xchem#66 activate first molecule group

pavol-brunclik-m2ms · Mar 10, 2020 · 6f778b1 · 6f778b1
1 parent 92937ad
commit 6f778b1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/js/components/nglView/redux/dispatchActions.js b/js/components/nglView/redux/dispatchActions.js
@@ -19,7 +19,7 @@ export const toggleMoleculeGroup = (molGroupId, summaryViewStage, majorViewStage
   if (objIdx === -1) {
     dispatch(setMolGroupOn(molGroupId));
     selectionCopy.push(molGroupId);
-    dispatch(setMolGroupSelection(selectionCopy, summaryViewStage));
+    dispatch(setMolGroupSelection(selectionCopy));
     dispatch(
       deleteObject(
         {
@@ -37,7 +37,7 @@ export const toggleMoleculeGroup = (molGroupId, summaryViewStage, majorViewStage
     );
   } else {
     selectionCopy.splice(objIdx, 1);
-    dispatch(setMolGroupSelection(selectionCopy, summaryViewStage));
+    dispatch(setMolGroupSelection(selectionCopy));
     dispatch(
       deleteObject(
         {

diff --git a/js/components/preview/moleculeGroups/redux/dispatchActions.js b/js/components/preview/moleculeGroups/redux/dispatchActions.js
@@ -91,7 +91,28 @@ export const loadMoleculeGroups = ({ stage, setOldUrl, oldUrl, onCancel, isState
       old_url: oldUrl,
       afterPush: data_list => dispatch(saveMoleculeGroupsToNglView(data_list, stage, projectId)),
       list_type,
-      setObjectList: mol_group_list => dispatch(setMolGroupList(mol_group_list)),
+      setObjectList: async mol_group_list => {
+        await dispatch(setMolGroupList(mol_group_list));
+        const currentMolGroup = state.apiReducers.mol_group_list[0];
+        if (currentMolGroup) {
+          const currMolGroupID = currentMolGroup.id;
+          dispatch(setMolGroupOn(currMolGroupID));
+          const currentMolGroupStringID = `${OBJECT_TYPE.MOLECULE_GROUP}_${currMolGroupID}`;
+          dispatch(setMolGroupSelection([currMolGroupID]));
+          dispatch(
+            deleteObject(
+              {
+                display_div: VIEWS.SUMMARY_VIEW,
+                name: currentMolGroupStringID
+              },
+              stage
+            )
+          );
+          dispatch(
+            loadObject(Object.assign({ display_div: VIEWS.SUMMARY_VIEW }, generateSphere(currentMolGroup, true)), stage)
+          );
+        }
+      },
       cancel: onCancel
     });
   } else if (target_on && isStateLoaded) {