From 1b35148a286157fa63a77bde474bd59900e0c7b9 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 14 Jan 2021 09:51:21 -0800
Subject: [PATCH 01/42] fix SCT-2914 / PUBLIC-1493 - movement of unselected
 cells - fix movement of unselected cells - improve styling of toolbar
 controls in unselected cells - integration tests for the above

---
 RELEASE_NOTES.md                              |   1 +
 .../static/kbase/custom/custom.css            |  20 +-
 kbase-extension/static/kbase/js/userMenu.js   |   6 +-
 .../narrative_core/kbaseCellToolbarMenu.js    |  25 +-
 .../specs/kbaseCellToolbarMenu_test.js        | 317 ++++++++++++++++++
 test/integration/wdioUtils.js                 |  13 +-
 6 files changed, 358 insertions(+), 24 deletions(-)
 create mode 100644 test/integration/specs/kbaseCellToolbarMenu_test.js

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index d00aba80d4..c1407dd5c5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -6,6 +6,7 @@ This is built on the Jupyter Notebook v6.0.2 (more notes will follow).
 ### Version NEXT
 - SCT-2778 - convert data slideout, public tab, refseq data source to use searchapi2/rpc api rather than searchapi2/legacy.
 - enhance integration testing support to add service, host, browser, screen size support
+- SCT-2914 / PUBLIC-1493 - fix up/down cell movement behavior for unselected cells
 
 ### Version 4.3.1
 - Fixed problem where code cells could forget their toggled state after saving.
diff --git a/kbase-extension/static/kbase/custom/custom.css b/kbase-extension/static/kbase/custom/custom.css
index 33a946f084..96c0613b29 100644
--- a/kbase-extension/static/kbase/custom/custom.css
+++ b/kbase-extension/static/kbase/custom/custom.css
@@ -315,14 +315,30 @@ div#notebook {
   color: #ccc;
 }
 
+.cell.unselected .btn-default:hover {
+    color: #000;
+  }
+
 .cell.unselected .kb-cell-toolbar .title-container {
   opacity: 0.5;
 }
 
-.cell.unselected .kb-cell-toolbar .buttons-container {
-  opacity: 0.2;
+.btn.btn-default.kb-btn-expander.-minimized {
+  color: rgba(255,137,0,1);
+}
+
+.cell.unselected .kb-btn-expander.-minimized {
+  color: rgba(255,137,0, 0.5);
 }
 
+.cell.unselected .kb-btn-expander.-minimized:hover {
+    color: rgba(255,137,0, 1);
+  }
+
+/* .cell.unselected .kb-cell-toolbar .buttons-container {
+  opacity: 0.2;
+} */
+
 .kb-btn-icon {
   display: inline-block;
   padding: 4px;
diff --git a/kbase-extension/static/kbase/js/userMenu.js b/kbase-extension/static/kbase/js/userMenu.js
index cd10c1891c..1369f80922 100644
--- a/kbase-extension/static/kbase/js/userMenu.js
+++ b/kbase-extension/static/kbase/js/userMenu.js
@@ -82,10 +82,10 @@ define([
                             div({style: 'display:inline-block; width: 34px; vertical-align: top;'}, [
                                 span({class: 'fa fa-user', style: 'font-size: 150%; margin-right: 10px;'})
                             ]),
-                            div({style: 'display: inline-block', 'data-element': 'user-label'}, [
-                                displayName,
+                            div({style: 'display: inline-block'}, [
+                                span({'data-element': 'realname'}, displayName),
                                 br(),
-                                i({}, userName)
+                                i({'data-element': 'username'}, userName)
                             ])
                         ])
                     ]),
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
index 97d559805c..853acff319 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
@@ -22,7 +22,7 @@ define([
 ) {
     'use strict';
 
-    var t = html.tag,
+    const t = html.tag,
         div = t('div'),
         a = t('a'),
         button = t('button'),
@@ -50,11 +50,13 @@ define([
             readOnly = Jupyter.narrative.readonly;
 
         function doMoveCellUp() {
-            Jupyter.notebook.move_cell_up();
+            const cellIndex = Jupyter.notebook.find_cell_index(cell);
+            Jupyter.notebook.move_cell_up(cellIndex);
         }
 
         function doMoveCellDown() {
-            Jupyter.notebook.move_cell_down();
+            const cellIndex = Jupyter.notebook.find_cell_index(cell);
+            Jupyter.notebook.move_cell_down(cellIndex);
         }
 
         function doDeleteCell() {
@@ -199,10 +201,8 @@ define([
         }
 
         function renderOptions(cell, events) {
-            var toggleMinMax = utils.getCellMeta(cell, 'kbase.cellState.toggleMinMax', 'maximized'),
-                toggleIcon = (toggleMinMax === 'maximized' ? 'minus' : 'plus'),
-                dropdownId = html.genId(),
-                menuItems = [];
+            const dropdownId = html.genId();
+            const menuItems = [];
 
             if (cell.cell_type === 'code') {
                 menuItems.push({
@@ -403,12 +403,12 @@ define([
                         ])),
 
                         (function () {
-                            var toggleMinMax = utils.getCellMeta(cell, 'kbase.cellState.toggleMinMax', 'maximized'),
+                            const toggleMinMax = utils.getCellMeta(cell, 'kbase.cellState.toggleMinMax', 'maximized'),
                                 toggleIcon = (toggleMinMax === 'maximized' ? 'minus' : 'plus'),
-                                color = (toggleMinMax === 'maximized' ? '#000' : 'rgba(255,137,0,1)');
+                                classModifier = (toggleMinMax === 'maximized' ? '-maximized' : '-minimized');
                             return button({
                                 type: 'button',
-                                class: 'btn btn-default btn-xs',
+                                class: `btn btn-default btn-xs kb-btn-expander ${classModifier}`,
                                 dataToggle: 'tooltip',
                                 dataPlacement: 'left',
                                 title: true,
@@ -418,10 +418,7 @@ define([
                                 id: events.addEvent({type: 'click', handler: doToggleMinMaxCell})
                             }, [
                                 span({
-                                    class: 'fa fa-' + toggleIcon + '-square-o fa-lg',
-                                    style: {
-                                        color: color
-                                    }
+                                    class: 'fa fa-' + toggleIcon + '-square-o fa-lg'
                                 })
                             ]);
                         }())
diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
new file mode 100644
index 0000000000..5e656c2ed6
--- /dev/null
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -0,0 +1,317 @@
+/*global describe, it, browser, expect, $, afterEach, beforeEach*/
+/* eslint {strict: ['error', 'global']} */
+'use strict';
+
+const {login, openNarrative, sendString, clickWhenReady} = require('../wdioUtils.js');
+
+/*
+Notes:
+
+The test narrative has 4 markdown cells, each collapsed. The initial collapsed
+state makes some tests easier, because they all have a title.
+*/
+
+const testData = {
+    common: {
+        unselectedBorder: '1px 1px 1px 5px solid rgb(204, 204, 204)',
+        selectedBorder: '1px 1px 1px 5px solid rgb(75, 184, 86)',
+    },
+    all: {
+        TEST_CASE1: {
+            cellIndex: 1,
+            title: "Narrative Cell Toolbar Testing"
+        },
+        TEST_CASE2: {
+            cellIndex: 2,
+            title: "Cell 1"
+        },
+        TEST_CASE3: {
+            cellIndex: 3,
+            title: "Cell 2"
+        },
+        TEST_CASE4: {
+            cellIndex: 3,
+            title: "Cell 2"
+        },
+        TEST_CASE5: {
+            cellIndex: 4,
+            body: "Cell 3"
+        }
+    },
+    ci: {
+        TEST_CASE1: {
+            narrativeId: 58675,
+        },
+        TEST_CASE2: {
+            narrativeId: 58675,
+        },
+        TEST_CASE3: {
+            narrativeId: 58675,
+        },
+        TEST_CASE4: {
+            narrativeId: 58675,
+        },
+        TEST_CASE5: {
+            narrativeId: 58675,
+        }
+    },
+    'narrative-dev': {
+        TEST_CASE1: {
+            narrativeId: 80970,
+        },
+        TEST_CASE2: {
+            narrativeId: 80970,
+        },
+        TEST_CASE3: {
+            narrativeId: 80970,
+        },
+        TEST_CASE4: {
+            narrativeId: 80970,
+        },
+        TEST_CASE5: {
+            narrativeId: 80970,
+        }
+    }
+};
+
+const testCases = mergeObjects([testData[browser.config.testParams.ENV], testData.all]);
+
+function mergeObjects(listOfObjects) {
+    const simpleObjectPrototype = Object.getPrototypeOf({});
+
+    function isSimpleObject(obj) {
+        return Object.getPrototypeOf(obj) === simpleObjectPrototype;
+    }
+
+    function merge(obj1, obj2, keyStack) {
+        Object.keys(obj2).forEach(function (key) {
+            const obj1Value = obj1[key];
+            const obj2Value = obj2[key];
+            const obj1Type = typeof obj1Value;
+            // var obj2Type = typeof obj2Value;
+            if (obj1Type === 'undefined') {
+                obj1[key] = obj2[key];
+            } else if (isSimpleObject(obj1Value) && isSimpleObject(obj2Value)) {
+                keyStack.push(key);
+                merge(obj1Value, obj2Value, keyStack);
+                keyStack.pop();
+            } else {
+                console.error('UNMERGABLE', obj1Type, obj1Value);
+                throw new Error('Unmergable at ' + keyStack.join('.') + ':' + key);
+            }
+        });
+    }
+
+    const base = JSON.parse(JSON.stringify(listOfObjects[0]));
+    for (let i = 1; i < listOfObjects.length; i += 1) {
+        merge(base, listOfObjects[i], []);
+    }
+    return base;
+}
+
+
+
+async function waitForCell(notebookContainer, cellIndex){
+    return await browser.waitUntil(async () => {
+        const cell = await notebookContainer.$(`.cell:nth-child(${cellIndex})`);
+        return cell;
+    });
+    // return await panel.$$('[role="table"][data-test-id="result"] > div > [role="row"]');
+}
+
+async function waitForCellWithTitle(container, cellIndex, title) {
+    const cell = await waitForCell(container, cellIndex);
+    await browser.waitUntil(async () => {
+        const titleElement = await cell.$('[data-element="title"]');
+        const text = await titleElement.getText();
+        return text === title;
+    });
+    return cell;
+}
+
+async function waitForCellWithBody(container, cellIndex, bodyText) {
+    const cell = await waitForCell(container, cellIndex);
+    await browser.waitUntil(async () => {
+        const element = await cell.$('.text_cell_render.rendered_html');
+        const text = await element.getText();
+        return text === bodyText;
+    });
+    return cell;
+}
+
+async function selectCell(container, cellIndex, title) {
+    const cell = await waitForCellWithTitle(container, cellIndex, title);
+
+    // Make sure not selected.
+    // We do this by inspecting the border.
+    const borderStyle = await cell.getCSSProperty('border');
+    expect(borderStyle.value).toEqual(testData.common.unselectedBorder);
+
+    // Click on title area to select cell.
+    const titleArea = await cell.$('.title-container');
+    await clickWhenReady(titleArea);
+
+    await browser.waitUntil(async () => {
+        const borderStyle = await cell.getCSSProperty('border');
+        return borderStyle.value === testData.common.selectedBorder;
+    });
+
+    return cell;
+}
+
+async function selectCellWithBody(container, cellIndex, body) {
+    const cell = await waitForCellWithBody(container, cellIndex, body);
+
+    // Make sure not selected.
+    // We do this by inspecting the border.
+    const borderStyle = await cell.getCSSProperty('border');
+    expect(borderStyle.value).toEqual(testData.common.unselectedBorder);
+
+    // Click on title area to select cell.
+    const bodyArea = await cell.$('.text_cell_render.rendered_html');
+    await clickWhenReady(bodyArea);
+
+    await browser.waitUntil(async () => {
+        const borderStyle = await cell.getCSSProperty('border');
+        return borderStyle.value === testData.common.selectedBorder;
+    });
+
+    return cell;
+}
+
+describe('Test kbaseCellToolbarMenu', () => {
+    beforeEach(async () => {
+        await browser.setTimeout({ 'implicit': 30000 });
+        await browser.reloadSession();
+    });
+
+    afterEach(async () => {
+        await browser.deleteCookies();
+    });
+
+    it('moves a minimized selected cell down', async () => {
+        const testCase = testCases.TEST_CASE1;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+
+        const cell = await waitForCellWithTitle(narrativeContainer, testCase.cellIndex, testCase.title);
+
+        // Find and click the move-down button
+        const downButton = await cell.$('[data-test="cell-move-down"]');
+        await clickWhenReady(downButton);
+        await waitForCellWithTitle(narrativeContainer, testCase.cellIndex + 1, testCase.title);
+    });
+
+    it('moves a minimized unselected cell down', async () => {
+        const testCase = testCases.TEST_CASE2;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+
+        const cell = await waitForCellWithTitle(narrativeContainer, testCase.cellIndex, testCase.title);
+
+        // Find and click the move-down button
+        const downButton = await cell.$('[data-test="cell-move-down"]');
+        await clickWhenReady(downButton);
+        await waitForCellWithTitle(narrativeContainer, testCase.cellIndex + 1, testCase.title);
+    });
+
+    it('moves a minimized unselected cell up', async () => {
+        const testCase = testCases.TEST_CASE3;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+
+        const cell = await waitForCellWithTitle(narrativeContainer, testCase.cellIndex, testCase.title);
+
+        // Find and click the move-ups button
+        const upButton = await cell.$('[data-test="cell-move-up"]');
+        await clickWhenReady(upButton);
+        await waitForCellWithTitle(narrativeContainer, testCase.cellIndex - 1, testCase.title);
+    });
+
+     // select cell
+    it('selects a minimized cell', async () => {
+        const testCase = testCases.TEST_CASE4;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
+    });
+
+    // select cell and move down
+    it('selects a minimized cell and moves it down', async () => {
+        const testCase = testCases.TEST_CASE4;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        const cell = await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
+        const downButton = await cell.$('[data-test="cell-move-down"]');
+        await clickWhenReady(downButton);
+        await waitForCellWithTitle(narrativeContainer, testCase.cellIndex + 1, testCase.title);
+    });
+
+    // select cell and move up
+    it('selects a minimized cell and moves it up', async () => {
+        const testCase = testCases.TEST_CASE4;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        const cell = await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
+        const upButton = await cell.$('[data-test="cell-move-up"]');
+        await clickWhenReady(upButton);
+        await waitForCellWithTitle(narrativeContainer, testCase.cellIndex - 1, testCase.title);
+    });
+
+    // Everything above, but cells are expanded.
+
+    it('moves an expanded unselected cell down', async () => {
+        const testCase = testCases.TEST_CASE5;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+
+        const cell = await waitForCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
+
+        // Find and click the move-down button
+        const downButton = await cell.$('[data-test="cell-move-down"]');
+        await clickWhenReady(downButton);
+        await waitForCellWithBody(narrativeContainer, testCase.cellIndex + 1, testCase.body);
+    });
+
+    it('moves an expanded unselected cell up', async () => {
+        const testCase = testCases.TEST_CASE5;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+
+        const cell = await waitForCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
+
+        // Find and click the move-down button
+        const button = await cell.$('[data-test="cell-move-up"]');
+        await clickWhenReady(button);
+        await waitForCellWithBody(narrativeContainer, testCase.cellIndex - 1, testCase.body);
+    });
+
+    it('selects an expanded cell', async () => {
+        const testCase = testCases.TEST_CASE5;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
+    });
+
+    // select cell and move down
+    it('selects an expanded cell and moves it down', async () => {
+        const testCase = testCases.TEST_CASE5;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        const cell = await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
+        const downButton = await cell.$('[data-test="cell-move-down"]');
+        await clickWhenReady(downButton);
+        await waitForCellWithBody(narrativeContainer, testCase.cellIndex + 1, testCase.body);
+    });
+
+    // select cell and move up
+    it('selects an expanded cell and moves it up', async () => {
+        const testCase = testCases.TEST_CASE5;
+        await login();
+        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        const cell = await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
+        const upButton = await cell.$('[data-test="cell-move-up"]');
+        await clickWhenReady(upButton);
+        await waitForCellWithBody(narrativeContainer, testCase.cellIndex - 1, testCase.body);
+    });
+});
diff --git a/test/integration/wdioUtils.js b/test/integration/wdioUtils.js
index 1fc8ff2f71..1c07157d55 100644
--- a/test/integration/wdioUtils.js
+++ b/test/integration/wdioUtils.js
@@ -93,13 +93,15 @@ async function openNarrative(workspaceId) {
 
     await clickWhenReady(loginButton);
 
-    const userLabelElement = await $('[data-element="user-label"]');
+    const realnameElement = await $('[data-element="realname"]');
+    const usernameElement = await $('[data-element="username"]');
     await browser.waitUntil(async () => {
-        const userLabelText = await userLabelElement.getText();
-        return (userLabelText && userLabelText.length > 0);
+        const text = await realnameElement.getText();
+        return (text && text.length > 0);
     });
-    const text = await userLabelElement.getText();
-    console.warn(`Logged in as user ${text}`);
+    const realname = await realnameElement.getText();
+    const username = await usernameElement.getText();
+    console.warn(`Signed in as user "${realname}" (${username})`);
     await loginButton.click();
     
     // Ensure narrative notebook has displayed
@@ -110,6 +112,7 @@ async function openNarrative(workspaceId) {
         timeout,
         timeoutMsg: `Timeout after waiting ${timeout}ms for narrative to appear`
     });
+    return container;
 }
 
 module.exports = {

From 6aad8e9d72f9c03806284d3ba19b09450e2fccd3 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 14 Jan 2021 10:10:15 -0800
Subject: [PATCH 02/42] add more test doc

---
 .../specs/kbaseCellToolbarMenu_test.js           | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index 5e656c2ed6..e2c23ff7a7 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -2,13 +2,21 @@
 /* eslint {strict: ['error', 'global']} */
 'use strict';
 
-const {login, openNarrative, sendString, clickWhenReady} = require('../wdioUtils.js');
+const {login, openNarrative, clickWhenReady} = require('../wdioUtils.js');
 
 /*
 Notes:
 
-The test narrative has 4 markdown cells, each collapsed. The initial collapsed
-state makes some tests easier, because they all have a title.
+The test narrative has 5 markdown cells. The first cell has summary text, the remaining 4 contain the text "Cell #".
+The first three cells are collapsed, the last two are expanded.
+
+Tests currently cover common cases of cell movement; additional cases can be added, e.g. try to move 
+past the end, or before the beginning, try moving the same cell multiple times, inspect the state
+of all cells after a movement.
+
+This test suite could be expanded to cover all usage of the cell toolbar (kbaseCellToolbarMenu.js), or they
+could be in separate files.
+
 */
 
 const testData = {
@@ -109,8 +117,6 @@ function mergeObjects(listOfObjects) {
     return base;
 }
 
-
-
 async function waitForCell(notebookContainer, cellIndex){
     return await browser.waitUntil(async () => {
         const cell = await notebookContainer.$(`.cell:nth-child(${cellIndex})`);

From 632318dc5d0775584ef639bbb733a0e67059bb0a Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 14 Jan 2021 10:28:52 -0800
Subject: [PATCH 03/42] fix code quality issue

---
 test/integration/specs/kbaseCellToolbarMenu_test.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index e2c23ff7a7..493baf6035 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -150,8 +150,10 @@ async function selectCell(container, cellIndex, title) {
 
     // Make sure not selected.
     // We do this by inspecting the border.
-    const borderStyle = await cell.getCSSProperty('border');
-    expect(borderStyle.value).toEqual(testData.common.unselectedBorder);
+    await browser.waitUntil(async () => {
+        const borderStyle = await cell.getCSSProperty('border');
+        return borderStyle.value === testData.common.unselectedBorder;
+    });
 
     // Click on title area to select cell.
     const titleArea = await cell.$('.title-container');
@@ -170,8 +172,11 @@ async function selectCellWithBody(container, cellIndex, body) {
 
     // Make sure not selected.
     // We do this by inspecting the border.
-    const borderStyle = await cell.getCSSProperty('border');
-    expect(borderStyle.value).toEqual(testData.common.unselectedBorder);
+    await browser.waitUntil(async () => {
+        const borderStyle = await cell.getCSSProperty('border');
+        return borderStyle.value === testData.common.unselectedBorder;
+    });
+
 
     // Click on title area to select cell.
     const bodyArea = await cell.$('.text_cell_render.rendered_html');

From a4a9a8338c1c04eb8d00634f90217ae874cddef7 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 14 Jan 2021 10:47:05 -0800
Subject: [PATCH 04/42] Address github code quality alerts

---
 .../static/kbase/custom/custom.css            | 26 ++++++++-----------
 .../specs/kbaseCellToolbarMenu_test.js        | 12 ++++-----
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/kbase-extension/static/kbase/custom/custom.css b/kbase-extension/static/kbase/custom/custom.css
index 96c0613b29..a28f6cc872 100644
--- a/kbase-extension/static/kbase/custom/custom.css
+++ b/kbase-extension/static/kbase/custom/custom.css
@@ -25,7 +25,7 @@ CSS should go in /kbase-extension/static/kbase/css/kbaseNarrative.css
 
 /* disable the standard notebook, bottom spacer */
 
-#notebook > .end_space {
+#notebook>.end_space {
   min-height: 0;
   height: 0;
 }
@@ -195,11 +195,11 @@ div#notebook {
   overflow: visible;
 }
 
-.notebook_app .celltoolbar > .button_container {
+.notebook_app .celltoolbar>.button_container {
   flex: 0 auto;
 }
 
-.notebook_app .celltoolbar > .button_container:nth-child(1) {
+.notebook_app .celltoolbar>.button_container:nth-child(1) {
   flex: auto;
 }
 
@@ -303,7 +303,7 @@ div#notebook {
   color: #d84315;
 }
 
-.cell > .inner_cell > .ctb_hideshow {
+.cell>.inner_cell>.ctb_hideshow {
   display: block;
 }
 
@@ -316,28 +316,24 @@ div#notebook {
 }
 
 .cell.unselected .btn-default:hover {
-    color: #000;
-  }
+  color: #000;
+}
 
 .cell.unselected .kb-cell-toolbar .title-container {
   opacity: 0.5;
 }
 
 .btn.btn-default.kb-btn-expander.-minimized {
-  color: rgba(255,137,0,1);
+  color: rgba(255, 137, 0, 1);
 }
 
 .cell.unselected .kb-btn-expander.-minimized {
-  color: rgba(255,137,0, 0.5);
+  color: rgba(255, 137, 0, 0.5);
 }
 
 .cell.unselected .kb-btn-expander.-minimized:hover {
-    color: rgba(255,137,0, 1);
-  }
-
-/* .cell.unselected .kb-cell-toolbar .buttons-container {
-  opacity: 0.2;
-} */
+  color: rgba(255, 137, 0, 1);
+}
 
 .kb-btn-icon {
   display: inline-block;
@@ -385,4 +381,4 @@ div.code_cell div.input_prompt {
 .run_this_cell {
   padding: 0 !important;
   width: 0 !important;
-}
+}
\ No newline at end of file
diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index 493baf6035..01e8379629 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -27,23 +27,23 @@ const testData = {
     all: {
         TEST_CASE1: {
             cellIndex: 1,
-            title: "Narrative Cell Toolbar Testing"
+            title: 'Narrative Cell Toolbar Testing'
         },
         TEST_CASE2: {
             cellIndex: 2,
-            title: "Cell 1"
+            title: 'Cell 1'
         },
         TEST_CASE3: {
             cellIndex: 3,
-            title: "Cell 2"
+            title: 'Cell 2'
         },
         TEST_CASE4: {
             cellIndex: 3,
-            title: "Cell 2"
+            title: 'Cell 2'
         },
         TEST_CASE5: {
             cellIndex: 4,
-            body: "Cell 3"
+            body: 'Cell 3'
         }
     },
     ci: {
@@ -239,7 +239,7 @@ describe('Test kbaseCellToolbarMenu', () => {
         await waitForCellWithTitle(narrativeContainer, testCase.cellIndex - 1, testCase.title);
     });
 
-     // select cell
+    // select cell
     it('selects a minimized cell', async () => {
         const testCase = testCases.TEST_CASE4;
         await login();

From 5ae04bc0c27f62291aa796d2836a3b4b531b09e3 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 14 Jan 2021 12:33:16 -0800
Subject: [PATCH 05/42] reformat to make codacy happy

---
 .../static/kbase/custom/custom.css            | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/kbase-extension/static/kbase/custom/custom.css b/kbase-extension/static/kbase/custom/custom.css
index a28f6cc872..97b7866d20 100644
--- a/kbase-extension/static/kbase/custom/custom.css
+++ b/kbase-extension/static/kbase/custom/custom.css
@@ -5,9 +5,15 @@ CSS should go in /kbase-extension/static/kbase/css/kbaseNarrative.css
 (or the specific css file if available)
 */
 @font-face {
-  font-family: 'Glyphicons Halflings';
-  src: url('../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot');
-  src: url('../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+  font-family: "Glyphicons Halflings";
+  src: url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot");
+  src: url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot?#iefix")
+      format("embedded-opentype"),
+    url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2") format("woff2"),
+    url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff") format("woff"),
+    url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf") format("truetype"),
+    url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular")
+      format("svg");
 }
 
 .select2-container--default .select2-results__option--highlighted[aria-selected] {
@@ -25,7 +31,7 @@ CSS should go in /kbase-extension/static/kbase/css/kbaseNarrative.css
 
 /* disable the standard notebook, bottom spacer */
 
-#notebook>.end_space {
+#notebook > .end_space {
   min-height: 0;
   height: 0;
 }
@@ -195,11 +201,11 @@ div#notebook {
   overflow: visible;
 }
 
-.notebook_app .celltoolbar>.button_container {
+.notebook_app .celltoolbar > .button_container {
   flex: 0 auto;
 }
 
-.notebook_app .celltoolbar>.button_container:nth-child(1) {
+.notebook_app .celltoolbar > .button_container:nth-child(1) {
   flex: auto;
 }
 
@@ -303,7 +309,7 @@ div#notebook {
   color: #d84315;
 }
 
-.cell>.inner_cell>.ctb_hideshow {
+.cell > .inner_cell > .ctb_hideshow {
   display: block;
 }
 
@@ -381,4 +387,4 @@ div.code_cell div.input_prompt {
 .run_this_cell {
   padding: 0 !important;
   width: 0 !important;
-}
\ No newline at end of file
+}

From f10799f6b88ee3a707fd4d01b5140eb665f7e20b Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 14 Jan 2021 13:33:01 -0800
Subject: [PATCH 06/42] more codacy / stylelint happiness

---
 kbase-extension/static/kbase/custom/custom.css      | 7 ++++---
 test/integration/specs/kbaseCellToolbarMenu_test.js | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kbase-extension/static/kbase/custom/custom.css b/kbase-extension/static/kbase/custom/custom.css
index 97b7866d20..de59079c5c 100644
--- a/kbase-extension/static/kbase/custom/custom.css
+++ b/kbase-extension/static/kbase/custom/custom.css
@@ -7,13 +7,14 @@ CSS should go in /kbase-extension/static/kbase/css/kbaseNarrative.css
 @font-face {
   font-family: "Glyphicons Halflings";
   src: url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot");
-  src: url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot?#iefix")
-      format("embedded-opentype"),
+  src: 
+    url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot?#iefix")
+    format("embedded-opentype"),
     url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2") format("woff2"),
     url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff") format("woff"),
     url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf") format("truetype"),
     url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular")
-      format("svg");
+    format("svg");
 }
 
 .select2-container--default .select2-results__option--highlighted[aria-selected] {
diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index 01e8379629..a92d45008a 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -1,4 +1,4 @@
-/*global describe, it, browser, expect, $, afterEach, beforeEach*/
+/*global describe, it, browser, expect, afterEach, beforeEach*/
 /* eslint {strict: ['error', 'global']} */
 'use strict';
 

From 9b6072551d60d75a02a5ec19ea9db0d526de8959 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 14 Jan 2021 13:38:26 -0800
Subject: [PATCH 07/42] more codacy spam

---
 kbase-extension/static/kbase/custom/custom.css      | 2 +-
 test/integration/specs/kbaseCellToolbarMenu_test.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kbase-extension/static/kbase/custom/custom.css b/kbase-extension/static/kbase/custom/custom.css
index de59079c5c..c88f0b0b16 100644
--- a/kbase-extension/static/kbase/custom/custom.css
+++ b/kbase-extension/static/kbase/custom/custom.css
@@ -7,7 +7,7 @@ CSS should go in /kbase-extension/static/kbase/css/kbaseNarrative.css
 @font-face {
   font-family: "Glyphicons Halflings";
   src: url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot");
-  src: 
+  src:
     url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot?#iefix")
     format("embedded-opentype"),
     url("../../ext_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2") format("woff2"),
diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index a92d45008a..d15cdffb2a 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -1,4 +1,4 @@
-/*global describe, it, browser, expect, afterEach, beforeEach*/
+/*global describe, it, browser, afterEach, beforeEach*/
 /* eslint {strict: ['error', 'global']} */
 'use strict';
 
@@ -122,7 +122,6 @@ async function waitForCell(notebookContainer, cellIndex){
         const cell = await notebookContainer.$(`.cell:nth-child(${cellIndex})`);
         return cell;
     });
-    // return await panel.$$('[role="table"][data-test-id="result"] > div > [role="row"]');
 }
 
 async function waitForCellWithTitle(container, cellIndex, title) {

From 2c7e7fab9f95869a384a4fdce5ca02ebe9d00339 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 21 Jan 2021 09:32:54 -0800
Subject: [PATCH 08/42] improve test case property naming (TEST_CASEX ->
 TEST_CASE_X); move login() into beforeEach()

---
 .../specs/kbaseCellToolbarMenu_test.js        | 74 +++++++++----------
 .../specs/kbaseNarrativeSidePublicTab_test.js | 39 +++++-----
 .../integration/specs/narrative_basic_test.js |  6 +-
 3 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index d15cdffb2a..cb2c9443d6 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -25,58 +25,58 @@ const testData = {
         selectedBorder: '1px 1px 1px 5px solid rgb(75, 184, 86)',
     },
     all: {
-        TEST_CASE1: {
+        TEST_CASE_1: {
             cellIndex: 1,
             title: 'Narrative Cell Toolbar Testing'
         },
-        TEST_CASE2: {
+        TEST_CASE_2: {
             cellIndex: 2,
             title: 'Cell 1'
         },
-        TEST_CASE3: {
+        TEST_CASE_3: {
             cellIndex: 3,
             title: 'Cell 2'
         },
-        TEST_CASE4: {
+        TEST_CASE_4: {
             cellIndex: 3,
             title: 'Cell 2'
         },
-        TEST_CASE5: {
+        TEST_CASE_5: {
             cellIndex: 4,
             body: 'Cell 3'
         }
     },
     ci: {
-        TEST_CASE1: {
+        TEST_CASE_1: {
             narrativeId: 58675,
         },
-        TEST_CASE2: {
+        TEST_CASE_2: {
             narrativeId: 58675,
         },
-        TEST_CASE3: {
+        TEST_CASE_3: {
             narrativeId: 58675,
         },
-        TEST_CASE4: {
+        TEST_CASE_4: {
             narrativeId: 58675,
         },
-        TEST_CASE5: {
+        TEST_CASE_5: {
             narrativeId: 58675,
         }
     },
     'narrative-dev': {
-        TEST_CASE1: {
+        TEST_CASE_1: {
             narrativeId: 80970,
         },
-        TEST_CASE2: {
+        TEST_CASE_2: {
             narrativeId: 80970,
         },
-        TEST_CASE3: {
+        TEST_CASE_3: {
             narrativeId: 80970,
         },
-        TEST_CASE4: {
+        TEST_CASE_4: {
             narrativeId: 80970,
         },
-        TEST_CASE5: {
+        TEST_CASE_5: {
             narrativeId: 80970,
         }
     }
@@ -193,6 +193,7 @@ describe('Test kbaseCellToolbarMenu', () => {
     beforeEach(async () => {
         await browser.setTimeout({ 'implicit': 30000 });
         await browser.reloadSession();
+        await login();
     });
 
     afterEach(async () => {
@@ -200,8 +201,7 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('moves a minimized selected cell down', async () => {
-        const testCase = testCases.TEST_CASE1;
-        await login();
+        const testCase = testCases.TEST_CASE_1;
         const narrativeContainer = await openNarrative(testCase.narrativeId);
 
         const cell = await waitForCellWithTitle(narrativeContainer, testCase.cellIndex, testCase.title);
@@ -213,8 +213,8 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('moves a minimized unselected cell down', async () => {
-        const testCase = testCases.TEST_CASE2;
-        await login();
+        const testCase = testCases.TEST_CASE_2;
+
         const narrativeContainer = await openNarrative(testCase.narrativeId);
 
         const cell = await waitForCellWithTitle(narrativeContainer, testCase.cellIndex, testCase.title);
@@ -226,8 +226,8 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('moves a minimized unselected cell up', async () => {
-        const testCase = testCases.TEST_CASE3;
-        await login();
+        const testCase = testCases.TEST_CASE_3;
+
         const narrativeContainer = await openNarrative(testCase.narrativeId);
 
         const cell = await waitForCellWithTitle(narrativeContainer, testCase.cellIndex, testCase.title);
@@ -240,16 +240,16 @@ describe('Test kbaseCellToolbarMenu', () => {
 
     // select cell
     it('selects a minimized cell', async () => {
-        const testCase = testCases.TEST_CASE4;
-        await login();
+        const testCase = testCases.TEST_CASE_4;
+
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
     });
 
     // select cell and move down
     it('selects a minimized cell and moves it down', async () => {
-        const testCase = testCases.TEST_CASE4;
-        await login();
+        const testCase = testCases.TEST_CASE_4;
+
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         const cell = await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
         const downButton = await cell.$('[data-test="cell-move-down"]');
@@ -259,8 +259,8 @@ describe('Test kbaseCellToolbarMenu', () => {
 
     // select cell and move up
     it('selects a minimized cell and moves it up', async () => {
-        const testCase = testCases.TEST_CASE4;
-        await login();
+        const testCase = testCases.TEST_CASE_4;
+
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         const cell = await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
         const upButton = await cell.$('[data-test="cell-move-up"]');
@@ -271,8 +271,8 @@ describe('Test kbaseCellToolbarMenu', () => {
     // Everything above, but cells are expanded.
 
     it('moves an expanded unselected cell down', async () => {
-        const testCase = testCases.TEST_CASE5;
-        await login();
+        const testCase = testCases.TEST_CASE_5;
+
         const narrativeContainer = await openNarrative(testCase.narrativeId);
 
         const cell = await waitForCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
@@ -284,8 +284,8 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('moves an expanded unselected cell up', async () => {
-        const testCase = testCases.TEST_CASE5;
-        await login();
+        const testCase = testCases.TEST_CASE_5;
+
         const narrativeContainer = await openNarrative(testCase.narrativeId);
 
         const cell = await waitForCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
@@ -297,16 +297,16 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('selects an expanded cell', async () => {
-        const testCase = testCases.TEST_CASE5;
-        await login();
+        const testCase = testCases.TEST_CASE_5;
+
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
     });
 
     // select cell and move down
     it('selects an expanded cell and moves it down', async () => {
-        const testCase = testCases.TEST_CASE5;
-        await login();
+        const testCase = testCases.TEST_CASE_5;
+
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         const cell = await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
         const downButton = await cell.$('[data-test="cell-move-down"]');
@@ -316,8 +316,8 @@ describe('Test kbaseCellToolbarMenu', () => {
 
     // select cell and move up
     it('selects an expanded cell and moves it up', async () => {
-        const testCase = testCases.TEST_CASE5;
-        await login();
+        const testCase = testCases.TEST_CASE_5;
+
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         const cell = await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
         const upButton = await cell.$('[data-test="cell-move-up"]');
diff --git a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
index 85227c64f9..802f4dc44b 100644
--- a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
+++ b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
@@ -11,7 +11,7 @@ const {login, openNarrative, sendString, clickWhenReady} = require('../wdioUtils
 // Note that narrativetest is not yet set up in narrative-dev/prod.
 const allTestCases = {
     ci: {
-        TEST_CASE1: {
+        TEST_CASE_1: {
             narrativeId: 53983,
             row: 4,
             name: 'Acetobacter ascendens',
@@ -43,7 +43,7 @@ const allTestCases = {
                 }
             ]
         },
-        TEST_CASE2: {
+        TEST_CASE_2: {
             narrativeId: 53983,
             row: 10,
             scrollTo: true,
@@ -76,7 +76,7 @@ const allTestCases = {
                 }
             ]
         },
-        TEST_CASE3: {
+        TEST_CASE_3: {
             narrativeId: 53983,
             row: 1,
             scrollTo: false,
@@ -111,12 +111,12 @@ const allTestCases = {
                 }
             ]
         },
-        TEST_CASE4: {
+        TEST_CASE_4: {
             narrativeId: 53983,
             searchFor: 'foobar',
             foundCount: 'None'
         },
-        TEST_CASE5: {
+        TEST_CASE_5: {
             narrativeId: 53983,
             row: 30,
             scrollTo: true,
@@ -154,7 +154,7 @@ const allTestCases = {
         }
     },
     'narrative-dev':  {
-        TEST_CASE1: {
+        TEST_CASE_1: {
             narrativeId: 78050,
             row: 3,
             name: 'Absiella sp. AM09-45',
@@ -186,7 +186,7 @@ const allTestCases = {
                 }
             ]
         },
-        TEST_CASE2: {
+        TEST_CASE_2: {
             narrativeId: 78050,
             row: 10,
             scrollTo: true,
@@ -219,7 +219,7 @@ const allTestCases = {
                 }
             ]
         },
-        TEST_CASE3: {
+        TEST_CASE_3: {
             narrativeId: 78050,
             row: 1,
             scrollTo: false,
@@ -254,12 +254,12 @@ const allTestCases = {
                 }
             ]
         },
-        TEST_CASE4: {
+        TEST_CASE_4: {
             narrativeId: 78050,
             searchFor: 'foobar',
             foundCount: 'None'
         },
-        TEST_CASE5: {
+        TEST_CASE_5: {
             narrativeId: 78050,
             row: 30,
             scrollTo: true,
@@ -352,6 +352,7 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     beforeEach(async () => {
         await browser.setTimeout({ 'implicit': 30000 });
         await browser.reloadSession();
+        await login();
     });
 
     afterEach(async () => {
@@ -359,8 +360,8 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results', async () => {
-        const testCase = testCases.TEST_CASE1;
-        await login();
+        const testCase = testCases.TEST_CASE_1;
+        
         await openNarrative(testCase.narrativeId);
 
         const publicPanel = await openPublicData();
@@ -385,8 +386,7 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
-        const testCase = testCases.TEST_CASE2;
-        await login();
+        const testCase = testCases.TEST_CASE_2;
         await openNarrative(testCase.narrativeId);
 
         const publicPanel = await openPublicData();
@@ -411,9 +411,8 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, searches for a term, should find an expected row', async () => {
-        const testCase = testCases.TEST_CASE3;
+        const testCase = testCases.TEST_CASE_3;
 
-        await login();
         await openNarrative(testCase.narrativeId);
 
         const publicPanel = await openPublicData();
@@ -452,8 +451,8 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, searches for a term which should not be found', async () => {
-        await login();
-        const testCase = testCases.TEST_CASE4;
+        const testCase = testCases.TEST_CASE_4;
+
         await openNarrative(testCase.narrativeId);
 
         const publicPanel = await openPublicData();
@@ -480,8 +479,8 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
-        const testCase = testCases.TEST_CASE5;
-        await login();
+        const testCase = testCases.TEST_CASE_5;
+
         await openNarrative(testCase.narrativeId);
 
         // Open the data slideout
diff --git a/test/integration/specs/narrative_basic_test.js b/test/integration/specs/narrative_basic_test.js
index cb3cf96c4e..0dc67bbaae 100644
--- a/test/integration/specs/narrative_basic_test.js
+++ b/test/integration/specs/narrative_basic_test.js
@@ -5,13 +5,13 @@ const env = process.env.ENV || 'ci';
 
 const allTestCases = {
     ci: {
-        CASE1: {
+        CASE_1: {
             narrativeId: 31932
         }
         
     },
     'narrative-dev': {
-        CASE1: {
+        CASE_1: {
             narrativeId: 78050
         }
     }
@@ -25,7 +25,7 @@ describe('Narrative tree page with login', () => {
     beforeEach(async () => await Utils.login());
 
     it('opens a narrative', async () => {
-        await browser.url(Utils.makeURL(`narrative/${testCases.CASE1.narrativeId}`));
+        await browser.url(Utils.makeURL(`narrative/${testCases.CASE_1.narrativeId}`));
         const loadingBlocker = await $('#kb-loading-blocker');
         const loadingText = await loadingBlocker.getText();
         expect(loadingText).toContain('Connecting to KBase services...');

From f6e3d09d4a8d8d7234b746f33760b291d30c62cc Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 21 Jan 2021 13:35:28 -0800
Subject: [PATCH 09/42] refactor test data to support case and env defaults

---
 .../specs/kbaseCellToolbarMenu_test.js        | 77 +++++--------------
 .../specs/kbaseNarrativeSidePublicTab_test.js | 43 ++++++-----
 test/integration/wdioUtils.js                 | 69 ++++++++++++++++-
 3 files changed, 112 insertions(+), 77 deletions(-)

diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index cb2c9443d6..6dd23fe2d5 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -2,7 +2,7 @@
 /* eslint {strict: ['error', 'global']} */
 'use strict';
 
-const {login, openNarrative, clickWhenReady} = require('../wdioUtils.js');
+const {login, openNarrative, clickWhenReady, getCaseData} = require('../wdioUtils.js');
 
 /*
 Notes:
@@ -24,7 +24,7 @@ const testData = {
         unselectedBorder: '1px 1px 1px 5px solid rgb(204, 204, 204)',
         selectedBorder: '1px 1px 1px 5px solid rgb(75, 184, 86)',
     },
-    all: {
+    cases: {
         TEST_CASE_1: {
             cellIndex: 1,
             title: 'Narrative Cell Toolbar Testing'
@@ -47,76 +47,37 @@ const testData = {
         }
     },
     ci: {
+        defaults: {
+            narrativeId: 58675
+        },
         TEST_CASE_1: {
-            narrativeId: 58675,
         },
         TEST_CASE_2: {
-            narrativeId: 58675,
         },
         TEST_CASE_3: {
-            narrativeId: 58675,
         },
         TEST_CASE_4: {
-            narrativeId: 58675,
         },
         TEST_CASE_5: {
-            narrativeId: 58675,
         }
     },
     'narrative-dev': {
+        defaults: {
+            narrativeId: 80970
+        },
         TEST_CASE_1: {
-            narrativeId: 80970,
         },
         TEST_CASE_2: {
-            narrativeId: 80970,
         },
         TEST_CASE_3: {
-            narrativeId: 80970,
         },
         TEST_CASE_4: {
-            narrativeId: 80970,
         },
         TEST_CASE_5: {
-            narrativeId: 80970,
         }
     }
 };
 
-const testCases = mergeObjects([testData[browser.config.testParams.ENV], testData.all]);
-
-function mergeObjects(listOfObjects) {
-    const simpleObjectPrototype = Object.getPrototypeOf({});
-
-    function isSimpleObject(obj) {
-        return Object.getPrototypeOf(obj) === simpleObjectPrototype;
-    }
-
-    function merge(obj1, obj2, keyStack) {
-        Object.keys(obj2).forEach(function (key) {
-            const obj1Value = obj1[key];
-            const obj2Value = obj2[key];
-            const obj1Type = typeof obj1Value;
-            // var obj2Type = typeof obj2Value;
-            if (obj1Type === 'undefined') {
-                obj1[key] = obj2[key];
-            } else if (isSimpleObject(obj1Value) && isSimpleObject(obj2Value)) {
-                keyStack.push(key);
-                merge(obj1Value, obj2Value, keyStack);
-                keyStack.pop();
-            } else {
-                console.error('UNMERGABLE', obj1Type, obj1Value);
-                throw new Error('Unmergable at ' + keyStack.join('.') + ':' + key);
-            }
-        });
-    }
-
-    const base = JSON.parse(JSON.stringify(listOfObjects[0]));
-    for (let i = 1; i < listOfObjects.length; i += 1) {
-        merge(base, listOfObjects[i], []);
-    }
-    return base;
-}
-
 async function waitForCell(notebookContainer, cellIndex){
     return await browser.waitUntil(async () => {
         const cell = await notebookContainer.$(`.cell:nth-child(${cellIndex})`);
@@ -201,7 +162,7 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('moves a minimized selected cell down', async () => {
-        const testCase = testCases.TEST_CASE_1;
+        const testCase = getCaseData(testData, 'TEST_CASE_1');
         const narrativeContainer = await openNarrative(testCase.narrativeId);
 
         const cell = await waitForCellWithTitle(narrativeContainer, testCase.cellIndex, testCase.title);
@@ -213,7 +174,7 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('moves a minimized unselected cell down', async () => {
-        const testCase = testCases.TEST_CASE_2;
+        const testCase = getCaseData(testData, 'TEST_CASE_2');
 
         const narrativeContainer = await openNarrative(testCase.narrativeId);
 
@@ -226,7 +187,7 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('moves a minimized unselected cell up', async () => {
-        const testCase = testCases.TEST_CASE_3;
+        const testCase = getCaseData(testData, 'TEST_CASE_3');
 
         const narrativeContainer = await openNarrative(testCase.narrativeId);
 
@@ -240,7 +201,7 @@ describe('Test kbaseCellToolbarMenu', () => {
 
     // select cell
     it('selects a minimized cell', async () => {
-        const testCase = testCases.TEST_CASE_4;
+        const testCase = getCaseData(testData, 'TEST_CASE_4');
 
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
@@ -248,7 +209,7 @@ describe('Test kbaseCellToolbarMenu', () => {
 
     // select cell and move down
     it('selects a minimized cell and moves it down', async () => {
-        const testCase = testCases.TEST_CASE_4;
+        const testCase = getCaseData(testData, 'TEST_CASE_4');
 
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         const cell = await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
@@ -259,7 +220,7 @@ describe('Test kbaseCellToolbarMenu', () => {
 
     // select cell and move up
     it('selects a minimized cell and moves it up', async () => {
-        const testCase = testCases.TEST_CASE_4;
+        const testCase = getCaseData(testData, 'TEST_CASE_4');
 
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         const cell = await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
@@ -271,7 +232,7 @@ describe('Test kbaseCellToolbarMenu', () => {
     // Everything above, but cells are expanded.
 
     it('moves an expanded unselected cell down', async () => {
-        const testCase = testCases.TEST_CASE_5;
+        const testCase = getCaseData(testData, 'TEST_CASE_5');
 
         const narrativeContainer = await openNarrative(testCase.narrativeId);
 
@@ -284,7 +245,7 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('moves an expanded unselected cell up', async () => {
-        const testCase = testCases.TEST_CASE_5;
+        const testCase = getCaseData(testData, 'TEST_CASE_5');
 
         const narrativeContainer = await openNarrative(testCase.narrativeId);
 
@@ -297,7 +258,7 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('selects an expanded cell', async () => {
-        const testCase = testCases.TEST_CASE_5;
+        const testCase = getCaseData(testData, 'TEST_CASE_5');
 
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
@@ -305,7 +266,7 @@ describe('Test kbaseCellToolbarMenu', () => {
 
     // select cell and move down
     it('selects an expanded cell and moves it down', async () => {
-        const testCase = testCases.TEST_CASE_5;
+        const testCase = getCaseData(testData, 'TEST_CASE_5');
 
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         const cell = await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
@@ -316,7 +277,7 @@ describe('Test kbaseCellToolbarMenu', () => {
 
     // select cell and move up
     it('selects an expanded cell and moves it up', async () => {
-        const testCase = testCases.TEST_CASE_5;
+        const testCase = getCaseData(testData, 'TEST_CASE_5');
 
         const narrativeContainer = await openNarrative(testCase.narrativeId);
         const cell = await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
diff --git a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
index 802f4dc44b..0172f168a1 100644
--- a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
+++ b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
@@ -2,17 +2,26 @@
 /* eslint {strict: ['error', 'global']} */
 'use strict';
 
-const {login, openNarrative, sendString, clickWhenReady} = require('../wdioUtils.js');
+const {login, openNarrative, sendString, clickWhenReady, getCaseData} = require('../wdioUtils.js');
 
 // Ideally the test data should be the same, except for narrative id, in each env.
 // But currently CI and prod are indexed differently.
 
 // Note that the narrativeIds used below must be owned or shared with full rights (at least edit) with the narrativetest user.
 // Note that narrativetest is not yet set up in narrative-dev/prod.
-const allTestCases = {
+const testData = {
+    cases: {
+        TEST_CASE_1: {},
+        TEST_CASE_2: {},
+        TEST_CASE_3: {},
+        TEST_CASE_4: {},
+        TEST_CASE_5: {}
+    },
     ci: {
-        TEST_CASE_1: {
+        defaults: {
             narrativeId: 53983,
+        },
+        TEST_CASE_1: {
             row: 4,
             name: 'Acetobacter ascendens',
             metadata: [
@@ -44,7 +53,6 @@ const allTestCases = {
             ]
         },
         TEST_CASE_2: {
-            narrativeId: 53983,
             row: 10,
             scrollTo: true,
             name: 'Acidaminococcus fermentans',
@@ -77,7 +85,6 @@ const allTestCases = {
             ]
         },
         TEST_CASE_3: {
-            narrativeId: 53983,
             row: 1,
             scrollTo: false,
             searchFor: 'prochlorococcus',
@@ -112,12 +119,10 @@ const allTestCases = {
             ]
         },
         TEST_CASE_4: {
-            narrativeId: 53983,
             searchFor: 'foobar',
             foundCount: 'None'
         },
         TEST_CASE_5: {
-            narrativeId: 53983,
             row: 30,
             scrollTo: true,
             scrolls: [
@@ -154,8 +159,10 @@ const allTestCases = {
         }
     },
     'narrative-dev':  {
+        defaults: {
+            narrativeId: 78050
+        },
         TEST_CASE_1: {
-            narrativeId: 78050,
             row: 3,
             name: 'Absiella sp. AM09-45',
             metadata: [
@@ -187,7 +194,6 @@ const allTestCases = {
             ]
         },
         TEST_CASE_2: {
-            narrativeId: 78050,
             row: 10,
             scrollTo: true,
             name: 'Abyssicoccus albus',
@@ -220,7 +226,6 @@ const allTestCases = {
             ]
         },
         TEST_CASE_3: {
-            narrativeId: 78050,
             row: 1,
             scrollTo: false,
             searchFor: 'prochlorococcus',
@@ -255,12 +260,10 @@ const allTestCases = {
             ]
         },
         TEST_CASE_4: {
-            narrativeId: 78050,
             searchFor: 'foobar',
             foundCount: 'None'
         },
         TEST_CASE_5: {
-            narrativeId: 78050,
             row: 30,
             scrollTo: true,
             scrolls: [
@@ -298,7 +301,10 @@ const allTestCases = {
     }
 };
 
-const testCases = allTestCases[browser.config.testParams.ENV];
+// const testCases = allTestCases[browser.config.testParams.ENV];
+
+// const testCases = getConfig(testData, browser.config.testParams.ENV);
+
 
 async function testField({container, id, label, value}) {
     const lineageLabel = await container.$(`[role="row"][data-test-id="${id}"] [data-test-id="label"]`);
@@ -360,7 +366,7 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results', async () => {
-        const testCase = testCases.TEST_CASE_1;
+        const testCase = getCaseData(testData, 'TEST_CASE_1');
         
         await openNarrative(testCase.narrativeId);
 
@@ -386,7 +392,8 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
-        const testCase = testCases.TEST_CASE_2;
+        const testCase = getCaseData(testData, 'TEST_CASE_2');
+
         await openNarrative(testCase.narrativeId);
 
         const publicPanel = await openPublicData();
@@ -411,7 +418,7 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, searches for a term, should find an expected row', async () => {
-        const testCase = testCases.TEST_CASE_3;
+        const testCase = getCaseData(testData, 'TEST_CASE_3');
 
         await openNarrative(testCase.narrativeId);
 
@@ -451,7 +458,7 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, searches for a term which should not be found', async () => {
-        const testCase = testCases.TEST_CASE_4;
+        const testCase = getCaseData(testData, 'TEST_CASE_4');
 
         await openNarrative(testCase.narrativeId);
 
@@ -479,7 +486,7 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
-        const testCase = testCases.TEST_CASE_5;
+        const testCase = getCaseData(testData, 'TEST_CASE_5');
 
         await openNarrative(testCase.narrativeId);
 
diff --git a/test/integration/wdioUtils.js b/test/integration/wdioUtils.js
index 1c07157d55..ef86eeabd4 100644
--- a/test/integration/wdioUtils.js
+++ b/test/integration/wdioUtils.js
@@ -115,10 +115,77 @@ async function openNarrative(workspaceId) {
     return container;
 }
 
+function mergeObjects(listOfObjects) {
+    const simpleObjectPrototype = Object.getPrototypeOf({});
+
+    function isSimpleObject(obj) {
+        if (typeof obj !== 'object') {
+            return false;
+        }
+        return Object.getPrototypeOf(obj) === simpleObjectPrototype;
+    }
+
+    function merge(targetObj, sourceObj) {
+        if (!isSimpleObject(targetObj)) {
+            throw new Error(`Can only merge simple objects, target is a "${typeof targetObj}"`);
+        } 
+        
+        // Copy target, so we don't stomp over original objects.
+        // Note that the source object is not copied, since we don't care if
+        // there is object sharing in the result, we just want to ensure that 
+        // we don't overwrite properties of shared objects.
+        targetObj = JSON.parse(JSON.stringify(targetObj));
+
+        Object.keys(sourceObj).forEach(function (key) {
+            if (isSimpleObject(targetObj[key]) && isSimpleObject(sourceObj[key])) {
+                targetObj[key] = merge(targetObj[key], sourceObj[key]);
+            } else {
+                targetObj[key] = sourceObj[key];
+            }
+        });
+        
+        return targetObj;
+    }
+
+    const objectsToMerge = listOfObjects.map((obj, index) => {
+        if (!isSimpleObject(obj)) {
+            throw new Error(`Can only merge simple objects, object #${index} is a "${typeof obj}"`);
+        } else {
+            return JSON.parse(JSON.stringify(obj));
+        }
+    });
+    let merged = objectsToMerge[0];
+    for (let i = 1; i < objectsToMerge.length; i += 1) {
+        merged = merge(merged, objectsToMerge[i]);
+    }
+    return merged;
+}
+
+function getCaseData(testData, caseLabel) {
+    const env = browser.config.testParams.ENV;
+
+    // Note, order is least specific to most specific, so that the more
+    // specific can override the least.
+
+    // Top level test cases provide defaults (non-env-specific) per-case
+    // test data.
+    const testCase = testData.cases[caseLabel];
+
+    // Each env can establish defaults (e.g. narrative id)
+    const envDefaults = testData[env].defaults;
+
+    // Each test case is defined per environment as well, as the 
+    // state of services will be different.
+    const envTestCase = testData[env][caseLabel];
+
+    return mergeObjects([testCase, envDefaults, envTestCase]);
+}
+
 module.exports = {
     login,
     makeURL,
     sendString,
     openNarrative,
-    clickWhenReady
+    clickWhenReady,
+    getCaseData
 };
\ No newline at end of file

From b63e27c5c21c35214862b4ecb13441a84407060d Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 21 Jan 2021 13:36:16 -0800
Subject: [PATCH 10/42] don't expose service key - could be handy to obscure in
 CI, but expose locally.

---
 test/integration/wdio.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/wdio.conf.js b/test/integration/wdio.conf.js
index 8f7728a9f1..e8d330e617 100644
--- a/test/integration/wdio.conf.js
+++ b/test/integration/wdio.conf.js
@@ -277,7 +277,7 @@ console.log('OS VERSION      : ' + testParams.OS_VERSION);
 console.log('HEADLESS        : ' + testParams.HEADLESS);
 console.log('TEST SERVICE    : ' + testParams.SERVICE);
 console.log('SERVICE USER    : ' + testParams.SERVICE_USER);
-console.log('SERVICE KEY     : ' + testParams.SERVICE_KEY);
+console.log('SERVICE KEY     : ' + (testParams.SERVICE_KEY ? 'set but hidden' : ''));
 console.log('-----------------');
 
 const wdioConfig = {

From 953964314d7f9064febfb6ab8bf997041ca1a40f Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 21 Jan 2021 14:45:21 -0800
Subject: [PATCH 11/42] use null, not empty string

---
 test/integration/wdio.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/wdio.conf.js b/test/integration/wdio.conf.js
index e8d330e617..a7cc60ad4b 100644
--- a/test/integration/wdio.conf.js
+++ b/test/integration/wdio.conf.js
@@ -277,7 +277,7 @@ console.log('OS VERSION      : ' + testParams.OS_VERSION);
 console.log('HEADLESS        : ' + testParams.HEADLESS);
 console.log('TEST SERVICE    : ' + testParams.SERVICE);
 console.log('SERVICE USER    : ' + testParams.SERVICE_USER);
-console.log('SERVICE KEY     : ' + (testParams.SERVICE_KEY ? 'set but hidden' : ''));
+console.log('SERVICE KEY     : ' + (testParams.SERVICE_KEY ? 'set but hidden' : null));
 console.log('-----------------');
 
 const wdioConfig = {

From da586464f8f4bd71345e388fc65a26190b7cb43e Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 21 Jan 2021 16:48:41 -0800
Subject: [PATCH 12/42] move some test utils into new NarrativeTesting class
 (and file), to compartmentalize usage of test data.

---
 test/integration/NarrativeTesting.js          | 217 ++++++++++++++++++
 .../specs/kbaseCellToolbarMenu_test.js        | 165 ++++---------
 .../specs/kbaseNarrativeSidePublicTab_test.js |  72 +++---
 test/integration/wdioUtils.js                 |  69 +-----
 4 files changed, 306 insertions(+), 217 deletions(-)
 create mode 100644 test/integration/NarrativeTesting.js

diff --git a/test/integration/NarrativeTesting.js b/test/integration/NarrativeTesting.js
new file mode 100644
index 0000000000..c8786292c8
--- /dev/null
+++ b/test/integration/NarrativeTesting.js
@@ -0,0 +1,217 @@
+/* eslint strict: ["error", "global"] */
+/*global browser, $*/
+'use strict';
+
+const {makeURL, login, sendString, clickWhenReady} = require('./wdioUtils');
+
+function mergeObjects(listOfObjects) {
+    const simpleObjectPrototype = Object.getPrototypeOf({});
+
+    function isSimpleObject(obj) {
+        if (typeof obj !== 'object') {
+            return false;
+        }
+        return Object.getPrototypeOf(obj) === simpleObjectPrototype;
+    }
+
+    function merge(targetObj, sourceObj) {
+        if (!isSimpleObject(targetObj)) {
+            throw new Error(`Can only merge simple objects, target is a "${typeof targetObj}"`);
+        } 
+        
+        // Copy target, so we don't stomp over original objects.
+        // Note that the source object is not copied, since we don't care if
+        // there is object sharing in the result, we just want to ensure that 
+        // we don't overwrite properties of shared objects.
+        targetObj = JSON.parse(JSON.stringify(targetObj));
+
+        Object.keys(sourceObj).forEach(function (key) {
+            if (isSimpleObject(targetObj[key]) && isSimpleObject(sourceObj[key])) {
+                targetObj[key] = merge(targetObj[key], sourceObj[key]);
+            } else {
+                targetObj[key] = sourceObj[key];
+            }
+        });
+        
+        return targetObj;
+    }
+
+    const objectsToMerge = listOfObjects.map((obj, index) => {
+        if (!isSimpleObject(obj)) {
+            throw new Error(`Can only merge simple objects, object #${index} is a "${typeof obj}"`);
+        } else {
+            return JSON.parse(JSON.stringify(obj));
+        }
+    });
+    let merged = objectsToMerge[0];
+    for (let i = 1; i < objectsToMerge.length; i += 1) {
+        merged = merge(merged, objectsToMerge[i]);
+    }
+    return merged;
+}
+
+class NarrativeTesting {
+    constructor({testData, caseLabel, timeout}) {
+        this.testData = testData;
+        this.caseLabel = caseLabel;
+        this.timeout = timeout;
+        this.testCase = this.getCaseData();
+    }
+
+    getCaseData() {
+        if (this.caseData) {
+            return this.caseData;
+        }
+        const env = browser.config.testParams.ENV;
+
+        // Note, order is least specific to most specific, so that the more
+        // specific can override the least.
+
+        // Top level test cases provide defaults (non-env-specific) per-case
+        // test data.
+        const testCase = this.testData.cases[this.caseLabel];
+
+        // Each env can establish defaults (e.g. narrative id)
+        const envDefaults = this.testData[env].defaults;
+
+        // Each test case is defined per environment as well, as the 
+        // state of services will be different.
+        const envTestCase = this.testData[env][this.caseLabel];
+
+        return mergeObjects([testCase, envDefaults, envTestCase]);
+    }
+
+    /**
+    * Navigates the wdio browser to a workspace as given by its id, and waits until the 
+    * narrative container is visible.
+    * @arg {number} The narrative's workspace id
+    * @returns {Promise} The Promise value is ignored.
+    */
+    async openNarrative(workspaceId, timeoutOverride) {
+
+        // Go to the narrative!
+        const timeout = timeoutOverride || this.timeout;
+        await browser.url(makeURL(`narrative/${workspaceId}`));
+
+        // should experience loading blocker for a few seconds.
+        const loadingBlocker = await $('#kb-loading-blocker');
+        await loadingBlocker.waitForDisplayed({
+            timeout,
+            timeoutMsg: `Timeout after waiting ${timeout}ms for loading blocker to appear`
+        }); 
+
+        // And then the loading blocker should disappear!
+        await loadingBlocker.waitForDisplayed({
+            timeout,
+            timeoutMsg: `Timeout after waiting ${timeout}ms for loading blocker to disappear`,
+            reverse: true
+        });
+
+        // Ensure logged in
+        const loginButton = await $('#signin-button > div > button');
+        await loginButton.waitForDisplayed({
+            timeout,
+            timeoutMsg: `Timeout after waiting ${timeout}ms for login button to appear`
+        }); 
+
+        await clickWhenReady(loginButton);
+
+        const realnameElement = await $('[data-element="realname"]');
+        const usernameElement = await $('[data-element="username"]');
+        await browser.waitUntil(async () => {
+            const text = await realnameElement.getText();
+            return (text && text.length > 0);
+        });
+        const realname = await realnameElement.getText();
+        const username = await usernameElement.getText();
+        console.warn(`Signed in as user "${realname}" (${username})`);
+        await loginButton.click();
+    
+        // Ensure narrative notebook has displayed
+        // TODO: more interesting waitUntil loop to signal the 
+        // failure reason (useful for debugging tests?)
+        const container = await $('#notebook-container');
+        await container.waitForDisplayed({
+            timeout,
+            timeoutMsg: `Timeout after waiting ${timeout}ms for narrative to appear`
+        });
+        return container;
+    }
+
+    async waitForCell(notebookContainer, cellIndex){
+        return await browser.waitUntil(async () => {
+            const cell = await notebookContainer.$(`.cell:nth-child(${cellIndex})`);
+            return cell;
+        });
+    }
+
+    async selectCell(container, cellIndex, title) {
+        const cell = await this.waitForCellWithTitle(container, cellIndex, title);
+
+        // Make sure not selected.
+        // We do this by inspecting the border.
+        await browser.waitUntil(async () => {
+            const borderStyle = await cell.getCSSProperty('border');
+            return borderStyle.value === this.testData.common.unselectedBorder;
+        });
+
+        // Click on title area to select cell.
+        const titleArea = await cell.$('.title-container');
+        await clickWhenReady(titleArea);
+
+        await browser.waitUntil(async () => {
+            const borderStyle = await cell.getCSSProperty('border');
+            return borderStyle.value === this.testData.common.selectedBorder;
+        });
+
+        return cell;
+    }
+
+    async waitForCellWithText(container, cellIndex, selector, text) {
+        const cell = await this.waitForCell(container, cellIndex);
+        await browser.waitUntil(async () => {
+            const element = await cell.$(selector);
+            return text == await element.getText();
+        });
+        return cell;
+    }
+
+    async waitForCellWithTitle(container, cellIndex, titleText) {
+        return await this.waitForCellWithText(container, cellIndex, '[data-element="title"]', titleText);
+    }
+
+    async waitForCellWithBody(container, cellIndex, bodyText) {
+        return await this.waitForCellWithText(container, cellIndex, '.text_cell_render.rendered_html', bodyText);
+    }
+
+    async selectCellWithText(container, cellIndex, selector, text) {
+        const cell = await this.waitForCellWithText(container, cellIndex, selector, text);
+
+        await browser.waitUntil(async () => {
+            const borderStyle = await cell.getCSSProperty('border');
+            return borderStyle.value === this.testData.common.unselectedBorder;
+        });
+
+        const bodyArea = await cell.$(selector);
+        await clickWhenReady(bodyArea);
+
+        await browser.waitUntil(async () => {
+            const borderStyle = await cell.getCSSProperty('border');
+            return borderStyle.value === this.testData.common.selectedBorder;
+        });
+
+        return cell;
+    }
+
+    async selectCellWithBody(container, cellIndex, body) {
+        return await this.selectCellWithText(container, cellIndex, '.text_cell_render.rendered_html', body);
+    }
+}
+
+module.exports = {
+    login,
+    makeURL,
+    sendString,
+    clickWhenReady,
+    NarrativeTesting
+};
\ No newline at end of file
diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index 6dd23fe2d5..d2eeb1011f 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -2,7 +2,14 @@
 /* eslint {strict: ['error', 'global']} */
 'use strict';
 
-const {login, openNarrative, clickWhenReady, getCaseData} = require('../wdioUtils.js');
+// const {
+//     login, openNarrative, clickWhenReady, getCaseData,
+//     waitForCellWithTitle, selectCell, waitForCellWithBody,
+// } = require('../wdioUtils.js');
+
+const { NarrativeTesting } = require('../NarrativeTesting.js');
+const { login, clickWhenReady } = require('../wdioUtils.js');
+
 
 /*
 Notes:
@@ -78,77 +85,7 @@ const testData = {
     }
 };
 
-async function waitForCell(notebookContainer, cellIndex){
-    return await browser.waitUntil(async () => {
-        const cell = await notebookContainer.$(`.cell:nth-child(${cellIndex})`);
-        return cell;
-    });
-}
-
-async function waitForCellWithTitle(container, cellIndex, title) {
-    const cell = await waitForCell(container, cellIndex);
-    await browser.waitUntil(async () => {
-        const titleElement = await cell.$('[data-element="title"]');
-        const text = await titleElement.getText();
-        return text === title;
-    });
-    return cell;
-}
-
-async function waitForCellWithBody(container, cellIndex, bodyText) {
-    const cell = await waitForCell(container, cellIndex);
-    await browser.waitUntil(async () => {
-        const element = await cell.$('.text_cell_render.rendered_html');
-        const text = await element.getText();
-        return text === bodyText;
-    });
-    return cell;
-}
-
-async function selectCell(container, cellIndex, title) {
-    const cell = await waitForCellWithTitle(container, cellIndex, title);
-
-    // Make sure not selected.
-    // We do this by inspecting the border.
-    await browser.waitUntil(async () => {
-        const borderStyle = await cell.getCSSProperty('border');
-        return borderStyle.value === testData.common.unselectedBorder;
-    });
-
-    // Click on title area to select cell.
-    const titleArea = await cell.$('.title-container');
-    await clickWhenReady(titleArea);
-
-    await browser.waitUntil(async () => {
-        const borderStyle = await cell.getCSSProperty('border');
-        return borderStyle.value === testData.common.selectedBorder;
-    });
-
-    return cell;
-}
-
-async function selectCellWithBody(container, cellIndex, body) {
-    const cell = await waitForCellWithBody(container, cellIndex, body);
-
-    // Make sure not selected.
-    // We do this by inspecting the border.
-    await browser.waitUntil(async () => {
-        const borderStyle = await cell.getCSSProperty('border');
-        return borderStyle.value === testData.common.unselectedBorder;
-    });
-
-
-    // Click on title area to select cell.
-    const bodyArea = await cell.$('.text_cell_render.rendered_html');
-    await clickWhenReady(bodyArea);
-
-    await browser.waitUntil(async () => {
-        const borderStyle = await cell.getCSSProperty('border');
-        return borderStyle.value === testData.common.selectedBorder;
-    });
-
-    return cell;
-}
+const TIMEOUT = 60000;
 
 describe('Test kbaseCellToolbarMenu', () => {
     beforeEach(async () => {
@@ -162,127 +99,127 @@ describe('Test kbaseCellToolbarMenu', () => {
     });
 
     it('moves a minimized selected cell down', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_1');
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_1'});
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
 
-        const cell = await waitForCellWithTitle(narrativeContainer, testCase.cellIndex, testCase.title);
+        const cell = await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
 
         // Find and click the move-down button
         const downButton = await cell.$('[data-test="cell-move-down"]');
         await clickWhenReady(downButton);
-        await waitForCellWithTitle(narrativeContainer, testCase.cellIndex + 1, testCase.title);
+        await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex + 1, t.testCase.title);
     });
 
     it('moves a minimized unselected cell down', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_2');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_2'});
 
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
 
-        const cell = await waitForCellWithTitle(narrativeContainer, testCase.cellIndex, testCase.title);
+        const cell = await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
 
         // Find and click the move-down button
         const downButton = await cell.$('[data-test="cell-move-down"]');
         await clickWhenReady(downButton);
-        await waitForCellWithTitle(narrativeContainer, testCase.cellIndex + 1, testCase.title);
+        await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex + 1, t.testCase.title);
     });
 
     it('moves a minimized unselected cell up', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_3');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_3'});
 
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
 
-        const cell = await waitForCellWithTitle(narrativeContainer, testCase.cellIndex, testCase.title);
+        const cell = await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
 
         // Find and click the move-ups button
         const upButton = await cell.$('[data-test="cell-move-up"]');
         await clickWhenReady(upButton);
-        await waitForCellWithTitle(narrativeContainer, testCase.cellIndex - 1, testCase.title);
+        await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex - 1, t.testCase.title);
     });
 
     // select cell
     it('selects a minimized cell', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_4');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_4'});
 
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
-        await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
+        await t.selectCell(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
     });
 
     // select cell and move down
     it('selects a minimized cell and moves it down', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_4');
+        const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel: 'TEST_CASE_4'});
 
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
-        const cell = await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
+        const cell = await t.selectCell(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
         const downButton = await cell.$('[data-test="cell-move-down"]');
         await clickWhenReady(downButton);
-        await waitForCellWithTitle(narrativeContainer, testCase.cellIndex + 1, testCase.title);
+        await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex + 1, t.testCase.title);
     });
 
     // select cell and move up
     it('selects a minimized cell and moves it up', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_4');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_4'});
 
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
-        const cell = await selectCell(narrativeContainer, testCase.cellIndex, testCase.title);
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
+        const cell = await t.selectCell(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
         const upButton = await cell.$('[data-test="cell-move-up"]');
         await clickWhenReady(upButton);
-        await waitForCellWithTitle(narrativeContainer, testCase.cellIndex - 1, testCase.title);
+        await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex - 1, t.testCase.title);
     });
 
     // Everything above, but cells are expanded.
 
     it('moves an expanded unselected cell down', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_5');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_5'});
 
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
 
-        const cell = await waitForCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
+        const cell = await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex, t.testCase.body);
 
         // Find and click the move-down button
         const downButton = await cell.$('[data-test="cell-move-down"]');
         await clickWhenReady(downButton);
-        await waitForCellWithBody(narrativeContainer, testCase.cellIndex + 1, testCase.body);
+        await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex + 1, t.testCase.body);
     });
 
     it('moves an expanded unselected cell up', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_5');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_5'});
 
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
 
-        const cell = await waitForCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
+        const cell = await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex, t.testCase.body);
 
         // Find and click the move-down button
         const button = await cell.$('[data-test="cell-move-up"]');
         await clickWhenReady(button);
-        await waitForCellWithBody(narrativeContainer, testCase.cellIndex - 1, testCase.body);
+        await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex - 1, t.testCase.body);
     });
 
     it('selects an expanded cell', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_5');
+        const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel: 'TEST_CASE_5'});
 
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
-        await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
+        await t.selectCellWithBody(narrativeContainer, t.testCase.cellIndex, t.testCase.body);
     });
 
     // select cell and move down
     it('selects an expanded cell and moves it down', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_5');
+        const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel: 'TEST_CASE_5'});
 
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
-        const cell = await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
+        const cell = await t.selectCellWithBody(narrativeContainer, t.testCase.cellIndex, t.testCase.body);
         const downButton = await cell.$('[data-test="cell-move-down"]');
         await clickWhenReady(downButton);
-        await waitForCellWithBody(narrativeContainer, testCase.cellIndex + 1, testCase.body);
+        await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex + 1, t.testCase.body);
     });
 
     // select cell and move up
     it('selects an expanded cell and moves it up', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_5');
+        const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel: 'TEST_CASE_5'});
 
-        const narrativeContainer = await openNarrative(testCase.narrativeId);
-        const cell = await selectCellWithBody(narrativeContainer, testCase.cellIndex, testCase.body);
+        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
+        const cell = await t.selectCellWithBody(narrativeContainer, t.testCase.cellIndex, t.testCase.body);
         const upButton = await cell.$('[data-test="cell-move-up"]');
         await clickWhenReady(upButton);
-        await waitForCellWithBody(narrativeContainer, testCase.cellIndex - 1, testCase.body);
+        await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex - 1, t.testCase.body);
     });
 });
diff --git a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
index 0172f168a1..5fdd51943d 100644
--- a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
+++ b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
@@ -2,7 +2,9 @@
 /* eslint {strict: ['error', 'global']} */
 'use strict';
 
-const {login, openNarrative, sendString, clickWhenReady, getCaseData} = require('../wdioUtils.js');
+const {login, openNarrative, sendString, clickWhenReady} = require('../wdioUtils.js');
+const { NarrativeTesting } = require('../NarrativeTesting.js');
+
 
 // Ideally the test data should be the same, except for narrative id, in each env.
 // But currently CI and prod are indexed differently.
@@ -366,22 +368,22 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_1');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_1'});
         
-        await openNarrative(testCase.narrativeId);
+        await openNarrative(t.testCase.narrativeId);
 
         const publicPanel = await openPublicData();
-        const rows = await waitForRows(publicPanel, testCase.row);
+        const rows = await waitForRows(publicPanel, t.testCase.row);
 
-        expect(rows.length).toBeGreaterThanOrEqual(testCase.row);
-        const row = rows[testCase.row - 1];
+        expect(rows.length).toBeGreaterThanOrEqual(t.testCase.row);
+        const row = rows[t.testCase.row - 1];
         expect(row).toBeDefined();
 
         const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(testCase.name);
+        expect(nameCell).toHaveText(t.testCase.name);
 
         // Confirm the metadata fields.
-        for (const {id, label, value} of testCase.metadata) {
+        for (const {id, label, value} of t.testCase.metadata) {
             await testField({
                 container: row, 
                 id, 
@@ -392,22 +394,22 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_2');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_2'});
 
-        await openNarrative(testCase.narrativeId);
+        await openNarrative(t.testCase.narrativeId);
 
         const publicPanel = await openPublicData();
-        const rows = await waitForRows(publicPanel, testCase.row);
+        const rows = await waitForRows(publicPanel, t.testCase.row);
 
         // Look at the row - it should already be in view.
-        const row = rows[testCase.row - 1];
+        const row = rows[t.testCase.row - 1];
         await row.scrollIntoView();
 
         const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(testCase.name);
+        expect(nameCell).toHaveText(t.testCase.name);
 
         // Confirm the metadata fields.
-        for (const {id, label, value} of testCase.metadata) {
+        for (const {id, label, value} of t.testCase.metadata) {
             await testField({
                 container: row, 
                 id, 
@@ -418,36 +420,36 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, searches for a term, should find an expected row', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_3');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_3'});
 
-        await openNarrative(testCase.narrativeId);
+        await openNarrative(t.testCase.narrativeId);
 
         const publicPanel = await openPublicData();
 
         // Select search input and input a search term
         const searchInput = await publicPanel.$('[data-test-id="search-input"]');
         await clickWhenReady(searchInput);
-        await sendString(testCase.searchFor);
+        await sendString(t.testCase.searchFor);
         await browser.keys('Enter');
 
         const foundCount = await publicPanel.$('[data-test-id="found-count"]');
-        expect(foundCount).toHaveText(testCase.foundCount);
+        expect(foundCount).toHaveText(t.testCase.foundCount);
 
         // get rows
         // When using roles, we sometimes need to be very specific in our queries.
         // Maybe roles are not suitable for integration tests, then.
-        const rows = await waitForRows(publicPanel, testCase.row);
+        const rows = await waitForRows(publicPanel, t.testCase.row);
 
-        expect(rows.length).toBeGreaterThanOrEqual(testCase.row);
+        expect(rows.length).toBeGreaterThanOrEqual(t.testCase.row);
 
         // Look at the row - it should already be in view.
-        const row = rows[testCase.row - 1];
+        const row = rows[t.testCase.row - 1];
         await row.scrollIntoView();
         const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(testCase.name);
+        expect(nameCell).toHaveText(t.testCase.name);
 
         // Confirm the metadata fields.
-        for (const {id, label, value} of testCase.metadata) {
+        for (const {id, label, value} of t.testCase.metadata) {
             await testField({
                 container: row, 
                 id, 
@@ -458,16 +460,16 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, searches for a term which should not be found', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_4');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_4'});
 
-        await openNarrative(testCase.narrativeId);
+        await openNarrative(t.testCase.narrativeId);
 
         const publicPanel = await openPublicData();
 
         // Select search input and input a search term
         const searchInput = await publicPanel.$('[data-test-id="search-input"]');
         await clickWhenReady(searchInput);
-        await sendString(testCase.searchFor);
+        await sendString(t.testCase.searchFor);
         await browser.keys('Enter');
 
         await browser.waitUntil(async () => {
@@ -475,20 +477,20 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
             
             if (await foundCountElement.isDisplayed()) {
                 const text = await foundCountElement.getText();
-                return text === testCase.foundCount;
+                return text === t.testCase.foundCount;
             } else {
                 return false;
             }
         });
         
         const foundCount = await publicPanel.$('[data-test-id="found-count"]');
-        expect(foundCount).toHaveText(testCase.foundCount);
+        expect(foundCount).toHaveText(t.testCase.foundCount);
     });
 
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
-        const testCase = getCaseData(testData, 'TEST_CASE_5');
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_5'});
 
-        await openNarrative(testCase.narrativeId);
+        await openNarrative(t.testCase.narrativeId);
 
         // Open the data slideout
         const publicPanel = await openPublicData();
@@ -496,21 +498,21 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
         // get rows
         // When using roles, we sometimes need to be very specific in our queries.
         // Maybe roles are not suitable for integration tests, then.
-        for (const scrollRow of testCase.scrolls) {
+        for (const scrollRow of t.testCase.scrolls) {
             const rowElements = await waitForRows(publicPanel, scrollRow);
             const rowElement = rowElements[scrollRow - 1];
             await rowElement.scrollIntoView();
         }
 
         // ensure we have all of the rows.
-        const rows = await waitForRows(publicPanel, testCase.row);
-        const row = rows[testCase.row - 1];
+        const rows = await waitForRows(publicPanel, t.testCase.row);
+        const row = rows[t.testCase.row - 1];
         await row.scrollIntoView();
         const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(testCase.name);
+        expect(nameCell).toHaveText(t.testCase.name);
 
         // Confirm the metadata fields.
-        for (const {id, label, value} of testCase.metadata) {
+        for (const {id, label, value} of t.testCase.metadata) {
             await testField({
                 container: row, 
                 id, 
diff --git a/test/integration/wdioUtils.js b/test/integration/wdioUtils.js
index ef86eeabd4..1c07157d55 100644
--- a/test/integration/wdioUtils.js
+++ b/test/integration/wdioUtils.js
@@ -115,77 +115,10 @@ async function openNarrative(workspaceId) {
     return container;
 }
 
-function mergeObjects(listOfObjects) {
-    const simpleObjectPrototype = Object.getPrototypeOf({});
-
-    function isSimpleObject(obj) {
-        if (typeof obj !== 'object') {
-            return false;
-        }
-        return Object.getPrototypeOf(obj) === simpleObjectPrototype;
-    }
-
-    function merge(targetObj, sourceObj) {
-        if (!isSimpleObject(targetObj)) {
-            throw new Error(`Can only merge simple objects, target is a "${typeof targetObj}"`);
-        } 
-        
-        // Copy target, so we don't stomp over original objects.
-        // Note that the source object is not copied, since we don't care if
-        // there is object sharing in the result, we just want to ensure that 
-        // we don't overwrite properties of shared objects.
-        targetObj = JSON.parse(JSON.stringify(targetObj));
-
-        Object.keys(sourceObj).forEach(function (key) {
-            if (isSimpleObject(targetObj[key]) && isSimpleObject(sourceObj[key])) {
-                targetObj[key] = merge(targetObj[key], sourceObj[key]);
-            } else {
-                targetObj[key] = sourceObj[key];
-            }
-        });
-        
-        return targetObj;
-    }
-
-    const objectsToMerge = listOfObjects.map((obj, index) => {
-        if (!isSimpleObject(obj)) {
-            throw new Error(`Can only merge simple objects, object #${index} is a "${typeof obj}"`);
-        } else {
-            return JSON.parse(JSON.stringify(obj));
-        }
-    });
-    let merged = objectsToMerge[0];
-    for (let i = 1; i < objectsToMerge.length; i += 1) {
-        merged = merge(merged, objectsToMerge[i]);
-    }
-    return merged;
-}
-
-function getCaseData(testData, caseLabel) {
-    const env = browser.config.testParams.ENV;
-
-    // Note, order is least specific to most specific, so that the more
-    // specific can override the least.
-
-    // Top level test cases provide defaults (non-env-specific) per-case
-    // test data.
-    const testCase = testData.cases[caseLabel];
-
-    // Each env can establish defaults (e.g. narrative id)
-    const envDefaults = testData[env].defaults;
-
-    // Each test case is defined per environment as well, as the 
-    // state of services will be different.
-    const envTestCase = testData[env][caseLabel];
-
-    return mergeObjects([testCase, envDefaults, envTestCase]);
-}
-
 module.exports = {
     login,
     makeURL,
     sendString,
     openNarrative,
-    clickWhenReady,
-    getCaseData
+    clickWhenReady
 };
\ No newline at end of file

From 25ef6fe41bf4c2f2a47dc6da347c4c2b8d642db5 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Fri, 22 Jan 2021 10:01:44 -0800
Subject: [PATCH 13/42] refactor integration tests - improve NarrativeTesting
 tools - add range function to wdio utils - public tab adjust to
 NarrativeTesting chagnes - rarrange tests to run through single cell movement
 function, with rearranged test data.

---
 test/integration/NarrativeTesting.js          |  51 +--
 .../specs/kbaseCellToolbarMenu_test.js        | 369 ++++++++++++------
 .../specs/kbaseNarrativeSidePublicTab_test.js |  63 ++-
 test/integration/wdioUtils.js                 |  11 +-
 4 files changed, 294 insertions(+), 200 deletions(-)

diff --git a/test/integration/NarrativeTesting.js b/test/integration/NarrativeTesting.js
index c8786292c8..16b620c077 100644
--- a/test/integration/NarrativeTesting.js
+++ b/test/integration/NarrativeTesting.js
@@ -15,10 +15,6 @@ function mergeObjects(listOfObjects) {
     }
 
     function merge(targetObj, sourceObj) {
-        if (!isSimpleObject(targetObj)) {
-            throw new Error(`Can only merge simple objects, target is a "${typeof targetObj}"`);
-        } 
-        
         // Copy target, so we don't stomp over original objects.
         // Note that the source object is not copied, since we don't care if
         // there is object sharing in the result, we just want to ensure that 
@@ -37,6 +33,9 @@ function mergeObjects(listOfObjects) {
     }
 
     const objectsToMerge = listOfObjects.map((obj, index) => {
+        if (typeof obj === 'undefined') {
+            return {};
+        }
         if (!isSimpleObject(obj)) {
             throw new Error(`Can only merge simple objects, object #${index} is a "${typeof obj}"`);
         } else {
@@ -55,7 +54,7 @@ class NarrativeTesting {
         this.testData = testData;
         this.caseLabel = caseLabel;
         this.timeout = timeout;
-        this.testCase = this.getCaseData();
+        this.caseData = this.getCaseData();
     }
 
     getCaseData() {
@@ -69,16 +68,16 @@ class NarrativeTesting {
 
         // Top level test cases provide defaults (non-env-specific) per-case
         // test data.
-        const testCase = this.testData.cases[this.caseLabel];
+        const caseData = this.testData.cases[this.caseLabel];
 
         // Each env can establish defaults (e.g. narrative id)
         const envDefaults = this.testData[env].defaults;
 
         // Each test case is defined per environment as well, as the 
         // state of services will be different.
-        const envTestCase = this.testData[env][this.caseLabel];
+        const envcaseData = this.testData[env][this.caseLabel];
 
-        return mergeObjects([testCase, envDefaults, envTestCase]);
+        return mergeObjects([caseData, envDefaults, envcaseData]);
     }
 
     /**
@@ -145,9 +144,7 @@ class NarrativeTesting {
         });
     }
 
-    async selectCell(container, cellIndex, title) {
-        const cell = await this.waitForCellWithTitle(container, cellIndex, title);
-
+    async selectCell(cell) {
         // Make sure not selected.
         // We do this by inspecting the border.
         await browser.waitUntil(async () => {
@@ -168,12 +165,13 @@ class NarrativeTesting {
     }
 
     async waitForCellWithText(container, cellIndex, selector, text) {
-        const cell = await this.waitForCell(container, cellIndex);
         await browser.waitUntil(async () => {
+            const cell = await this.waitForCell(container, cellIndex);
             const element = await cell.$(selector);
-            return text == await element.getText();
+            const cellText = await element.getText();
+            return text === cellText;
         });
-        return cell;
+        return await this.waitForCell(container, cellIndex);
     }
 
     async waitForCellWithTitle(container, cellIndex, titleText) {
@@ -183,29 +181,6 @@ class NarrativeTesting {
     async waitForCellWithBody(container, cellIndex, bodyText) {
         return await this.waitForCellWithText(container, cellIndex, '.text_cell_render.rendered_html', bodyText);
     }
-
-    async selectCellWithText(container, cellIndex, selector, text) {
-        const cell = await this.waitForCellWithText(container, cellIndex, selector, text);
-
-        await browser.waitUntil(async () => {
-            const borderStyle = await cell.getCSSProperty('border');
-            return borderStyle.value === this.testData.common.unselectedBorder;
-        });
-
-        const bodyArea = await cell.$(selector);
-        await clickWhenReady(bodyArea);
-
-        await browser.waitUntil(async () => {
-            const borderStyle = await cell.getCSSProperty('border');
-            return borderStyle.value === this.testData.common.selectedBorder;
-        });
-
-        return cell;
-    }
-
-    async selectCellWithBody(container, cellIndex, body) {
-        return await this.selectCellWithText(container, cellIndex, '.text_cell_render.rendered_html', body);
-    }
 }
 
 module.exports = {
@@ -214,4 +189,4 @@ module.exports = {
     sendString,
     clickWhenReady,
     NarrativeTesting
-};
\ No newline at end of file
+};
diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index d2eeb1011f..9c73314b93 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -2,27 +2,20 @@
 /* eslint {strict: ['error', 'global']} */
 'use strict';
 
-// const {
-//     login, openNarrative, clickWhenReady, getCaseData,
-//     waitForCellWithTitle, selectCell, waitForCellWithBody,
-// } = require('../wdioUtils.js');
-
 const { NarrativeTesting } = require('../NarrativeTesting.js');
 const { login, clickWhenReady } = require('../wdioUtils.js');
 
-
 /*
 Notes:
 
 The test narrative has 5 markdown cells. The first cell has summary text, the remaining 4 contain the text "Cell #".
 The first three cells are collapsed, the last two are expanded.
 
-Tests currently cover common cases of cell movement; additional cases can be added, e.g. try to move 
-past the end, or before the beginning, try moving the same cell multiple times, inspect the state
-of all cells after a movement.
+Tests currently cover moving cells up and down, in both selected and unselected state, and ensuring that the moved 
+cell is in the expected position.
 
-This test suite could be expanded to cover all usage of the cell toolbar (kbaseCellToolbarMenu.js), or they
-could be in separate files.
+TODO: This test suite could be expanded to cover all usage of the cell toolbar (kbaseCellToolbarMenu.js), or such 
+test cases can be could be in separate files.
 
 */
 
@@ -30,64 +23,149 @@ const testData = {
     common: {
         unselectedBorder: '1px 1px 1px 5px solid rgb(204, 204, 204)',
         selectedBorder: '1px 1px 1px 5px solid rgb(75, 184, 86)',
+        cells: [
+            {title: 'Narrative Cell Toolbar Testing'},
+            {title: 'Cell 1'},
+            {title: 'Cell 2'},
+            {body: 'Cell 3'},
+            {body: 'Cell 4'}
+        ]
     },
     cases: {
         TEST_CASE_1: {
             cellIndex: 1,
-            title: 'Narrative Cell Toolbar Testing'
+            title: 'Narrative Cell Toolbar Testing',
+            expect: {
+                afterMove: {
+                    up: {
+                        cellOrder: [1, 2, 3, 4, 5]
+                    },
+                    down: {
+                        cellOrder: [2, 1, 3, 4, 5]
+                    }
+                }
+            }
         },
         TEST_CASE_2: {
             cellIndex: 2,
-            title: 'Cell 1'
+            title: 'Cell 1',
+            expect: {
+                afterMove: {
+                    up: {
+                        cellOrder: [2, 1, 3, 4, 5]
+                    },
+                    down: {
+                        cellOrder: [1, 3, 2, 4, 5]
+                    }
+                }
+            }
         },
         TEST_CASE_3: {
             cellIndex: 3,
-            title: 'Cell 2'
+            title: 'Cell 2',
+            expect: {
+                afterMove: {
+                    up: {
+                        cellOrder: [1, 3, 2, 4, 5]
+                    },
+                    down: {
+                        cellOrder: [1, 2, 4, 3, 5]
+                    }
+                }
+            }
         },
         TEST_CASE_4: {
-            cellIndex: 3,
-            title: 'Cell 2'
+            cellIndex: 4,
+            body: 'Cell 3',
+            expect: {
+                afterMove: {
+                    up: {
+                        cellOrder: [1, 2, 4, 3, 5]
+                    },
+                    down: {
+                        cellOrder: [1, 2, 3, 5, 4]
+                    }
+                }
+            }
         },
         TEST_CASE_5: {
-            cellIndex: 4,
-            body: 'Cell 3'
+            cellIndex: 5,
+            body: 'Cell 4',
+            expect: {
+                afterMove: {
+                    up: {
+                        cellOrder: [1, 2, 3, 5, 4]
+                    },
+                    down: {
+                        cellOrder: [1, 2, 3, 4, 5]
+                    }
+                }
+            }
         }
     },
     ci: {
         defaults: {
             narrativeId: 58675
-        },
-        TEST_CASE_1: {
-        },
-        TEST_CASE_2: {
-        },
-        TEST_CASE_3: {
-        },
-        TEST_CASE_4: {
-        },
-        TEST_CASE_5: {
         }
     },
     'narrative-dev': {
         defaults: {
             narrativeId: 80970
-        },
-        TEST_CASE_1: {
-        },
-        TEST_CASE_2: {
-        },
-        TEST_CASE_3: {
-        },
-        TEST_CASE_4: {
-        },
-        TEST_CASE_5: {
         }
     }
 };
 
 const TIMEOUT = 60000;
 
-describe('Test kbaseCellToolbarMenu', () => {
+async function testCellMovement({caseLabel, selectCell, direction}) {
+    const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel});
+    const cellIndex = t.caseData.cellIndex;
+    const cells = t.testData.common.cells;
+    const narrativeContainer = await t.openNarrative(t.caseData.narrativeId);
+
+    function waitForExpectedCell(targetCellIndex, expectedCell) {
+        if (expectedCell.title) {
+            return t.waitForCellWithTitle(narrativeContainer, targetCellIndex, expectedCell.title);
+        } else if (expectedCell.body) {
+            return t.waitForCellWithBody(narrativeContainer, targetCellIndex, expectedCell.body);
+        } else {
+            throw new Error('Either title or body must be specified for a cell movement test');
+        }
+    }
+
+    // Select a cell by title or body text.
+    // Each test case targets a cell for movement, and this step ensures
+    // that we start with the right one.
+    const cell = await waitForExpectedCell(cellIndex, t.caseData);
+
+    // Optionally select the cell.
+    // Since the bug which triggered this set of tests was for movement
+    // of unselected cells, we want to ensure that we can test for cell
+    // movement of both selected and unselected cells.
+    if (selectCell) {
+        await t.selectCell(cell);
+    }
+
+    // Click the appropriate cell movement button.
+    const button = await cell.$(`[data-test="cell-move-${direction}"]`);
+    await clickWhenReady(button);
+
+    // Loop through all of the cells in the test Narrative, ensuring that they
+    // are in the expected order.
+    // This relies on the "cellOrder" array, which contains expected ordering
+    // of cells, where each cell is identified by it's original cell position.
+    const cellOrder = t.caseData.expect.afterMove[direction].cellOrder;
+    await Promise.all(cellOrder.map((originalCellIndex, index) => {
+        const actualCellIndex = index + 1;
+        // Get the expected title or body for the cell at that position, based
+        // on the master list of starting cells.
+        const expected = cells[originalCellIndex - 1];
+
+        return waitForExpectedCell(actualCellIndex, expected);
+    }));
+}
+
+describe('Test kbaseCellToolbarMenu movement buttons', () => {
     beforeEach(async () => {
         await browser.setTimeout({ 'implicit': 30000 });
         await browser.reloadSession();
@@ -98,128 +176,165 @@ describe('Test kbaseCellToolbarMenu', () => {
         await browser.deleteCookies();
     });
 
-    it('moves a minimized selected cell down', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_1'});
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
-
-        const cell = await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
+    // Move first cell 
 
-        // Find and click the move-down button
-        const downButton = await cell.$('[data-test="cell-move-down"]');
-        await clickWhenReady(downButton);
-        await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex + 1, t.testCase.title);
+    it('moves a minimized selected first cell down', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_1',
+            direction: 'up',
+            selectCell: false
+        });
     });
 
-    it('moves a minimized unselected cell down', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_2'});
-
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
+    it('moves a minimized selected first cell down', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_1',
+            direction: 'down',
+            selectCell: false
+        });
+    });
 
-        const cell = await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
+    // Move second cell, a regular minimized cell.
 
-        // Find and click the move-down button
-        const downButton = await cell.$('[data-test="cell-move-down"]');
-        await clickWhenReady(downButton);
-        await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex + 1, t.testCase.title);
+    it('moves a minimized selected second cell up', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_2',
+            direction: 'up',
+            selectCell: false
+        });
     });
 
-    it('moves a minimized unselected cell up', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_3'});
-
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
+    it('moves a minimized selected second cell down', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_2',
+            direction: 'down',
+            selectCell: false
+        });
+    });
 
-        const cell = await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
+    // ... so select it and try again
 
-        // Find and click the move-ups button
-        const upButton = await cell.$('[data-test="cell-move-up"]');
-        await clickWhenReady(upButton);
-        await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex - 1, t.testCase.title);
+    it('selects and moves a minimized selected second cell up', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_2',
+            direction: 'up',
+            selectCell: true
+        });
     });
 
-    // select cell
-    it('selects a minimized cell', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_4'});
-
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
-        await t.selectCell(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
+    it('selects and moves a minimized selected second cell down', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_2',
+            direction: 'down',
+            selectCell: true
+        });
     });
 
-    // select cell and move down
-    it('selects a minimized cell and moves it down', async () => {
-        const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel: 'TEST_CASE_4'});
+    // Third cell is minimized.
 
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
-        const cell = await t.selectCell(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
-        const downButton = await cell.$('[data-test="cell-move-down"]');
-        await clickWhenReady(downButton);
-        await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex + 1, t.testCase.title);
+    it('moves a minimized selected second cell up', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_3',
+            direction: 'up',
+            selectCell: false
+        });
     });
 
-    // select cell and move up
-    it('selects a minimized cell and moves it up', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_4'});
-
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
-        const cell = await t.selectCell(narrativeContainer, t.testCase.cellIndex, t.testCase.title);
-        const upButton = await cell.$('[data-test="cell-move-up"]');
-        await clickWhenReady(upButton);
-        await t.waitForCellWithTitle(narrativeContainer, t.testCase.cellIndex - 1, t.testCase.title);
+    it('moves a minimized selected second cell down', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_3',
+            direction: 'down',
+            selectCell: false
+        });
     });
 
-    // Everything above, but cells are expanded.
+    // ... so select it and try again.
 
-    it('moves an expanded unselected cell down', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_5'});
+    it('moves a minimized selected second cell up', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_3',
+            direction: 'up',
+            selectCell: true
+        });
+    });
 
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
+    it('moves a minimized selected second cell down', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_3',
+            direction: 'down',
+            selectCell: true
+        });
+    });
 
-        const cell = await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex, t.testCase.body);
+    // Fourth cell is expanded
 
-        // Find and click the move-down button
-        const downButton = await cell.$('[data-test="cell-move-down"]');
-        await clickWhenReady(downButton);
-        await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex + 1, t.testCase.body);
+    it('moves an expanded selected fourth cell up', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_4',
+            direction: 'up',
+            selectCell: false
+        });
     });
 
-    it('moves an expanded unselected cell up', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_5'});
+    it('moves an expanded unselected fourth cell down', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_4',
+            direction: 'down',
+            selectCell: false
+        });
+    });
 
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
+    // ... so select it and try again.
 
-        const cell = await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex, t.testCase.body);
+    it('selects and moves an expanded unselected second cell up', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_4',
+            direction: 'up',
+            selectCell: true
+        });
+    });
 
-        // Find and click the move-down button
-        const button = await cell.$('[data-test="cell-move-up"]');
-        await clickWhenReady(button);
-        await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex - 1, t.testCase.body);
+    it('selects and moves an expanded selected second cell down', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_4',
+            direction: 'down',
+            selectCell: true
+        });
     });
 
-    it('selects an expanded cell', async () => {
-        const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel: 'TEST_CASE_5'});
+    // Fifth cell is expanded
 
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
-        await t.selectCellWithBody(narrativeContainer, t.testCase.cellIndex, t.testCase.body);
+    it('moves an expanded selected fourth cell up', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_5',
+            direction: 'up',
+            selectCell: false
+        });
     });
 
-    // select cell and move down
-    it('selects an expanded cell and moves it down', async () => {
-        const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel: 'TEST_CASE_5'});
-
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
-        const cell = await t.selectCellWithBody(narrativeContainer, t.testCase.cellIndex, t.testCase.body);
-        const downButton = await cell.$('[data-test="cell-move-down"]');
-        await clickWhenReady(downButton);
-        await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex + 1, t.testCase.body);
+    it('moves an expanded selected fourth cell down', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_5',
+            direction: 'down',
+            selectCell: false
+        });
     });
 
-    // select cell and move up
-    it('selects an expanded cell and moves it up', async () => {
-        const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel: 'TEST_CASE_5'});
+    // ... so select it and try again.
+
+    it('selects and moves an expanded last cell up', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_5',
+            direction: 'up',
+            selectCell: true
+        });
+    });
 
-        const narrativeContainer = await t.openNarrative(t.testCase.narrativeId);
-        const cell = await t.selectCellWithBody(narrativeContainer, t.testCase.cellIndex, t.testCase.body);
-        const upButton = await cell.$('[data-test="cell-move-up"]');
-        await clickWhenReady(upButton);
-        await t.waitForCellWithBody(narrativeContainer, t.testCase.cellIndex - 1, t.testCase.body);
+    it('selects and moves an expanded last cell down', async () => {
+        await testCellMovement({
+            caseLabel: 'TEST_CASE_5',
+            direction: 'down',
+            selectCell: true
+        });
     });
 });
diff --git a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
index 5fdd51943d..86f60fee8d 100644
--- a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
+++ b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
@@ -303,11 +303,6 @@ const testData = {
     }
 };
 
-// const testCases = allTestCases[browser.config.testParams.ENV];
-
-// const testCases = getConfig(testData, browser.config.testParams.ENV);
-
-
 async function testField({container, id, label, value}) {
     const lineageLabel = await container.$(`[role="row"][data-test-id="${id}"] [data-test-id="label"]`);
     expect(lineageLabel).toHaveText(label);
@@ -370,20 +365,20 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     it('opens the public data search tab, should show default results', async () => {
         const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_1'});
         
-        await openNarrative(t.testCase.narrativeId);
+        await openNarrative(t.caseData.narrativeId);
 
         const publicPanel = await openPublicData();
-        const rows = await waitForRows(publicPanel, t.testCase.row);
+        const rows = await waitForRows(publicPanel, t.caseData.row);
 
-        expect(rows.length).toBeGreaterThanOrEqual(t.testCase.row);
-        const row = rows[t.testCase.row - 1];
+        expect(rows.length).toBeGreaterThanOrEqual(t.caseData.row);
+        const row = rows[t.caseData.row - 1];
         expect(row).toBeDefined();
 
         const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(t.testCase.name);
+        expect(nameCell).toHaveText(t.caseData.name);
 
         // Confirm the metadata fields.
-        for (const {id, label, value} of t.testCase.metadata) {
+        for (const {id, label, value} of t.caseData.metadata) {
             await testField({
                 container: row, 
                 id, 
@@ -396,20 +391,20 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
         const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_2'});
 
-        await openNarrative(t.testCase.narrativeId);
+        await openNarrative(t.caseData.narrativeId);
 
         const publicPanel = await openPublicData();
-        const rows = await waitForRows(publicPanel, t.testCase.row);
+        const rows = await waitForRows(publicPanel, t.caseData.row);
 
         // Look at the row - it should already be in view.
-        const row = rows[t.testCase.row - 1];
+        const row = rows[t.caseData.row - 1];
         await row.scrollIntoView();
 
         const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(t.testCase.name);
+        expect(nameCell).toHaveText(t.caseData.name);
 
         // Confirm the metadata fields.
-        for (const {id, label, value} of t.testCase.metadata) {
+        for (const {id, label, value} of t.caseData.metadata) {
             await testField({
                 container: row, 
                 id, 
@@ -422,34 +417,34 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     it('opens the public data search tab, searches for a term, should find an expected row', async () => {
         const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_3'});
 
-        await openNarrative(t.testCase.narrativeId);
+        await openNarrative(t.caseData.narrativeId);
 
         const publicPanel = await openPublicData();
 
         // Select search input and input a search term
         const searchInput = await publicPanel.$('[data-test-id="search-input"]');
         await clickWhenReady(searchInput);
-        await sendString(t.testCase.searchFor);
+        await sendString(t.caseData.searchFor);
         await browser.keys('Enter');
 
         const foundCount = await publicPanel.$('[data-test-id="found-count"]');
-        expect(foundCount).toHaveText(t.testCase.foundCount);
+        expect(foundCount).toHaveText(t.caseData.foundCount);
 
         // get rows
         // When using roles, we sometimes need to be very specific in our queries.
         // Maybe roles are not suitable for integration tests, then.
-        const rows = await waitForRows(publicPanel, t.testCase.row);
+        const rows = await waitForRows(publicPanel, t.caseData.row);
 
-        expect(rows.length).toBeGreaterThanOrEqual(t.testCase.row);
+        expect(rows.length).toBeGreaterThanOrEqual(t.caseData.row);
 
         // Look at the row - it should already be in view.
-        const row = rows[t.testCase.row - 1];
+        const row = rows[t.caseData.row - 1];
         await row.scrollIntoView();
         const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(t.testCase.name);
+        expect(nameCell).toHaveText(t.caseData.name);
 
         // Confirm the metadata fields.
-        for (const {id, label, value} of t.testCase.metadata) {
+        for (const {id, label, value} of t.caseData.metadata) {
             await testField({
                 container: row, 
                 id, 
@@ -462,14 +457,14 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     it('opens the public data search tab, searches for a term which should not be found', async () => {
         const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_4'});
 
-        await openNarrative(t.testCase.narrativeId);
+        await openNarrative(t.caseData.narrativeId);
 
         const publicPanel = await openPublicData();
 
         // Select search input and input a search term
         const searchInput = await publicPanel.$('[data-test-id="search-input"]');
         await clickWhenReady(searchInput);
-        await sendString(t.testCase.searchFor);
+        await sendString(t.caseData.searchFor);
         await browser.keys('Enter');
 
         await browser.waitUntil(async () => {
@@ -477,20 +472,20 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
             
             if (await foundCountElement.isDisplayed()) {
                 const text = await foundCountElement.getText();
-                return text === t.testCase.foundCount;
+                return text === t.caseData.foundCount;
             } else {
                 return false;
             }
         });
         
         const foundCount = await publicPanel.$('[data-test-id="found-count"]');
-        expect(foundCount).toHaveText(t.testCase.foundCount);
+        expect(foundCount).toHaveText(t.caseData.foundCount);
     });
 
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
         const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_5'});
 
-        await openNarrative(t.testCase.narrativeId);
+        await openNarrative(t.caseData.narrativeId);
 
         // Open the data slideout
         const publicPanel = await openPublicData();
@@ -498,21 +493,21 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
         // get rows
         // When using roles, we sometimes need to be very specific in our queries.
         // Maybe roles are not suitable for integration tests, then.
-        for (const scrollRow of t.testCase.scrolls) {
+        for (const scrollRow of t.caseData.scrolls) {
             const rowElements = await waitForRows(publicPanel, scrollRow);
             const rowElement = rowElements[scrollRow - 1];
             await rowElement.scrollIntoView();
         }
 
         // ensure we have all of the rows.
-        const rows = await waitForRows(publicPanel, t.testCase.row);
-        const row = rows[t.testCase.row - 1];
+        const rows = await waitForRows(publicPanel, t.caseData.row);
+        const row = rows[t.caseData.row - 1];
         await row.scrollIntoView();
         const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(t.testCase.name);
+        expect(nameCell).toHaveText(t.caseData.name);
 
         // Confirm the metadata fields.
-        for (const {id, label, value} of t.testCase.metadata) {
+        for (const {id, label, value} of t.caseData.metadata) {
             await testField({
                 container: row, 
                 id, 
diff --git a/test/integration/wdioUtils.js b/test/integration/wdioUtils.js
index 1c07157d55..554cc000ff 100644
--- a/test/integration/wdioUtils.js
+++ b/test/integration/wdioUtils.js
@@ -115,10 +115,19 @@ async function openNarrative(workspaceId) {
     return container;
 }
 
+function* range(start, end) {
+    yield start;
+    if (start === end) {
+        return;
+    }
+    yield* range(start + 1, end);
+}
+
 module.exports = {
     login,
     makeURL,
     sendString,
     openNarrative,
-    clickWhenReady
+    clickWhenReady,
+    range
 };
\ No newline at end of file

From 2ce09eae33da77425d317211a631d8744c19e75d Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Fri, 22 Jan 2021 12:26:34 -0800
Subject: [PATCH 14/42] remove inadvertently re-exported functions

---
 test/integration/NarrativeTesting.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/integration/NarrativeTesting.js b/test/integration/NarrativeTesting.js
index 16b620c077..eb48464c80 100644
--- a/test/integration/NarrativeTesting.js
+++ b/test/integration/NarrativeTesting.js
@@ -2,7 +2,7 @@
 /*global browser, $*/
 'use strict';
 
-const {makeURL, login, sendString, clickWhenReady} = require('./wdioUtils');
+const {makeURL, clickWhenReady} = require('./wdioUtils');
 
 function mergeObjects(listOfObjects) {
     const simpleObjectPrototype = Object.getPrototypeOf({});
@@ -184,9 +184,6 @@ class NarrativeTesting {
 }
 
 module.exports = {
-    login,
-    makeURL,
-    sendString,
-    clickWhenReady,
-    NarrativeTesting
+    NarrativeTesting,
+    mergeObjects
 };

From 09e0a6549f95295ba7b02c9dbd94880af22d5e8c Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Fri, 22 Jan 2021 14:54:50 -0800
Subject: [PATCH 15/42] remove duplicate code, part 1

---
 .../specs/kbaseCellToolbarMenu_test.js        |  4 +-
 .../specs/kbaseNarrativeSidePublicTab_test.js | 25 ++++----
 test/integration/wdioUtils.js                 | 60 +------------------
 3 files changed, 16 insertions(+), 73 deletions(-)

diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index 9c73314b93..0c29464cc0 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -5,6 +5,8 @@
 const { NarrativeTesting } = require('../NarrativeTesting.js');
 const { login, clickWhenReady } = require('../wdioUtils.js');
 
+const TIMEOUT = 30000;
+
 /*
 Notes:
 
@@ -115,8 +117,6 @@ const testData = {
     }
 };
 
-const TIMEOUT = 60000;
-
 async function testCellMovement({caseLabel, selectCell, direction}) {
     const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel});
     const cellIndex = t.caseData.cellIndex;
diff --git a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
index 86f60fee8d..52e5ab85f4 100644
--- a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
+++ b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
@@ -2,9 +2,10 @@
 /* eslint {strict: ['error', 'global']} */
 'use strict';
 
-const {login, openNarrative, sendString, clickWhenReady} = require('../wdioUtils.js');
+const {login, sendString, clickWhenReady} = require('../wdioUtils.js');
 const { NarrativeTesting } = require('../NarrativeTesting.js');
 
+const TIMEOUT = 30000;
 
 // Ideally the test data should be the same, except for narrative id, in each env.
 // But currently CI and prod are indexed differently.
@@ -353,7 +354,7 @@ async function openPublicData() {
 
 describe('Test kbaseNarrativeSidePublicTab', () => {
     beforeEach(async () => {
-        await browser.setTimeout({ 'implicit': 30000 });
+        await browser.setTimeout({ 'implicit': TIMEOUT });
         await browser.reloadSession();
         await login();
     });
@@ -363,9 +364,9 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_1'});
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_1', timeout: TIMEOUT});
         
-        await openNarrative(t.caseData.narrativeId);
+        await t.openNarrative(t.caseData.narrativeId);
 
         const publicPanel = await openPublicData();
         const rows = await waitForRows(publicPanel, t.caseData.row);
@@ -389,9 +390,9 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_2'});
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_2', timeout: TIMEOUT});
 
-        await openNarrative(t.caseData.narrativeId);
+        await t.openNarrative(t.caseData.narrativeId);
 
         const publicPanel = await openPublicData();
         const rows = await waitForRows(publicPanel, t.caseData.row);
@@ -415,9 +416,9 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, searches for a term, should find an expected row', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_3'});
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_3', timeout: TIMEOUT});
 
-        await openNarrative(t.caseData.narrativeId);
+        await t.openNarrative(t.caseData.narrativeId);
 
         const publicPanel = await openPublicData();
 
@@ -455,9 +456,9 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, searches for a term which should not be found', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_4'});
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_4', timeout: TIMEOUT});
 
-        await openNarrative(t.caseData.narrativeId);
+        await t.openNarrative(t.caseData.narrativeId);
 
         const publicPanel = await openPublicData();
 
@@ -483,9 +484,9 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
     });
 
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_5'});
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_5', timeout: TIMEOUT});
 
-        await openNarrative(t.caseData.narrativeId);
+        await t.openNarrative(t.caseData.narrativeId);
 
         // Open the data slideout
         const publicPanel = await openPublicData();
diff --git a/test/integration/wdioUtils.js b/test/integration/wdioUtils.js
index 554cc000ff..f0c9e6d589 100644
--- a/test/integration/wdioUtils.js
+++ b/test/integration/wdioUtils.js
@@ -1,5 +1,5 @@
 /* eslint strict: ["error", "global"] */
-/*global browser, $*/
+/*global browser */
 
 'use strict';
 
@@ -58,63 +58,6 @@ async function clickWhenReady(el) {
     await el.click();
 }
 
-/**
-* Navigates the wdio browser to a workspace as given by its id, and waits until the 
-* narrative container is visible.
-* @arg {number} The narrative's workspace id
-* @returns {Promise} The Promise value is ignored.
-*/
-async function openNarrative(workspaceId) {
-    const timeout = 60000;
-
-    // Go to the narrative!
-    await browser.url(makeURL(`narrative/${workspaceId}`));
-
-    // should experience loading blocker for a few seconds.
-    const loadingBlocker = await $('#kb-loading-blocker');
-    await loadingBlocker.waitForDisplayed({
-        timeout,
-        timeoutMsg: `Timeout after waiting ${timeout}ms for loading blocker to appear`
-    }); 
-
-    // And then the loading blocker should disappear!
-    await loadingBlocker.waitForDisplayed({
-        timeout,
-        timeoutMsg: `Timeout after waiting ${timeout}ms for loading blocker to disappear`,
-        reverse: true
-    });
-
-    // Ensure logged in
-    const loginButton = await $('#signin-button > div > button');
-    await loginButton.waitForDisplayed({
-        timeout,
-        timeoutMsg: `Timeout after waiting ${timeout}ms for login button to appear`
-    }); 
-
-    await clickWhenReady(loginButton);
-
-    const realnameElement = await $('[data-element="realname"]');
-    const usernameElement = await $('[data-element="username"]');
-    await browser.waitUntil(async () => {
-        const text = await realnameElement.getText();
-        return (text && text.length > 0);
-    });
-    const realname = await realnameElement.getText();
-    const username = await usernameElement.getText();
-    console.warn(`Signed in as user "${realname}" (${username})`);
-    await loginButton.click();
-    
-    // Ensure narrative notebook has displayed
-    // TODO: more interesting waitUntil loop to signal the 
-    // failure reason (useful for debugging tests?)
-    const container = await $('#notebook-container');
-    await container.waitForDisplayed({
-        timeout,
-        timeoutMsg: `Timeout after waiting ${timeout}ms for narrative to appear`
-    });
-    return container;
-}
-
 function* range(start, end) {
     yield start;
     if (start === end) {
@@ -127,7 +70,6 @@ module.exports = {
     login,
     makeURL,
     sendString,
-    openNarrative,
     clickWhenReady,
     range
 };
\ No newline at end of file

From 234228e09896c7aa5899c07743a38348be3489a7 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Fri, 22 Jan 2021 15:13:09 -0800
Subject: [PATCH 16/42] move test data to separate json file

---
 .../specs/kbaseCellToolbarMenu_data.json      | 165 ++++++++++
 .../specs/kbaseCellToolbarMenu_test.js        |  97 +-----
 .../kbaseNarrativeSidePublicTab_data.json     | 291 +++++++++++++++++
 .../specs/kbaseNarrativeSidePublicTab_test.js | 298 +-----------------
 4 files changed, 458 insertions(+), 393 deletions(-)
 create mode 100644 test/integration/specs/kbaseCellToolbarMenu_data.json
 create mode 100644 test/integration/specs/kbaseNarrativeSidePublicTab_data.json

diff --git a/test/integration/specs/kbaseCellToolbarMenu_data.json b/test/integration/specs/kbaseCellToolbarMenu_data.json
new file mode 100644
index 0000000000..fa4c67f11e
--- /dev/null
+++ b/test/integration/specs/kbaseCellToolbarMenu_data.json
@@ -0,0 +1,165 @@
+{
+    "common": {
+        "unselectedBorder": "1px 1px 1px 5px solid rgb(204, 204, 204)",
+        "selectedBorder": "1px 1px 1px 5px solid rgb(75, 184, 86)",
+        "cells": [
+            {
+                "title": "Narrative Cell Toolbar Testing"
+            },
+            {
+                "title": "Cell 1"
+            },
+            {
+                "title": "Cell 2"
+            },
+            {
+                "body": "Cell 3"
+            },
+            {
+                "body": "Cell 4"
+            }
+        ]
+    },
+    "cases": {
+        "TEST_CASE_1": {
+            "cellIndex": 1,
+            "title": "Narrative Cell Toolbar Testing",
+            "expect": {
+                "afterMove": {
+                    "up": {
+                        "cellOrder": [
+                            1,
+                            2,
+                            3,
+                            4,
+                            5
+                        ]
+                    },
+                    "down": {
+                        "cellOrder": [
+                            2,
+                            1,
+                            3,
+                            4,
+                            5
+                        ]
+                    }
+                }
+            }
+        },
+        "TEST_CASE_2": {
+            "cellIndex": 2,
+            "title": "Cell 1",
+            "expect": {
+                "afterMove": {
+                    "up": {
+                        "cellOrder": [
+                            2,
+                            1,
+                            3,
+                            4,
+                            5
+                        ]
+                    },
+                    "down": {
+                        "cellOrder": [
+                            1,
+                            3,
+                            2,
+                            4,
+                            5
+                        ]
+                    }
+                }
+            }
+        },
+        "TEST_CASE_3": {
+            "cellIndex": 3,
+            "title": "Cell 2",
+            "expect": {
+                "afterMove": {
+                    "up": {
+                        "cellOrder": [
+                            1,
+                            3,
+                            2,
+                            4,
+                            5
+                        ]
+                    },
+                    "down": {
+                        "cellOrder": [
+                            1,
+                            2,
+                            4,
+                            3,
+                            5
+                        ]
+                    }
+                }
+            }
+        },
+        "TEST_CASE_4": {
+            "cellIndex": 4,
+            "body": "Cell 3",
+            "expect": {
+                "afterMove": {
+                    "up": {
+                        "cellOrder": [
+                            1,
+                            2,
+                            4,
+                            3,
+                            5
+                        ]
+                    },
+                    "down": {
+                        "cellOrder": [
+                            1,
+                            2,
+                            3,
+                            5,
+                            4
+                        ]
+                    }
+                }
+            }
+        },
+        "TEST_CASE_5": {
+            "cellIndex": 5,
+            "body": "Cell 4",
+            "expect": {
+                "afterMove": {
+                    "up": {
+                        "cellOrder": [
+                            1,
+                            2,
+                            3,
+                            5,
+                            4
+                        ]
+                    },
+                    "down": {
+                        "cellOrder": [
+                            1,
+                            2,
+                            3,
+                            4,
+                            5
+                        ]
+                    }
+                }
+            }
+        }
+    },
+    "ci": {
+        "defaults": {
+            "narrativeId": 58675
+        }
+    },
+    "narrative-dev": {
+        "defaults": {
+            "narrativeId": 80970
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index 0c29464cc0..d446f27f77 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -4,6 +4,7 @@
 
 const { NarrativeTesting } = require('../NarrativeTesting.js');
 const { login, clickWhenReady } = require('../wdioUtils.js');
+const testData = require('./kbaseCellToolbarMenu_data.json');
 
 const TIMEOUT = 30000;
 
@@ -21,102 +22,6 @@ test cases can be could be in separate files.
 
 */
 
-const testData = {
-    common: {
-        unselectedBorder: '1px 1px 1px 5px solid rgb(204, 204, 204)',
-        selectedBorder: '1px 1px 1px 5px solid rgb(75, 184, 86)',
-        cells: [
-            {title: 'Narrative Cell Toolbar Testing'},
-            {title: 'Cell 1'},
-            {title: 'Cell 2'},
-            {body: 'Cell 3'},
-            {body: 'Cell 4'}
-        ]
-    },
-    cases: {
-        TEST_CASE_1: {
-            cellIndex: 1,
-            title: 'Narrative Cell Toolbar Testing',
-            expect: {
-                afterMove: {
-                    up: {
-                        cellOrder: [1, 2, 3, 4, 5]
-                    },
-                    down: {
-                        cellOrder: [2, 1, 3, 4, 5]
-                    }
-                }
-            }
-        },
-        TEST_CASE_2: {
-            cellIndex: 2,
-            title: 'Cell 1',
-            expect: {
-                afterMove: {
-                    up: {
-                        cellOrder: [2, 1, 3, 4, 5]
-                    },
-                    down: {
-                        cellOrder: [1, 3, 2, 4, 5]
-                    }
-                }
-            }
-        },
-        TEST_CASE_3: {
-            cellIndex: 3,
-            title: 'Cell 2',
-            expect: {
-                afterMove: {
-                    up: {
-                        cellOrder: [1, 3, 2, 4, 5]
-                    },
-                    down: {
-                        cellOrder: [1, 2, 4, 3, 5]
-                    }
-                }
-            }
-        },
-        TEST_CASE_4: {
-            cellIndex: 4,
-            body: 'Cell 3',
-            expect: {
-                afterMove: {
-                    up: {
-                        cellOrder: [1, 2, 4, 3, 5]
-                    },
-                    down: {
-                        cellOrder: [1, 2, 3, 5, 4]
-                    }
-                }
-            }
-        },
-        TEST_CASE_5: {
-            cellIndex: 5,
-            body: 'Cell 4',
-            expect: {
-                afterMove: {
-                    up: {
-                        cellOrder: [1, 2, 3, 5, 4]
-                    },
-                    down: {
-                        cellOrder: [1, 2, 3, 4, 5]
-                    }
-                }
-            }
-        }
-    },
-    ci: {
-        defaults: {
-            narrativeId: 58675
-        }
-    },
-    'narrative-dev': {
-        defaults: {
-            narrativeId: 80970
-        }
-    }
-};
-
 async function testCellMovement({caseLabel, selectCell, direction}) {
     const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel});
     const cellIndex = t.caseData.cellIndex;
diff --git a/test/integration/specs/kbaseNarrativeSidePublicTab_data.json b/test/integration/specs/kbaseNarrativeSidePublicTab_data.json
new file mode 100644
index 0000000000..8ecc11dafa
--- /dev/null
+++ b/test/integration/specs/kbaseNarrativeSidePublicTab_data.json
@@ -0,0 +1,291 @@
+{
+    "cases": {
+        "TEST_CASE_1": {},
+        "TEST_CASE_2": {},
+        "TEST_CASE_3": {},
+        "TEST_CASE_4": {},
+        "TEST_CASE_5": {}
+    },
+    "ci": {
+        "defaults": {
+            "narrativeId": 53983
+        },
+        "TEST_CASE_1": {
+            "row": 4,
+            "name": "Acetobacter ascendens",
+            "metadata": [
+                {
+                    "id": "lineage",
+                    "label": "Lineage",
+                    "value": "Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter"
+                },
+                {
+                    "id": "kbase_id",
+                    "label": "KBase ID",
+                    "value": "GCF_001766255.1"
+                },
+                {
+                    "id": "refseq_id",
+                    "label": "RefSeq ID",
+                    "value": "NZ_CP015168"
+                },
+                {
+                    "id": "contigs",
+                    "label": "Contigs",
+                    "value": "4"
+                },
+                {
+                    "id": "features",
+                    "label": "Features",
+                    "value": "3,032"
+                }
+            ]
+        },
+        "TEST_CASE_2": {
+            "row": 10,
+            "scrollTo": true,
+            "name": "Acidaminococcus fermentans",
+            "metadata": [
+                {
+                    "id": "lineage",
+                    "label": "Lineage",
+                    "value": "Bacteria > Terrabacteria group > Firmicutes > Negativicutes > Acidaminococcales > Acidaminococcaceae > Acidaminococcus"
+                },
+                {
+                    "id": "kbase_id",
+                    "label": "KBase ID",
+                    "value": "GCF_900107075.1"
+                },
+                {
+                    "id": "refseq_id",
+                    "label": "RefSeq ID",
+                    "value": "NZ_FNOP01000039"
+                },
+                {
+                    "id": "contigs",
+                    "label": "Contigs",
+                    "value": "40"
+                },
+                {
+                    "id": "features",
+                    "label": "Features",
+                    "value": "2,067"
+                }
+            ]
+        },
+        "TEST_CASE_3": {
+            "row": 1,
+            "scrollTo": false,
+            "searchFor": "prochlorococcus",
+            "foundCount": "14",
+            "name": "Prochlorococcus marinus str. GP2",
+            "metadata": [
+                {
+                    "id": "lineage",
+                    "label": "Lineage",
+                    "value": "Bacteria > Terrabacteria group > Cyanobacteria/Melainabacteria group > Cyanobacteria > Synechococcales > Prochloraceae > Prochlorococcus > Prochlorococcus marinus"
+                },
+                {
+                    "id": "kbase_id",
+                    "label": "KBase ID",
+                    "value": "GCF_000759885.1"
+                },
+                {
+                    "id": "refseq_id",
+                    "label": "RefSeq ID",
+                    "value": "NZ_JNAH01000001"
+                },
+                {
+                    "id": "contigs",
+                    "label": "Contigs",
+                    "value": "11"
+                },
+                {
+                    "id": "features",
+                    "label": "Features",
+                    "value": "1,760"
+                }
+            ]
+        },
+        "TEST_CASE_4": {
+            "searchFor": "foobar",
+            "foundCount": "None"
+        },
+        "TEST_CASE_5": {
+            "row": 30,
+            "scrollTo": true,
+            "scrolls": [
+                20
+            ],
+            "name": "Acinetobacter baumannii",
+            "metadata": [
+                {
+                    "id": "lineage",
+                    "label": "Lineage",
+                    "value": "Bacteria > Proteobacteria > Gammaproteobacteria > Pseudomonadales > Moraxellaceae > Acinetobacter > Acinetobacter calcoaceticus/baumannii complex"
+                },
+                {
+                    "id": "kbase_id",
+                    "label": "KBase ID",
+                    "value": "GCF_000804875.1"
+                },
+                {
+                    "id": "refseq_id",
+                    "label": "RefSeq ID",
+                    "value": "NZ_JSCS01000001"
+                },
+                {
+                    "id": "contigs",
+                    "label": "Contigs",
+                    "value": "74"
+                },
+                {
+                    "id": "features",
+                    "label": "Features",
+                    "value": "3,862"
+                }
+            ]
+        }
+    },
+    "narrative-dev": {
+        "defaults": {
+            "narrativeId": 78050
+        },
+        "TEST_CASE_1": {
+            "row": 3,
+            "name": "Absiella sp. AM09-45",
+            "metadata": [
+                {
+                    "id": "lineage",
+                    "label": "Lineage",
+                    "value": "Bacteria > Terrabacteria group > Firmicutes > Erysipelotrichia > Erysipelotrichales > Erysipelotrichaceae > Absiella > unclassified Absiella"
+                },
+                {
+                    "id": "kbase_id",
+                    "label": "KBase ID",
+                    "value": "GCF_003433745.1"
+                },
+                {
+                    "id": "refseq_id",
+                    "label": "RefSeq ID",
+                    "value": "NZ_QVFJ01000001"
+                },
+                {
+                    "id": "contigs",
+                    "label": "Contigs",
+                    "value": "96"
+                },
+                {
+                    "id": "features",
+                    "label": "Features",
+                    "value": "4,170"
+                }
+            ]
+        },
+        "TEST_CASE_2": {
+            "row": 10,
+            "scrollTo": true,
+            "name": "Abyssicoccus albus",
+            "metadata": [
+                {
+                    "id": "lineage",
+                    "label": "Lineage",
+                    "value": "Bacteria > Terrabacteria group > Firmicutes > Bacilli > Bacillales > Staphylococcaceae > Abyssicoccus"
+                },
+                {
+                    "id": "kbase_id",
+                    "label": "KBase ID",
+                    "value": "GCF_003815035.1"
+                },
+                {
+                    "id": "refseq_id",
+                    "label": "RefSeq ID",
+                    "value": "NZ_RKRK01000002"
+                },
+                {
+                    "id": "contigs",
+                    "label": "Contigs",
+                    "value": "10"
+                },
+                {
+                    "id": "features",
+                    "label": "Features",
+                    "value": "1,777"
+                }
+            ]
+        },
+        "TEST_CASE_3": {
+            "row": 1,
+            "scrollTo": false,
+            "searchFor": "prochlorococcus",
+            "foundCount": "28",
+            "name": "Prochlorococcus marinus",
+            "metadata": [
+                {
+                    "id": "lineage",
+                    "label": "Lineage",
+                    "value": "Bacteria > Terrabacteria group > Cyanobacteria/Melainabacteria group > Cyanobacteria > Synechococcales > Prochloraceae > Prochlorococcus"
+                },
+                {
+                    "id": "kbase_id",
+                    "label": "KBase ID",
+                    "value": "GCF_001180245.1"
+                },
+                {
+                    "id": "refseq_id",
+                    "label": "RefSeq ID",
+                    "value": "NZ_CVSV01000001"
+                },
+                {
+                    "id": "contigs",
+                    "label": "Contigs",
+                    "value": "136"
+                },
+                {
+                    "id": "features",
+                    "label": "Features",
+                    "value": "1,648"
+                }
+            ]
+        },
+        "TEST_CASE_4": {
+            "searchFor": "foobar",
+            "foundCount": "None"
+        },
+        "TEST_CASE_5": {
+            "row": 30,
+            "scrollTo": true,
+            "scrolls": [
+                20
+            ],
+            "name": "Acetobacter orientalis",
+            "metadata": [
+                {
+                    "id": "lineage",
+                    "label": "Lineage",
+                    "value": "Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter"
+                },
+                {
+                    "id": "kbase_id",
+                    "label": "KBase ID",
+                    "value": "GCF_002153475.1"
+                },
+                {
+                    "id": "refseq_id",
+                    "label": "RefSeq ID",
+                    "value": "NZ_JOMO01000001"
+                },
+                {
+                    "id": "contigs",
+                    "label": "Contigs",
+                    "value": "106"
+                },
+                {
+                    "id": "features",
+                    "label": "Features",
+                    "value": "2,539"
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
index 52e5ab85f4..0f99b31b5d 100644
--- a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
+++ b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
@@ -4,306 +4,10 @@
 
 const {login, sendString, clickWhenReady} = require('../wdioUtils.js');
 const { NarrativeTesting } = require('../NarrativeTesting.js');
+const testData = require('./kbaseNarrativeSidePublicTab_data.json');
 
 const TIMEOUT = 30000;
 
-// Ideally the test data should be the same, except for narrative id, in each env.
-// But currently CI and prod are indexed differently.
-
-// Note that the narrativeIds used below must be owned or shared with full rights (at least edit) with the narrativetest user.
-// Note that narrativetest is not yet set up in narrative-dev/prod.
-const testData = {
-    cases: {
-        TEST_CASE_1: {},
-        TEST_CASE_2: {},
-        TEST_CASE_3: {},
-        TEST_CASE_4: {},
-        TEST_CASE_5: {}
-    },
-    ci: {
-        defaults: {
-            narrativeId: 53983,
-        },
-        TEST_CASE_1: {
-            row: 4,
-            name: 'Acetobacter ascendens',
-            metadata: [
-                {
-                    id: 'lineage',
-                    label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter'
-                },
-                {
-                    id: 'kbase_id',
-                    label: 'KBase ID',
-                    value: 'GCF_001766255.1'
-                },
-                {
-                    id: 'refseq_id',
-                    label: 'RefSeq ID',
-                    value: 'NZ_CP015168'
-                },
-                {
-                    id: 'contigs',
-                    label: 'Contigs',
-                    value: '4'
-                },
-                {
-                    id: 'features',
-                    label: 'Features',
-                    value: '3,032'
-                }
-            ]
-        },
-        TEST_CASE_2: {
-            row: 10,
-            scrollTo: true,
-            name: 'Acidaminococcus fermentans',
-            metadata: [
-                {
-                    id: 'lineage',
-                    label: 'Lineage',
-                    value: 'Bacteria > Terrabacteria group > Firmicutes > Negativicutes > Acidaminococcales > Acidaminococcaceae > Acidaminococcus'
-                },
-                {
-                    id: 'kbase_id',
-                    label: 'KBase ID',
-                    value: 'GCF_900107075.1'
-                },
-                {
-                    id: 'refseq_id',
-                    label: 'RefSeq ID',
-                    value: 'NZ_FNOP01000039'
-                },
-                {
-                    id: 'contigs',
-                    label: 'Contigs',
-                    value: '40'
-                },
-                {
-                    id: 'features',
-                    label: 'Features',
-                    value: '2,067'
-                }
-            ]
-        },
-        TEST_CASE_3: {
-            row: 1,
-            scrollTo: false,
-            searchFor: 'prochlorococcus',
-            foundCount: '14',
-            name: 'Prochlorococcus marinus str. GP2',
-            metadata: [
-                {
-                    id: 'lineage',
-                    label: 'Lineage',
-                    value: 'Bacteria > Terrabacteria group > Cyanobacteria/Melainabacteria group > Cyanobacteria > Synechococcales > Prochloraceae > Prochlorococcus > Prochlorococcus marinus'
-                },
-                {
-                    id: 'kbase_id',
-                    label: 'KBase ID',
-                    value: 'GCF_000759885.1'
-                },
-                {
-                    id: 'refseq_id',
-                    label: 'RefSeq ID',
-                    value: 'NZ_JNAH01000001'
-                },
-                {
-                    id: 'contigs',
-                    label: 'Contigs',
-                    value: '11'
-                },
-                {
-                    id: 'features',
-                    label: 'Features',
-                    value: '1,760'
-                }
-            ]
-        },
-        TEST_CASE_4: {
-            searchFor: 'foobar',
-            foundCount: 'None'
-        },
-        TEST_CASE_5: {
-            row: 30,
-            scrollTo: true,
-            scrolls: [
-                20
-            ],
-            name: 'Acinetobacter baumannii',
-            metadata: [
-                {
-                    id: 'lineage',
-                    label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Gammaproteobacteria > Pseudomonadales > Moraxellaceae > Acinetobacter > Acinetobacter calcoaceticus/baumannii complex'
-                },
-                {
-                    id: 'kbase_id',
-                    label: 'KBase ID',
-                    value: 'GCF_000804875.1'
-                },
-                {
-                    id: 'refseq_id',
-                    label: 'RefSeq ID',
-                    value: 'NZ_JSCS01000001'
-                },
-                {
-                    id: 'contigs',
-                    label: 'Contigs',
-                    value: '74'
-                },
-                {
-                    id: 'features',
-                    label: 'Features',
-                    value: '3,862'
-                }
-            ]
-        }
-    },
-    'narrative-dev':  {
-        defaults: {
-            narrativeId: 78050
-        },
-        TEST_CASE_1: {
-            row: 3,
-            name: 'Absiella sp. AM09-45',
-            metadata: [
-                {
-                    id: 'lineage',
-                    label: 'Lineage',
-                    value: 'Bacteria > Terrabacteria group > Firmicutes > Erysipelotrichia > Erysipelotrichales > Erysipelotrichaceae > Absiella > unclassified Absiella'
-                },
-                {
-                    id: 'kbase_id',
-                    label: 'KBase ID',
-                    value: 'GCF_003433745.1'
-                },
-                {
-                    id: 'refseq_id',
-                    label: 'RefSeq ID',
-                    value: 'NZ_QVFJ01000001'
-                },
-                {
-                    id: 'contigs',
-                    label: 'Contigs',
-                    value: '96'
-                },
-                {
-                    id: 'features',
-                    label: 'Features',
-                    value: '4,170'
-                }
-            ]
-        },
-        TEST_CASE_2: {
-            row: 10,
-            scrollTo: true,
-            name: 'Abyssicoccus albus',
-            metadata: [
-                {
-                    id: 'lineage',
-                    label: 'Lineage',
-                    value: 'Bacteria > Terrabacteria group > Firmicutes > Bacilli > Bacillales > Staphylococcaceae > Abyssicoccus'
-                },
-                {
-                    id: 'kbase_id',
-                    label: 'KBase ID',
-                    value: 'GCF_003815035.1'
-                },
-                {
-                    id: 'refseq_id',
-                    label: 'RefSeq ID',
-                    value: 'NZ_RKRK01000002'
-                },
-                {
-                    id: 'contigs',
-                    label: 'Contigs',
-                    value: '10'
-                },
-                {
-                    id: 'features',
-                    label: 'Features',
-                    value: '1,777'
-                }
-            ]
-        },
-        TEST_CASE_3: {
-            row: 1,
-            scrollTo: false,
-            searchFor: 'prochlorococcus',
-            foundCount: '28',
-            name: 'Prochlorococcus marinus',
-            metadata: [
-                {
-                    id: 'lineage',
-                    label: 'Lineage',
-                    value: 'Bacteria > Terrabacteria group > Cyanobacteria/Melainabacteria group > Cyanobacteria > Synechococcales > Prochloraceae > Prochlorococcus'
-                },
-                {
-                    id: 'kbase_id',
-                    label: 'KBase ID',
-                    value: 'GCF_001180245.1'
-                },
-                {
-                    id: 'refseq_id',
-                    label: 'RefSeq ID',
-                    value: 'NZ_CVSV01000001'
-                },
-                {
-                    id: 'contigs',
-                    label: 'Contigs',
-                    value: '136'
-                },
-                {
-                    id: 'features',
-                    label: 'Features',
-                    value: '1,648'
-                }
-            ]
-        },
-        TEST_CASE_4: {
-            searchFor: 'foobar',
-            foundCount: 'None'
-        },
-        TEST_CASE_5: {
-            row: 30,
-            scrollTo: true,
-            scrolls: [
-                20
-            ],
-            name: 'Acetobacter orientalis',
-            metadata: [
-                {
-                    id: 'lineage',
-                    label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter'
-                },
-                {
-                    id: 'kbase_id',
-                    label: 'KBase ID',
-                    value: 'GCF_002153475.1'
-                },
-                {
-                    id: 'refseq_id',
-                    label: 'RefSeq ID',
-                    value: 'NZ_JOMO01000001'
-                },
-                {
-                    id: 'contigs',
-                    label: 'Contigs',
-                    value: '106'
-                },
-                {
-                    id: 'features',
-                    label: 'Features',
-                    value: '2,539'
-                }
-            ]
-        }
-    }
-};
-
 async function testField({container, id, label, value}) {
     const lineageLabel = await container.$(`[role="row"][data-test-id="${id}"] [data-test-id="label"]`);
     expect(lineageLabel).toHaveText(label);

From 417067665d4fa6b4ebcbe01f7056472fecf2da87 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Sat, 23 Jan 2021 08:52:36 -0800
Subject: [PATCH 17/42] change test data to match ci changes

---
 .../specs/kbaseNarrativeSidePublicTab_data.json           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/integration/specs/kbaseNarrativeSidePublicTab_data.json b/test/integration/specs/kbaseNarrativeSidePublicTab_data.json
index 8ecc11dafa..ee54667279 100644
--- a/test/integration/specs/kbaseNarrativeSidePublicTab_data.json
+++ b/test/integration/specs/kbaseNarrativeSidePublicTab_data.json
@@ -127,22 +127,22 @@
                 {
                     "id": "kbase_id",
                     "label": "KBase ID",
-                    "value": "GCF_000804875.1"
+                    "value": "GCF_000695855.3"
                 },
                 {
                     "id": "refseq_id",
                     "label": "RefSeq ID",
-                    "value": "NZ_JSCS01000001"
+                    "value": "NZ_CP007535"
                 },
                 {
                     "id": "contigs",
                     "label": "Contigs",
-                    "value": "74"
+                    "value": "3"
                 },
                 {
                     "id": "features",
                     "label": "Features",
-                    "value": "3,862"
+                    "value": "3,739"
                 }
             ]
         }

From 22454ca5e7ad41830022751b6ea8907d8c0fd003 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Sat, 23 Jan 2021 08:53:39 -0800
Subject: [PATCH 18/42] refactor some common code into functions; fix usage of
 async expect

---
 .../specs/kbaseNarrativeSidePublicTab_test.js | 191 ++++++++----------
 1 file changed, 82 insertions(+), 109 deletions(-)

diff --git a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
index 0f99b31b5d..f3d091182e 100644
--- a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
+++ b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
@@ -9,10 +9,10 @@ const testData = require('./kbaseNarrativeSidePublicTab_data.json');
 const TIMEOUT = 30000;
 
 async function testField({container, id, label, value}) {
-    const lineageLabel = await container.$(`[role="row"][data-test-id="${id}"] [data-test-id="label"]`);
-    expect(lineageLabel).toHaveText(label);
-    const lineageValue = await container.$(`[role="row"][data-test-id="${id}"] [data-test-id="value"]`);
-    expect(lineageValue).toHaveText(value);
+    const labelElement = await container.$(`[role="row"][data-test-id="${id}"] [data-test-id="label"]`);
+    await expect(labelElement).toHaveText(label);
+    const valueElement = await container.$(`[role="row"][data-test-id="${id}"] [data-test-id="value"]`);
+    await expect(valueElement).toHaveText(value);
 }
 
 async function waitForRows(panel, count){
@@ -23,7 +23,9 @@ async function waitForRows(panel, count){
     return await panel.$$('[role="table"][data-test-id="result"] > div > [role="row"]');
 }
 
-async function openPublicData() {
+async function openPublicDataPanel(t) {
+    await t.openNarrative(t.caseData.narrativeId);
+
     // Open the data slideout
     const button = await $('[data-test-id="data-slideout-button"]');
     await button.waitForExist();
@@ -52,10 +54,58 @@ async function openPublicData() {
     // Maybe roles are not suitable for integration tests, then.
     
     const rows = await waitForRows(publicPanel, 20);
-    expect(rows.length).toEqual(20);
+    await expect(rows.length).toEqual(20);
     return publicPanel;
 }
 
+/**
+ * Tests the a row to ensure that columns have the values specified
+ * in the test data.
+ * @param {} row 
+ * @param {*} t 
+ */
+async function testRow(row, t) {
+    const nameCell = await row.$('[role="cell"][data-test-id="name"]');
+    await expect(nameCell).toHaveText(t.caseData.name);
+
+    // Confirm the metadata fields.
+    for (const {id, label, value} of t.caseData.metadata) {
+        await testField({
+            container: row, 
+            id, 
+            label, 
+            value
+        });
+    }
+}
+
+async function getPublicDataRows(t) {
+    const publicPanel = await openPublicDataPanel(t);
+    const rows = await waitForRows(publicPanel, t.caseData.row);
+    await expect(rows.length).toBeGreaterThanOrEqual(t.caseData.row);
+    return rows;
+}
+
+async function waitForRow(publicPanel, rowNumber) {
+    const rows = await waitForRows(publicPanel, rowNumber);
+    const row = rows[rowNumber - 1];
+    await row.scrollIntoView();
+    return row;
+}
+
+async function testPublicDataRow(t, scrollIntoView) {
+    const rows = await getPublicDataRows(t);
+
+    // get row
+    const row = rows[t.caseData.row - 1];
+    if (scrollIntoView) {
+        await row.scrollIntoView();
+    }
+    await expect(row).toBeDefined();
+
+    await testRow(row, t);
+}
+
 describe('Test kbaseNarrativeSidePublicTab', () => {
     beforeEach(async () => {
         await browser.setTimeout({ 'implicit': TIMEOUT });
@@ -69,62 +119,40 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
 
     it('opens the public data search tab, should show default results', async () => {
         const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_1', timeout: TIMEOUT});
-        
-        await t.openNarrative(t.caseData.narrativeId);
-
-        const publicPanel = await openPublicData();
-        const rows = await waitForRows(publicPanel, t.caseData.row);
-
-        expect(rows.length).toBeGreaterThanOrEqual(t.caseData.row);
-        const row = rows[t.caseData.row - 1];
-        expect(row).toBeDefined();
-
-        const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(t.caseData.name);
-
-        // Confirm the metadata fields.
-        for (const {id, label, value} of t.caseData.metadata) {
-            await testField({
-                container: row, 
-                id, 
-                label, 
-                value
-            });
-        }
+        await testPublicDataRow(t, false);
     });
 
     it('opens the public data search tab, should show default results, scroll to desired row', async () => {
         const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_2', timeout: TIMEOUT});
+        await testPublicDataRow(t, true);
+    });
+
+    it('opens the public data search tab, should show default results, scroll to desired row', async () => {
+        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_5', timeout: TIMEOUT});
 
-        await t.openNarrative(t.caseData.narrativeId);
+        const publicPanel = await openPublicDataPanel(t);
 
-        const publicPanel = await openPublicData();
-        const rows = await waitForRows(publicPanel, t.caseData.row);
+        for (const scrollRow of t.caseData.scrolls) {
+            const rowElements = await waitForRows(publicPanel, scrollRow);
+            const rowElement = rowElements[scrollRow - 1];
+            await rowElement.scrollIntoView();
+        }
 
-        // Look at the row - it should already be in view.
+        const rows = await waitForRows(publicPanel, t.caseData.row);
         const row = rows[t.caseData.row - 1];
         await row.scrollIntoView();
+        await expect(row).toBeVisible();
+        await testRow(row, t);
+    });
 
-        const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(t.caseData.name);
-
-        // Confirm the metadata fields.
-        for (const {id, label, value} of t.caseData.metadata) {
-            await testField({
-                container: row, 
-                id, 
-                label, 
-                value
-            });
-        }
+    it('does nothing', async () => {
+        await expect(1).toEqual(1);
     });
 
     it('opens the public data search tab, searches for a term, should find an expected row', async () => {
         const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_3', timeout: TIMEOUT});
 
-        await t.openNarrative(t.caseData.narrativeId);
-
-        const publicPanel = await openPublicData();
+        const publicPanel = await openPublicDataPanel(t);
 
         // Select search input and input a search term
         const searchInput = await publicPanel.$('[data-test-id="search-input"]');
@@ -132,39 +160,18 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
         await sendString(t.caseData.searchFor);
         await browser.keys('Enter');
 
+        // Ensure the correct number of items was found.
         const foundCount = await publicPanel.$('[data-test-id="found-count"]');
-        expect(foundCount).toHaveText(t.caseData.foundCount);
-
-        // get rows
-        // When using roles, we sometimes need to be very specific in our queries.
-        // Maybe roles are not suitable for integration tests, then.
-        const rows = await waitForRows(publicPanel, t.caseData.row);
-
-        expect(rows.length).toBeGreaterThanOrEqual(t.caseData.row);
+        await expect(foundCount).toHaveText(t.caseData.foundCount);
 
-        // Look at the row - it should already be in view.
-        const row = rows[t.caseData.row - 1];
-        await row.scrollIntoView();
-        const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(t.caseData.name);
-
-        // Confirm the metadata fields.
-        for (const {id, label, value} of t.caseData.metadata) {
-            await testField({
-                container: row, 
-                id, 
-                label, 
-                value
-            });
-        }
+        const row = await waitForRow(publicPanel, t.caseData.row);
+        await testRow(row, t);
     });
 
     it('opens the public data search tab, searches for a term which should not be found', async () => {
         const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_4', timeout: TIMEOUT});
 
-        await t.openNarrative(t.caseData.narrativeId);
-
-        const publicPanel = await openPublicData();
+        const publicPanel = await openPublicDataPanel(t);
 
         // Select search input and input a search term
         const searchInput = await publicPanel.$('[data-test-id="search-input"]');
@@ -172,6 +179,7 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
         await sendString(t.caseData.searchFor);
         await browser.keys('Enter');
 
+        // Ensure that the reported found count matches expectations.
         await browser.waitUntil(async () => {
             const foundCountElement = await publicPanel.$('[data-test-id="found-count"]');
             
@@ -184,41 +192,6 @@ describe('Test kbaseNarrativeSidePublicTab', () => {
         });
         
         const foundCount = await publicPanel.$('[data-test-id="found-count"]');
-        expect(foundCount).toHaveText(t.caseData.foundCount);
-    });
-
-    it('opens the public data search tab, should show default results, scroll to desired row', async () => {
-        const t = new NarrativeTesting({testData, caseLabel: 'TEST_CASE_5', timeout: TIMEOUT});
-
-        await t.openNarrative(t.caseData.narrativeId);
-
-        // Open the data slideout
-        const publicPanel = await openPublicData();
-
-        // get rows
-        // When using roles, we sometimes need to be very specific in our queries.
-        // Maybe roles are not suitable for integration tests, then.
-        for (const scrollRow of t.caseData.scrolls) {
-            const rowElements = await waitForRows(publicPanel, scrollRow);
-            const rowElement = rowElements[scrollRow - 1];
-            await rowElement.scrollIntoView();
-        }
-
-        // ensure we have all of the rows.
-        const rows = await waitForRows(publicPanel, t.caseData.row);
-        const row = rows[t.caseData.row - 1];
-        await row.scrollIntoView();
-        const nameCell = await row.$('[role="cell"][data-test-id="name"]');
-        expect(nameCell).toHaveText(t.caseData.name);
-
-        // Confirm the metadata fields.
-        for (const {id, label, value} of t.caseData.metadata) {
-            await testField({
-                container: row, 
-                id, 
-                label, 
-                value
-            });
-        }
+        await expect(foundCount).toHaveText(t.caseData.foundCount);
     });
 });

From 574ef346b81df372d23bee711a5633245f6da3a5 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Mon, 25 Jan 2021 18:33:13 -0800
Subject: [PATCH 19/42] test config should use narrativetest as the test user

---
 test/testConfig.json | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/test/testConfig.json b/test/testConfig.json
index 387ccc3eda..b856b37c4b 100644
--- a/test/testConfig.json
+++ b/test/testConfig.json
@@ -1,12 +1,14 @@
 {
     "token": {
-        "user": "wjriehl",
-        "file": "test/wjriehl.tok"
+        "user": "narrativetest",
+        "file": "test/narrativetest.tok"
     },
     "currentNarrative": "bar",
-    "data": [{
-        "file": "/test/data/blah.xyz",
-        "type": "Module.type-1.0",
-        "name": "obj_name"
-    }]
-}
+    "data": [
+        {
+            "file": "/test/data/blah.xyz",
+            "type": "Module.type-1.0",
+            "name": "obj_name"
+        }
+    ]
+}
\ No newline at end of file

From c26d813b7fd11f28074e078c6bb80c766e96c726 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Tue, 26 Jan 2021 09:59:18 -0800
Subject: [PATCH 20/42] use chrome binary in pupeteer - github's ubuntu should
 be fixed to support it now

---
 package-lock.json             | 151 +++++++++++++++++-----------------
 package.json                  |   4 +-
 test/integration/wdio.conf.js |   6 +-
 3 files changed, 83 insertions(+), 78 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 43cb486a4f..3b3dc6c14a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -377,28 +377,28 @@
       }
     },
     "@nodelib/fs.scandir": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
-      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
+      "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "2.0.3",
+        "@nodelib/fs.stat": "2.0.4",
         "run-parallel": "^1.1.9"
       }
     },
     "@nodelib/fs.stat": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
-      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
+      "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
       "dev": true
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
-      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
+      "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.scandir": "2.1.3",
+        "@nodelib/fs.scandir": "2.1.4",
         "fastq": "^1.6.0"
       }
     },
@@ -1193,12 +1193,20 @@
       "dev": true
     },
     "axios": {
-      "version": "0.19.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
-      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
       "dev": true,
       "requires": {
-        "follow-redirects": "1.5.10"
+        "follow-redirects": "^1.10.0"
+      },
+      "dependencies": {
+        "follow-redirects": {
+          "version": "1.13.2",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
+          "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
+          "dev": true
+        }
       }
     },
     "backo2": {
@@ -1626,17 +1634,18 @@
       }
     },
     "chromedriver": {
-      "version": "87.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-87.0.0.tgz",
-      "integrity": "sha512-PY7FnHOQKfH0oPfSdhpLx5nEy5g4dGYySf2C/WZGkAaCaldYH8/3lPPucZ8MlOCi4bCSGoKoCUTeG6+wYWavvw==",
+      "version": "88.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-88.0.0.tgz",
+      "integrity": "sha512-EE8rXh7mikxk3VWKjUsz0KCUX8d3HkQ4HgMNJhWrWjzju12dKPPVHO9MY+YaAI5ryXrXGNf0Y4HcNKgW36P/CA==",
       "dev": true,
       "requires": {
         "@testim/chrome-version": "^1.0.7",
-        "axios": "^0.19.2",
-        "del": "^5.1.0",
+        "axios": "^0.21.1",
+        "del": "^6.0.0",
         "extract-zip": "^2.0.1",
         "https-proxy-agent": "^5.0.0",
         "mkdirp": "^1.0.4",
+        "proxy-from-env": "^1.1.0",
         "tcp-port-used": "^1.0.1"
       },
       "dependencies": {
@@ -2117,18 +2126,18 @@
       }
     },
     "del": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz",
-      "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz",
+      "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==",
       "dev": true,
       "requires": {
-        "globby": "^10.0.1",
-        "graceful-fs": "^4.2.2",
+        "globby": "^11.0.1",
+        "graceful-fs": "^4.2.4",
         "is-glob": "^4.0.1",
         "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.1",
-        "p-map": "^3.0.0",
-        "rimraf": "^3.0.0",
+        "is-path-inside": "^3.0.2",
+        "p-map": "^4.0.0",
+        "rimraf": "^3.0.2",
         "slash": "^3.0.0"
       }
     },
@@ -2976,9 +2985,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
-      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
+      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -3002,9 +3011,9 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz",
-      "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz",
+      "integrity": "sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -3386,18 +3395,16 @@
       "dev": true
     },
     "globby": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz",
-      "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==",
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz",
+      "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==",
       "dev": true,
       "requires": {
-        "@types/glob": "^7.1.1",
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.0.3",
-        "glob": "^7.1.3",
-        "ignore": "^5.1.1",
-        "merge2": "^1.2.3",
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
         "slash": "^3.0.0"
       }
     },
@@ -4125,9 +4132,9 @@
       "dev": true
     },
     "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
+      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
       "dev": true
     },
     "is-absolute": {
@@ -4395,14 +4402,14 @@
       }
     },
     "is2": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.1.tgz",
-      "integrity": "sha512-+WaJvnaA7aJySz2q/8sLjMb2Mw14KTplHmSwcSpZ/fWJPkUmqw3YTzSWbPJ7OAwRvdYTWF2Wg+yYJ1AdP5Z8CA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.6.tgz",
+      "integrity": "sha512-+Z62OHOjA6k2sUDOKXoZI3EXv7Fb1K52jpTBLbkfx62bcUeSsrTBLhEquCRDKTx0XE5XbHcG/S2vrtE3lnEDsQ==",
       "dev": true,
       "requires": {
         "deep-is": "^0.1.3",
-        "ip-regex": "^2.1.0",
-        "is-url": "^1.2.2"
+        "ip-regex": "^4.1.0",
+        "is-url": "^1.2.4"
       }
     },
     "isarray": {
@@ -6369,9 +6376,9 @@
       }
     },
     "p-map": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
       "requires": {
         "aggregate-error": "^3.0.0"
@@ -6672,13 +6679,13 @@
       "dev": true
     },
     "puppeteer": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-5.4.0.tgz",
-      "integrity": "sha512-LgTqVW2ClEP4XGAT64FLQ0QWVhdNSRwJp9HfMFVfoJlZHGQu3HUbuBhR1hBow3DXZH1K3b/WfHxt1n8hr2uayw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-5.5.0.tgz",
+      "integrity": "sha512-OM8ZvTXAhfgFA7wBIIGlPQzvyEETzDjeRa4mZRCRHxYL+GNH5WAuYUQdja3rpWZvkX/JKqmuVgbsxDNsDFjMEg==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
-        "devtools-protocol": "0.0.809251",
+        "devtools-protocol": "0.0.818844",
         "extract-zip": "^2.0.0",
         "https-proxy-agent": "^4.0.0",
         "node-fetch": "^2.6.1",
@@ -6692,20 +6699,14 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
         },
-        "devtools-protocol": {
-          "version": "0.0.809251",
-          "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.809251.tgz",
-          "integrity": "sha512-pf+2OY6ghMDPjKkzSWxHMq+McD+9Ojmq5XVRYpv/kPd9sTMQxzEt21592a31API8qRjro0iYYOc3ag46qF/1FA==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -8076,22 +8077,22 @@
       }
     },
     "tcp-port-used": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.1.tgz",
-      "integrity": "sha512-rwi5xJeU6utXoEIiMvVBMc9eJ2/ofzB+7nLOdnZuFTmNCLqRiQh2sMG9MqCxHU/69VC/Fwp5dV9306Qd54ll1Q==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz",
+      "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==",
       "dev": true,
       "requires": {
-        "debug": "4.1.0",
-        "is2": "2.0.1"
+        "debug": "4.3.1",
+        "is2": "^2.0.6"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
-          "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
diff --git a/package.json b/package.json
index cc77e8360e..db03ae0674 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
         "@wdio/browserstack-service": "^6.10.4",
         "bower": "^1.8.8",
         "chrome-launcher": "^0.13.4",
-        "chromedriver": "^87.0.0",
+        "chromedriver": "^88.0.0",
         "eslint": "7.17.0",
         "grunt": "1.3.0",
         "grunt-cli": "1.3.2",
@@ -38,7 +38,7 @@
         "karma-mocha-reporter": "2.2.5",
         "karma-requirejs": "1.1.0",
         "karma-safari-launcher": "1.0.0",
-        "puppeteer": "5.4.0",
+        "puppeteer": "5.5.0",
         "requirejs": "2.3.6",
         "selenium-standalone": "6.23.0",
         "selenium-webdriver": "3.6.0",
diff --git a/test/integration/wdio.conf.js b/test/integration/wdio.conf.js
index a7cc60ad4b..ebd5b0d670 100644
--- a/test/integration/wdio.conf.js
+++ b/test/integration/wdio.conf.js
@@ -6,6 +6,9 @@
 const testConfig = require('../testConfig');
 const fs = require('fs');
 
+const CHROME_BINARY = require('puppeteer').executablePath();
+// process.env.
+
 // Import environment variables used to control the tests.
 // Note that most have defaults, and many are only applicable 
 // to testing services
@@ -211,7 +214,8 @@ function makeCapabilities(config) {
                     acceptInsecureCerts: true,
                     maxInstances: 1,
                     'goog:chromeOptions': {
-                        args
+                        args,
+                        binary: CHROME_BINARY
                     }
                 };
             })();

From efbd2bdce2b4e3cc64e4ad0b5083655e6e093cf8 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Tue, 25 May 2021 10:18:27 -0700
Subject: [PATCH 21/42] add unreleased section to release notes

---
 RELEASE_NOTES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 9cc2274821..39fdfe4ac5 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -4,6 +4,9 @@ The Narrative Interface allows users to craft KBase Narratives using a combinati
 
 This is built on the Jupyter Notebook v6.0.2 (more notes will follow).
 
+### Unreleased
+- SCT-2914 / PUBLIC-1493 - fix up/down cell movement behavior for unselected cells
+
 ### Version 4.4.0
 -   No ticket: boatloads of code cleanup and fixes to the unit and internal testing
 -   PTV-1635: fix bug in data slideout tab selection

From 7ec78de51338936cec44971ea01d0ce0c9c7bc51 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 10:34:12 -0700
Subject: [PATCH 22/42] prettier and linting fixes

---
 kbase-extension/static/kbase/js/userMenu.js   |  12 +-
 .../appWidgets2/input/select2ObjectInput.js   |  18 +-
 .../narrative_core/kbaseCellToolbarMenu.js    | 130 +-----
 .../narrative_core/kbaseNarrativeDataList.js  |   7 +-
 .../kbaseNarrativeSidePublicTab.js            | 399 ++++++++++--------
 .../kbaseNarrativeStagingDataTab.js           |  12 +-
 .../publicDataSources/search2DataSource.js    | 390 +++++++++--------
 .../upload/stagingAreaViewer.js               |   7 +-
 test/integration/NarrativeTesting.js          |  58 +--
 .../specs/kbaseCellToolbarMenu_test.js        |  63 +--
 .../specs/kbaseNarrativeSidePublicTab_test.js |  48 ++-
 11 files changed, 561 insertions(+), 583 deletions(-)

diff --git a/kbase-extension/static/kbase/js/userMenu.js b/kbase-extension/static/kbase/js/userMenu.js
index 41c444b59d..61ef0c353a 100644
--- a/kbase-extension/static/kbase/js/userMenu.js
+++ b/kbase-extension/static/kbase/js/userMenu.js
@@ -88,13 +88,11 @@ define([
                                         }),
                                     ]
                                 ),
-                                div(
-                                    {
-                                        style: 'display: inline-block',
-                                        'data-element': 'user-label',
-                                    },
-                                    [displayName, br(), i({}, userName)]
-                                ),
+                                div({ style: 'display: inline-block' }, [
+                                    span({ 'data-element': 'realname' }, displayName),
+                                    br(),
+                                    i({ 'data-element': 'username' }, userName),
+                                ]),
                             ]
                         ),
                     ]),
diff --git a/kbase-extension/static/kbase/js/widgets/appWidgets2/input/select2ObjectInput.js b/kbase-extension/static/kbase/js/widgets/appWidgets2/input/select2ObjectInput.js
index 9d10c7fe52..a471951e92 100644
--- a/kbase-extension/static/kbase/js/widgets/appWidgets2/input/select2ObjectInput.js
+++ b/kbase-extension/static/kbase/js/widgets/appWidgets2/input/select2ObjectInput.js
@@ -14,19 +14,7 @@ define([
     'select2',
     'bootstrap',
     'css!font-awesome',
-], (
-    Promise,
-    $,
-    html,
-    utils,
-    Data,
-    Events,
-    Runtime,
-    UI,
-    Validation,
-    TimeFormat,
-    WidgetCommon,
-) => {
+], (Promise, $, html, utils, Data, Events, Runtime, UI, Validation, TimeFormat, WidgetCommon) => {
     'use strict';
 
     // Constants
@@ -50,9 +38,7 @@ define([
                 availableValuesMap: {},
                 value: undefined,
             };
-        let parent,
-            container,
-            ui;
+        let parent, container, ui;
 
         // TODO: getting rid of blacklist temporarily until we work out how to state-ify everything by reference.
         model.blacklistValues = []; //config.blacklist || [];
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
index d098c7d863..e244844f5a 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
@@ -15,7 +15,6 @@ define([
         div = t('div'),
         a = t('a'),
         button = t('button'),
-        p = t('p'),
         span = t('span'),
         ul = t('ul'),
         li = t('li');
@@ -33,10 +32,9 @@ define([
         return cell.metadata.kbase[group][name];
     }
 
-    function factory(config) {
-        let container,
-            cell,
-            readOnly = Jupyter.narrative.readonly;
+    function factory() {
+        let container, cell;
+        const readOnly = Jupyter.narrative.readonly;
 
         function doMoveCellUp() {
             const cellIndex = Jupyter.notebook.find_cell_index(cell);
@@ -63,9 +61,8 @@ define([
         }
 
         function getCellSubtitle(cell) {
-            const subTitle = getMeta(cell, 'attributes', 'subtitle'),
-                showTitle = utils.getCellMeta(cell, 'kbase.cellState.showTitle', true),
-                showSubtitle = utils.getCellMeta(cell, 'kbase.cellState.showSubtitle', true);
+            const subTitle = getMeta(cell, 'attributes', 'subtitle');
+            const showTitle = utils.getCellMeta(cell, 'kbase.cellState.showTitle', true);
 
             if (showTitle) {
                 return subTitle;
@@ -73,31 +70,11 @@ define([
             return '';
         }
 
-        function getCellInfoLink(cell, events) {
-            const url = utils.getCellMeta(cell, 'kbase.attributes.info.url'),
-                label = utils.getCellMeta(cell, 'kbase.attributes.info.label');
-
-            if (url) {
-                return a(
-                    {
-                        href: url,
-                        target: '_blank',
-                        id: events.addEvent({
-                            type: 'click',
-                            handler: doShowInfoModal,
-                        }),
-                    },
-                    label || 'ref'
-                );
-            }
-            return '';
-        }
-
         function doToggleMinMaxCell(e) {
             if (e.getModifierState) {
                 const modifier = e.getModifierState('Alt');
                 if (modifier) {
-                    console.log('I want to toggle all cells!');
+                    console.warn('I want to toggle all cells!');
                 }
             }
             cell.toggleMinMax();
@@ -114,70 +91,6 @@ define([
             return null;
         }
 
-        function doShowInfoModal(e) {
-            e.preventDefault();
-            const version = utils.getCellMeta(cell, 'kbase.appCell.app.version'),
-                authors = utils.getCellMeta(cell, 'kbase.appCell.app.spec.info.authors'),
-                title = getMeta(cell, 'attributes', 'title') + ' v' + version,
-                appStoreUrl = utils.getCellMeta(cell, 'kbase.attributes.info.url'),
-                tag = utils.getCellMeta(cell, 'kbase.appCell.app.tag'),
-                module = utils.getCellMeta(cell, 'kbase.appCell.app.spec.info.module_name');
-            var dialog = new BootstrapDialog({
-                title: title,
-                body: $('<div class="container"></div>'),
-                buttons: [
-                    $(
-                        '<a href="' +
-                            appStoreUrl +
-                            '" target="_blank" type="button" class="btn btn-default">View on App Store</a>'
-                    ),
-                    $('<button type="button" class="btn btn-primary">Close</button>').click(() => {
-                        dialog.hide();
-                    }),
-                ],
-                enterToTrigger: true,
-                closeButton: true,
-            });
-
-            const infoPanel = AppInfoPanel.make({
-                appId: utils.getCellMeta(cell, 'kbase.appCell.app.id'),
-                appVersion: version,
-                appAuthors: authors,
-                appModule: module,
-                tag: tag,
-            });
-            infoPanel.start({ node: dialog.getBody() });
-
-            dialog.getElement().on('hidden.bs.modal', () => {
-                dialog.destroy();
-            });
-            dialog.show();
-        }
-
-        function doToggleCellSettings() {
-            cell.element.trigger('toggleCellSettings.cell');
-        }
-
-        function renderToggleCellSettings(events) {
-            // Only kbase cells have cell settings.
-            if (!cell.metadata || !cell.metadata.kbase || !cell.metadata.kbase.type) {
-                return;
-            }
-
-            return button(
-                {
-                    type: 'button',
-                    class: 'btn btn-default btn-xs',
-                    dataToggle: 'tooltip',
-                    dataPlacement: 'left',
-                    title: true,
-                    dataOriginalTitle: 'Cell Settings',
-                    id: events.addEvent({ type: 'click', handler: doToggleCellSettings }),
-                },
-                [span({ class: 'fa fa-cog', style: 'font-size: 14pt' })]
-            );
-        }
-
         function renderIcon(icon) {
             return span({
                 class: 'fa fa-' + icon.type + ' fa-sm',
@@ -185,24 +98,7 @@ define([
             });
         }
 
-        function isKBaseCell(cell) {
-            if (!cell.metadata || !cell.metadata.kbase || !cell.metadata.kbase.type) {
-                return false;
-            }
-            return true;
-        }
-
-        function doHelp() {
-            alert('help here...');
-        }
-
         function renderOptions(cell, events) {
-            const toggleMinMax = utils.getCellMeta(
-                    cell,
-                    'kbase.cellState.toggleMinMax',
-                    'maximized'
-                );
-            const toggleIcon = toggleMinMax === 'maximized' ? 'minus' : 'plus';
             const dropdownId = html.genId();
             const menuItems = [];
 
@@ -429,13 +325,15 @@ define([
                               ),
                         (function () {
                             const toggleMinMax = utils.getCellMeta(
-                                    cell,
-                                    'kbase.cellState.toggleMinMax',
-                                    'maximized'
-                                );
+                                cell,
+                                'kbase.cellState.toggleMinMax',
+                                'maximized'
+                            );
                             const toggleIcon = toggleMinMax === 'maximized' ? 'minus' : 'plus';
-                            const color = toggleMinMax === 'maximized' ? '#000' : 'rgba(255,137,0,1)';
-                            const classModifier = (toggleMinMax === 'maximized' ? '-maximized' : '-minimized');
+                            const color =
+                                toggleMinMax === 'maximized' ? '#000' : 'rgba(255,137,0,1)';
+                            const classModifier =
+                                toggleMinMax === 'maximized' ? '-maximized' : '-minimized';
                             return button(
                                 {
                                     type: 'button',
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js
index d8c86e2e9f..576fb6ad5e 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js
@@ -277,7 +277,10 @@ define([
                     height: this.mainListPanelHeight,
                 })
                 .on('scroll', (event) => {
-                    if ($(event.target).scrollTop() + $(event.target).innerHeight() >= event.target.scrollHeight) {
+                    if (
+                        $(event.target).scrollTop() + $(event.target).innerHeight() >=
+                        event.target.scrollHeight
+                    ) {
                         this.renderMore();
                     }
                 });
@@ -411,7 +414,7 @@ define([
                     }
                 })
                 .catch((error) => {
-                    console.trace('dumping stacktrace!')
+                    console.trace('dumping stacktrace!');
                     console.error('DataList: when checking for updates:', error);
                     if (showError) {
                         this.showBlockingError(
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeSidePublicTab.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeSidePublicTab.js
index e5e7cd3cb9..2b999eb90f 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeSidePublicTab.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeSidePublicTab.js
@@ -32,13 +32,12 @@ define([
     Icon,
     WorkspaceDataSource,
     SearchDataSource,
-    DataSourceConfig,
+    DataSourceConfig
 ) => {
     'use strict';
 
     function formatValue(value) {
-        if (typeof value === 'undefined' ||
-            (typeof value === 'string' && value.length === 0)) {
+        if (typeof value === 'undefined' || (typeof value === 'string' && value.length === 0)) {
             return '<span style="color: #AAA; font-weight: normal; font-style: italic">n/a</span>';
         } else {
             return String(value);
@@ -48,7 +47,9 @@ define([
     function formatItem(item) {
         return `
             <span role='row' data-test-id='${item.id}'>
-            <span style='color: #AAA; font-weight: normal; font-style: italic' data-test-id='label' role='cell'>${item.label}</span>: 
+            <span style='color: #AAA; font-weight: normal; font-style: italic' data-test-id='label' role='cell'>${
+                item.label
+            }</span>: 
             &nbsp;
             <span data-test-id='value' role='cell'>${formatValue(item.value)}</span>
             </span>
@@ -60,35 +61,40 @@ define([
     // an array of the same.
     //
     function metadataToTable(metadata) {
-        const $table = $('<table role="table">')
-            .css('font-size', '80%');
+        const $table = $('<table role="table">').css('font-size', '80%');
 
         metadata.forEach((item) => {
             let value;
             if (item.value instanceof Array) {
-                value = item.value.map((item) => {
-                    return formatItem(item);
-                }).join('&nbsp;&nbsp;&nbsp;');
+                value = item.value
+                    .map((item) => {
+                        return formatItem(item);
+                    })
+                    .join('&nbsp;&nbsp;&nbsp;');
             } else {
                 value = formatValue(item.value);
             }
 
             const $row = $(`<tr role='row' data-test-id='${item.id || item.label}'>`)
                 .css('margin-bottom', '2px')
-                .append($('<td role="cell" data-test-id="label">')
-                    .css('width', '7em')
-                    .css('font-weight', 'normal')
-                    .css('font-style', 'italic')
-                    .css('padding-right', '4px')
-                    .css('color', '#AAA')
-                    .css('vertical-align', 'top')
-                    .css('padding-bottom', '2px')
-                    .text(item.label))
-                .append($('<td role="cell" data-test-id="value">')
-                    // .css('font-weight', 'bold')
-                    .css('vertical-align', 'top')
-                    .css('padding-bottom', '2px')
-                    .html(value));
+                .append(
+                    $('<td role="cell" data-test-id="label">')
+                        .css('width', '7em')
+                        .css('font-weight', 'normal')
+                        .css('font-style', 'italic')
+                        .css('padding-right', '4px')
+                        .css('color', '#AAA')
+                        .css('vertical-align', 'top')
+                        .css('padding-bottom', '2px')
+                        .text(item.label)
+                )
+                .append(
+                    $('<td role="cell" data-test-id="value">')
+                        // .css('font-weight', 'bold')
+                        .css('vertical-align', 'top')
+                        .css('padding-bottom', '2px')
+                        .html(value)
+                );
 
             $table.append($row);
         });
@@ -98,21 +104,25 @@ define([
     function renderTotals(found, total) {
         const $totals = $('<span>').addClass('kb-data-list-type');
         if (total === 0) {
-            $totals
-                .append($('<span>None available</span>'));
+            $totals.append($('<span>None available</span>'));
         } else if (found === 0) {
             $totals
-                .append($('<span data-test-id="found-count">').css('font-weight', 'bold').text('None'))
+                .append(
+                    $('<span data-test-id="found-count">').css('font-weight', 'bold').text('None')
+                )
                 .append($('<span>').text(' found out of '))
                 .append($('<span>').css('font-weight', 'bold').text(numeral(total).format('0,0')))
                 .append($('<span>').text(' available'));
         } else if (total > found) {
             $totals
-                .append($('<span data-test-id="found-count">').css('font-weight', 'bold').text(numeral(found).format('0,0')))
+                .append(
+                    $('<span data-test-id="found-count">')
+                        .css('font-weight', 'bold')
+                        .text(numeral(found).format('0,0'))
+                )
                 .append($('<span>').text(' found out of '))
                 .append($('<span>').css('font-weight', 'bold').text(numeral(total).format('0,0')))
                 .append($('<span>').text(' available'));
-
         } else {
             $totals
                 .append($('<span>').text(numeral(total).format('0,0')))
@@ -218,7 +228,7 @@ define([
         narrativeObjects: {},
         narrativeObjectsClean: null,
 
-        init: function(options) {
+        init: function (options) {
             this._super(options);
 
             this.data_icons = Config.get('icons').data;
@@ -232,16 +242,20 @@ define([
             return this;
         },
 
-        loadObjects: function() {
+        loadObjects: function () {
             this.narrativeObjectsClean = false;
-            $(document).trigger('dataLoadedQuery.Narrative', [null, this.IGNORE_VERSION, function(objects) {
-                this.narrativeObjects = objects;
-                this.narrativeObjectsClean = true;
-            }.bind(this)]);
+            $(document).trigger('dataLoadedQuery.Narrative', [
+                null,
+                this.IGNORE_VERSION,
+                function (objects) {
+                    this.narrativeObjects = objects;
+                    this.narrativeObjectsClean = true;
+                }.bind(this),
+            ]);
         },
 
-        render: function() {
-            if ((!this.token) || (!this.wsName)) {
+        render: function () {
+            if (!this.token || !this.wsName) {
                 return;
             }
 
@@ -250,18 +264,20 @@ define([
                 this.loadObjects();
                 this.loaded = true;
                 $(document).on('dataUpdated.Narrative', () => {
-                    $(document).trigger('dataLoadedQuery.Narrative', [null, this.IGNORE_VERSION, function(objects) {
-                        this.narrativeObjects = objects;
-                        this.narrativeObjectsClean = true;
-                    }.bind(this)]);
+                    $(document).trigger('dataLoadedQuery.Narrative', [
+                        null,
+                        this.IGNORE_VERSION,
+                        function (objects) {
+                            this.narrativeObjects = objects;
+                            this.narrativeObjectsClean = true;
+                        }.bind(this),
+                    ]);
                 });
             }
 
             this.infoPanel = $('<div>');
             this.dataPolicyPanel = $('<div>');
-            this.$elem.empty()
-                .append(this.infoPanel)
-                .append(this.dataPolicyPanel);
+            this.$elem.empty().append(this.infoPanel).append(this.dataPolicyPanel);
 
             this.narrativeService = new DynamicServiceClient({
                 module: 'NarrativeService',
@@ -275,11 +291,12 @@ define([
             });
 
             const margin = { margin: '10px 0px 10px 0px' };
-            const $typeInput = $('<select class="form-control">')
-                .css(margin);
+            const $typeInput = $('<select class="form-control">').css(margin);
 
             this.dataSourceConfigs.forEach((config, index) => {
-                $typeInput.append('<option value="' + String(index) + '">' + config.name + '</option>');
+                $typeInput.append(
+                    '<option value="' + String(index) + '">' + config.name + '</option>'
+                );
             });
 
             const $dataSourceLogo = $('<span>')
@@ -292,33 +309,36 @@ define([
                 .css('background-color', 'transparent');
             this.$dataSourceLogo = $dataSourceLogo;
 
-            const $inputGroup = $('<div>')
-                .addClass('input-group')
-                .css('width', '100%');
+            const $inputGroup = $('<div>').addClass('input-group').css('width', '100%');
 
-            const typeFilter = $('<div class="col-sm-4">')
-                .append($inputGroup
-                    .append($typeInput)
-                    .append($dataSourceLogo));
+            const typeFilter = $('<div class="col-sm-4">').append(
+                $inputGroup.append($typeInput).append($dataSourceLogo)
+            );
 
-            const $filterInput = $('<input type="text" class="form-control" placeholder="Filter data..." data-test-id="search-input">');
+            const $filterInput = $(
+                '<input type="text" class="form-control" placeholder="Filter data..." data-test-id="search-input">'
+            );
             const $filterInputField = $('<div class="input-group">')
                 .css(margin)
                 .append($filterInput)
-                .append($('<div class="input-group-addon btn btn-default">')
-                    .append($('<span class="fa fa-search">'))
-                    .css('padding', '4px 8px')
-                    .click(() => {
-                        $filterInput.change();
-                    }))
-                .append($('<div class="input-group-addon btn btn-default">')
-                    .append($('<span class="fa fa-times">'))
-                    .css('padding', '4px 8px')
-                    .click(() => {
-                        $filterInput.val('');
-                        inputFieldLastValue = '';
-                        $filterInput.change();
-                    }));
+                .append(
+                    $('<div class="input-group-addon btn btn-default">')
+                        .append($('<span class="fa fa-search">'))
+                        .css('padding', '4px 8px')
+                        .click(() => {
+                            $filterInput.change();
+                        })
+                )
+                .append(
+                    $('<div class="input-group-addon btn btn-default">')
+                        .append($('<span class="fa fa-times">'))
+                        .css('padding', '4px 8px')
+                        .click(() => {
+                            $filterInput.val('');
+                            inputFieldLastValue = '';
+                            $filterInput.change();
+                        })
+                );
 
             /*
                 search and render when the type dropdown changes.
@@ -329,8 +349,7 @@ define([
                 this.$dataSourceLogo.empty();
                 if (dataSource) {
                     if (dataSource.logoUrl) {
-                        this.$dataSourceLogo.append($('<img>')
-                            .attr('src', dataSource.logoUrl));
+                        this.$dataSourceLogo.append($('<img>').attr('src', dataSource.logoUrl));
                     }
                 }
                 this.searchAndRender(newDataSourceID, $filterInput.val());
@@ -365,11 +384,12 @@ define([
 
             const searchFilter = $('<div class="col-sm-8">').append($filterInputField);
 
-            const header = $('<div class="row">').css({ 'margin': '0px 10px 0px 10px' })
+            const header = $('<div class="row">')
+                .css({ margin: '0px 10px 0px 10px' })
                 .append(typeFilter)
                 .append(searchFilter);
             this.$elem.append(header);
-            this.totalPanel = $('<div>').css({ 'margin': '0px 0px 0px 10px' });
+            this.totalPanel = $('<div>').css({ margin: '0px 0px 0px 10px' });
             this.$elem.append(this.totalPanel);
 
             this.resultPanel = $('<div role="table" data-test-id="result">');
@@ -405,15 +425,15 @@ define([
             return this;
         },
 
-        hideResultFooter: function() {
+        hideResultFooter: function () {
             this.resultFooter.addClass('hide');
         },
 
-        showResultFooter: function() {
+        showResultFooter: function () {
             this.resultFooter.removeClass('hide');
         },
 
-        searchAndRender: function(category, query) {
+        searchAndRender: function (category, query) {
             if (query) {
                 query = query.trim();
                 if (query.length == 0) {
@@ -432,7 +452,11 @@ define([
             }
 
             // Duplicate queries are suppressed.
-            if (this.currentQuery && this.currentQuery === query && category === this.currentCategory) {
+            if (
+                this.currentQuery &&
+                this.currentQuery === query &&
+                category === this.currentCategory
+            ) {
                 return;
             }
 
@@ -447,22 +471,23 @@ define([
             return this.renderInitial();
         },
 
-        renderTotalsPanel: function() {
+        renderTotalsPanel: function () {
             const $totals = renderTotals(this.currentFilteredResults, this.totalAvailable);
             this.totalPanel.html($totals);
         },
 
-        renderInitial: function() {
+        renderInitial: function () {
             // Get and render the first batch of data.
             // Note that the loading ui is only displayed on the initial load.
             // Reset the ui.
             this.totalPanel.empty();
             this.resultPanel.empty();
             this.resultsFooterMessage.empty();
-            this.totalPanel
-                .append($('<span>')
+            this.totalPanel.append(
+                $('<span>')
                     .addClass('kb-data-list-type')
-                    .append('<img src="' + this.loadingImage + '"/> searching...'));
+                    .append('<img src="' + this.loadingImage + '"/> searching...')
+            );
 
             this.hideError();
             this.showResultFooter();
@@ -471,14 +496,16 @@ define([
             return this.renderFromDataSource(this.currentCategory, true);
         },
 
-        renderError: function() {
+        renderError: function () {
             this.totalPanel.empty();
             this.hideResultFooter();
             this.resultsFooterMessage.empty();
-            this.totalPanel.html('<div class="alert alert-danger">An error occurred executing this search!</div>');
+            this.totalPanel.html(
+                '<div class="alert alert-danger">An error occurred executing this search!</div>'
+            );
         },
 
-        renderMore: function() {
+        renderMore: function () {
             this.hideError();
 
             // suss out whether we really need more...
@@ -499,13 +526,12 @@ define([
 
             this.currentPage += 1;
 
-            return this.renderFromDataSource(this.currentCategory, false)
-                .finally(() => {
-                    this.renderingMore = false;
-                });
+            return this.renderFromDataSource(this.currentCategory, false).finally(() => {
+                this.renderingMore = false;
+            });
         },
 
-        fetchFromDataSource: function(dataSource) {
+        fetchFromDataSource: function (dataSource) {
             const query = {
                 input: this.currentQuery,
                 page: this.currentPage,
@@ -514,7 +540,7 @@ define([
             return dataSource.search(query);
         },
 
-        getDataSource: function(dataSourceID) {
+        getDataSource: function (dataSourceID) {
             let dataSource;
             const dataSourceConfig = this.dataSourceConfigs[dataSourceID];
             if (this.currentDataSource && this.currentDataSource.config === dataSourceConfig) {
@@ -522,25 +548,26 @@ define([
             } else {
                 const dataSourceType = dataSourceTypes[dataSourceConfig.sourceType];
 
-                const urls = Object.keys(dataSourceType.serviceDependencies)
-                    .reduce((accumUrls, key) => {
+                const urls = Object.keys(dataSourceType.serviceDependencies).reduce(
+                    (accumUrls, key) => {
                         const configKey = dataSourceType.serviceDependencies[key];
                         accumUrls[key] = Config.url(configKey);
                         return accumUrls;
-                    }, {});
-                dataSource = Object.create(dataSourceType.baseObject)
-                    .init({
-                        config: dataSourceConfig,
-                        urls,
-                        token: this.token,
-                        pageSize: this.itemsPerPage,
-                    });
+                    },
+                    {}
+                );
+                dataSource = Object.create(dataSourceType.baseObject).init({
+                    config: dataSourceConfig,
+                    urls,
+                    token: this.token,
+                    pageSize: this.itemsPerPage,
+                });
                 this.currentDataSource = dataSource;
             }
             return dataSource;
         },
 
-        renderFromDataSource: function(dataSourceID, initial) {
+        renderFromDataSource: function (dataSourceID, initial) {
             const dataSource = this.getDataSource(dataSourceID);
             this.resultsFooterMessage.html(`
                 <span>fetching another ${this.itemsPerPage} items</span> 
@@ -570,7 +597,11 @@ define([
                             if (dataSource.fetchedDataCount === dataSource.filteredDataCount) {
                                 message = 'all ' + this.currentFilteredResults + ' fetched';
                             } else {
-                                message = 'fetched ' + dataSource.fetchedDataCount + ' of ' + this.currentFilteredResults;
+                                message =
+                                    'fetched ' +
+                                    dataSource.fetchedDataCount +
+                                    ' of ' +
+                                    this.currentFilteredResults;
                             }
                             this.showResultFooter();
                         } else {
@@ -591,23 +622,23 @@ define([
                 });
         },
 
-        clearRows: function() {
+        clearRows: function () {
             this.resultPanel.empty();
         },
 
-        addRow: function(dataSource, row) {
+        addRow: function (dataSource, row) {
             const $row = this.renderObjectRow(dataSource, row);
             this.resultPanel.append($row);
         },
 
-        escapeSearchQuery: function(str) {
+        escapeSearchQuery: function (str) {
             return str.replace(/[%]/g, '').replace(/[:"\\]/g, '\\$&');
         },
 
         /*
         renderObjectRow
         */
-        renderObjectRow: function(dataSource, object) {
+        renderObjectRow: function (dataSource, object) {
             const self = this;
             const type = object.type.split('.')[1].split('-')[0];
             const copyText = ' Add';
@@ -646,7 +677,7 @@ define([
                 .attr('role', 'toolbar')
                 .hide();
             const btnClasses = 'btn btn-xs btn-default';
-            const css = { 'color': '#888' };
+            const css = { color: '#888' };
             const $openLandingPage = $('<span>')
                 // tooltips showing behind pullout, need to fix!
                 //.tooltip({title:'Explore data', 'container':'#'+this.mainListId})
@@ -658,46 +689,45 @@ define([
                 });
 
             const $openProvenance = $('<span>')
-                .addClass(btnClasses).css(css)
+                .addClass(btnClasses)
+                .css(css)
                 //.tooltip({title:'View data provenance and relationships', 'container':'body'})
                 .append($('<span>').addClass('fa fa-sitemap fa-rotate-90').css(css))
                 .click((e) => {
                     e.stopPropagation();
                     window.open(provenanceLink);
                 });
-            $btnToolbar
-                .append($openLandingPage)
-                .append($openProvenance);
+            $btnToolbar.append($openLandingPage).append($openProvenance);
 
             // Action Column
 
-            const $addDiv =
-                $('<div>').append(
-                    $('<button>')
-                        .addClass('kb-primary-btn')
-                        .css({ 'white-space': 'nowrap', padding: '10px 15px' })
-                        .append($('<span>')
-                            .addClass('fa fa-chevron-circle-left'))
-                        .append(copyText)
-                        .on('click', function() { // probably should move action outside of render func, but oh well
-                            $(this).attr('disabled', 'disabled');
-                            $(this).html('<img src="' + self.loadingImage + '">');
-
-                            let targetName = object.name;
-
-                            // object name cannot start with digits.
-                            if (/^[\d]/.test(targetName)) {
-                                targetName = targetName.replace(/^[\d]+/, '_');
-                            }
+            const $addDiv = $('<div>').append(
+                $('<button>')
+                    .addClass('kb-primary-btn')
+                    .css({ 'white-space': 'nowrap', padding: '10px 15px' })
+                    .append($('<span>').addClass('fa fa-chevron-circle-left'))
+                    .append(copyText)
+                    .on('click', function () {
+                        // probably should move action outside of render func, but oh well
+                        $(this).attr('disabled', 'disabled');
+                        $(this).html('<img src="' + self.loadingImage + '">');
+
+                        let targetName = object.name;
+
+                        // object name cannot start with digits.
+                        if (/^[\d]/.test(targetName)) {
+                            targetName = targetName.replace(/^[\d]+/, '_');
+                        }
 
-                            // to avoid weird object names, replace entities with underscores.
-                            targetName = targetName.replace(/&[^;]*;/g, '_');
+                        // to avoid weird object names, replace entities with underscores.
+                        targetName = targetName.replace(/&[^;]*;/g, '_');
 
-                            // replace characters which are invalid for a workspace object name with underscores.
-                            targetName = targetName.replace(/[^a-zA-Z0-9.\-_]/g, '_');
+                        // replace characters which are invalid for a workspace object name with underscores.
+                        targetName = targetName.replace(/[^a-zA-Z0-9.\-_]/g, '_');
 
-                            self.copy(object, targetName, this);
-                        }));
+                        self.copy(object, targetName, this);
+                    })
+            );
 
             const $actionColumn = $('<div>')
                 .css('flex', '0 0 90px')
@@ -758,14 +788,9 @@ define([
                 .append($iconColumn)
                 .append($resultColumn);
 
-            const $divider = $('<hr>')
-                .addClass('kb-data-list-row-hr')
-                .css('width', '100%');
-
+            const $divider = $('<hr>').addClass('kb-data-list-row-hr').css('width', '100%');
 
-            const $rowContainer = $('<div>')
-                .append($divider)
-                .append($row);
+            const $rowContainer = $('<div>').append($divider).append($row);
 
             if ('rowNumber' in object) {
                 $rowContainer.attr('data-row-number', String(object.rowNumber));
@@ -785,7 +810,7 @@ define([
             that is the only possible error.
         */
 
-        copy: function(object, targetName, thisBtn, nextSuffix, tries) {
+        copy: function (object, targetName, thisBtn, nextSuffix, tries) {
             if (tries > 10) {
                 throw new Error('Too many rename tries (10)');
             }
@@ -817,18 +842,29 @@ define([
             // TODO: request ws api changes to support this. It is bad that we force a 500
             // error for the failure case (which is actually success!)
             // There really should be an "stat_object" call which provides object info
-            return this.workspace.callFunc('get_object_info_new', [{
-                objects: [{
-                    ref: this.wsName + '/' + correctedTargetName,
-                }],
-                ignoreErrors: 1,
-            }])
+            return this.workspace
+                .callFunc('get_object_info_new', [
+                    {
+                        objects: [
+                            {
+                                ref: this.wsName + '/' + correctedTargetName,
+                            },
+                        ],
+                        ignoreErrors: 1,
+                    },
+                ])
                 .spread((infos) => {
                     // If an object already exists with this name, the attempt again,
                     // incrementing the suffix by 1. NB this will loop until a unique
                     // filename is found.
                     if (infos[0] !== null) {
-                        return this.copy(object, targetName, thisBtn, suffix ? suffix + 1 : 1, tries ? tries + 1 : 1);
+                        return this.copy(
+                            object,
+                            targetName,
+                            thisBtn,
+                            suffix ? suffix + 1 : 1,
+                            tries ? tries + 1 : 1
+                        );
                     }
                     return this.copyFinal(object, correctedTargetName, thisBtn);
                 })
@@ -838,12 +874,15 @@ define([
                 });
         },
 
-        copyFinal: function(object, targetName, thisBtn) {
-            return this.narrativeService.callFunc('copy_object', [{
-                ref: object.workspaceReference.ref,
-                target_ws_name: this.wsName,
-                target_name: targetName,
-            }])
+        copyFinal: function (object, targetName, thisBtn) {
+            return this.narrativeService
+                .callFunc('copy_object', [
+                    {
+                        ref: object.workspaceReference.ref,
+                        target_ws_name: this.wsName,
+                        target_name: targetName,
+                    },
+                ])
                 .spread(() => {
                     $(thisBtn).prop('disabled', false);
                     $(thisBtn).html('<span class="fa fa-chevron-circle-left"/> Add');
@@ -853,28 +892,42 @@ define([
                     $(thisBtn).html('Error');
                     if (error.error && error.error.message) {
                         if (error.error.message.indexOf('may not write to workspace') >= 0) {
-                            this.options.$importStatus.html($('<div>').css({
-                                'color': '#F44336',
-                                'width': '500px',
-                            }).append('Error: you do not have permission to add data to this Narrative.'));
+                            this.options.$importStatus.html(
+                                $('<div>')
+                                    .css({
+                                        color: '#F44336',
+                                        width: '500px',
+                                    })
+                                    .append(
+                                        'Error: you do not have permission to add data to this Narrative.'
+                                    )
+                            );
                         } else {
-                            this.options.$importStatus.html($('<div>').css({
-                                'color': '#F44336',
-                                'width': '500px',
-                            }).append('Error: ' + error.error.message));
+                            this.options.$importStatus.html(
+                                $('<div>')
+                                    .css({
+                                        color: '#F44336',
+                                        width: '500px',
+                                    })
+                                    .append('Error: ' + error.error.message)
+                            );
                         }
                     } else {
-                        this.options.$importStatus.html($('<div>').css({
-                            'color': '#F44336',
-                            'width': '500px',
-                        }).append('Unknown error!'));
+                        this.options.$importStatus.html(
+                            $('<div>')
+                                .css({
+                                    color: '#F44336',
+                                    width: '500px',
+                                })
+                                .append('Unknown error!')
+                        );
                     }
                     console.error(error);
                     this.showError(error);
                 });
         },
 
-        showError: function(error) {
+        showError: function (error) {
             let errorMsg;
             if (error.error && error.error.message) {
                 // handle errors thrown by kbase service clients
@@ -890,18 +943,18 @@ define([
             this.infoPanel.append('<div class="alert alert-danger">Error: ' + errorMsg + '</span>');
         },
 
-        hideError: function() {
+        hideError: function () {
             this.infoPanel.empty();
         },
 
-        loggedInCallback: function(event, auth) {
+        loggedInCallback: function (event, auth) {
             this.token = auth.token;
             return this;
         },
 
-        loggedOutCallback: function() {
+        loggedOutCallback: function () {
             this.token = null;
             return this;
         },
     });
-});
\ No newline at end of file
+});
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeStagingDataTab.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeStagingDataTab.js
index 1cfe805d9e..f5104263ce 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeStagingDataTab.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeStagingDataTab.js
@@ -81,13 +81,11 @@ define([
                     this.updateView();
                 });
 
-                const stagingAreaArgs = Object.assign({},
-                    this.options.stagingAreaViewer || {},
-                    {
-                        path: this.path,
-                        updatePathFn: this.updatePath.bind(this),
-                        userInfo: userInfo
-                    })
+                const stagingAreaArgs = Object.assign({}, this.options.stagingAreaViewer || {}, {
+                    path: this.path,
+                    updatePathFn: this.updatePath.bind(this),
+                    userInfo: userInfo,
+                });
                 this.stagingAreaViewer = new StagingAreaViewer(this.$myFiles, stagingAreaArgs);
 
                 this.updateView();
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/publicDataSources/search2DataSource.js b/kbase-extension/static/kbase/js/widgets/narrative_core/publicDataSources/search2DataSource.js
index 84fb4f75e4..75bc09fe8e 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/publicDataSources/search2DataSource.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/publicDataSources/search2DataSource.js
@@ -5,16 +5,11 @@ The search data source performs a fresh search with every new query.
 Whereas the workspace data source fetches the data once, and then performs
 a search against these cached results
 */
-define([
-    'bluebird',
-    'handlebars',
-    'common/searchAPI2',
-    './common',
-], function(
+define(['bluebird', 'handlebars', 'common/searchAPI2', './common'], function (
     Promise,
     Handlebars,
     SearchAPI2,
-    common,
+    common
 ) {
     'use strict';
 
@@ -50,7 +45,8 @@ define([
                 from: 0,
                 track_total_hits: true,
             };
-            return this.searchAPI2.search_objects({ params, timeout: this.timeout })
+            return this.searchAPI2
+                .search_objects({ params, timeout: this.timeout })
                 .then((result) => {
                     return result.count;
                 });
@@ -76,7 +72,7 @@ define([
                 },
                 sort: [
                     { 'scientific_name.raw': { order: 'asc' } },
-                    { 'genome_id': { order: 'asc' } },
+                    { genome_id: { order: 'asc' } },
                 ],
                 only_public: true,
                 indexes: ['genome'],
@@ -86,30 +82,30 @@ define([
             };
             if (query !== null) {
                 // Note that this rather convoluted-looking filter how one implements a required "or" filter.
-                // Having the "should" within a "must" ensures that the at least one of the "should" matches 
+                // Having the "should" within a "must" ensures that the at least one of the "should" matches
                 // must succeed. We want a filter here because we don't care about scoring.
-                // There may be better ways to form this query, but this one does work. 
+                // There may be better ways to form this query, but this one does work.
                 params.query.bool.filter = {
-                    'bool': {
-                        'must': {
-                            'bool': {
-                                'should': [
+                    bool: {
+                        must: {
+                            bool: {
+                                should: [
                                     {
-                                        'match': {
-                                            'scientific_name': {
-                                                'query': query,
-                                                'operator': 'AND',
+                                        match: {
+                                            scientific_name: {
+                                                query: query,
+                                                operator: 'AND',
                                             },
                                         },
                                     },
                                     {
-                                        'match': {
-                                            'source_id': query,
+                                        match: {
+                                            source_id: query,
                                         },
                                     },
                                     {
-                                        'match': {
-                                            'genome_id': query,
+                                        match: {
+                                            genome_id: query,
                                         },
                                     },
                                 ],
@@ -127,13 +123,12 @@ define([
             return Promise.all([
                 this.referenceGenomeTotal({ source }),
                 this.referenceGenomeDataSearch({ source, query, offset, limit }),
-            ])
-                .then(([totalAvailable, result]) => {
-                    return {
-                        totalAvailable,
-                        result,
-                    };
-                });
+            ]).then(([totalAvailable, result]) => {
+                return {
+                    totalAvailable,
+                    result,
+                };
+            });
         }
     }
 
@@ -153,114 +148,188 @@ define([
         };
     }
 
-    return Object.create({}, {
-        init: {
-            value: function(arg) {
-                common.requireArg(arg, 'config');
-                common.requireArg(arg, 'token');
-                common.requireArg(arg, 'urls.searchapi2');
-                common.requireArg(arg, 'pageSize');
-                const { config, token, urls: { searchapi2 }, pageSize } = arg;
+    return Object.create(
+        {},
+        {
+            init: {
+                value: function (arg) {
+                    common.requireArg(arg, 'config');
+                    common.requireArg(arg, 'token');
+                    common.requireArg(arg, 'urls.searchapi2');
+                    common.requireArg(arg, 'pageSize');
+                    const {
+                        config,
+                        token,
+                        urls: { searchapi2 },
+                        pageSize,
+                    } = arg;
 
-                this.pageSize = pageSize;
+                    this.pageSize = pageSize;
 
-                this.currentPage = null;
-                this.page = null;
-                this.config = config;
-                this.queryExpression = null;
-                this.availableData = null;
-                this.fetchedDataCount = null;
-                this.filteredData = null;
-                this.searchApi = new RefDataSearch({
-                    url: searchapi2,
-                    token,
-                    timeout: config.timeout,
-                });
-                this.searchState = {
-                    lastSearchAt: null,
-                    inProgress: false,
-                    lastQuery: null,
-                    currentQueryState: null,
-                };
-                this.titleTemplate = Handlebars.compile(this.config.templates.title);
-                this.metadataTemplates = common.compileTemplates(this.config.templates.metadata);
-                return this;
+                    this.currentPage = null;
+                    this.page = null;
+                    this.config = config;
+                    this.queryExpression = null;
+                    this.availableData = null;
+                    this.fetchedDataCount = null;
+                    this.filteredData = null;
+                    this.searchApi = new RefDataSearch({
+                        url: searchapi2,
+                        token,
+                        timeout: config.timeout,
+                    });
+                    this.searchState = {
+                        lastSearchAt: null,
+                        inProgress: false,
+                        lastQuery: null,
+                        currentQueryState: null,
+                    };
+                    this.titleTemplate = Handlebars.compile(this.config.templates.title);
+                    this.metadataTemplates = common.compileTemplates(
+                        this.config.templates.metadata
+                    );
+                    return this;
+                },
             },
-        },
-        search: {
-            value: function(query) {
-                return Promise.try(() => {
-                    if (this.searchState.currentQueryState) {
-                        return null;
-                    }
+            search: {
+                value: function (query) {
+                    return Promise.try(() => {
+                        if (this.searchState.currentQueryState) {
+                            return null;
+                        }
 
-                    // Prepare page number
-                    let page;
-                    if (query.page) {
-                        page = query.page;
-                    } else {
-                        page = 1;
-                    }
-                    this.page = page;
+                        // Prepare page number
+                        let page;
+                        if (query.page) {
+                            page = query.page;
+                        } else {
+                            page = 1;
+                        }
+                        this.page = page;
 
-                    // Prepare search input
-                    const queryInput = query.input;
-                    let newQuery;
-                    if (!queryInput) {
-                        newQuery = null;
-                    } else if (queryInput === '*') {
-                        newQuery = null;
-                    } else {
-                        // strip off "*" suffix from any terms in this search; it does not
-                        // act as a wildcard for search2, and would be interpreted as a
-                        // literal part of the search string.
-                        // The "*" will have been added by the generic search ui code handling
-                        // itself, not the user.
-                        newQuery = queryInput.split(/[ ]+/)
-                            .map((term) => {
-                                if (term.charAt(term.length - 1) === '*') {
-                                    return term.slice(0, -1);
-                                } else {
-                                    return term;
-                                }
-                            }).join(' ');
-                    }
-                    this.queryExpression = newQuery;
+                        // Prepare search input
+                        const queryInput = query.input;
+                        let newQuery;
+                        if (!queryInput) {
+                            newQuery = null;
+                        } else if (queryInput === '*') {
+                            newQuery = null;
+                        } else {
+                            // strip off "*" suffix from any terms in this search; it does not
+                            // act as a wildcard for search2, and would be interpreted as a
+                            // literal part of the search string.
+                            // The "*" will have been added by the generic search ui code handling
+                            // itself, not the user.
+                            newQuery = queryInput
+                                .split(/[ ]+/)
+                                .map((term) => {
+                                    if (term.charAt(term.length - 1) === '*') {
+                                        return term.slice(0, -1);
+                                    } else {
+                                        return term;
+                                    }
+                                })
+                                .join(' ');
+                        }
+                        this.queryExpression = newQuery;
 
-                    // Create state for this specific search
-                    const now = new Date().getTime();
+                        // Create state for this specific search
+                        const now = new Date().getTime();
 
-                    const queryState = {
-                        query,
-                        page,
-                        started: now,
-                        promise: null,
-                        canceled: false,
-                    };
+                        const queryState = {
+                            query,
+                            page,
+                            started: now,
+                            promise: null,
+                            canceled: false,
+                        };
+
+                        // And update the uber-search-state.
+                        this.searchState.currentQueryState = queryState;
+                        this.searchState.lastSearchAt = now;
+                        this.searchState.lastQuery = newQuery;
+
+                        queryState.promise = this.searchApi
+                            .referenceGenomeSearch({
+                                source: this.config.source,
+                                pageSize: this.pageSize,
+                                query: this.queryExpression,
+                                page: this.page - 1,
+                            })
+                            .then((result) => {
+                                this.availableDataCount = result.totalAvailable;
+                                this.filteredDataCount = result.result.count;
+                                this.availableData = result.result.hits.map((item, index) => {
+                                    // This call gives us a normalized genome result object.
+                                    // In porting this over, we are preserving the field names.
+                                    const genomeRecord = parseGenomeSearchResultItem(item);
 
-                    // And update the uber-search-state.
-                    this.searchState.currentQueryState = queryState;
-                    this.searchState.lastSearchAt = now;
-                    this.searchState.lastQuery = newQuery;
+                                    const name = this.titleTemplate(genomeRecord);
+                                    const metadata = common.applyMetadataTemplates(
+                                        this.metadataTemplates,
+                                        genomeRecord
+                                    );
+                                    return {
+                                        rowNumber: index + (this.page - 1) * this.pageSize + 1,
+                                        info: null,
+                                        id: genomeRecord.genome_id,
+                                        objectId: null,
+                                        name,
+                                        objectName: genomeRecord.object_name,
+                                        metadata,
+                                        ws: this.config.workspaceName,
+                                        type: this.config.type,
+                                        attached: false,
+                                        workspaceReference: { ref: genomeRecord.ws_ref },
+                                    };
+                                });
+                                // assume that all items before the page have been fetched
+                                this.fetchedDataCount =
+                                    (this.page - 1) * this.pageSize + this.availableData.length;
+                                return this.availableData;
+                            })
+                            .catch((error) => {
+                                if (error instanceof DOMException && error.name === 'AbortError') {
+                                    const errorMsg = `Request canceled - perhaps timed out after ${this.config.timeout}ms`;
+                                    throw new Error(errorMsg);
+                                }
+                                throw error;
+                            });
 
-                    queryState.promise = this.searchApi.referenceGenomeSearch({
-                        source: this.config.source,
-                        pageSize: this.pageSize,
-                        query: this.queryExpression,
-                        page: this.page - 1,
-                    })
+                        return queryState.promise;
+                    }).finally(() => {
+                        this.searchState.currentQueryState = null;
+                    });
+                },
+            },
+            setQuery: {
+                value: function (query) {
+                    this.queryExpression = query.replace(/[*]/g, ' ').trim().toLowerCase();
+                },
+            },
+            applyQuery: {
+                value: () => {
+                    return this.searchApi
+                        .referenceGenomeSearch({
+                            source: this.config.source,
+                            pageSize: this.itemsPerPage,
+                            query: this.queryExpression,
+                            page: this.page,
+                        })
                         .then((result) => {
                             this.availableDataCount = result.totalAvailable;
                             this.filteredDataCount = result.result.count;
-                            this.availableData = result.result.hits.map((item, index) => {
+                            this.availableData = result.result.objects.map(function (item) {
                                 // This call gives us a normalized genome result object.
                                 // In porting this over, we are preserving the field names.
                                 const genomeRecord = parseGenomeSearchResultItem(item);
 
                                 const name = this.titleTemplate(genomeRecord);
-                                const metadata = common.applyMetadataTemplates(this.metadataTemplates, genomeRecord);
+                                const metadata = common.applyMetadataTemplates(
+                                    this.metadataTemplates,
+                                    genomeRecord
+                                );
                                 return {
-                                    rowNumber: index + (this.page - 1) * this.pageSize + 1,
                                     info: null,
                                     id: genomeRecord.genome_id,
                                     objectId: null,
@@ -270,75 +339,26 @@ define([
                                     ws: this.config.workspaceName,
                                     type: this.config.type,
                                     attached: false,
-                                    workspaceReference: { ref: genomeRecord.ws_ref },
                                 };
                             });
-                            // assume that all items before the page have been fetched
-                            this.fetchedDataCount = (this.page - 1) * this.pageSize + this.availableData.length;
                             return this.availableData;
-                        })
-                        .catch((error) => {
-                            if (error instanceof DOMException && error.name === 'AbortError') {
-                                const errorMsg = `Request canceled - perhaps timed out after ${this.config.timeout}ms`;
-                                throw new Error(errorMsg);
-                            }
-                            throw(error);
                         });
-
-                    return queryState.promise;
-                })
-                    .finally(() => {
-                        this.searchState.currentQueryState = null;
-                    });
-            },
-        },
-        setQuery: {
-            value: function(query) {
-                this.queryExpression = query.replace(/[*]/g, ' ').trim().toLowerCase();
+                },
             },
-        },
-        applyQuery: {
-            value: () => {
-                return this.searchApi.referenceGenomeSearch({
-                    source: this.config.source,
-                    pageSize: this.itemsPerPage,
-                    query: this.queryExpression,
-                    page: this.page,
-                })
-                    .then((result) => {
-                        this.availableDataCount = result.totalAvailable;
-                        this.filteredDataCount = result.result.count;
-                        this.availableData = result.result.objects.map(function(item) {
-                            // This call gives us a normalized genome result object.
-                            // In porting this over, we are preserving the field names.
-                            const genomeRecord = parseGenomeSearchResultItem(item);
-
-                            const name = this.titleTemplate(genomeRecord);
-                            const metadata = common.applyMetadataTemplates(this.metadataTemplates, genomeRecord);
-                            return {
-                                info: null,
-                                id: genomeRecord.genome_id,
-                                objectId: null,
-                                name,
-                                objectName: genomeRecord.object_name,
-                                metadata,
-                                ws: this.config.workspaceName,
-                                type: this.config.type,
-                                attached: false,
-                            };
+            load: {
+                value: function () {
+                    return common
+                        .listObjectsWithSets(
+                            this.narrativeService,
+                            this.config.workspaceName,
+                            this.config.type
+                        )
+                        .then((data) => {
+                            this.availableData = data;
+                            this.availableDataCount = this.availableData.length;
                         });
-                        return this.availableData;
-                    });
-            },
-        },
-        load: {
-            value: function() {
-                return common.listObjectsWithSets(this.narrativeService, this.config.workspaceName, this.config.type)
-                    .then((data) => {
-                        this.availableData = data;
-                        this.availableDataCount = this.availableData.length;
-                    });
+                },
             },
-        },
-    });
-});
\ No newline at end of file
+        }
+    );
+});
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/upload/stagingAreaViewer.js b/kbase-extension/static/kbase/js/widgets/narrative_core/upload/stagingAreaViewer.js
index 265307b916..591da3c950 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/upload/stagingAreaViewer.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/upload/stagingAreaViewer.js
@@ -717,7 +717,7 @@ define([
                 }
                 if (appInfo.app_static_params) {
                     for (const p in appInfo.app_static_params) {
-                        if (appInfo.app_static_params.hasOwnProperty(p)) {
+                        if (Object.prototype.hasOwnProperty.call(appInfo.app_static_params, p)) {
                             inputs[p] = appInfo.app_static_params[p];
                         }
                     }
@@ -729,10 +729,7 @@ define([
 
         startTour: function () {
             if (!this.tour) {
-                this.tour = new UploadTour.Tour(
-                    this.$elem.parent(),
-                    this.globus_name
-                );
+                this.tour = new UploadTour.Tour(this.$elem.parent(), this.globus_name);
             }
             this.tour.start();
         },
diff --git a/test/integration/NarrativeTesting.js b/test/integration/NarrativeTesting.js
index eb48464c80..5511a92712 100644
--- a/test/integration/NarrativeTesting.js
+++ b/test/integration/NarrativeTesting.js
@@ -1,8 +1,7 @@
 /* eslint strict: ["error", "global"] */
-/*global browser, $*/
 'use strict';
 
-const {makeURL, clickWhenReady} = require('./wdioUtils');
+const { makeURL, clickWhenReady } = require('./wdioUtils');
 
 function mergeObjects(listOfObjects) {
     const simpleObjectPrototype = Object.getPrototypeOf({});
@@ -17,7 +16,7 @@ function mergeObjects(listOfObjects) {
     function merge(targetObj, sourceObj) {
         // Copy target, so we don't stomp over original objects.
         // Note that the source object is not copied, since we don't care if
-        // there is object sharing in the result, we just want to ensure that 
+        // there is object sharing in the result, we just want to ensure that
         // we don't overwrite properties of shared objects.
         targetObj = JSON.parse(JSON.stringify(targetObj));
 
@@ -28,7 +27,7 @@ function mergeObjects(listOfObjects) {
                 targetObj[key] = sourceObj[key];
             }
         });
-        
+
         return targetObj;
     }
 
@@ -50,7 +49,7 @@ function mergeObjects(listOfObjects) {
 }
 
 class NarrativeTesting {
-    constructor({testData, caseLabel, timeout}) {
+    constructor({ testData, caseLabel, timeout }) {
         this.testData = testData;
         this.caseLabel = caseLabel;
         this.timeout = timeout;
@@ -73,7 +72,7 @@ class NarrativeTesting {
         // Each env can establish defaults (e.g. narrative id)
         const envDefaults = this.testData[env].defaults;
 
-        // Each test case is defined per environment as well, as the 
+        // Each test case is defined per environment as well, as the
         // state of services will be different.
         const envcaseData = this.testData[env][this.caseLabel];
 
@@ -81,13 +80,12 @@ class NarrativeTesting {
     }
 
     /**
-    * Navigates the wdio browser to a workspace as given by its id, and waits until the 
-    * narrative container is visible.
-    * @arg {number} The narrative's workspace id
-    * @returns {Promise} The Promise value is ignored.
-    */
+     * Navigates the wdio browser to a workspace as given by its id, and waits until the
+     * narrative container is visible.
+     * @arg {number} The narrative's workspace id
+     * @returns {Promise} The Promise value is ignored.
+     */
     async openNarrative(workspaceId, timeoutOverride) {
-
         // Go to the narrative!
         const timeout = timeoutOverride || this.timeout;
         await browser.url(makeURL(`narrative/${workspaceId}`));
@@ -96,22 +94,22 @@ class NarrativeTesting {
         const loadingBlocker = await $('#kb-loading-blocker');
         await loadingBlocker.waitForDisplayed({
             timeout,
-            timeoutMsg: `Timeout after waiting ${timeout}ms for loading blocker to appear`
-        }); 
+            timeoutMsg: `Timeout after waiting ${timeout}ms for loading blocker to appear`,
+        });
 
         // And then the loading blocker should disappear!
         await loadingBlocker.waitForDisplayed({
             timeout,
             timeoutMsg: `Timeout after waiting ${timeout}ms for loading blocker to disappear`,
-            reverse: true
+            reverse: true,
         });
 
         // Ensure logged in
         const loginButton = await $('#signin-button > div > button');
         await loginButton.waitForDisplayed({
             timeout,
-            timeoutMsg: `Timeout after waiting ${timeout}ms for login button to appear`
-        }); 
+            timeoutMsg: `Timeout after waiting ${timeout}ms for login button to appear`,
+        });
 
         await clickWhenReady(loginButton);
 
@@ -119,25 +117,25 @@ class NarrativeTesting {
         const usernameElement = await $('[data-element="username"]');
         await browser.waitUntil(async () => {
             const text = await realnameElement.getText();
-            return (text && text.length > 0);
+            return text && text.length > 0;
         });
         const realname = await realnameElement.getText();
         const username = await usernameElement.getText();
         console.warn(`Signed in as user "${realname}" (${username})`);
         await loginButton.click();
-    
+
         // Ensure narrative notebook has displayed
-        // TODO: more interesting waitUntil loop to signal the 
+        // TODO: more interesting waitUntil loop to signal the
         // failure reason (useful for debugging tests?)
         const container = await $('#notebook-container');
         await container.waitForDisplayed({
             timeout,
-            timeoutMsg: `Timeout after waiting ${timeout}ms for narrative to appear`
+            timeoutMsg: `Timeout after waiting ${timeout}ms for narrative to appear`,
         });
         return container;
     }
 
-    async waitForCell(notebookContainer, cellIndex){
+    async waitForCell(notebookContainer, cellIndex) {
         return await browser.waitUntil(async () => {
             const cell = await notebookContainer.$(`.cell:nth-child(${cellIndex})`);
             return cell;
@@ -175,15 +173,25 @@ class NarrativeTesting {
     }
 
     async waitForCellWithTitle(container, cellIndex, titleText) {
-        return await this.waitForCellWithText(container, cellIndex, '[data-element="title"]', titleText);
+        return await this.waitForCellWithText(
+            container,
+            cellIndex,
+            '[data-element="title"]',
+            titleText
+        );
     }
 
     async waitForCellWithBody(container, cellIndex, bodyText) {
-        return await this.waitForCellWithText(container, cellIndex, '.text_cell_render.rendered_html', bodyText);
+        return await this.waitForCellWithText(
+            container,
+            cellIndex,
+            '.text_cell_render.rendered_html',
+            bodyText
+        );
     }
 }
 
 module.exports = {
     NarrativeTesting,
-    mergeObjects
+    mergeObjects,
 };
diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index d446f27f77..cf9da2dc4a 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -1,4 +1,3 @@
-/*global describe, it, browser, afterEach, beforeEach*/
 /* eslint {strict: ['error', 'global']} */
 'use strict';
 
@@ -22,8 +21,8 @@ test cases can be could be in separate files.
 
 */
 
-async function testCellMovement({caseLabel, selectCell, direction}) {
-    const t = new NarrativeTesting({testData, timeout: TIMEOUT, caseLabel});
+async function testCellMovement({ caseLabel, selectCell, direction }) {
+    const t = new NarrativeTesting({ testData, timeout: TIMEOUT, caseLabel });
     const cellIndex = t.caseData.cellIndex;
     const cells = t.testData.common.cells;
     const narrativeContainer = await t.openNarrative(t.caseData.narrativeId);
@@ -60,19 +59,21 @@ async function testCellMovement({caseLabel, selectCell, direction}) {
     // This relies on the "cellOrder" array, which contains expected ordering
     // of cells, where each cell is identified by it's original cell position.
     const cellOrder = t.caseData.expect.afterMove[direction].cellOrder;
-    await Promise.all(cellOrder.map((originalCellIndex, index) => {
-        const actualCellIndex = index + 1;
-        // Get the expected title or body for the cell at that position, based
-        // on the master list of starting cells.
-        const expected = cells[originalCellIndex - 1];
-
-        return waitForExpectedCell(actualCellIndex, expected);
-    }));
+    await Promise.all(
+        cellOrder.map((originalCellIndex, index) => {
+            const actualCellIndex = index + 1;
+            // Get the expected title or body for the cell at that position, based
+            // on the master list of starting cells.
+            const expected = cells[originalCellIndex - 1];
+
+            return waitForExpectedCell(actualCellIndex, expected);
+        })
+    );
 }
 
 describe('Test kbaseCellToolbarMenu movement buttons', () => {
     beforeEach(async () => {
-        await browser.setTimeout({ 'implicit': 30000 });
+        await browser.setTimeout({ implicit: 30000 });
         await browser.reloadSession();
         await login();
     });
@@ -81,13 +82,13 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await browser.deleteCookies();
     });
 
-    // Move first cell 
+    // Move first cell
 
     it('moves a minimized selected first cell down', async () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_1',
             direction: 'up',
-            selectCell: false
+            selectCell: false,
         });
     });
 
@@ -95,7 +96,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_1',
             direction: 'down',
-            selectCell: false
+            selectCell: false,
         });
     });
 
@@ -105,7 +106,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_2',
             direction: 'up',
-            selectCell: false
+            selectCell: false,
         });
     });
 
@@ -113,7 +114,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_2',
             direction: 'down',
-            selectCell: false
+            selectCell: false,
         });
     });
 
@@ -123,7 +124,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_2',
             direction: 'up',
-            selectCell: true
+            selectCell: true,
         });
     });
 
@@ -131,7 +132,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_2',
             direction: 'down',
-            selectCell: true
+            selectCell: true,
         });
     });
 
@@ -141,7 +142,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_3',
             direction: 'up',
-            selectCell: false
+            selectCell: false,
         });
     });
 
@@ -149,7 +150,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_3',
             direction: 'down',
-            selectCell: false
+            selectCell: false,
         });
     });
 
@@ -159,7 +160,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_3',
             direction: 'up',
-            selectCell: true
+            selectCell: true,
         });
     });
 
@@ -167,7 +168,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_3',
             direction: 'down',
-            selectCell: true
+            selectCell: true,
         });
     });
 
@@ -177,7 +178,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_4',
             direction: 'up',
-            selectCell: false
+            selectCell: false,
         });
     });
 
@@ -185,7 +186,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_4',
             direction: 'down',
-            selectCell: false
+            selectCell: false,
         });
     });
 
@@ -195,7 +196,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_4',
             direction: 'up',
-            selectCell: true
+            selectCell: true,
         });
     });
 
@@ -203,7 +204,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_4',
             direction: 'down',
-            selectCell: true
+            selectCell: true,
         });
     });
 
@@ -213,7 +214,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_5',
             direction: 'up',
-            selectCell: false
+            selectCell: false,
         });
     });
 
@@ -221,7 +222,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_5',
             direction: 'down',
-            selectCell: false
+            selectCell: false,
         });
     });
 
@@ -231,7 +232,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_5',
             direction: 'up',
-            selectCell: true
+            selectCell: true,
         });
     });
 
@@ -239,7 +240,7 @@ describe('Test kbaseCellToolbarMenu movement buttons', () => {
         await testCellMovement({
             caseLabel: 'TEST_CASE_5',
             direction: 'down',
-            selectCell: true
+            selectCell: true,
         });
     });
 });
diff --git a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
index 6db6edd782..271b1e4f58 100644
--- a/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
+++ b/test/integration/specs/kbaseNarrativeSidePublicTab_test.js
@@ -22,7 +22,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Terrabacteria group > Firmicutes > Bacilli > Lactobacillales > Aerococcaceae > Abiotrophia > Abiotrophia defectiva',
+                    value:
+                        'Bacteria > Terrabacteria group > Firmicutes > Bacilli > Lactobacillales > Aerococcaceae > Abiotrophia > Abiotrophia defectiva',
                 },
                 {
                     id: 'kbase_id',
@@ -55,7 +56,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Terrabacteria group > Tenericutes > Mollicutes > Acholeplasmatales > Acholeplasmataceae > Candidatus Phytoplasma > Candidatus Phytoplasma asteris',
+                    value:
+                        'Bacteria > Terrabacteria group > Tenericutes > Mollicutes > Acholeplasmatales > Acholeplasmataceae > Candidatus Phytoplasma > Candidatus Phytoplasma asteris',
                 },
                 {
                     id: 'kbase_id',
@@ -90,7 +92,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Terrabacteria group > Cyanobacteria/Melainabacteria group > Cyanobacteria > Synechococcales > Prochloraceae > Prochlorococcus',
+                    value:
+                        'Bacteria > Terrabacteria group > Cyanobacteria/Melainabacteria group > Cyanobacteria > Synechococcales > Prochloraceae > Prochlorococcus',
                 },
                 {
                     id: 'kbase_id',
@@ -130,7 +133,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Gammaproteobacteria > Pseudomonadales > Moraxellaceae > Acinetobacter > Acinetobacter calcoaceticus/baumannii complex',
+                    value:
+                        'Bacteria > Proteobacteria > Gammaproteobacteria > Pseudomonadales > Moraxellaceae > Acinetobacter > Acinetobacter calcoaceticus/baumannii complex',
                 },
                 {
                     id: 'kbase_id',
@@ -166,7 +170,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > delta/epsilon subdivisions > Epsilonproteobacteria > Campylobacterales > Campylobacteraceae > Campylobacter',
+                    value:
+                        'Bacteria > Proteobacteria > delta/epsilon subdivisions > Epsilonproteobacteria > Campylobacterales > Campylobacteraceae > Campylobacter',
                 },
                 {
                     id: 'kbase_id',
@@ -200,7 +205,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
+                    value:
+                        'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
                 },
                 {
                     id: 'kbase_id',
@@ -234,7 +240,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
+                    value:
+                        'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
                 },
                 {
                     id: 'kbase_id',
@@ -268,7 +275,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
+                    value:
+                        'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
                 },
                 {
                     id: 'kbase_id',
@@ -302,7 +310,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Betaproteobacteria > Burkholderiales > Oxalobacteraceae > Massilia',
+                    value:
+                        'Bacteria > Proteobacteria > Betaproteobacteria > Burkholderiales > Oxalobacteraceae > Massilia',
                 },
                 {
                     id: 'kbase_id',
@@ -335,7 +344,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Terrabacteria group > Firmicutes > Bacilli > Bacillales > Staphylococcaceae > Abyssicoccus',
+                    value:
+                        'Bacteria > Terrabacteria group > Firmicutes > Bacilli > Bacillales > Staphylococcaceae > Abyssicoccus',
                 },
                 {
                     id: 'kbase_id',
@@ -370,7 +380,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Terrabacteria group > Cyanobacteria/Melainabacteria group > Cyanobacteria > Synechococcales > Prochloraceae > Prochlorococcus',
+                    value:
+                        'Bacteria > Terrabacteria group > Cyanobacteria/Melainabacteria group > Cyanobacteria > Synechococcales > Prochloraceae > Prochlorococcus',
                 },
                 {
                     id: 'kbase_id',
@@ -409,7 +420,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
+                    value:
+                        'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
                 },
                 {
                     id: 'kbase_id',
@@ -445,7 +457,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Gammaproteobacteria > Thiotrichales > Francisellaceae > Francisella > Francisella noatunensis',
+                    value:
+                        'Bacteria > Proteobacteria > Gammaproteobacteria > Thiotrichales > Francisellaceae > Francisella > Francisella noatunensis',
                 },
                 {
                     id: 'kbase_id',
@@ -479,7 +492,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
+                    value:
+                        'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
                 },
                 {
                     id: 'kbase_id',
@@ -513,7 +527,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
+                    value:
+                        'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
                 },
                 {
                     id: 'kbase_id',
@@ -547,7 +562,8 @@ const allTestCases = {
                 {
                     id: 'lineage',
                     label: 'Lineage',
-                    value: 'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
+                    value:
+                        'Bacteria > Proteobacteria > Alphaproteobacteria > Rhodospirillales > Acetobacteraceae > Acetobacter',
                 },
                 {
                     id: 'kbase_id',

From b46252aea552e360703309609105efd469c4288f Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 10:37:30 -0700
Subject: [PATCH 23/42] add eslint pre push check (just files that will be
 pushed).

---
 .husky/pre-push | 2 +-
 package.json    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.husky/pre-push b/.husky/pre-push
index 4cbfc3da43..3447a9037d 100755
--- a/.husky/pre-push
+++ b/.husky/pre-push
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run husky_msg && npm run prettier_check
+npm run husky_msg && npm run prettier_check && npm run eslint-pre-push
diff --git a/package.json b/package.json
index 445395d242..7c3f46ac80 100644
--- a/package.json
+++ b/package.json
@@ -56,9 +56,14 @@
         "prettier": "prettier --write '**/*.js'",
         "prettier_check": "prettier --check '**/*.js'",
         "prettier_debug": "prettier --debug-check '**/*.js'",
+        "eslint-check": "eslint '**/*.js'",
+        "eslint-pre-push": "eslint $(git diff HEAD  --name-only | egrep \"\\.js$\")",
         "requirejs": "r.js -o build.js",
         "test": "karma start test/unit/karma.conf.js",
         "uglify": "terser kbase-extension/static/kbase-narrative.js -c --source-map --output kbase-extension/static/kbase-narrative-min.js",
         "postinstall": "husky install"
+    },
+    "lint-staged": {
+        "*.js": "eslint"
     }
 }

From 44a05cfd6c5774297ed6b072abd8eb2f7ecee1da Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 10:38:53 -0700
Subject: [PATCH 24/42] add auto-creation of docker network for local image run

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 26534ed40b..94fd1516ae 100755
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,13 @@ build-narrative-container:
 
 docker_image: build-narrative-container
 
-# Per PR #1328, adding an option to skip minification
+dev-network:
+	docker network create kbase-dev || true
+
 dev-image:
 	SKIP_MINIFY=1 DOCKER_TAG=dev sh $(DOCKER_INSTALLER)
 
-run-dev-image:
+run-dev-image: dev-network
 	ENV=$(ENV) sh scripts/local-dev-run.sh
 
 install:

From 6c3dbc16d4546aed134c40fc285f45a70b58f486 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 15:14:53 -0700
Subject: [PATCH 25/42] address sonarcloud issue

---
 .../kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
index e244844f5a..b66c380979 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
@@ -523,8 +523,9 @@ define([
     }
 
     return {
-        make: function (config) {
-            return factory(config);
+        // eslint-disable-next-line no-unused-vars
+        make: function (_config) {
+            return factory();
         },
     };
 });

From 32cf2927d397c3effa19044da888e008551d7dad Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 20:32:26 -0700
Subject: [PATCH 26/42] fix regressions due to merge

---
 kbase-extension/static/kbase/js/userMenu.js | 101 ++++++++++----------
 test/integration/NarrativeTesting.js        |   4 +-
 test/integration/wdioUtils.js               |   7 +-
 3 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/kbase-extension/static/kbase/js/userMenu.js b/kbase-extension/static/kbase/js/userMenu.js
index 61ef0c353a..d0de1d2c64 100644
--- a/kbase-extension/static/kbase/js/userMenu.js
+++ b/kbase-extension/static/kbase/js/userMenu.js
@@ -57,59 +57,62 @@ define([
         }
 
         function render() {
-            const menu = div({ class: 'dropdown', style: 'display:inline-block' }, [
-                button(
-                    {
-                        type: 'button',
-                        class: 'btn btn-default dropdown-toggle',
-                        'data-toggle': 'dropdown',
-                        'aria-expanded': 'false',
-                    },
-                    [renderAvatar(), span({ class: 'caret', style: 'margin-left: 5px;' })]
-                ),
-                ul({ class: 'dropdown-menu', role: 'menu' }, [
-                    li({}, [
-                        a(
-                            {
-                                href: '/#people/' + userName,
-                                target: '_blank',
-                                'data-menu-item': 'userlabel',
-                            },
-                            [
-                                div(
-                                    {
-                                        style:
-                                            'display:inline-block; width: 34px; vertical-align: top;',
-                                    },
-                                    [
-                                        span({
-                                            class: 'fa fa-user',
-                                            style: 'font-size: 150%; margin-right: 10px;',
-                                        }),
-                                    ]
-                                ),
-                                div({ style: 'display: inline-block' }, [
-                                    span({ 'data-element': 'realname' }, displayName),
-                                    br(),
-                                    i({ 'data-element': 'username' }, userName),
+            const menu = div(
+                { class: 'dropdown', style: 'display:inline-block', dataTestid: 'userMenu' },
+                [
+                    button(
+                        {
+                            type: 'button',
+                            class: 'btn btn-default dropdown-toggle',
+                            'data-toggle': 'dropdown',
+                            'aria-expanded': 'false',
+                        },
+                        [renderAvatar(), span({ class: 'caret', style: 'margin-left: 5px;' })]
+                    ),
+                    ul({ class: 'dropdown-menu', role: 'menu' }, [
+                        li({}, [
+                            a(
+                                {
+                                    href: '/#people/' + userName,
+                                    target: '_blank',
+                                    'data-menu-item': 'userlabel',
+                                },
+                                [
+                                    div(
+                                        {
+                                            style:
+                                                'display:inline-block; width: 34px; vertical-align: top;',
+                                        },
+                                        [
+                                            span({
+                                                class: 'fa fa-user',
+                                                style: 'font-size: 150%; margin-right: 10px;',
+                                            }),
+                                        ]
+                                    ),
+                                    div({ style: 'display: inline-block' }, [
+                                        span({ dataTestid: 'realname' }, displayName),
+                                        br(),
+                                        i({ dataTestid: 'username' }, userName),
+                                    ]),
+                                ]
+                            ),
+                        ]),
+                        li({ class: 'divider' }),
+                        li({}, [
+                            a({ href: '#', 'data-menu-item': 'logout', id: 'signout-button' }, [
+                                div({ style: 'display: inline-block; width: 34px;' }, [
+                                    span({
+                                        class: 'fa fa-sign-out',
+                                        style: 'font-size: 150%; margin-right: 10px;',
+                                    }),
                                 ]),
-                            ]
-                        ),
-                    ]),
-                    li({ class: 'divider' }),
-                    li({}, [
-                        a({ href: '#', 'data-menu-item': 'logout', id: 'signout-button' }, [
-                            div({ style: 'display: inline-block; width: 34px;' }, [
-                                span({
-                                    class: 'fa fa-sign-out',
-                                    style: 'font-size: 150%; margin-right: 10px;',
-                                }),
+                                'Sign Out',
                             ]),
-                            'Sign Out',
                         ]),
                     ]),
-                ]),
-            ]);
+                ]
+            );
             target.append(menu);
             target.find('#signout-button').click(logout);
         }
diff --git a/test/integration/NarrativeTesting.js b/test/integration/NarrativeTesting.js
index 5511a92712..e8aee77a48 100644
--- a/test/integration/NarrativeTesting.js
+++ b/test/integration/NarrativeTesting.js
@@ -113,8 +113,8 @@ class NarrativeTesting {
 
         await clickWhenReady(loginButton);
 
-        const realnameElement = await $('[data-element="realname"]');
-        const usernameElement = await $('[data-element="username"]');
+        const realnameElement = await $('[data-testid="realname"]');
+        const usernameElement = await $('[data-testid="username"]');
         await browser.waitUntil(async () => {
             const text = await realnameElement.getText();
             return text && text.length > 0;
diff --git a/test/integration/wdioUtils.js b/test/integration/wdioUtils.js
index 8770def741..076edce2d7 100644
--- a/test/integration/wdioUtils.js
+++ b/test/integration/wdioUtils.js
@@ -60,8 +60,9 @@ async function clickWhenReady(el) {
 /**
  * Navigates the wdio browser to a workspace as given by its id, and waits until the
  * narrative container is visible.
- * @arg {number} The narrative's workspace id
- * @returns {Promise} The Promise value is ignored.
+ *
+ * @param workspaceId {number} The narrative's workspace id
+ * @returns {Promise<void>}
  */
 async function openNarrative(workspaceId) {
     const timeout = 60000;
@@ -92,7 +93,7 @@ async function openNarrative(workspaceId) {
 
     await clickWhenReady(loginButton);
 
-    const userLabelElement = await $('[data-element="user-label"]');
+    const userLabelElement = await $('[data-testid="userMenu"] [data-testid="username"]');
     await browser.waitUntil(async () => {
         const userLabelText = await userLabelElement.getText();
         return userLabelText && userLabelText.length > 0;

From 5fe036f95f68c2089f3c933e8eb8defa4fe4844b Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 20:59:44 -0700
Subject: [PATCH 27/42] improve eslint prepush

---
 package.json               | 2 +-
 scripts/eslint-pre-push.sh | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100755 scripts/eslint-pre-push.sh

diff --git a/package.json b/package.json
index 7c3f46ac80..43b7b7bc03 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
         "prettier_check": "prettier --check '**/*.js'",
         "prettier_debug": "prettier --debug-check '**/*.js'",
         "eslint-check": "eslint '**/*.js'",
-        "eslint-pre-push": "eslint $(git diff HEAD  --name-only | egrep \"\\.js$\")",
+        "eslint-pre-push": "scripts/eslint-pre-push.sh",
         "requirejs": "r.js -o build.js",
         "test": "karma start test/unit/karma.conf.js",
         "uglify": "terser kbase-extension/static/kbase-narrative.js -c --source-map --output kbase-extension/static/kbase-narrative-min.js",
diff --git a/scripts/eslint-pre-push.sh b/scripts/eslint-pre-push.sh
new file mode 100755
index 0000000000..b8a9bb1970
--- /dev/null
+++ b/scripts/eslint-pre-push.sh
@@ -0,0 +1,2 @@
+export BRANCH=$(git branch --show-current)
+eslint $(git diff --stat --name-only  origin/$BRANCH HEAD | egrep "\\.js$")
\ No newline at end of file

From 6d3cac4263bafeeb129ff6bc78fd90bae07ebee8 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 21:24:27 -0700
Subject: [PATCH 28/42] trivial changes to trigger need testing commit

---
 test/integration/NarrativeTesting.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/integration/NarrativeTesting.js b/test/integration/NarrativeTesting.js
index e8aee77a48..38db0a0dc1 100644
--- a/test/integration/NarrativeTesting.js
+++ b/test/integration/NarrativeTesting.js
@@ -18,17 +18,17 @@ function mergeObjects(listOfObjects) {
         // Note that the source object is not copied, since we don't care if
         // there is object sharing in the result, we just want to ensure that
         // we don't overwrite properties of shared objects.
-        targetObj = JSON.parse(JSON.stringify(targetObj));
+        const merged = JSON.parse(JSON.stringify(targetObj));
 
         Object.keys(sourceObj).forEach(function (key) {
-            if (isSimpleObject(targetObj[key]) && isSimpleObject(sourceObj[key])) {
-                targetObj[key] = merge(targetObj[key], sourceObj[key]);
+            if (isSimpleObject(merged[key]) && isSimpleObject(sourceObj[key])) {
+                merged[key] = merge(merged[key], sourceObj[key]);
             } else {
-                targetObj[key] = sourceObj[key];
+                merged[key] = sourceObj[key];
             }
         });
 
-        return targetObj;
+        return merged;
     }
 
     const objectsToMerge = listOfObjects.map((obj, index) => {
@@ -41,6 +41,7 @@ function mergeObjects(listOfObjects) {
             return JSON.parse(JSON.stringify(obj));
         }
     });
+
     let merged = objectsToMerge[0];
     for (let i = 1; i < objectsToMerge.length; i += 1) {
         merged = merge(merged, objectsToMerge[i]);

From 5f5e64455ef9084e1f80bf032988bf185a872b30 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 21:29:42 -0700
Subject: [PATCH 29/42] eslint warnings return error code

---
 scripts/eslint-pre-push.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eslint-pre-push.sh b/scripts/eslint-pre-push.sh
index b8a9bb1970..b775465288 100755
--- a/scripts/eslint-pre-push.sh
+++ b/scripts/eslint-pre-push.sh
@@ -1,2 +1,2 @@
 export BRANCH=$(git branch --show-current)
-eslint $(git diff --stat --name-only  origin/$BRANCH HEAD | egrep "\\.js$")
\ No newline at end of file
+eslint --max-warnings=0 $(git diff --stat --name-only  origin/$BRANCH HEAD | egrep "\\.js$")
\ No newline at end of file

From 4b31bccfa36b10372854be14e35a5062c4f91b17 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 21:30:45 -0700
Subject: [PATCH 30/42] make eslint happy

---
 test/integration/NarrativeTesting.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/NarrativeTesting.js b/test/integration/NarrativeTesting.js
index 38db0a0dc1..c29aadb223 100644
--- a/test/integration/NarrativeTesting.js
+++ b/test/integration/NarrativeTesting.js
@@ -20,7 +20,7 @@ function mergeObjects(listOfObjects) {
         // we don't overwrite properties of shared objects.
         const merged = JSON.parse(JSON.stringify(targetObj));
 
-        Object.keys(sourceObj).forEach(function (key) {
+        Object.keys(sourceObj).forEach((key) => {
             if (isSimpleObject(merged[key]) && isSimpleObject(sourceObj[key])) {
                 merged[key] = merge(merged[key], sourceObj[key]);
             } else {

From dff4d923e568193a378a52ced3b73a2bb4333357 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 22:00:12 -0700
Subject: [PATCH 31/42] make sonarcloud happy

---
 test/integration/NarrativeTesting.js          | 34 +++++++------------
 .../specs/kbaseCellToolbarMenu_test.js        |  3 --
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/test/integration/NarrativeTesting.js b/test/integration/NarrativeTesting.js
index c29aadb223..793a95f280 100644
--- a/test/integration/NarrativeTesting.js
+++ b/test/integration/NarrativeTesting.js
@@ -18,17 +18,17 @@ function mergeObjects(listOfObjects) {
         // Note that the source object is not copied, since we don't care if
         // there is object sharing in the result, we just want to ensure that
         // we don't overwrite properties of shared objects.
-        const merged = JSON.parse(JSON.stringify(targetObj));
+        const mergedObj = JSON.parse(JSON.stringify(targetObj));
 
         Object.keys(sourceObj).forEach((key) => {
-            if (isSimpleObject(merged[key]) && isSimpleObject(sourceObj[key])) {
-                merged[key] = merge(merged[key], sourceObj[key]);
+            if (isSimpleObject(mergedObj[key]) && isSimpleObject(sourceObj[key])) {
+                mergedObj[key] = merge(mergedObj[key], sourceObj[key]);
             } else {
-                merged[key] = sourceObj[key];
+                mergedObj[key] = sourceObj[key];
             }
         });
 
-        return merged;
+        return mergedObj;
     }
 
     const objectsToMerge = listOfObjects.map((obj, index) => {
@@ -126,8 +126,6 @@ class NarrativeTesting {
         await loginButton.click();
 
         // Ensure narrative notebook has displayed
-        // TODO: more interesting waitUntil loop to signal the
-        // failure reason (useful for debugging tests?)
         const container = await $('#notebook-container');
         await container.waitForDisplayed({
             timeout,
@@ -136,10 +134,9 @@ class NarrativeTesting {
         return container;
     }
 
-    async waitForCell(notebookContainer, cellIndex) {
-        return await browser.waitUntil(async () => {
-            const cell = await notebookContainer.$(`.cell:nth-child(${cellIndex})`);
-            return cell;
+    waitForCell(notebookContainer, cellIndex) {
+        return browser.waitUntil(async () => {
+            return await notebookContainer.$(`.cell:nth-child(${cellIndex})`);
         });
     }
 
@@ -170,20 +167,15 @@ class NarrativeTesting {
             const cellText = await element.getText();
             return text === cellText;
         });
-        return await this.waitForCell(container, cellIndex);
+        return this.waitForCell(container, cellIndex);
     }
 
-    async waitForCellWithTitle(container, cellIndex, titleText) {
-        return await this.waitForCellWithText(
-            container,
-            cellIndex,
-            '[data-element="title"]',
-            titleText
-        );
+    waitForCellWithTitle(container, cellIndex, titleText) {
+        return this.waitForCellWithText(container, cellIndex, '[data-element="title"]', titleText);
     }
 
-    async waitForCellWithBody(container, cellIndex, bodyText) {
-        return await this.waitForCellWithText(
+    waitForCellWithBody(container, cellIndex, bodyText) {
+        return this.waitForCellWithText(
             container,
             cellIndex,
             '.text_cell_render.rendered_html',
diff --git a/test/integration/specs/kbaseCellToolbarMenu_test.js b/test/integration/specs/kbaseCellToolbarMenu_test.js
index cf9da2dc4a..7f7124041e 100644
--- a/test/integration/specs/kbaseCellToolbarMenu_test.js
+++ b/test/integration/specs/kbaseCellToolbarMenu_test.js
@@ -16,9 +16,6 @@ The first three cells are collapsed, the last two are expanded.
 Tests currently cover moving cells up and down, in both selected and unselected state, and ensuring that the moved 
 cell is in the expected position.
 
-TODO: This test suite could be expanded to cover all usage of the cell toolbar (kbaseCellToolbarMenu.js), or such 
-test cases can be could be in separate files.
-
 */
 
 async function testCellMovement({ caseLabel, selectCell, direction }) {

From ea4d6d94b3a94464f1b8b7276c6530b7827c207f Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 22:12:05 -0700
Subject: [PATCH 32/42] more pr code quality fixes

---
 scripts/eslint-pre-push.sh           | 2 ++
 test/integration/NarrativeTesting.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/eslint-pre-push.sh b/scripts/eslint-pre-push.sh
index b775465288..3cf5142dc8 100755
--- a/scripts/eslint-pre-push.sh
+++ b/scripts/eslint-pre-push.sh
@@ -1,2 +1,4 @@
+#!/bin/bash
+
 export BRANCH=$(git branch --show-current)
 eslint --max-warnings=0 $(git diff --stat --name-only  origin/$BRANCH HEAD | egrep "\\.js$")
\ No newline at end of file
diff --git a/test/integration/NarrativeTesting.js b/test/integration/NarrativeTesting.js
index 793a95f280..de8f619eb1 100644
--- a/test/integration/NarrativeTesting.js
+++ b/test/integration/NarrativeTesting.js
@@ -135,8 +135,8 @@ class NarrativeTesting {
     }
 
     waitForCell(notebookContainer, cellIndex) {
-        return browser.waitUntil(async () => {
-            return await notebookContainer.$(`.cell:nth-child(${cellIndex})`);
+        return browser.waitUntil(() => {
+            return notebookContainer.$(`.cell:nth-child(${cellIndex})`);
         });
     }
 

From 11c8619cce37577ed57093d2c2a5ea63a827f31b Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 26 May 2021 22:15:44 -0700
Subject: [PATCH 33/42] more pr code quality fixes

---
 scripts/eslint-pre-push.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eslint-pre-push.sh b/scripts/eslint-pre-push.sh
index 3cf5142dc8..7bba0c3549 100755
--- a/scripts/eslint-pre-push.sh
+++ b/scripts/eslint-pre-push.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 export BRANCH=$(git branch --show-current)
-eslint --max-warnings=0 $(git diff --stat --name-only  origin/$BRANCH HEAD | egrep "\\.js$")
\ No newline at end of file
+eslint --max-warnings=0 $(git diff --stat --name-only  "origin/$BRANCH" HEAD | egrep "\\.js$")
\ No newline at end of file

From 02b67d08b4257ca1350455085797bc73b81f1d4b Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Tue, 27 Jul 2021 10:55:51 -0700
Subject: [PATCH 34/42] Correct linting errors in files merged from develop
 (?!). WebStorm notes a bunch of additional warnings, but ignoring.

---
 .../function_input/kbaseTabbedInput.js        |  24 +-
 .../narrative_core/kbaseNarrativeDataList.js  |   1 +
 .../widgets/advancedViewCellWidget.js         | 255 +++++++-----------
 nbextensions/codeCell/main.js                 |   6 +-
 .../viewCell/widgets/viewCellWidget.js        |  87 +++---
 5 files changed, 156 insertions(+), 217 deletions(-)

diff --git a/kbase-extension/static/kbase/js/widgets/function_input/kbaseTabbedInput.js b/kbase-extension/static/kbase/js/widgets/function_input/kbaseTabbedInput.js
index bf4d048e0b..590f4f3262 100644
--- a/kbase-extension/static/kbase/js/widgets/function_input/kbaseTabbedInput.js
+++ b/kbase-extension/static/kbase/js/widgets/function_input/kbaseTabbedInput.js
@@ -12,6 +12,8 @@ define(['kbwidget', 'bootstrap', 'jquery', 'kbaseTabs', 'kbaseNarrativeMethodInp
     kbaseTabs,
     kbaseNarrativeMethodInput
 ) => {
+    'use strict';
+
     return KBWidget({
         name: 'kbaseTabbedInput',
         parent: kbaseNarrativeMethodInput,
@@ -54,18 +56,17 @@ define(['kbwidget', 'bootstrap', 'jquery', 'kbaseTabs', 'kbaseNarrativeMethodInp
                 //console.log(tabParamSpec);
                 self.paramIdToTab = {};
                 const tabIdToParamCount = {};
-                for (var tabId in tabParamSpec.tab_options.tab_id_to_param_ids) {
+                for (const tabId in tabParamSpec.tab_options.tab_id_to_param_ids) {
                     const paramIds = tabParamSpec.tab_options.tab_id_to_param_ids[tabId];
                     tabIdToParamCount[tabId] = paramIds.length;
                     for (const paramPosInTab in paramIds) {
-                        paramId = paramIds[paramPosInTab];
-                        self.paramIdToTab[paramId] = tabId;
+                        self.paramIdToTab[paramIds[paramPosInTab]] = tabId;
                     }
                 }
                 const tabNamesRaw = tabParamSpec.tab_options.tab_id_to_tab_name;
                 if (this.options.isInSidePanel) {
                     self.tabNames = {};
-                    for (var tabId in tabNamesRaw) {
+                    for (const tabId in tabNamesRaw) {
                         if (tabIdToParamCount[tabId] && tabIdToParamCount[tabId] > 0)
                             self.tabNames[tabId] = tabNamesRaw[tabId];
                     }
@@ -87,11 +88,11 @@ define(['kbwidget', 'bootstrap', 'jquery', 'kbaseTabs', 'kbaseNarrativeMethodInp
                 self.tabParamToSpec = {};
                 let tabCount = 0;
                 for (const tabPos in tabParamSpec.tab_options.tab_id_order) {
-                    var tabId = tabParamSpec.tab_options.tab_id_order[tabPos];
+                    const tabId = tabParamSpec.tab_options.tab_id_order[tabPos];
                     const tabName = self.tabNames[tabId];
                     if (!tabName) continue;
-                    tab = $('<div/>');
-                    const isShown = tabCount == 0;
+                    const tab = $('<div/>');
+                    const isShown = tabCount === 0;
                     self.tabPaneWidget.addTab({
                         tab: tabName,
                         content: tab,
@@ -175,13 +176,13 @@ define(['kbwidget', 'bootstrap', 'jquery', 'kbaseTabs', 'kbaseNarrativeMethodInp
         },
 
         putInTab: function (paramSpec, $stepDiv, $optionsDiv, tabId) {
-            if ($optionsDiv.children().length == 0) $stepDiv.css({ 'margin-top': '5px' });
+            if ($optionsDiv.children().length === 0) $stepDiv.css({ 'margin-top': '5px' });
             if (!this.tabPaneWasAdded) {
                 $optionsDiv.append(this.tabPane);
                 this.tabPaneWasAdded = true;
             }
             const tab = this.tabs[tabId];
-            if (tab.children().length == 0) tab.css({ 'margin-top': '5px' });
+            if (tab.children().length === 0) tab.css({ 'margin-top': '5px' });
             tab.append($stepDiv);
             this.tabParamToSpec[tabId][paramSpec.id] = paramSpec;
         },
@@ -204,8 +205,7 @@ define(['kbwidget', 'bootstrap', 'jquery', 'kbaseTabs', 'kbaseNarrativeMethodInp
 
         getState: function () {
             const state = this._superMethod('getState');
-            const selectedParameterTab = this.getSelectedTabId();
-            state['selectedParameterTab'] = selectedParameterTab;
+            state['selectedParameterTab'] = this.getSelectedTabId();
             return state;
         },
 
@@ -270,4 +270,4 @@ define(['kbwidget', 'bootstrap', 'jquery', 'kbaseTabs', 'kbaseNarrativeMethodInp
             }
         },
     });
-})(jQuery);
+});
diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js
index 041a538a85..6b532b3562 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseNarrativeDataList.js
@@ -414,6 +414,7 @@ define([
                     }
                 })
                 .catch((error) => {
+                    // eslint-disable-next-line no-console
                     console.trace('dumping stacktrace!');
                     console.error('DataList: when checking for updates:', error);
                     if (showError) {
diff --git a/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js b/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js
index 156b9e6772..2bf0e112f8 100644
--- a/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js
+++ b/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js
@@ -39,7 +39,7 @@ define([
     Fsm,
     Spec,
     PR,
-    appStates
+    appStates,
 ) => {
     'use strict';
     const t = html.tag,
@@ -50,48 +50,44 @@ define([
         table = t('table'),
         tr = t('tr'),
         th = t('th'),
-        td = t('td'),
-        img = t('img');
+        td = t('td');
 
     function factory(config) {
-        let container,
-            ui,
-            workspaceInfo = config.workspaceInfo,
-            runtime = Runtime.make(),
-            cell = config.cell,
-            parentBus = config.bus,
-            spec,
-            // TODO: the cell bus should be created and managed through main.js,
-            // that is, the extension.
-            cellBus,
-            bus = runtime.bus().makeChannelBus({ description: 'A view cell widget' }),
-            env = {},
-            model,
-            eventManager = BusEventManager.make({
-                bus: runtime.bus(),
-            }),
-            // HMM. Sync with metadata, or just keep everything there?
-            settings = {
-                showAdvanced: {
-                    label: 'Show advanced parameters',
-                    defaultValue: false,
-                    type: 'custom',
-                },
-                showNotifications: {
-                    label: 'Show the notifications panel',
-                    defaultValue: false,
-                    type: 'toggle',
-                    element: 'notifications',
-                },
-                showAboutApp: {
-                    label: 'Show the About App panel',
-                    defaultValue: false,
-                    type: 'toggle',
-                    element: 'about-app',
-                },
+        let container;
+        let ui;
+        const workspaceInfo = config.workspaceInfo;
+        const runtime = Runtime.make();
+        const cell = config.cell;
+        const parentBus = config.bus;
+        // TODO: the cell bus should be created and managed through main.js,
+        // that is, the extension.
+        let cellBus;
+        const bus = runtime.bus().makeChannelBus({ description: 'A view cell widget' });
+        const eventManager = BusEventManager.make({
+            bus: runtime.bus(),
+        });
+        // HMM. Sync with metadata, or just keep everything there?
+        const settings = {
+            showAdvanced: {
+                label: 'Show advanced parameters',
+                defaultValue: false,
+                type: 'custom',
+            },
+            showNotifications: {
+                label: 'Show the notifications panel',
+                defaultValue: false,
+                type: 'toggle',
+                element: 'notifications',
             },
-            widgets = {},
-            fsm;
+            showAboutApp: {
+                label: 'Show the About App panel',
+                defaultValue: false,
+                type: 'toggle',
+                element: 'about-app',
+            },
+        };
+        const widgets = {};
+        let fsm;
 
         if (runtime.config('features.developer')) {
             settings.showDeveloper = {
@@ -121,7 +117,7 @@ define([
                     runtime.config('services.narrative_method_store.url'),
                     {
                         token: runtime.authToken(),
-                    }
+                    },
                 );
 
             return nms.get_method_spec(appRef).then((data) => {
@@ -138,15 +134,8 @@ define([
             ui.setContent('fatal-error.message', model.getItem('fatalError.message'));
         }
 
-        function showFatalError(arg) {
-            ui.showElement('fatal-error');
-        }
-
         function toBoolean(value) {
-            if (value && value !== null) {
-                return true;
-            }
-            return false;
+            return (value && value !== null);
         }
 
         function validateModel() {
@@ -179,16 +168,16 @@ define([
         }
 
         function buildPython(cell, cellId, app, params) {
-            var runId = new Uuid(4).format(),
-                app = fixApp(app),
-                outputWidgetState = utils.getCellMeta(cell, 'viewCell.outputWidgetState') || null,
-                code = PythonInterop.buildAdvancedViewRunner(
-                    cellId,
-                    runId,
-                    app,
-                    params,
-                    outputWidgetState
-                );
+            const runId = new Uuid(4).format();
+            const fixedApp = fixApp(app);
+            const outputWidgetState = utils.getCellMeta(cell, 'viewCell.outputWidgetState') || null;
+            const code = PythonInterop.buildAdvancedViewRunner(
+                cellId,
+                runId,
+                fixedApp,
+                params,
+                outputWidgetState,
+            );
             // TODO: do something with the runId
             cell.set_text(code);
         }
@@ -213,7 +202,7 @@ define([
                 //xinitialState: {
                 //    mode: 'editing', params: 'incomplete'
                 //},
-                onNewState: function (fsm) {
+                onNewState: function(fsm) {
                     model.setItem('fsm.currentState', fsm.getCurrentState().state);
                     // save the narrative!
                 },
@@ -245,7 +234,7 @@ define([
             }
         }
 
-        function toggleCodeInputArea(cell) {
+        function toggleCodeInputArea() {
             if (model.getItem('user-settings.showCodeInputArea')) {
                 model.setItem('user-settings.showCodeInputArea', false);
             } else {
@@ -277,14 +266,14 @@ define([
                                             class: 'btn btn-default',
                                             id: events.addEvent({
                                                 type: 'click',
-                                                handler: function () {
+                                                handler: function() {
                                                     doRemoveNotification(index);
                                                 },
                                             }),
                                         },
-                                        'X'
+                                        'X',
                                     ),
-                                ])
+                                ]),
                             ),
                         ]);
                     })
@@ -300,29 +289,9 @@ define([
             renderNotifications();
         }
 
-        function clearNotifications() {
-            model.setItem('notifications', []);
-        }
 
         // WIDGETS
 
-        function showWidget(name, widgetModule, path) {
-            const bus = runtime.bus().makeChannelBus({ description: 'Bus for showWidget' }),
-                widget = widgetModule.make({
-                    bus: bus,
-                    workspaceInfo: workspaceInfo,
-                });
-            widgets[name] = {
-                path: path,
-                module: widgetModule,
-                instance: widget,
-            };
-            widget.start();
-            bus.emit('attach', {
-                node: ui.getElement(path),
-            });
-        }
-
         /*
          *
          * Render the UI according to the FSM
@@ -374,7 +343,7 @@ define([
                                     flexDirection: 'column',
                                 },
                             },
-                            [div({ dataElement: 'status' })]
+                            [div({ dataElement: 'status' })],
                         ),
                         div(
                             {
@@ -409,7 +378,7 @@ define([
                                                             td({ dataElement: 'title' }),
                                                             td(
                                                                 'Message',
-                                                                td({ dataElement: 'message' })
+                                                                td({ dataElement: 'message' }),
                                                             ),
                                                         ]),
                                                     ]),
@@ -432,7 +401,7 @@ define([
                                                 collapsed: utils.getCellMeta(
                                                     cell,
                                                     'kbase.viewCell.user-settings.collapsedConfigurePanel',
-                                                    false
+                                                    false,
                                                 ),
                                                 type: 'default',
                                                 classes: ['kb-panel-container'],
@@ -460,38 +429,39 @@ define([
                                                                             {
                                                                                 events: events,
                                                                                 type: 'primary',
-                                                                            }
+                                                                            },
                                                                         ),
                                                                     ]),
-                                                                ]
+                                                                ],
                                                             ),
-                                                        ]
+                                                        ],
                                                     ),
                                                 ]),
                                             }),
                                         ]),
-                                    ]
+                                    ],
                                 ),
-                            ]
+                            ],
                         ),
-                    ]
+                    ],
                 );
             container.innerHTML = content;
             events.attachEvents(container);
-            $('#' + configureId + ' .collapse').on('hidden.bs.collapse', () => {
-                utils.setCellMeta(
-                    cell,
-                    'kbase.viewCell.user-settings.collapsedConfigurePanel',
-                    true
-                );
-            });
-            $('#' + configureId + ' .collapse').on('shown.bs.collapse', () => {
-                utils.setCellMeta(
-                    cell,
-                    'kbase.viewCell.user-settings.collapsedConfigurePanel',
-                    false
-                );
-            });
+            $('#' + configureId + ' .collapse')
+                .on('hidden.bs.collapse', () => {
+                    utils.setCellMeta(
+                        cell,
+                        'kbase.viewCell.user-settings.collapsedConfigurePanel',
+                        true,
+                    );
+                })
+                .on('shown.bs.collapse', () => {
+                    utils.setCellMeta(
+                        cell,
+                        'kbase.viewCell.user-settings.collapsedConfigurePanel',
+                        false,
+                    );
+                });
         }
 
         function doDeleteCell() {
@@ -512,7 +482,7 @@ define([
                     bus.emit('stop');
 
                     Jupyter.deleteCell(cell);
-                }
+                },
             );
         }
 
@@ -565,9 +535,7 @@ define([
                         label = showing ? 'Hide Code' : 'Show Code';
                     ui.setButtonLabel('toggle-code-view', label);
                 });
-                bus.on('show-notifications', () => {
-                    doShowNotifications();
-                });
+
                 bus.on('edit-cell-metadata', () => {
                     doEditCellMetadata();
                 });
@@ -598,13 +566,13 @@ define([
                 eventManager.add(
                     cellBus.on('delete-cell', () => {
                         doDeleteCell();
-                    })
+                    }),
                 );
 
                 eventManager.add(
                     cellBus.on('metadata-changed', () => {
                         evaluateAppState();
-                    })
+                    }),
                 );
 
                 showCodeInputArea();
@@ -625,7 +593,7 @@ define([
                 if (!paramSpec) {
                     console.error(
                         'Parameter ' + key + ' is not defined in the parameter map',
-                        parameters
+                        parameters,
                     );
                     throw new Error('Parameter ' + key + ' is not defined in the parameter map');
                 }
@@ -668,7 +636,7 @@ define([
                                     type: 'update',
                                     parameter: message.parameter,
                                 },
-                            }
+                            },
                         );
                     });
 
@@ -685,7 +653,7 @@ define([
                                         parameter: paramId,
                                     },
                                     channel: message.replyToChannel,
-                                }
+                                },
                             );
                         });
                     });
@@ -694,7 +662,7 @@ define([
                         key: {
                             type: 'get-parameter',
                         },
-                        handle: function (message) {
+                        handle: function(message) {
                             return {
                                 value: model.getItem(['params', message.parameterName]),
                             };
@@ -717,44 +685,12 @@ define([
                             resolve();
                         });
                 }, (err) => {
-                    console.log('ERROR', err);
+                    console.error('ERROR', err);
                     reject(err);
                 });
             });
         }
 
-        function makeIcon() {
-            // icon is in the spec ...
-            const appSpec = env.appSpec,
-                nmsBase = runtime.config('services.narrative_method_store_image.url'),
-                iconUrl = Props.getDataItem(appSpec, 'info.icon.url');
-
-            if (iconUrl) {
-                return span({ class: 'fa-stack fa-2x', style: { padding: '2px' } }, [
-                    img({
-                        src: nmsBase + iconUrl,
-                        style: { maxWidth: '46px', maxHeight: '46px', margin: '2px' },
-                    }),
-                ]);
-            }
-
-            return span({ style: '' }, [
-                span(
-                    {
-                        class: 'fa-stack fa-2x',
-                        style: { textAlign: 'center', color: 'rgb(103,58,183)' },
-                    },
-                    [
-                        span({
-                            class: 'fa fa-square fa-stack-2x',
-                            style: { color: 'rgb(103,58,183)' },
-                        }),
-                        span({ class: 'fa fa-inverse fa-stack-1x fa-cube' }),
-                    ]
-                ),
-            ]);
-        }
-
         // just a quick hack since we are not truly recursive yet..,
         function gatherValidationMessages(validationResult) {
             const messages = [];
@@ -781,6 +717,7 @@ define([
                     });
                 }
             }
+
             harvestErrors(validationResult);
             return messages;
         }
@@ -797,7 +734,7 @@ define([
                             cell,
                             utils.getMeta(cell, 'attributes').id,
                             model.getItem('app'),
-                            exportParams()
+                            exportParams(),
                         );
                         fsm.newState({ mode: 'editing', params: 'complete', code: 'built' });
                         renderUI();
@@ -808,7 +745,8 @@ define([
                     }
                 })
                 .catch((err) => {
-                    alert('internal error'), console.error('INTERNAL ERROR', err);
+                    alert('internal error');
+                    console.error('INTERNAL ERROR', err);
                 });
         }
 
@@ -824,12 +762,12 @@ define([
                     utils.setCellMeta(
                         cell,
                         'kbase.attributes.title',
-                        model.getItem('app.spec.info.name')
+                        model.getItem('app.spec.info.name'),
                     );
                     utils.setCellMeta(
                         cell,
                         'kbase.attributes.subtitle',
-                        model.getItem('app.spec.info.subtitle')
+                        model.getItem('app.spec.info.subtitle'),
                     );
                     utils.setCellMeta(cell, 'kbase.attributes.info.url', url);
                     utils.setCellMeta(cell, 'kbase.attributes.info.label', 'more...');
@@ -864,15 +802,15 @@ define([
 
         // INIT
 
-        model = Props.make({
+        const model = Props.make({
             data: utils.getMeta(cell, 'viewCell'),
-            onUpdate: function (props) {
+            onUpdate: function(props) {
                 utils.setMeta(cell, 'viewCell', props.getRawObject());
                 // saveNarrative();
             },
         });
 
-        spec = Spec.make({
+        const spec = Spec.make({
             appSpec: model.getItem('app.spec'),
         });
 
@@ -885,10 +823,11 @@ define([
     }
 
     return {
-        make: function (config) {
+        make: function(config) {
             return factory(config);
         },
     };
 }, (err) => {
+    'use strict';
     console.error('ERROR loading viewCell viewCellWidget', err);
 });
diff --git a/nbextensions/codeCell/main.js b/nbextensions/codeCell/main.js
index 7711f2d5d6..de5f2aa916 100644
--- a/nbextensions/codeCell/main.js
+++ b/nbextensions/codeCell/main.js
@@ -61,8 +61,7 @@ define([
 
         cell.getIcon = function () {
             const iconColor = 'silver';
-            let icon;
-            icon = span({ class: 'fa fa-inverse fa-stack-1x fa-' + 'terminal' });
+            const icon = span({ class: 'fa fa-inverse fa-stack-1x fa-' + 'terminal' });
 
             return span({ style: '' }, [
                 span(
@@ -92,6 +91,7 @@ define([
                     true
                 );
                 // NB purely for side effect - toolbar refresh
+                // eslint-disable-next-line no-self-assign
                 cell.metadata = cell.metadata;
             }
         };
@@ -131,6 +131,7 @@ define([
 
         cell.renderMinMax();
         // force toolbar rerender.
+        // eslint-disable-next-line no-self-assign
         cell.metadata = cell.metadata;
     }
 
@@ -268,5 +269,6 @@ define([
         load_ipython_extension: load,
     };
 }, (err) => {
+    'use strict';
     console.error('ERROR loading codeCell main', err);
 });
diff --git a/nbextensions/viewCell/widgets/viewCellWidget.js b/nbextensions/viewCell/widgets/viewCellWidget.js
index 2b544c1290..2891d75707 100644
--- a/nbextensions/viewCell/widgets/viewCellWidget.js
+++ b/nbextensions/viewCell/widgets/viewCellWidget.js
@@ -250,43 +250,41 @@ define([
         ];
 
     function factory(config) {
-        let container,
-            ui,
-            workspaceInfo = config.workspaceInfo,
-            runtime = Runtime.make(),
-            cell = config.cell,
-            parentBus = config.bus,
-            spec,
-            // TODO: the cell bus should be created and managed through main.js,
-            // that is, the extension.
-            cellBus,
-            bus = runtime.bus().makeChannelBus({ description: 'A view cell widget' }),
-            model,
-            paramsWidget,
-            eventManager = BusEventManager.make({
-                bus: runtime.bus(),
-            }),
-            // HMM. Sync with metadata, or just keep everything there?
-            settings = {
-                showAdvanced: {
-                    label: 'Show advanced parameters',
-                    defaultValue: false,
-                    type: 'custom',
-                },
-                showNotifications: {
-                    label: 'Show the notifications panel',
-                    defaultValue: false,
-                    type: 'toggle',
-                    element: 'notifications',
-                },
-                showAboutApp: {
-                    label: 'Show the About App panel',
-                    defaultValue: false,
-                    type: 'toggle',
-                    element: 'about-app',
-                },
+        let container;
+        let ui;
+        const workspaceInfo = config.workspaceInfo;
+        const runtime = Runtime.make();
+        const cell = config.cell;
+        const parentBus = config.bus;
+        // TODO: the cell bus should be created and managed through main.js,
+        // that is, the extension.
+        let cellBus;
+        const bus = runtime.bus().makeChannelBus({ description: 'A view cell widget' });
+        let paramsWidget;
+        const eventManager = BusEventManager.make({
+            bus: runtime.bus(),
+        });
+        // HMM. Sync with metadata, or just keep everything there?
+        const settings = {
+            showAdvanced: {
+                label: 'Show advanced parameters',
+                defaultValue: false,
+                type: 'custom',
+            },
+            showNotifications: {
+                label: 'Show the notifications panel',
+                defaultValue: false,
+                type: 'toggle',
+                element: 'notifications',
+            },
+            showAboutApp: {
+                label: 'Show the About App panel',
+                defaultValue: false,
+                type: 'toggle',
+                element: 'about-app',
             },
-            fsm;
+        };
+        let fsm;
 
         if (runtime.config('features.developer')) {
             settings.showDeveloper = {
@@ -408,14 +406,13 @@ define([
         }
 
         function renderSetting(settingName) {
-            let setting = settings[settingName],
-                value;
+            const setting = settings[settingName];
 
             if (!setting) {
                 return;
             }
 
-            value = model.getItem(['user-settings', settingName], setting.defaultValue);
+            const value = model.getItem(['user-settings', settingName], setting.defaultValue);
             switch (setting.type) {
                 case 'toggle':
                     if (value) {
@@ -800,10 +797,10 @@ define([
         }
 
         function toggleSettings() {
-            let name = 'showSettings',
-                selector = 'settings',
-                node = ui.getElement(selector),
-                showing = model.getItem(['user-settings', name]);
+            const name = 'showSettings';
+            const selector = 'settings';
+            const node = ui.getElement(selector);
+            let showing = model.getItem(['user-settings', name]);
             if (showing) {
                 model.setItem(['user-settings', name], false);
             } else {
@@ -1332,14 +1329,14 @@ define([
         }
 
         // INIT
-        model = Props.make({
+        const model = Props.make({
             data: utils.getMeta(cell, 'viewCell'),
             onUpdate: function (props) {
                 utils.setMeta(cell, 'viewCell', props.getRawObject());
             },
         });
 
-        spec = Spec.make({
+        const spec = Spec.make({
             appSpec: model.getItem('app.spec'),
         });
 

From a7dc8e1f1b968957846df8ac48bcec7e1b444dd1 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Tue, 27 Jul 2021 11:00:33 -0700
Subject: [PATCH 35/42] Prettify file.

---
 .../widgets/advancedViewCellWidget.js         | 63 +++++++++----------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js b/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js
index 2bf0e112f8..f9af2bd533 100644
--- a/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js
+++ b/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js
@@ -39,7 +39,7 @@ define([
     Fsm,
     Spec,
     PR,
-    appStates,
+    appStates
 ) => {
     'use strict';
     const t = html.tag,
@@ -117,7 +117,7 @@ define([
                     runtime.config('services.narrative_method_store.url'),
                     {
                         token: runtime.authToken(),
-                    },
+                    }
                 );
 
             return nms.get_method_spec(appRef).then((data) => {
@@ -135,7 +135,7 @@ define([
         }
 
         function toBoolean(value) {
-            return (value && value !== null);
+            return value && value !== null;
         }
 
         function validateModel() {
@@ -176,7 +176,7 @@ define([
                 runId,
                 fixedApp,
                 params,
-                outputWidgetState,
+                outputWidgetState
             );
             // TODO: do something with the runId
             cell.set_text(code);
@@ -202,7 +202,7 @@ define([
                 //xinitialState: {
                 //    mode: 'editing', params: 'incomplete'
                 //},
-                onNewState: function(fsm) {
+                onNewState: function (fsm) {
                     model.setItem('fsm.currentState', fsm.getCurrentState().state);
                     // save the narrative!
                 },
@@ -266,14 +266,14 @@ define([
                                             class: 'btn btn-default',
                                             id: events.addEvent({
                                                 type: 'click',
-                                                handler: function() {
+                                                handler: function () {
                                                     doRemoveNotification(index);
                                                 },
                                             }),
                                         },
-                                        'X',
+                                        'X'
                                     ),
-                                ]),
+                                ])
                             ),
                         ]);
                     })
@@ -289,7 +289,6 @@ define([
             renderNotifications();
         }
 
-
         // WIDGETS
 
         /*
@@ -343,7 +342,7 @@ define([
                                     flexDirection: 'column',
                                 },
                             },
-                            [div({ dataElement: 'status' })],
+                            [div({ dataElement: 'status' })]
                         ),
                         div(
                             {
@@ -378,7 +377,7 @@ define([
                                                             td({ dataElement: 'title' }),
                                                             td(
                                                                 'Message',
-                                                                td({ dataElement: 'message' }),
+                                                                td({ dataElement: 'message' })
                                                             ),
                                                         ]),
                                                     ]),
@@ -401,7 +400,7 @@ define([
                                                 collapsed: utils.getCellMeta(
                                                     cell,
                                                     'kbase.viewCell.user-settings.collapsedConfigurePanel',
-                                                    false,
+                                                    false
                                                 ),
                                                 type: 'default',
                                                 classes: ['kb-panel-container'],
@@ -429,21 +428,21 @@ define([
                                                                             {
                                                                                 events: events,
                                                                                 type: 'primary',
-                                                                            },
+                                                                            }
                                                                         ),
                                                                     ]),
-                                                                ],
+                                                                ]
                                                             ),
-                                                        ],
+                                                        ]
                                                     ),
                                                 ]),
                                             }),
                                         ]),
-                                    ],
+                                    ]
                                 ),
-                            ],
+                            ]
                         ),
-                    ],
+                    ]
                 );
             container.innerHTML = content;
             events.attachEvents(container);
@@ -452,14 +451,14 @@ define([
                     utils.setCellMeta(
                         cell,
                         'kbase.viewCell.user-settings.collapsedConfigurePanel',
-                        true,
+                        true
                     );
                 })
                 .on('shown.bs.collapse', () => {
                     utils.setCellMeta(
                         cell,
                         'kbase.viewCell.user-settings.collapsedConfigurePanel',
-                        false,
+                        false
                     );
                 });
         }
@@ -482,7 +481,7 @@ define([
                     bus.emit('stop');
 
                     Jupyter.deleteCell(cell);
-                },
+                }
             );
         }
 
@@ -566,13 +565,13 @@ define([
                 eventManager.add(
                     cellBus.on('delete-cell', () => {
                         doDeleteCell();
-                    }),
+                    })
                 );
 
                 eventManager.add(
                     cellBus.on('metadata-changed', () => {
                         evaluateAppState();
-                    }),
+                    })
                 );
 
                 showCodeInputArea();
@@ -593,7 +592,7 @@ define([
                 if (!paramSpec) {
                     console.error(
                         'Parameter ' + key + ' is not defined in the parameter map',
-                        parameters,
+                        parameters
                     );
                     throw new Error('Parameter ' + key + ' is not defined in the parameter map');
                 }
@@ -636,7 +635,7 @@ define([
                                     type: 'update',
                                     parameter: message.parameter,
                                 },
-                            },
+                            }
                         );
                     });
 
@@ -653,7 +652,7 @@ define([
                                         parameter: paramId,
                                     },
                                     channel: message.replyToChannel,
-                                },
+                                }
                             );
                         });
                     });
@@ -662,7 +661,7 @@ define([
                         key: {
                             type: 'get-parameter',
                         },
-                        handle: function(message) {
+                        handle: function (message) {
                             return {
                                 value: model.getItem(['params', message.parameterName]),
                             };
@@ -734,7 +733,7 @@ define([
                             cell,
                             utils.getMeta(cell, 'attributes').id,
                             model.getItem('app'),
-                            exportParams(),
+                            exportParams()
                         );
                         fsm.newState({ mode: 'editing', params: 'complete', code: 'built' });
                         renderUI();
@@ -762,12 +761,12 @@ define([
                     utils.setCellMeta(
                         cell,
                         'kbase.attributes.title',
-                        model.getItem('app.spec.info.name'),
+                        model.getItem('app.spec.info.name')
                     );
                     utils.setCellMeta(
                         cell,
                         'kbase.attributes.subtitle',
-                        model.getItem('app.spec.info.subtitle'),
+                        model.getItem('app.spec.info.subtitle')
                     );
                     utils.setCellMeta(cell, 'kbase.attributes.info.url', url);
                     utils.setCellMeta(cell, 'kbase.attributes.info.label', 'more...');
@@ -804,7 +803,7 @@ define([
 
         const model = Props.make({
             data: utils.getMeta(cell, 'viewCell'),
-            onUpdate: function(props) {
+            onUpdate: function (props) {
                 utils.setMeta(cell, 'viewCell', props.getRawObject());
                 // saveNarrative();
             },
@@ -823,7 +822,7 @@ define([
     }
 
     return {
-        make: function(config) {
+        make: function (config) {
             return factory(config);
         },
     };

From 1749f9aba7aa4227c883414036b8b9006424c6f0 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Tue, 27 Jul 2021 14:19:10 -0700
Subject: [PATCH 36/42] resolve linting errors.

---
 .../widgets/advancedViewCellWidget.js         |   2 +-
 .../widgets/editors/readsSet/editor.js        | 174 ++++--------------
 2 files changed, 41 insertions(+), 135 deletions(-)

diff --git a/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js b/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js
index f9af2bd533..6e74a38796 100644
--- a/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js
+++ b/nbextensions/advancedViewCell/widgets/advancedViewCellWidget.js
@@ -135,7 +135,7 @@ define([
         }
 
         function toBoolean(value) {
-            return value && value !== null;
+            return !!value;
         }
 
         function validateModel() {
diff --git a/nbextensions/editorCell/widgets/editors/readsSet/editor.js b/nbextensions/editorCell/widgets/editors/readsSet/editor.js
index 7af0fd30d4..e7c2665768 100644
--- a/nbextensions/editorCell/widgets/editors/readsSet/editor.js
+++ b/nbextensions/editorCell/widgets/editors/readsSet/editor.js
@@ -69,40 +69,38 @@ define([
     CancellationError.prototype.name = 'ClientException';
 
     function factory(config) {
-        let cell = config.cell,
-            parentBus = config.bus,
-            hostNode,
-            container,
-            ui,
-            workspaceInfo = config.workspaceInfo,
-            runtime = Runtime.make(),
-            // TODO: the cell bus should be created and managed through main.js,
-            // that is, the extension.
-            cellBus,
-            bus = runtime.bus().makeChannelBus({ description: 'An editor cell widget' }),
-            env = {},
-            editorState,
-            model,
-            eventManager = BusEventManager.make({
-                bus: runtime.bus(),
-            }),
-            // HMM. Sync with metadata, or just keep everything there?
-            settings = {
-                showAdvanced: {
-                    label: 'Show advanced parameters',
-                    defaultValue: false,
-                    type: 'custom',
-                },
-                showNotifications: {
-                    label: 'Show the notifications panel',
-                    defaultValue: false,
-                    type: 'toggle',
-                    element: 'notifications',
-                },
+        const cell = config.cell;
+        const parentBus = config.bus;
+        let hostNode;
+        let container;
+        let ui;
+        const workspaceInfo = config.workspaceInfo;
+        const runtime = Runtime.make();
+        // TODO: the cell bus should be created and managed through main.js,
+        // that is, the extension.
+        let cellBus;
+        const bus = runtime.bus().makeChannelBus({ description: 'An editor cell widget' });
+        const env = {};
+        const eventManager = BusEventManager.make({
+            bus: runtime.bus(),
+        });
+        // HMM. Sync with metadata, or just keep everything there?
+        const settings = {
+            showAdvanced: {
+                label: 'Show advanced parameters',
+                defaultValue: false,
+                type: 'custom',
             },
-            widgets = {},
-            spec,
-            fsm;
+            showNotifications: {
+                label: 'Show the notifications panel',
+                defaultValue: false,
+                type: 'toggle',
+                element: 'notifications',
+            },
+        };
+        const widgets = {};
+        let spec;
+        let fsm;
 
         if (runtime.config('features.developer')) {
             settings.showDeveloper = {
@@ -156,35 +154,8 @@ define([
             ui.setContent('fatal-error.advice', editorState.getItem('fatalError.advice'));
         }
 
-        function showFatalError(arg) {
-            ui.showElement('fatal-error');
-        }
-
-        function renderSetting(settingName) {
-            let setting = settings[settingName],
-                value;
-
-            if (!setting) {
-                return;
-            }
-
-            value = editorState.getItem(['user-settings', settingName], setting.defaultValue);
-            switch (setting.type) {
-                case 'toggle':
-                    if (value) {
-                        ui.showElement(setting.element);
-                    } else {
-                        ui.hideElement(setting.element);
-                    }
-                    break;
-            }
-        }
-
         function toBoolean(value) {
-            if (value && value !== null) {
-                return true;
-            }
-            return false;
+            return !!value;
         }
 
         function buildLayout(events) {
@@ -472,7 +443,7 @@ define([
             }
         }
 
-        function toggleCodeInputArea(cell) {
+        function toggleCodeInputArea() {
             if (editorState.getItem('user-settings.showCodeInputArea')) {
                 editorState.setItem('user-settings.showCodeInputArea', false);
             } else {
@@ -527,29 +498,8 @@ define([
             renderNotifications();
         }
 
-        function clearNotifications() {
-            editorState.setItem('notifications', []);
-        }
-
         // WIDGETS
 
-        function showWidget(name, widgetModule, path) {
-            const bus = runtime.bus().makeChannelBus({ description: 'Bus for showWidget' }),
-                widget = widgetModule.make({
-                    bus: bus,
-                    workspaceInfo: workspaceInfo,
-                });
-            widgets[name] = {
-                path: path,
-                module: widgetModule,
-                instance: widget,
-            };
-            widget.start();
-            bus.emit('attach', {
-                node: ui.getElement(path),
-            });
-        }
-
         /*
          *
          * Render the UI according to the FSM
@@ -638,12 +588,6 @@ define([
         function loadErrorWidget(error) {
             console.error('ERROR', error);
             console.error(error.detail.replace('\n', '<br>'));
-            let detail;
-            if (error.detail) {
-                detail = error.detail.replace('\n', '<br>');
-            } else {
-                detail = '';
-            }
 
             const content = div(
                 {
@@ -667,17 +611,6 @@ define([
             ui.setContent('editor.widget', content);
         }
 
-        function setStatusFlag(flag, value) {
-            const flagNode = ui.getElement('editor-status.flags.' + flag);
-            if (flagNode) {
-                if (value) {
-                    flagNode.style.backgroundColor = 'green';
-                } else {
-                    flagNode.style.backgroundColor = 'white';
-                }
-            }
-        }
-
         function loadUpdateEditor(controller) {
             return new Promise((resolve, reject) => {
                 require(['./update'], (Widget) => {
@@ -752,7 +685,7 @@ define([
                         evaluateAppState();
                     });
 
-                    bus.on('parameter-touched', (message) => {
+                    bus.on('parameter-touched', () => {
                         const state = fsm.getCurrentState(),
                             newState = JSON.parse(JSON.stringify(state.state));
                         newState.data = 'touched';
@@ -781,15 +714,6 @@ define([
             });
         }
 
-        function doShowMessage(message) {
-            const messageWidget = MessageWidget.make();
-            widgets.editor.instance = messageWidget;
-            return messageWidget.start({
-                content: message,
-                node: ui.getElement('editor.widget'),
-            });
-        }
-
         function renderCurrentlyEditing() {
             const info = editorState.getItem('current.set.info');
             const content = table({ class: 'table table-striped' }, [
@@ -866,12 +790,6 @@ define([
          * TODO: this really should be done through the spec, but we
          * are rapidly cutting corners here...
          */
-        function resetEditorModel(objectRef) {
-            model.setItem('params', {});
-            model.setItem('params.name', '');
-            model.setItem('params.description', '');
-            model.setItem('params.items', []);
-        }
 
         function doCreateNewSet(name) {
             const setApiClient = new GenericClient({
@@ -915,7 +833,6 @@ define([
         const editorControllers = {};
 
         function unloadEditorController(controller) {
-            const originalStatus = controller.status;
             controller.status = 'unloading';
             controller.cancelled = true;
             return Promise.try(() => {
@@ -951,7 +868,6 @@ define([
         // Widget controller
 
         function unloadWidgetController(controller) {
-            const originalStatus = controller.status;
             controller.status = 'unloading';
             controller.cancelled = true;
             return Promise.try(() => {
@@ -1222,7 +1138,8 @@ define([
                     renderUI();
                 })
                 .catch((err) => {
-                    alert('internal error'), console.error('INTERNAL ERROR', err);
+                    alert('internal error');
+                    console.error('INTERNAL ERROR', err);
                 });
         }
 
@@ -1245,23 +1162,12 @@ define([
                     label = showing ? 'Hide Code' : 'Show Code';
                 ui.setButtonLabel('toggle-code-view', label);
             });
-            bus.on('show-notifications', () => {
-                doShowNotifications();
-            });
             bus.on('save', () => {
                 doSave();
             });
 
-            bus.on('on-success', () => {
-                doOnSuccess();
-            });
-
             // Events from widgets...
 
-            parentBus.on('newstate', (message) => {
-                console.log('GOT NEWSTATE', message);
-            });
-
             parentBus.on('reset-to-defaults', () => {
                 bus.emit('reset-to-defaults');
             });
@@ -1385,7 +1291,6 @@ define([
                     // only load the editor up if we have an existing set.
                     // NEW: get the most recent one, not just the most recently selected one.
                     if (editorState.getItem('current.set.info')) {
-                        console.log('START() -- LOADING OBJECT IN editor');
                         return doEditObject(editorState.getItem('current.set.info'));
                     } else {
                         return doShowWidget(MessageWidget, {
@@ -1437,14 +1342,14 @@ define([
 
         // INIT
 
-        model = Props.make({
+        const model = Props.make({
             data: {},
-            onUpdate: function (props) {
+            onUpdate: function () {
                 renderUI();
             },
         });
 
-        editorState = Props.make({
+        const editorState = Props.make({
             data: utils.getCellMeta(cell, 'kbase.editorCell'),
             onUpdate: function (props) {
                 utils.setCellMeta(cell, 'kbase.editorCell', props.getRawObject());
@@ -1464,5 +1369,6 @@ define([
         },
     };
 }, (err) => {
+    'use strict';
     console.error('ERROR loading editorCell editorCellWidget', err);
 });

From 3e6335175a1272dabcea6af38fca6e3a49fb2d02 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Tue, 27 Jul 2021 17:21:45 -0700
Subject: [PATCH 37/42] bump and pin npm versions; works, deterministic
 (nearly).

---
 package-lock.json | 2587 ++++++++++++++++++++++++++-------------------
 package.json      |   44 +-
 2 files changed, 1519 insertions(+), 1112 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b40619baa5..b0cacfc0c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,47 +10,47 @@
             "hasInstallScript": true,
             "devDependencies": {
                 "@types/puppeteer": "5",
-                "@wdio/browserstack-service": "^7.7.4",
-                "@wdio/cli": "^7.7.4",
-                "@wdio/local-runner": "^7.7.4",
-                "@wdio/mocha-framework": "^7.7.4",
-                "@wdio/selenium-standalone-service": "^7.7.4",
-                "@wdio/spec-reporter": "^7.7.3",
-                "bower": "^1.8.12",
-                "chrome-launcher": "^0.14.0",
-                "chromedriver": "^91.0.1",
-                "eslint": "7.29.0",
-                "eslint-config-prettier": "^8.3.0",
-                "grunt": "^1.4.1",
-                "grunt-cli": "^1.4.3",
+                "@wdio/browserstack-service": "7.8.0",
+                "@wdio/cli": "7.8.0",
+                "@wdio/local-runner": "7.8.0",
+                "@wdio/mocha-framework": "7.8.0",
+                "@wdio/selenium-standalone-service": "7.8.0",
+                "@wdio/spec-reporter": "7.8.0",
+                "bower": "1.8.12",
+                "chrome-launcher": "0.14.0",
+                "chromedriver": "92.0.0",
+                "eslint": "7.31.0",
+                "eslint-config-prettier": "8.3.0",
+                "grunt": "1.4.1",
+                "grunt-cli": "1.4.3",
                 "grunt-contrib-copy": "1.0.0",
                 "grunt-regex-replace": "0.4.0",
                 "husky": "^7.0.0",
                 "jasmine-ajax": "4.0.0",
-                "jasmine-core": "3.7.1",
+                "jasmine-core": "3.8.0",
                 "jasmine-jquery": "2.1.1",
                 "karma": "^6.3.4",
                 "karma-brief-reporter": "^0.2.1",
                 "karma-chrome-launcher": "^3.1.0",
                 "karma-coverage": "2.0.3",
                 "karma-es6-shim": "1.0.0",
-                "karma-firefox-launcher": "^2.1.0",
-                "karma-jasmine": "^3.3.1",
-                "karma-jasmine-html-reporter": "^1.6.0",
-                "karma-json-result-reporter": "^1.0.0",
+                "karma-firefox-launcher": "2.1.1",
+                "karma-jasmine": "4.0.1",
+                "karma-jasmine-html-reporter": "1.7.0",
+                "karma-json-result-reporter": "1.0.0",
                 "karma-mocha-reporter": "2.2.5",
                 "karma-requirejs": "1.1.0",
                 "karma-safari-launcher": "1.0.0",
-                "prettier": "2.2.1",
+                "prettier": "2.3.2",
                 "puppeteer": "10.1.0",
                 "requirejs": "2.3.6",
                 "selenium-standalone": "7.1.0",
                 "selenium-webdriver": "3.6.0",
                 "string.prototype.endswith": "1.0.0",
                 "string.prototype.startswith": "1.0.0",
-                "terser": "^5.7.1",
-                "wdio-chromedriver-service": "^7.1.1",
-                "webdriverio": "^7.7.4"
+                "terser": "5.7.1",
+                "wdio-chromedriver-service": "7.2.0",
+                "webdriverio": "7.8.0"
             }
         },
         "node_modules/@babel/code-frame": {
@@ -63,26 +63,29 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.14.4",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz",
-            "integrity": "sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ==",
-            "dev": true
+            "version": "7.14.7",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz",
+            "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
         },
         "node_modules/@babel/core": {
-            "version": "7.14.3",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.3.tgz",
-            "integrity": "sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg==",
-            "dev": true,
-            "dependencies": {
-                "@babel/code-frame": "^7.12.13",
-                "@babel/generator": "^7.14.3",
-                "@babel/helper-compilation-targets": "^7.13.16",
-                "@babel/helper-module-transforms": "^7.14.2",
-                "@babel/helpers": "^7.14.0",
-                "@babel/parser": "^7.14.3",
-                "@babel/template": "^7.12.13",
-                "@babel/traverse": "^7.14.2",
-                "@babel/types": "^7.14.2",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz",
+            "integrity": "sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.14.5",
+                "@babel/generator": "^7.14.8",
+                "@babel/helper-compilation-targets": "^7.14.5",
+                "@babel/helper-module-transforms": "^7.14.8",
+                "@babel/helpers": "^7.14.8",
+                "@babel/parser": "^7.14.8",
+                "@babel/template": "^7.14.5",
+                "@babel/traverse": "^7.14.8",
+                "@babel/types": "^7.14.8",
                 "convert-source-map": "^1.7.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -99,12 +102,15 @@
             }
         },
         "node_modules/@babel/core/node_modules/@babel/code-frame": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-            "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+            "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
             "dev": true,
             "dependencies": {
-                "@babel/highlight": "^7.12.13"
+                "@babel/highlight": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/core/node_modules/semver": {
@@ -126,14 +132,17 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.14.3",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz",
-            "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz",
+            "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.14.2",
+                "@babel/types": "^7.14.8",
                 "jsesc": "^2.5.1",
                 "source-map": "^0.5.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/generator/node_modules/source-map": {
@@ -146,16 +155,19 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.14.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz",
-            "integrity": "sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
+            "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
             "dev": true,
             "dependencies": {
-                "@babel/compat-data": "^7.14.4",
-                "@babel/helper-validator-option": "^7.12.17",
+                "@babel/compat-data": "^7.14.5",
+                "@babel/helper-validator-option": "^7.14.5",
                 "browserslist": "^4.16.6",
                 "semver": "^6.3.0"
             },
+            "engines": {
+                "node": ">=6.9.0"
+            },
             "peerDependencies": {
                 "@babel/core": "^7.0.0"
             }
@@ -170,130 +182,181 @@
             }
         },
         "node_modules/@babel/helper-function-name": {
-            "version": "7.14.2",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz",
-            "integrity": "sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
+            "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-get-function-arity": "^7.12.13",
-                "@babel/template": "^7.12.13",
-                "@babel/types": "^7.14.2"
+                "@babel/helper-get-function-arity": "^7.14.5",
+                "@babel/template": "^7.14.5",
+                "@babel/types": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-get-function-arity": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-            "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
+            "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-hoist-variables": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
+            "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.12.13"
+                "@babel/types": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-member-expression-to-functions": {
-            "version": "7.13.12",
-            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
-            "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
+            "version": "7.14.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
+            "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.13.12"
+                "@babel/types": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-imports": {
-            "version": "7.13.12",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
-            "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
+            "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.13.12"
+                "@babel/types": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-transforms": {
-            "version": "7.14.2",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz",
-            "integrity": "sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz",
+            "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-module-imports": "^7.13.12",
-                "@babel/helper-replace-supers": "^7.13.12",
-                "@babel/helper-simple-access": "^7.13.12",
-                "@babel/helper-split-export-declaration": "^7.12.13",
-                "@babel/helper-validator-identifier": "^7.14.0",
-                "@babel/template": "^7.12.13",
-                "@babel/traverse": "^7.14.2",
-                "@babel/types": "^7.14.2"
+                "@babel/helper-module-imports": "^7.14.5",
+                "@babel/helper-replace-supers": "^7.14.5",
+                "@babel/helper-simple-access": "^7.14.8",
+                "@babel/helper-split-export-declaration": "^7.14.5",
+                "@babel/helper-validator-identifier": "^7.14.8",
+                "@babel/template": "^7.14.5",
+                "@babel/traverse": "^7.14.8",
+                "@babel/types": "^7.14.8"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-optimise-call-expression": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-            "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
+            "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.12.13"
+                "@babel/types": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-replace-supers": {
-            "version": "7.14.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz",
-            "integrity": "sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
+            "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-member-expression-to-functions": "^7.13.12",
-                "@babel/helper-optimise-call-expression": "^7.12.13",
-                "@babel/traverse": "^7.14.2",
-                "@babel/types": "^7.14.4"
+                "@babel/helper-member-expression-to-functions": "^7.14.5",
+                "@babel/helper-optimise-call-expression": "^7.14.5",
+                "@babel/traverse": "^7.14.5",
+                "@babel/types": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-simple-access": {
-            "version": "7.13.12",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
-            "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
+            "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.13.12"
+                "@babel/types": "^7.14.8"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-split-export-declaration": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-            "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
+            "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
             "dev": true,
             "dependencies": {
-                "@babel/types": "^7.12.13"
+                "@babel/types": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.14.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
-            "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
-            "dev": true
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz",
+            "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
         },
         "node_modules/@babel/helper-validator-option": {
-            "version": "7.12.17",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
-            "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
-            "dev": true
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
+            "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.14.0",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
-            "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
+            "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
             "dev": true,
             "dependencies": {
-                "@babel/template": "^7.12.13",
-                "@babel/traverse": "^7.14.0",
-                "@babel/types": "^7.14.0"
+                "@babel/template": "^7.14.5",
+                "@babel/traverse": "^7.14.8",
+                "@babel/types": "^7.14.8"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/highlight": {
-            "version": "7.14.0",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
-            "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+            "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.14.0",
+                "@babel/helper-validator-identifier": "^7.14.5",
                 "chalk": "^2.0.0",
                 "js-tokens": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/highlight/node_modules/ansi-styles": {
@@ -368,9 +431,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.14.4",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz",
-            "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz",
+            "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==",
             "dev": true,
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -380,9 +443,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.14.6",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
-            "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
+            "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
             "dev": true,
             "dependencies": {
                 "regenerator-runtime": "^0.13.4"
@@ -392,9 +455,9 @@
             }
         },
         "node_modules/@babel/runtime-corejs3": {
-            "version": "7.14.7",
-            "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz",
-            "integrity": "sha512-Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz",
+            "integrity": "sha512-4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w==",
             "dev": true,
             "dependencies": {
                 "core-js-pure": "^3.15.0",
@@ -405,48 +468,61 @@
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-            "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+            "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
             "dev": true,
             "dependencies": {
-                "@babel/code-frame": "^7.12.13",
-                "@babel/parser": "^7.12.13",
-                "@babel/types": "^7.12.13"
+                "@babel/code-frame": "^7.14.5",
+                "@babel/parser": "^7.14.5",
+                "@babel/types": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/template/node_modules/@babel/code-frame": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-            "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+            "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
             "dev": true,
             "dependencies": {
-                "@babel/highlight": "^7.12.13"
+                "@babel/highlight": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.14.2",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.2.tgz",
-            "integrity": "sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==",
-            "dev": true,
-            "dependencies": {
-                "@babel/code-frame": "^7.12.13",
-                "@babel/generator": "^7.14.2",
-                "@babel/helper-function-name": "^7.14.2",
-                "@babel/helper-split-export-declaration": "^7.12.13",
-                "@babel/parser": "^7.14.2",
-                "@babel/types": "^7.14.2",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz",
+            "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.14.5",
+                "@babel/generator": "^7.14.8",
+                "@babel/helper-function-name": "^7.14.5",
+                "@babel/helper-hoist-variables": "^7.14.5",
+                "@babel/helper-split-export-declaration": "^7.14.5",
+                "@babel/parser": "^7.14.8",
+                "@babel/types": "^7.14.8",
                 "debug": "^4.1.0",
                 "globals": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse/node_modules/@babel/code-frame": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-            "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+            "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
             "dev": true,
             "dependencies": {
-                "@babel/highlight": "^7.12.13"
+                "@babel/highlight": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse/node_modules/globals": {
@@ -459,19 +535,22 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.14.4",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz",
-            "integrity": "sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz",
+            "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==",
             "dev": true,
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.14.0",
+                "@babel/helper-validator-identifier": "^7.14.8",
                 "to-fast-properties": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/@eslint/eslintrc": {
-            "version": "0.4.2",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
-            "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+            "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
             "dev": true,
             "dependencies": {
                 "ajv": "^6.12.4",
@@ -488,6 +567,26 @@
                 "node": "^10.12.0 || >=12.0.0"
             }
         },
+        "node_modules/@humanwhocodes/config-array": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+            "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+            "dev": true,
+            "dependencies": {
+                "@humanwhocodes/object-schema": "^1.2.0",
+                "debug": "^4.1.1",
+                "minimatch": "^3.0.4"
+            },
+            "engines": {
+                "node": ">=10.10.0"
+            }
+        },
+        "node_modules/@humanwhocodes/object-schema": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+            "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+            "dev": true
+        },
         "node_modules/@istanbuljs/schema": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
@@ -498,9 +597,9 @@
             }
         },
         "node_modules/@jest/types": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.2.tgz",
-            "integrity": "sha512-XpjCtJ/99HB4PmyJ2vgmN7vT+JLP7RW1FBT9RgnMFS4Dt7cvIyBee8O3/j98aUZ34ZpenPZFqmaaObWSeL65dg==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz",
+            "integrity": "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==",
             "dev": true,
             "dependencies": {
                 "@types/istanbul-lib-coverage": "^2.0.0",
@@ -536,9 +635,9 @@
             }
         },
         "node_modules/@nodelib/fs.walk": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-            "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
             "dev": true,
             "dependencies": {
                 "@nodelib/fs.scandir": "2.1.5",
@@ -561,9 +660,9 @@
             }
         },
         "node_modules/@szmarczak/http-timer": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz",
-            "integrity": "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==",
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+            "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
             "dev": true,
             "dependencies": {
                 "defer-to-connect": "^2.0.0"
@@ -579,15 +678,15 @@
             "dev": true
         },
         "node_modules/@types/aria-query": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.1.tgz",
-            "integrity": "sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg==",
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+            "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
             "dev": true
         },
         "node_modules/@types/cacheable-request": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz",
-            "integrity": "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==",
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
+            "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
             "dev": true,
             "dependencies": {
                 "@types/http-cache-semantics": "*",
@@ -603,48 +702,54 @@
             "dev": true
         },
         "node_modules/@types/cookie": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz",
-            "integrity": "sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg==",
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+            "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
             "dev": true
         },
         "node_modules/@types/cors": {
-            "version": "2.8.10",
-            "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz",
-            "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==",
+            "version": "2.8.12",
+            "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+            "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
+            "dev": true
+        },
+        "node_modules/@types/diff": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.1.tgz",
+            "integrity": "sha512-XIpxU6Qdvp1ZE6Kr3yrkv1qgUab0fyf4mHYvW8N3Bx3PCsbN6or1q9/q72cv5jIFWolaGH08U9XyYoLLIykyKQ==",
             "dev": true
         },
         "node_modules/@types/easy-table": {
-            "version": "0.0.32",
-            "resolved": "https://registry.npmjs.org/@types/easy-table/-/easy-table-0.0.32.tgz",
-            "integrity": "sha512-zKh0f/ixYFnr3Ldf5ZJTi1ZpnRqAynTTtVyGvWDf/TT12asE8ac98t3/WGWfFdRPp/qsccxg82C/Kl3NPNhqEw==",
+            "version": "0.0.33",
+            "resolved": "https://registry.npmjs.org/@types/easy-table/-/easy-table-0.0.33.tgz",
+            "integrity": "sha512-/vvqcJPmZUfQwCgemL0/34G7bIQnCuvgls379ygRlcC1FqNqk3n+VZ15dAO51yl6JNDoWd8vsk+kT8zfZ1VZSw==",
             "dev": true
         },
         "node_modules/@types/ejs": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.0.6.tgz",
-            "integrity": "sha512-fj1hi+ZSW0xPLrJJD+YNwIh9GZbyaIepG26E/gXvp8nCa2pYokxUYO1sK9qjGxp2g8ryZYuon7wmjpwE2cyASQ==",
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.0.7.tgz",
+            "integrity": "sha512-AUxAGNIPr7wQmzdFMNhHy/RkR5kk8gSzAZIuCYY//6ZYJKHvnjezmoEYP34coPleUPnqrUWt03cCq7NzNaA/qg==",
             "dev": true
         },
         "node_modules/@types/fs-extra": {
-            "version": "9.0.11",
-            "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",
-            "integrity": "sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==",
+            "version": "9.0.12",
+            "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
+            "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
             "dev": true,
             "dependencies": {
                 "@types/node": "*"
             }
         },
         "node_modules/@types/http-cache-semantics": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz",
-            "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==",
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
+            "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
             "dev": true
         },
         "node_modules/@types/inquirer": {
-            "version": "7.3.1",
-            "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.1.tgz",
-            "integrity": "sha512-osD38QVIfcdgsPCT0V3lD7eH0OFurX71Jft18bZrsVQWVRt6TuxRzlr0GJLrxoHZR2V5ph7/qP8se/dcnI7o0g==",
+            "version": "7.3.3",
+            "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
+            "integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
             "dev": true,
             "dependencies": {
                 "@types/through": "*",
@@ -676,18 +781,18 @@
             }
         },
         "node_modules/@types/keyv": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
-            "integrity": "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.2.tgz",
+            "integrity": "sha512-/FvAK2p4jQOaJ6CGDHJTqZcUtbZe820qIeTg7o0Shg7drB4JHeL+V/dhSaly7NXx6u8eSee+r7coT+yuJEvDLg==",
             "dev": true,
             "dependencies": {
                 "@types/node": "*"
             }
         },
         "node_modules/@types/lodash": {
-            "version": "4.14.170",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz",
-            "integrity": "sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q==",
+            "version": "4.14.171",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.171.tgz",
+            "integrity": "sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg==",
             "dev": true
         },
         "node_modules/@types/lodash.flattendeep": {
@@ -718,21 +823,27 @@
             }
         },
         "node_modules/@types/mocha": {
-            "version": "8.2.2",
-            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz",
-            "integrity": "sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw==",
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz",
+            "integrity": "sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==",
             "dev": true
         },
         "node_modules/@types/node": {
-            "version": "15.12.2",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz",
-            "integrity": "sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww==",
+            "version": "16.4.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.4.tgz",
+            "integrity": "sha512-BH/jX0HjzElFCQdAwaEMwuGBQwm6ViDZ00X6LKdnRRmGWOzkWugEH4+7a0BwfHQ8DfPPCSd/mdsm3Nu8FKFu0w==",
+            "dev": true
+        },
+        "node_modules/@types/object-inspect": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmjs.org/@types/object-inspect/-/object-inspect-1.8.1.tgz",
+            "integrity": "sha512-0JTdf3CGV0oWzE6Wa40Ayv2e2GhpP3pEJMcrlM74vBSJPuuNkVwfDnl0SZxyFCXETcB4oKA/MpTVfuYSMOelBg==",
             "dev": true
         },
         "node_modules/@types/puppeteer": {
-            "version": "5.4.3",
-            "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.3.tgz",
-            "integrity": "sha512-3nE8YgR9DIsgttLW+eJf6mnXxq8Ge+27m5SU3knWmrlfl6+KOG0Bf9f7Ua7K+C4BnaTMAh3/UpySqdAYvrsvjg==",
+            "version": "5.4.4",
+            "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.4.tgz",
+            "integrity": "sha512-3Nau+qi69CN55VwZb0ATtdUAlYlqOOQ3OfQfq0Hqgc4JMFXiQT/XInlwQ9g6LbicDslE6loIFsXFklGh5XmI6Q==",
             "dev": true,
             "dependencies": {
                 "@types/node": "*"
@@ -757,29 +868,35 @@
             }
         },
         "node_modules/@types/selenium-standalone": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/@types/selenium-standalone/-/selenium-standalone-7.0.0.tgz",
-            "integrity": "sha512-YJD+4gF0HmkN0T7Ytl1QnQ314ZKQ7Aj+es44NKOKacbjrwcAI49e6PjrTEL3byiHHQvgFYKNwvtXJWzNMxq9hw==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/@types/selenium-standalone/-/selenium-standalone-7.0.1.tgz",
+            "integrity": "sha512-zbKenL0fAXzPyiOaaFMrvFdMNhj5BgNJQq8bxiZfwQD9ID2J8bUG5xbcS3tQtlzIX/62z9nG5Vo45oaHWTbvbw==",
             "dev": true,
             "dependencies": {
                 "@types/node": "*"
             }
         },
         "node_modules/@types/stack-utils": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-            "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+            "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
             "dev": true
         },
         "node_modules/@types/stream-buffers": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.3.tgz",
-            "integrity": "sha512-NeFeX7YfFZDYsCfbuaOmFQ0OjSmHreKBpp7MQ4alWQBHeh2USLsj7qyMyn9t82kjqIX516CR/5SRHnARduRtbQ==",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.4.tgz",
+            "integrity": "sha512-qU/K1tb2yUdhXkLIATzsIPwbtX6BpZk0l3dPW6xqWyhfzzM1ECaQ/8faEnu3CNraLiQ9LHyQQPBGp7N9Fbs25w==",
             "dev": true,
             "dependencies": {
                 "@types/node": "*"
             }
         },
+        "node_modules/@types/supports-color": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
+            "dev": true
+        },
         "node_modules/@types/through": {
             "version": "0.0.30",
             "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
@@ -796,24 +913,24 @@
             "dev": true
         },
         "node_modules/@types/yargs": {
-            "version": "16.0.3",
-            "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.3.tgz",
-            "integrity": "sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ==",
+            "version": "16.0.4",
+            "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+            "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
             "dev": true,
             "dependencies": {
                 "@types/yargs-parser": "*"
             }
         },
         "node_modules/@types/yargs-parser": {
-            "version": "20.2.0",
-            "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-            "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+            "version": "20.2.1",
+            "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
+            "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
             "dev": true
         },
         "node_modules/@types/yauzl": {
-            "version": "2.9.1",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
-            "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+            "version": "2.9.2",
+            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+            "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
             "dev": true,
             "optional": true,
             "dependencies": {
@@ -827,16 +944,17 @@
             "dev": true
         },
         "node_modules/@wdio/browserstack-service": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-7.7.4.tgz",
-            "integrity": "sha512-FF+AYq0WlHK6IQPw/q+RG8TnUf+BCaXVftgKh48ZXL0jFpAFYMdDZknJD/6o6bizYkT5G5PRshkorv0+F0v1jA==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-7.8.0.tgz",
+            "integrity": "sha512-YROlwin263K5D1gy9nD83RRFinAE0lIKLhbv6upZ71j0ZQ4ze8DKYhsxe3d05SpqeT5LkglWmswy1IJlPsomXQ==",
             "dev": true,
             "dependencies": {
+                "@types/node": "^15.12.5",
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
+                "@wdio/types": "7.8.0",
                 "browserstack-local": "^1.4.5",
                 "got": "^11.0.2",
-                "webdriverio": "7.7.4"
+                "webdriverio": "7.8.0"
             },
             "engines": {
                 "node": ">=12.0.0"
@@ -845,10 +963,16 @@
                 "@wdio/cli": "^7.0.0"
             }
         },
+        "node_modules/@wdio/browserstack-service/node_modules/@types/node": {
+            "version": "15.14.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+            "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
+            "dev": true
+        },
         "node_modules/@wdio/cli": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.7.4.tgz",
-            "integrity": "sha512-npgpaIpPoSpyef1Pv0ZKyB5FJAZnDJiVphgda0RysXd6J0S3mlwzXrcIoapl28mmeWI6NIvvv65u0sominhsyQ==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.8.0.tgz",
+            "integrity": "sha512-f3mfqbVK55hNGB4a7PvbS+G2DS+NX1QYcpLM1h+SIBfxg0e2wmyKxh3uu/TloqkpCEl4MiMdX62Biyxd2/0oSg==",
             "dev": true,
             "dependencies": {
                 "@types/ejs": "^3.0.5",
@@ -857,11 +981,12 @@
                 "@types/lodash.flattendeep": "^4.4.6",
                 "@types/lodash.pickby": "^4.6.6",
                 "@types/lodash.union": "^4.6.6",
+                "@types/node": "^15.12.5",
                 "@types/recursive-readdir": "^2.2.0",
-                "@wdio/config": "7.7.3",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "async-exit-hook": "^2.0.1",
                 "chalk": "^4.0.0",
                 "chokidar": "^3.0.0",
@@ -874,7 +999,7 @@
                 "lodash.union": "^4.6.0",
                 "mkdirp": "^1.0.4",
                 "recursive-readdir": "^2.2.2",
-                "webdriverio": "7.7.4",
+                "webdriverio": "7.8.0",
                 "yargs": "^17.0.0",
                 "yarn-install": "^1.0.0"
             },
@@ -885,14 +1010,20 @@
                 "node": ">=12.0.0"
             }
         },
+        "node_modules/@wdio/cli/node_modules/@types/node": {
+            "version": "15.14.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+            "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
+            "dev": true
+        },
         "node_modules/@wdio/config": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.7.3.tgz",
-            "integrity": "sha512-I8gkb5BjXLe6/9NK7OCA9Mc+A6xeGUqbYTRd4PNKdObE6HomKOxw4plVZCYF0DlD2FCo4OGrvYGmalojFsCMdA==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.8.0.tgz",
+            "integrity": "sha512-f/9z+aPYAYGxNpdoe78pVtgpMXXcqvuZsvy3IajO5qH0+kva5XbWAAS89QH5fZFMI+/fEiwHv8ki60t229N/fQ==",
             "dev": true,
             "dependencies": {
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
+                "@wdio/types": "7.8.0",
                 "deepmerge": "^4.0.0",
                 "glob": "^7.1.2"
             },
@@ -901,16 +1032,16 @@
             }
         },
         "node_modules/@wdio/local-runner": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.7.4.tgz",
-            "integrity": "sha512-ubBr9+pDZuOg6i/EJdW8E71dXrE1A63+wsZH6lpdm1fFWqfRvjl+DTCdE2rtLhr44vNSmiHxIIQnCjvZXwjiFg==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.8.0.tgz",
+            "integrity": "sha512-FcbCZ980yudFI+0kx5Qepm/cCCFLGsby/9ZZy5RZL9gRbYD6Hwa9U094LUHR/eUPcK0Lcdxy5xWN2GzP6393FQ==",
             "dev": true,
             "dependencies": {
                 "@types/stream-buffers": "^3.0.3",
                 "@wdio/logger": "7.7.0",
-                "@wdio/repl": "7.7.3",
-                "@wdio/runner": "7.7.4",
-                "@wdio/types": "7.7.3",
+                "@wdio/repl": "7.8.0",
+                "@wdio/runner": "7.8.0",
+                "@wdio/types": "7.8.0",
                 "async-exit-hook": "^2.0.1",
                 "split2": "^3.2.2",
                 "stream-buffers": "^3.0.2"
@@ -938,15 +1069,15 @@
             }
         },
         "node_modules/@wdio/mocha-framework": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.7.4.tgz",
-            "integrity": "sha512-zLhMJBAp4HOP0qGffCNSA1UBdRystn9o5y7EEQXU6Gu+ktrSOV/RU+pvd+kqHo6RfOIcwShljZVStf3zh8cY6Q==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.8.0.tgz",
+            "integrity": "sha512-3UA44VLFEOu1dNh6lkGV4Tv1ceOA3HAwEGrauxEXps7z2f8EtNhZ2ZIxDN5vTmeVPHNJ1LrJM7MNiuC+hQmnVg==",
             "dev": true,
             "dependencies": {
-                "@types/mocha": "^8.0.0",
+                "@types/mocha": "^9.0.0",
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "expect-webdriverio": "^3.0.0",
                 "mocha": "^9.0.0"
             },
@@ -964,68 +1095,74 @@
             }
         },
         "node_modules/@wdio/repl": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.7.3.tgz",
-            "integrity": "sha512-7nhvUa3Zd5Ny9topJGRZwkomlveuO3RIv+jBUHgQ2jiDIGvG9MroHxKEniIbscVSsD32XFOOZY59kSpX1b50VQ==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.8.0.tgz",
+            "integrity": "sha512-/xK+onqFtG4Fx2NL1uWPv9m5NafJNGxWA79b6U+4pcC/HV30o5LqMDvamGgj6Y4rgC9K7lOFVeTdZ2tuh+iEpA==",
             "dev": true,
             "dependencies": {
-                "@wdio/utils": "7.7.3"
+                "@wdio/utils": "7.8.0"
             },
             "engines": {
                 "node": ">=12.0.0"
             }
         },
         "node_modules/@wdio/reporter": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.7.3.tgz",
-            "integrity": "sha512-zAUGgP/FZ3XF5s4RUcDGIAeum3WzkA9ll5lymytxhh/9Jj9/5c77o498ic3RGQlB8FTz+5SVmw08r7g3uekI8g==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.8.0.tgz",
+            "integrity": "sha512-mKfKq8yDq1fiVpbP6gXtaPS0DiIJAFeEW3Em4zXMR3YcGAHOB/B5PXCYXwpz9kdylureRTMTisrauMf2ey6/4w==",
             "dev": true,
             "dependencies": {
-                "@types/node": "^14.14.31",
-                "@wdio/types": "7.7.3",
-                "fs-extra": "^10.0.0"
+                "@types/diff": "^5.0.0",
+                "@types/node": "^15.12.5",
+                "@types/object-inspect": "^1.8.0",
+                "@types/supports-color": "^8.1.0",
+                "@wdio/types": "7.8.0",
+                "diff": "^5.0.0",
+                "fs-extra": "^10.0.0",
+                "object-inspect": "^1.10.3",
+                "supports-color": "8.1.1"
             },
             "engines": {
                 "node": ">=12.0.0"
             }
         },
         "node_modules/@wdio/reporter/node_modules/@types/node": {
-            "version": "14.17.3",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz",
-            "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==",
+            "version": "15.14.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+            "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
             "dev": true
         },
         "node_modules/@wdio/runner": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.7.4.tgz",
-            "integrity": "sha512-Ahfrv3TM9y2KMjWI1xKc+tnLVO+X1/Gf5QPjprmLlRxf/rSQDfX+wMmQP/g0wsLtm4pXy0kR1K/76WWvZgzSkw==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.8.0.tgz",
+            "integrity": "sha512-4Pe8dy7dCtOpq9YjduQ3WXr4KuC/7WUFsf80FWW2IpBnNP15xiOaLkXqtxerBjT+WoFXPFtZhLKUTMHqhginkg==",
             "dev": true,
             "dependencies": {
-                "@wdio/config": "7.7.3",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "deepmerge": "^4.0.0",
                 "gaze": "^1.1.2",
-                "webdriver": "7.7.4",
-                "webdriverio": "7.7.4"
+                "webdriver": "7.8.0",
+                "webdriverio": "7.8.0"
             },
             "engines": {
                 "node": ">=12.0.0"
             }
         },
         "node_modules/@wdio/selenium-standalone-service": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/selenium-standalone-service/-/selenium-standalone-service-7.7.4.tgz",
-            "integrity": "sha512-sAfhW8OU9Z7qpK0/6jxcNelmb8l36hOvFOVol4j/qhF8e3sv24W4Cnzh0oekSrcwmeiATtvVitGr55zuDDv3iQ==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/selenium-standalone-service/-/selenium-standalone-service-7.8.0.tgz",
+            "integrity": "sha512-iJ0QeNBhdrd2PefoE7kB5Qoap+h/yuqjSNFAxixykcyIpLPlYzyajJTrY7rDhJeZWfaIVcw4caHRstt1dH+qhA==",
             "dev": true,
             "dependencies": {
                 "@types/fs-extra": "^9.0.1",
-                "@types/node": "^14.14.31",
+                "@types/node": "^15.12.5",
                 "@types/selenium-standalone": "^7.0.0",
-                "@wdio/config": "7.7.3",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
+                "@wdio/types": "7.8.0",
                 "fs-extra": "^10.0.0",
                 "selenium-standalone": "^7.0.1"
             },
@@ -1037,20 +1174,20 @@
             }
         },
         "node_modules/@wdio/selenium-standalone-service/node_modules/@types/node": {
-            "version": "14.17.3",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz",
-            "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==",
+            "version": "15.14.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+            "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
             "dev": true
         },
         "node_modules/@wdio/spec-reporter": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.7.3.tgz",
-            "integrity": "sha512-5elsNfZd3kbBaKY5IK5ZmdZsWZNSOCqXnM2fYryAh2RBoXbcXkak4D5PbLehusZhp6CQ7UpXEKf4BDDYfd0ebw==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.8.0.tgz",
+            "integrity": "sha512-RnJwqgmrisYVy2GA1rlcbbWYAXVL9RPTjTrILndYN6+bHryoVkvibXqJ2rQE/U7pWLcHmR0C2FBKhf91fDVnvA==",
             "dev": true,
             "dependencies": {
-                "@types/easy-table": "^0.0.32",
-                "@wdio/reporter": "7.7.3",
-                "@wdio/types": "7.7.3",
+                "@types/easy-table": "^0.0.33",
+                "@wdio/reporter": "7.8.0",
+                "@wdio/types": "7.8.0",
                 "chalk": "^4.0.0",
                 "easy-table": "^1.1.1",
                 "pretty-ms": "^7.0.0"
@@ -1063,12 +1200,12 @@
             }
         },
         "node_modules/@wdio/types": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.7.3.tgz",
-            "integrity": "sha512-ZZBQHCXKjZSQj9pf4df/QhfgQQj0vzm9hkK7YyNM+S+qnW0LExL8qQKLxTlGHDaYxk/+Jrd9pcZrJXRCoSnUaA==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.8.0.tgz",
+            "integrity": "sha512-vqDUWs2gmI0DgZgh0kc2lWVeLI2/I4w6uZBnfmSnWtVdiIAjMgoqpgWvNT8DuZ1S9k1P2zYs5IugkuS5QCH2DQ==",
             "dev": true,
             "dependencies": {
-                "@types/node": "^14.14.31",
+                "@types/node": "^15.12.5",
                 "got": "^11.8.1"
             },
             "engines": {
@@ -1076,19 +1213,19 @@
             }
         },
         "node_modules/@wdio/types/node_modules/@types/node": {
-            "version": "14.17.3",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz",
-            "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==",
+            "version": "15.14.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+            "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
             "dev": true
         },
         "node_modules/@wdio/utils": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.7.3.tgz",
-            "integrity": "sha512-bvOoE2gve8Z8HFguVw0RMp5BbSmJR4zSr8DwbwnA8RSL3NshKlRk33HWYLmKsxjkH+ZWI2ihFbpvLD4W4imXag==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.8.0.tgz",
+            "integrity": "sha512-ISFjqtTUh/hCjr8H9RLBK1TIGbZ0yG4ZEfMhry1IBPeexeTwYIYdHzPknjFEydmlTSLUJZVU6UZXCIDYL2hA0A==",
             "dev": true,
             "dependencies": {
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3"
+                "@wdio/types": "7.8.0"
             },
             "engines": {
                 "node": ">=12.0.0"
@@ -1126,9 +1263,9 @@
             }
         },
         "node_modules/acorn-jsx": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-            "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
             "dev": true,
             "peerDependencies": {
                 "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
@@ -1809,9 +1946,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001236",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz",
-            "integrity": "sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ==",
+            "version": "1.0.30001247",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001247.tgz",
+            "integrity": "sha512-4rS7co+7+AoOSPRPOPUt5/GdaqZc0EsUpWk66ofE3HJTAajUK2Ss2VwoNzVN69ghg8lYYlh0an0Iy4LIHHo9UQ==",
             "dev": true,
             "funding": {
                 "type": "opencollective",
@@ -1834,6 +1971,18 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
+        "node_modules/chalk/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/chardet": {
             "version": "0.7.0",
             "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
@@ -1841,24 +1990,24 @@
             "dev": true
         },
         "node_modules/chokidar": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-            "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+            "version": "3.5.2",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+            "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
             "dev": true,
             "dependencies": {
-                "anymatch": "~3.1.1",
+                "anymatch": "~3.1.2",
                 "braces": "~3.0.2",
-                "glob-parent": "~5.1.0",
+                "glob-parent": "~5.1.2",
                 "is-binary-path": "~2.1.0",
                 "is-glob": "~4.0.1",
                 "normalize-path": "~3.0.0",
-                "readdirp": "~3.5.0"
+                "readdirp": "~3.6.0"
             },
             "engines": {
                 "node": ">= 8.10.0"
             },
             "optionalDependencies": {
-                "fsevents": "~2.3.1"
+                "fsevents": "~2.3.2"
             }
         },
         "node_modules/chownr": {
@@ -1883,9 +2032,9 @@
             }
         },
         "node_modules/chromedriver": {
-            "version": "91.0.1",
-            "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-91.0.1.tgz",
-            "integrity": "sha512-9LktpHiUxM4UWUsr+jI1K1YKx2GENt6BKKJ2mibPj1Wc6ODzX/3fFIlr8CZ4Ftuyga+dHTTbAyPWKwKvybEbKA==",
+            "version": "92.0.0",
+            "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-92.0.0.tgz",
+            "integrity": "sha512-IdJ5n5jLL6tCsGQF/fQHF2gDEhVzoYIqktUn6hE/BSsXlCcyDTi45fQbhTEhZlmshM8+BpnRtPuIT5DRbxNqKg==",
             "dev": true,
             "hasInstallScript": true,
             "dependencies": {
@@ -2057,10 +2206,13 @@
             }
         },
         "node_modules/commander": {
-            "version": "2.20.3",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-            "dev": true
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 10"
+            }
         },
         "node_modules/component-emitter": {
             "version": "1.3.0",
@@ -2129,9 +2281,9 @@
             }
         },
         "node_modules/convert-source-map": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-            "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+            "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
             "dev": true,
             "dependencies": {
                 "safe-buffer": "~5.1.1"
@@ -2266,9 +2418,9 @@
             }
         },
         "node_modules/debug": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-            "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+            "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
             "dev": true,
             "dependencies": {
                 "ms": "2.1.2"
@@ -2407,20 +2559,20 @@
             }
         },
         "node_modules/devtools": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.7.4.tgz",
-            "integrity": "sha512-rkO9k6yOA2XzFTph9y+gO/387653jou0La7QSLd57XTQiM3D/UODqLBt+fMVu8w3fdQzZHVAlIIvP4B8rkXY1Q==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.8.0.tgz",
+            "integrity": "sha512-tZOuJhLSppIjDCm8vSzIZMzdSiN2IF3uwk6QvGBQhBtFl1xvhGnNtSYIrI9x2ACXtt53dcp4czFIi2HzcFupyg==",
             "dev": true,
             "dependencies": {
-                "@types/node": "^14.14.31",
-                "@wdio/config": "7.7.3",
+                "@types/node": "^15.12.5",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
                 "@wdio/protocols": "7.7.4",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "chrome-launcher": "^0.14.0",
                 "edge-paths": "^2.1.0",
-                "puppeteer-core": "^9.1.0",
+                "puppeteer-core": "^10.1.0",
                 "query-selector-shadow-dom": "^1.0.0",
                 "ua-parser-js": "^0.7.21",
                 "uuid": "^8.0.0"
@@ -2436,9 +2588,9 @@
             "dev": true
         },
         "node_modules/devtools/node_modules/@types/node": {
-            "version": "14.17.4",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
-            "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
+            "version": "15.14.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+            "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
             "dev": true
         },
         "node_modules/di": {
@@ -2457,9 +2609,9 @@
             }
         },
         "node_modules/diff-sequences": {
-            "version": "27.0.1",
-            "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.1.tgz",
-            "integrity": "sha512-XPLijkfJUh/PIBnfkcSHgvD6tlYixmcMAn3osTk6jt+H0v/mgURto1XUiD9DKuGX5NDoVS6dSlA23gd9FUaCFg==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz",
+            "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==",
             "dev": true,
             "engines": {
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
@@ -2551,9 +2703,9 @@
             }
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.3.750",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz",
-            "integrity": "sha512-Eqy9eHNepZxJXT+Pc5++zvEi5nQ6AGikwFYDCYwXUFBr+ynJ6pDG7MzZmwGYCIuXShLJM0n4bq+aoKDmvSGJ8A==",
+            "version": "1.3.789",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.789.tgz",
+            "integrity": "sha512-lK4xn6C6ZF1kgLaC/EhOtC1MSKENExj3rMwGVnBTfHW81Z/Hb1Rge5YaWawN/YOXy3xCaESuE4KWSD50kOZ9rQ==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -2771,13 +2923,14 @@
             }
         },
         "node_modules/eslint": {
-            "version": "7.29.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.29.0.tgz",
-            "integrity": "sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==",
+            "version": "7.31.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz",
+            "integrity": "sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==",
             "dev": true,
             "dependencies": {
                 "@babel/code-frame": "7.12.11",
-                "@eslint/eslintrc": "^0.4.2",
+                "@eslint/eslintrc": "^0.4.3",
+                "@humanwhocodes/config-array": "^0.5.0",
                 "ajv": "^6.10.0",
                 "chalk": "^4.0.0",
                 "cross-spawn": "^7.0.2",
@@ -3048,17 +3201,17 @@
             }
         },
         "node_modules/expect": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/expect/-/expect-27.0.2.tgz",
-            "integrity": "sha512-YJFNJe2+P2DqH+ZrXy+ydRQYO87oxRUonZImpDodR1G7qo3NYd3pL+NQ9Keqpez3cehczYwZDBC3A7xk3n7M/w==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/expect/-/expect-27.0.6.tgz",
+            "integrity": "sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw==",
             "dev": true,
             "dependencies": {
-                "@jest/types": "^27.0.2",
+                "@jest/types": "^27.0.6",
                 "ansi-styles": "^5.0.0",
-                "jest-get-type": "^27.0.1",
-                "jest-matcher-utils": "^27.0.2",
-                "jest-message-util": "^27.0.2",
-                "jest-regex-util": "^27.0.1"
+                "jest-get-type": "^27.0.6",
+                "jest-matcher-utils": "^27.0.6",
+                "jest-message-util": "^27.0.6",
+                "jest-regex-util": "^27.0.6"
             },
             "engines": {
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
@@ -3148,17 +3301,16 @@
             "dev": true
         },
         "node_modules/fast-glob": {
-            "version": "3.2.5",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-            "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+            "version": "3.2.7",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+            "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
             "dev": true,
             "dependencies": {
                 "@nodelib/fs.stat": "^2.0.2",
                 "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.0",
+                "glob-parent": "^5.1.2",
                 "merge2": "^1.3.0",
-                "micromatch": "^4.0.2",
-                "picomatch": "^2.2.1"
+                "micromatch": "^4.0.4"
             },
             "engines": {
                 "node": ">=8"
@@ -3177,9 +3329,9 @@
             "dev": true
         },
         "node_modules/fastq": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-            "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz",
+            "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==",
             "dev": true,
             "dependencies": {
                 "reusify": "^1.0.4"
@@ -3382,9 +3534,9 @@
             }
         },
         "node_modules/flatted": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-            "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz",
+            "integrity": "sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==",
             "dev": true
         },
         "node_modules/follow-redirects": {
@@ -3647,9 +3799,9 @@
             }
         },
         "node_modules/globals": {
-            "version": "13.9.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-            "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+            "version": "13.10.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
+            "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
             "dev": true,
             "dependencies": {
                 "type-fest": "^0.20.2"
@@ -3662,9 +3814,9 @@
             }
         },
         "node_modules/globby": {
-            "version": "11.0.3",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
-            "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
+            "version": "11.0.4",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+            "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
             "dev": true,
             "dependencies": {
                 "array-union": "^2.1.0",
@@ -4129,9 +4281,9 @@
             }
         },
         "node_modules/husky": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.0.tgz",
-            "integrity": "sha512-xK7lO0EtSzfFPiw+oQncQVy/XqV7UVVjxBByc+Iv5iK3yhW9boDoWgvZy3OGo48QKg/hUtZkzz0hi2HXa0kn7w==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz",
+            "integrity": "sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==",
             "dev": true,
             "bin": {
                 "husky": "lib/bin.js"
@@ -4247,9 +4399,9 @@
             "dev": true
         },
         "node_modules/inquirer": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.0.tgz",
-            "integrity": "sha512-1nKYPoalt1vMBfCMtpomsUc32wmOoWXAoq3kM/5iTfxyQ2f/BxjixQpC+mbZ7BI0JUXHED4/XPXekDVtJNpXYw==",
+            "version": "8.1.2",
+            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.2.tgz",
+            "integrity": "sha512-DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q==",
             "dev": true,
             "dependencies": {
                 "ansi-escapes": "^4.2.1",
@@ -4262,7 +4414,7 @@
                 "mute-stream": "0.0.8",
                 "ora": "^5.3.0",
                 "run-async": "^2.4.0",
-                "rxjs": "^6.6.6",
+                "rxjs": "^7.2.0",
                 "string-width": "^4.1.0",
                 "strip-ansi": "^6.0.0",
                 "through": "^2.3.6"
@@ -4271,6 +4423,21 @@
                 "node": ">=8.0.0"
             }
         },
+        "node_modules/inquirer/node_modules/rxjs": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.2.0.tgz",
+            "integrity": "sha512-aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw==",
+            "dev": true,
+            "dependencies": {
+                "tslib": "~2.1.0"
+            }
+        },
+        "node_modules/inquirer/node_modules/tslib": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+            "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
+            "dev": true
+        },
         "node_modules/interpret": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
@@ -4354,9 +4521,9 @@
             }
         },
         "node_modules/is-core-module": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-            "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
+            "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
             "dev": true,
             "dependencies": {
                 "has": "^1.0.3"
@@ -4730,6 +4897,18 @@
                 "node": ">=8"
             }
         },
+        "node_modules/istanbul-lib-report/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/istanbul-lib-source-maps": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
@@ -4859,9 +5038,9 @@
             "dev": true
         },
         "node_modules/jasmine-core": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.7.1.tgz",
-            "integrity": "sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ==",
+            "version": "3.8.0",
+            "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.8.0.tgz",
+            "integrity": "sha512-zl0nZWDrmbCiKns0NcjkFGYkVTGCPUgoHypTaj+G2AzaWus7QGoXARSlYsSle2VRpSdfJmM+hzmFKzQNhF2kHg==",
             "dev": true
         },
         "node_modules/jasmine-jquery": {
@@ -4871,57 +5050,57 @@
             "dev": true
         },
         "node_modules/jest-diff": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.2.tgz",
-            "integrity": "sha512-BFIdRb0LqfV1hBt8crQmw6gGQHVDhM87SpMIZ45FPYKReZYG5er1+5pIn2zKqvrJp6WNox0ylR8571Iwk2Dmgw==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.6.tgz",
+            "integrity": "sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg==",
             "dev": true,
             "dependencies": {
                 "chalk": "^4.0.0",
-                "diff-sequences": "^27.0.1",
-                "jest-get-type": "^27.0.1",
-                "pretty-format": "^27.0.2"
+                "diff-sequences": "^27.0.6",
+                "jest-get-type": "^27.0.6",
+                "pretty-format": "^27.0.6"
             },
             "engines": {
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
             }
         },
         "node_modules/jest-get-type": {
-            "version": "27.0.1",
-            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.1.tgz",
-            "integrity": "sha512-9Tggo9zZbu0sHKebiAijyt1NM77Z0uO4tuWOxUCujAiSeXv30Vb5D4xVF4UR4YWNapcftj+PbByU54lKD7/xMg==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz",
+            "integrity": "sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==",
             "dev": true,
             "engines": {
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
             }
         },
         "node_modules/jest-matcher-utils": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz",
-            "integrity": "sha512-Qczi5xnTNjkhcIB0Yy75Txt+Ez51xdhOxsukN7awzq2auZQGPHcQrJ623PZj0ECDEMOk2soxWx05EXdXGd1CbA==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz",
+            "integrity": "sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA==",
             "dev": true,
             "dependencies": {
                 "chalk": "^4.0.0",
-                "jest-diff": "^27.0.2",
-                "jest-get-type": "^27.0.1",
-                "pretty-format": "^27.0.2"
+                "jest-diff": "^27.0.6",
+                "jest-get-type": "^27.0.6",
+                "pretty-format": "^27.0.6"
             },
             "engines": {
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
             }
         },
         "node_modules/jest-message-util": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.2.tgz",
-            "integrity": "sha512-rTqWUX42ec2LdMkoUPOzrEd1Tcm+R1KfLOmFK+OVNo4MnLsEaxO5zPDb2BbdSmthdM/IfXxOZU60P/WbWF8BTw==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.6.tgz",
+            "integrity": "sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw==",
             "dev": true,
             "dependencies": {
                 "@babel/code-frame": "^7.12.13",
-                "@jest/types": "^27.0.2",
+                "@jest/types": "^27.0.6",
                 "@types/stack-utils": "^2.0.0",
                 "chalk": "^4.0.0",
                 "graceful-fs": "^4.2.4",
                 "micromatch": "^4.0.4",
-                "pretty-format": "^27.0.2",
+                "pretty-format": "^27.0.6",
                 "slash": "^3.0.0",
                 "stack-utils": "^2.0.3"
             },
@@ -4930,18 +5109,21 @@
             }
         },
         "node_modules/jest-message-util/node_modules/@babel/code-frame": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-            "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+            "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
             "dev": true,
             "dependencies": {
-                "@babel/highlight": "^7.12.13"
+                "@babel/highlight": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
         "node_modules/jest-regex-util": {
-            "version": "27.0.1",
-            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.1.tgz",
-            "integrity": "sha512-6nY6QVcpTgEKQy1L41P4pr3aOddneK17kn3HJw6SdwGiKfgCGTvH02hVXL0GU8GEKtPH83eD2DIDgxHXOxVohQ==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz",
+            "integrity": "sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==",
             "dev": true,
             "engines": {
                 "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
@@ -5024,9 +5206,9 @@
             }
         },
         "node_modules/jszip": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz",
-            "integrity": "sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==",
+            "version": "3.7.0",
+            "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz",
+            "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==",
             "dev": true,
             "dependencies": {
                 "lie": "~3.3.0",
@@ -5192,27 +5374,27 @@
             }
         },
         "node_modules/karma-jasmine": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.3.1.tgz",
-            "integrity": "sha512-Nxh7eX9mOQMyK0VSsMxdod+bcqrR/ikrmEiWj5M6fwuQ7oI+YEF1FckaDsWfs6TIpULm9f0fTKMjF7XcrvWyqQ==",
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.1.tgz",
+            "integrity": "sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw==",
             "dev": true,
             "dependencies": {
-                "jasmine-core": "^3.5.0"
+                "jasmine-core": "^3.6.0"
             },
             "engines": {
-                "node": ">= 8"
+                "node": ">= 10"
             },
             "peerDependencies": {
                 "karma": "*"
             }
         },
         "node_modules/karma-jasmine-html-reporter": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.6.0.tgz",
-            "integrity": "sha512-ELO9yf0cNqpzaNLsfFgXd/wxZVYkE2+ECUwhMHUD4PZ17kcsPsYsVyjquiRqyMn2jkd2sHt0IeMyAyq1MC23Fw==",
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz",
+            "integrity": "sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==",
             "dev": true,
             "peerDependencies": {
-                "jasmine-core": ">=3.7.1",
+                "jasmine-core": ">=3.8",
                 "karma": ">=0.9",
                 "karma-jasmine": ">=1.1"
             }
@@ -5399,6 +5581,18 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/ky": {
+            "version": "0.28.5",
+            "resolved": "https://registry.npmjs.org/ky/-/ky-0.28.5.tgz",
+            "integrity": "sha512-O5gg9kF4MeyfSw+YkgPAafOPwEUU6xcdGEJKUJmKpIPbLzk3oxUtY4OdBNekG7mawofzkyZ/ZHuR9ev5uZZdAA==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/ky?sponsor=1"
+            }
+        },
         "node_modules/lazystream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
@@ -5492,13 +5686,13 @@
             }
         },
         "node_modules/lighthouse-logger": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz",
-            "integrity": "sha512-wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz",
+            "integrity": "sha512-BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==",
             "dev": true,
             "dependencies": {
-                "debug": "^2.6.8",
-                "marky": "^1.2.0"
+                "debug": "^2.6.9",
+                "marky": "^1.2.2"
             }
         },
         "node_modules/lighthouse-logger/node_modules/debug": {
@@ -5917,21 +6111,21 @@
             }
         },
         "node_modules/mime-db": {
-            "version": "1.48.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-            "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
+            "version": "1.49.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
+            "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==",
             "dev": true,
             "engines": {
                 "node": ">= 0.6"
             }
         },
         "node_modules/mime-types": {
-            "version": "2.1.31",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-            "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+            "version": "2.1.32",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
+            "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
             "dev": true,
             "dependencies": {
-                "mime-db": "1.48.0"
+                "mime-db": "1.49.0"
             },
             "engines": {
                 "node": ">= 0.6"
@@ -5986,15 +6180,15 @@
             }
         },
         "node_modules/mocha": {
-            "version": "9.0.1",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.0.1.tgz",
-            "integrity": "sha512-9zwsavlRO+5csZu6iRtl3GHImAbhERoDsZwdRkdJ/bE+eVplmoxNKE901ZJ9LdSchYBjSCPbjKc5XvcAri2ylw==",
+            "version": "9.0.3",
+            "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz",
+            "integrity": "sha512-hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg==",
             "dev": true,
             "dependencies": {
                 "@ungap/promise-all-settled": "1.1.2",
                 "ansi-colors": "4.1.1",
                 "browser-stdout": "1.3.1",
-                "chokidar": "3.5.1",
+                "chokidar": "3.5.2",
                 "debug": "4.3.1",
                 "diff": "5.0.0",
                 "escape-string-regexp": "4.0.0",
@@ -6007,12 +6201,12 @@
                 "minimatch": "3.0.4",
                 "ms": "2.1.3",
                 "nanoid": "3.1.23",
-                "serialize-javascript": "5.0.1",
+                "serialize-javascript": "6.0.0",
                 "strip-json-comments": "3.1.1",
                 "supports-color": "8.1.1",
                 "which": "2.0.2",
                 "wide-align": "1.1.3",
-                "workerpool": "6.1.4",
+                "workerpool": "6.1.5",
                 "yargs": "16.2.0",
                 "yargs-parser": "20.2.4",
                 "yargs-unparser": "2.0.0"
@@ -6035,6 +6229,29 @@
             "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
             "dev": true
         },
+        "node_modules/mocha/node_modules/debug": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+            "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/mocha/node_modules/debug/node_modules/ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+            "dev": true
+        },
         "node_modules/mocha/node_modules/js-yaml": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -6069,21 +6286,6 @@
             "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
             "dev": true
         },
-        "node_modules/mocha/node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
         "node_modules/mocha/node_modules/yargs": {
             "version": "16.2.0",
             "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -6205,9 +6407,9 @@
             }
         },
         "node_modules/normalize-url": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.0.1.tgz",
-            "integrity": "sha512-VU4pzAuh7Kip71XEmO9aNREYAdMHFGTVj/i+CaTImS8x0i1d3jUZkXhqluy/PRgjPLMgsLQulYY3PJ/aSbSjpQ==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+            "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
             "dev": true,
             "engines": {
                 "node": ">=10"
@@ -6226,9 +6428,9 @@
             }
         },
         "node_modules/object-inspect": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-            "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+            "version": "1.11.0",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+            "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
             "dev": true,
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -6773,9 +6975,9 @@
             }
         },
         "node_modules/prettier": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
-            "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
+            "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
             "dev": true,
             "bin": {
                 "prettier": "bin-prettier.js"
@@ -6785,12 +6987,12 @@
             }
         },
         "node_modules/pretty-format": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.2.tgz",
-            "integrity": "sha512-mXKbbBPnYTG7Yra9qFBtqj+IXcsvxsvOBco3QHxtxTl+hHKq6QdzMZ+q0CtL4ORHZgwGImRr2XZUX2EWzORxig==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz",
+            "integrity": "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==",
             "dev": true,
             "dependencies": {
-                "@jest/types": "^27.0.2",
+                "@jest/types": "^27.0.6",
                 "ansi-regex": "^5.0.0",
                 "ansi-styles": "^5.0.0",
                 "react-is": "^17.0.1"
@@ -6933,23 +7135,23 @@
             }
         },
         "node_modules/puppeteer-core": {
-            "version": "9.1.1",
-            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
-            "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-10.1.0.tgz",
+            "integrity": "sha512-x2yDSJI/PRiWhDqAt1jd4rhTotxwjwKzHLIIqD2MlJ+TmzGJfBY9snAGIVXJwkWfKJg+Ef5xupdK0EbHDqBpFw==",
             "dev": true,
             "dependencies": {
-                "debug": "^4.1.0",
-                "devtools-protocol": "0.0.869402",
-                "extract-zip": "^2.0.0",
-                "https-proxy-agent": "^5.0.0",
-                "node-fetch": "^2.6.1",
-                "pkg-dir": "^4.2.0",
-                "progress": "^2.0.1",
-                "proxy-from-env": "^1.1.0",
-                "rimraf": "^3.0.2",
-                "tar-fs": "^2.0.0",
-                "unbzip2-stream": "^1.3.3",
-                "ws": "^7.2.3"
+                "debug": "4.3.1",
+                "devtools-protocol": "0.0.883894",
+                "extract-zip": "2.0.1",
+                "https-proxy-agent": "5.0.0",
+                "node-fetch": "2.6.1",
+                "pkg-dir": "4.2.0",
+                "progress": "2.0.1",
+                "proxy-from-env": "1.1.0",
+                "rimraf": "3.0.2",
+                "tar-fs": "2.0.0",
+                "unbzip2-stream": "1.3.3",
+                "ws": "7.4.6"
             },
             "engines": {
                 "node": ">=10.18.1"
@@ -6967,11 +7169,22 @@
                 "node": ">= 6.0.0"
             }
         },
-        "node_modules/puppeteer-core/node_modules/devtools-protocol": {
-            "version": "0.0.869402",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
-            "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
-            "dev": true
+        "node_modules/puppeteer-core/node_modules/debug": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+            "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
         },
         "node_modules/puppeteer-core/node_modules/https-proxy-agent": {
             "version": "5.0.0",
@@ -6986,6 +7199,15 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/puppeteer-core/node_modules/progress": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
+            "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
         "node_modules/puppeteer/node_modules/agent-base": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -6998,6 +7220,23 @@
                 "node": ">= 6.0.0"
             }
         },
+        "node_modules/puppeteer/node_modules/debug": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+            "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/puppeteer/node_modules/https-proxy-agent": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
@@ -7205,9 +7444,9 @@
             }
         },
         "node_modules/readdirp": {
-            "version": "3.5.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-            "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
             "dev": true,
             "dependencies": {
                 "picomatch": "^2.2.1"
@@ -7217,9 +7456,9 @@
             }
         },
         "node_modules/rechoir": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
-            "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+            "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
             "dev": true,
             "dependencies": {
                 "resolve": "^1.9.0"
@@ -7241,15 +7480,15 @@
             }
         },
         "node_modules/regenerator-runtime": {
-            "version": "0.13.7",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-            "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+            "version": "0.13.9",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
             "dev": true
         },
         "node_modules/regexpp": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-            "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+            "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
             "dev": true,
             "engines": {
                 "node": ">=8"
@@ -7318,9 +7557,9 @@
             }
         },
         "node_modules/resolve-alpn": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.1.2.tgz",
-            "integrity": "sha512-8OyfzhAtA32LVUsJSke3auIyINcwdh5l3cvYKdKO0nvsYSKuiLfTM5i78PJswFPT8y6cPW+L1v6/hE95chcpDA==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.0.tgz",
+            "integrity": "sha512-e4FNQs+9cINYMO5NMFc6kOUCdohjqFPSgMuwuZAOUWqrfWsen+Yjy5qZFkV5K7VO7tFSLKcUL97olkED7sCBHA==",
             "dev": true
         },
         "node_modules/resolve-dir": {
@@ -7510,15 +7749,6 @@
                 "npm": ">=6.0.0"
             }
         },
-        "node_modules/selenium-standalone/node_modules/commander": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-            "dev": true,
-            "engines": {
-                "node": ">= 10"
-            }
-        },
         "node_modules/selenium-webdriver": {
             "version": "3.6.0",
             "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz",
@@ -7589,9 +7819,9 @@
             }
         },
         "node_modules/serialize-javascript": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-            "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+            "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
             "dev": true,
             "dependencies": {
                 "randombytes": "^2.1.0"
@@ -8030,15 +8260,18 @@
             }
         },
         "node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
             "dev": true,
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
             }
         },
         "node_modules/table": {
@@ -8059,9 +8292,9 @@
             }
         },
         "node_modules/table/node_modules/ajv": {
-            "version": "8.6.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-            "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+            "version": "8.6.2",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
+            "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
             "dev": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.1",
@@ -8130,6 +8363,23 @@
                 "is2": "^2.0.6"
             }
         },
+        "node_modules/tcp-port-used/node_modules/debug": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+            "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/temp-fs": {
             "version": "0.9.9",
             "resolved": "https://registry.npmjs.org/temp-fs/-/temp-fs-0.9.9.tgz",
@@ -8171,6 +8421,12 @@
                 "node": ">=10"
             }
         },
+        "node_modules/terser/node_modules/commander": {
+            "version": "2.20.3",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "dev": true
+        },
         "node_modules/terser/node_modules/source-map": {
             "version": "0.7.3",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
@@ -8466,9 +8722,9 @@
             }
         },
         "node_modules/wdio-chromedriver-service": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/wdio-chromedriver-service/-/wdio-chromedriver-service-7.1.1.tgz",
-            "integrity": "sha512-wZyXKJDwuK+17SWm/OvVNXIs+dLJPMeeDRjbMKigSsBzo8h9LGnfAonIs35CrpCyRrNb8MZmntUXDI0LpkP2kA==",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/wdio-chromedriver-service/-/wdio-chromedriver-service-7.2.0.tgz",
+            "integrity": "sha512-0N/mEE0Bk/aoc7YZNwS5sbzzGrPWb7Lo4nA+t/bF9BwQRAokeHl/70vD2JKe/D4Wo05J2X0C1RxRS7e4iwW6KQ==",
             "dev": true,
             "dependencies": {
                 "@wdio/logger": "^7.5.3",
@@ -8499,18 +8755,19 @@
             }
         },
         "node_modules/webdriver": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.7.4.tgz",
-            "integrity": "sha512-bE6/A+OYb040GZ1MiuZebc8bOOYm797dmqEfmj6aoEQ4BMy1juiFlzCzeBzAlPrq33qPa8/CSYfH7rnkB3RRwg==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.8.0.tgz",
+            "integrity": "sha512-PlAlPLeUEI9w7Wkvhhm67MB/wdeqilcXXYxTe9o1JsQzW64ptMltORm/LsLmGfEnuNTstRor7y68HXPNDOSGXw==",
             "dev": true,
             "dependencies": {
-                "@types/node": "^14.14.31",
-                "@wdio/config": "7.7.3",
+                "@types/node": "^15.12.5",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
                 "@wdio/protocols": "7.7.4",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "got": "^11.0.2",
+                "ky": "^0.28.5",
                 "lodash.merge": "^4.6.1"
             },
             "engines": {
@@ -8518,32 +8775,32 @@
             }
         },
         "node_modules/webdriver/node_modules/@types/node": {
-            "version": "14.17.4",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
-            "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
+            "version": "15.14.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+            "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
             "dev": true
         },
         "node_modules/webdriverio": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.7.4.tgz",
-            "integrity": "sha512-VSWRj2mmvA8WbideFAYb5BMWPkBCJ7gJHhYrUSibTrMHKreRtX++cw/oGxxowy9/pTHsAW6OxlnaDxFL5Gt08A==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.8.0.tgz",
+            "integrity": "sha512-lIxtBbAMbt4SDk2WzdDPlDnxQCIK/xOv/39LKHkQIDj780xgqDfoq/4V7xdm5uDgeCdk1Uw3ZB7VCEWZ+QZdFg==",
             "dev": true,
             "dependencies": {
                 "@types/aria-query": "^4.2.1",
-                "@types/node": "^14.14.31",
-                "@wdio/config": "7.7.3",
+                "@types/node": "^15.12.5",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
                 "@wdio/protocols": "7.7.4",
-                "@wdio/repl": "7.7.3",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/repl": "7.8.0",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "archiver": "^5.0.0",
                 "aria-query": "^4.2.2",
                 "atob": "^2.1.2",
                 "css-shorthand-properties": "^1.1.1",
                 "css-value": "^0.0.1",
-                "devtools": "7.7.4",
-                "devtools-protocol": "^0.0.892017",
+                "devtools": "7.8.0",
+                "devtools-protocol": "^0.0.901419",
                 "fs-extra": "^10.0.0",
                 "get-port": "^5.1.1",
                 "grapheme-splitter": "^1.0.2",
@@ -8552,27 +8809,27 @@
                 "lodash.isplainobject": "^4.0.6",
                 "lodash.zip": "^4.2.0",
                 "minimatch": "^3.0.4",
-                "puppeteer-core": "^9.1.0",
+                "puppeteer-core": "^10.1.0",
                 "query-selector-shadow-dom": "^1.0.0",
                 "resq": "^1.9.1",
                 "rgb2hex": "0.2.5",
                 "serialize-error": "^8.0.0",
-                "webdriver": "7.7.4"
+                "webdriver": "7.8.0"
             },
             "engines": {
                 "node": ">=12.0.0"
             }
         },
         "node_modules/webdriverio/node_modules/@types/node": {
-            "version": "14.17.4",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
-            "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
+            "version": "15.14.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+            "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
             "dev": true
         },
         "node_modules/webdriverio/node_modules/devtools-protocol": {
-            "version": "0.0.892017",
-            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.892017.tgz",
-            "integrity": "sha512-23yn1+zeMBlWiZTtrCViNQt+W+FRDw5rEetI19bMuyKIYeK11xo/dS+Hmuu8ifGJnJvXUU3Y79IoxSPWZWcVOA==",
+            "version": "0.0.901419",
+            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz",
+            "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==",
             "dev": true
         },
         "node_modules/which": {
@@ -8659,9 +8916,9 @@
             }
         },
         "node_modules/workerpool": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.4.tgz",
-            "integrity": "sha512-jGWPzsUqzkow8HoAvqaPWTUPCrlPJaJ5tY8Iz7n1uCz3tTp6s3CDG0FF1NsX42WNlkRSW6Mr+CDZGnNoSsKa7g==",
+            "version": "6.1.5",
+            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
+            "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
             "dev": true
         },
         "node_modules/wrap-ansi": {
@@ -8955,26 +9212,26 @@
             }
         },
         "@babel/compat-data": {
-            "version": "7.14.4",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.4.tgz",
-            "integrity": "sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ==",
+            "version": "7.14.7",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz",
+            "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==",
             "dev": true
         },
         "@babel/core": {
-            "version": "7.14.3",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.3.tgz",
-            "integrity": "sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.12.13",
-                "@babel/generator": "^7.14.3",
-                "@babel/helper-compilation-targets": "^7.13.16",
-                "@babel/helper-module-transforms": "^7.14.2",
-                "@babel/helpers": "^7.14.0",
-                "@babel/parser": "^7.14.3",
-                "@babel/template": "^7.12.13",
-                "@babel/traverse": "^7.14.2",
-                "@babel/types": "^7.14.2",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz",
+            "integrity": "sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.14.5",
+                "@babel/generator": "^7.14.8",
+                "@babel/helper-compilation-targets": "^7.14.5",
+                "@babel/helper-module-transforms": "^7.14.8",
+                "@babel/helpers": "^7.14.8",
+                "@babel/parser": "^7.14.8",
+                "@babel/template": "^7.14.5",
+                "@babel/traverse": "^7.14.8",
+                "@babel/types": "^7.14.8",
                 "convert-source-map": "^1.7.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -8984,12 +9241,12 @@
             },
             "dependencies": {
                 "@babel/code-frame": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-                    "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+                    "version": "7.14.5",
+                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+                    "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
                     "dev": true,
                     "requires": {
-                        "@babel/highlight": "^7.12.13"
+                        "@babel/highlight": "^7.14.5"
                     }
                 },
                 "semver": {
@@ -9007,12 +9264,12 @@
             }
         },
         "@babel/generator": {
-            "version": "7.14.3",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz",
-            "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz",
+            "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.14.2",
+                "@babel/types": "^7.14.8",
                 "jsesc": "^2.5.1",
                 "source-map": "^0.5.0"
             },
@@ -9026,13 +9283,13 @@
             }
         },
         "@babel/helper-compilation-targets": {
-            "version": "7.14.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz",
-            "integrity": "sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
+            "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
             "dev": true,
             "requires": {
-                "@babel/compat-data": "^7.14.4",
-                "@babel/helper-validator-option": "^7.12.17",
+                "@babel/compat-data": "^7.14.5",
+                "@babel/helper-validator-option": "^7.14.5",
                 "browserslist": "^4.16.6",
                 "semver": "^6.3.0"
             },
@@ -9046,128 +9303,137 @@
             }
         },
         "@babel/helper-function-name": {
-            "version": "7.14.2",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz",
-            "integrity": "sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
+            "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
             "dev": true,
             "requires": {
-                "@babel/helper-get-function-arity": "^7.12.13",
-                "@babel/template": "^7.12.13",
-                "@babel/types": "^7.14.2"
+                "@babel/helper-get-function-arity": "^7.14.5",
+                "@babel/template": "^7.14.5",
+                "@babel/types": "^7.14.5"
             }
         },
         "@babel/helper-get-function-arity": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-            "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
+            "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.14.5"
+            }
+        },
+        "@babel/helper-hoist-variables": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
+            "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.12.13"
+                "@babel/types": "^7.14.5"
             }
         },
         "@babel/helper-member-expression-to-functions": {
-            "version": "7.13.12",
-            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
-            "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
+            "version": "7.14.7",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz",
+            "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.13.12"
+                "@babel/types": "^7.14.5"
             }
         },
         "@babel/helper-module-imports": {
-            "version": "7.13.12",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
-            "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
+            "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.13.12"
+                "@babel/types": "^7.14.5"
             }
         },
         "@babel/helper-module-transforms": {
-            "version": "7.14.2",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz",
-            "integrity": "sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz",
+            "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==",
             "dev": true,
             "requires": {
-                "@babel/helper-module-imports": "^7.13.12",
-                "@babel/helper-replace-supers": "^7.13.12",
-                "@babel/helper-simple-access": "^7.13.12",
-                "@babel/helper-split-export-declaration": "^7.12.13",
-                "@babel/helper-validator-identifier": "^7.14.0",
-                "@babel/template": "^7.12.13",
-                "@babel/traverse": "^7.14.2",
-                "@babel/types": "^7.14.2"
+                "@babel/helper-module-imports": "^7.14.5",
+                "@babel/helper-replace-supers": "^7.14.5",
+                "@babel/helper-simple-access": "^7.14.8",
+                "@babel/helper-split-export-declaration": "^7.14.5",
+                "@babel/helper-validator-identifier": "^7.14.8",
+                "@babel/template": "^7.14.5",
+                "@babel/traverse": "^7.14.8",
+                "@babel/types": "^7.14.8"
             }
         },
         "@babel/helper-optimise-call-expression": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-            "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
+            "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.12.13"
+                "@babel/types": "^7.14.5"
             }
         },
         "@babel/helper-replace-supers": {
-            "version": "7.14.4",
-            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz",
-            "integrity": "sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
+            "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
             "dev": true,
             "requires": {
-                "@babel/helper-member-expression-to-functions": "^7.13.12",
-                "@babel/helper-optimise-call-expression": "^7.12.13",
-                "@babel/traverse": "^7.14.2",
-                "@babel/types": "^7.14.4"
+                "@babel/helper-member-expression-to-functions": "^7.14.5",
+                "@babel/helper-optimise-call-expression": "^7.14.5",
+                "@babel/traverse": "^7.14.5",
+                "@babel/types": "^7.14.5"
             }
         },
         "@babel/helper-simple-access": {
-            "version": "7.13.12",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
-            "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz",
+            "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.13.12"
+                "@babel/types": "^7.14.8"
             }
         },
         "@babel/helper-split-export-declaration": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-            "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
+            "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.12.13"
+                "@babel/types": "^7.14.5"
             }
         },
         "@babel/helper-validator-identifier": {
-            "version": "7.14.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
-            "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz",
+            "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==",
             "dev": true
         },
         "@babel/helper-validator-option": {
-            "version": "7.12.17",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
-            "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
+            "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
             "dev": true
         },
         "@babel/helpers": {
-            "version": "7.14.0",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
-            "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
+            "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
             "dev": true,
             "requires": {
-                "@babel/template": "^7.12.13",
-                "@babel/traverse": "^7.14.0",
-                "@babel/types": "^7.14.0"
+                "@babel/template": "^7.14.5",
+                "@babel/traverse": "^7.14.8",
+                "@babel/types": "^7.14.8"
             }
         },
         "@babel/highlight": {
-            "version": "7.14.0",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
-            "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+            "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
             "dev": true,
             "requires": {
-                "@babel/helper-validator-identifier": "^7.14.0",
+                "@babel/helper-validator-identifier": "^7.14.5",
                 "chalk": "^2.0.0",
                 "js-tokens": "^4.0.0"
             },
@@ -9231,24 +9497,24 @@
             }
         },
         "@babel/parser": {
-            "version": "7.14.4",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.4.tgz",
-            "integrity": "sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz",
+            "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==",
             "dev": true
         },
         "@babel/runtime": {
-            "version": "7.14.6",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
-            "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
+            "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
             "dev": true,
             "requires": {
                 "regenerator-runtime": "^0.13.4"
             }
         },
         "@babel/runtime-corejs3": {
-            "version": "7.14.7",
-            "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz",
-            "integrity": "sha512-Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz",
+            "integrity": "sha512-4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w==",
             "dev": true,
             "requires": {
                 "core-js-pure": "^3.15.0",
@@ -9256,50 +9522,51 @@
             }
         },
         "@babel/template": {
-            "version": "7.12.13",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-            "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+            "version": "7.14.5",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
+            "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
             "dev": true,
             "requires": {
-                "@babel/code-frame": "^7.12.13",
-                "@babel/parser": "^7.12.13",
-                "@babel/types": "^7.12.13"
+                "@babel/code-frame": "^7.14.5",
+                "@babel/parser": "^7.14.5",
+                "@babel/types": "^7.14.5"
             },
             "dependencies": {
                 "@babel/code-frame": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-                    "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+                    "version": "7.14.5",
+                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+                    "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
                     "dev": true,
                     "requires": {
-                        "@babel/highlight": "^7.12.13"
+                        "@babel/highlight": "^7.14.5"
                     }
                 }
             }
         },
         "@babel/traverse": {
-            "version": "7.14.2",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.2.tgz",
-            "integrity": "sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.12.13",
-                "@babel/generator": "^7.14.2",
-                "@babel/helper-function-name": "^7.14.2",
-                "@babel/helper-split-export-declaration": "^7.12.13",
-                "@babel/parser": "^7.14.2",
-                "@babel/types": "^7.14.2",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz",
+            "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.14.5",
+                "@babel/generator": "^7.14.8",
+                "@babel/helper-function-name": "^7.14.5",
+                "@babel/helper-hoist-variables": "^7.14.5",
+                "@babel/helper-split-export-declaration": "^7.14.5",
+                "@babel/parser": "^7.14.8",
+                "@babel/types": "^7.14.8",
                 "debug": "^4.1.0",
                 "globals": "^11.1.0"
             },
             "dependencies": {
                 "@babel/code-frame": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-                    "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+                    "version": "7.14.5",
+                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+                    "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
                     "dev": true,
                     "requires": {
-                        "@babel/highlight": "^7.12.13"
+                        "@babel/highlight": "^7.14.5"
                     }
                 },
                 "globals": {
@@ -9311,19 +9578,19 @@
             }
         },
         "@babel/types": {
-            "version": "7.14.4",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.4.tgz",
-            "integrity": "sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw==",
+            "version": "7.14.8",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz",
+            "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==",
             "dev": true,
             "requires": {
-                "@babel/helper-validator-identifier": "^7.14.0",
+                "@babel/helper-validator-identifier": "^7.14.8",
                 "to-fast-properties": "^2.0.0"
             }
         },
         "@eslint/eslintrc": {
-            "version": "0.4.2",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.2.tgz",
-            "integrity": "sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==",
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+            "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
             "dev": true,
             "requires": {
                 "ajv": "^6.12.4",
@@ -9337,6 +9604,23 @@
                 "strip-json-comments": "^3.1.1"
             }
         },
+        "@humanwhocodes/config-array": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+            "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+            "dev": true,
+            "requires": {
+                "@humanwhocodes/object-schema": "^1.2.0",
+                "debug": "^4.1.1",
+                "minimatch": "^3.0.4"
+            }
+        },
+        "@humanwhocodes/object-schema": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+            "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+            "dev": true
+        },
         "@istanbuljs/schema": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
@@ -9344,9 +9628,9 @@
             "dev": true
         },
         "@jest/types": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.2.tgz",
-            "integrity": "sha512-XpjCtJ/99HB4PmyJ2vgmN7vT+JLP7RW1FBT9RgnMFS4Dt7cvIyBee8O3/j98aUZ34ZpenPZFqmaaObWSeL65dg==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz",
+            "integrity": "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==",
             "dev": true,
             "requires": {
                 "@types/istanbul-lib-coverage": "^2.0.0",
@@ -9373,9 +9657,9 @@
             "dev": true
         },
         "@nodelib/fs.walk": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-            "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
             "dev": true,
             "requires": {
                 "@nodelib/fs.scandir": "2.1.5",
@@ -9389,9 +9673,9 @@
             "dev": true
         },
         "@szmarczak/http-timer": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz",
-            "integrity": "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==",
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
+            "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
             "dev": true,
             "requires": {
                 "defer-to-connect": "^2.0.0"
@@ -9404,15 +9688,15 @@
             "dev": true
         },
         "@types/aria-query": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.1.tgz",
-            "integrity": "sha512-S6oPal772qJZHoRZLFc/XoZW2gFvwXusYUmXPXkgxJLuEk2vOt7jc4Yo6z/vtI0EBkbPBVrJJ0B+prLIKiWqHg==",
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+            "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
             "dev": true
         },
         "@types/cacheable-request": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz",
-            "integrity": "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==",
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
+            "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
             "dev": true,
             "requires": {
                 "@types/http-cache-semantics": "*",
@@ -9428,48 +9712,54 @@
             "dev": true
         },
         "@types/cookie": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz",
-            "integrity": "sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg==",
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+            "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
             "dev": true
         },
         "@types/cors": {
-            "version": "2.8.10",
-            "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz",
-            "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==",
+            "version": "2.8.12",
+            "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+            "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
+            "dev": true
+        },
+        "@types/diff": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.1.tgz",
+            "integrity": "sha512-XIpxU6Qdvp1ZE6Kr3yrkv1qgUab0fyf4mHYvW8N3Bx3PCsbN6or1q9/q72cv5jIFWolaGH08U9XyYoLLIykyKQ==",
             "dev": true
         },
         "@types/easy-table": {
-            "version": "0.0.32",
-            "resolved": "https://registry.npmjs.org/@types/easy-table/-/easy-table-0.0.32.tgz",
-            "integrity": "sha512-zKh0f/ixYFnr3Ldf5ZJTi1ZpnRqAynTTtVyGvWDf/TT12asE8ac98t3/WGWfFdRPp/qsccxg82C/Kl3NPNhqEw==",
+            "version": "0.0.33",
+            "resolved": "https://registry.npmjs.org/@types/easy-table/-/easy-table-0.0.33.tgz",
+            "integrity": "sha512-/vvqcJPmZUfQwCgemL0/34G7bIQnCuvgls379ygRlcC1FqNqk3n+VZ15dAO51yl6JNDoWd8vsk+kT8zfZ1VZSw==",
             "dev": true
         },
         "@types/ejs": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.0.6.tgz",
-            "integrity": "sha512-fj1hi+ZSW0xPLrJJD+YNwIh9GZbyaIepG26E/gXvp8nCa2pYokxUYO1sK9qjGxp2g8ryZYuon7wmjpwE2cyASQ==",
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.0.7.tgz",
+            "integrity": "sha512-AUxAGNIPr7wQmzdFMNhHy/RkR5kk8gSzAZIuCYY//6ZYJKHvnjezmoEYP34coPleUPnqrUWt03cCq7NzNaA/qg==",
             "dev": true
         },
         "@types/fs-extra": {
-            "version": "9.0.11",
-            "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",
-            "integrity": "sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==",
+            "version": "9.0.12",
+            "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz",
+            "integrity": "sha512-I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw==",
             "dev": true,
             "requires": {
                 "@types/node": "*"
             }
         },
         "@types/http-cache-semantics": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz",
-            "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==",
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
+            "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
             "dev": true
         },
         "@types/inquirer": {
-            "version": "7.3.1",
-            "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.1.tgz",
-            "integrity": "sha512-osD38QVIfcdgsPCT0V3lD7eH0OFurX71Jft18bZrsVQWVRt6TuxRzlr0GJLrxoHZR2V5ph7/qP8se/dcnI7o0g==",
+            "version": "7.3.3",
+            "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-7.3.3.tgz",
+            "integrity": "sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==",
             "dev": true,
             "requires": {
                 "@types/through": "*",
@@ -9501,18 +9791,18 @@
             }
         },
         "@types/keyv": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
-            "integrity": "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.2.tgz",
+            "integrity": "sha512-/FvAK2p4jQOaJ6CGDHJTqZcUtbZe820qIeTg7o0Shg7drB4JHeL+V/dhSaly7NXx6u8eSee+r7coT+yuJEvDLg==",
             "dev": true,
             "requires": {
                 "@types/node": "*"
             }
         },
         "@types/lodash": {
-            "version": "4.14.170",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.170.tgz",
-            "integrity": "sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q==",
+            "version": "4.14.171",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.171.tgz",
+            "integrity": "sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg==",
             "dev": true
         },
         "@types/lodash.flattendeep": {
@@ -9543,21 +9833,27 @@
             }
         },
         "@types/mocha": {
-            "version": "8.2.2",
-            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz",
-            "integrity": "sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw==",
+            "version": "9.0.0",
+            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz",
+            "integrity": "sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==",
             "dev": true
         },
         "@types/node": {
-            "version": "15.12.2",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.2.tgz",
-            "integrity": "sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww==",
+            "version": "16.4.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.4.tgz",
+            "integrity": "sha512-BH/jX0HjzElFCQdAwaEMwuGBQwm6ViDZ00X6LKdnRRmGWOzkWugEH4+7a0BwfHQ8DfPPCSd/mdsm3Nu8FKFu0w==",
+            "dev": true
+        },
+        "@types/object-inspect": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmjs.org/@types/object-inspect/-/object-inspect-1.8.1.tgz",
+            "integrity": "sha512-0JTdf3CGV0oWzE6Wa40Ayv2e2GhpP3pEJMcrlM74vBSJPuuNkVwfDnl0SZxyFCXETcB4oKA/MpTVfuYSMOelBg==",
             "dev": true
         },
         "@types/puppeteer": {
-            "version": "5.4.3",
-            "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.3.tgz",
-            "integrity": "sha512-3nE8YgR9DIsgttLW+eJf6mnXxq8Ge+27m5SU3knWmrlfl6+KOG0Bf9f7Ua7K+C4BnaTMAh3/UpySqdAYvrsvjg==",
+            "version": "5.4.4",
+            "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-5.4.4.tgz",
+            "integrity": "sha512-3Nau+qi69CN55VwZb0ATtdUAlYlqOOQ3OfQfq0Hqgc4JMFXiQT/XInlwQ9g6LbicDslE6loIFsXFklGh5XmI6Q==",
             "dev": true,
             "requires": {
                 "@types/node": "*"
@@ -9582,29 +9878,35 @@
             }
         },
         "@types/selenium-standalone": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/@types/selenium-standalone/-/selenium-standalone-7.0.0.tgz",
-            "integrity": "sha512-YJD+4gF0HmkN0T7Ytl1QnQ314ZKQ7Aj+es44NKOKacbjrwcAI49e6PjrTEL3byiHHQvgFYKNwvtXJWzNMxq9hw==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/@types/selenium-standalone/-/selenium-standalone-7.0.1.tgz",
+            "integrity": "sha512-zbKenL0fAXzPyiOaaFMrvFdMNhj5BgNJQq8bxiZfwQD9ID2J8bUG5xbcS3tQtlzIX/62z9nG5Vo45oaHWTbvbw==",
             "dev": true,
             "requires": {
                 "@types/node": "*"
             }
         },
         "@types/stack-utils": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-            "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+            "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
             "dev": true
         },
         "@types/stream-buffers": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.3.tgz",
-            "integrity": "sha512-NeFeX7YfFZDYsCfbuaOmFQ0OjSmHreKBpp7MQ4alWQBHeh2USLsj7qyMyn9t82kjqIX516CR/5SRHnARduRtbQ==",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/@types/stream-buffers/-/stream-buffers-3.0.4.tgz",
+            "integrity": "sha512-qU/K1tb2yUdhXkLIATzsIPwbtX6BpZk0l3dPW6xqWyhfzzM1ECaQ/8faEnu3CNraLiQ9LHyQQPBGp7N9Fbs25w==",
             "dev": true,
             "requires": {
                 "@types/node": "*"
             }
         },
+        "@types/supports-color": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw==",
+            "dev": true
+        },
         "@types/through": {
             "version": "0.0.30",
             "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz",
@@ -9621,24 +9923,24 @@
             "dev": true
         },
         "@types/yargs": {
-            "version": "16.0.3",
-            "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.3.tgz",
-            "integrity": "sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ==",
+            "version": "16.0.4",
+            "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+            "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
             "dev": true,
             "requires": {
                 "@types/yargs-parser": "*"
             }
         },
         "@types/yargs-parser": {
-            "version": "20.2.0",
-            "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-            "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+            "version": "20.2.1",
+            "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
+            "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
             "dev": true
         },
         "@types/yauzl": {
-            "version": "2.9.1",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
-            "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+            "version": "2.9.2",
+            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+            "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
             "dev": true,
             "optional": true,
             "requires": {
@@ -9652,22 +9954,31 @@
             "dev": true
         },
         "@wdio/browserstack-service": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-7.7.4.tgz",
-            "integrity": "sha512-FF+AYq0WlHK6IQPw/q+RG8TnUf+BCaXVftgKh48ZXL0jFpAFYMdDZknJD/6o6bizYkT5G5PRshkorv0+F0v1jA==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/browserstack-service/-/browserstack-service-7.8.0.tgz",
+            "integrity": "sha512-YROlwin263K5D1gy9nD83RRFinAE0lIKLhbv6upZ71j0ZQ4ze8DKYhsxe3d05SpqeT5LkglWmswy1IJlPsomXQ==",
             "dev": true,
             "requires": {
+                "@types/node": "^15.12.5",
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
+                "@wdio/types": "7.8.0",
                 "browserstack-local": "^1.4.5",
                 "got": "^11.0.2",
-                "webdriverio": "7.7.4"
+                "webdriverio": "7.8.0"
+            },
+            "dependencies": {
+                "@types/node": {
+                    "version": "15.14.3",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+                    "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
+                    "dev": true
+                }
             }
         },
         "@wdio/cli": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.7.4.tgz",
-            "integrity": "sha512-npgpaIpPoSpyef1Pv0ZKyB5FJAZnDJiVphgda0RysXd6J0S3mlwzXrcIoapl28mmeWI6NIvvv65u0sominhsyQ==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-7.8.0.tgz",
+            "integrity": "sha512-f3mfqbVK55hNGB4a7PvbS+G2DS+NX1QYcpLM1h+SIBfxg0e2wmyKxh3uu/TloqkpCEl4MiMdX62Biyxd2/0oSg==",
             "dev": true,
             "requires": {
                 "@types/ejs": "^3.0.5",
@@ -9676,11 +9987,12 @@
                 "@types/lodash.flattendeep": "^4.4.6",
                 "@types/lodash.pickby": "^4.6.6",
                 "@types/lodash.union": "^4.6.6",
+                "@types/node": "^15.12.5",
                 "@types/recursive-readdir": "^2.2.0",
-                "@wdio/config": "7.7.3",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "async-exit-hook": "^2.0.1",
                 "chalk": "^4.0.0",
                 "chokidar": "^3.0.0",
@@ -9693,34 +10005,42 @@
                 "lodash.union": "^4.6.0",
                 "mkdirp": "^1.0.4",
                 "recursive-readdir": "^2.2.2",
-                "webdriverio": "7.7.4",
+                "webdriverio": "7.8.0",
                 "yargs": "^17.0.0",
                 "yarn-install": "^1.0.0"
+            },
+            "dependencies": {
+                "@types/node": {
+                    "version": "15.14.3",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+                    "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
+                    "dev": true
+                }
             }
         },
         "@wdio/config": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.7.3.tgz",
-            "integrity": "sha512-I8gkb5BjXLe6/9NK7OCA9Mc+A6xeGUqbYTRd4PNKdObE6HomKOxw4plVZCYF0DlD2FCo4OGrvYGmalojFsCMdA==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/config/-/config-7.8.0.tgz",
+            "integrity": "sha512-f/9z+aPYAYGxNpdoe78pVtgpMXXcqvuZsvy3IajO5qH0+kva5XbWAAS89QH5fZFMI+/fEiwHv8ki60t229N/fQ==",
             "dev": true,
             "requires": {
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
+                "@wdio/types": "7.8.0",
                 "deepmerge": "^4.0.0",
                 "glob": "^7.1.2"
             }
         },
         "@wdio/local-runner": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.7.4.tgz",
-            "integrity": "sha512-ubBr9+pDZuOg6i/EJdW8E71dXrE1A63+wsZH6lpdm1fFWqfRvjl+DTCdE2rtLhr44vNSmiHxIIQnCjvZXwjiFg==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-7.8.0.tgz",
+            "integrity": "sha512-FcbCZ980yudFI+0kx5Qepm/cCCFLGsby/9ZZy5RZL9gRbYD6Hwa9U094LUHR/eUPcK0Lcdxy5xWN2GzP6393FQ==",
             "dev": true,
             "requires": {
                 "@types/stream-buffers": "^3.0.3",
                 "@wdio/logger": "7.7.0",
-                "@wdio/repl": "7.7.3",
-                "@wdio/runner": "7.7.4",
-                "@wdio/types": "7.7.3",
+                "@wdio/repl": "7.8.0",
+                "@wdio/runner": "7.8.0",
+                "@wdio/types": "7.8.0",
                 "async-exit-hook": "^2.0.1",
                 "split2": "^3.2.2",
                 "stream-buffers": "^3.0.2"
@@ -9739,15 +10059,15 @@
             }
         },
         "@wdio/mocha-framework": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.7.4.tgz",
-            "integrity": "sha512-zLhMJBAp4HOP0qGffCNSA1UBdRystn9o5y7EEQXU6Gu+ktrSOV/RU+pvd+kqHo6RfOIcwShljZVStf3zh8cY6Q==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-7.8.0.tgz",
+            "integrity": "sha512-3UA44VLFEOu1dNh6lkGV4Tv1ceOA3HAwEGrauxEXps7z2f8EtNhZ2ZIxDN5vTmeVPHNJ1LrJM7MNiuC+hQmnVg==",
             "dev": true,
             "requires": {
-                "@types/mocha": "^8.0.0",
+                "@types/mocha": "^9.0.0",
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "expect-webdriverio": "^3.0.0",
                 "mocha": "^9.0.0"
             }
@@ -9759,113 +10079,119 @@
             "dev": true
         },
         "@wdio/repl": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.7.3.tgz",
-            "integrity": "sha512-7nhvUa3Zd5Ny9topJGRZwkomlveuO3RIv+jBUHgQ2jiDIGvG9MroHxKEniIbscVSsD32XFOOZY59kSpX1b50VQ==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-7.8.0.tgz",
+            "integrity": "sha512-/xK+onqFtG4Fx2NL1uWPv9m5NafJNGxWA79b6U+4pcC/HV30o5LqMDvamGgj6Y4rgC9K7lOFVeTdZ2tuh+iEpA==",
             "dev": true,
             "requires": {
-                "@wdio/utils": "7.7.3"
+                "@wdio/utils": "7.8.0"
             }
         },
         "@wdio/reporter": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.7.3.tgz",
-            "integrity": "sha512-zAUGgP/FZ3XF5s4RUcDGIAeum3WzkA9ll5lymytxhh/9Jj9/5c77o498ic3RGQlB8FTz+5SVmw08r7g3uekI8g==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-7.8.0.tgz",
+            "integrity": "sha512-mKfKq8yDq1fiVpbP6gXtaPS0DiIJAFeEW3Em4zXMR3YcGAHOB/B5PXCYXwpz9kdylureRTMTisrauMf2ey6/4w==",
             "dev": true,
             "requires": {
-                "@types/node": "^14.14.31",
-                "@wdio/types": "7.7.3",
-                "fs-extra": "^10.0.0"
+                "@types/diff": "^5.0.0",
+                "@types/node": "^15.12.5",
+                "@types/object-inspect": "^1.8.0",
+                "@types/supports-color": "^8.1.0",
+                "@wdio/types": "7.8.0",
+                "diff": "^5.0.0",
+                "fs-extra": "^10.0.0",
+                "object-inspect": "^1.10.3",
+                "supports-color": "8.1.1"
             },
             "dependencies": {
                 "@types/node": {
-                    "version": "14.17.3",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz",
-                    "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==",
+                    "version": "15.14.3",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+                    "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
                     "dev": true
                 }
             }
         },
         "@wdio/runner": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.7.4.tgz",
-            "integrity": "sha512-Ahfrv3TM9y2KMjWI1xKc+tnLVO+X1/Gf5QPjprmLlRxf/rSQDfX+wMmQP/g0wsLtm4pXy0kR1K/76WWvZgzSkw==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-7.8.0.tgz",
+            "integrity": "sha512-4Pe8dy7dCtOpq9YjduQ3WXr4KuC/7WUFsf80FWW2IpBnNP15xiOaLkXqtxerBjT+WoFXPFtZhLKUTMHqhginkg==",
             "dev": true,
             "requires": {
-                "@wdio/config": "7.7.3",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "deepmerge": "^4.0.0",
                 "gaze": "^1.1.2",
-                "webdriver": "7.7.4",
-                "webdriverio": "7.7.4"
+                "webdriver": "7.8.0",
+                "webdriverio": "7.8.0"
             }
         },
         "@wdio/selenium-standalone-service": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/@wdio/selenium-standalone-service/-/selenium-standalone-service-7.7.4.tgz",
-            "integrity": "sha512-sAfhW8OU9Z7qpK0/6jxcNelmb8l36hOvFOVol4j/qhF8e3sv24W4Cnzh0oekSrcwmeiATtvVitGr55zuDDv3iQ==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/selenium-standalone-service/-/selenium-standalone-service-7.8.0.tgz",
+            "integrity": "sha512-iJ0QeNBhdrd2PefoE7kB5Qoap+h/yuqjSNFAxixykcyIpLPlYzyajJTrY7rDhJeZWfaIVcw4caHRstt1dH+qhA==",
             "dev": true,
             "requires": {
                 "@types/fs-extra": "^9.0.1",
-                "@types/node": "^14.14.31",
+                "@types/node": "^15.12.5",
                 "@types/selenium-standalone": "^7.0.0",
-                "@wdio/config": "7.7.3",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3",
+                "@wdio/types": "7.8.0",
                 "fs-extra": "^10.0.0",
                 "selenium-standalone": "^7.0.1"
             },
             "dependencies": {
                 "@types/node": {
-                    "version": "14.17.3",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz",
-                    "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==",
+                    "version": "15.14.3",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+                    "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
                     "dev": true
                 }
             }
         },
         "@wdio/spec-reporter": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.7.3.tgz",
-            "integrity": "sha512-5elsNfZd3kbBaKY5IK5ZmdZsWZNSOCqXnM2fYryAh2RBoXbcXkak4D5PbLehusZhp6CQ7UpXEKf4BDDYfd0ebw==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-7.8.0.tgz",
+            "integrity": "sha512-RnJwqgmrisYVy2GA1rlcbbWYAXVL9RPTjTrILndYN6+bHryoVkvibXqJ2rQE/U7pWLcHmR0C2FBKhf91fDVnvA==",
             "dev": true,
             "requires": {
-                "@types/easy-table": "^0.0.32",
-                "@wdio/reporter": "7.7.3",
-                "@wdio/types": "7.7.3",
+                "@types/easy-table": "^0.0.33",
+                "@wdio/reporter": "7.8.0",
+                "@wdio/types": "7.8.0",
                 "chalk": "^4.0.0",
                 "easy-table": "^1.1.1",
                 "pretty-ms": "^7.0.0"
             }
         },
         "@wdio/types": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.7.3.tgz",
-            "integrity": "sha512-ZZBQHCXKjZSQj9pf4df/QhfgQQj0vzm9hkK7YyNM+S+qnW0LExL8qQKLxTlGHDaYxk/+Jrd9pcZrJXRCoSnUaA==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/types/-/types-7.8.0.tgz",
+            "integrity": "sha512-vqDUWs2gmI0DgZgh0kc2lWVeLI2/I4w6uZBnfmSnWtVdiIAjMgoqpgWvNT8DuZ1S9k1P2zYs5IugkuS5QCH2DQ==",
             "dev": true,
             "requires": {
-                "@types/node": "^14.14.31",
+                "@types/node": "^15.12.5",
                 "got": "^11.8.1"
             },
             "dependencies": {
                 "@types/node": {
-                    "version": "14.17.3",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz",
-                    "integrity": "sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==",
+                    "version": "15.14.3",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+                    "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
                     "dev": true
                 }
             }
         },
         "@wdio/utils": {
-            "version": "7.7.3",
-            "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.7.3.tgz",
-            "integrity": "sha512-bvOoE2gve8Z8HFguVw0RMp5BbSmJR4zSr8DwbwnA8RSL3NshKlRk33HWYLmKsxjkH+ZWI2ihFbpvLD4W4imXag==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-7.8.0.tgz",
+            "integrity": "sha512-ISFjqtTUh/hCjr8H9RLBK1TIGbZ0yG4ZEfMhry1IBPeexeTwYIYdHzPknjFEydmlTSLUJZVU6UZXCIDYL2hA0A==",
             "dev": true,
             "requires": {
                 "@wdio/logger": "7.7.0",
-                "@wdio/types": "7.7.3"
+                "@wdio/types": "7.8.0"
             }
         },
         "abbrev": {
@@ -9891,9 +10217,9 @@
             "dev": true
         },
         "acorn-jsx": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-            "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
             "dev": true,
             "requires": {}
         },
@@ -10399,9 +10725,9 @@
             }
         },
         "caniuse-lite": {
-            "version": "1.0.30001236",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz",
-            "integrity": "sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ==",
+            "version": "1.0.30001247",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001247.tgz",
+            "integrity": "sha512-4rS7co+7+AoOSPRPOPUt5/GdaqZc0EsUpWk66ofE3HJTAajUK2Ss2VwoNzVN69ghg8lYYlh0an0Iy4LIHHo9UQ==",
             "dev": true
         },
         "chalk": {
@@ -10412,6 +10738,17 @@
             "requires": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
+            },
+            "dependencies": {
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
             }
         },
         "chardet": {
@@ -10421,19 +10758,19 @@
             "dev": true
         },
         "chokidar": {
-            "version": "3.5.1",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-            "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+            "version": "3.5.2",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+            "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
             "dev": true,
             "requires": {
-                "anymatch": "~3.1.1",
+                "anymatch": "~3.1.2",
                 "braces": "~3.0.2",
-                "fsevents": "~2.3.1",
-                "glob-parent": "~5.1.0",
+                "fsevents": "~2.3.2",
+                "glob-parent": "~5.1.2",
                 "is-binary-path": "~2.1.0",
                 "is-glob": "~4.0.1",
                 "normalize-path": "~3.0.0",
-                "readdirp": "~3.5.0"
+                "readdirp": "~3.6.0"
             }
         },
         "chownr": {
@@ -10455,9 +10792,9 @@
             }
         },
         "chromedriver": {
-            "version": "91.0.1",
-            "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-91.0.1.tgz",
-            "integrity": "sha512-9LktpHiUxM4UWUsr+jI1K1YKx2GENt6BKKJ2mibPj1Wc6ODzX/3fFIlr8CZ4Ftuyga+dHTTbAyPWKwKvybEbKA==",
+            "version": "92.0.0",
+            "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-92.0.0.tgz",
+            "integrity": "sha512-IdJ5n5jLL6tCsGQF/fQHF2gDEhVzoYIqktUn6hE/BSsXlCcyDTi45fQbhTEhZlmshM8+BpnRtPuIT5DRbxNqKg==",
             "dev": true,
             "requires": {
                 "@testim/chrome-version": "^1.0.7",
@@ -10593,9 +10930,9 @@
             "dev": true
         },
         "commander": {
-            "version": "2.20.3",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
             "dev": true
         },
         "component-emitter": {
@@ -10658,9 +10995,9 @@
             "dev": true
         },
         "convert-source-map": {
-            "version": "1.7.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-            "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+            "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
             "dev": true,
             "requires": {
                 "safe-buffer": "~5.1.1"
@@ -10766,9 +11103,9 @@
             "dev": true
         },
         "debug": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-            "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+            "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
             "dev": true,
             "requires": {
                 "ms": "2.1.2"
@@ -10862,29 +11199,29 @@
             "dev": true
         },
         "devtools": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.7.4.tgz",
-            "integrity": "sha512-rkO9k6yOA2XzFTph9y+gO/387653jou0La7QSLd57XTQiM3D/UODqLBt+fMVu8w3fdQzZHVAlIIvP4B8rkXY1Q==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/devtools/-/devtools-7.8.0.tgz",
+            "integrity": "sha512-tZOuJhLSppIjDCm8vSzIZMzdSiN2IF3uwk6QvGBQhBtFl1xvhGnNtSYIrI9x2ACXtt53dcp4czFIi2HzcFupyg==",
             "dev": true,
             "requires": {
-                "@types/node": "^14.14.31",
-                "@wdio/config": "7.7.3",
+                "@types/node": "^15.12.5",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
                 "@wdio/protocols": "7.7.4",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "chrome-launcher": "^0.14.0",
                 "edge-paths": "^2.1.0",
-                "puppeteer-core": "^9.1.0",
+                "puppeteer-core": "^10.1.0",
                 "query-selector-shadow-dom": "^1.0.0",
                 "ua-parser-js": "^0.7.21",
                 "uuid": "^8.0.0"
             },
             "dependencies": {
                 "@types/node": {
-                    "version": "14.17.4",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
-                    "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
+                    "version": "15.14.3",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+                    "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
                     "dev": true
                 }
             }
@@ -10908,9 +11245,9 @@
             "dev": true
         },
         "diff-sequences": {
-            "version": "27.0.1",
-            "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.1.tgz",
-            "integrity": "sha512-XPLijkfJUh/PIBnfkcSHgvD6tlYixmcMAn3osTk6jt+H0v/mgURto1XUiD9DKuGX5NDoVS6dSlA23gd9FUaCFg==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz",
+            "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==",
             "dev": true
         },
         "dir-glob": {
@@ -10985,9 +11322,9 @@
             }
         },
         "electron-to-chromium": {
-            "version": "1.3.750",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz",
-            "integrity": "sha512-Eqy9eHNepZxJXT+Pc5++zvEi5nQ6AGikwFYDCYwXUFBr+ynJ6pDG7MzZmwGYCIuXShLJM0n4bq+aoKDmvSGJ8A==",
+            "version": "1.3.789",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.789.tgz",
+            "integrity": "sha512-lK4xn6C6ZF1kgLaC/EhOtC1MSKENExj3rMwGVnBTfHW81Z/Hb1Rge5YaWawN/YOXy3xCaESuE4KWSD50kOZ9rQ==",
             "dev": true
         },
         "emoji-regex": {
@@ -11169,13 +11506,14 @@
             "dev": true
         },
         "eslint": {
-            "version": "7.29.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.29.0.tgz",
-            "integrity": "sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==",
+            "version": "7.31.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz",
+            "integrity": "sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "7.12.11",
-                "@eslint/eslintrc": "^0.4.2",
+                "@eslint/eslintrc": "^0.4.3",
+                "@humanwhocodes/config-array": "^0.5.0",
                 "ajv": "^6.10.0",
                 "chalk": "^4.0.0",
                 "cross-spawn": "^7.0.2",
@@ -11385,17 +11723,17 @@
             }
         },
         "expect": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/expect/-/expect-27.0.2.tgz",
-            "integrity": "sha512-YJFNJe2+P2DqH+ZrXy+ydRQYO87oxRUonZImpDodR1G7qo3NYd3pL+NQ9Keqpez3cehczYwZDBC3A7xk3n7M/w==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/expect/-/expect-27.0.6.tgz",
+            "integrity": "sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw==",
             "dev": true,
             "requires": {
-                "@jest/types": "^27.0.2",
+                "@jest/types": "^27.0.6",
                 "ansi-styles": "^5.0.0",
-                "jest-get-type": "^27.0.1",
-                "jest-matcher-utils": "^27.0.2",
-                "jest-message-util": "^27.0.2",
-                "jest-regex-util": "^27.0.1"
+                "jest-get-type": "^27.0.6",
+                "jest-matcher-utils": "^27.0.6",
+                "jest-message-util": "^27.0.6",
+                "jest-regex-util": "^27.0.6"
             },
             "dependencies": {
                 "ansi-styles": {
@@ -11469,17 +11807,16 @@
             "dev": true
         },
         "fast-glob": {
-            "version": "3.2.5",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-            "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+            "version": "3.2.7",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+            "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
             "dev": true,
             "requires": {
                 "@nodelib/fs.stat": "^2.0.2",
                 "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.0",
+                "glob-parent": "^5.1.2",
                 "merge2": "^1.3.0",
-                "micromatch": "^4.0.2",
-                "picomatch": "^2.2.1"
+                "micromatch": "^4.0.4"
             }
         },
         "fast-json-stable-stringify": {
@@ -11495,9 +11832,9 @@
             "dev": true
         },
         "fastq": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-            "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz",
+            "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==",
             "dev": true,
             "requires": {
                 "reusify": "^1.0.4"
@@ -11664,9 +12001,9 @@
             }
         },
         "flatted": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-            "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz",
+            "integrity": "sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==",
             "dev": true
         },
         "follow-redirects": {
@@ -11856,18 +12193,18 @@
             }
         },
         "globals": {
-            "version": "13.9.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
-            "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+            "version": "13.10.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
+            "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
             "dev": true,
             "requires": {
                 "type-fest": "^0.20.2"
             }
         },
         "globby": {
-            "version": "11.0.3",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
-            "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
+            "version": "11.0.4",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+            "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
             "dev": true,
             "requires": {
                 "array-union": "^2.1.0",
@@ -12225,9 +12562,9 @@
             }
         },
         "husky": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.0.tgz",
-            "integrity": "sha512-xK7lO0EtSzfFPiw+oQncQVy/XqV7UVVjxBByc+Iv5iK3yhW9boDoWgvZy3OGo48QKg/hUtZkzz0hi2HXa0kn7w==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz",
+            "integrity": "sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==",
             "dev": true
         },
         "iconv-lite": {
@@ -12302,9 +12639,9 @@
             "dev": true
         },
         "inquirer": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.0.tgz",
-            "integrity": "sha512-1nKYPoalt1vMBfCMtpomsUc32wmOoWXAoq3kM/5iTfxyQ2f/BxjixQpC+mbZ7BI0JUXHED4/XPXekDVtJNpXYw==",
+            "version": "8.1.2",
+            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.1.2.tgz",
+            "integrity": "sha512-DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q==",
             "dev": true,
             "requires": {
                 "ansi-escapes": "^4.2.1",
@@ -12317,10 +12654,27 @@
                 "mute-stream": "0.0.8",
                 "ora": "^5.3.0",
                 "run-async": "^2.4.0",
-                "rxjs": "^6.6.6",
+                "rxjs": "^7.2.0",
                 "string-width": "^4.1.0",
                 "strip-ansi": "^6.0.0",
                 "through": "^2.3.6"
+            },
+            "dependencies": {
+                "rxjs": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.2.0.tgz",
+                    "integrity": "sha512-aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw==",
+                    "dev": true,
+                    "requires": {
+                        "tslib": "~2.1.0"
+                    }
+                },
+                "tslib": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+                    "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
+                    "dev": true
+                }
             }
         },
         "interpret": {
@@ -12382,9 +12736,9 @@
             "dev": true
         },
         "is-core-module": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-            "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
+            "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
             "dev": true,
             "requires": {
                 "has": "^1.0.3"
@@ -12638,6 +12992,17 @@
                 "istanbul-lib-coverage": "^3.0.0",
                 "make-dir": "^3.0.0",
                 "supports-color": "^7.1.0"
+            },
+            "dependencies": {
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
             }
         },
         "istanbul-lib-source-maps": {
@@ -12744,9 +13109,9 @@
             "dev": true
         },
         "jasmine-core": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.7.1.tgz",
-            "integrity": "sha512-DH3oYDS/AUvvr22+xUBW62m1Xoy7tUlY1tsxKEJvl5JeJ7q8zd1K5bUwiOxdH+erj6l2vAMM3hV25Xs9/WrmuQ==",
+            "version": "3.8.0",
+            "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.8.0.tgz",
+            "integrity": "sha512-zl0nZWDrmbCiKns0NcjkFGYkVTGCPUgoHypTaj+G2AzaWus7QGoXARSlYsSle2VRpSdfJmM+hzmFKzQNhF2kHg==",
             "dev": true
         },
         "jasmine-jquery": {
@@ -12756,67 +13121,67 @@
             "dev": true
         },
         "jest-diff": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.2.tgz",
-            "integrity": "sha512-BFIdRb0LqfV1hBt8crQmw6gGQHVDhM87SpMIZ45FPYKReZYG5er1+5pIn2zKqvrJp6WNox0ylR8571Iwk2Dmgw==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.6.tgz",
+            "integrity": "sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg==",
             "dev": true,
             "requires": {
                 "chalk": "^4.0.0",
-                "diff-sequences": "^27.0.1",
-                "jest-get-type": "^27.0.1",
-                "pretty-format": "^27.0.2"
+                "diff-sequences": "^27.0.6",
+                "jest-get-type": "^27.0.6",
+                "pretty-format": "^27.0.6"
             }
         },
         "jest-get-type": {
-            "version": "27.0.1",
-            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.1.tgz",
-            "integrity": "sha512-9Tggo9zZbu0sHKebiAijyt1NM77Z0uO4tuWOxUCujAiSeXv30Vb5D4xVF4UR4YWNapcftj+PbByU54lKD7/xMg==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz",
+            "integrity": "sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==",
             "dev": true
         },
         "jest-matcher-utils": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz",
-            "integrity": "sha512-Qczi5xnTNjkhcIB0Yy75Txt+Ez51xdhOxsukN7awzq2auZQGPHcQrJ623PZj0ECDEMOk2soxWx05EXdXGd1CbA==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz",
+            "integrity": "sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA==",
             "dev": true,
             "requires": {
                 "chalk": "^4.0.0",
-                "jest-diff": "^27.0.2",
-                "jest-get-type": "^27.0.1",
-                "pretty-format": "^27.0.2"
+                "jest-diff": "^27.0.6",
+                "jest-get-type": "^27.0.6",
+                "pretty-format": "^27.0.6"
             }
         },
         "jest-message-util": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.2.tgz",
-            "integrity": "sha512-rTqWUX42ec2LdMkoUPOzrEd1Tcm+R1KfLOmFK+OVNo4MnLsEaxO5zPDb2BbdSmthdM/IfXxOZU60P/WbWF8BTw==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.6.tgz",
+            "integrity": "sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.12.13",
-                "@jest/types": "^27.0.2",
+                "@jest/types": "^27.0.6",
                 "@types/stack-utils": "^2.0.0",
                 "chalk": "^4.0.0",
                 "graceful-fs": "^4.2.4",
                 "micromatch": "^4.0.4",
-                "pretty-format": "^27.0.2",
+                "pretty-format": "^27.0.6",
                 "slash": "^3.0.0",
                 "stack-utils": "^2.0.3"
             },
             "dependencies": {
                 "@babel/code-frame": {
-                    "version": "7.12.13",
-                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-                    "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+                    "version": "7.14.5",
+                    "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+                    "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
                     "dev": true,
                     "requires": {
-                        "@babel/highlight": "^7.12.13"
+                        "@babel/highlight": "^7.14.5"
                     }
                 }
             }
         },
         "jest-regex-util": {
-            "version": "27.0.1",
-            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.1.tgz",
-            "integrity": "sha512-6nY6QVcpTgEKQy1L41P4pr3aOddneK17kn3HJw6SdwGiKfgCGTvH02hVXL0GU8GEKtPH83eD2DIDgxHXOxVohQ==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz",
+            "integrity": "sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==",
             "dev": true
         },
         "js-tokens": {
@@ -12879,9 +13244,9 @@
             }
         },
         "jszip": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.6.0.tgz",
-            "integrity": "sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==",
+            "version": "3.7.0",
+            "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz",
+            "integrity": "sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==",
             "dev": true,
             "requires": {
                 "lie": "~3.3.0",
@@ -13063,18 +13428,18 @@
             }
         },
         "karma-jasmine": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.3.1.tgz",
-            "integrity": "sha512-Nxh7eX9mOQMyK0VSsMxdod+bcqrR/ikrmEiWj5M6fwuQ7oI+YEF1FckaDsWfs6TIpULm9f0fTKMjF7XcrvWyqQ==",
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.1.tgz",
+            "integrity": "sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw==",
             "dev": true,
             "requires": {
-                "jasmine-core": "^3.5.0"
+                "jasmine-core": "^3.6.0"
             }
         },
         "karma-jasmine-html-reporter": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.6.0.tgz",
-            "integrity": "sha512-ELO9yf0cNqpzaNLsfFgXd/wxZVYkE2+ECUwhMHUD4PZ17kcsPsYsVyjquiRqyMn2jkd2sHt0IeMyAyq1MC23Fw==",
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz",
+            "integrity": "sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==",
             "dev": true,
             "requires": {}
         },
@@ -13194,6 +13559,12 @@
             "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
             "dev": true
         },
+        "ky": {
+            "version": "0.28.5",
+            "resolved": "https://registry.npmjs.org/ky/-/ky-0.28.5.tgz",
+            "integrity": "sha512-O5gg9kF4MeyfSw+YkgPAafOPwEUU6xcdGEJKUJmKpIPbLzk3oxUtY4OdBNekG7mawofzkyZ/ZHuR9ev5uZZdAA==",
+            "dev": true
+        },
         "lazystream": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
@@ -13279,13 +13650,13 @@
             }
         },
         "lighthouse-logger": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz",
-            "integrity": "sha512-wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz",
+            "integrity": "sha512-BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA==",
             "dev": true,
             "requires": {
-                "debug": "^2.6.8",
-                "marky": "^1.2.0"
+                "debug": "^2.6.9",
+                "marky": "^1.2.2"
             },
             "dependencies": {
                 "debug": {
@@ -13638,18 +14009,18 @@
             "dev": true
         },
         "mime-db": {
-            "version": "1.48.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-            "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
+            "version": "1.49.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
+            "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==",
             "dev": true
         },
         "mime-types": {
-            "version": "2.1.31",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-            "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+            "version": "2.1.32",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
+            "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
             "dev": true,
             "requires": {
-                "mime-db": "1.48.0"
+                "mime-db": "1.49.0"
             }
         },
         "mimic-fn": {
@@ -13686,15 +14057,15 @@
             "dev": true
         },
         "mocha": {
-            "version": "9.0.1",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.0.1.tgz",
-            "integrity": "sha512-9zwsavlRO+5csZu6iRtl3GHImAbhERoDsZwdRkdJ/bE+eVplmoxNKE901ZJ9LdSchYBjSCPbjKc5XvcAri2ylw==",
+            "version": "9.0.3",
+            "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.0.3.tgz",
+            "integrity": "sha512-hnYFrSefHxYS2XFGtN01x8un0EwNu2bzKvhpRFhgoybIvMaOkkL60IVPmkb5h6XDmUl4IMSB+rT5cIO4/4bJgg==",
             "dev": true,
             "requires": {
                 "@ungap/promise-all-settled": "1.1.2",
                 "ansi-colors": "4.1.1",
                 "browser-stdout": "1.3.1",
-                "chokidar": "3.5.1",
+                "chokidar": "3.5.2",
                 "debug": "4.3.1",
                 "diff": "5.0.0",
                 "escape-string-regexp": "4.0.0",
@@ -13707,12 +14078,12 @@
                 "minimatch": "3.0.4",
                 "ms": "2.1.3",
                 "nanoid": "3.1.23",
-                "serialize-javascript": "5.0.1",
+                "serialize-javascript": "6.0.0",
                 "strip-json-comments": "3.1.1",
                 "supports-color": "8.1.1",
                 "which": "2.0.2",
                 "wide-align": "1.1.3",
-                "workerpool": "6.1.4",
+                "workerpool": "6.1.5",
                 "yargs": "16.2.0",
                 "yargs-parser": "20.2.4",
                 "yargs-unparser": "2.0.0"
@@ -13724,6 +14095,23 @@
                     "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
                     "dev": true
                 },
+                "debug": {
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+                    "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    },
+                    "dependencies": {
+                        "ms": {
+                            "version": "2.1.2",
+                            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+                            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+                            "dev": true
+                        }
+                    }
+                },
                 "js-yaml": {
                     "version": "4.1.0",
                     "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -13749,15 +14137,6 @@
                     "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
                     "dev": true
                 },
-                "supports-color": {
-                    "version": "8.1.1",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-                    "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
                 "yargs": {
                     "version": "16.2.0",
                     "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
@@ -13859,9 +14238,9 @@
             "dev": true
         },
         "normalize-url": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.0.1.tgz",
-            "integrity": "sha512-VU4pzAuh7Kip71XEmO9aNREYAdMHFGTVj/i+CaTImS8x0i1d3jUZkXhqluy/PRgjPLMgsLQulYY3PJ/aSbSjpQ==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+            "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
             "dev": true
         },
         "object-assign": {
@@ -13871,9 +14250,9 @@
             "dev": true
         },
         "object-inspect": {
-            "version": "1.10.3",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-            "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+            "version": "1.11.0",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+            "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
             "dev": true
         },
         "object-keys": {
@@ -14269,18 +14648,18 @@
             "dev": true
         },
         "prettier": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
-            "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
+            "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
             "dev": true
         },
         "pretty-format": {
-            "version": "27.0.2",
-            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.2.tgz",
-            "integrity": "sha512-mXKbbBPnYTG7Yra9qFBtqj+IXcsvxsvOBco3QHxtxTl+hHKq6QdzMZ+q0CtL4ORHZgwGImRr2XZUX2EWzORxig==",
+            "version": "27.0.6",
+            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz",
+            "integrity": "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==",
             "dev": true,
             "requires": {
-                "@jest/types": "^27.0.2",
+                "@jest/types": "^27.0.6",
                 "ansi-regex": "^5.0.0",
                 "ansi-styles": "^5.0.0",
                 "react-is": "^17.0.1"
@@ -14393,6 +14772,15 @@
                         "debug": "4"
                     }
                 },
+                "debug": {
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+                    "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                },
                 "https-proxy-agent": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
@@ -14412,23 +14800,23 @@
             }
         },
         "puppeteer-core": {
-            "version": "9.1.1",
-            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz",
-            "integrity": "sha512-zbedbitVIGhmgz0nt7eIdLsnaoVZSlNJfBivqm2w67T8LR2bU1dvnruDZ8nQO0zn++Iet7zHbAOdnuS5+H2E7A==",
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-10.1.0.tgz",
+            "integrity": "sha512-x2yDSJI/PRiWhDqAt1jd4rhTotxwjwKzHLIIqD2MlJ+TmzGJfBY9snAGIVXJwkWfKJg+Ef5xupdK0EbHDqBpFw==",
             "dev": true,
             "requires": {
-                "debug": "^4.1.0",
-                "devtools-protocol": "0.0.869402",
-                "extract-zip": "^2.0.0",
-                "https-proxy-agent": "^5.0.0",
-                "node-fetch": "^2.6.1",
-                "pkg-dir": "^4.2.0",
-                "progress": "^2.0.1",
-                "proxy-from-env": "^1.1.0",
-                "rimraf": "^3.0.2",
-                "tar-fs": "^2.0.0",
-                "unbzip2-stream": "^1.3.3",
-                "ws": "^7.2.3"
+                "debug": "4.3.1",
+                "devtools-protocol": "0.0.883894",
+                "extract-zip": "2.0.1",
+                "https-proxy-agent": "5.0.0",
+                "node-fetch": "2.6.1",
+                "pkg-dir": "4.2.0",
+                "progress": "2.0.1",
+                "proxy-from-env": "1.1.0",
+                "rimraf": "3.0.2",
+                "tar-fs": "2.0.0",
+                "unbzip2-stream": "1.3.3",
+                "ws": "7.4.6"
             },
             "dependencies": {
                 "agent-base": {
@@ -14440,11 +14828,14 @@
                         "debug": "4"
                     }
                 },
-                "devtools-protocol": {
-                    "version": "0.0.869402",
-                    "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
-                    "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
-                    "dev": true
+                "debug": {
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+                    "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
                 },
                 "https-proxy-agent": {
                     "version": "5.0.0",
@@ -14455,6 +14846,12 @@
                         "agent-base": "6",
                         "debug": "4"
                     }
+                },
+                "progress": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
+                    "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
+                    "dev": true
                 }
             }
         },
@@ -14597,18 +14994,18 @@
             }
         },
         "readdirp": {
-            "version": "3.5.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-            "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
             "dev": true,
             "requires": {
                 "picomatch": "^2.2.1"
             }
         },
         "rechoir": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
-            "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
+            "version": "0.7.1",
+            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+            "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
             "dev": true,
             "requires": {
                 "resolve": "^1.9.0"
@@ -14624,15 +15021,15 @@
             }
         },
         "regenerator-runtime": {
-            "version": "0.13.7",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-            "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+            "version": "0.13.9",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
             "dev": true
         },
         "regexpp": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-            "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+            "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
             "dev": true
         },
         "repeat-string": {
@@ -14676,9 +15073,9 @@
             }
         },
         "resolve-alpn": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.1.2.tgz",
-            "integrity": "sha512-8OyfzhAtA32LVUsJSke3auIyINcwdh5l3cvYKdKO0nvsYSKuiLfTM5i78PJswFPT8y6cPW+L1v6/hE95chcpDA==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.0.tgz",
+            "integrity": "sha512-e4FNQs+9cINYMO5NMFc6kOUCdohjqFPSgMuwuZAOUWqrfWsen+Yjy5qZFkV5K7VO7tFSLKcUL97olkED7sCBHA==",
             "dev": true
         },
         "resolve-dir": {
@@ -14822,14 +15219,6 @@
                 "tar-stream": "2.2.0",
                 "which": "^2.0.2",
                 "yauzl": "^2.10.0"
-            },
-            "dependencies": {
-                "commander": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-                    "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-                    "dev": true
-                }
             }
         },
         "selenium-webdriver": {
@@ -14883,9 +15272,9 @@
             }
         },
         "serialize-javascript": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-            "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+            "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
             "dev": true,
             "requires": {
                 "randombytes": "^2.1.0"
@@ -15237,9 +15626,9 @@
             "dev": true
         },
         "supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
             "dev": true,
             "requires": {
                 "has-flag": "^4.0.0"
@@ -15260,9 +15649,9 @@
             },
             "dependencies": {
                 "ajv": {
-                    "version": "8.6.0",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
-                    "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+                    "version": "8.6.2",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
+                    "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
                     "dev": true,
                     "requires": {
                         "fast-deep-equal": "^3.1.1",
@@ -15323,6 +15712,17 @@
             "requires": {
                 "debug": "4.3.1",
                 "is2": "^2.0.6"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+                    "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                }
             }
         },
         "temp-fs": {
@@ -15356,6 +15756,12 @@
                 "source-map-support": "~0.5.19"
             },
             "dependencies": {
+                "commander": {
+                    "version": "2.20.3",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+                    "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+                    "dev": true
+                },
                 "source-map": {
                     "version": "0.7.3",
                     "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
@@ -15583,9 +15989,9 @@
             }
         },
         "wdio-chromedriver-service": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/wdio-chromedriver-service/-/wdio-chromedriver-service-7.1.1.tgz",
-            "integrity": "sha512-wZyXKJDwuK+17SWm/OvVNXIs+dLJPMeeDRjbMKigSsBzo8h9LGnfAonIs35CrpCyRrNb8MZmntUXDI0LpkP2kA==",
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/wdio-chromedriver-service/-/wdio-chromedriver-service-7.2.0.tgz",
+            "integrity": "sha512-0N/mEE0Bk/aoc7YZNwS5sbzzGrPWb7Lo4nA+t/bF9BwQRAokeHl/70vD2JKe/D4Wo05J2X0C1RxRS7e4iwW6KQ==",
             "dev": true,
             "requires": {
                 "@wdio/logger": "^7.5.3",
@@ -15608,50 +16014,51 @@
             }
         },
         "webdriver": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.7.4.tgz",
-            "integrity": "sha512-bE6/A+OYb040GZ1MiuZebc8bOOYm797dmqEfmj6aoEQ4BMy1juiFlzCzeBzAlPrq33qPa8/CSYfH7rnkB3RRwg==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-7.8.0.tgz",
+            "integrity": "sha512-PlAlPLeUEI9w7Wkvhhm67MB/wdeqilcXXYxTe9o1JsQzW64ptMltORm/LsLmGfEnuNTstRor7y68HXPNDOSGXw==",
             "dev": true,
             "requires": {
-                "@types/node": "^14.14.31",
-                "@wdio/config": "7.7.3",
+                "@types/node": "^15.12.5",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
                 "@wdio/protocols": "7.7.4",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "got": "^11.0.2",
+                "ky": "^0.28.5",
                 "lodash.merge": "^4.6.1"
             },
             "dependencies": {
                 "@types/node": {
-                    "version": "14.17.4",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
-                    "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
+                    "version": "15.14.3",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+                    "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
                     "dev": true
                 }
             }
         },
         "webdriverio": {
-            "version": "7.7.4",
-            "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.7.4.tgz",
-            "integrity": "sha512-VSWRj2mmvA8WbideFAYb5BMWPkBCJ7gJHhYrUSibTrMHKreRtX++cw/oGxxowy9/pTHsAW6OxlnaDxFL5Gt08A==",
+            "version": "7.8.0",
+            "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-7.8.0.tgz",
+            "integrity": "sha512-lIxtBbAMbt4SDk2WzdDPlDnxQCIK/xOv/39LKHkQIDj780xgqDfoq/4V7xdm5uDgeCdk1Uw3ZB7VCEWZ+QZdFg==",
             "dev": true,
             "requires": {
                 "@types/aria-query": "^4.2.1",
-                "@types/node": "^14.14.31",
-                "@wdio/config": "7.7.3",
+                "@types/node": "^15.12.5",
+                "@wdio/config": "7.8.0",
                 "@wdio/logger": "7.7.0",
                 "@wdio/protocols": "7.7.4",
-                "@wdio/repl": "7.7.3",
-                "@wdio/types": "7.7.3",
-                "@wdio/utils": "7.7.3",
+                "@wdio/repl": "7.8.0",
+                "@wdio/types": "7.8.0",
+                "@wdio/utils": "7.8.0",
                 "archiver": "^5.0.0",
                 "aria-query": "^4.2.2",
                 "atob": "^2.1.2",
                 "css-shorthand-properties": "^1.1.1",
                 "css-value": "^0.0.1",
-                "devtools": "7.7.4",
-                "devtools-protocol": "^0.0.892017",
+                "devtools": "7.8.0",
+                "devtools-protocol": "^0.0.901419",
                 "fs-extra": "^10.0.0",
                 "get-port": "^5.1.1",
                 "grapheme-splitter": "^1.0.2",
@@ -15660,24 +16067,24 @@
                 "lodash.isplainobject": "^4.0.6",
                 "lodash.zip": "^4.2.0",
                 "minimatch": "^3.0.4",
-                "puppeteer-core": "^9.1.0",
+                "puppeteer-core": "^10.1.0",
                 "query-selector-shadow-dom": "^1.0.0",
                 "resq": "^1.9.1",
                 "rgb2hex": "0.2.5",
                 "serialize-error": "^8.0.0",
-                "webdriver": "7.7.4"
+                "webdriver": "7.8.0"
             },
             "dependencies": {
                 "@types/node": {
-                    "version": "14.17.4",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
-                    "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
+                    "version": "15.14.3",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.3.tgz",
+                    "integrity": "sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==",
                     "dev": true
                 },
                 "devtools-protocol": {
-                    "version": "0.0.892017",
-                    "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.892017.tgz",
-                    "integrity": "sha512-23yn1+zeMBlWiZTtrCViNQt+W+FRDw5rEetI19bMuyKIYeK11xo/dS+Hmuu8ifGJnJvXUU3Y79IoxSPWZWcVOA==",
+                    "version": "0.0.901419",
+                    "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz",
+                    "integrity": "sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==",
                     "dev": true
                 }
             }
@@ -15747,9 +16154,9 @@
             "dev": true
         },
         "workerpool": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.4.tgz",
-            "integrity": "sha512-jGWPzsUqzkow8HoAvqaPWTUPCrlPJaJ5tY8Iz7n1uCz3tTp6s3CDG0FF1NsX42WNlkRSW6Mr+CDZGnNoSsKa7g==",
+            "version": "6.1.5",
+            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
+            "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
             "dev": true
         },
         "wrap-ansi": {
diff --git a/package.json b/package.json
index 3066537c14..4ae077455e 100644
--- a/package.json
+++ b/package.json
@@ -6,47 +6,47 @@
     "repository": "github.com/kbase/narrative",
     "devDependencies": {
         "@types/puppeteer": "5",
-        "@wdio/browserstack-service": "^7.7.4",
-        "@wdio/cli": "^7.7.4",
-        "@wdio/local-runner": "^7.7.4",
-        "@wdio/mocha-framework": "^7.7.4",
-        "@wdio/selenium-standalone-service": "^7.7.4",
-        "@wdio/spec-reporter": "^7.7.3",
-        "bower": "^1.8.12",
-        "chrome-launcher": "^0.14.0",
-        "chromedriver": "^91.0.1",
-        "eslint": "7.29.0",
-        "eslint-config-prettier": "^8.3.0",
-        "grunt": "^1.4.1",
-        "grunt-cli": "^1.4.3",
+        "@wdio/browserstack-service": "7.8.0",
+        "@wdio/cli": "7.8.0",
+        "@wdio/local-runner": "7.8.0",
+        "@wdio/mocha-framework": "7.8.0",
+        "@wdio/selenium-standalone-service": "7.8.0",
+        "@wdio/spec-reporter": "7.8.0",
+        "bower": "1.8.12",
+        "chrome-launcher": "0.14.0",
+        "chromedriver": "92.0.0",
+        "eslint": "7.31.0",
+        "eslint-config-prettier": "8.3.0",
+        "grunt": "1.4.1",
+        "grunt-cli": "1.4.3",
         "grunt-contrib-copy": "1.0.0",
         "grunt-regex-replace": "0.4.0",
         "husky": "^7.0.0",
         "jasmine-ajax": "4.0.0",
-        "jasmine-core": "3.7.1",
+        "jasmine-core": "3.8.0",
         "jasmine-jquery": "2.1.1",
         "karma": "^6.3.4",
         "karma-brief-reporter": "^0.2.1",
         "karma-chrome-launcher": "^3.1.0",
         "karma-coverage": "2.0.3",
         "karma-es6-shim": "1.0.0",
-        "karma-firefox-launcher": "^2.1.0",
-        "karma-jasmine": "^3.3.1",
-        "karma-jasmine-html-reporter": "^1.6.0",
-        "karma-json-result-reporter": "^1.0.0",
+        "karma-firefox-launcher": "2.1.1",
+        "karma-jasmine": "4.0.1",
+        "karma-jasmine-html-reporter": "1.7.0",
+        "karma-json-result-reporter": "1.0.0",
         "karma-mocha-reporter": "2.2.5",
         "karma-requirejs": "1.1.0",
         "karma-safari-launcher": "1.0.0",
-        "prettier": "2.2.1",
+        "prettier": "2.3.2",
         "puppeteer": "10.1.0",
         "requirejs": "2.3.6",
         "selenium-standalone": "7.1.0",
         "selenium-webdriver": "3.6.0",
         "string.prototype.endswith": "1.0.0",
         "string.prototype.startswith": "1.0.0",
-        "terser": "^5.7.1",
-        "wdio-chromedriver-service": "^7.1.1",
-        "webdriverio": "^7.7.4"
+        "terser": "5.7.1",
+        "wdio-chromedriver-service": "7.2.0",
+        "webdriverio": "7.8.0"
     },
     "browserslist": [
         "defaults"

From f678d6db35734276c6a73e4cbf2245d6014d900e Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Tue, 27 Jul 2021 17:27:16 -0700
Subject: [PATCH 38/42] sort scripts

---
 package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 4ae077455e..6394a94220 100644
--- a/package.json
+++ b/package.json
@@ -60,23 +60,23 @@
         "black": "black -v --exclude '.+Impl.py' .",
         "bower": "bower install",
         "eslint": "eslint --fix '**/*.js'",
+        "eslint-check": "eslint '**/*.js'",
+        "eslint-pre-push": "scripts/eslint-pre-push.sh",
         "flake8": "flake8 .",
+        "headless": "kbase-narrative --no-browser --NotebookApp.allow_origin='*' --ip=127.0.0.1 --port=32323",
         "husky_msg": "echo Running git hooks -- see the 'husky' section of package.json for details",
         "minify": "r.js -o build.js && terser kbase-extension/static/kbase-narrative.js -c --source-map --output kbase-extension/static/kbase-narrative-min.js && grunt regex-replace",
         "postinstall": "husky install",
+        "prepare": "husky install",
         "prettier": "prettier --write '**/*.js'",
         "prettier_check": "prettier --check '**/*.js'",
         "prettier_debug": "prettier --debug-check '**/*.js'",
-        "eslint-check": "eslint '**/*.js'",
-        "eslint-pre-push": "scripts/eslint-pre-push.sh",
         "requirejs": "r.js -o build.js",
-        "headless": "kbase-narrative --no-browser --NotebookApp.allow_origin='*' --ip=127.0.0.1 --port=32323",
         "tdd": "karma start test/unit/karma.local.conf.js --auto-watch --no-single-run",
+        "test": "karma start test/unit/karma.conf.js",
         "test_chrome": "karma start test/unit/karma.local.conf.js --browsers=Chrome --single-run=false",
         "test_firefox": "karma start test/unit/karma.local.conf.js --browsers=Firefox --single-run=false",
-        "test": "karma start test/unit/karma.conf.js",
-        "uglify": "terser kbase-extension/static/kbase-narrative.js -c --source-map --output kbase-extension/static/kbase-narrative-min.js",
-        "prepare": "husky install"
+        "uglify": "terser kbase-extension/static/kbase-narrative.js -c --source-map --output kbase-extension/static/kbase-narrative-min.js"
     },
     "lint-staged": {
         "*.js": "eslint"

From b81e4a4fc3b37b9d4e5688d9775853697a9a5181 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Tue, 27 Jul 2021 17:29:00 -0700
Subject: [PATCH 39/42] remove unused parameter

---
 .../kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
index b66c380979..13682285b1 100644
--- a/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
+++ b/kbase-extension/static/kbase/js/widgets/narrative_core/kbaseCellToolbarMenu.js
@@ -523,8 +523,7 @@ define([
     }
 
     return {
-        // eslint-disable-next-line no-unused-vars
-        make: function (_config) {
+        make: function () {
             return factory();
         },
     };

From a6ddfa6863688ad66404fcfef7f7d6619ff5cdb5 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Tue, 27 Jul 2021 18:07:46 -0700
Subject: [PATCH 40/42] prettier run pre-push (via husky) should only inspect
 files being pushed

---
 .husky/pre-push              | 2 +-
 package.json                 | 1 +
 scripts/prettier-pre-push.sh | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100755 scripts/prettier-pre-push.sh

diff --git a/.husky/pre-push b/.husky/pre-push
index 3447a9037d..cfb23ce262 100755
--- a/.husky/pre-push
+++ b/.husky/pre-push
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run husky_msg && npm run prettier_check && npm run eslint-pre-push
+npm run husky_msg && npm run prettier-pre-push && npm run eslint-pre-push
diff --git a/package.json b/package.json
index 6394a94220..d6ebbba1e2 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
         "postinstall": "husky install",
         "prepare": "husky install",
         "prettier": "prettier --write '**/*.js'",
+        "prettier-pre-push": "scripts/prettier-pre-push.sh",
         "prettier_check": "prettier --check '**/*.js'",
         "prettier_debug": "prettier --debug-check '**/*.js'",
         "requirejs": "r.js -o build.js",
diff --git a/scripts/prettier-pre-push.sh b/scripts/prettier-pre-push.sh
new file mode 100755
index 0000000000..4249c6ed01
--- /dev/null
+++ b/scripts/prettier-pre-push.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export BRANCH=$(git branch --show-current)
+prettier --check $(git diff --stat --name-only  "origin/$BRANCH" HEAD | egrep "\\.js$")
\ No newline at end of file

From 68536e5f9f7de621af4b4a5b742b930c9e1dbd83 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Wed, 28 Jul 2021 05:29:56 -0700
Subject: [PATCH 41/42] use puppeteer's chrome binary; otherwise it is too hard
 to match chromedriver and chrome-on-host.

---
 test/integration/wdio.conf.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/integration/wdio.conf.js b/test/integration/wdio.conf.js
index 38a410193b..2c6c965a78 100644
--- a/test/integration/wdio.conf.js
+++ b/test/integration/wdio.conf.js
@@ -5,6 +5,11 @@
 const testConfig = require('../testConfig');
 const fs = require('fs');
 
+// We use a specific chrome binary because chromedriver only works with
+// a single major version of chrome. This ensures integration tests work
+// across all environments.
+const CHROME_BINARY = require('puppeteer').executablePath();
+
 // Import environment variables used to control the tests.
 // Note that most have defaults, and many are only applicable
 // to testing services
@@ -222,6 +227,7 @@ function makeCapabilities(config) {
                     maxInstances: 1,
                     'goog:chromeOptions': {
                         args,
+                        binary: CHROME_BINARY,
                     },
                 };
             })();
@@ -564,7 +570,7 @@ const wdioConfig = {
      * @param {Object} exitCode 0 - success, 1 - fail
      * @param {Object} config wdio configuration object
      * @param {Array.<Object>} capabilities list of capabilities details
-     * @param {<Object>} results object containing test results
+     * @param {Object} results object containing test results
      */
     // onComplete: function(exitCode, config, capabilities, results) {
     // },

From 0d7876c304ae25fe958c669ea8b214e77df1fa09 Mon Sep 17 00:00:00 2001
From: Erik Pearson <eapearson@lbl.gov>
Date: Thu, 30 Sep 2021 12:59:52 -0700
Subject: [PATCH 42/42] restore data-testid to userMenu (merge regression)

---
 kbase-extension/static/kbase/js/userMenu.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kbase-extension/static/kbase/js/userMenu.js b/kbase-extension/static/kbase/js/userMenu.js
index 3ff7635b02..71c1994302 100644
--- a/kbase-extension/static/kbase/js/userMenu.js
+++ b/kbase-extension/static/kbase/js/userMenu.js
@@ -57,7 +57,7 @@ define([
         }
 
         function render() {
-            const menu = div({ class: 'dropdown', style: 'display:inline-block' }, [
+            const menu = div({ class: 'dropdown', style: 'display:inline-block', dataTestid: 'userMenu' }, [
                 button(
                     {
                         type: 'button',
@@ -90,12 +90,11 @@ define([
                                 div(
                                     {
                                         style: 'display: inline-block',
-                                        'data-element': 'user-label',
                                     },
                                     [
-                                        span({ 'data-element': 'realname' }, displayName),
+                                        span({ dataTestid: 'realname' }, displayName),
                                         br(),
-                                        i({ 'data-element': 'username' }, userName),
+                                        i({ dataTestid: 'username' }, userName),
                                     ]
                                 ),
                             ]