#571 [L] toggle not restored from snapshot for things on Selected Com…

…pounds tab
m2ms · Mar 12, 2021 · a063e67 · a063e67
1 parent 22a978c
commit a063e67
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/js/components/preview/compounds/redux/dispatchActions.js b/js/components/preview/compounds/redux/dispatchActions.js
@@ -212,17 +212,21 @@ const clearCompounds = (items, majorViewStage) => (dispatch, getState) => {
 };
 
 export const prepareFakeFilterData = () => (dispatch, getState) => {
-  dispatch(updateFilterShowedScoreProperties({
-    datasetID: AUX_VECTOR_SELECTOR_DATASET_ID,
-    scoreList: [{id: 1, name: 'smiles', description: 'smiles', computed_set: AUX_VECTOR_SELECTOR_DATASET_ID},
-      {id: 2, name: 'mol', description: 'mol', computed_set: AUX_VECTOR_SELECTOR_DATASET_ID},
-      {id: 3, name: 'vector', description: 'vector', computed_set: AUX_VECTOR_SELECTOR_DATASET_ID},
-      {id: 4, name: 'class', description: 'class', computed_set: AUX_VECTOR_SELECTOR_DATASET_ID},
-      {id: 5, name: 'compoundClass', description: 'compoundClass', computed_set: AUX_VECTOR_SELECTOR_DATASET_ID}]
-  }));
-}
-
-export const isCompoundFromVectorSelector = (data) => {
+  dispatch(
+    updateFilterShowedScoreProperties({
+      datasetID: AUX_VECTOR_SELECTOR_DATASET_ID,
+      scoreList: [
+        { id: 1, name: 'smiles', description: 'smiles', computed_set: AUX_VECTOR_SELECTOR_DATASET_ID },
+        { id: 2, name: 'mol', description: 'mol', computed_set: AUX_VECTOR_SELECTOR_DATASET_ID },
+        { id: 3, name: 'vector', description: 'vector', computed_set: AUX_VECTOR_SELECTOR_DATASET_ID },
+        { id: 4, name: 'class', description: 'class', computed_set: AUX_VECTOR_SELECTOR_DATASET_ID },
+        { id: 5, name: 'compoundClass', description: 'compoundClass', computed_set: AUX_VECTOR_SELECTOR_DATASET_ID }
+      ]
+    })
+  );
+};
+
+export const isCompoundFromVectorSelector = data => {
   if (data['index'] !== undefined) {
     return true;
   } else {
@@ -330,7 +334,8 @@ export const handleBuyListAll = ({ isSelected, items, majorViewStage }) => (disp
   }
 };
 
-export const handleShowVectorCompound = ({ isSelected, data, index, majorViewStage }) => async (dispatch, getState) => {
+export const handleShowVectorCompound = ({ isSelected, data, majorViewStage }) => async (dispatch, getState) => {
+  const index = data.index;
   await dispatch(showCompoundNglView({ majorViewStage, data, index }));
   if (isSelected === false) {
     dispatch(removeShowedCompoundFromList(index, data));

diff --git a/js/reducers/tracking/dispatchActions.js b/js/reducers/tracking/dispatchActions.js
@@ -467,7 +467,7 @@ const getCurrentActionList = (orderedActionList, type, collection, currentAction
 
   if (collection) {
     collection.forEach(data => {
-      let action = actionList.find(action => action.object_id === data.id && action.dataset_id === data.datasetId);
+      let action = actionList.find(a => a.object_id === data.id && a.dataset_id === data.datasetId);
 
       if (action) {
         currentActions.push(Object.assign({ ...action }));
@@ -972,8 +972,7 @@ const restoreCartActions = (orderedActionList, majorViewStage) => async (dispatc
   if (vectorCompoundActions) {
     vectorCompoundActions.forEach(action => {
       let data = action.item;
-      let compoundId = action.compoundId;
-      dispatch(handleShowVectorCompound({ isSelected: true, data, index: compoundId, majorViewStage: majorViewStage }));
+      dispatch(handleShowVectorCompound({ isSelected: true, data, majorViewStage: majorViewStage }));
     });
   }
 };
@@ -1936,8 +1935,7 @@ const handleVectorAction = (action, isSelected) => (dispatch, getState) => {
 const handleVectorCompoundAction = (action, isSelected, majorViewStage) => (dispatch, getState) => {
   if (action) {
     let data = action.item;
-    let compoundId = action.compoundId;
-    dispatch(handleShowVectorCompound({ isSelected, data, index: compoundId, majorViewStage: majorViewStage }));
+    dispatch(handleShowVectorCompound({ isSelected, data, majorViewStage: majorViewStage }));
   }
 };
 

diff --git a/js/reducers/tracking/trackingActions.js b/js/reducers/tracking/trackingActions.js
@@ -449,6 +449,7 @@ export const findTrackAction = (action, state) => {
     } else if (action.type === previewCompoundConstants.APPEND_SHOWED_COMPOUND_LIST) {
       let objectType = actionObjectType.COMPOUND;
       let objectName = action.item && action.item.vector;
+      let objectId = action.item && action.item.smiles;
 
       trackAction = {
         type: actionType.VECTOR_COUMPOUND_ADDED,
@@ -457,14 +458,15 @@ export const findTrackAction = (action, state) => {
         username: username,
         object_type: objectType,
         object_name: objectName,
-        object_id: action.payload,
+        object_id: objectId,
         item: action.item,
         compoundId: action.payload,
         text: `${actionDescription.COMPOUND} ${objectName} ${actionDescription.ADDED}`
       };
     } else if (action.type === previewCompoundConstants.REMOVE_SHOWED_COMPOUND_LIST) {
       let objectType = actionObjectType.COMPOUND;
       let objectName = action.item && action.item.vector;
+      let objectId = action.item && action.item.smiles;
 
       trackAction = {
         type: actionType.VECTOR_COUMPOUND_REMOVED,
@@ -473,7 +475,7 @@ export const findTrackAction = (action, state) => {
         username: username,
         object_type: objectType,
         object_name: objectName,
-        object_id: action.payload,
+        object_id: objectId,
         item: action.item,
         compoundId: action.payload,
         text: `${actionDescription.COMPOUND} ${objectName} ${actionDescription.REMOVED}`