From 5d6bfdd6cd6459383eb9078aaf2485aab4d45350 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Fri, 25 Sep 2020 08:59:09 -0600
Subject: [PATCH 01/16] One approach to fixing issues with window width/level
 sliders

---
 client/src/components/WindowControl.vue | 22 +++++++++++++++++--
 client/src/store/index.js               | 28 ++++++++++++++++++++++++-
 client/src/views/Dataset.vue            |  2 ++
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/client/src/components/WindowControl.vue b/client/src/components/WindowControl.vue
index a805c3c..eab03b0 100644
--- a/client/src/components/WindowControl.vue
+++ b/client/src/components/WindowControl.vue
@@ -10,6 +10,7 @@ export default {
   computed: {
     ...mapState(["proxyManager", "currentDataset"]),
     representation() {
+      console.log("goop");
       return this.currentDataset && this.proxyManager.getRepresentations()[0];
     },
     windowWidthDomain() {
@@ -21,9 +22,11 @@ export default {
   },
   watch: {
     windowWidth(value) {
+      console.log(`watcher: representation.setWindowWidth(${value})`);
       this.representation.setWindowWidth(value);
     },
     windowLevel(value) {
+      console.log(`watcher: representation.setWindowLevel(${value})`);
       this.representation.setWindowLevel(value);
     },
     proxyManager() {
@@ -41,9 +44,24 @@ export default {
     bindWindow() {
       this.windowWidth = this.representation.getWindowWidth();
       this.windowLevel = this.representation.getWindowLevel();
+      console.log(
+        `bindWindow: w = ${this.windowWidth}, l = ${this.windowLevel}`
+      );
       this.modifiedSubscription = this.representation.onModified(() => {
-        this.windowWidth = this.representation.getWindowWidth();
-        this.windowLevel = this.representation.getWindowLevel();
+        console.log(
+          `representation modified: w = ${this.windowWidth}, l = ${this.windowLevel}`
+        );
+        // const ratio =
+        //   (this.representation.getWindowWidth() - this.windowWidthDomain.min) /
+        //   (this.windowWidthDomain.max - this.windowWidthDomain.min);
+        console.log(
+          `width min: ${this.windowWidthDomain.min}, width max: ${this.windowWidthDomain.max}`
+        );
+        console.log(
+          `level min: ${this.windowLevelDomain.min}, level max: ${this.windowLevelDomain.max}`
+        );
+        // this.windowWidth = this.representation.getWindowWidth();
+        // this.windowLevel = this.representation.getWindowLevel();
       });
     },
     increaseWindowWidth() {
diff --git a/client/src/store/index.js b/client/src/store/index.js
index a1b9801..f96bc70 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -35,6 +35,7 @@ const store = new Vuex.Store({
       return state.currentDataset ? state.currentDataset["_id"] : null;
     },
     allDatasets(state) {
+      console.log("allDatasets");
       if (!state.sessionTree) {
         return;
       }
@@ -49,7 +50,9 @@ const store = new Vuex.Store({
       return state.currentDataset ? state.currentDataset.nextDataset : null;
     },
     getDataset(state, getters) {
+      console.log("getDataset");
       return function(datasetId) {
+        console.log("inner getDataset");
         if (!datasetId || !getters.allDatasets) {
           return;
         }
@@ -167,6 +170,19 @@ const store = new Vuex.Store({
       if (state.currentDataset === dataset) {
         return;
       }
+      let windowLevel = null;
+      let windowWidth = null;
+      if (state.proxyManager) {
+        const repList = state.proxyManager.getRepresentations();
+        if (repList.length > 0) {
+          const rep = repList[0];
+          windowLevel = rep.getWindowLevel();
+          windowWidth = rep.getWindowWidth();
+          console.log(`
+            Current values are windowLevel = ${windowLevel}, windowWidth = ${windowWidth}
+          `);
+        }
+      }
       state.loadingDataset = true;
       state.errorLoadingDataset = false;
       var oldSession = getters.currentSession;
@@ -182,12 +198,13 @@ const store = new Vuex.Store({
         });
         readDataQueue = [];
       }
-
+      let restoreWindowParams = true;
       if (!state.proxyManager || newProxyManager) {
         state.proxyManager = vtkProxyManager.newInstance({
           proxyConfiguration: proxy
         });
         state.vtkViews = [];
+        restoreWindowParams = false;
       }
 
       let sourceProxy = state.proxyManager.getActiveSource();
@@ -219,6 +236,15 @@ const store = new Vuex.Store({
         state.currentDataset = dataset;
         state.loadingDataset = false;
       }
+
+      if (restoreWindowParams && windowLevel) {
+        const rep = state.proxyManager.getRepresentations()[0];
+        rep.setWindowLevel(windowLevel);
+        rep.setWindowWidth(windowWidth);
+        console.log(`
+          Reset values to windowLevel = ${windowLevel}, windowWidth = ${windowWidth}
+        `);
+      }
     },
     async loadSites({ state }) {
       let { data: sites } = await girder.rest.get("miqa_setting/site");
diff --git a/client/src/views/Dataset.vue b/client/src/views/Dataset.vue
index e885d0f..da16bf8 100644
--- a/client/src/views/Dataset.vue
+++ b/client/src/views/Dataset.vue
@@ -89,6 +89,7 @@ export default {
     );
     await Promise.all([this.loadSessions(), this.loadSites()]);
     var datasetId = this.$route.params.datasetId;
+    console.log("Dataset.created(), about to call getDataset");
     var dataset = this.getDataset(datasetId);
     if (dataset) {
       await this.swapToDataset(dataset);
@@ -108,6 +109,7 @@ export default {
     }
   },
   async beforeRouteUpdate(to, from, next) {
+    console.log("beforeRouteUpdate(), about to call getDataset");
     let toDataset = this.getDataset(to.params.datasetId);
     let result = await this.beforeLeaveSession(toDataset);
     next(result);

From c74bd8f3f70491dbd308e20da931ffa822e3c54a Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Tue, 29 Sep 2020 20:33:16 -0600
Subject: [PATCH 02/16] Flatten session tree data structure in state

---
 client/src/components/EmailDialog.vue    |   4 +-
 client/src/components/NavigationTabs.vue |   4 +-
 client/src/components/SessionsView.vue   |  38 +++-
 client/src/components/VtkViewer.vue      |   4 +-
 client/src/components/WindowControl.vue  |  27 +--
 client/src/store/index.js                | 217 ++++++++++++-----------
 client/src/views/Dataset.vue             |  40 ++---
 7 files changed, 178 insertions(+), 156 deletions(-)

diff --git a/client/src/components/EmailDialog.vue b/client/src/components/EmailDialog.vue
index 75fb9b2..99cc4f8 100644
--- a/client/src/components/EmailDialog.vue
+++ b/client/src/components/EmailDialog.vue
@@ -37,8 +37,8 @@ export default {
     sending: false
   }),
   computed: {
-    ...mapState(["currentDataset", "screenshots"]),
-    ...mapGetters(["currentSession", "siteMap"])
+    ...mapState(["screenshots"]),
+    ...mapGetters(["currentDataset", "currentSession", "siteMap"])
   },
   watch: {
     currentDataset(value) {
diff --git a/client/src/components/NavigationTabs.vue b/client/src/components/NavigationTabs.vue
index bae1806..8feae6d 100644
--- a/client/src/components/NavigationTabs.vue
+++ b/client/src/components/NavigationTabs.vue
@@ -1,5 +1,5 @@
 <script>
-import { mapGetters, mapMutations } from "vuex";
+import { mapState, mapMutations } from "vuex";
 
 import { GIRDER_URL } from "../constants";
 
@@ -10,7 +10,7 @@ export default {
     GIRDER_URL
   }),
   computed: {
-    ...mapGetters(["currentDatasetId"])
+    ...mapState(["currentDatasetId"])
   },
   methods: {
     ...mapMutations(["setDrawer"]),
diff --git a/client/src/components/SessionsView.vue b/client/src/components/SessionsView.vue
index 29c3f1b..06dda34 100644
--- a/client/src/components/SessionsView.vue
+++ b/client/src/components/SessionsView.vue
@@ -15,10 +15,29 @@ export default {
     API_URL
   }),
   computed: {
-    ...mapState(["sessionTree"]),
-    ...mapGetters(["currentSession"])
+    ...mapState([
+      "experiments",
+      "experimentIds",
+      "experimentSessions",
+      "sessions",
+      "sessionDatasets",
+      "datasets"
+    ]),
+    ...mapGetters(["currentSession"]),
+    orderedExperiments() {
+      const allExperiments = this.experiments;
+      return this.experimentIds.map(expId => allExperiments[expId]);
+    }
   },
   methods: {
+    sessionsForExperiment(expId) {
+      const expSessionIds = this.experimentSessions[expId];
+      const allSessions = this.sessions;
+      return expSessionIds.map(sessionId => allSessions[sessionId]);
+    },
+    getIdOfFirstDatasetInSession(sessionId) {
+      return this.sessionDatasets[sessionId][0];
+    },
     ratingToLabel(rating) {
       switch (rating) {
         case "questionable":
@@ -37,18 +56,21 @@ export default {
 
 <template>
   <div class="sessions-view">
-    <ul class="experiment" v-if="sessionTree && sessionTree.length">
+    <ul
+      class="experiment"
+      v-if="orderedExperiments && orderedExperiments.length"
+    >
       <li
-        v-for="experiment of sessionTree"
+        v-for="experiment of orderedExperiments"
         class="body-2"
-        :key="experiment.folderId"
+        :key="experiment.id"
       >
         {{ experiment.name }}
         <ul class="sessions">
           <li
-            v-for="session of experiment.sessions"
+            v-for="session of sessionsForExperiment(experiment.id)"
             class="body-1"
-            :key="session.folderId"
+            :key="session.id"
             :class="{ current: session === currentSession }"
           >
             <v-btn
@@ -56,7 +78,7 @@ export default {
               href
               text
               small
-              :to="session.datasets[0]._id"
+              :to="getIdOfFirstDatasetInSession(session.id)"
               active-class=""
               >{{ session.name
               }}<span small v-if="session.meta && session.meta.rating"
diff --git a/client/src/components/VtkViewer.vue b/client/src/components/VtkViewer.vue
index e2f9ef5..6422005 100644
--- a/client/src/components/VtkViewer.vue
+++ b/client/src/components/VtkViewer.vue
@@ -20,8 +20,8 @@ export default {
     fullscreen: false
   }),
   computed: {
-    ...mapState(["proxyManager", "currentDataset", "loadingDataset"]),
-    ...mapGetters(["currentSession", "currentSession"]),
+    ...mapState(["proxyManager", "loadingDataset"]),
+    ...mapGetters(["currentDataset", "currentSession"]),
     representation() {
       return (
         // force add dependancy on currentDataset
diff --git a/client/src/components/WindowControl.vue b/client/src/components/WindowControl.vue
index eab03b0..b16084f 100644
--- a/client/src/components/WindowControl.vue
+++ b/client/src/components/WindowControl.vue
@@ -1,5 +1,5 @@
 <script>
-import { mapState } from "vuex";
+import { mapState, mapGetters } from "vuex";
 
 export default {
   name: "WindowControl",
@@ -8,9 +8,9 @@ export default {
     windowLevel: 0
   }),
   computed: {
-    ...mapState(["proxyManager", "currentDataset"]),
+    ...mapState(["proxyManager"]),
+    ...mapGetters(["currentDataset"]),
     representation() {
-      console.log("goop");
       return this.currentDataset && this.proxyManager.getRepresentations()[0];
     },
     windowWidthDomain() {
@@ -22,11 +22,9 @@ export default {
   },
   watch: {
     windowWidth(value) {
-      console.log(`watcher: representation.setWindowWidth(${value})`);
       this.representation.setWindowWidth(value);
     },
     windowLevel(value) {
-      console.log(`watcher: representation.setWindowLevel(${value})`);
       this.representation.setWindowLevel(value);
     },
     proxyManager() {
@@ -44,24 +42,9 @@ export default {
     bindWindow() {
       this.windowWidth = this.representation.getWindowWidth();
       this.windowLevel = this.representation.getWindowLevel();
-      console.log(
-        `bindWindow: w = ${this.windowWidth}, l = ${this.windowLevel}`
-      );
       this.modifiedSubscription = this.representation.onModified(() => {
-        console.log(
-          `representation modified: w = ${this.windowWidth}, l = ${this.windowLevel}`
-        );
-        // const ratio =
-        //   (this.representation.getWindowWidth() - this.windowWidthDomain.min) /
-        //   (this.windowWidthDomain.max - this.windowWidthDomain.min);
-        console.log(
-          `width min: ${this.windowWidthDomain.min}, width max: ${this.windowWidthDomain.max}`
-        );
-        console.log(
-          `level min: ${this.windowLevelDomain.min}, level max: ${this.windowLevelDomain.max}`
-        );
-        // this.windowWidth = this.representation.getWindowWidth();
-        // this.windowLevel = this.representation.getWindowLevel();
+        this.windowWidth = this.representation.getWindowWidth();
+        this.windowLevel = this.representation.getWindowLevel();
       });
     },
     increaseWindowWidth() {
diff --git a/client/src/store/index.js b/client/src/store/index.js
index f96bc70..335a16d 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -19,10 +19,15 @@ var readDataQueue = [];
 const store = new Vuex.Store({
   state: {
     drawer: false,
-    sessionTree: null,
+    experimentIds: [],
+    experiments: {},
+    experimentSessions: {},
+    sessions: {},
+    sessionDatasets: {},
+    datasets: {},
     proxyManager: null,
     vtkViews: [],
-    currentDataset: null,
+    currentDatasetId: null,
     loadingDataset: false,
     errorLoadingDataset: false,
     currentScreenshot: null,
@@ -31,45 +36,42 @@ const store = new Vuex.Store({
     sessionCachedPercentage: 0
   },
   getters: {
-    currentDatasetId(state) {
-      return state.currentDataset ? state.currentDataset["_id"] : null;
-    },
-    allDatasets(state) {
-      console.log("allDatasets");
-      if (!state.sessionTree) {
-        return;
-      }
-      return _.flatMap(state.sessionTree, experiment => {
-        return _.flatMap(experiment.sessions, session => session.datasets);
-      });
+    currentDataset(state) {
+      return state.currentDatasetId
+        ? state.datasets[state.currentDatasetId]
+        : null;
     },
-    previousDataset(state) {
-      return state.currentDataset ? state.currentDataset.previousDataset : null;
+    previousDataset(state, getters) {
+      return getters.currentDataset
+        ? getters.currentDataset.previousDataset
+        : null;
     },
-    nextDataset(state) {
-      return state.currentDataset ? state.currentDataset.nextDataset : null;
+    nextDataset(state, getters) {
+      return getters.currentDataset ? getters.currentDataset.nextDataset : null;
     },
-    getDataset(state, getters) {
-      console.log("getDataset");
+    getDataset(state) {
       return function(datasetId) {
-        console.log("inner getDataset");
-        if (!datasetId || !getters.allDatasets) {
+        if (!datasetId || !state.datasets[datasetId]) {
           return;
         }
-        return getters.allDatasets.find(dataset => dataset._id === datasetId);
+        return state.datasets[datasetId];
       };
     },
-    currentSession(state) {
-      return state.currentDataset ? state.currentDataset.session : null;
+    currentSession(state, getters) {
+      if (getters.currentDataset) {
+        const curSessionId = getters.currentDataset.session;
+        return state.sessions[curSessionId];
+      }
+      return null;
     },
-    firstDatasetInPreviousSession(state) {
-      return state.currentDataset
-        ? state.currentDataset.firstDatasetInPreviousSession
+    firstDatasetInPreviousSession(state, getters) {
+      return getters.currentDataset
+        ? getters.currentDataset.firstDatasetInPreviousSession
         : null;
     },
-    firstDatasetInNextSession(state) {
-      return state.currentDataset
-        ? state.currentDataset.firstDatasetInNextSession
+    firstDatasetInNextSession(state, getters) {
+      return getters.currentDataset
+        ? getters.currentDataset.firstDatasetInNextSession
         : null;
     },
     siteMap(state) {
@@ -111,54 +113,87 @@ const store = new Vuex.Store({
   actions: {
     async loadSessions({ state }) {
       let { data: sessionTree } = await girder.rest.get(`miqa/sessions`);
-      state.sessionTree = sessionTree.map(experiment => {
-        return {
-          ...experiment,
-          ...{
-            sessions: experiment.sessions.sort(
-              (a, b) => a.meta.scanId - b.meta.scanId
-            )
-          }
-        };
-      });
 
-      // Build navigation links throughout the dataset to improve performance.
+      console.log("breakpoint sessionTree");
 
-      // First iterate through the session tree forwards to build up "previous" links
-      let previousDataset = null;
+      // Build navigation links throughout the dataset to improve performance.
       let firstInPrev = null;
 
-      for (let i = 0; i < state.sessionTree.length; i++) {
-        let experiment = state.sessionTree[i];
-        for (let j = 0; j < experiment.sessions.length; j++) {
-          let session = experiment.sessions[j];
+      for (let i = 0; i < sessionTree.length; i++) {
+        let experiment = sessionTree[i];
+        let experimentId = experiment.folderId;
+
+        state.experimentIds.push(experimentId);
+        state.experiments[experimentId] = {
+          id: experimentId,
+          folderId: experimentId,
+          name: experiment.name
+        };
+
+        let sessions = experiment.sessions.sort(
+          (a, b) => a.meta.scanId - b.meta.scanId
+        );
+
+        state.experimentSessions[experimentId] = [];
+
+        for (let j = 0; j < sessions.length; j++) {
+          let session = sessions[j];
+          let sessionId = session.folderId;
+
+          state.experimentSessions[experimentId].push(sessionId);
+          state.sessions[sessionId] = {
+            id: sessionId,
+            folderId: sessionId,
+            name: session.name,
+            meta: Object.assign({}, session.meta),
+            numDatasets: session.datasets.length,
+            cumulativeRange: [Number.MAX_VALUE, -Number.MAX_VALUE], // [null, null],
+            experiment: experimentId
+          };
+
+          state.sessionDatasets[sessionId] = [];
+
           for (let k = 0; k < session.datasets.length; k++) {
             let dataset = session.datasets[k];
-            dataset.session = session;
-            dataset.index = k;
-            dataset.previousDataset = previousDataset;
-            dataset.firstDatasetInPreviousSession = firstInPrev;
-            previousDataset = dataset;
+            let datasetId = dataset._id;
+
+            state.sessionDatasets[sessionId].push(datasetId);
+            state.datasets[datasetId] = Object.assign(
+              {
+                cached: false
+              },
+              dataset
+            );
+            state.datasets[datasetId].session = sessionId;
+            state.datasets[datasetId].index = k;
+            state.datasets[datasetId].previousDataset =
+              k > 0 ? session.datasets[k - 1]._id : null;
+            state.datasets[datasetId].nextDataset =
+              k < session.datasets.length - 1
+                ? session.datasets[k + 1]._id
+                : null;
+            state.datasets[
+              datasetId
+            ].firstDatasetInPreviousSession = firstInPrev;
           }
-          firstInPrev = session.datasets[0];
+          firstInPrev = session.datasets[0]._id;
         }
       }
 
-      // Now iterate through the session tree backwards to build up "next" links
-      let nextDataset = null;
+      // Now iterate through the session tree backwards to build up the links
+      // to the "firstInNext" datasets.
       let firstInNext = null;
 
-      for (let i = state.sessionTree.length - 1; i >= 0; i--) {
-        let experiment = state.sessionTree[i];
+      for (let i = sessionTree.length - 1; i >= 0; i--) {
+        let experiment = sessionTree[i];
         for (let j = experiment.sessions.length - 1; j >= 0; j--) {
           let session = experiment.sessions[j];
           for (let k = session.datasets.length - 1; k >= 0; k--) {
-            let dataset = session.datasets[k];
-            dataset.nextDataset = nextDataset;
+            let datasetId = session.datasets[k]._id;
+            let dataset = state.datasets[datasetId];
             dataset.firstDatasetInNextSession = firstInNext;
-            nextDataset = dataset;
           }
-          firstInNext = session.datasets[0];
+          firstInNext = session.datasets[0]._id;
         }
       }
     },
@@ -166,27 +201,13 @@ const store = new Vuex.Store({
       if (!dataset) {
         throw new Error(`dataset id doesn't exist`);
       }
-      // console.log('debug here');
-      if (state.currentDataset === dataset) {
+      if (getters.currentDataset === dataset) {
         return;
       }
-      let windowLevel = null;
-      let windowWidth = null;
-      if (state.proxyManager) {
-        const repList = state.proxyManager.getRepresentations();
-        if (repList.length > 0) {
-          const rep = repList[0];
-          windowLevel = rep.getWindowLevel();
-          windowWidth = rep.getWindowWidth();
-          console.log(`
-            Current values are windowLevel = ${windowLevel}, windowWidth = ${windowWidth}
-          `);
-        }
-      }
       state.loadingDataset = true;
       state.errorLoadingDataset = false;
       var oldSession = getters.currentSession;
-      const newSession = dataset.session;
+      const newSession = state.sessions[dataset.session];
       var newProxyManager = false;
       if (oldSession !== newSession && state.proxyManager) {
         // At this moment. use new proxyManger between session could avoid a not showing issue.
@@ -198,13 +219,11 @@ const store = new Vuex.Store({
         });
         readDataQueue = [];
       }
-      let restoreWindowParams = true;
       if (!state.proxyManager || newProxyManager) {
         state.proxyManager = vtkProxyManager.newInstance({
           proxyConfiguration: proxy
         });
         state.vtkViews = [];
-        restoreWindowParams = false;
       }
 
       let sourceProxy = state.proxyManager.getActiveSource();
@@ -233,18 +252,9 @@ const store = new Vuex.Store({
         state.vtkViews = [];
         state.errorLoadingDataset = true;
       } finally {
-        state.currentDataset = dataset;
+        state.currentDatasetId = dataset._id;
         state.loadingDataset = false;
       }
-
-      if (restoreWindowParams && windowLevel) {
-        const rep = state.proxyManager.getRepresentations()[0];
-        rep.setWindowLevel(windowLevel);
-        rep.setWindowWidth(windowWidth);
-        console.log(`
-          Reset values to windowLevel = ${windowLevel}, windowWidth = ${windowWidth}
-        `);
-      }
     },
     async loadSites({ state }) {
       let { data: sites } = await girder.rest.get("miqa_setting/site");
@@ -265,19 +275,19 @@ store.watch(
       return;
     }
     if (oldValue) {
-      oldValue.datasets.forEach(dataset => {
-        fileCache.delete(dataset._id);
-        datasetCache.delete(dataset._id);
+      const oldSessionDatasets = store.state.sessionDatasets[oldValue.id];
+      oldSessionDatasets.forEach(datasetId => {
+        fileCache.delete(datasetId);
+        datasetCache.delete(datasetId);
       });
       readDataQueue = [];
     }
-    readDataQueue = newValue.datasets.map(dataset => {
-      return loadFile(dataset._id);
+    const newSessionDatasets = store.state.sessionDatasets[newValue.id];
+    readDataQueue = newSessionDatasets.map(datasetId => {
+      return loadFile(datasetId);
     });
     if (store.getters.firstDatasetInNextSession) {
-      readDataQueue.unshift(
-        loadFile(store.getters.firstDatasetInNextSession._id)
-      );
+      readDataQueue.unshift(loadFile(store.getters.firstDatasetInNextSession));
     }
     var concurrency = navigator.hardwareConcurrency + 1 || 2;
     calculateCachedPercentage();
@@ -332,6 +342,11 @@ function getData(id, file) {
     .then(readers => readers[0])
     .then(({ reader }) => {
       var imageData = reader.getOutputData();
+      const dataRange = imageData
+        .getPointData()
+        .getArray(0)
+        .getRange();
+      console.log(`vtkImageData array range ${dataRange}`);
       datasetCache.set(id, imageData);
       return imageData;
     });
@@ -352,10 +367,12 @@ var calculateCachedPercentage = _.throttle(() => {
   if (!store.getters.currentSession) {
     return;
   }
+  const currentSession = store.getters.currentSession;
+  const sessionDatasets = store.state.sessionDatasets[currentSession.id];
   var percentage =
-    store.getters.currentSession.datasets.reduce((total, dataset) => {
-      return total + (datasetCache.has(dataset._id) ? 1 : 0);
-    }, 0) / store.getters.currentSession.datasets.length;
+    sessionDatasets.reduce((total, datasetId) => {
+      return total + (datasetCache.has(datasetId) ? 1 : 0);
+    }, 0) / sessionDatasets.length;
   store.state.sessionCachedPercentage = percentage;
 }, 500);
 
diff --git a/client/src/views/Dataset.vue b/client/src/views/Dataset.vue
index da16bf8..8c70369 100644
--- a/client/src/views/Dataset.vue
+++ b/client/src/views/Dataset.vue
@@ -49,24 +49,28 @@ export default {
   }),
   computed: {
     ...mapState([
-      "currentDataset",
+      "currentDatasetId",
       "vtkViews",
       "loadingDataset",
       "errorLoadingDataset",
       "drawer",
       "screenshots",
-      "sessionCachedPercentage"
+      "sessionCachedPercentage",
+      "sessionDatasets"
     ]),
     ...mapGetters([
       "nextDataset",
       "getDataset",
-      "currentDatasetId",
+      "currentDataset",
       "currentSession",
       "previousDataset",
       "firstDatasetInPreviousSession",
       "firstDatasetInNextSession",
       "getSiteDisplayName"
     ]),
+    currentSessionDatasets() {
+      return this.sessionDatasets[this.currentSession.id];
+    },
     note() {
       if (this.currentSession && this.currentSession.meta) {
         return this.currentSession.meta.note;
@@ -89,7 +93,6 @@ export default {
     );
     await Promise.all([this.loadSessions(), this.loadSites()]);
     var datasetId = this.$route.params.datasetId;
-    console.log("Dataset.created(), about to call getDataset");
     var dataset = this.getDataset(datasetId);
     if (dataset) {
       await this.swapToDataset(dataset);
@@ -109,7 +112,6 @@ export default {
     }
   },
   async beforeRouteUpdate(to, from, next) {
-    console.log("beforeRouteUpdate(), about to call getDataset");
     let toDataset = this.getDataset(to.params.datasetId);
     let result = await this.beforeLeaveSession(toDataset);
     next(result);
@@ -244,7 +246,7 @@ export default {
       if (this.firstDatasetInNextSession) {
         var currentDatasetId = this.currentDatasetId;
         this.$router
-          .push(this.firstDatasetInNextSession._id)
+          .push(this.firstDatasetInNextSession)
           .catch(this.handleNavigationError);
         this.$snackbar({
           text: "Proceeded to next session",
@@ -264,8 +266,8 @@ export default {
       e.preventDefault();
     },
     debouncedDatasetSliderChange(index) {
-      var dataset = this.currentSession.datasets[index];
-      this.$router.push(dataset._id).catch(this.handleNavigationError);
+      var datasetId = this.currentSessionDatasets[index];
+      this.$router.push(datasetId).catch(this.handleNavigationError);
     }
   }
 };
@@ -350,14 +352,14 @@ export default {
                     small
                     class="primary--text my-0 elevation-2 smaller"
                     :disabled="!previousDataset"
-                    :to="previousDataset ? previousDataset._id : ''"
+                    :to="previousDataset ? previousDataset : ''"
                     v-mousetrap="{
                       bind: 'left',
                       disabled:
                         !previousDataset || unsavedDialog || loadingDataset,
                       handler: () =>
                         $router
-                          .push(previousDataset ? previousDataset._id : '')
+                          .push(previousDataset ? previousDataset : '')
                           .catch(this.handleNavigationError)
                     }"
                   >
@@ -367,7 +369,7 @@ export default {
                 <v-flex style="text-align: center;">
                   <span
                     >{{ currentDataset.index + 1 }} of
-                    {{ currentSession.datasets.length }}</span
+                    {{ currentSessionDatasets.length }}</span
                   >
                 </v-flex>
                 <v-flex shrink>
@@ -376,13 +378,13 @@ export default {
                     small
                     class="primary--text my-0 elevation-2 smaller"
                     :disabled="!nextDataset"
-                    :to="nextDataset ? nextDataset._id : ''"
+                    :to="nextDataset ? nextDataset : ''"
                     v-mousetrap="{
                       bind: 'right',
                       disabled: !nextDataset || unsavedDialog || loadingDataset,
                       handler: () =>
                         $router
-                          .push(nextDataset ? nextDataset._id : '')
+                          .push(nextDataset ? nextDataset : '')
                           .catch(this.handleNavigationError)
                     }"
                   >
@@ -400,11 +402,11 @@ export default {
                     thumb-size="28"
                     :min="1"
                     :max="
-                      currentSession.datasets.length === 1
+                      currentSessionDatasets.length === 1
                         ? 2
-                        : currentSession.datasets.length
+                        : currentSessionDatasets.length
                     "
-                    :disabled="currentSession.datasets.length === 1"
+                    :disabled="currentSessionDatasets.length === 1"
                     :height="24"
                     :value="currentDataset.index + 1"
                     @input="debouncedDatasetSliderChange($event - 1)"
@@ -423,7 +425,7 @@ export default {
                     :disabled="!firstDatasetInPreviousSession"
                     :to="
                       firstDatasetInPreviousSession
-                        ? firstDatasetInPreviousSession._id
+                        ? firstDatasetInPreviousSession
                         : ''
                     "
                   >
@@ -438,9 +440,7 @@ export default {
                     class="primary--text mb-0 elevation-2 smaller"
                     :disabled="!firstDatasetInNextSession"
                     :to="
-                      firstDatasetInNextSession
-                        ? firstDatasetInNextSession._id
-                        : ''
+                      firstDatasetInNextSession ? firstDatasetInNextSession : ''
                     "
                   >
                     <v-icon>fast_forward</v-icon>

From b0302b4d06ae06ccd5ebf83ecb077a45dfb7e8cd Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Fri, 9 Oct 2020 15:43:05 -0600
Subject: [PATCH 03/16] Wrap up flattening, add press+hold functionality to
 scan through time

---
 client/src/components/SessionsView.vue |  4 ++--
 client/src/store/index.js              |  9 +++++++-
 client/src/views/Dataset.vue           | 32 +++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/client/src/components/SessionsView.vue b/client/src/components/SessionsView.vue
index 06dda34..f6d7e1d 100644
--- a/client/src/components/SessionsView.vue
+++ b/client/src/components/SessionsView.vue
@@ -63,14 +63,14 @@ export default {
       <li
         v-for="experiment of orderedExperiments"
         class="body-2"
-        :key="experiment.id"
+        :key="`e.${experiment.id}`"
       >
         {{ experiment.name }}
         <ul class="sessions">
           <li
             v-for="session of sessionsForExperiment(experiment.id)"
             class="body-1"
-            :key="session.id"
+            :key="`s.${session.id}`"
             :class="{ current: session === currentSession }"
           >
             <v-btn
diff --git a/client/src/store/index.js b/client/src/store/index.js
index 335a16d..d5d2458 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -116,6 +116,13 @@ const store = new Vuex.Store({
 
       console.log("breakpoint sessionTree");
 
+      state.experimentIds = [];
+      state.experiments = {};
+      state.experimentSessions = {};
+      state.sessions = {};
+      state.sessionDatasets = {};
+      state.datasets = {};
+
       // Build navigation links throughout the dataset to improve performance.
       let firstInPrev = null;
 
@@ -346,7 +353,7 @@ function getData(id, file) {
         .getPointData()
         .getArray(0)
         .getRange();
-      console.log(`vtkImageData array range ${dataRange}`);
+      // console.log(`vtkImageData array range ${dataRange}`);
       datasetCache.set(id, imageData);
       return imageData;
     });
diff --git a/client/src/views/Dataset.vue b/client/src/views/Dataset.vue
index 8c70369..3590cee 100644
--- a/client/src/views/Dataset.vue
+++ b/client/src/views/Dataset.vue
@@ -268,7 +268,33 @@ export default {
     debouncedDatasetSliderChange(index) {
       var datasetId = this.currentSessionDatasets[index];
       this.$router.push(datasetId).catch(this.handleNavigationError);
-    }
+    },
+    updateImage(animTime) {
+      if (animTime - this.lastAnimTime >= 100) {
+        if (this.direction === 'back') {
+          this.$router
+            .push(this.previousDataset ? this.previousDataset : '')
+            .catch(this.handleNavigationError);
+        } else {
+          this.$router
+            .push(this.nextDataset ? this.nextDataset : '')
+            .catch(this.handleNavigationError);
+        }
+        this.lastAnimTime = animTime
+      }
+      if (this.scanning) {
+        window.requestAnimationFrame(this.updateImage)
+      }
+    },
+    handleMouseDown(direction) {
+      this.direction = direction;
+      this.scanning = true;
+      this.lastAnimTime = 0;
+      window.requestAnimationFrame(this.updateImage)
+    },
+    handleMouseUp() {
+      this.scanning = false;
+    },
   }
 };
 </script>
@@ -352,6 +378,8 @@ export default {
                     small
                     class="primary--text my-0 elevation-2 smaller"
                     :disabled="!previousDataset"
+                    v-on:mousedown="handleMouseDown('back')"
+                    v-on:mouseup="handleMouseUp()"
                     :to="previousDataset ? previousDataset : ''"
                     v-mousetrap="{
                       bind: 'left',
@@ -378,6 +406,8 @@ export default {
                     small
                     class="primary--text my-0 elevation-2 smaller"
                     :disabled="!nextDataset"
+                    v-on:mousedown="handleMouseDown('forward')"
+                    v-on:mouseup="handleMouseUp()"
                     :to="nextDataset ? nextDataset : ''"
                     v-mousetrap="{
                       bind: 'right',

From e0ec76d8165d0898104ced319f05f2c89a5ff989 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Thu, 15 Oct 2020 19:08:36 -0600
Subject: [PATCH 04/16] Improve scanning through timesteps

By making the vtk.js rendering synchronous when changing timesteps,
this change ensures the user moves through timesteps as fast as their
machine can handle, and that each time step finishes rendering before
moving to the next.  Also, the two mechanisms by which time step
scanning is achieved (left/right arrow keys and single arrow press+hold)
now use the same underlying functionality and thus behave the same.
---
 client/src/store/index.js    | 13 +++++++----
 client/src/views/Dataset.vue | 44 +++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/client/src/store/index.js b/client/src/store/index.js
index d5d2458..f1459e2 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -255,7 +255,9 @@ const store = new Vuex.Store({
         if (!state.vtkViews.length) {
           state.vtkViews = state.proxyManager.getViews();
         }
-      } catch {
+      } catch (err) {
+        console.log("Caught exception loading next image");
+        console.log(err);
         state.vtkViews = [];
         state.errorLoadingDataset = true;
       } finally {
@@ -306,9 +308,9 @@ store.watch(
 
 function prepareProxyManager(proxyManager) {
   if (!proxyManager.getViews().length) {
-    var handler = null;
+    // var handler = null;
     var update = () => {
-      proxyManager.renderAllViews();
+      proxyManager.renderAllViews(true);
       // proxyManager.autoAnimateViews();
     };
     ["View2D_Z:z", "View2D_X:x", "View2D_Y:y"].forEach(type => {
@@ -316,8 +318,9 @@ function prepareProxyManager(proxyManager) {
       view.setOrientationAxesVisibility(false);
       view.getRepresentations().forEach(representation => {
         representation.onModified(() => {
-          clearTimeout(handler);
-          handler = setTimeout(update);
+          // clearTimeout(handler);
+          // handler = setTimeout(update);
+          update()
         });
       });
     });
diff --git a/client/src/views/Dataset.vue b/client/src/views/Dataset.vue
index 3590cee..eb21900 100644
--- a/client/src/views/Dataset.vue
+++ b/client/src/views/Dataset.vue
@@ -45,7 +45,9 @@ export default {
     editingNoteDialog: false,
     editingNote: "",
     showNotePopup: false,
-    keyboardShortcutDialog: false
+    keyboardShortcutDialog: false,
+    scanning: false,
+    direction: 'forward',
   }),
   computed: {
     ...mapState([
@@ -269,8 +271,8 @@ export default {
       var datasetId = this.currentSessionDatasets[index];
       this.$router.push(datasetId).catch(this.handleNavigationError);
     },
-    updateImage(animTime) {
-      if (animTime - this.lastAnimTime >= 100) {
+    updateImage() {
+      if (this.scanning) {
         if (this.direction === 'back') {
           this.$router
             .push(this.previousDataset ? this.previousDataset : '')
@@ -280,17 +282,15 @@ export default {
             .push(this.nextDataset ? this.nextDataset : '')
             .catch(this.handleNavigationError);
         }
-        this.lastAnimTime = animTime
-      }
-      if (this.scanning) {
-        window.requestAnimationFrame(this.updateImage)
+        window.requestAnimationFrame(this.updateImage);
       }
     },
     handleMouseDown(direction) {
-      this.direction = direction;
-      this.scanning = true;
-      this.lastAnimTime = 0;
-      window.requestAnimationFrame(this.updateImage)
+      if (!this.scanning) {
+        this.direction = direction;
+        this.scanning = true;
+        window.requestAnimationFrame(this.updateImage);
+      }
     },
     handleMouseUp() {
       this.scanning = false;
@@ -380,15 +380,16 @@ export default {
                     :disabled="!previousDataset"
                     v-on:mousedown="handleMouseDown('back')"
                     v-on:mouseup="handleMouseUp()"
-                    :to="previousDataset ? previousDataset : ''"
                     v-mousetrap="{
                       bind: 'left',
                       disabled:
                         !previousDataset || unsavedDialog || loadingDataset,
-                      handler: () =>
-                        $router
-                          .push(previousDataset ? previousDataset : '')
-                          .catch(this.handleNavigationError)
+                      handler: {
+                        'keydown': function() {
+                          handleMouseDown('back');
+                        },
+                        'keyup': handleMouseUp,
+                      },
                     }"
                   >
                     <v-icon>keyboard_arrow_left</v-icon>
@@ -408,14 +409,15 @@ export default {
                     :disabled="!nextDataset"
                     v-on:mousedown="handleMouseDown('forward')"
                     v-on:mouseup="handleMouseUp()"
-                    :to="nextDataset ? nextDataset : ''"
                     v-mousetrap="{
                       bind: 'right',
                       disabled: !nextDataset || unsavedDialog || loadingDataset,
-                      handler: () =>
-                        $router
-                          .push(nextDataset ? nextDataset : '')
-                          .catch(this.handleNavigationError)
+                      handler: {
+                        'keydown': function() {
+                          handleMouseDown('forward');
+                        },
+                        'keyup': handleMouseUp,
+                      },
                     }"
                   >
                     <v-icon>chevron_right</v-icon>

From e91502a24842006bc79c56628d21cd65b3905ffe Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Thu, 22 Oct 2020 20:08:49 -0600
Subject: [PATCH 05/16] Update vtk.js dep to include synchronous render on view
 proxy

---
 client/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/package.json b/client/package.json
index bcd3e86..60542b6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -11,7 +11,7 @@
     "@girder/components": "git+https://github.com/girder/girder_web_components.git#v2.2.6",
     "bluebird": "^3.5.5",
     "itk": "^9.1.1",
-    "vtk.js": "^8.3.15",
+    "vtk.js": "14.16.5",
     "vue": "^2.6.10",
     "vue-async-computed": "^3.5.1",
     "vue-router": "3.4.3",

From 0753bc52cf732e2e6d2510883a1492eb012a4d48 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Thu, 22 Oct 2020 20:09:25 -0600
Subject: [PATCH 06/16] Cache more datasets (entire experiment instead of just
 one session)

---
 client/src/components/SessionsView.vue  |  14 ++-
 client/src/components/WindowControl.vue |  12 ++
 client/src/store/index.js               | 157 +++++++++++++++++++-----
 client/src/views/Dataset.vue            |  28 +++--
 4 files changed, 167 insertions(+), 44 deletions(-)

diff --git a/client/src/components/SessionsView.vue b/client/src/components/SessionsView.vue
index f6d7e1d..3cbfd29 100644
--- a/client/src/components/SessionsView.vue
+++ b/client/src/components/SessionsView.vue
@@ -21,7 +21,8 @@ export default {
       "experimentSessions",
       "sessions",
       "sessionDatasets",
-      "datasets"
+      "sessionsModifiedTime",
+      "datasets",
     ]),
     ...mapGetters(["currentSession"]),
     orderedExperiments() {
@@ -70,8 +71,11 @@ export default {
           <li
             v-for="session of sessionsForExperiment(experiment.id)"
             class="body-1"
-            :key="`s.${session.id}`"
-            :class="{ current: session === currentSession }"
+            :key="`s.${session.id}-${sessionsModifiedTime}`"
+            :class="{
+              current: session === currentSession,
+              cached: session.cached,
+            }"
           >
             <v-btn
               class="ml-0 px-1 session-name"
@@ -98,6 +102,10 @@ export default {
   background: rgb(206, 206, 206);
 }
 
+li.cached {
+  list-style-type: disc;
+}
+
 ul.experiment {
   list-style: none;
 }
diff --git a/client/src/components/WindowControl.vue b/client/src/components/WindowControl.vue
index b16084f..7157735 100644
--- a/client/src/components/WindowControl.vue
+++ b/client/src/components/WindowControl.vue
@@ -42,9 +42,17 @@ export default {
     bindWindow() {
       this.windowWidth = this.representation.getWindowWidth();
       this.windowLevel = this.representation.getWindowLevel();
+      console.log("WindowControl subscribing representation 'modified' event");
       this.modifiedSubscription = this.representation.onModified(() => {
         this.windowWidth = this.representation.getWindowWidth();
         this.windowLevel = this.representation.getWindowLevel();
+        // console.log(`reprensentation modified, width: ${this.windowWidth} (range: [
+        //   ${this.windowWidthDomain.min}, ${this.windowWidthDomain.max}
+        // ]), new level: ${this.windowLevel} (range: [
+        //   ${this.windowLevelDomain.min}, ${this.windowLevelDomain.max}
+        // ])`);
+        // const arrayRange = this.representation.getInputDataSet().getPointData().getArray(0).getRange();
+        // console.log(`Image data array range: [${arrayRange[0]}, ${arrayRange[1]}]`);
       });
     },
     increaseWindowWidth() {
@@ -91,6 +99,8 @@ export default {
           class="mr-4 verticalOffset"
           hide-details
           label="Window"
+          thumb-label
+          :thumb-size=48
           :min="windowWidthDomain.min"
           :max="windowWidthDomain.max"
           :step="windowWidthDomain.step"
@@ -117,6 +127,8 @@ export default {
           class="mr-4 verticalOffset"
           hide-details
           label="Level"
+          thumb-label
+          :thumb-size=48
           :min="windowLevelDomain.min"
           :max="windowLevelDomain.max"
           :step="windowLevelDomain.step"
diff --git a/client/src/store/index.js b/client/src/store/index.js
index f1459e2..d407349 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -33,7 +33,8 @@ const store = new Vuex.Store({
     currentScreenshot: null,
     screenshots: [],
     sites: null,
-    sessionCachedPercentage: 0
+    sessionCachedPercentage: 0,
+    sessionsModifiedTime: (new Date()).toISOString(),
   },
   getters: {
     currentDataset(state) {
@@ -64,6 +65,29 @@ const store = new Vuex.Store({
       }
       return null;
     },
+    currentExperiment(state, getters) {
+      if (getters.currentSession) {
+        const curExperimentId = getters.currentSession.experiment;
+        return state.experiments[curExperimentId];
+      }
+      return null;
+    },
+    experimentDatasets(state, getters) {
+      return function(expId) {
+        const experimentSessions = state.experimentSessions[expId];
+        const expDatasets = [];
+        experimentSessions.forEach(sessionId => {
+          const sessionDatasets = state.sessionDatasets[sessionId];
+          sessionDatasets.forEach(datasetId => {
+            expDatasets.push(datasetId);
+          });
+        });
+        return expDatasets;
+      }
+    },
+    getTodoById: (state) => (id) => {
+      return state.todos.find(todo => todo.id === id)
+    },
     firstDatasetInPreviousSession(state, getters) {
       return getters.currentDataset
         ? getters.currentDataset.firstDatasetInPreviousSession
@@ -74,6 +98,30 @@ const store = new Vuex.Store({
         ? getters.currentDataset.firstDatasetInNextSession
         : null;
     },
+    firstDatasetInPreviousExeriment(state, getters) {
+      if (getters.currentExperiment) {
+        const expIdx = getters.currentExperiment.index;
+        if (expIdx >= 1) {
+          const prevExp = state.experiments[state.experimentIds[expIdx - 1]];
+          const prevExpSessions = state.experimentSessions[prevExp.id];
+          const prevExpSessionDatasets = state.sessionDatasets[prevExpSessions[0].id];
+          return prevExpSessionDatasets[0];
+        }
+      }
+      return null;
+    },
+    firstDatasetInNextExeriment(state, getters) {
+      if (getters.currentExperiment) {
+        const expIdx = getters.currentExperiment.index;
+        if (expIdx < (state.experimentIds.length - 1)) {
+          const nextExp = state.experiments[state.experimentIds[expIdx + 1]];
+          const nextExpSessions = state.experimentSessions[nextExp.id];
+          const nextExpSessionDatasets = state.sessionDatasets[nextExpSessions[0].id];
+          return nextExpSessionDatasets[0];
+        }
+      }
+      return null;
+    },
     siteMap(state) {
       if (!state.sites) {
         return {};
@@ -134,7 +182,8 @@ const store = new Vuex.Store({
         state.experiments[experimentId] = {
           id: experimentId,
           folderId: experimentId,
-          name: experiment.name
+          name: experiment.name,
+          index: i,
         };
 
         let sessions = experiment.sessions.sort(
@@ -155,9 +204,12 @@ const store = new Vuex.Store({
             meta: Object.assign({}, session.meta),
             numDatasets: session.datasets.length,
             cumulativeRange: [Number.MAX_VALUE, -Number.MAX_VALUE], // [null, null],
-            experiment: experimentId
+            experiment: experimentId,
+            cached: false,
           };
 
+          state.sessionsModifiedTime = (new Date()).toISOString();
+
           state.sessionDatasets[sessionId] = [];
 
           for (let k = 0; k < session.datasets.length; k++) {
@@ -165,12 +217,7 @@ const store = new Vuex.Store({
             let datasetId = dataset._id;
 
             state.sessionDatasets[sessionId].push(datasetId);
-            state.datasets[datasetId] = Object.assign(
-              {
-                cached: false
-              },
-              dataset
-            );
+            state.datasets[datasetId] = Object.assign({}, dataset);
             state.datasets[datasetId].session = sessionId;
             state.datasets[datasetId].index = k;
             state.datasets[datasetId].previousDataset =
@@ -247,6 +294,7 @@ const store = new Vuex.Store({
       // This try catch and within logic are mainly for handling data doesn't exist issue
       try {
         var imagedata = await loadFileAndGetData(dataset._id);
+        // console.log("swapping datasets, here we setInputData()");
         sourceProxy.setInputData(imagedata);
         if (needPrep || !state.proxyManager.getViews().length) {
           prepareProxyManager(state.proxyManager);
@@ -272,9 +320,10 @@ const store = new Vuex.Store({
   }
 });
 
-// cache datasets of current session and first dataset of next session
+// cache datasets associated with sessions of current experiment and first
+// dataset of next experiment
 store.watch(
-  (state, getters) => getters.currentSession,
+  (state, getters) => getters.currentExperiment,
   (newValue, oldValue) => {
     if (
       !newValue ||
@@ -284,19 +333,34 @@ store.watch(
       return;
     }
     if (oldValue) {
-      const oldSessionDatasets = store.state.sessionDatasets[oldValue.id];
-      oldSessionDatasets.forEach(datasetId => {
-        fileCache.delete(datasetId);
-        datasetCache.delete(datasetId);
+      const oldExperimentSessions = store.state.experimentSessions[oldValue.id];
+      oldExperimentSessions.forEach(sessionId => {
+        const sessionDatasets = store.state.sessionDatasets[sessionId];
+        sessionDatasets.forEach(datasetId => {
+          fileCache.delete(datasetId);
+          datasetCache.delete(datasetId);
+        });
+        const session = store.state.sessions[sessionId]
+        console.log(`session ${session.name} is now deleted from cache`);
+        session.cached = false;
+        store.state.sessionsModifiedTime = (new Date()).toISOString();
       });
       readDataQueue = [];
     }
-    const newSessionDatasets = store.state.sessionDatasets[newValue.id];
-    readDataQueue = newSessionDatasets.map(datasetId => {
-      return loadFile(datasetId);
+    readDataQueue = [];
+    const newExperimentSessions = store.state.experimentSessions[newValue.id];
+    newExperimentSessions.forEach(sessionId => {
+      const sessionDatasets = store.state.sessionDatasets[sessionId];
+      sessionDatasets.forEach(datasetId => {
+        readDataQueue.push(loadFile(datasetId));
+      });
+      readDataQueue.push({
+        status: 'sessionLoaded',
+        sessionId,
+      });
     });
     if (store.getters.firstDatasetInNextSession) {
-      readDataQueue.unshift(loadFile(store.getters.firstDatasetInNextSession));
+      readDataQueue.unshift(loadFile(store.getters.firstDatasetInNextExperiment));
     }
     var concurrency = navigator.hardwareConcurrency + 1 || 2;
     calculateCachedPercentage();
@@ -318,9 +382,14 @@ function prepareProxyManager(proxyManager) {
       view.setOrientationAxesVisibility(false);
       view.getRepresentations().forEach(representation => {
         representation.onModified(() => {
+          // console.log(`nuther representation modified handler (${
+          //   type
+          // }), will proxyManager.renderAllViews()`);
+          // console.log(view);
           // clearTimeout(handler);
           // handler = setTimeout(update);
-          update()
+          // update();
+          view.render(true);
         });
       });
     });
@@ -358,6 +427,7 @@ function getData(id, file) {
         .getRange();
       // console.log(`vtkImageData array range ${dataRange}`);
       datasetCache.set(id, imageData);
+      expandSessionRange(id, dataRange);
       return imageData;
     });
 }
@@ -374,15 +444,27 @@ function loadFileAndGetData(id) {
 }
 
 var calculateCachedPercentage = _.throttle(() => {
-  if (!store.getters.currentSession) {
+  if (!store.getters.currentExperiment) {
     return;
   }
-  const currentSession = store.getters.currentSession;
-  const sessionDatasets = store.state.sessionDatasets[currentSession.id];
+
+  const currentExpId = store.getters.currentExperiment.id;
+
+  const expDatasets = store.getters.experimentDatasets(currentExpId);
+
+  // const experimentSessions = store.state.experimentSessions[currentExpId];
+  // const expDatasets = [];
+  // experimentSessions.forEach(sessionId => {
+  //   const sessionDatasets = store.state.sessionDatasets[sessionId];
+  //   sessionDatasets.forEach(datasetId => {
+  //     expDatasets.push(datasetId);
+  //   });
+  // });
+
   var percentage =
-    sessionDatasets.reduce((total, datasetId) => {
+    expDatasets.reduce((total, datasetId) => {
       return total + (datasetCache.has(datasetId) ? 1 : 0);
-    }, 0) / sessionDatasets.length;
+    }, 0) / expDatasets.length;
   store.state.sessionCachedPercentage = percentage;
 }, 500);
 
@@ -391,9 +473,17 @@ async function startReaderWorker() {
   if (!data) {
     return;
   }
-  var { id, fileP } = data;
-  var file = await fileP;
-  await getData(id, file);
+  if ('status' in data) {
+    const { status, sessionId } = data;
+    const session = store.state.sessions[sessionId];
+    session.cached = true;
+    store.state.sessionsModifiedTime = (new Date()).toISOString();
+    console.log(`Session ${session.name} is now loaded into cache`);
+  } else {
+    var { id, fileP } = data;
+    var file = await fileP;
+    await getData(id, file);
+  }
   calculateCachedPercentage();
   if (readDataQueue.length) {
     setTimeout(() => {
@@ -402,4 +492,15 @@ async function startReaderWorker() {
   }
 }
 
+function expandSessionRange(datasetId, dataRange) {
+  const sessionId = store.state.datasets[datasetId].session;
+  const session = store.state.sessions[sessionId];
+  if (dataRange[0] < session.cumulativeRange[0]) {
+    session.cumulativeRange[0] = dataRange[0];
+  }
+  if (dataRange[1] > session.cumulativeRange[1]) {
+    session.cumulativeRange[1] = dataRange[1];
+  }
+}
+
 export default store;
diff --git a/client/src/views/Dataset.vue b/client/src/views/Dataset.vue
index eb21900..450206f 100644
--- a/client/src/views/Dataset.vue
+++ b/client/src/views/Dataset.vue
@@ -47,7 +47,7 @@ export default {
     showNotePopup: false,
     keyboardShortcutDialog: false,
     scanning: false,
-    direction: 'forward',
+    direction: "forward"
   }),
   computed: {
     ...mapState([
@@ -140,6 +140,7 @@ export default {
       } else if (isNavigationFailure(fail, NavigationFailureType.duplicated)) {
         failureType = "duplicated";
       }
+      this.scanning = false;
       console.log(`Caught navigation error (${failureType})`);
     },
     async beforeLeaveSession(toDataset) {
@@ -273,28 +274,29 @@ export default {
     },
     updateImage() {
       if (this.scanning) {
-        if (this.direction === 'back') {
+        if (this.direction === "back") {
           this.$router
-            .push(this.previousDataset ? this.previousDataset : '')
+            .push(this.previousDataset ? this.previousDataset : "")
             .catch(this.handleNavigationError);
         } else {
           this.$router
-            .push(this.nextDataset ? this.nextDataset : '')
+            .push(this.nextDataset ? this.nextDataset : "")
             .catch(this.handleNavigationError);
         }
-        window.requestAnimationFrame(this.updateImage);
+        this.nextAnimRequest = window.requestAnimationFrame(this.updateImage);
       }
     },
     handleMouseDown(direction) {
       if (!this.scanning) {
         this.direction = direction;
         this.scanning = true;
-        window.requestAnimationFrame(this.updateImage);
+        this.nextAnimRequest = window.requestAnimationFrame(this.updateImage);
       }
     },
     handleMouseUp() {
       this.scanning = false;
-    },
+      window.cancelAnimationFrame(this.nextAnimRequest);
+    }
   }
 };
 </script>
@@ -385,11 +387,11 @@ export default {
                       disabled:
                         !previousDataset || unsavedDialog || loadingDataset,
                       handler: {
-                        'keydown': function() {
+                        keydown: function() {
                           handleMouseDown('back');
                         },
-                        'keyup': handleMouseUp,
-                      },
+                        keyup: handleMouseUp
+                      }
                     }"
                   >
                     <v-icon>keyboard_arrow_left</v-icon>
@@ -413,11 +415,11 @@ export default {
                       bind: 'right',
                       disabled: !nextDataset || unsavedDialog || loadingDataset,
                       handler: {
-                        'keydown': function() {
+                        keydown: function() {
                           handleMouseDown('forward');
                         },
-                        'keyup': handleMouseUp,
-                      },
+                        keyup: handleMouseUp
+                      }
                     }"
                   >
                     <v-icon>chevron_right</v-icon>

From 9603a86865b0cb65300d2bc204e490e1236afa2e Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Thu, 22 Oct 2020 21:07:19 -0600
Subject: [PATCH 07/16] Allow user to supply import file in csv format

This provides support for the previously used csv file format, as
well as the new json format.  If a csv file is provided, it is
converted to the json format before loading.
---
 client/src/components/JSONConfig.vue          |   2 +-
 server/miqa_server/conversion/__init__.py     |   0
 .../conversion}/csv_to_json.py                |  24 ++-
 server/miqa_server/session.py                 | 202 ++++++++++--------
 4 files changed, 126 insertions(+), 102 deletions(-)
 create mode 100644 server/miqa_server/conversion/__init__.py
 rename server/{scripts => miqa_server/conversion}/csv_to_json.py (91%)

diff --git a/client/src/components/JSONConfig.vue b/client/src/components/JSONConfig.vue
index 7cb049c..b46628e 100644
--- a/client/src/components/JSONConfig.vue
+++ b/client/src/components/JSONConfig.vue
@@ -55,7 +55,7 @@ export default {
           name="miqa-json-importpath"
           :rules="[
             v => !!v || 'path is required',
-            v => v.endsWith('.json') || 'Needs to be a json file'
+            v => v.endsWith('.json') || v.endsWith('.csv') || 'Needs to be a json or csv file'
           ]"
           :error-messages="importpathError"
       /></v-flex>
diff --git a/server/miqa_server/conversion/__init__.py b/server/miqa_server/conversion/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/server/scripts/csv_to_json.py b/server/miqa_server/conversion/csv_to_json.py
similarity index 91%
rename from server/scripts/csv_to_json.py
rename to server/miqa_server/conversion/csv_to_json.py
index 4ae889e..faf9cac 100644
--- a/server/scripts/csv_to_json.py
+++ b/server/miqa_server/conversion/csv_to_json.py
@@ -18,13 +18,8 @@ def find_common_prefix(p1, p2):
     return p1[:firstNotMatch]
 
 
-def convert_standard_csv_to_json(csvFilePath, jsonFilePath):
-    print('Reading input csv from {0}'.format(csvFilePath))
-
-    with open(csvFilePath) as fd:
-        csv_content = fd.read()
-
-    csvReader = csv.DictReader(io.StringIO(csv_content))
+def csvContentToJsonObject(csvContent):
+    csvReader = csv.DictReader(io.StringIO(csvContent))
 
     print('field names: {0}'.format(csvReader.fieldnames))
 
@@ -81,10 +76,21 @@ def convert_standard_csv_to_json(csvFilePath, jsonFilePath):
     outputObject['experiments'] = experiments
     outputObject['sites'] = [{'id': site} for site in site_set]
 
+    return outputObject
+
+
+def csvToJson(csvFilePath, jsonFilePath):
+    print('Reading input csv from {0}'.format(csvFilePath))
+
+    with open(csvFilePath) as fd:
+        csvContent = fd.read()
+
+    jsonObject = csvContentToJsonObject(csvContent)
+
     print('Writing output json to {0}'.format(jsonFilePath))
 
     with open(jsonFilePath, 'w') as fd:
-        json.dump(outputObject, fd)
+        json.dump(jsonObject, fd)
 
 
 if __name__ == '__main__':
@@ -115,4 +121,4 @@ def convert_standard_csv_to_json(csvFilePath, jsonFilePath):
         nameWithoutExtension = fileName[:fileName.rindex('.')]
         outputFilePath = os.path.join(filePath, '{0}.json'.format(nameWithoutExtension))
 
-    convert_standard_csv_to_json(inputFilePath, outputFilePath)
+    csvToJson(inputFilePath, outputFilePath)
diff --git a/server/miqa_server/session.py b/server/miqa_server/session.py
index 6d999d3..43646ac 100644
--- a/server/miqa_server/session.py
+++ b/server/miqa_server/session.py
@@ -18,6 +18,7 @@
 from girder.models.setting import Setting
 from girder.utility.progress import noProgress
 
+from .conversion.csv_to_json import csvContentToJsonObject
 from .setting import fileWritable, tryAddSites
 from .constants import exportpathKey, importpathKey
 from .schema.data_import import schema
@@ -102,106 +103,123 @@ def dataImport(self, params):
         importpath = os.path.expanduser(Setting().get(importpathKey))
         if not os.path.isfile(importpath):
             raise RestException('import path does not exist ({0}'.format(importpath), code=404)
-        with open(importpath) as json_file:
-            json_content = json.load(json_file)
-            try:
-                validate(json_content, schema)
-            except JSONValidationError as inst:
-                return {
-                    "error": 'Invalid JSON file: '.format(inst.message),
-                    "success": successCount,
-                    "failed": failedCount
-                }
-            existingSessionsFolder = self.findSessionsFolder(user)
-            if existingSessionsFolder:
-                existingSessionsFolder['name'] = 'sessions_' + \
-                    datetime.datetime.now().strftime("%Y-%m-%d %I:%M:%S %p")
-                Folder().save(existingSessionsFolder)
-            sessionsFolder = self.findSessionsFolder(user, True)
-            Item().createItem('json', user, sessionsFolder, description=json.dumps(json_content))
 
-            datasetRoot = json_content['data_root']
-            experiments = json_content['experiments']
-            sites = json_content['sites']
+        json_content = None
 
-            successCount = 0
-            failedCount = 0
-            sites = set()
-            for scan in json_content['scans']:
-                experimentId = scan['experiment_id']
-                experimentNote = ''
-                for experiment in experiments:
-                    if experiment['id'] == experimentId:
-                        experimentNote = experiment['note']
-                scanPath = scan['path']
-                site = scan['site_id']
-                sites.add(site)
-                scanId = scan['id']
-                scanType = scan['type']
-                scanName = scanId+'_'+scanType
-                niftiFolder = os.path.expanduser(os.path.join(datasetRoot, scanPath))
-                if not os.path.isdir(niftiFolder):
-                    failedCount += 1
-                    continue
-                experimentFolder = Folder().createFolder(
-                    sessionsFolder, experimentId, parentType='folder', reuseExisting=True)
-                scanFolder = Folder().createFolder(
-                    experimentFolder, scanName, parentType='folder', reuseExisting=True)
-                meta = {
-                    'experimentId': experimentId,
-                    'experimentNote': experimentNote,
-                    'site': site,
-                    'scanId': scanId,
-                    'scanType': scanType
-                }
-                # Merge note and rating if record exists
-                if existingSessionsFolder:
-                    existingMeta = self.tryGetExistingSessionMeta(
-                        existingSessionsFolder, experimentId, scanName)
-                    if(existingMeta and (existingMeta.get('note', None) or existingMeta.get('rating', None))):
-                        meta['note'] = existingMeta.get('note', None)
-                        meta['rating'] = existingMeta.get('rating', None)
-                Folder().setMetadata(scanFolder, meta)
-                currentAssetstore = Assetstore().getCurrent()
-                if 'images' in scan:
-                    scanImages = scan['images']
-                    # Import images one at a time because the user provided a list
-                    for scanImage in scanImages:
-                        absImagePath = os.path.join(niftiFolder, scanImage)
-                        Assetstore().importData(
-                            currentAssetstore, parent=scanFolder, parentType='folder', params={
-                                'fileIncludeRegex': '^{0}$'.format(scanImage),
-                                'importPath': niftiFolder,
-                            }, progress=noProgress, user=user, leafFoldersAsItems=False)
-                    imageOrderDescription = {
-                        'orderDescription': {
-                            'images': scanImages
-                        }
+        if importpath.endswith('.csv'):
+            with open(importpath) as fd:
+                csv_content = fd.read()
+                try:
+                    json_content = csvContentToJsonObject(csv_content)
+                    validate(json_content, schema)
+                except (JSONValidationError, Exception) as inst:
+                    return {
+                        "error": 'Invalid CSV file: {0}'.format(inst.message),
+                        "success": successCount,
+                        "failed": failedCount
                     }
-                else:
-                    scanImagePattern = scan['imagePattern']
-                    # Import all images in directory at once because user provide a file pattern
+        else:
+            with open(importpath) as json_file:
+                json_content = json.load(json_file)
+                try:
+                    validate(json_content, schema)
+                except JSONValidationError as inst:
+                    return {
+                        "error": 'Invalid JSON file: {0}'.format(inst.message),
+                        "success": successCount,
+                        "failed": failedCount
+                    }
+
+        existingSessionsFolder = self.findSessionsFolder(user)
+        if existingSessionsFolder:
+            existingSessionsFolder['name'] = 'sessions_' + \
+                datetime.datetime.now().strftime("%Y-%m-%d %I:%M:%S %p")
+            Folder().save(existingSessionsFolder)
+        sessionsFolder = self.findSessionsFolder(user, True)
+        Item().createItem('json', user, sessionsFolder, description=json.dumps(json_content))
+
+        datasetRoot = json_content['data_root']
+        experiments = json_content['experiments']
+        sites = json_content['sites']
+
+        successCount = 0
+        failedCount = 0
+        sites = set()
+        for scan in json_content['scans']:
+            experimentId = scan['experiment_id']
+            experimentNote = ''
+            for experiment in experiments:
+                if experiment['id'] == experimentId:
+                    experimentNote = experiment['note']
+            scanPath = scan['path']
+            site = scan['site_id']
+            sites.add(site)
+            scanId = scan['id']
+            scanType = scan['type']
+            scanName = scanId+'_'+scanType
+            niftiFolder = os.path.expanduser(os.path.join(datasetRoot, scanPath))
+            if not os.path.isdir(niftiFolder):
+                failedCount += 1
+                continue
+            experimentFolder = Folder().createFolder(
+                sessionsFolder, experimentId, parentType='folder', reuseExisting=True)
+            scanFolder = Folder().createFolder(
+                experimentFolder, scanName, parentType='folder', reuseExisting=True)
+            meta = {
+                'experimentId': experimentId,
+                'experimentNote': experimentNote,
+                'site': site,
+                'scanId': scanId,
+                'scanType': scanType
+            }
+            # Merge note and rating if record exists
+            if existingSessionsFolder:
+                existingMeta = self.tryGetExistingSessionMeta(
+                    existingSessionsFolder, experimentId, scanName)
+                if(existingMeta and (existingMeta.get('note', None) or existingMeta.get('rating', None))):
+                    meta['note'] = existingMeta.get('note', None)
+                    meta['rating'] = existingMeta.get('rating', None)
+            Folder().setMetadata(scanFolder, meta)
+            currentAssetstore = Assetstore().getCurrent()
+            if 'images' in scan:
+                scanImages = scan['images']
+                # Import images one at a time because the user provided a list
+                for scanImage in scanImages:
+                    absImagePath = os.path.join(niftiFolder, scanImage)
                     Assetstore().importData(
                         currentAssetstore, parent=scanFolder, parentType='folder', params={
-                            'fileIncludeRegex': scanImagePattern,
+                            'fileIncludeRegex': '^{0}$'.format(scanImage),
                             'importPath': niftiFolder,
                         }, progress=noProgress, user=user, leafFoldersAsItems=False)
-                    imageOrderDescription = {
-                        'orderDescription': {
-                            'imagePattern': scanImagePattern
-                        }
+                imageOrderDescription = {
+                    'orderDescription': {
+                        'images': scanImages
                     }
-                Item().createItem(name='imageOrderDescription',
-                                  creator=user,
-                                  folder=scanFolder,
-                                  reuseExisting=True,
-                                  description=json.dumps(imageOrderDescription))
-                successCount += 1
-            tryAddSites(sites, self.getCurrentUser())
-            return {
-                "success": successCount,
-                "failed": failedCount
-            }
+                }
+            else:
+                scanImagePattern = scan['imagePattern']
+                # Import all images in directory at once because user provide a file pattern
+                Assetstore().importData(
+                    currentAssetstore, parent=scanFolder, parentType='folder', params={
+                        'fileIncludeRegex': scanImagePattern,
+                        'importPath': niftiFolder,
+                    }, progress=noProgress, user=user, leafFoldersAsItems=False)
+                imageOrderDescription = {
+                    'orderDescription': {
+                        'imagePattern': scanImagePattern
+                    }
+                }
+            Item().createItem(name='imageOrderDescription',
+                              creator=user,
+                              folder=scanFolder,
+                              reuseExisting=True,
+                              description=json.dumps(imageOrderDescription))
+            successCount += 1
+        tryAddSites(sites, self.getCurrentUser())
+        return {
+            "success": successCount,
+            "failed": failedCount
+        }
 
     @access.user
     @autoDescribeRoute(

From f16a58fcca4a03794b2f7eecfd2d338dfddd2c6a Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Wed, 28 Oct 2020 10:54:58 -0600
Subject: [PATCH 08/16] Move vue-utilities dep into project, fix lint errors

---
 client/package-lock.json                      | 1737 ++++++++---------
 client/package.json                           |    2 +-
 client/src/components/JSONConfig.vue          |    5 +-
 client/src/components/SessionsView.vue        |    4 +-
 client/src/components/WindowControl.vue       |    4 +-
 client/src/main.js                            |    6 +-
 client/src/store/index.js                     |   67 +-
 .../vue-utilities/prompt-service/Prompt.vue   |   53 +
 .../vue-utilities/prompt-service/README.md    |   47 +
 .../src/vue-utilities/prompt-service/index.js |   48 +
 .../vue-utilities/snackbar-service/README.md  |   53 +
 .../snackbar-service/Snackbar.vue             |   28 +
 .../vue-utilities/snackbar-service/index.js   |   52 +
 .../src/vue-utilities/v-mousetrap/README.md   |   44 +
 client/src/vue-utilities/v-mousetrap/index.js |   50 +
 15 files changed, 1223 insertions(+), 977 deletions(-)
 create mode 100644 client/src/vue-utilities/prompt-service/Prompt.vue
 create mode 100644 client/src/vue-utilities/prompt-service/README.md
 create mode 100644 client/src/vue-utilities/prompt-service/index.js
 create mode 100644 client/src/vue-utilities/snackbar-service/README.md
 create mode 100644 client/src/vue-utilities/snackbar-service/Snackbar.vue
 create mode 100644 client/src/vue-utilities/snackbar-service/index.js
 create mode 100644 client/src/vue-utilities/v-mousetrap/README.md
 create mode 100644 client/src/vue-utilities/v-mousetrap/index.js

diff --git a/client/package-lock.json b/client/package-lock.json
index fff7dae..a45a38a 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -38,12 +38,12 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -55,12 +55,12 @@
       }
     },
     "@babel/generator": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-      "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz",
+      "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0",
+        "@babel/types": "^7.12.1",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       }
@@ -85,28 +85,27 @@
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
-      "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz",
+      "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-member-expression-to-functions": "^7.10.5",
+        "@babel/helper-member-expression-to-functions": "^7.12.1",
         "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.12.1",
         "@babel/helper-split-export-declaration": "^7.10.4"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz",
+      "integrity": "sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-regex": "^7.10.4",
-        "regexpu-core": "^4.7.0"
+        "regexpu-core": "^4.7.1"
       }
     },
     "@babel/helper-define-map": {
@@ -121,13 +120,12 @@
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz",
-      "integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz",
+      "integrity": "sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.1"
       }
     },
     "@babel/helper-function-name": {
@@ -160,35 +158,37 @@
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-      "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+      "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.12.1"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz",
+      "integrity": "sha512-ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.1"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz",
+      "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-module-imports": "^7.12.1",
+        "@babel/helper-replace-supers": "^7.12.1",
+        "@babel/helper-simple-access": "^7.12.1",
         "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/helper-validator-identifier": "^7.10.4",
         "@babel/template": "^7.10.4",
-        "@babel/types": "^7.11.0",
+        "@babel/traverse": "^7.12.1",
+        "@babel/types": "^7.12.1",
         "lodash": "^4.17.19"
       }
     },
@@ -217,47 +217,44 @@
       }
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz",
+      "integrity": "sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-wrap-function": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.1"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-      "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz",
+      "integrity": "sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.10.4",
+        "@babel/helper-member-expression-to-functions": "^7.12.1",
         "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/traverse": "^7.12.1",
+        "@babel/types": "^7.12.1"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz",
+      "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.1"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
+      "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.12.1"
       }
     },
     "@babel/helper-split-export-declaration": {
@@ -276,9 +273,9 @@
       "dev": true
     },
     "@babel/helper-wrap-function": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-      "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+      "version": "7.12.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz",
+      "integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.10.4",
@@ -288,14 +285,14 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
-      "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz",
+      "integrity": "sha512-9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/traverse": "^7.12.1",
+        "@babel/types": "^7.12.1"
       }
     },
     "@babel/highlight": {
@@ -316,41 +313,41 @@
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz",
+      "integrity": "sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.12.1",
         "@babel/plugin-syntax-async-generators": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz",
-      "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz",
+      "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.4",
+        "@babel/helper-create-class-features-plugin": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-decorators": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.5.tgz",
-      "integrity": "sha512-Sc5TAQSZuLzgY0664mMDn24Vw2P8g/VhyLyGPaWiHahhgLqeZvcGeyBZOrJW0oSKIK2mvQ22a1ENXBIQLhrEiQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz",
+      "integrity": "sha512-knNIuusychgYN8fGJHONL0RbFxLGawhXOJNLBk75TniTsZZeA+wdkDuv6wp4lGwzQEKjZi6/WYtnb3udNPmQmQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.5",
+        "@babel/helper-create-class-features-plugin": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-syntax-decorators": "^7.10.4"
+        "@babel/plugin-syntax-decorators": "^7.12.1"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz",
+      "integrity": "sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -358,20 +355,20 @@
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
+      "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.4"
+        "@babel/plugin-transform-parameters": "^7.12.1"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz",
+      "integrity": "sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -379,12 +376,12 @@
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz",
+      "integrity": "sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-create-regexp-features-plugin": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
@@ -398,9 +395,9 @@
       }
     },
     "@babel/plugin-syntax-decorators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz",
-      "integrity": "sha512-2NaoC6fAk2VMdhY1eerkfHV+lVYC1u8b+jmRJISqANCJlTxYy19HGdIkkQtix2UtkcPuPu+IlDgrVseZnU03bw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz",
+      "integrity": "sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -425,9 +422,9 @@
       }
     },
     "@babel/plugin-syntax-jsx": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz",
-      "integrity": "sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz",
+      "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -452,29 +449,29 @@
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-      "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz",
+      "integrity": "sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz",
+      "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-module-imports": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4"
+        "@babel/helper-remap-async-to-generator": "^7.12.1"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz",
+      "integrity": "sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -490,9 +487,9 @@
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-      "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz",
+      "integrity": "sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
@@ -500,52 +497,52 @@
         "@babel/helper-function-name": "^7.10.4",
         "@babel/helper-optimise-call-expression": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.12.1",
         "@babel/helper-split-export-declaration": "^7.10.4",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz",
+      "integrity": "sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz",
+      "integrity": "sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz",
+      "integrity": "sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-create-regexp-features-plugin": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz",
+      "integrity": "sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz",
+      "integrity": "sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==",
       "dev": true,
       "requires": {
         "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
@@ -553,18 +550,18 @@
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-      "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz",
+      "integrity": "sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz",
+      "integrity": "sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.10.4",
@@ -572,141 +569,141 @@
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz",
+      "integrity": "sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz",
+      "integrity": "sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-module-transforms": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz",
+      "integrity": "sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-simple-access": "^7.12.1",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz",
+      "integrity": "sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==",
       "dev": true,
       "requires": {
         "@babel/helper-hoist-variables": "^7.10.4",
-        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-module-transforms": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-validator-identifier": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz",
+      "integrity": "sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz",
+      "integrity": "sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.12.1"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz",
+      "integrity": "sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz",
+      "integrity": "sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4"
+        "@babel/helper-replace-supers": "^7.12.1"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz",
+      "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz",
+      "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==",
       "dev": true,
       "requires": {
         "regenerator-transform": "^0.14.2"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz",
-      "integrity": "sha512-LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz",
+      "integrity": "sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-module-imports": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
         "resolve": "^1.8.1",
         "semver": "^5.5.1"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz",
+      "integrity": "sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz",
+      "integrity": "sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz",
+      "integrity": "sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -714,31 +711,30 @@
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz",
+      "integrity": "sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz",
+      "integrity": "sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz",
+      "integrity": "sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-create-regexp-features-plugin": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
@@ -824,29 +820,35 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-      "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz",
+      "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.0",
+        "@babel/generator": "^7.12.1",
         "@babel/helper-function-name": "^7.10.4",
         "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/parser": "^7.11.0",
-        "@babel/types": "^7.11.0",
+        "@babel/parser": "^7.12.1",
+        "@babel/types": "^7.12.1",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.19"
       },
       "dependencies": {
+        "@babel/parser": {
+          "version": "7.12.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz",
+          "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==",
+          "dev": true
+        },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -858,9 +860,9 @@
       }
     },
     "@babel/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
+      "integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
       "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.10.4",
@@ -934,9 +936,9 @@
       }
     },
     "@mdi/font": {
-      "version": "5.4.55",
-      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-5.4.55.tgz",
-      "integrity": "sha512-M+Wdcs4nZ4/Kid949fcI0DsnvHtpE6pwk6Hv8YJZDp+Zne7ZtYdIN0z73cvcANkbyNnY3ncScULGMIceNd0xxQ=="
+      "version": "5.8.55",
+      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-5.8.55.tgz",
+      "integrity": "sha512-8mrwfFBsmj+D67ZiGQSe5TU/lcWCtDyli2eshQ2fvLCZGRPqFMM23YQp4+JMOTpk5yMZKTeAwNWIYfITy76OHA=="
     },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
@@ -1008,9 +1010,9 @@
       }
     },
     "@types/babel-types": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.8.tgz",
-      "integrity": "sha512-jvu8g4LR7+p6ao30RhTREnEhHxmP4/R9D9/rOR/Kq14FztORty9SKgtOZUNZNMB9CXLxZ54EWu4dArUE8WdTsw==",
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.9.tgz",
+      "integrity": "sha512-qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA==",
       "dev": true
     },
     "@types/babylon": {
@@ -1022,12 +1024,6 @@
         "@types/babel-types": "*"
       }
     },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
     "@types/glob": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
@@ -1039,9 +1035,9 @@
       }
     },
     "@types/json-schema": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
-      "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
       "dev": true
     },
     "@types/minimatch": {
@@ -1051,9 +1047,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.0.27",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz",
-      "integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==",
+      "version": "14.14.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.5.tgz",
+      "integrity": "sha512-H5Wn24s/ZOukBmDn03nnGTp18A60ny9AmCwnEcgJiTgSGsCO7k+NWP7zjCCbhlcnVCoI+co52dUAt9GMhOSULw==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -1069,20 +1065,20 @@
       "dev": true
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz",
-      "integrity": "sha512-6tyf5Cqm4m6v7buITuwS+jHzPlIPxbFzEhXR5JGZpbrvOcp1hiQKckd305/3C7C36wFekNTQSxAtgeM0j0yoUw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz",
+      "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA==",
       "dev": true
     },
     "@vue/babel-plugin-transform-vue-jsx": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.1.2.tgz",
-      "integrity": "sha512-YfdaoSMvD1nj7+DsrwfTvTnhDXI7bsuh+Y5qWwvQXlD24uLgnsoww3qbiZvWf/EoviZMrvqkqN4CBw0W3BWUTQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.2.1.tgz",
+      "integrity": "sha512-HJuqwACYehQwh1fNT8f4kyzqlNMpBuUK4rSiSES5D4QsYncv5fxFsLyrxFPG2ksO7t5WP+Vgix6tt6yKClwPzA==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
+        "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
         "html-tags": "^2.0.0",
         "lodash.kebabcase": "^4.1.1",
         "svg-tags": "^1.0.0"
@@ -1110,59 +1106,79 @@
       }
     },
     "@vue/babel-preset-jsx": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.2.tgz",
-      "integrity": "sha512-zDpVnFpeC9YXmvGIDSsKNdL7qCG2rA3gjywLYHPCKDT10erjxF4U+6ay9X6TW5fl4GsDlJp9bVfAVQAAVzxxvQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.2.4.tgz",
+      "integrity": "sha512-oRVnmN2a77bYDJzeGSt92AuHXbkIxbf/XXSE3klINnh9AXBmVS1DGa1f0d+dDYpLfsAKElMnqKTQfKn7obcL4w==",
       "dev": true,
       "requires": {
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
-        "@vue/babel-sugar-functional-vue": "^1.1.2",
-        "@vue/babel-sugar-inject-h": "^1.1.2",
-        "@vue/babel-sugar-v-model": "^1.1.2",
-        "@vue/babel-sugar-v-on": "^1.1.2"
+        "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+        "@vue/babel-plugin-transform-vue-jsx": "^1.2.1",
+        "@vue/babel-sugar-composition-api-inject-h": "^1.2.1",
+        "@vue/babel-sugar-composition-api-render-instance": "^1.2.4",
+        "@vue/babel-sugar-functional-vue": "^1.2.2",
+        "@vue/babel-sugar-inject-h": "^1.2.2",
+        "@vue/babel-sugar-v-model": "^1.2.3",
+        "@vue/babel-sugar-v-on": "^1.2.3"
+      }
+    },
+    "@vue/babel-sugar-composition-api-inject-h": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.2.1.tgz",
+      "integrity": "sha512-4B3L5Z2G+7s+9Bwbf+zPIifkFNcKth7fQwekVbnOA3cr3Pq71q71goWr97sk4/yyzH8phfe5ODVzEjX7HU7ItQ==",
+      "dev": true,
+      "requires": {
+        "@babel/plugin-syntax-jsx": "^7.2.0"
+      }
+    },
+    "@vue/babel-sugar-composition-api-render-instance": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.2.4.tgz",
+      "integrity": "sha512-joha4PZznQMsxQYXtR3MnTgCASC9u3zt9KfBxIeuI5g2gscpTsSKRDzWQt4aqNIpx6cv8On7/m6zmmovlNsG7Q==",
+      "dev": true,
+      "requires": {
+        "@babel/plugin-syntax-jsx": "^7.2.0"
       }
     },
     "@vue/babel-sugar-functional-vue": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.1.2.tgz",
-      "integrity": "sha512-YhmdJQSVEFF5ETJXzrMpj0nkCXEa39TvVxJTuVjzvP2rgKhdMmQzlJuMv/HpadhZaRVMCCF3AEjjJcK5q/cYzQ==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.2.2.tgz",
+      "integrity": "sha512-JvbgGn1bjCLByIAU1VOoepHQ1vFsroSA/QkzdiSs657V79q6OwEWLCQtQnEXD/rLTA8rRit4rMOhFpbjRFm82w==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-jsx": "^7.2.0"
       }
     },
     "@vue/babel-sugar-inject-h": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.1.2.tgz",
-      "integrity": "sha512-VRSENdTvD5htpnVp7i7DNuChR5rVMcORdXjvv5HVvpdKHzDZAYiLSD+GhnhxLm3/dMuk8pSzV+k28ECkiN5m8w==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.2.2.tgz",
+      "integrity": "sha512-y8vTo00oRkzQTgufeotjCLPAvlhnpSkcHFEp60+LJUwygGcd5Chrpn5480AQp/thrxVm8m2ifAk0LyFel9oCnw==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-jsx": "^7.2.0"
       }
     },
     "@vue/babel-sugar-v-model": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.2.tgz",
-      "integrity": "sha512-vLXPvNq8vDtt0u9LqFdpGM9W9IWDmCmCyJXuozlq4F4UYVleXJ2Fa+3JsnTZNJcG+pLjjfnEGHci2339Kj5sGg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.2.3.tgz",
+      "integrity": "sha512-A2jxx87mySr/ulAsSSyYE8un6SIH0NWHiLaCWpodPCVOlQVODCaSpiR4+IMsmBr73haG+oeCuSvMOM+ttWUqRQ==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
+        "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+        "@vue/babel-plugin-transform-vue-jsx": "^1.2.1",
         "camelcase": "^5.0.0",
         "html-tags": "^2.0.0",
         "svg-tags": "^1.0.0"
       }
     },
     "@vue/babel-sugar-v-on": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.2.tgz",
-      "integrity": "sha512-T8ZCwC8Jp2uRtcZ88YwZtZXe7eQrJcfRq0uTFy6ShbwYJyz5qWskRFoVsdTi9o0WEhmQXxhQUewodOSCUPVmsQ==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.2.3.tgz",
+      "integrity": "sha512-kt12VJdz/37D3N3eglBywV8GStKNUhNrsxChXIV+o0MwVXORYuhDTHJRKPgLJRb/EY3vM2aRFQdxJBp9CLikjw==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-jsx": "^7.2.0",
-        "@vue/babel-plugin-transform-vue-jsx": "^1.1.2",
+        "@vue/babel-plugin-transform-vue-jsx": "^1.2.1",
         "camelcase": "^5.0.0"
       }
     },
@@ -1410,12 +1426,12 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -1722,9 +1738,9 @@
       }
     },
     "acorn": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
       "dev": true
     },
     "acorn-globals": {
@@ -1776,9 +1792,9 @@
       "dev": true
     },
     "ajv": {
-      "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-      "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
@@ -1883,9 +1899,9 @@
       "dev": true
     },
     "arch": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz",
-      "integrity": "sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
       "dev": true
     },
     "argparse": {
@@ -1957,14 +1973,15 @@
       }
     },
     "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
       "dev": true,
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
       },
       "dependencies": {
         "bn.js": {
@@ -2075,9 +2092,9 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
-      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz",
+      "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==",
       "dev": true
     },
     "axios": {
@@ -2301,9 +2318,10 @@
       }
     },
     "base64-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+      "dev": true
     },
     "batch": {
       "version": "0.6.1",
@@ -2360,14 +2378,14 @@
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
     },
     "blueimp-md5": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz",
-      "integrity": "sha512-EkNUOi7tpV68TqjpiUz9D9NcT8um2+qtgntmMbi5UKssVX2m/2PLqotcric0RE63pB3HPN/fjf3cKHN2ufGSUQ=="
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.13.0.tgz",
+      "integrity": "sha512-lmp0m647R5e77ORduxLW5mISIDcvgJZa52vMBv5uVI3UmSWTQjkJsZVBfaFqQPw/QFogJwvY6e3Gl9nP+Loe+Q=="
     },
     "bn.js": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
-      "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
+      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
       "dev": true
     },
     "body-parser": {
@@ -2533,16 +2551,16 @@
       }
     },
     "browserify-sign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
-      "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
       "dev": true,
       "requires": {
         "bn.js": "^5.1.1",
         "browserify-rsa": "^4.0.1",
         "create-hash": "^1.2.0",
         "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.2",
+        "elliptic": "^6.5.3",
         "inherits": "^2.0.4",
         "parse-asn1": "^5.1.5",
         "readable-stream": "^3.6.0",
@@ -2565,15 +2583,6 @@
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
           "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
           "dev": true
-        },
-        "string_decoder": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.2.0"
-          }
         }
       }
     },
@@ -2587,15 +2596,15 @@
       }
     },
     "browserslist": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz",
-      "integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==",
+      "version": "4.14.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
+      "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001093",
-        "electron-to-chromium": "^1.3.488",
-        "escalade": "^3.0.1",
-        "node-releases": "^1.1.58"
+        "caniuse-lite": "^1.0.30001135",
+        "electron-to-chromium": "^1.3.571",
+        "escalade": "^3.1.0",
+        "node-releases": "^1.1.61"
       }
     },
     "buffer": {
@@ -2774,9 +2783,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001110",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001110.tgz",
-      "integrity": "sha512-KqJWeat4rhSHF0ito4yz9q/JuZHkvn71SsBnxge4azjPDbowIjOUnS8i1xpKGxZxU6BFiPqO2hSV2eiCpFQVRw==",
+      "version": "1.0.30001151",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001151.tgz",
+      "integrity": "sha512-Zh3sHqskX6mHNrqUerh+fkf0N72cMxrmflzje/JyVImfpknscMnkeJrlFGJcqTmaa0iszdYptGpWMJCRQDkBVw==",
       "dev": true
     },
     "cardboard-vr-display": {
@@ -2845,9 +2854,9 @@
       "dev": true
     },
     "chokidar": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz",
-      "integrity": "sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
+      "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
       "dev": true,
       "requires": {
         "anymatch": "~3.1.1",
@@ -2857,7 +2866,7 @@
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.4.0"
+        "readdirp": "~3.5.0"
       },
       "dependencies": {
         "braces": {
@@ -2997,12 +3006,11 @@
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -3038,9 +3046,9 @@
           "dev": true
         },
         "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "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"
@@ -3049,9 +3057,9 @@
       }
     },
     "cli-spinners": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz",
-      "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz",
+      "integrity": "sha512-PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ==",
       "dev": true
     },
     "cli-width": {
@@ -3169,13 +3177,13 @@
       }
     },
     "color": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
-      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
+      "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
       "dev": true,
       "requires": {
         "color-convert": "^1.9.1",
-        "color-string": "^1.5.2"
+        "color-string": "^1.5.4"
       }
     },
     "color-convert": {
@@ -3194,9 +3202,9 @@
       "dev": true
     },
     "color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz",
+      "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==",
       "dev": true,
       "requires": {
         "color-name": "^1.0.0",
@@ -3291,38 +3299,6 @@
         "inherits": "^2.0.3",
         "readable-stream": "^2.2.2",
         "typedarray": "^0.0.6"
-      },
-      "dependencies": {
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "connect-history-api-fallback": {
@@ -3597,13 +3573,13 @@
       }
     },
     "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
       "dev": true,
       "requires": {
         "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "elliptic": "^6.5.3"
       },
       "dependencies": {
         "bn.js": {
@@ -3781,9 +3757,9 @@
       }
     },
     "css-what": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz",
-      "integrity": "sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
       "dev": true
     },
     "cssesc": {
@@ -3870,28 +3846,28 @@
       "dev": true
     },
     "csso": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
-      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.1.0.tgz",
+      "integrity": "sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==",
       "dev": true,
       "requires": {
-        "css-tree": "1.0.0-alpha.39"
+        "css-tree": "^1.0.0"
       },
       "dependencies": {
         "css-tree": {
-          "version": "1.0.0-alpha.39",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
-          "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0.tgz",
+          "integrity": "sha512-CdVYz/Yuqw0VdKhXPBIgi8DO3NicJVYZNWeX9XcIuSp9ZoFT5IcleVRW07O5rMjdcx1mb+MEJPknTTEW7DdsYw==",
           "dev": true,
           "requires": {
-            "mdn-data": "2.0.6",
+            "mdn-data": "2.0.12",
             "source-map": "^0.6.1"
           }
         },
         "mdn-data": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
-          "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+          "version": "2.0.12",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz",
+          "integrity": "sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==",
           "dev": true
         },
         "source-map": {
@@ -4014,9 +3990,9 @@
           }
         },
         "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
           "dev": true,
           "requires": {
             "pump": "^3.0.0"
@@ -4044,9 +4020,9 @@
           }
         },
         "onetime": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-          "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
           "dev": true,
           "requires": {
             "mimic-fn": "^2.1.0"
@@ -4310,9 +4286,9 @@
       },
       "dependencies": {
         "domelementtype": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
+          "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
           "dev": true
         }
       }
@@ -4349,9 +4325,9 @@
       }
     },
     "dot-prop": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
-      "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
       "dev": true,
       "requires": {
         "is-obj": "^2.0.0"
@@ -4370,9 +4346,9 @@
       "dev": true
     },
     "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
     "duplexify": {
@@ -4416,9 +4392,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.519",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.519.tgz",
-      "integrity": "sha512-2r/p/9YOjIpX10KxcH1HcAGz1oadSD9Cwwotoek8wNJx/SRpklea14qdAMzCTTZlIezvsJ8sNsBQN05bJ/ZjhA==",
+      "version": "1.3.584",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.584.tgz",
+      "integrity": "sha512-NB3DzrTzJFhWkUp+nl2KtUtoFzrfGXTir2S+BU4tXGyXH9vlluPuFpE3pTKeH7+PY460tHLjKzh6K2+TWwW+Ww==",
       "dev": true
     },
     "elliptic": {
@@ -4527,20 +4503,21 @@
       }
     },
     "es-abstract": {
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
+      "version": "1.18.0-next.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
+      "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
       "dev": true,
       "requires": {
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
         "has-symbols": "^1.0.1",
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
+        "is-callable": "^1.2.2",
+        "is-negative-zero": "^2.0.0",
+        "is-regex": "^1.1.1",
+        "object-inspect": "^1.8.0",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
+        "object.assign": "^4.1.1",
         "string.prototype.trimend": "^1.0.1",
         "string.prototype.trimstart": "^1.0.1"
       }
@@ -4556,15 +4533,10 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "es6-promise": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
-      "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y="
-    },
     "escalade": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz",
-      "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "dev": true
     },
     "escape-html": {
@@ -4624,9 +4596,9 @@
       },
       "dependencies": {
         "acorn-jsx": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-          "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+          "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==",
           "dev": true
         },
         "chardet": {
@@ -4636,12 +4608,12 @@
           "dev": true
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "doctrine": {
@@ -4890,18 +4862,18 @@
       },
       "dependencies": {
         "acorn-jsx": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-          "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+          "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==",
           "dev": true
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "espree": {
@@ -4998,20 +4970,28 @@
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
-          "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
           "dev": true
         }
       }
     },
     "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
       }
     },
     "estraverse": {
@@ -5039,9 +5019,9 @@
       "dev": true
     },
     "eventemitter3": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
       "dev": true
     },
     "events": {
@@ -5557,38 +5537,6 @@
       "requires": {
         "inherits": "^2.0.3",
         "readable-stream": "^2.3.6"
-      },
-      "dependencies": {
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "follow-redirects": {
@@ -5691,8 +5639,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
@@ -5701,9 +5648,9 @@
       "dev": true
     },
     "gensync": {
-      "version": "1.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true
     },
     "get-caller-file": {
@@ -5743,9 +5690,9 @@
       }
     },
     "gl-matrix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.0.0.tgz",
-      "integrity": "sha512-PD4mVH/C/Zs64kOozeFnKY8ybhgwxXXQYGWdB4h68krAHknWJgk9uKOn6z8YElh5//vs++90pb6csrTIDWnexA=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.3.0.tgz",
+      "integrity": "sha512-COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA=="
     },
     "gl-preserve-state": {
       "version": "1.0.0",
@@ -5852,7 +5799,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
@@ -5945,15 +5891,6 @@
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
           "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
           "dev": true
-        },
-        "string_decoder": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.2.0"
-          }
         }
       }
     },
@@ -6166,21 +6103,6 @@
             "string_decoder": "^1.1.1",
             "util-deprecate": "^1.0.1"
           }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.2.0"
-          }
         }
       }
     },
@@ -6301,9 +6223,9 @@
       }
     },
     "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "dev": true
     },
     "iferr": {
@@ -6568,9 +6490,9 @@
       "dev": true
     },
     "is-callable": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
+      "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
       "dev": true
     },
     "is-ci": {
@@ -6596,6 +6518,14 @@
         "rgba-regex": "^1.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz",
+      "integrity": "sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -6648,9 +6578,9 @@
       "dev": true
     },
     "is-docker": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
-      "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
+      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
       "dev": true
     },
     "is-expression": {
@@ -6698,6 +6628,12 @@
         "is-extglob": "^2.1.1"
       }
     },
+    "is-negative-zero": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
+      "dev": true
+    },
     "is-number": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -6770,9 +6706,9 @@
       "dev": true
     },
     "is-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
-      "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
+      "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
       "dev": true,
       "requires": {
         "has-symbols": "^1.0.1"
@@ -6933,6 +6869,12 @@
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
       "dev": true
     },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -7004,22 +6946,14 @@
       }
     },
     "jszip": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.4.tgz",
-      "integrity": "sha512-z6w8iYIxZ/fcgul0j/OerkYnkomH8BZigvzbxVmr2h5HkZUrPtk2kjYtLkqR9wwQxEP6ecKNoKLsbhd18jfnGA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz",
+      "integrity": "sha512-gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg==",
       "requires": {
-        "core-js": "~2.3.0",
-        "es6-promise": "~3.0.2",
-        "lie": "~3.1.0",
+        "lie": "~3.3.0",
         "pako": "~1.0.2",
-        "readable-stream": "~2.0.6"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz",
-          "integrity": "sha1-+rg/uwstjchfpjbEudNMdUIMbWU="
-        }
+        "readable-stream": "~2.3.6",
+        "set-immediate-shim": "~1.0.1"
       }
     },
     "killable": {
@@ -7070,9 +7004,9 @@
       }
     },
     "lie": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
-      "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
       "requires": {
         "immediate": "~3.0.5"
       }
@@ -7181,9 +7115,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
       "dev": true
     },
     "lodash.defaultsdeep": {
@@ -7232,9 +7166,9 @@
       }
     },
     "loglevel": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
-      "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
+      "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
       "dev": true
     },
     "longest": {
@@ -7293,9 +7227,9 @@
       }
     },
     "markdown-it": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.0.tgz",
-      "integrity": "sha512-+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-11.0.1.tgz",
+      "integrity": "sha512-aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ==",
       "requires": {
         "argparse": "^1.0.7",
         "entities": "~2.0.0",
@@ -7559,9 +7493,9 @@
       }
     },
     "moment": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
-      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
     "mousetrap": {
       "version": "1.6.5",
@@ -7621,9 +7555,9 @@
       }
     },
     "nan": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
-      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
       "dev": true,
       "optional": true
     },
@@ -7680,9 +7614,9 @@
       }
     },
     "node-forge": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
-      "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
       "dev": true
     },
     "node-ipc": {
@@ -7727,67 +7661,18 @@
         "vm-browserify": "^1.0.1"
       },
       "dependencies": {
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-          "dev": true
-        },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
           "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
           "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          },
-          "dependencies": {
-            "string_decoder": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-              "dev": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        },
-        "string_decoder": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.2.0"
-          },
-          "dependencies": {
-            "safe-buffer": {
-              "version": "5.2.1",
-              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-              "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-              "dev": true
-            }
-          }
         }
       }
     },
     "node-releases": {
-      "version": "1.1.60",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz",
-      "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==",
+      "version": "1.1.64",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.64.tgz",
+      "integrity": "sha512-Iec8O9166/x2HRMJyLLLWkd0sFFLrFNy+Xf+JQfSQsdBJzPcHpNl3JQ9gD4j+aJxmCa25jNsIbM4bmACtSbkSg==",
       "dev": true
     },
     "normalize-package-data": {
@@ -7928,13 +7813,13 @@
       "dev": true
     },
     "object-is": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
-      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
+      "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "es-abstract": "^1.18.0-next.1"
       }
     },
     "object-keys": {
@@ -7953,15 +7838,15 @@
       }
     },
     "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
+      "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.0",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
       }
     },
     "object.getownpropertydescriptors": {
@@ -7972,6 +7857,27 @@
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "object.pick": {
@@ -7993,6 +7899,27 @@
         "es-abstract": "^1.17.0-next.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "obuf": {
@@ -8043,9 +7970,9 @@
       }
     },
     "opener": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
-      "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
       "dev": true
     },
     "opn": {
@@ -8152,9 +8079,9 @@
       "dev": true
     },
     "pako": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
     },
     "parallel-transform": {
       "version": "1.2.0",
@@ -8165,38 +8092,6 @@
         "cyclist": "^1.0.1",
         "inherits": "^2.0.3",
         "readable-stream": "^2.1.5"
-      },
-      "dependencies": {
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "param-case": {
@@ -8226,14 +8121,13 @@
       }
     },
     "parse-asn1": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
       "dev": true,
       "requires": {
-        "asn1.js": "^4.0.0",
+        "asn1.js": "^5.2.0",
         "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
         "evp_bytestokey": "^1.0.0",
         "pbkdf2": "^3.0.3",
         "safe-buffer": "^5.1.1"
@@ -8490,9 +8384,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.32",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
-      "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+      "version": "7.0.35",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+      "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
@@ -8518,9 +8412,9 @@
       }
     },
     "postcss-calc": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz",
