#255 enable to make interaction after switching of snapshots in project

m2ms · Apr 16, 2020 · b72493b · b72493b
1 parent e5ee3d7
commit b72493b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/js/components/helpers/useEnableUserInteracion.js b/js/components/helpers/useEnableUserInteracion.js
@@ -21,7 +21,8 @@ export const useDisableUserInteraction = () => {
       countOfPendingNglObjects[VIEWS.SUMMARY_VIEW] === 0 &&
       countOfPendingNglObjects[VIEWS.MAJOR_VIEW] === 0 &&
       ((countOfRemainingMoleculeGroups === 0 && proteinsHasLoaded === true) ||
-        (countOfRemainingMoleculeGroups === null && proteinsHasLoaded === null))
+        (countOfRemainingMoleculeGroups === null && proteinsHasLoaded === null) ||
+        (countOfRemainingMoleculeGroups === null && proteinsHasLoaded === true))
     ) {
       if (disableInteraction === true) {
         setDisableInteraction(false);

diff --git a/js/components/preview/redux/dispatchActions.js b/js/components/preview/redux/dispatchActions.js
@@ -69,7 +69,11 @@ export const shouldLoadProtein = ({
     }
 
     // decide to load existing snapshot
-    else if (currentSnapshotID !== null && currentSnapshotData !== null) {
+    else if (
+      currentSnapshotID !== null &&
+      (!routeSnapshotID || routeSnapshotID === currentSnapshotID.toString()) &&
+      currentSnapshotData !== null
+    ) {
       dispatch(reloadSession(currentSnapshotData, nglViewList));
     }
 

diff --git a/js/components/snapshot/redux/dispatchActions.js b/js/components/snapshot/redux/dispatchActions.js
@@ -29,8 +29,8 @@ export const reloadSession = (snapshotData, nglViewList) => (dispatch, getState)
   if (nglViewList.length > 0) {
     dispatch(reloadSelectionReducer(snapshotData.selectionReducers));
 
-    nglViewList.forEach(async nglView => {
-      await dispatch(reloadNglViewFromSnapshot(nglView.stage, nglView.id, snapshotData.nglReducers));
+    nglViewList.forEach(nglView => {
+      dispatch(reloadNglViewFromSnapshot(nglView.stage, nglView.id, snapshotData.nglReducers));
     });
 
     if (snapshotData.selectionReducers.vectorOnList.length !== 0) {