Revert "feat: update to node 16 and fix deprecations"

This reverts commit ddcdd61.
newrelic · Feb 15, 2022 · a55fdbb · a55fdbb
1 parent ddcdd61
commit a55fdbb
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 3,582 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 10.x
 
       - name: Cache node_modules
         id: cache-node-modules
@@ -53,7 +53,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: 16 
+          node-version: 10.x
 
       - name: Cache node_modules
         id: cache-node-modules
@@ -99,7 +99,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 10.x
 
       - name: Cache node_modules
         id: cache-node-modules

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 10.x
 
       - name: Cache node_modules
         id: cache-node-modules
@@ -59,7 +59,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 10.x
 
       - name: Download Cached Deps
         id: cache-node-modules
@@ -170,7 +170,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 14
 
       - name: Install dependencies
         run: npm ci

diff --git a/nerdlets/top-nerdlet/process-details.js b/nerdlets/top-nerdlet/process-details.js
@@ -86,7 +86,7 @@ export default class ProcessDetails extends React.PureComponent {
       WHERE entityGuid = '${entity.guid}' AND parentProcessId = ${pid}`;
 
     return (
-      <NrqlQuery accountIds={[entity.accountId]} query={nrql} formatType="raw">
+      <NrqlQuery accountId={entity.accountId} query={nrql} formatType="raw">
         {({ loading, data }) => {
           if (loading) return '';
           const { members } = data.results[0];
@@ -186,7 +186,7 @@ export default class ProcessDetails extends React.PureComponent {
         <h3>{title}</h3>
         <ChartType
           className="chart"
-          accountIds={[entity.accountId]}
+          accountId={entity.accountId}
           query={this.metricQuery(select)}
         />
       </StackItem>
@@ -210,7 +210,7 @@ export default class ProcessDetails extends React.PureComponent {
                 'CPU',
                 "average(cpuSystemPercent) as 'System CPU %', average(cpuUserPercent) AS 'User CPU %'"
               )}
-              {this.render(
+              {this.renderChart(
                 LineChart,
                 'I/O',
                 "average(ioReadBytesPerSecond/1024/1024) AS 'Read MB/s', average(ioWriteBytesPerSecond/1024/1024) AS 'Write MB/s'"

diff --git a/nerdlets/top-nerdlet/process-table.js b/nerdlets/top-nerdlet/process-table.js
@@ -102,11 +102,11 @@ export default class ProcessTable extends React.PureComponent {
       SINCE ${Math.round(new Date().getTime() / 1000) - 60}`;
 
     const { data } = await NrqlQuery.query({
-      accountIds: [entity.accountId],
+      accountId: entity.accountId,
       query: nrql,
       formatType: 'raw',
     });
-    const { facets } = data;
+    const { facets } = data.raw;
     const tableData = facets.map((facet) => {
       return {
         pid: parseInt(facet.name),
@@ -168,9 +168,7 @@ export default class ProcessTable extends React.PureComponent {
                     <Icon
                       style={{ marginLeft: '6px' }}
                       color="#aaaaaa"
-                      type={
-                        Icon.TYPE.INTERFACE__CARET__CARET_BOTTOM__WEIGHT_BOLD
-                      }
+                      type="interface_caret_caret-bottom_weight-bold"
                     />
                   )}
                 </th>

diff --git a/nerdlets/top-nerdlet/top.js b/nerdlets/top-nerdlet/top.js
@@ -33,7 +33,7 @@ export default class Top extends React.PureComponent {
             <p className="subtitle">Refreshes every 15 seconds</p>
           </header>
           <div className="primary-column-main">
-            <PlatformStateContext.Consumer>
+            <PlatformStateContext>
               {(platformUrlState) => (
                 <ProcessTable
                   entity={entity}
@@ -43,12 +43,12 @@ export default class Top extends React.PureComponent {
                   {...this.props}
                 />
               )}
-            </PlatformStateContext.Consumer>
+            </PlatformStateContext>
           </div>
         </GridItem>
         <GridItem columnSpan={5} className="column secondary-column">
           {selectedPid ? (
-            <PlatformStateContext.Consumer>
+            <PlatformStateContext>
               {(platformUrlState) => (
                 <ProcessDetails
                   entity={entity}
@@ -58,7 +58,7 @@ export default class Top extends React.PureComponent {
                   {...this.props}
                 />
               )}
-            </PlatformStateContext.Consumer>
+            </PlatformStateContext>
           ) : (
             <Spinner />
           )}

diff --git a/nr1.json b/nr1.json
@@ -1,6 +1,6 @@
 {
   "schemaType": "NERDPACK",
-  "id": "fd71c932-0d45-4439-bffd-2dcee2076b69",
-  "displayName": "Task",
+  "id": "b9616a2a-9543-4162-8e9f-30dbb50c5cba",
+  "displayName": "Top",
   "description": "Display and inspect the top processes of your hosts, including CPU, I/O and memory"
 }