-      "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
+      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.27",
@@ -8604,9 +8498,9 @@
       }
     },
     "postcss-load-config": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
-      "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
       "dev": true,
       "requires": {
         "cosmiconfig": "^5.0.0",
@@ -9100,14 +8994,15 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
-      "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
+      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
         "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
+        "uniq": "^1.0.1",
+        "util-deprecate": "^1.0.2"
       }
     },
     "postcss-svgo": {
@@ -9175,13 +9070,13 @@
       }
     },
     "pretty-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
-      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
+      "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
       "dev": true,
       "requires": {
-        "renderkid": "^2.0.1",
-        "utila": "~0.4"
+        "lodash": "^4.17.20",
+        "renderkid": "^2.0.4"
       }
     },
     "process": {
@@ -9191,9 +9086,9 @@
       "dev": true
     },
     "process-nextick-args": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "progress": {
       "version": "2.0.3",
@@ -9532,9 +9427,9 @@
       "dev": true
     },
     "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
     "randombytes": {
@@ -9587,36 +9482,37 @@
       },
       "dependencies": {
         "parse-json": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz",
-          "integrity": "sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
+          "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.0.0",
             "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1",
+            "json-parse-even-better-errors": "^2.3.0",
             "lines-and-columns": "^1.1.6"
           }
         }
       }
     },
     "readable-stream": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-      "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
       "requires": {
         "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
+        "inherits": "~2.0.3",
         "isarray": "~1.0.0",
-        "process-nextick-args": "~1.0.6",
-        "string_decoder": "~0.10.x",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
         "util-deprecate": "~1.0.1"
       }
     },
     "readdirp": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
       "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
