- partial changes

m2ms · Nov 26, 2020 · b406141 · b406141
1 parent 36c1f58
commit b406141
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/js/components/datasets/redux/selectors.js b/js/components/datasets/redux/selectors.js
@@ -266,11 +266,11 @@ export const getFilteredDatasetMoleculeList = createSelector(
         for (let prioAttr of sortedAttributes) {
           const order = filterProperties[prioAttr].order;
 
-          const scoreValueOfA =
+          let scoreValueOfA =
             Object.keys(a.numerical_scores).find(key => key === prioAttr) && a.numerical_scores[prioAttr];
           scoreValueOfA =
             scoreValueOfA || (Object.keys(a.text_scores).find(key => key === prioAttr) && a.text_scores[prioAttr]);
-          const scoreValueOfB =
+          let scoreValueOfB =
             Object.keys(b.numerical_scores).find(key => key === prioAttr) && b.numerical_scores[prioAttr];
           scoreValueOfB =
             scoreValueOfB || (Object.keys(b.text_scores).find(key => key === prioAttr) && b.text_scores[prioAttr]);
@@ -296,7 +296,6 @@ export const getFilteredDatasetMoleculeList = createSelector(
           }
         }
       });
-      return filteredMolecules;
     }
     return datasetMoleculeList;
   }

diff --git a/js/components/preview/Preview.js b/js/components/preview/Preview.js
@@ -95,6 +95,10 @@ const Preview = memo(({ isStateLoaded, hideProjects }) => {
   const currentDataset = customDatasets[selectedDatasetIndex];
   const target_on = useSelector(state => state.apiReducers.target_on);
 
+  const all_mol_lists = useSelector(state => state.apiReducers.all_mol_lists);
+  const moleculeLists = useSelector(state => state.datasetsReducers.moleculeLists);
+  const isLoadingMoleculeList = useSelector(state => state.datasetsReducers.isLoadingMoleculeList);
+
   /*
      Loading datasets
    */
@@ -117,6 +121,17 @@ const Preview = memo(({ isStateLoaded, hideProjects }) => {
     }
   }, [customDatasets.length, dispatch, target_on]);
 
+  useEffect(() => {
+    const allMolsGroupsCount = Object.keys(all_mol_lists || {}).length;
+    const moleculeListsCount = Object.keys(moleculeLists || {}).length;
+    if (allMolsGroupsCount > 0 && moleculeListsCount > 0 && !isLoadingMoleculeList) {
+      const keys = Object.keys(moleculeLists);
+      keys.forEach(key => {
+        let dataset = moleculeLists[key];
+      });
+    }
+  }, [all_mol_lists, moleculeLists, isLoadingMoleculeList]);
+
   const [molGroupsHeight, setMolGroupsHeight] = useState(0);
   const [filterItemsHeight, setFilterItemsHeight] = useState(0);
   const [filterItemsHeightDataset, setFilterItemsHeightDataset] = useState(0);

diff --git a/js/components/preview/molecule/moleculeList.js b/js/components/preview/molecule/moleculeList.js
@@ -249,7 +249,6 @@ export const MoleculeList = memo(({ height, setFilterItemsHeight, filterItemsHei
   const firstLoad = useSelector(state => state.selectionReducers.firstLoad);
   const target_on = useSelector(state => state.apiReducers.target_on);
   const mol_group_on = useSelector(state => state.apiReducers.mol_group_on);
-  const cached_mol_lists = useSelector(state => state.apiReducers.cached_mol_lists);
 
   const allInspirationMoleculeDataList = useSelector(state => state.datasetsReducers.allInspirationMoleculeDataList);
 

diff --git a/js/components/preview/molecule/redux/selectors.js b/js/components/preview/molecule/redux/selectors.js
@@ -35,13 +35,13 @@ export const selectJoinedMoleculeList = createSelector(
 );
 
 export const getMoleculeList = createSelector(
-  getCachedMoleculeLists,
+  getAllMolecules,
   getMoleculeGroupLists,
-  (cached_mol_lists, mol_group_list) => {
+  (all_mol_lists, mol_group_list) => {
     let cachedDataArray = [];
     if (mol_group_list) {
       mol_group_list.forEach(obj => {
-        const cachedData = cached_mol_lists[obj.id];
+        const cachedData = all_mol_lists[obj.id];
 
         if (cachedData && Array.isArray(cachedData)) {
           cachedDataArray.push(...cachedData);

diff --git a/js/components/preview/moleculeGroups/molGroupChecklist.js b/js/components/preview/moleculeGroups/molGroupChecklist.js
@@ -74,7 +74,7 @@ const molGroupChecklist = memo(({}) => {
                         color="primary"
                         checked={checked}
                         onChange={event => dispatch(onSelectMoleculeGroup({ moleculeGroup, stageSummaryView, majorViewStage, selectGroup: event.target.checked }))}
-                        disabled={disableUserInteraction}
+                        disabled={false}
                       />
                     </Grid>
                     <Grid item xs={10} className={checked ? classes.selectedLine : null}>