Merge branch 'main' into mlosier/update-cats-and-keywords

Author: MichelLosier

.extended-webpackrc.js

@@ -1,8 +1,6 @@
-// import webpack from 'webpack';
-
 module.exports =  {
   resolve: {
-    // .mjs needed for https://github.com/graphql/graphql-js/issues/1272
+    // .mjs needed to fix for https://github.com/graphql/graphql-js/issues/1272
     extensions: ['*', '.mjs', '.js', '.json', '.gql', '.graphql']
   },
   module: {

.github/workflows/release.yml

@@ -170,18 +170,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 10.x
-
-      - name: Download Cached Deps
-        id: cache-node-modules
-        uses: actions/cache@v1
-        env:
-          cache-name: node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ env.cache-name }}-
+          node-version: 14
 
       - name: Install dependencies
         run: npm ci
@@ -214,7 +203,7 @@ jobs:
           GIT_COMMITTER_NAME: "nr-opensource-bot"
           GIT_COMMITTER_EMAIL: "[email protected]"
           GITHUB_TOKEN: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
-        run: npx semantic-release
+        run: npx semantic-release@^18.0.0
 
       - name: Re-enable "required_pull_request_reviews" branch protection
         id: enable-branch-protection

catalog/documentation.md

@@ -72,37 +72,7 @@ Renderers are simply React component classes with an additional static method, `
 Documentation is a little lacking at the moment but you _could_ drop your own renderer in today! Here's one you can try out that will link account IDs on account objects to the account page in APM.
 
 Add this file to the `nerdlets/notebook-nerdlet/renderers` directory.
-
-```javascript
-import React from 'react';
-
-// Render account IDs as links to the account page in APM
-export default class AccountIdRenderer extends React.Component {
-  static test(node) {
-    let parent = node.__meta.parent;
-
-    if (!parent) return false;
-
-    let isAccountTypeObject =
-      parent.__meta.typename == 'Account' ||
-      parent.__meta.typename == 'AccountOutline';
-
-    return isAccountTypeObject && node.__meta.fieldName == 'id';
-  }
-
-  render() {
-    let accountId = this.props.node.value;
-    return (
-      <a
-        target="_blank"
-        href={`https://rpm.newrelic.com/accounts/${accountId}`}
-      >
-        Visit Account {accountId}
-      </a>
-    );
-  }
-}
-```
+ - https://github.com/newrelic/nr1-graphiql-notebook/tree/main/nerdlets/notebook-nerdlet/context-render-example.txt
 
 Next, import this class into `nerdlets/notebook-nerdlet/renderers/render.js` and add it to the `RENDERERS` array.
 

catalog/screenshots/nr1-graphiql-notebook-1.png

@@ -1,3 +1,40 @@
+## [0.6.10](https://github.com/newrelic/nr1-graphiql-notebook/compare/v0.6.9...v0.6.10) (2021-11-12)
+
+
+### Bug Fixes
+
+* error with gql import ([740903a](https://github.com/newrelic/nr1-graphiql-notebook/commit/740903afdd52942a7ba8d4e5507516c15f8773ac))
+
+## [0.6.9](https://github.com/newrelic/nr1-graphiql-notebook/compare/v0.6.8...v0.6.9) (2021-11-12)
+
+
+### Bug Fixes
+
+* issue with html tag in catalog documentation ([7dc818d](https://github.com/newrelic/nr1-graphiql-notebook/commit/7dc818dc933e8665e96199443c7184dcfd1a55b4))
+
+## [0.6.8](https://github.com/newrelic/nr1-graphiql-notebook/compare/v0.6.7...v0.6.8) (2021-11-12)
+
+
+### Bug Fixes
+
+* check for contextNode ([0b7f679](https://github.com/newrelic/nr1-graphiql-notebook/commit/0b7f6791fd28558b6e34d9a1059456e6b7b801df))
+* eslint issues ([f2069c1](https://github.com/newrelic/nr1-graphiql-notebook/commit/f2069c17e000f3a6ee59150fd663c1c9c7e2321e))
+
+## [0.6.7](https://github.com/newrelic/nr1-graphiql-notebook/compare/v0.6.6...v0.6.7) (2021-11-12)
+
+
+### Bug Fixes
+
+* reduce size of images for catalog ([d8b01f5](https://github.com/newrelic/nr1-graphiql-notebook/commit/d8b01f54147c078f26a06f2a31d969e3aa6b1750))
+
+## [0.6.6](https://github.com/newrelic/nr1-graphiql-notebook/compare/v0.6.5...v0.6.6) (2021-11-12)
+
+
+### Bug Fixes
+
+* remove deprecated paramter from TextField ([efd2021](https://github.com/newrelic/nr1-graphiql-notebook/commit/efd2021dbbc0ca15b00d3e755b4530802fc4b789))
+* use node 14 and speicifc version of semantic release ([233597a](https://github.com/newrelic/nr1-graphiql-notebook/commit/233597a3b7cd0068475e43435a2d88af60eab744))
+
 ## [0.6.5](https://github.com/newrelic/nr1-graphiql-notebook/compare/v0.6.4...v0.6.5) (2021-05-07)
 
 

catalog/screenshots/nr1-graphiql-notebook-2.png

@@ -0,0 +1,29 @@
+import React from 'react';
+
+// Render account IDs as links to the account page in APM
+export default class AccountIdRenderer extends React.Component {
+  static test(node) {
+    const parent = node.__meta.parent;
+
+    if (!parent) return false;
+
+    const isAccountTypeObject =
+      parent.__meta.typename === 'Account' ||
+      parent.__meta.typename === 'AccountOutline';
+
+    return isAccountTypeObject && node.__meta.fieldName === 'id';
+  }
+
+  render() {
+    const accountId = this.props.node.value;
+    return (
+      <a
+        target="_blank"
+        rel="noreferrer"
+        href={`https://rpm.newrelic.com/accounts/${accountId}`}
+      >
+        Visit Account {accountId}
+      </a>
+    );
+  }
+}

docs/CHANGELOG.md

@@ -167,7 +167,6 @@ export default class NotebookCell extends React.Component {
         <div className="notebook-cell-notes">
           <TextField
             style={{ marginBottom: '7px' }}
-            multiline
             label="Notes"
             placeholder="e.g. Lorem Ipsum"
             value={this.state.notes}

nerdlets/notebook-nerdlet/context-render-example.txt

@@ -12,9 +12,15 @@ export function generate(queryDoc) {
 // value of that node in the augmented response. The context property
 // includes things like the argument the field was queried with.
 export function findFieldContext(contextNode, path) {
-  if (Number.isInteger(last(path)))
+  if (Number.isInteger(last(path))) {
     return findFieldContext(contextNode, path.slice(0, -1));
-  if (path.length === 0) return contextNode.context || {};
+  }
+  if (path.length === 0) {
+    if (contextNode && contextNode.context) {
+      return contextNode.context;
+    }
+    return {};
+  }
   const [nextField, remainingPath] = pop(path);
   const nextNode = contextNode.selectionSet[nextField];
   return findFieldContext(nextNode, remainingPath);