@@ -9678,6 +9574,27 @@
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "regexpp": {
@@ -9688,9 +9605,9 @@
       "optional": true
     },
     "regexpu-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0",
@@ -9737,16 +9654,16 @@
       "dev": true
     },
     "renderkid": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
-      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz",
+      "integrity": "sha512-K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g==",
       "dev": true,
       "requires": {
         "css-select": "^1.1.0",
         "dom-converter": "^0.2",
         "htmlparser2": "^3.3.0",
-        "strip-ansi": "^3.0.0",
-        "utila": "^0.4.0"
+        "lodash": "^4.17.20",
+        "strip-ansi": "^3.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -9898,10 +9815,11 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
+      "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
       "requires": {
+        "is-core-module": "^2.0.0",
         "path-parse": "^1.0.6"
       }
     },
@@ -10030,9 +9948,9 @@
       }
     },
     "rxjs": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz",
-      "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==",
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+      "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
@@ -10041,8 +9959,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -10060,9 +9977,9 @@
       "dev": true
     },
     "sass": {
-      "version": "1.26.10",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz",
-      "integrity": "sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==",
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.27.0.tgz",
+      "integrity": "sha512-0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig==",
       "dev": true,
       "requires": {
         "chokidar": ">=2.0.0 <4.0.0"
@@ -10096,20 +10013,20 @@
       "dev": true
     },
     "schema-utils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
       "dev": true,
       "requires": {
-        "@types/json-schema": "^7.0.4",
-        "ajv": "^6.12.2",
-        "ajv-keywords": "^3.4.1"
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
       }
     },
     "seedrandom": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-2.4.3.tgz",
