Skip to content

Commit

Permalink
Merge pull request #106 from newrelic/app-deprecations
Browse files Browse the repository at this point in the history
fix: app deprecations
  • Loading branch information
aswanson-nr authored Feb 23, 2022
2 parents 6d852d9 + 3884f93 commit 7d2f74f
Show file tree
Hide file tree
Showing 4 changed files with 4,189 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1
with:
node-version: 10.x
node-version: 16

- name: Cache node_modules
id: cache-node-modules
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1
with:
node-version: 10.x
node-version: 16

- name: Cache node_modules
id: cache-node-modules
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v1
with:
node-version: 10.x
node-version: 16

- name: Cache node_modules
id: cache-node-modules
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 10.x
node-version: 16

- name: Cache node_modules
id: cache-node-modules
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 10.x
node-version: 16

- name: Download Cached Deps
id: cache-node-modules
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 14
node-version: 16

- name: Install dependencies
run: npm ci
Expand Down Expand Up @@ -198,10 +198,10 @@ jobs:
env:
# Use nr-opensource-bot for authoring commits done by
# semantic-release (rather than using @semantic-release-bot)
GIT_AUTHOR_NAME: "nr-opensource-bot"
GIT_AUTHOR_EMAIL: "opensource+bot@newrelic.com"
GIT_COMMITTER_NAME: "nr-opensource-bot"
GIT_COMMITTER_EMAIL: "opensource+bot@newrelic.com"
GIT_AUTHOR_NAME: 'nr-opensource-bot'
GIT_AUTHOR_EMAIL: 'opensource+bot@newrelic.com'
GIT_COMMITTER_NAME: 'nr-opensource-bot'
GIT_COMMITTER_EMAIL: 'opensource+bot@newrelic.com'
GITHUB_TOKEN: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
run: npx semantic-release@^18.0.0

Expand Down
6 changes: 4 additions & 2 deletions nerdlets/integrations-manager-nerdlet/context/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,10 @@ export class DataProvider extends Component {
selectedCollection.collectionAccountId || selectedCollection.accountId,
collection: selectedCollection.label
}).then((value) => {
if (value.errors && value.errors.length > 0) {
window.alert(`${selectedCollection.label}: ${value.errors[0].message}`);
if (value.error && value.error.graphQLErrors.length > 0) {
window.alert(
`${selectedCollection.label}: ${value.error.graphQLErrors[0].message}`
);
this.setState({ selectedCollection: null });
} else {
this.setState({
Expand Down
Loading

0 comments on commit 7d2f74f

Please sign in to comment.