Merge pull request #55 from newrelic/joe/node-upgrade

Node Upgrade

Author: josephgregoryii

.github/workflows/pr.yml

@@ -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
@@ -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
@@ -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

.github/workflows/release.yml

@@ -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
@@ -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
@@ -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

.nvmrc

@@ -0,0 +1 @@
+16

nerdlets/e2m-gui-nerdlet/account-details.js

@@ -116,7 +116,7 @@ export default class AccountDetails extends React.Component {
 
 AccountDetails.propTypes = {
   filteredMetrics: PropTypes.array,
-  accountIdFilter: PropTypes.string,
+  accountIdFilter: PropTypes.number,
   cardinalities: PropTypes.array,
   cardinalityTotals: PropTypes.object,
   timerangeArray: PropTypes.array,

nerdlets/e2m-gui-nerdlet/detail-components/rule-history.js

@@ -35,7 +35,7 @@ const RuleHistory = ({ ruleId, accountId }) => {
     <div className="RuleHistoryWrapper">
       <div className="Label">Rule Audit Log</div>
       <NrqlQuery
-        accountId={accountId}
+        accountIds={[accountId]}
         query={`FROM NrAuditEvent SELECT \`actorId\`, \`actionIdentifier\`, timestamp since 36 months ago WHERE actionIdentifier like 'e2m_rule%' and \`targetId\` = '${ruleId}'`}
       >
         {({ data, error, loading }) => {

nerdlets/e2m-gui-nerdlet/metric-details.js

@@ -40,11 +40,11 @@ export default class MetricDetails extends React.Component {
     const {
       eventRate,
       metricRate,
-      errors
+      error
     } = await calculateVolumeReductionForMetric(this.props.metric);
 
-    if (errors) {
-      console.log(errors); // eslint-disable-line no-console
+    if (error) {
+      console.log(error); // eslint-disable-line no-console
       Toast.showToast({
         title: 'Error',
         description:

nerdlets/util/async.js

@@ -28,18 +28,18 @@ export async function calculateVolumeReductionForMetric(metric) {
     wheres,
     metricName
   );
-  let { data, errors } = await NerdGraphQuery.query(query);
+  let { data, error } = await NerdGraphQuery.query(query);
   let eventRate = null;
   let metricRate = null;
-  if (!errors) {
+  if (!error) {
     try {
       eventRate = data.actor.EventRate.nrql.results[0].eventrate;
       metricRate = data.actor.MetricRate.nrql.results[0].metricrate;
     } catch (err) {
-      errors = err;
+      error = err;
     }
   }
-  return { eventRate, metricRate, errors };
+  return { eventRate, metricRate, error };
 }
 
 export function createNewRuleGraphQuery(
@@ -172,11 +172,11 @@ export async function getE2MRulesForAccountObj(accounts) {
   let e2mRules = [];
 
   for (let i = 0; i < accountBatchArray.length; i++) {
-    const { data, errors } = await NerdGraphQuery.query(
+    const { data, error } = await NerdGraphQuery.query(
       buildRulesQuery(accountBatchArray[i])
     );
-    if (errors) {
-      throw errors;
+    if (error) {
+      throw error;
     }
     const rulesForBatch = parseE2MMetricRuleListFromResponse(data);
     e2mRules = e2mRules.concat(rulesForBatch);
@@ -187,9 +187,9 @@ export async function getE2MRulesForAccountObj(accounts) {
 // NOTE: There seems to be a bug in the SDK for AccountsQuery. I error when I try to
 //       use it imperatively.
 export async function getAccountsForUser() {
-  const { data, errors } = await AccountsQuery.query();
-  if (errors) {
-    throw errors;
+  const { data, error } = await AccountsQuery.query();
+  if (error) {
+    throw error;
   }
   // Convert accounts array to object for easier processing
   return data;
@@ -232,19 +232,19 @@ async function processBatchOfCardinalities(
 ) {
   let failedBatch = false;
   try {
-    const { data, errors } = await calculateCardinalityForRuleBatch(
+    const { data, error } = await calculateCardinalityForRuleBatch(
       batchOfRules,
       accountId
     );
-    if (errors) {
-      const errorStr = JSON.stringify(errors);
+    if (error) {
+      const errorStr = JSON.stringify(error.graphQLErrors);
       const isDbLimitError = errorStr.includes('limit exceeded');
       /* eslint-disable no-console */
       console.log('Error loading cardinality with batch: ', errorStr);
       /* eslint-enable */
       errorCount = errorCount + 1;
       if (!isDbLimitError && errorCount < maxVisibileErrors) {
-        onError(JSON.stringify(errors));
+        onError(JSON.stringify(error));
       }
       failedBatch = true;
     } else if (data) {