-      "integrity": "sha1-JDhQTa0zkXMUv/GKxNeU8W1qrsw="
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
+      "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
     },
     "select-hose": {
       "version": "2.0.0",
@@ -10118,12 +10035,12 @@
       "dev": true
     },
     "selfsigned": {
-      "version": "1.10.7",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
-      "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
+      "version": "1.10.8",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
+      "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
       "dev": true,
       "requires": {
-        "node-forge": "0.9.0"
+        "node-forge": "^0.10.0"
       }
     },
     "semver": {
@@ -10185,9 +10102,9 @@
       }
     },
     "serialize-javascript": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
-      "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
@@ -10261,6 +10178,11 @@
       "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
       "dev": true
     },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
+    },
     "set-value": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -10346,9 +10268,9 @@
       "dev": true
     },
     "shelljs": {
-      "version": "0.7.8",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
-      "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
+      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
       "requires": {
         "glob": "^7.0.0",
         "interpret": "^1.0.0",
@@ -10646,9 +10568,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
+      "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==",
       "dev": true
     },
     "spdy": {
@@ -10665,12 +10587,12 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -10696,12 +10618,12 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
@@ -10720,21 +10642,6 @@
             "string_decoder": "^1.1.1",
             "util-deprecate": "^1.0.1"
           }
-        },
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.2.0"
-          }
         }
       }
     },
