#462 Mass actions

m2ms · Nov 26, 2020 · 799efbb · 799efbb
1 parent 0cb5476
commit 799efbb
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 73 deletions.
diff --git a/js/components/datasets/inspirationDialog.js b/js/components/datasets/inspirationDialog.js
@@ -258,7 +258,7 @@ export const InspirationDialog = memo(
     const removeSelectedType = (type, skipTracking = false) => {
       if (type === 'ligand') {
         moleculeList.forEach(molecule => {
-          dispatch(removeType[type](stage, molecule, colourList[molecule.id % colourList.length], false, skipTracking));
+          dispatch(removeType[type](stage, molecule, skipTracking));
         });
       } else {
         moleculeList.forEach(molecule => {

diff --git a/js/components/datasets/redux/dispatchActions.js b/js/components/datasets/redux/dispatchActions.js
@@ -455,11 +455,11 @@ export const removeOrAddAllHitProteinsOfList = (areAllSelected, moleculeList = [
 
   if (areAllSelected) {
     let molecules = dispatch(getSelectedMoleculesByType(type, false, moleculeList));
-    dispatch(setDeselectedAllByType(type, molecules));
+    dispatch(setDeselectedAllByType(type, null, molecules, true));
     dispatch(removeAllHitProteins(moleculeList, stage, true));
   } else {
     let molecules = dispatch(getSelectedMoleculesByType(type, true, moleculeList));
-    dispatch(setSelectedAllByType(type, molecules));
+    dispatch(setSelectedAllByType(type, null, molecules, true));
     dispatch(addAllHitProteins(moleculeList, stage, true));
   }
 };
@@ -497,11 +497,11 @@ export const removeOrAddAllComplexesOfList = (areAllSelected, moleculeList = [],
 
   if (areAllSelected) {
     let molecules = dispatch(getSelectedMoleculesByType(type, false, moleculeList));
-    dispatch(setDeselectedAllByType(type, molecules));
+    dispatch(setDeselectedAllByType(type, null, molecules, true));
     dispatch(removeAllComplexes(moleculeList, stage, true));
   } else {
     let molecules = dispatch(getSelectedMoleculesByType(type, true, moleculeList));
-    dispatch(setSelectedAllByType(type, molecules));
+    dispatch(setSelectedAllByType(type, null, molecules, true));
     dispatch(addAllComplexes(moleculeList, stage, true));
   }
 };

diff --git a/js/reducers/tracking/constants.js b/js/reducers/tracking/constants.js
@@ -57,13 +57,16 @@ export const actionDescription = {
   TO_SHOPPING_CART: 'to shopping cart',
   FROM_SHOPPING_CART: 'from shopping cart',
   LIGAND: 'Ligand',
-  SIDECHAINS: 'Sidechain',
-  INTERACTIONS: 'Interaction',
+  SIDECHAIN: 'Sidechain',
+  INTERACTION: 'Interaction',
   VECTOR: 'Vector',
   SURFACE: 'Surface',
   SITE: 'Site',
   TARGET: 'Target',
-  ALL: 'All'
+  ALL: 'All',
+  LIGANDS: 'Ligands',
+  SIDECHAINS: 'Sidechains',
+  INTERACTIONS: 'Interactions'
 };
 
 export const actionObjectType = {