Implements purple part of #1370 (#413)

* - first implementation of #1354 * - updated message for #1354 * - cleanup for #1354 * - implemented #1361 - improvements for #1354 * - implemented #1376 - also fixed bug in download structures dialog where only first download got added to the dropdown menu * - partial fix for purple release for #1370
xchem · Mar 7, 2024 · 5862ad9 · 5862ad9
1 parent 42fdbad
commit 5862ad9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/js/components/preview/molecule/observationCmpList.js b/js/components/preview/molecule/observationCmpList.js
@@ -1107,7 +1107,7 @@ export const ObservationCmpList = memo(({ hideProjects }) => {
                   [classes.contColButtonHalfSelected]: false
                 })}
                 onClick={() => {
-                  dispatch(selectAllHits(joinedMoleculeLists, setNextXMolecules, selectAllHitsPressed));
+                  dispatch(selectAllHits(filteredLHSCompoundsList, setNextXMolecules, selectAllHitsPressed));
                   setSelectAllHitsPressed(!selectAllHitsPressed);
                 }}
                 disabled={false}
@@ -1214,7 +1214,12 @@ export const ObservationCmpList = memo(({ hideProjects }) => {
               >
                 {filteredLHSCompoundsList.map((data, index, array) => {
                   const molsForCmp = data.associatedObs;
-                  const selected = allSelectedMolecules.some(molecule => molecule.cmpd === data.origId);
+                  // const selected = allSelectedMolecules.some(
+                  //   molecule => molecule.cmpd === data.origId && molecule.canon_site_conf === data.canonSiteConf
+                  // );
+                  const selected = allSelectedMolecules.some(molecule =>
+                    data.associatedObs.some(obs => obs.id === molecule.id)
+                  );
 
                   return (
                     <ObservationCmpView

diff --git a/js/components/preview/molecule/observationCmpView/observationCmpView.js b/js/components/preview/molecule/observationCmpView/observationCmpView.js
@@ -1184,9 +1184,9 @@ const ObservationCmpView = memo(
                 onChange={e => {
                   const result = e.target.checked;
                   if (result) {
-                    observations?.forEach(obs => {
-                      dispatch(appendToMolListToEdit(obs.id));
-                    });
+                    if (observations?.length > 0) {
+                      dispatch(appendToMolListToEdit(observations[0].id));
+                    }
                     // dispatch(appendToObsCmpListToEdit(currentID));
                   } else {
                     observations?.forEach(obs => {

diff --git a/js/components/preview/molecule/redux/dispatchActions.js b/js/components/preview/molecule/redux/dispatchActions.js
@@ -1232,16 +1232,21 @@ export const withDisabledMoleculesNglControlButtons = (moleculeIds, type, callba
   });
 };
 
-export const selectAllHits = (allFilteredMolecules, setNextXMolecules, unselect) => (dispatch, getState) => {
+export const selectAllHits = (allFilteredLhsCompounds, setNextXMolecules, unselect) => (dispatch, getState) => {
   if (setNextXMolecules) {
-    dispatch(setNextXMolecules(allFilteredMolecules?.length || 0));
+    dispatch(setNextXMolecules(allFilteredLhsCompounds?.length || 0));
   }
-  const listOfIds = allFilteredMolecules.map(m => m.id);
+  const listOfIds = [];
+  allFilteredLhsCompounds.forEach(cmp => {
+    if (cmp.associatedObs?.length > 0) {
+      listOfIds.push(cmp.associatedObs[0].id);
+    }
+  });
   if (!unselect) {
     dispatch(setMolListToEdit(listOfIds));
-    dispatch(setSelectAllMolecules(allFilteredMolecules));
+    dispatch(setSelectAllMolecules(allFilteredLhsCompounds));
   } else {
     dispatch(setMolListToEdit([]));
-    dispatch(setUnselectAllMolecules(allFilteredMolecules));
+    dispatch(setUnselectAllMolecules(allFilteredLhsCompounds));
   }
 };