@@ -10854,38 +10761,6 @@
         "readable-stream": "^2.3.6",
         "to-arraybuffer": "^1.0.0",
         "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "stream-shift": {
@@ -10935,6 +10810,27 @@
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "string.prototype.padstart": {
@@ -10945,32 +10841,56 @@
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
-      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz",
+      "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "es-abstract": "^1.18.0-next.1"
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
-      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz",
+      "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
+        "es-abstract": "^1.18.0-next.1"
       }
     },
     "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
     },
     "strip-ansi": {
       "version": "5.2.0",
@@ -11142,16 +11062,16 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz",
-      "integrity": "sha512-U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
+      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
       "dev": true,
       "requires": {
         "cacache": "^12.0.2",
         "find-cache-dir": "^2.1.0",
         "is-wsl": "^1.1.0",
         "schema-utils": "^1.0.0",
-        "serialize-javascript": "^3.1.0",
+        "serialize-javascript": "^4.0.0",
         "source-map": "^0.6.1",
         "terser": "^4.1.2",
         "webpack-sources": "^1.4.0",
@@ -11226,38 +11146,6 @@
       "requires": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
-      },
-      "dependencies": {
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
       }
     },
     "thunky": {
@@ -11267,9 +11155,9 @@
       "dev": true
     },
     "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
       "dev": true,
       "requires": {
         "setimmediate": "^1.0.4"
@@ -11379,9 +11267,9 @@
       "dev": true
     },
     "tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
     "tty-browserify": {
@@ -11613,9 +11501,9 @@
       "dev": true
     },
     "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
       "dev": true,
       "requires": {
         "punycode": "^2.1.0"
@@ -11717,6 +11605,27 @@
         "es-abstract": "^1.17.2",
         "has-symbols": "^1.0.1",
         "object.getownpropertydescriptors": "^2.1.0"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.7",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
+          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.2.2",
+            "is-regex": "^1.1.1",
+            "object-inspect": "^1.8.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.1",
+            "string.prototype.trimend": "^1.0.1",
+            "string.prototype.trimstart": "^1.0.1"
+          }
+        }
       }
     },
     "utila": {
@@ -11783,39 +11692,38 @@
       "dev": true
     },
     "vtk.js": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/vtk.js/-/vtk.js-8.14.0.tgz",
-      "integrity": "sha512-/marh1LOJSxPYOc2j+GxiWUJt5EyFh9L2H+92vcgSn+AQ/FuaU7ovA2Q9BD0Sr2PJuIA7LlgxA6xOQzKHTJ1Yw==",
-      "requires": {
-        "base64-js": "1.2.1",
-        "blueimp-md5": "2.10.0",
-        "commander": "2.11.0",
-        "gl-matrix": "3.0.0",
-        "jszip": "3.1.4",
-        "pako": "1.0.6",
-        "seedrandom": "2.4.3",
-        "shelljs": "0.7.8",
-        "webvr-polyfill": "0.10.8",
+      "version": "14.16.5",
+      "resolved": "https://registry.npmjs.org/vtk.js/-/vtk.js-14.16.5.tgz",
+      "integrity": "sha512-cvkaO/4eF161h9HW9ozIb7e8pLbtWUzz/H6QVjPrBVqJR861/VIAageD5c2zVGywu/DqKbWX/8ZhWi8H1JhwNg==",
+      "requires": {
+        "blueimp-md5": "2.13.0",
+        "commander": "5.1.0",
+        "gl-matrix": "3.3.0",
+        "jszip": "3.4.0",
+        "pako": "1.0.11",
+        "seedrandom": "3.0.5",
+        "shelljs": "0.8.4",
+        "webvr-polyfill": "0.10.11",
         "webworker-promise": "0.4.2",
-        "xmlbuilder": "9.0.7"
+        "xmlbuilder": "15.1.1"
       },
       "dependencies": {
         "commander": {
-          "version": "2.11.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+          "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="
         }
       }
     },
     "vue": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
-      "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
+      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
     },
     "vue-async-computed": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/vue-async-computed/-/vue-async-computed-3.8.2.tgz",
-      "integrity": "sha512-If5roOhp/x0WWd0TWRD77YsuFoiIw3MbkcRlIB/FE3TqQCPje52eQp5CV5NN/7B0VAyPuGX5JQa+rc9AOcGAYw=="
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/vue-async-computed/-/vue-async-computed-3.9.0.tgz",
+      "integrity": "sha512-ac6m/9zxHHNGGKNOU1en8qNk+fAmEbJLuWL7qyQTFuH3vjv3V4urv//QHcVzCobROM6btnaDG2b+XYMncF/ETA=="
     },
     "vue-cli-plugin-vuetify": {
       "version": "2.0.7",
@@ -11833,17 +11741,6 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
           "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
           "dev": true
-        },
-        "shelljs": {
-          "version": "0.8.4",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
-          "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.0.0",
-            "interpret": "^1.0.0",
-            "rechoir": "^0.6.2"
-          }
         }
       }
     },
@@ -11882,9 +11779,9 @@
       "dev": true
     },
     "vue-loader": {
-      "version": "15.9.3",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.3.tgz",
-      "integrity": "sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==",
+      "version": "15.9.4",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.4.tgz",
+      "integrity": "sha512-58YX00oCYre2/+Hu7wwV/2Bpml15/PUHni8LcmpRF1ofiOZJJ+oYt1g3J8BRyE2ZrkMWiy95fZynnZRmMdErEQ==",
       "dev": true,
       "requires": {
         "@vue/component-compiler-utils": "^3.1.0",
@@ -11910,9 +11807,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz",
-      "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==",
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz",
+      "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==",
       "dev": true,
       "requires": {
         "de-indent": "^1.0.2",
@@ -11925,17 +11822,10 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
-    "vue-utilities": {
-      "version": "git+https://github.com/Kitware/vue-utilities.git#fae8978b508ec4dcaea886370ba2a2336abf7bfc",
-      "from": "git+https://github.com/Kitware/vue-utilities.git#fae8978b508ec4dcaea886370ba2a2336abf7bfc",
-      "requires": {
-        "mousetrap": "~1.6.2"
-      }
-    },
     "vuetify": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.7.tgz",
-      "integrity": "sha512-9PNorMNNcn0okT78ZpN86qL5Zx4xu0yzcO2w1IdN3ECdbAP00rHe8CEYCThakwXGUuTZ8Iv7gAMDqH6zfxSMtA=="
+      "version": "2.3.16",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.16.tgz",
+      "integrity": "sha512-LHPqY+Gmyb/75xJscO0a3CuB4ZdpqHLNaGMAbmfTyapI8Q02+hjABEZzitFU/XObD2KhrNWPJzmGZPhbshGUzg=="
     },
     "vuetify-loader": {
       "version": "1.6.0",
@@ -12114,9 +12004,9 @@
       }
     },
     "webpack": {
-      "version": "4.44.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz",
-      "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==",
+      "version": "4.44.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
+      "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.9.0",
@@ -12158,9 +12048,9 @@
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz",
-      "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==",
+      "version": "3.9.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
+      "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==",
       "dev": true,
       "requires": {
         "acorn": "^7.1.1",
@@ -12172,16 +12062,16 @@
         "express": "^4.16.3",
         "filesize": "^3.6.1",
         "gzip-size": "^5.0.0",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.19",
         "mkdirp": "^0.5.1",
         "opener": "^1.5.1",
         "ws": "^6.0.0"
       },
       "dependencies": {
         "acorn": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
-          "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==",
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
         "acorn-walk": {
@@ -12310,12 +12200,12 @@
           }
         },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "emoji-regex": {
@@ -12577,11 +12467,11 @@
       "dev": true
     },
     "webvr-polyfill": {
-      "version": "0.10.8",
-      "resolved": "https://registry.npmjs.org/webvr-polyfill/-/webvr-polyfill-0.10.8.tgz",
-      "integrity": "sha512-Oa89Hb0+NRRgQXxnMxnPgT/1UYItPJfpnwmn7RFmPtGpxcWBXpwXZ0zR0RkfoB77ahlJZ+No+5QejLfOA4CJ8Q==",
+      "version": "0.10.11",
+      "resolved": "https://registry.npmjs.org/webvr-polyfill/-/webvr-polyfill-0.10.11.tgz",
+      "integrity": "sha512-mzTuMpC3W/aKmm5QxYtTzXAxhVo3tR4c0D5Kihk8Q38GVxiCOvS4Ga4LBN8CsFVpXu1WkGeuf/hMzF75iWYiyA==",
       "requires": {
-        "cardboard-vr-display": "^1.0.15"
+        "cardboard-vr-display": "^1.0.18"
       }
     },
     "webvr-polyfill-dpdb": {
@@ -12694,12 +12584,11 @@
           "dev": true
         },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -12771,9 +12660,9 @@
       }
     },
     "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="
     },
     "xtend": {
       "version": "4.0.2",
diff --git a/client/package.json b/client/package.json
index 60542b6..2663f94 100644
--- a/client/package.json
+++ b/client/package.json
@@ -11,11 +11,11 @@
     "@girder/components": "git+https://github.com/girder/girder_web_components.git#v2.2.6",
     "bluebird": "^3.5.5",
     "itk": "^9.1.1",
+    "mousetrap": "~1.6.2",
     "vtk.js": "14.16.5",
     "vue": "^2.6.10",
     "vue-async-computed": "^3.5.1",
     "vue-router": "3.4.3",
-    "vue-utilities": "git+https://github.com/Kitware/vue-utilities.git#fae8978b508ec4dcaea886370ba2a2336abf7bfc",
     "vuetify": "^2.3.7",
     "vuex": "^3.0.1"
   },
diff --git a/client/src/components/JSONConfig.vue b/client/src/components/JSONConfig.vue
index b46628e..b0a741c 100644
--- a/client/src/components/JSONConfig.vue
+++ b/client/src/components/JSONConfig.vue
@@ -55,7 +55,10 @@ export default {
           name="miqa-json-importpath"
           :rules="[
             v => !!v || 'path is required',
-            v => v.endsWith('.json') || v.endsWith('.csv') || 'Needs to be a json or csv file'
+            v =>
+              v.endsWith('.json') ||
+              v.endsWith('.csv') ||
+              'Needs to be a json or csv file'
           ]"
           :error-messages="importpathError"
       /></v-flex>
