December Dependency Updates

gotdibbs · gotdibbs · commit 4824fa9afe62 · 2022-12-13T16:25:19.000-06:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
-            node-version: 14
+            node-version: 18
       - name: Install App Dependencies
         run: yarn --frozen-lockfile
       - name: Build App
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
-            node-version: 14
+            node-version: 18
       - name: Install App Dependencies
         run: yarn --frozen-lockfile
       - name: Build App
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.18.1
+18.12.1
diff --git a/chromeExtension/README.md b/chromeExtension/README.md
@@ -26,9 +26,10 @@ Key components of the React app are listed below.
 1. Clone this repository
 2. Open the repository in Visual Studio Code
 3. `cd` to `chromeExtensions`
-4. Run `yarn install`
-5. Run `yarn dev` after making changes
-6. Load the extension, unpacked, into Chrome:
+4. Copy `.env.example` to `.env`
+5. Run `yarn install`
+6. Run `yarn dev` after making changes
+7. Load the extension, unpacked, into Chrome:
  - Open Chrome
  - Navigate to `chrome://extensions/`
  - Toggle on `Developer mode`
diff --git a/chromeExtension/package.json b/chromeExtension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gotdibbs-toolbox",
-  "version": "2022.4.1",
+  "version": "2022.12.1",
   "description": "Admin tools for Dynamics 365/CRM",
   "main": "index.js",
   "scripts": {
@@ -12,28 +12,26 @@
   "license": "MIT",
   "private": "true",
   "devDependencies": {
-    "@babel/core": "^7.17.5",
+    "@babel/core": "^7.20.5",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
-    "babel-loader": "^8.2.3",
+    "babel-loader": "^9.1.0",
     "classnames": "^2.3.1",
-    "copy-webpack-plugin": "^7.0.0",
+    "copy-webpack-plugin": "^11.0.0",
     "core-js": "^3.21.1",
     "crx": "^5.0.1",
-    "css-loader": "^5.0.1",
+    "css-loader": "^6.7.2",
     "dotenv": "^16.0.0",
     "eslint": "^7.17.0",
     "eslint-config-defaults": "^9.0.0",
-    "eslint-loader": "^4.0.2",
     "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-react": "^7.20.5",
-    "extract-css-chunks-webpack-plugin": "^4.7.5",
+    "eslint-plugin-react": "^7.31.11",
+    "extract-css-chunks-webpack-plugin": "^4.9.0",
     "react-hook-form": "^6.14.1",
-    "react-json-view": "^1.19.1",
-    "style-loader": "^2.0.0",
-    "sumo-logger": "^2.6.1",
+    "react-json-view": "^1.21.3",
+    "sumo-logger": "^2.8.1",
     "url-loader": "^4.1.0",
-    "webpack": "^5.70.0",
+    "webpack": "5.75.0",
     "webpack-cli": "^4.9.2",
     "zip-webpack-plugin": "^4.0.1"
   },
@@ -42,5 +40,14 @@
     "fathom-client": "^3.0.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1"
+  },
+  "resolutions": {
+    "async": "^2.6.4",
+    "cross-fetch": "^3.1.5",
+    "loader-utils": "^2.0.4",
+    "minimatch": "^3.0.5",
+    "minimist": "^1.2.6",
+    "node-fetch": "^2.6.7",
+    "terser-webpack-plugin": "^5.1.4"
   }
 }
diff --git a/chromeExtension/public/honeybadger.min.js b/chromeExtension/public/honeybadger.min.js
diff --git a/chromeExtension/tests/integration/config/wdio.conf-local.js b/chromeExtension/tests/integration/config/wdio.conf-local.js
@@ -21,6 +21,6 @@ exports.config = {
     ],
     // Uncomment the below to specify a specific feature file to run
     // specs: [
-    //     './features/toolbox.feature'
+    //     './features/navigation.feature'
     // ]
 };
