- additional fixes

js/components/datasets/redux/actions.js

@@ -26,6 +26,11 @@ export const setMoleculeListIsLoading = isLoading => ({
   payload: isLoading
 });
 
+export const replaceAllMoleculeLists = allMoleculeLists => ({
+  type: constants.REPLACE_ALL_MOLECULELISTS,
+  payload: allMoleculeLists
+});
+
 export const setFilterSettings = (datasetID, filter) => ({
   type: constants.SET_FILTER_SETTINGS,
   payload: { datasetID, filter }

js/components/datasets/redux/constants.js

@@ -3,6 +3,7 @@ const prefix = 'CUSTOM_DATASETS_';
 export const constants = {
   ADD_DATASET: prefix + 'ADD_DATASET',
   SET_DATASET: prefix + 'SET_DATASET',
+  REPLACE_ALL_MOLECULELISTS: prefix + 'REPLACE_ALL_MOLECULELISTS',
   ADD_MOLECULELIST: prefix + 'ADD_MOLECULELIST',
   REMOVE_MOLECULELIST: prefix + 'REMOVE_MOLECULELIST',
   SET_IS_LOADING_MOLECULE_LIST: prefix + 'SET_IS_LOADING_MOLECULE_LIST',

js/components/datasets/redux/reducer.js

@@ -132,6 +132,9 @@ export const datasetsReducers = (state = INITIAL_STATE, action = {}) => {
     case constants.SET_DATASET:
       return Object.assign({}, state, { datasets: action.payload });
 
+    case constants.REPLACE_ALL_MOLECULELISTS:
+      return {...state, moleculeLists: action.payload};
+
     case constants.ADD_MOLECULELIST:
       // initialize also control containers
       const initializedState = initializeContainerLists(state, action.payload.datasetID);

js/components/preview/Preview.js

@@ -2,7 +2,7 @@
  * Created by abradley on 14/04/2018.
  */
 
-import React, { memo, useContext, useEffect, useRef, useState } from 'react';
+import React, { memo, useCallback, useContext, useEffect, useRef, useState } from 'react';
 import { Grid, makeStyles, useTheme, ButtonGroup, Button } from '@material-ui/core';
 import NGLView from '../nglView/nglView';
 import HitNavigator from './molecule/hitNavigator';
@@ -31,7 +31,7 @@ import { loadDatasetCompoundsWithScores, loadDataSets } from '../datasets/redux/
 import { SelectedCompoundList } from '../datasets/selectedCompoundsList';
 import { DatasetSelectorMenuButton } from '../datasets/datasetSelectorMenuButton';
 import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
-import { setMoleculeListIsLoading } from '../datasets/redux/actions';
+import { setMoleculeListIsLoading, replaceAllMoleculeLists } from '../datasets/redux/actions';
 
 const hitNavigatorWidth = 504;
 
@@ -125,12 +125,40 @@ const Preview = memo(({ isStateLoaded, hideProjects }) => {
     const allMolsGroupsCount = Object.keys(all_mol_lists || {}).length;
     const moleculeListsCount = Object.keys(moleculeLists || {}).length;
     if (allMolsGroupsCount > 0 && moleculeListsCount > 0 && !isLoadingMoleculeList) {
+      const allDatasets = {};
+      const allMolsMap = linearizeMoleculesLists();
       const keys = Object.keys(moleculeLists);
       keys.forEach(key => {
         let dataset = moleculeLists[key];
+        let mols = [];
+        dataset.forEach(dsMol => {
+          let inspirations = [];
+          dsMol.computed_inspirations.forEach(id => {
+            let lhsMol = allMolsMap[id];
+            inspirations.push(lhsMol);
+          });
+          dsMol.inspirations = inspirations;
+          mols.push(dsMol);
+        });
+        allDatasets[key] = mols;
       });
+      dispatch(replaceAllMoleculeLists(allDatasets));
     }
-  }, [all_mol_lists, moleculeLists, isLoadingMoleculeList]);
+  }, [all_mol_lists, moleculeLists, isLoadingMoleculeList, linearizeMoleculesLists, dispatch]);
+
+  const linearizeMoleculesLists = useCallback(() => {
+    const keys = Object.keys(all_mol_lists);
+    const allMolsMap = {};
+
+    keys.forEach(key => {
+      let molList = all_mol_lists[key];
+      molList.forEach(mol => {
+        allMolsMap[mol.id] = mol;
+      });
+    });
+
+    return allMolsMap;
+  }, [all_mol_lists]);
 
   const [molGroupsHeight, setMolGroupsHeight] = useState(0);
   const [filterItemsHeight, setFilterItemsHeight] = useState(0);