diff --git a/client/src/components/SessionsView.vue b/client/src/components/SessionsView.vue
index 3cbfd29..4598ab3 100644
--- a/client/src/components/SessionsView.vue
+++ b/client/src/components/SessionsView.vue
@@ -22,7 +22,7 @@ export default {
       "sessions",
       "sessionDatasets",
       "sessionsModifiedTime",
-      "datasets",
+      "datasets"
     ]),
     ...mapGetters(["currentSession"]),
     orderedExperiments() {
@@ -74,7 +74,7 @@ export default {
             :key="`s.${session.id}-${sessionsModifiedTime}`"
             :class="{
               current: session === currentSession,
-              cached: session.cached,
+              cached: session.cached
             }"
           >
             <v-btn
diff --git a/client/src/components/WindowControl.vue b/client/src/components/WindowControl.vue
index 7157735..9507db0 100644
--- a/client/src/components/WindowControl.vue
+++ b/client/src/components/WindowControl.vue
@@ -100,7 +100,7 @@ export default {
           hide-details
           label="Window"
           thumb-label
-          :thumb-size=48
+          :thumb-size="48"
           :min="windowWidthDomain.min"
           :max="windowWidthDomain.max"
           :step="windowWidthDomain.step"
@@ -128,7 +128,7 @@ export default {
           hide-details
           label="Level"
           thumb-label
-          :thumb-size=48
+          :thumb-size="48"
           :min="windowLevelDomain.min"
           :max="windowLevelDomain.max"
           :step="windowLevelDomain.step"
diff --git a/client/src/main.js b/client/src/main.js
index ec8298a..74b497e 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -10,9 +10,9 @@ import store from "./store";
 import Girder, { RestClient, utils } from "@girder/components/src";
 import { API_URL, STATIC_PATH } from "./constants";
 
-import vMousetrap from "vue-utilities/v-mousetrap";
-import snackbarService from "vue-utilities/snackbar-service";
-import promptService from "vue-utilities/prompt-service";
+import vMousetrap from "./vue-utilities/v-mousetrap";
+import snackbarService from "./vue-utilities/snackbar-service";
+import promptService from "./vue-utilities/prompt-service";
 import girder from "./girder";
 
 import "vuetify/dist/vuetify.min.css";
diff --git a/client/src/store/index.js b/client/src/store/index.js
index d407349..a408ec1 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -34,7 +34,7 @@ const store = new Vuex.Store({
     screenshots: [],
     sites: null,
     sessionCachedPercentage: 0,
-    sessionsModifiedTime: (new Date()).toISOString(),
+    sessionsModifiedTime: new Date().toISOString()
   },
   getters: {
     currentDataset(state) {
@@ -72,7 +72,7 @@ const store = new Vuex.Store({
       }
       return null;
     },
-    experimentDatasets(state, getters) {
+    experimentDatasets(state) {
       return function(expId) {
         const experimentSessions = state.experimentSessions[expId];
         const expDatasets = [];
@@ -83,10 +83,10 @@ const store = new Vuex.Store({
           });
         });
         return expDatasets;
-      }
+      };
     },
-    getTodoById: (state) => (id) => {
-      return state.todos.find(todo => todo.id === id)
+    getTodoById: state => id => {
+      return state.todos.find(todo => todo.id === id);
     },
     firstDatasetInPreviousSession(state, getters) {
       return getters.currentDataset
@@ -104,7 +104,8 @@ const store = new Vuex.Store({
         if (expIdx >= 1) {
           const prevExp = state.experiments[state.experimentIds[expIdx - 1]];
           const prevExpSessions = state.experimentSessions[prevExp.id];
-          const prevExpSessionDatasets = state.sessionDatasets[prevExpSessions[0].id];
+          const prevExpSessionDatasets =
+            state.sessionDatasets[prevExpSessions[0].id];
           return prevExpSessionDatasets[0];
         }
       }
@@ -113,10 +114,11 @@ const store = new Vuex.Store({
     firstDatasetInNextExeriment(state, getters) {
       if (getters.currentExperiment) {
         const expIdx = getters.currentExperiment.index;
-        if (expIdx < (state.experimentIds.length - 1)) {
+        if (expIdx < state.experimentIds.length - 1) {
           const nextExp = state.experiments[state.experimentIds[expIdx + 1]];
           const nextExpSessions = state.experimentSessions[nextExp.id];
-          const nextExpSessionDatasets = state.sessionDatasets[nextExpSessions[0].id];
+          const nextExpSessionDatasets =
+            state.sessionDatasets[nextExpSessions[0].id];
           return nextExpSessionDatasets[0];
         }
       }
@@ -162,8 +164,6 @@ const store = new Vuex.Store({
     async loadSessions({ state }) {
       let { data: sessionTree } = await girder.rest.get(`miqa/sessions`);
 
-      console.log("breakpoint sessionTree");
-
       state.experimentIds = [];
       state.experiments = {};
       state.experimentSessions = {};
@@ -183,7 +183,7 @@ const store = new Vuex.Store({
           id: experimentId,
           folderId: experimentId,
           name: experiment.name,
-          index: i,
+          index: i
         };
 
         let sessions = experiment.sessions.sort(
@@ -205,10 +205,10 @@ const store = new Vuex.Store({
             numDatasets: session.datasets.length,
             cumulativeRange: [Number.MAX_VALUE, -Number.MAX_VALUE], // [null, null],
             experiment: experimentId,
-            cached: false,
+            cached: false
           };
 
-          state.sessionsModifiedTime = (new Date()).toISOString();
+          state.sessionsModifiedTime = new Date().toISOString();
 
           state.sessionDatasets[sessionId] = [];
 
@@ -340,10 +340,9 @@ store.watch(
           fileCache.delete(datasetId);
           datasetCache.delete(datasetId);
         });
-        const session = store.state.sessions[sessionId]
-        console.log(`session ${session.name} is now deleted from cache`);
+        const session = store.state.sessions[sessionId];
         session.cached = false;
-        store.state.sessionsModifiedTime = (new Date()).toISOString();
+        store.state.sessionsModifiedTime = new Date().toISOString();
       });
       readDataQueue = [];
     }
@@ -355,12 +354,14 @@ store.watch(
         readDataQueue.push(loadFile(datasetId));
       });
       readDataQueue.push({
-        status: 'sessionLoaded',
-        sessionId,
+        status: "sessionLoaded",
+        sessionId
       });
     });
     if (store.getters.firstDatasetInNextSession) {
-      readDataQueue.unshift(loadFile(store.getters.firstDatasetInNextExperiment));
+      readDataQueue.unshift(
+        loadFile(store.getters.firstDatasetInNextExperiment)
+      );
     }
     var concurrency = navigator.hardwareConcurrency + 1 || 2;
     calculateCachedPercentage();
@@ -372,23 +373,11 @@ store.watch(
 
 function prepareProxyManager(proxyManager) {
   if (!proxyManager.getViews().length) {
-    // var handler = null;
-    var update = () => {
-      proxyManager.renderAllViews(true);
-      // proxyManager.autoAnimateViews();
-    };
     ["View2D_Z:z", "View2D_X:x", "View2D_Y:y"].forEach(type => {
       let view = getView(proxyManager, type);
       view.setOrientationAxesVisibility(false);
       view.getRepresentations().forEach(representation => {
         representation.onModified(() => {
-          // console.log(`nuther representation modified handler (${
-          //   type
-          // }), will proxyManager.renderAllViews()`);
-          // console.log(view);
-          // clearTimeout(handler);
-          // handler = setTimeout(update);
-          // update();
           view.render(true);
         });
       });
@@ -452,15 +441,6 @@ var calculateCachedPercentage = _.throttle(() => {
 
   const expDatasets = store.getters.experimentDatasets(currentExpId);
 
-  // const experimentSessions = store.state.experimentSessions[currentExpId];
-  // const expDatasets = [];
-  // experimentSessions.forEach(sessionId => {
-  //   const sessionDatasets = store.state.sessionDatasets[sessionId];
-  //   sessionDatasets.forEach(datasetId => {
-  //     expDatasets.push(datasetId);
-  //   });
-  // });
-
   var percentage =
     expDatasets.reduce((total, datasetId) => {
       return total + (datasetCache.has(datasetId) ? 1 : 0);
@@ -473,12 +453,11 @@ async function startReaderWorker() {
   if (!data) {
     return;
   }
-  if ('status' in data) {
-    const { status, sessionId } = data;
+  if ("status" in data) {
+    const { sessionId } = data;
     const session = store.state.sessions[sessionId];
     session.cached = true;
-    store.state.sessionsModifiedTime = (new Date()).toISOString();
-    console.log(`Session ${session.name} is now loaded into cache`);
+    store.state.sessionsModifiedTime = new Date().toISOString();
   } else {
     var { id, fileP } = data;
     var file = await fileP;
diff --git a/client/src/vue-utilities/prompt-service/Prompt.vue b/client/src/vue-utilities/prompt-service/Prompt.vue
new file mode 100644
index 0000000..800bb4e
--- /dev/null
+++ b/client/src/vue-utilities/prompt-service/Prompt.vue
@@ -0,0 +1,53 @@
+<template>
+  <v-dialog v-model="show" max-width="400">
+    <v-card>
+      <v-card-title class="title" v-if="title">{{ title }}</v-card-title>
+      <v-card-text>
+        {{ text }}
+      </v-card-text>
+      <v-card-actions>
+        <v-spacer></v-spacer>
+        <v-btn v-if="confirm" text @click="negative">
+          {{ negativeButton }}
+        </v-btn>
+        <v-btn color="primary" text @click="positive">
+          {{ positiveButton }}
+        </v-btn>
+      </v-card-actions>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script>
+export default {
+  name: "Prompt",
+  vuetify: null,
+  props: {},
+  data: () => ({
+    show: false,
+    title: "",
+    text: "",
+    positiveButton: "Confirm",
+    negativeButton: "Cancel",
+    confirm: false,
+    resolve: null
+  }),
+  watch: {
+    show(value) {
+      if (!value) {
+        this.resolve(false);
+      }
+    }
+  },
+  methods: {
+    negative() {
+      this.show = false;
+      this.resolve(false);
+    },
+    positive() {
+      this.show = false;
+      this.resolve(true);
+    }
+  }
+};
+</script>
diff --git a/client/src/vue-utilities/prompt-service/README.md b/client/src/vue-utilities/prompt-service/README.md
new file mode 100644
index 0000000..c2f7e0d
--- /dev/null
+++ b/client/src/vue-utilities/prompt-service/README.md
@@ -0,0 +1,47 @@
+## prompt-service
+A Vue plugin that provides a simple prompt service with Vutify components in Vue components. It's functionality is similar to native alert() and confirm(), prompt() is not supported.
+
+### Install
+Install plugin
+```JavaScript
+import Vuetify from "vuetify/lib";
+import promptService from "vue-utilities/prompt-service";
+
+let vuetify = new Vuetify();
+Vue.use(promptService(vuetify));
+```
+Attach container element to DOM after Vue app initialization
+```JavaScript
+new Vue({
+  render: h => h(App)
+}).$mount("#app")
+.$promptAttach();
+```
+### Usage
+Call `this.$prompt()` Within Vue Component
+
+Basic usage
+```JavaScript
+this.$prompt({ text: 'Record deleted.'});
+```
+all options
+```JavaScript
+this.$prompt({
+  title: "Confirm",
+  text: "Do you want to delete these items",
+  positiveButton: "Confirm",
+  negativeButton: "Cancel",
+  confirm: true //show negative button
+})
+```
+
+Wait dialog close result
+```JavaScript
+var result = await this.$prompt({...options});
+if (result === true) {
+  console.log("Closed with positive button");
+} else if (result === false) {
+  console.log("Closed with cancel button or clicked outside to close");
+}
+```
+By default new Prompt is queued.
diff --git a/client/src/vue-utilities/prompt-service/index.js b/client/src/vue-utilities/prompt-service/index.js
new file mode 100644
index 0000000..23bb38b
--- /dev/null
+++ b/client/src/vue-utilities/prompt-service/index.js
@@ -0,0 +1,48 @@
+import Prompt from "./Prompt";
+
+export default function(vuetify) {
+  return function install(Vue) {
+    Prompt.vuetify = vuetify;
+    var PromptComponent = Vue.extend(Prompt);
+    var component = new PromptComponent();
+    Vue.prototype.$promptAttach = function() {
+      var div = document.createElement("div");
+      this.$el.appendChild(div);
+      component.$mount(div);
+      return this;
+    };
+    Vue.prototype.$prompt = function({
+      title,
+      text,
+      positiveButton = "Confirm",
+      negativeButton = "Cancel",
+      confirm = false
+    } = {}) {
+      var resolve;
+      var p = new Promise(_resolve => {
+        resolve = _resolve;
+      });
+      function set() {
+        component.$data.title = title;
+        component.$data.text = text;
+        component.$data.positiveButton = positiveButton;
+        component.$data.negativeButton = negativeButton;
+        component.$data.confirm = confirm;
+        component.$data.resolve = resolve;
+        component.$data.show = true;
+      }
+      if (!component.$data.show) {
+        set();
+      } else {
+        var unwatch = component.$watch("show", () => {
+          unwatch();
+          set();
+        });
+      }
+      return p;
+    };
+    Vue.prototype.$prompt.hide = function() {
+      component.$data.show = false;
+    };
+  };
+}
diff --git a/client/src/vue-utilities/snackbar-service/README.md b/client/src/vue-utilities/snackbar-service/README.md
new file mode 100644
index 0000000..85a0d39
--- /dev/null
+++ b/client/src/vue-utilities/snackbar-service/README.md
@@ -0,0 +1,53 @@
+## snackbar-service
+A Vue plugin that provides a Snackbar service in Vue components.
+
+This plugin depends on Vuetify `<v-snackbar>` component
+
+### Install
+Install plugin
+```JavaScript
+import Vuetify from "vuetify/lib";
+import snackbarService from "vue-utilities/snackbar-service";
+
+let vuetify = new Vuetify();
+Vue.use(snackbarService(vuetify));
+```
+Attach container element to DOM after Vue app initialization
+```JavaScript
+new Vue({
+  render: h => h(App)
+}).$mount("#app")
+.$snackbarAttach();
+```
+### Usage
+Call `this.$snackbar()` Within Vue Component
+
+Basic usage
+```JavaScript
+this.$snackbar({ text: 'Import complete.'});
+```
+all options
+```JavaScript
+this.$snackbar({
+  text: "Item saved",
+  button: "Undo",
+  timeout: 6000,
+  immediate: true,
+  callback: () => {
+    this.undo();
+  }
+})
+```
+Set snackbar options
+```JavaScript
+this.$snackbar.setOptions({ bottom: true })
+```
+or set with `$snackbarAttach()`
+```JavaScript
+new Vue({
+  render: h => h(App)
+}).$mount("#app")
+.$snackbarAttach({ right: true });
+```
+
+By default new Snackbar is queued. But immediate option will hide current snackbar and show new one immediately.
diff --git a/client/src/vue-utilities/snackbar-service/Snackbar.vue b/client/src/vue-utilities/snackbar-service/Snackbar.vue
new file mode 100644
index 0000000..552cf94
--- /dev/null
+++ b/client/src/vue-utilities/snackbar-service/Snackbar.vue
@@ -0,0 +1,28 @@
+<template>
+  <v-snackbar v-model="show" v-bind="options" :timeout="timeout">
+    {{ text }}
+    <v-btn v-if="callback" color="primary" text @click="buttonClicked">
+      {{ button }}
+    </v-btn>
+  </v-snackbar>
+</template>
+
+<script>
+export default {
+  name: "Snackbar",
+  data: () => ({
+    show: false,
+    text: "",
+    button: "",
+    callback: null,
+    timeout: 0,
+    options: { left: true }
+  }),
+  methods: {
+    buttonClicked() {
+      this.callback();
+      this.show = false;
+    }
+  }
+};
+</script>
diff --git a/client/src/vue-utilities/snackbar-service/index.js b/client/src/vue-utilities/snackbar-service/index.js
new file mode 100644
index 0000000..bae1d28
--- /dev/null
+++ b/client/src/vue-utilities/snackbar-service/index.js
@@ -0,0 +1,52 @@
+import Snackbar from "./Snackbar";
+
+export default function(vuetify) {
+  return function install(Vue) {
+    Snackbar.vuetify = vuetify;
+    var SnackbarComponent = Vue.extend(Snackbar);
+    var component = new SnackbarComponent();
+    Vue.prototype.$snackbarAttach = function(options) {
+      if (options) {
+        component.$data.options = options;
+      }
+      var div = document.createElement("div");
+      this.$el.appendChild(div);
+      component.$mount(div);
+      return this;
+    };
+    Vue.prototype.$snackbar = function({
+      text,
+      button,
+      callback,
+      timeout,
+      immediate
+    }) {
+      function set() {
+        component.$data.text = text;
+        component.$data.button = button;
+        component.$data.callback = callback;
+        component.$data.timeout = timeout || 2000;
+        component.$data.show = true;
+      }
+      if (!component.$data.show) {
+        set();
+      } else {
+        if (immediate) {
+          component.$data.show = false;
+          setTimeout(set, 0);
+        } else {
+          var unwatch = component.$watch("show", () => {
+            unwatch();
+            set();
+          });
+        }
+      }
+    };
+    Vue.prototype.$snackbar.hide = function() {
+      component.$data.show = false;
+    };
+    Vue.prototype.$snackbar.setOptions = function(options) {
+      component.$data.options = options;
+    };
+  };
+}
diff --git a/client/src/vue-utilities/v-mousetrap/README.md b/client/src/vue-utilities/v-mousetrap/README.md
new file mode 100644
index 0000000..024fd07
--- /dev/null
+++ b/client/src/vue-utilities/v-mousetrap/README.md
@@ -0,0 +1,44 @@
+## v-mousetrap
+A Vue plugin that provide binding to [mousetrap](https://craig.is/killing/mice) as Vue directive.
+
+The key benefit of this library is that the keyboard binding will share the same life cycle as the bound element. it will be created and destroyed as the element created and destroyed.
+
+### Install
+Install peer dependancy
+
+```npm install mousetrap```
+
+
+Install plugin
+```JavaScript
+import vMousetrap from "vue-utilities/v-mousetrap";
+Vue.use(vMousetrap);
+```
+
+### Usage
+
+Value of `bind` will be passed to mousetrap as first argument and the `handler` will be passed as the second argument. The first argument of the handler will be the bound element or component. Rest of the arguments will be the passed directly from mousetrap.
+
+Single binding
+```html
+<div v-mousetrap="{ bind: 'b', handler: () => {} }"></div>
+```
+Multiple binding
+```html
+<div v-mousetrap="[
+    { bind: '=', handler: increase },
+    { bind: '-', handler: decrease }
+  ]"></div>
+```
+Disabled
+```html
+<div v-mousetrap="{ bind:'alt+s', handler: save, disabled: !changed }"></div>
+```
+By default event is bound to the `document`, but with the `.element` modifier the handler will be bound to the directive element.
+```html
+<textarea v-mousetrap.element="{ bind:'esc', handler: el => el.blur() }"></textarea>
+```
+Binds the `keypress` event by default, but supports handlers for all event types (mousetrap supports `keypress`, `keydown`, and `keyup`) by passing an object instead of a function.
+```html
+<div v-mousetrap="{ bind: 'b', handler: { keydown: keyDownHandler, keyup: keyUpHandler }"></div>
+```
diff --git a/client/src/vue-utilities/v-mousetrap/index.js b/client/src/vue-utilities/v-mousetrap/index.js
new file mode 100644
index 0000000..8080087
--- /dev/null
+++ b/client/src/vue-utilities/v-mousetrap/index.js
@@ -0,0 +1,50 @@
+import Mousetrap from "mousetrap";
+import _ from "lodash";
+
+function bind(el, value, bindElement) {
+  var mousetrap = new Mousetrap(bindElement ? el : undefined);
+  el.mousetrap = mousetrap;
+  if (!_.isArray(value)) {
+    value = [value];
+  }
+  value.forEach(({ bind, handler, disabled }) => {
+    const handlerType = typeof handler;
+    if (!disabled) {
+      if (handlerType === "function") {
+        mousetrap.bind(bind, function() {
+          handler.apply(this, [el, ...arguments]);
+        });
+      } else if (handlerType === "object") {
+        Object.keys(handler).forEach(eventType => {
+          const eventHandler = handler[eventType];
+          mousetrap.bind(
+            bind,
+            function() {
+              eventHandler.apply(this, [el, ...arguments]);
+            },
+            eventType
+          );
+        });
+      }
+    }
+  });
+}
+
+function unbind(el) {
+  el.mousetrap.reset();
+}
+
+export default function install(Vue) {
+  Vue.directive("mousetrap", {
+    inserted(el, { value, modifiers }) {
+      bind(el, value, modifiers.element);
+    },
+    update(el, { value, modifiers }) {
+      unbind(el);
+      bind(el, value, modifiers.element);
+    },
+    unbind(el) {
+      unbind(el);
+    }
+  });
+}

From c4962d0d2568ae6c3808e759f6bd3ba57ce57eb5 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Mon, 9 Nov 2020 19:15:04 -0700
Subject: [PATCH 09/16] Rework WindowControl component

---
 client/src/components/VtkViewer.vue     |   8 +
 client/src/components/WindowControl.vue | 405 ++++++++++++++++++------
 client/src/store/index.js               |   2 +-
 3 files changed, 319 insertions(+), 96 deletions(-)

diff --git a/client/src/components/VtkViewer.vue b/client/src/components/VtkViewer.vue
index 6422005..94fa3ae 100644
--- a/client/src/components/VtkViewer.vue
+++ b/client/src/components/VtkViewer.vue
@@ -73,6 +73,11 @@ export default {
       this.initializeView();
     },
     currentDataset() {
+      // console.log(
+      //   `vtkviewer override ${this.representation.getProxyName()} to ${
+      //     this.slice
+      //   }`
+      // );
       this.representation.setSlice(this.slice);
     },
     currentSession() {
@@ -98,6 +103,9 @@ export default {
       fill2DView(this.view);
       if (this.name !== "default") {
         this.modifiedSubscription = this.representation.onModified(() => {
+          // console.log(
+          //   `VtkViewer representation modified ${this.representation.getProxyName()}: ${this.representation.getSlice()}`
+          // );
           if (!this.loadingDataset) {
             this.slice = this.representation.getSlice();
           }
diff --git a/client/src/components/WindowControl.vue b/client/src/components/WindowControl.vue
index 9507db0..3d89ed5 100644
--- a/client/src/components/WindowControl.vue
+++ b/client/src/components/WindowControl.vue
@@ -4,11 +4,37 @@ import { mapState, mapGetters } from "vuex";
 export default {
   name: "WindowControl",
   data: () => ({
-    windowWidth: 0,
-    windowLevel: 0
+    active: {
+      width: 100,
+      widthDomain: {
+        min: 0,
+        max: 100,
+        step: 1
+      },
+      level: 0,
+      levelDomain: {
+        min: -50,
+        max: 50,
+        step: 1
+      }
+    },
+    default: {
+      width: 100,
+      widthDomain: {
+        min: 0,
+        max: 100,
+        step: 1
+      },
+      level: 0,
+      levelDomain: {
+        min: -50,
+        max: 50,
+        step: 1
+      }
+    }
   }),
   computed: {
-    ...mapState(["proxyManager"]),
+    ...mapState(["proxyManager", "loadingDataset"]),
     ...mapGetters(["currentDataset"]),
     representation() {
       return this.currentDataset && this.proxyManager.getRepresentations()[0];
@@ -18,14 +44,96 @@ export default {
     },
     windowLevelDomain() {
       return this.representation.getPropertyDomainByName("windowLevel");
-    }
+    },
+    validatedMinWidth: {
+      get: function() {
+        return this.active.widthDomain.min;
+      },
+      set: function(val) {
+        if (val < 0) {
+          this.active.widthDomain.min = 0;
+        } else {
+          this.active.widthDomain.min = val;
+        }
+      }
+    },
+    userDefinedValues: {
+      get: function() {
+        // return (
+        //   this.active.width !== this.default.width ||
+        //   this.active.widthDomain.min !== this.default.widthDomain.min ||
+        //   this.active.widthDomain.max !== this.default.widthDomain.max ||
+        //   this.active.widthDomain.step !== this.default.widthDomain.step ||
+        //   this.active.level !== this.default.level ||
+        //   this.active.levelDomain.min !== this.default.levelDomain.min ||
+        //   this.active.levelDomain.max !== this.default.levelDomain.max ||
+        //   this.active.levelDomain.step !== this.default.levelDomain.step
+        // );
+        if (this.active.width !== this.default.width) {
+          console.log(`width mismatch: ${this.active.width} - ${this.default.width}`);
+          return true;
+        } else if (this.active.widthDomain.min !== this.default.widthDomain.min) {
+          console.log(`width domain min mismatch: ${this.active.widthDomain.min} - ${this.default.widthDomain.min}`);
+          return true;
+        } else if (this.active.widthDomain.max !== this.default.widthDomain.max) {
+          console.log(`width domain max mismatch: ${this.active.widthDomain.max} - ${this.default.widthDomain.max}`);
+          return true;
+        } else if (this.active.widthDomain.step !== this.default.widthDomain.step) {
+          console.log(`width domain step mismatch: ${this.active.widthDomain.step} - ${this.default.widthDomain.step}`);
+          return true;
+        } else if (this.active.level !== this.default.level) {
+          console.log(`level mismatch: ${this.active.level} - ${this.default.level}`);
+          return true;
+        } else if (this.active.levelDomain.min !== this.default.levelDomain.min) {
+          console.log(`level domain min mismatch: ${this.active.levelDomain.min} - ${this.default.levelDomain.min}`);
+          return true;
+        } else if (this.active.levelDomain.max !== this.default.levelDomain.max) {
+          console.log(`level domain max mismatch: ${this.active.levelDomain.max} - ${this.default.levelDomain.max}`);
+          return true;
+        } else if (this.active.levelDomain.step !== this.default.levelDomain.step) {
+          console.log(`level domain step mismatch: ${this.active.levelDomain.step} - ${this.default.levelDomain.step}`);
+          return true;
+        }
+        return false;
+      },
+      set: function (newValue) {
+        if (!newValue) {
+          this.active.width = this.default.width;
+          this.active.widthDomain.min = this.default.widthDomain.min;
+          this.active.widthDomain.max = this.default.widthDomain.max;
+          this.active.widthDomain.step = this.default.widthDomain.step;
+          this.active.level = this.default.level;
+          this.active.levelDomain.min = this.default.levelDomain.min;
+          this.active.levelDomain.max = this.default.levelDomain.max;
+          this.active.levelDomain.step = this.default.levelDomain.step;
+        }
+      }
+    },
   },
   watch: {
-    windowWidth(value) {
-      this.representation.setWindowWidth(value);
+    currentDataset() {
+      const userDefs = this.userDefinedValues;
+      console.log(`currentDataset changed, user is ${userDefs ? 'IN' : 'NOT IN'} control`);
+      this.updateDefaults();
+      if (!userDefs) {
+        console.log('setting active values to match defaults of new dataset');
+        this.updateActive();
+      }
+      console.log('taking component width/level and setting them on the repr');
+      this.representation.setWindowWidth(this.active.width);
+      this.representation.setWindowLevel(this.active.level);
+    },
+    'active.width': function (value) {
+      console.log(`Watcher: active width = ${value}`);
+      if (value !== this.representation.getWindowWidth()) {
+        this.representation.setWindowWidth(value);
+      }
     },
-    windowLevel(value) {
-      this.representation.setWindowLevel(value);
+    'active.level': function (value) {
+      console.log(`Watcher: active level = ${value}`);
+      if (value !== this.representation.getWindowLevel()) {
+        this.representation.setWindowLevel(value);
+      }
     },
     proxyManager() {
       this.modifiedSubscription.unsubscribe();
@@ -39,122 +147,229 @@ export default {
     this.modifiedSubscription.unsubscribe();
   },
   methods: {
+    updateDefaults() {
+      console.log('Updating default values');
+      const widthDomain = this.representation.getPropertyDomainByName("windowWidth");
+      const levelDomain = this.representation.getPropertyDomainByName("windowLevel");
+
+      this.default.widthDomain.min = widthDomain.min;
+      this.default.widthDomain.max = widthDomain.max;
+      this.default.widthDomain.step = widthDomain.step;
+      this.default.levelDomain.min = levelDomain.min;
+      this.default.levelDomain.max = levelDomain.max;
+      this.default.levelDomain.step = levelDomain.step;
+
+      this.default.level = this.representation.getWindowLevel();
+      this.default.width = this.representation.getWindowWidth();
+    },
+    updateActive() {
+      console.log('Updating active values');
+      this.active.widthDomain.min = this.default.widthDomain.min;
+      this.active.widthDomain.max = this.default.widthDomain.max;
+      this.active.widthDomain.step = this.default.widthDomain.step;
+      this.active.levelDomain.min = this.default.levelDomain.min;
+      this.active.levelDomain.max = this.default.levelDomain.max;
+      this.active.levelDomain.step = this.default.levelDomain.step;
+
+      this.active.width = this.default.width;
+      this.active.level = this.default.level;
+    },
     bindWindow() {
-      this.windowWidth = this.representation.getWindowWidth();
-      this.windowLevel = this.representation.getWindowLevel();
-      console.log("WindowControl subscribing representation 'modified' event");
+      console.log("WindowControl bindWindow: subscribe representation 'modified'");
+      this.updateDefaults();
+      this.updateActive();
       this.modifiedSubscription = this.representation.onModified(() => {
-        this.windowWidth = this.representation.getWindowWidth();
-        this.windowLevel = this.representation.getWindowLevel();
-        // console.log(`reprensentation modified, width: ${this.windowWidth} (range: [
-        //   ${this.windowWidthDomain.min}, ${this.windowWidthDomain.max}
-        // ]), new level: ${this.windowLevel} (range: [
-        //   ${this.windowLevelDomain.min}, ${this.windowLevelDomain.max}
-        // ])`);
-        // const arrayRange = this.representation.getInputDataSet().getPointData().getArray(0).getRange();
-        // console.log(`Image data array range: [${arrayRange[0]}, ${arrayRange[1]}]`);
+        if (!this.loadingDataset && !this.userDefinedValues) {
+          console.log('repr modified, UPDATE');
+          this.updateActive();
+        } else {
+          console.log(`repr modified, IGNORE (loading = ${
+            this.loadingDataset
+          }, userDefined = ${this.userDefinedValues})`);
+        }
       });
     },
     increaseWindowWidth() {
       var windowWidth = Math.min(
-        (this.windowWidth +=
-          (this.windowWidthDomain.max - this.windowWidthDomain.min) / 30),
-        this.windowWidthDomain.max
+        (this.active.width +=
+          (this.active.widthDomain.max - this.active.widthDomain.min) / 30),
+        this.active.widthDomain.max
       );
-      this.windowWidth = windowWidth;
+      this.active.width = windowWidth;
     },
     decreaseWindowWidth() {
       var windowWidth = Math.max(
-        (this.windowWidth -=
-          (this.windowWidthDomain.max - this.windowWidthDomain.min) / 30),
-        this.windowWidthDomain.min
+        (this.active.width -=
+          (this.active.widthDomain.max - this.active.widthDomain.min) / 30),
+        this.active.widthDomain.min
       );
       this.windowWidth = windowWidth;
     },
     increaseWindowLevel() {
       var windowLevel = Math.min(
-        (this.windowLevel +=
-          (this.windowLevelDomain.max - this.windowLevelDomain.min) / 30),
-        this.windowLevelDomain.max
+        (this.active.level +=
+          (this.active.levelDomain.max - this.active.levelDomain.min) / 30),
+        this.active.levelDomain.max
       );
-      this.windowLevel = windowLevel;
+      this.active.level = windowLevel;
     },
     decreaseWindowLevel() {
       var windowLevel = Math.max(
-        (this.windowLevel -=
-          (this.windowLevelDomain.max - this.windowLevelDomain.min) / 30),
-        this.windowLevelDomain.min
+        (this.active.level -=
+          (this.active.levelDomain.max - this.active.levelDomain.min) / 30),
+        this.active.levelDomain.min
       );
-      this.windowLevel = windowLevel;
+      this.active.level = windowLevel;
+    },
+    validateWindowWidth(val) {
+      console.log(`blur: ${val}`);
     }
   }
 };
 </script>
 
 <template>
-  <div>
-    <v-layout>
-      <v-flex>
-        <v-slider
-          class="mr-4 verticalOffset"
-          hide-details
-          label="Window"
-          thumb-label
-          :thumb-size="48"
-          :min="windowWidthDomain.min"
-          :max="windowWidthDomain.max"
-          :step="windowWidthDomain.step"
-          v-model="windowWidth"
-          v-mousetrap="[
-            { bind: '=', handler: increaseWindowWidth },
-            { bind: '-', handler: decreaseWindowWidth }
-          ]"
-        ></v-slider>
-      </v-flex>
-      <v-flex shrink style="width: 80px">
-        <v-text-field
-          class="mt-0"
-          hide-details
-          single-line
-          type="number"
-          v-model="windowWidth"
-        ></v-text-field>
-      </v-flex>
-    </v-layout>
-    <v-layout>
-      <v-flex>
-        <v-slider
-          class="mr-4 verticalOffset"
-          hide-details
-          label="Level"
-          thumb-label
-          :thumb-size="48"
-          :min="windowLevelDomain.min"
-          :max="windowLevelDomain.max"
-          :step="windowLevelDomain.step"
-          v-model="windowLevel"
-          v-mousetrap="[
-            { bind: ']', handler: increaseWindowLevel },
-            { bind: '[', handler: decreaseWindowLevel }
-          ]"
-        ></v-slider>
-      </v-flex>
-      <v-flex shrink style="width: 80px">
-        <v-text-field
-          class="mt-0"
-          hide-details
-          single-line
-          type="number"
-          v-model="windowLevel"
-        ></v-text-field>
-      </v-flex>
-    </v-layout>
+  <div class="component">
+    <v-container>
+      <v-row align="center" class="headerRow">
+        <v-col class="pb-1 pt-0">
+          <div class="componentLabel">Window Controls</div>
+        </v-col>
+        <v-col class="pb-1 pt-0">
+          <div>
+            <v-switch
+              v-model="userDefinedValues"
+              label="User Defined Values"
+            ></v-switch>
+          </div>
+        </v-col>
+      </v-row>
+      <v-row>
+        <v-col cols="3" align-self="center" class="pb-1 pt-0">
+          <div>Width</div>
+        </v-col>
+        <v-col cols="9" class="pb-1 pt-0">
+          <v-text-field
+            class="mt-0"
+            hide-details
+            single-line
+            solo
+            dense
+            type="number"
+            v-model="active.width"
+          ></v-text-field>
+        </v-col>
+      </v-row>
+      <v-row>
+        <v-col cols="3" class="pb-1 pt-0">
+          <v-text-field
+            class="mt-0"
+            hide-details
+            single-line
+            solo
+            dense
+            type="number"
+            v-model="validatedMinWidth"
+          ></v-text-field>
+        </v-col>
+        <v-col align-self="end" cols="6" class="pb-1 pt-0">
+          <v-slider
+            hide-details
+            thumb-label
+            :thumb-size="48"
+            :min="active.widthDomain.min"
+            :max="active.widthDomain.max"
+            :step="active.widthDomain.step"
+            v-model="active.width"
+            v-mousetrap="[
+              { bind: ']', handler: increaseWindowWidth },
+              { bind: '[', handler: decreaseWindowWidth }
+            ]"
+          ></v-slider>
+        </v-col>
+        <v-col cols="3" class="pb-1 pt-0">
+          <v-text-field
+            class="mt-0"
+            hide-details
+            single-line
+            solo
+            dense
+            type="number"
+            v-model="active.widthDomain.max"
+          ></v-text-field>
+        </v-col>
+      </v-row>
+      <v-row>
+        <v-col cols="3" align-self="center" class="pb-1 pt-0">
+          <div>Level</div>
+        </v-col>
+        <v-col cols="9" class="pb-1 pt-0">
+          <v-text-field
+            class="mt-0"
+            hide-details
+            single-line
+            solo
+            dense
+            type="number"
+            v-model="active.level"
+          ></v-text-field>
+        </v-col>
+      </v-row>
+      <v-row>
+        <v-col cols="3" class="pb-1 pt-0">
+          <v-text-field
+            class="mt-0"
+            hide-details
+            single-line
+            solo
+            dense
+            type="number"
+            v-model="active.levelDomain.min"
+          ></v-text-field>
+        </v-col>
+        <v-col align-self="end" cols="6" class="pb-1 pt-0">
+          <v-slider
+            hide-details
+            thumb-label
+            :thumb-size="48"
+            :min="active.levelDomain.min"
+            :max="active.levelDomain.max"
+            :step="active.levelDomain.step"
+            v-model="active.level"
+            v-mousetrap="[
+              { bind: ']', handler: increaseWindowLevel },
+              { bind: '[', handler: decreaseWindowLevel }
+            ]"
+          ></v-slider>
+        </v-col>
+        <v-col cols="3" class="pb-1 pt-0">
+          <v-text-field
+            class="mt-0"
+            hide-details
+            single-line
+            solo
+            dense
+            type="number"
+            v-model="active.levelDomain.max"
+          ></v-text-field>
+        </v-col>
+      </v-row>
+    </v-container>
   </div>
 </template>
 
 <style lang="scss">
-.verticalOffset {
-  position: relative;
-  top: 12px;
+.noTopPad {
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+
+.componentLabel {
+  font-weight: bold;
+  text-align: left;
+}
+
+.headerRow {
+  max-height: 60px;
 }
 </style>
diff --git a/client/src/store/index.js b/client/src/store/index.js
index a408ec1..5727a9f 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -294,7 +294,7 @@ const store = new Vuex.Store({
       // This try catch and within logic are mainly for handling data doesn't exist issue
       try {
         var imagedata = await loadFileAndGetData(dataset._id);
-        // console.log("swapping datasets, here we setInputData()");
+        console.log("swapping datasets, here we setInputData()");
         sourceProxy.setInputData(imagedata);
         if (needPrep || !state.proxyManager.getViews().length) {
           prepareProxyManager(state.proxyManager);

From 6a9fa5f4277a7131cbdc93d4ee750e7b63677683 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Tue, 10 Nov 2020 10:44:52 -0700
Subject: [PATCH 10/16] Compress window controls layout a little more

---
 client/package-lock.json                | 6 +++---
 client/src/components/WindowControl.vue | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index a45a38a..43f7585 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1047,9 +1047,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.14.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.5.tgz",
-      "integrity": "sha512-H5Wn24s/ZOukBmDn03nnGTp18A60ny9AmCwnEcgJiTgSGsCO7k+NWP7zjCCbhlcnVCoI+co52dUAt9GMhOSULw==",
+      "version": "14.14.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.6.tgz",
+      "integrity": "sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==",
       "dev": true
     },
     "@types/normalize-package-data": {
diff --git a/client/src/components/WindowControl.vue b/client/src/components/WindowControl.vue
index 3d89ed5..486c6d1 100644
--- a/client/src/components/WindowControl.vue
+++ b/client/src/components/WindowControl.vue
@@ -230,14 +230,15 @@ export default {
 
 <template>
   <div class="component">
-    <v-container>
-      <v-row align="center" class="headerRow">
+    <v-container class="pb-0 pt-0">
+      <v-row align="start" class="headerRow">
         <v-col class="pb-1 pt-0">
           <div class="componentLabel">Window Controls</div>
         </v-col>
         <v-col class="pb-1 pt-0">
           <div>
             <v-switch
+              class="mt-0 customSwitch"
               v-model="userDefinedValues"
               label="User Defined Values"
             ></v-switch>
@@ -364,6 +365,10 @@ export default {
   padding-bottom: 3px;
 }
 
+.customSwitch {
+  max-height: 40px;
+}
+
 .componentLabel {
   font-weight: bold;
   text-align: left;

From 1321c780209f0b926192fee066b75dfb25dcb082 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Tue, 10 Nov 2020 15:17:51 -0700
Subject: [PATCH 11/16] Fix issue and remove debug logging

By using a setTimeout in WindowControl currentDataset watcher, we
fix the problem with the user-defined slices getting reset (in the
VtkViewer) between datasets, when we are in userDefinedValues mode
in the WindowControl component.
---
 client/src/components/VtkViewer.vue     |  8 ---
 client/src/components/WindowControl.vue | 78 +++++++------------------
 2 files changed, 22 insertions(+), 64 deletions(-)

diff --git a/client/src/components/VtkViewer.vue b/client/src/components/VtkViewer.vue
index 94fa3ae..6422005 100644
--- a/client/src/components/VtkViewer.vue
+++ b/client/src/components/VtkViewer.vue
@@ -73,11 +73,6 @@ export default {
       this.initializeView();
     },
     currentDataset() {
-      // console.log(
-      //   `vtkviewer override ${this.representation.getProxyName()} to ${
-      //     this.slice
-      //   }`
-      // );
       this.representation.setSlice(this.slice);
     },
     currentSession() {
@@ -103,9 +98,6 @@ export default {
       fill2DView(this.view);
       if (this.name !== "default") {
         this.modifiedSubscription = this.representation.onModified(() => {
-          // console.log(
-          //   `VtkViewer representation modified ${this.representation.getProxyName()}: ${this.representation.getSlice()}`
-          // );
           if (!this.loadingDataset) {
             this.slice = this.representation.getSlice();
           }
diff --git a/client/src/components/WindowControl.vue b/client/src/components/WindowControl.vue
index 486c6d1..1d388ad 100644
--- a/client/src/components/WindowControl.vue
+++ b/client/src/components/WindowControl.vue
@@ -59,42 +59,16 @@ export default {
     },
     userDefinedValues: {
       get: function() {
-        // return (
-        //   this.active.width !== this.default.width ||
-        //   this.active.widthDomain.min !== this.default.widthDomain.min ||
-        //   this.active.widthDomain.max !== this.default.widthDomain.max ||
-        //   this.active.widthDomain.step !== this.default.widthDomain.step ||
-        //   this.active.level !== this.default.level ||
-        //   this.active.levelDomain.min !== this.default.levelDomain.min ||
-        //   this.active.levelDomain.max !== this.default.levelDomain.max ||
-        //   this.active.levelDomain.step !== this.default.levelDomain.step
-        // );
-        if (this.active.width !== this.default.width) {
-          console.log(`width mismatch: ${this.active.width} - ${this.default.width}`);
-          return true;
-        } else if (this.active.widthDomain.min !== this.default.widthDomain.min) {
-          console.log(`width domain min mismatch: ${this.active.widthDomain.min} - ${this.default.widthDomain.min}`);
-          return true;
-        } else if (this.active.widthDomain.max !== this.default.widthDomain.max) {
-          console.log(`width domain max mismatch: ${this.active.widthDomain.max} - ${this.default.widthDomain.max}`);
-          return true;
-        } else if (this.active.widthDomain.step !== this.default.widthDomain.step) {
-          console.log(`width domain step mismatch: ${this.active.widthDomain.step} - ${this.default.widthDomain.step}`);
-          return true;
-        } else if (this.active.level !== this.default.level) {
-          console.log(`level mismatch: ${this.active.level} - ${this.default.level}`);
-          return true;
-        } else if (this.active.levelDomain.min !== this.default.levelDomain.min) {
-          console.log(`level domain min mismatch: ${this.active.levelDomain.min} - ${this.default.levelDomain.min}`);
-          return true;
-        } else if (this.active.levelDomain.max !== this.default.levelDomain.max) {
-          console.log(`level domain max mismatch: ${this.active.levelDomain.max} - ${this.default.levelDomain.max}`);
-          return true;
-        } else if (this.active.levelDomain.step !== this.default.levelDomain.step) {
-          console.log(`level domain step mismatch: ${this.active.levelDomain.step} - ${this.default.levelDomain.step}`);
-          return true;
-        }
-        return false;
+        return (
+          this.active.width !== this.default.width ||
+          this.active.widthDomain.min !== this.default.widthDomain.min ||
+          this.active.widthDomain.max !== this.default.widthDomain.max ||
+          this.active.widthDomain.step !== this.default.widthDomain.step ||
+          this.active.level !== this.default.level ||
+          this.active.levelDomain.min !== this.default.levelDomain.min ||
+          this.active.levelDomain.max !== this.default.levelDomain.max ||
+          this.active.levelDomain.step !== this.default.levelDomain.step
+        );
       },
       set: function (newValue) {
         if (!newValue) {
@@ -113,24 +87,27 @@ export default {
   watch: {
     currentDataset() {
       const userDefs = this.userDefinedValues;
-      console.log(`currentDataset changed, user is ${userDefs ? 'IN' : 'NOT IN'} control`);
       this.updateDefaults();
+
       if (!userDefs) {
-        console.log('setting active values to match defaults of new dataset');
         this.updateActive();
       }
-      console.log('taking component width/level and setting them on the repr');
-      this.representation.setWindowWidth(this.active.width);
-      this.representation.setWindowLevel(this.active.level);
+
+      const repr = this.representation;
+      const activeWidth = this.active.width;
+      const activeLevel = this.active.level;
+
+      window.setTimeout(function() {
+        repr.setWindowWidth(activeWidth);
+        repr.setWindowLevel(activeLevel);
+      }, 0);
     },
     'active.width': function (value) {
-      console.log(`Watcher: active width = ${value}`);
       if (value !== this.representation.getWindowWidth()) {
         this.representation.setWindowWidth(value);
       }
     },
     'active.level': function (value) {
-      console.log(`Watcher: active level = ${value}`);
       if (value !== this.representation.getWindowLevel()) {
         this.representation.setWindowLevel(value);
       }
@@ -148,7 +125,6 @@ export default {
   },
   methods: {
     updateDefaults() {
-      console.log('Updating default values');
       const widthDomain = this.representation.getPropertyDomainByName("windowWidth");
       const levelDomain = this.representation.getPropertyDomainByName("windowLevel");
 
@@ -163,7 +139,6 @@ export default {
       this.default.width = this.representation.getWindowWidth();
     },
     updateActive() {
-      console.log('Updating active values');
       this.active.widthDomain.min = this.default.widthDomain.min;
       this.active.widthDomain.max = this.default.widthDomain.max;
       this.active.widthDomain.step = this.default.widthDomain.step;
@@ -175,17 +150,11 @@ export default {
       this.active.level = this.default.level;
     },
     bindWindow() {
-      console.log("WindowControl bindWindow: subscribe representation 'modified'");
       this.updateDefaults();
       this.updateActive();
       this.modifiedSubscription = this.representation.onModified(() => {
         if (!this.loadingDataset && !this.userDefinedValues) {
-          console.log('repr modified, UPDATE');
           this.updateActive();
-        } else {
-          console.log(`repr modified, IGNORE (loading = ${
-            this.loadingDataset
-          }, userDefined = ${this.userDefinedValues})`);
         }
       });
     },
@@ -221,9 +190,6 @@ export default {
       );
       this.active.level = windowLevel;
     },
-    validateWindowWidth(val) {
-      console.log(`blur: ${val}`);
-    }
   }
 };
 </script>
@@ -283,8 +249,8 @@ export default {
             :step="active.widthDomain.step"
             v-model="active.width"
             v-mousetrap="[
-              { bind: ']', handler: increaseWindowWidth },
-              { bind: '[', handler: decreaseWindowWidth }
+              { bind: '=', handler: increaseWindowWidth },
+              { bind: '-', handler: decreaseWindowWidth }
             ]"
           ></v-slider>
         </v-col>

From 1705f5410a05ad3de5025e1607b787b9edab1cf8 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Tue, 10 Nov 2020 16:37:33 -0700
Subject: [PATCH 12/16] Make sure to schedule load of first dataset in clicked
 scan first

Also fix some lint errors
---
 client/src/components/WindowControl.vue | 18 +++++++++++-------
 client/src/store/index.js               | 16 ++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/client/src/components/WindowControl.vue b/client/src/components/WindowControl.vue
index 1d388ad..7c1ccae 100644
--- a/client/src/components/WindowControl.vue
+++ b/client/src/components/WindowControl.vue
@@ -70,7 +70,7 @@ export default {
           this.active.levelDomain.step !== this.default.levelDomain.step
         );
       },
-      set: function (newValue) {
+      set: function(newValue) {
         if (!newValue) {
           this.active.width = this.default.width;
           this.active.widthDomain.min = this.default.widthDomain.min;
@@ -82,7 +82,7 @@ export default {
           this.active.levelDomain.step = this.default.levelDomain.step;
         }
       }
-    },
+    }
   },
   watch: {
     currentDataset() {
@@ -102,12 +102,12 @@ export default {
         repr.setWindowLevel(activeLevel);
       }, 0);
     },
-    'active.width': function (value) {
+    "active.width": function(value) {
       if (value !== this.representation.getWindowWidth()) {
         this.representation.setWindowWidth(value);
       }
     },
-    'active.level': function (value) {
+    "active.level": function(value) {
       if (value !== this.representation.getWindowLevel()) {
         this.representation.setWindowLevel(value);
       }
@@ -125,8 +125,12 @@ export default {
   },
   methods: {
     updateDefaults() {
-      const widthDomain = this.representation.getPropertyDomainByName("windowWidth");
-      const levelDomain = this.representation.getPropertyDomainByName("windowLevel");
+      const widthDomain = this.representation.getPropertyDomainByName(
+        "windowWidth"
+      );
+      const levelDomain = this.representation.getPropertyDomainByName(
+        "windowLevel"
+      );
 
       this.default.widthDomain.min = widthDomain.min;
       this.default.widthDomain.max = widthDomain.max;
@@ -189,7 +193,7 @@ export default {
         this.active.levelDomain.min
       );
       this.active.level = windowLevel;
-    },
+    }
   }
 };
 </script>
diff --git a/client/src/store/index.js b/client/src/store/index.js
index 5727a9f..e7117c7 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -294,7 +294,7 @@ const store = new Vuex.Store({
       // This try catch and within logic are mainly for handling data doesn't exist issue
       try {
         var imagedata = await loadFileAndGetData(dataset._id);
-        console.log("swapping datasets, here we setInputData()");
+        // console.log("swapping datasets, here we setInputData()");
         sourceProxy.setInputData(imagedata);
         if (needPrep || !state.proxyManager.getViews().length) {
           prepareProxyManager(state.proxyManager);
@@ -346,23 +346,23 @@ store.watch(
       });
       readDataQueue = [];
     }
-    readDataQueue = [];
+    const curSesh = store.getters.currentSession;
+    console.log(`current session: ${curSesh.experiment}/${curSesh.name}`);
+    const firstDatasetToLoad = store.state.sessionDatasets[curSesh.id][0];
+    readDataQueue = [loadFile(firstDatasetToLoad)];
     const newExperimentSessions = store.state.experimentSessions[newValue.id];
     newExperimentSessions.forEach(sessionId => {
       const sessionDatasets = store.state.sessionDatasets[sessionId];
       sessionDatasets.forEach(datasetId => {
-        readDataQueue.push(loadFile(datasetId));
+        if (datasetId !== firstDatasetToLoad) {
+          readDataQueue.push(loadFile(datasetId));
+        }
       });
       readDataQueue.push({
         status: "sessionLoaded",
         sessionId
       });
     });
-    if (store.getters.firstDatasetInNextSession) {
-      readDataQueue.unshift(
-        loadFile(store.getters.firstDatasetInNextExperiment)
-      );
-    }
     var concurrency = navigator.hardwareConcurrency + 1 || 2;
     calculateCachedPercentage();
     for (var i = 0; i < concurrency; i++) {

From 95ac556a102c4f037bd3bfb50116b5b3af6997f6 Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Tue, 10 Nov 2020 20:21:39 -0700
Subject: [PATCH 13/16] Reorganize and clean up annotation ui panel

---
 client/src/components/WindowControl.vue |   2 +-
 client/src/views/Dataset.vue            | 383 +++++++++++++-----------
 2 files changed, 204 insertions(+), 181 deletions(-)

diff --git a/client/src/components/WindowControl.vue b/client/src/components/WindowControl.vue
index 7c1ccae..cec4dcc 100644
--- a/client/src/components/WindowControl.vue
+++ b/client/src/components/WindowControl.vue
@@ -200,7 +200,7 @@ export default {
 
 <template>
   <div class="component">
-    <v-container class="pb-0 pt-0">
+    <v-container class="pa-0">
       <v-row align="start" class="headerRow">
         <v-col class="pb-1 pt-0">
           <div class="componentLabel">Window Controls</div>
diff --git a/client/src/views/Dataset.vue b/client/src/views/Dataset.vue
index 450206f..7fe732d 100644
--- a/client/src/views/Dataset.vue
+++ b/client/src/views/Dataset.vue
@@ -86,6 +86,15 @@ export default {
       } else {
         return [];
       }
+    },
+    lastNoteTruncated() {
+      const segments = this.noteSegments;
+      if (segments.length > 0) {
+        const lastSeg = segments.slice(-1)[0];
+        console.log(`last note: ${lastSeg}`);
+        return `${lastSeg.substring(0, 32)}...`;
+      }
+      return "";
     }
   },
   async created() {
@@ -450,7 +459,7 @@ export default {
                   {{ Math.round(sessionCachedPercentage * 100) }}%
                 </v-flex>
               </v-layout>
-              <v-layout class="bottom-row">
+              <v-layout align-center class="bottom-row">
                 <v-flex shrink>
                   <v-btn
                     fab
@@ -483,198 +492,208 @@ export default {
               </v-layout>
             </v-flex>
             <v-flex xs4 class="mx-2">
-              <v-layout align-center justify-center class="body-2">
-                <v-flex>
-                  {{ getSiteDisplayName(currentSession.meta.site) }},
-                  <a
-                    :href="
-                      `/xnat/app/action/DisplayItemAction/search_value/${currentSession.meta.experimentId}/search_element/xnat:mrSessionData/search_field/xnat:mrSessionData.ID`
-                    "
-                    target="_blank"
-                    >{{ currentSession.meta.experimentId }}</a
-                  >
-                  (<a
-                    :href="
-                      `/redcap/redcap_v8.4.0/DataEntry/record_home.php?pid=20&arm=1&id=${currentSession.meta.experimentId2}`
-                    "
-                    target="_blank"
-                    >{{ currentSession.meta.experimentId2 }}</a
-                  >),
-                  {{ currentSession.name }}
-                </v-flex>
-                <v-spacer />
-                <v-flex
-                  shrink
-                  class="experiment-note"
-                  v-if="currentSession.meta.experimentNote"
-                >
-                  <v-tooltip top>
-                    <template v-slot:activator="{ on }">
-                      <span v-on="on">{{
-                        currentSession.meta.experimentNote
-                      }}</span>
-                    </template>
-                    Experiment note: {{ currentSession.meta.experimentNote }}
-                  </v-tooltip>
-                </v-flex>
-              </v-layout>
-              <v-layout align-center v-if="noteSegments.length">
-                <v-flex shrink>
-                  Note history: {{ noteSegments.slice(-1)[0] }}
-                </v-flex>
-                <v-flex shrink class="pa-0" v-if="noteSegments.length > 1">
-                  <v-menu
-                    v-model="showNotePopup"
-                    :close-on-content-click="false"
-                    :nudge-right="250"
-                    offset-y
-                    open-on-hover
-                    top
-                    left
-                    ref="historyMenu"
-                  >
-                    <template v-slot:activator="{ on }">
+              <v-container class="pa-0">
+                <v-row>
+                  <v-col cols="12" class="pb-1 pt-0">
+                    <v-container class="pa-0">
+                      <v-row>
+                        <v-col cols="3" class="pb-1 pt-0">
+                          Site
+                        </v-col>
+                        <v-col cols="9" class="pb-1 pt-0 justifyRight">
+                          {{ getSiteDisplayName(currentSession.meta.site) }}
+                        </v-col>
+                      </v-row>
+                      <v-row>
+                        <v-col cols="3" class="pb-1 pt-0">
+                          Experiment
+                        </v-col>
+                        <v-col cols="9" class="pb-1 pt-0 justifyRight">
+                          <a
+                            :href="
+                              `/xnat/app/action/DisplayItemAction/search_value/${currentSession.meta.experimentId}/search_element/  xnat:mrSessionData/      search_field/xnat:mrSessionData.ID`
+                            "
+                            target="_blank"
+                            >{{ currentSession.meta.experimentId }}</a
+                          >
+                        </v-col>
+                      </v-row>
+                      <v-row>
+                        <v-col cols="3" class="pb-1 pt-0">
+                          Session
+                        </v-col>
+                        <v-col cols="9" class="pb-1 pt-0 justifyRight">
+                          {{ currentSession.name }}
+                        </v-col>
+                      </v-row>
+                    </v-container>
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col class="pb-1 pt-0" cols="10">
+                    Note history: {{ lastNoteTruncated }}
+                  </v-col>
+                  <v-col class="pb-1 pt-0" cols="1">
+                    <v-menu
+                      v-model="showNotePopup"
+                      :close-on-content-click="false"
+                      :nudge-right="250"
+                      offset-y
+                      open-on-hover
+                      top
+                      left
+                      ref="historyMenu"
+                    >
+                      <template v-slot:activator="{ on }">
+                        <v-btn
+                          text
+                          small
+                          icon
+                          :disabled="noteSegments.length < 1"
+                          class="ma-0"
+                          v-on="on"
+                          v-mousetrap="{
+                            bind: 'h',
+                            handler: () => (showNotePopup = !showNotePopup)
+                          }"
+                          ><v-icon>arrow_drop_up</v-icon></v-btn
+                        >
+                      </template>
+                      <v-card>
+                        <v-card-text class="note-history">
+                          <pre>{{ note }}</pre>
+                        </v-card-text>
+                      </v-card>
+                    </v-menu>
+                  </v-col>
+                  <v-col class="pb-1 pt-0" cols="1">
+                    <v-btn
+                      text
+                      small
+                      icon
+                      class="ma-0"
+                      :disabled="userLevel.value > 1"
+                      @click="enableEditHistroy"
+                      ><v-icon style="font-size: 18px;">edit</v-icon></v-btn
+                    >
+                  </v-col>
+                </v-row>
+                <v-row class="pb-1 pt-1">
+                  <v-col cols="11" class="pb-1 pt-0 pr-0">
+                    <v-text-field
+                      class="note-field"
+                      label="Note"
+                      solo
+                      hide-details
+                      @blur="setNote($event)"
+                      @input="reviewChanged = true"
+                      :value="this.newNote"
+                      ref="note"
+                      v-mousetrap="{ bind: 'n', handler: focusNote }"
+                      v-mousetrap.element="{
+                        bind: 'esc',
+                        handler: () => $refs.note.blur()
+                      }"
+                    ></v-text-field>
+                  </v-col>
+                  <v-col cols="1" class="pb-1 pt-0">
+                    <v-tooltip top>
+                      <template v-slot:activator="{ on }">
+                        <v-btn
+                          text
+                          icon
+                          small
+                          color="grey"
+                          class="my-0"
+                          :disabled="!reviewChanged"
+                          v-on="on"
+                          @click="loadSessionMeta"
+                        >
+                          <v-icon>undo</v-icon>
+                        </v-btn>
+                      </template>
+                      <span>Revert</span>
+                    </v-tooltip>
+                  </v-col>
+                </v-row>
+                <v-row no-gutters class="pb-1">
+                  <v-col cols="6" class="pb-1 pt-0" v-if="userLevel.value <= 2">
+                    <v-btn-toggle
+                      class="buttons"
+                      v-model="rating"
+                      @change="ratingChanged"
+                    >
                       <v-btn
+                        v-if="userLevel.value <= 1"
                         text
                         small
-                        icon
-                        class="ma-0"
-                        v-on="on"
+                        value="bad"
+                        color="red"
+                        :disabled="!newNote && !note"
                         v-mousetrap="{
-                          bind: 'h',
-                          handler: () => (showNotePopup = !showNotePopup)
+                          bind: 'b',
+                          handler: () => setRating('bad')
                         }"
-                        ><v-icon>arrow_drop_up</v-icon></v-btn
+                        >Bad</v-btn
                       >
-                    </template>
-                    <v-card>
-                      <v-card-text class="note-history">
-                        <pre>{{ note }}</pre>
-                      </v-card-text>
-                    </v-card>
-                  </v-menu>
-                </v-flex>
-                <v-flex shrink class="pa-0" v-if="userLevel.value <= 1">
-                  <v-btn text small icon class="ma-0" @click="enableEditHistroy"
-                    ><v-icon style="font-size: 18px;">edit</v-icon></v-btn
-                  >
-                </v-flex>
-              </v-layout>
-              <div v-else style="height:28px;"></div>
-              <v-layout align-center>
-                <v-flex>
-                  <v-text-field
-                    class="note-field"
-                    label="Note"
-                    solo
-                    hide-details
-                    @blur="setNote($event)"
-                    @input="reviewChanged = true"
-                    :value="this.newNote"
-                    ref="note"
-                    v-mousetrap="{ bind: 'n', handler: focusNote }"
-                    v-mousetrap.element="{
-                      bind: 'esc',
-                      handler: () => $refs.note.blur()
-                    }"
-                  ></v-text-field>
-                </v-flex>
-                <v-flex shrink v-if="reviewChanged">
-                  <v-tooltip top>
-                    <template v-slot:activator="{ on }">
                       <v-btn
                         text
-                        icon
                         small
-                        color="grey"
-                        class="my-0"
-                        v-on="on"
-                        @click="loadSessionMeta"
+                        value="questionable"
+                        color="orange"
+                        :disabled="!newNote && !note"
+                        ><b>?</b></v-btn
                       >
-                        <v-icon>undo</v-icon>
-                      </v-btn>
-                    </template>
-                    <span>Revert</span>
-                  </v-tooltip>
-                </v-flex>
-              </v-layout>
-              <v-layout>
-                <v-flex v-if="userLevel.value <= 2">
-                  <v-btn-toggle
-                    class="buttons"
-                    v-model="rating"
-                    @change="ratingChanged"
-                  >
-                    <v-btn
-                      v-if="userLevel.value <= 1"
-                      text
-                      small
-                      value="bad"
-                      color="red"
-                      :disabled="!newNote && !note"
-                      v-mousetrap="{
-                        bind: 'b',
-                        handler: () => setRating('bad')
-                      }"
-                      >Bad</v-btn
-                    >
-                    <v-btn
-                      text
-                      small
-                      value="questionable"
-                      color="orange"
-                      :disabled="!newNote && !note"
-                      ><b>?</b></v-btn
-                    >
-                    <v-btn
-                      text
-                      small
-                      value="good"
-                      color="green"
-                      v-mousetrap="{
-                        bind: 'g',
-                        handler: () => setRating('good')
-                      }"
-                      >Good</v-btn
-                    >
+                      <v-btn
+                        text
+                        small
+                        value="good"
+                        color="green"
+                        v-mousetrap="{
+                          bind: 'g',
+                          handler: () => setRating('good')
+                        }"
+                        >Good</v-btn
+                      >
+                      <v-btn
+                        text
+                        small
+                        value="usableExtra"
+                        color="light-green"
+                        v-mousetrap="{
+                          bind: 'u',
+                          handler: () => setRating('usableExtra')
+                        }"
+                        >Extra</v-btn
+                      >
+                    </v-btn-toggle>
+                  </v-col>
+                  <v-col cols="4" class="pb-1 pt-0">
+                    <v-text-field
+                      class="small"
+                      label="Reviewer"
+                      solo
+                      disabled
+                      hide-details
+                      :value="reviewer"
+                    ></v-text-field>
+                  </v-col>
+                  <v-col cols="2" class="pb-1 pt-0">
                     <v-btn
-                      text
+                      color="primary"
+                      class="ma-0"
+                      style="height: 36px"
                       small
-                      value="usableExtra"
-                      color="light-green"
-                      v-mousetrap="{
-                        bind: 'u',
-                        handler: () => setRating('usableExtra')
-                      }"
-                      >Extra</v-btn
+                      :disabled="!reviewChanged"
+                      @click="save"
+                      v-mousetrap="{ bind: 'alt+s', handler: save }"
                     >
-                  </v-btn-toggle>
-                </v-flex>
-                <v-flex shrink>
-                  <v-text-field
-                    class="small"
-                    label="Reviewer"
-                    solo
-                    disabled
-                    hide-details
-                    :value="reviewer"
-                  ></v-text-field>
-                </v-flex>
-                <v-flex shrink>
-                  <v-btn
-                    color="primary"
-                    class="ma-0"
-                    style="height: 36px"
-                    small
-                    :disabled="!reviewChanged"
-                    @click="save"
-                    v-mousetrap="{ bind: 'alt+s', handler: save }"
-                  >
-                    Save
-                    <v-icon right>save</v-icon>
-                  </v-btn>
-                </v-flex>
-              </v-layout>
+                      Save
+                      <v-icon right>save</v-icon>
+                    </v-btn>
+                  </v-col>
+                </v-row>
+              </v-container>
             </v-flex>
             <v-flex xs4 class="mx-2">
               <WindowControl v-if="vtkViews.length" class="py-0" />
@@ -803,6 +822,10 @@ export default {
 </style>
 
 <style lang="scss">
+.justifyRight {
+  text-align: right;
+}
+
 .dataset {
   .v-text-field.small .v-input__control {
     min-height: 36px !important;

From 6512b179bd425ecee2bd5efddfbca5a2489da2cc Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Tue, 10 Nov 2020 20:56:44 -0700
Subject: [PATCH 14/16] Remove the slider balloon until we improve floating
 point number format

---
 client/src/components/WindowControl.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/components/WindowControl.vue b/client/src/components/WindowControl.vue
index cec4dcc..1946a53 100644
--- a/client/src/components/WindowControl.vue
+++ b/client/src/components/WindowControl.vue
@@ -246,7 +246,6 @@ export default {
         <v-col align-self="end" cols="6" class="pb-1 pt-0">
           <v-slider
             hide-details
-            thumb-label
             :thumb-size="48"
             :min="active.widthDomain.min"
             :max="active.widthDomain.max"
@@ -301,8 +300,6 @@ export default {
         <v-col align-self="end" cols="6" class="pb-1 pt-0">
           <v-slider
             hide-details
-            thumb-label
-            :thumb-size="48"
             :min="active.levelDomain.min"
             :max="active.levelDomain.max"
             :step="active.levelDomain.step"

From e6bfa66377f571495f009c10db5b5d0599f21aea Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Tue, 10 Nov 2020 20:59:29 -0700
Subject: [PATCH 15/16] Remove console logs

---
 client/src/store/index.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/store/index.js b/client/src/store/index.js
index e7117c7..637042d 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -294,7 +294,6 @@ const store = new Vuex.Store({
       // This try catch and within logic are mainly for handling data doesn't exist issue
       try {
         var imagedata = await loadFileAndGetData(dataset._id);
-        // console.log("swapping datasets, here we setInputData()");
         sourceProxy.setInputData(imagedata);
         if (needPrep || !state.proxyManager.getViews().length) {
           prepareProxyManager(state.proxyManager);
@@ -347,7 +346,6 @@ store.watch(
       readDataQueue = [];
     }
     const curSesh = store.getters.currentSession;
-    console.log(`current session: ${curSesh.experiment}/${curSesh.name}`);
     const firstDatasetToLoad = store.state.sessionDatasets[curSesh.id][0];
     readDataQueue = [loadFile(firstDatasetToLoad)];
     const newExperimentSessions = store.state.experimentSessions[newValue.id];
@@ -414,7 +412,6 @@ function getData(id, file) {
         .getPointData()
         .getArray(0)
         .getRange();
-      // console.log(`vtkImageData array range ${dataRange}`);
       datasetCache.set(id, imageData);
       expandSessionRange(id, dataRange);
       return imageData;

From e1a90afe7ba2cb68d37e2b2f6acb691901cc283c Mon Sep 17 00:00:00 2001
From: Scott Wittenburg <scott.wittenburg@kitware.com>
Date: Thu, 12 Nov 2020 16:11:11 -0700
Subject: [PATCH 16/16] If swapToDataset loads a new experiment, cancel pending
 loads

---
 client/src/store/index.js | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/client/src/store/index.js b/client/src/store/index.js
index 637042d..89c414b 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -262,17 +262,35 @@ const store = new Vuex.Store({
       state.errorLoadingDataset = false;
       var oldSession = getters.currentSession;
       const newSession = state.sessions[dataset.session];
+      const oldExperiment = getters.currentExperiment ? getters.currentExperiment.id : null;
+      const newExperiment = state.sessions[dataset.session].experiment
       var newProxyManager = false;
       if (oldSession !== newSession && state.proxyManager) {
-        // At this moment. use new proxyManger between session could avoid a not showing issue.
-        // However maybe unnecessary
+        // If we don't "shrinkProxyManager()" and reinitialize it between
+        // "sessions" (a.k.a "scans"), then we can end up with no image
+        // slices displayed, even though we have the data and attempted
+        // to render it.  This may be due to image extents changing between
+        // scans, which is not the case from one timestep of a single scan
+        // to tne next.
         shrinkProxyManager(state.proxyManager);
         newProxyManager = true;
-        readDataQueue.forEach(({ fileP }) => {
-          fileP.cancel();
-        });
-        readDataQueue = [];
+
+        if (oldExperiment !== newExperiment) {
+          // If we have changed experiments and there is anything left
+          // in the loading queue, it indicates the user interrupted the
+          // current loading process before it was finished.  So we need
+          // to cancel any outstanding loads and empty the queue.  The
+          // caches will be deleted in the experiment watcher which runs
+          // after this.
+          readDataQueue.forEach(({ fileP }) => {
+            if (fileP) {
+              fileP.cancel();
+            }
+          });
+          readDataQueue = [];
+        }
       }
+
       if (!state.proxyManager || newProxyManager) {
         state.proxyManager = vtkProxyManager.newInstance({
           proxyConfiguration: proxy