diff --git a/chromeExtension/tests/integration/config/wdio.conf.js b/chromeExtension/tests/integration/config/wdio.conf.js
@@ -256,7 +256,8 @@ exports.config = {
             .replace('.feature', '');
 
         let fileName = [
-            (new Date()).toLocaleDateString(), ' - ',
+            (new Date()).toLocaleDateString(),
+            ' - ',
             ['ERROR', browser.requestedCapabilities.browserName, browser.capabilities.browserVersion, featureName].join('_'),
             '.png'
         ].join('').replace(/(\/|\\)/g, '-');
diff --git a/chromeExtension/tests/integration/features/quickActions.feature b/chromeExtension/tests/integration/features/quickActions.feature
@@ -2,8 +2,8 @@ Feature: Quick Actions
 
   Background: Starting from the info pane on a record
 
-    Given I am on the info pane
-    And I am viewing a record
+    Given I am viewing a record
+    And I am on the info pane
 
   Scenario: Toggle Schema Names
 
diff --git a/chromeExtension/tests/integration/features/step-definitions/steps.js b/chromeExtension/tests/integration/features/step-definitions/steps.js
@@ -14,34 +14,36 @@ function capitalize(str) {
 }
 
 async function loadNewRecord() {
-    let isSuccess = await browser.execute(logicalName => {
+    let errorMessage = await browser.execute(logicalName => {
         try {
             Xrm.Utility.openEntityForm(logicalName);
-            return true;
+            return;
+        }
+        catch (e) {
+            return e?.message;
         }
-        catch {}
     }, RECORD_LOGICAL_NAME);
 
-    if (!isSuccess) {
-        // Backup, but noisy to the `info` logs as toolkit needs to be re-injected
-        await browser.url(`/main.aspx?pagetype=entityrecord&etn=${RECORD_LOGICAL_NAME}`);
+    if (errorMessage) {
+        throw new Error(`Could not load record via Xrm APIs: "${errorMessage}"`);
     }
 
     await Panes.Dynamics.FormHeader.waitForDisplayed();
 }
 
 async function loadRecord() {
-    let isSuccess = await browser.execute((logicalName, id) => {
+    let errorMessage = await browser.execute((logicalName, id) => {
         try {
             Xrm.Utility.openEntityForm(logicalName, id);
-            return true;
+            return;
+        }
+        catch (e) {
+            return e?.message;
         }
-        catch {}
     }, RECORD_LOGICAL_NAME, RECORD_ID);
 
-    if (!isSuccess) {
-        // Backup, but noisy to the `info` logs as toolkit needs to be re-injected
-        await browser.url(`/main.aspx?pagetype=entityrecord&etn=${RECORD_LOGICAL_NAME}&id=${RECORD_ID}`);
+    if (errorMessage) {
+        throw new Error(`Could not load record via Xrm APIs: "${errorMessage}"`);
     }
 
     await Panes.Dynamics.FormHeader.waitForDisplayed();
@@ -53,17 +55,6 @@ async function loadPane(pane, isViewingRecord) {
     }
 
     await Panes[capitalize(pane)].open();
-
-    if (!isViewingRecord) {
-        return;
-    }
-
-    if (/new/i.test(isViewingRecord)) {
-        await loadNewRecord();
-    }
-    else {
-        await loadRecord();
-    }
 }
 
 Given(/i am on the (\w+) pane( and viewing a record| and viewing a new record)?/i, loadPane);
@@ -325,20 +316,20 @@ Then(/a new window should open to show the (.+) (editor|list|page)$/i, async (co
 });
 
 // Copied from webdriver.io source, but modified to handle nulls
-async function switchWindow(urlOrTitleToMatch) {
+async function switchWindow(urlOrTitleToMatch, currentWindowId) {
     if (typeof urlOrTitleToMatch !== 'string' && !(urlOrTitleToMatch instanceof RegExp)) {
         throw new Error('Unsupported parameter for switchWindow, required is "string" or an RegExp');
     }
 
     const tabs = await browser.getWindowHandles();
 
-    for (const tab of tabs) {
-        await browser.switchToWindow(tab)
+    for (const tab of tabs.filter(t => t !== currentWindowId)) {
+        await browser.switchToWindow(tab);
 
         /**
          * check if url matches
          */
-        await browser.waitUntil(() => browser.getUrl());
+        await browser.waitUntil(async () => await browser.getUrl());
         const url = await browser.getUrl();
         if (url.match(urlOrTitleToMatch)) {
             return tab;
@@ -347,7 +338,7 @@ async function switchWindow(urlOrTitleToMatch) {
         /**
          * check title
          */
-        await browser.waitUntil(() => browser.getTitle());
+        await browser.waitUntil(async () => await browser.getTitle());
         const title = await browser.getTitle();
         if (title.match(urlOrTitleToMatch)) {
             return tab;
@@ -369,7 +360,7 @@ Then(/a new window should open with "(.+)" in the (title|url)$/i, async (title,
     // The title will be 'Microsoft Dynamics 365' until the page loads, so it is
     //  safe to wait for that title to transition, but then we need to wait for the
     //  the actual title to be present to pass the vibe check
-    await switchWindow(new RegExp(`(${title})|(^Microsoft Dynamics 365)`, 'i'));
+    await switchWindow(new RegExp(`(${title})|(Microsoft Dynamics 365)`, 'i'), currentWindow);
     await browser.waitUntil(async () => {
         const title = await browser.getTitle();
 
diff --git a/chromeExtension/tests/integration/package.json b/chromeExtension/tests/integration/package.json
@@ -23,11 +23,12 @@
     "@wdio/cucumber-framework": "^7.16.14",
     "@wdio/local-runner": "^7.16.16",
     "@wdio/spec-reporter": "^7.16.14",
-    "chromedriver": "^99.0.0",
-    "dotenv": "^16.0.0",
+    "chromedriver": "^108.0.0",
+    "dotenv": "^16.0.3",
     "msedgedriver": "^91.0.0",
-    "node-fetch": "^3.1.0",
-    "wdio-chromedriver-service": "^7.2.8",
-    "wdio-edgedriver-service": "^1.2.0"
-  }
+    "node-fetch": "^3.3.0",
+    "wdio-chromedriver-service": "^8.0.1",
+    "wdio-edgedriver-service": "^2.1.1"
+  },
+  "dependencies": {}
 }
diff --git a/chromeExtension/tests/integration/panes/toolbox.js b/chromeExtension/tests/integration/panes/toolbox.js
@@ -53,6 +53,12 @@ class Toolbox {
         }
     }
 
+    async waitForToolboxLoad() {
+        await browser.waitUntil(async () => 
+            await browser.execute(() => !!window?.__GOTDIBBS_TOOLBOX__?.context?.Xrm)
+        );
+    }
+
     async close() {
         await (new ScenarioHelper().close());
     }
diff --git a/chromeExtension/tests/integration/panes/utilities.pane.js b/chromeExtension/tests/integration/panes/utilities.pane.js
@@ -82,6 +82,8 @@ class UtilitiesPane extends Toolbox {
     }
 
     async disableField(field) {
+        await super.waitForToolboxLoad();
+
         await browser.execute((field) => {
             window.__GOTDIBBS_TOOLBOX__.context.Xrm.Page.getControl(field).setDisabled(true);
         }, field);
@@ -101,6 +103,8 @@ class UtilitiesPane extends Toolbox {
     }
 
     async hideField(field) {
+        await super.waitForToolboxLoad();
+
         await browser.execute((field) => {
             window.__GOTDIBBS_TOOLBOX__.context.Xrm.Page.getControl(field).setVisible(false);
         }, field);
@@ -119,6 +123,8 @@ class UtilitiesPane extends Toolbox {
     }
 
     async changeField(field) {
+        await super.waitForToolboxLoad();
+
         this.currentFieldValue = await browser.execute((field) => {
             let value = window.__GOTDIBBS_TOOLBOX__.context.Xrm.Page.getAttribute(field).getValue();
             window.__GOTDIBBS_TOOLBOX__.context.Xrm.Page.getAttribute(field).setValue(new Date().toISOString());
@@ -127,6 +133,8 @@ class UtilitiesPane extends Toolbox {
     }
 
     async changeFieldBack(field) {
+        await super.waitForToolboxLoad();
+
         await browser.execute((field, value) => {
             window.__GOTDIBBS_TOOLBOX__.context.Xrm.Page.getAttribute(field).setValue(value);
         }, field, this.currentFieldValue);
diff --git a/chromeExtension/tests/integration/utilities/ScenarioHelper.js b/chromeExtension/tests/integration/utilities/ScenarioHelper.js
@@ -1,3 +1,5 @@
+const { GherkinDocumentParser } = require("@cucumber/cucumber/lib/formatter/helpers");
+
 module.exports = class ToolboxHelper {
     get ToolboxContainer() {
         return $('.gotdibbs-toolbox');
@@ -14,17 +16,18 @@ module.exports = class ToolboxHelper {
     }
 
     async navigateHome() {
-        const isOnRecordPage = /(etn|etc)/i;
+        const isOnRecordPage = /entityrecord/i;
 
         if (isOnRecordPage.test(await browser.getUrl())) {
             // First, try to go back to prevent excessive toolbox script injection in `info` logs
             await browser.back();
 
+            // If we're still on a record page, force nav back to home
             if (!isOnRecordPage.test(await browser.getUrl())) {
                 return;
             }
             else {
-                await browser.url('/main.aspx?app=d365default&forceUCI=1');
+                await browser.url('/');
             }
         }
     }
diff --git a/chromeExtension/tests/integration/yarn.lock b/chromeExtension/tests/integration/yarn.lock
diff --git a/chromeExtension/webpack/webpack.config.js b/chromeExtension/webpack/webpack.config.js
diff --git a/chromeExtension/yarn.lock b/chromeExtension/yarn.lock
