#2 add fixed conflicts

xchem · Mar 10, 2020 · c6b091e · c6b091e
1 parent c79a8e3
commit c6b091e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/js/components/preview/moleculeGroups/redux/dispatchActions.js b/js/components/preview/moleculeGroups/redux/dispatchActions.js
@@ -76,10 +76,6 @@ export const saveMoleculeGroupsToNglView = (molGroupList, stage, projectId) => d
   }
 };
 
-export const loadMoleculeGroups = ({ stage, setOldUrl, oldUrl, onCancel, isStateLoaded, projectId }) => (
-  dispatch,
-  getState
-) => {
 export const selectFirstMolGroup = ({ summaryView }) => (dispatch, getState) => {
   const currentMolGroup = getState().apiReducers.mol_group_list[0];
   if (currentMolGroup) {
@@ -102,7 +98,7 @@ export const selectFirstMolGroup = ({ summaryView }) => (dispatch, getState) =>
   }
 };
 
-export const loadMoleculeGroups = ({ summaryView, setOldUrl, oldUrl, onCancel, isStateLoaded }) => (
+export const loadMoleculeGroups = ({ summaryView, setOldUrl, oldUrl, onCancel, isStateLoaded, projectId }) => (
   dispatch,
   getState
 ) => {
@@ -136,14 +132,12 @@ export const clearMoleculeGroupSelection = ({ getNglView }) => dispatch => {
   const majorViewStage = getNglView(VIEWS.MAJOR_VIEW) && getNglView(VIEWS.MAJOR_VIEW).stage;
   const summaryViewStage = getNglView(VIEWS.SUMMARY_VIEW) && getNglView(VIEWS.SUMMARY_VIEW).stage;
 
-  dispatch(reloadNglViewFromSnapshot(majorViewStage, VIEWS.MAJOR_VIEW))
-    .catch(error => {
-      throw new Error(error);
-    });
-  dispatch(reloadNglViewFromSnapshot(summaryViewStage, VIEWS.SUMMARY_VIEW))
-    .catch(error => {
-      throw new Error(error);
-    });
+  dispatch(reloadNglViewFromSnapshot(majorViewStage, VIEWS.MAJOR_VIEW)).catch(error => {
+    throw new Error(error);
+  });
+  dispatch(reloadNglViewFromSnapshot(summaryViewStage, VIEWS.SUMMARY_VIEW)).catch(error => {
+    throw new Error(error);
+  });
 
   // Reset selection reducer
   // remove sites selection

diff --git a/js/components/session/modalStateSave.js b/js/components/session/modalStateSave.js
@@ -216,7 +216,7 @@ const ModalStateSave = memo(
 
 function mapStateToProps(state) {
   return {
-    saveType: state.sessionReducers.saveType,
+    saveType: state.snapshotReducers.saveType,
     savingState: state.apiReducers.savingState,
     latestSession: state.apiReducers.latestSession,
     latestSnapshot: state.apiReducers.latestSnapshot,