fix(store): remap view ids

Kitware · Jan 14, 2022 · 1bf2f84 · 1bf2f84
1 parent 9b16e8d
commit 1bf2f84
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/samples/index.js b/src/samples/index.js
@@ -2,7 +2,7 @@ import Images from 'paraview-glance/src/samples/images';
 
 const version =
   window.GLANCE_VERSION && window.GLANCE_VERSION !== 'master'
-    ? `v${window.GLANCE_VERSION}`
+    ? window.GLANCE_VERSION
     : 'master';
 
 // prettier-ignore

diff --git a/src/store/index.js b/src/store/index.js
@@ -498,6 +498,11 @@ function createStore(injected) {
         const ind = (keys.indexOf(lastViewPoint) + 1) % keys.length;
         dispatch('changeCameraViewPoint', keys[ind]);
       },
+
+      rewriteProxyIds({ dispatch }, oldToNewMapping) {
+        dispatch('widgets/rewriteProxyIds', oldToNewMapping);
+        dispatch('views/rewriteProxyIds', oldToNewMapping);
+      },
     },
   });
 

diff --git a/src/store/views.js b/src/store/views.js
@@ -9,6 +9,8 @@ import {
 } from 'paraview-glance/src/components/core/VtkView/constants';
 import { DEFAULT_BACKGROUND } from 'paraview-glance/src/components/core/VtkView/palette';
 
+import { wrapMutationAsAction } from 'paraview-glance/src/utils';
+
 const { CaptureOn } = WidgetManagerConstants;
 
 export default ({ proxyManager }) => ({
@@ -80,6 +82,11 @@ export default ({ proxyManager }) => ({
       Vue.set(state.viewOrder, index, viewType);
       Vue.set(state.viewOrder, dstIndex, srcViewType);
     },
+    rewriteProxyIds(state, idMapping) {
+      Object.entries(state.viewTypeToId).forEach(([type, id]) => {
+        state.viewTypeToId[type] = idMapping[id];
+      });
+    },
   },
   actions: {
     initViews({ commit, state }) {
@@ -235,5 +242,6 @@ export default ({ proxyManager }) => ({
     setMaxTextureLODSize({ commit }, size) {
       commit('setMaxTextureLODSize', size);
     },
+    rewriteProxyIds: wrapMutationAsAction('rewriteProxyIds'),
   },
 });
diff --git a/src/store/widgets.js b/src/store/widgets.js
@@ -83,10 +83,7 @@ export default ({ proxyManager }) => ({
     setCroppingState: wrapMutationAsAction('setCroppingState'),
     setDistanceUnitSymbol: wrapMutationAsAction('setDistanceUnitSymbol'),
     setDistanceUnitFactor: wrapMutationAsAction('setDistanceUnitFactor'),
-    rewriteProxyIds: {
-      root: true,
-      handler: wrapMutationAsAction('rewriteProxyIds'),
-    },
+    rewriteProxyIds: wrapMutationAsAction('rewriteProxyIds'),
     pxmProxyCreated: {
       root: true,
       handler({ state }, { proxy, proxyId }) {