Merge remote-tracking branch 'remotes/origin/#486' into allfunctionality

m2ms · Jan 27, 2021 · 672fcab · 672fcab
2 parents 1c4dfba + 022446b
commit 672fcab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/js/components/snapshot/redux/dispatchActions.js b/js/components/snapshot/redux/dispatchActions.js
@@ -452,6 +452,7 @@ export const saveAndShareSnapshot = nglViewList => async (dispatch, getState) =>
 
       dispatch(setIsLoadingSnapshotDialog(false));
     } catch (error) {
+      dispatch(setIsLoadingSnapshotDialog(false));
       throw new Error(error);
     }
   }

diff --git a/js/reducers/tracking/dispatchActions.js b/js/reducers/tracking/dispatchActions.js
@@ -1976,9 +1976,7 @@ const handleChangeRepresentationAction = (action, isAdd, nglView) => (dispatch,
 const changeMolecularRepresentation = (action, representation, type, parentKey, nglView) => (dispatch, getState) => {
   const newRepresentationType = type;
 
-  //const newRepresentationType = e.target.value;
   const oldRepresentation = JSON.parse(JSON.stringify(representation));
-  //const nglView = getNglView(objectsInView[parentKey].display_div);
   const comp = nglView.stage.getComponentsByName(parentKey).first;
 
   // add representation to NGL
@@ -2164,26 +2162,26 @@ const isActionWithinTimeLimit = (firstAction, secondAction) => {
   return diffInSeconds <= NUM_OF_SECONDS_TO_IGNORE_MERGE;
 };
 
-export const manageSendTrackingActions = (projectID, copy) => (dispatch, getState) => {
+export const manageSendTrackingActions = (projectID, copy) => async (dispatch, getState) => {
   if (copy) {
-    dispatch(checkActionsProject(projectID));
+    await dispatch(checkActionsProject(projectID));
   } else {
-    dispatch(checkSendTrackingActions(true));
+    await dispatch(checkSendTrackingActions(true));
   }
 };
 
-export const checkSendTrackingActions = (save = false) => (dispatch, getState) => {
+export const checkSendTrackingActions = (save = false) => async (dispatch, getState) => {
   const state = getState();
   const currentProject = state.projectReducers.currentProject;
   const sendActions = state.trackingReducers.send_actions_list;
   const length = sendActions.length;
 
   if (length >= CONSTANTS.COUNT_SEND_TRACK_ACTIONS || save) {
-    dispatch(sendTrackingActions(sendActions, currentProject));
+    await dispatch(sendTrackingActions(sendActions, currentProject, true));
   }
 };
 
-const sendTrackingActions = (sendActions, project, clear = true) => async (dispatch, getState) => {
+const sendTrackingActions = (sendActions, project, clear = false) => async (dispatch, getState) => {
   if (project) {
     const projectID = project && project.projectID;
 
@@ -2230,6 +2228,8 @@ export const setProjectTrackingActions = () => (dispatch, getState) => {
 
 const getTrackingActions = (projectID, withTreeSeparation) => (dispatch, getState) => {
   const state = getState();
+  const currentProject = state.projectReducers.currentProject;
+  const currentProjectID = currentProject && currentProject.projectID;
   const sendActions = state.trackingReducers.send_actions_list;
 
   if (projectID) {
@@ -2259,7 +2259,7 @@ const getTrackingActions = (projectID, withTreeSeparation) => (dispatch, getStat
           }
         }
 
-        let projectActions = [...listToSet, ...sendActions];
+        let projectActions = currentProjectID && currentProjectID != null ? [...listToSet, ...sendActions] : listToSet;
         dispatch(setProjectActionList(projectActions));
         return Promise.resolve(projectActions);
       })
@@ -2321,7 +2321,7 @@ const checkActionsProject = projectID => async (dispatch, getState) => {
   );
 };
 
-const copyActionsToProject = (toProject, setActionList = true, clearSendList = true) => async (dispatch, getState) => {
+const copyActionsToProject = (toProject, setActionList = true, clear = false) => async (dispatch, getState) => {
   const state = getState();
   const actionList = state.trackingReducers.project_actions_list;
 
@@ -2335,7 +2335,7 @@ const copyActionsToProject = (toProject, setActionList = true, clearSendList = t
     if (setActionList === true) {
       dispatch(setActionsList(newActionsList));
     }
-    await dispatch(sendTrackingActions(newActionsList, toProject, clearSendList));
+    await dispatch(sendTrackingActions(newActionsList, toProject, clear));
   }
 };