Merge pull request #219 from m2ms/#451

#451 Compounds are not displayed for a vector

js/components/preview/molecule/redux/dispatchActions.js

@@ -42,8 +42,8 @@ import { setCompoundImage } from '../../summary/redux/actions';
 import { noCompoundImage } from '../../summary/redux/reducer';
 import { getMoleculeOfCurrentVector } from '../../../../reducers/selection/selectors';
 import { resetCurrentCompoundsSettings } from '../../compounds/redux/actions';
-import {selectMoleculeGroup} from '../../moleculeGroups/redux/dispatchActions';
-import {setDirectAccess, setDirectAccessProcessed} from '../../../../reducers/api/actions';
+import { selectMoleculeGroup } from '../../moleculeGroups/redux/dispatchActions';
+import { setDirectAccess, setDirectAccessProcessed } from '../../../../reducers/api/actions';
 
 /**
  * Convert the JSON into a list of arrow objects
@@ -442,5 +442,4 @@ export const applyDirectSelection = (stage, stageSummaryView) => (dispatch, getS
     // dispatch(setDirectAccess({}));
     dispatch(setDirectAccessProcessed(true));
   }
-
 };

js/reducers/api/selectors.js

@@ -1 +1,2 @@
 export const getMoleculeList = state => state.apiReducers.molecule_list;
+export const getAllMoleculeList = state => state.apiReducers.all_mol_lists;

js/reducers/selection/selectors.js

@@ -1,5 +1,5 @@
 import { createSelector } from 'reselect';
-import { getMoleculeList } from '../api/selectors';
+import { getAllMoleculeList } from '../api/selectors';
 
 const getCurrentCompoundClass = state => state.previewReducers.compounds.currentCompoundClass;
 const getVectorList = state => state.selectionReducers.vector_list;
@@ -10,14 +10,16 @@ const getCompoundsOfVectors = state => state.selectionReducers.compoundsOfVector
 export const getMoleculeOfCurrentVector = createSelector(
   getCurrentVector,
   getVectorList,
-  getMoleculeList,
+  getAllMoleculeList,
   (selectedVectorSmile, vectorList, moleculeList) => {
     if (selectedVectorSmile !== null && vectorList && moleculeList) {
       const foundedVector = vectorList.find(vector => vector.name.includes(selectedVectorSmile));
       if (foundedVector) {
-        for (const molecule in moleculeList) {
-          if (moleculeList.hasOwnProperty(molecule)) {
-            if (molecule.id === foundedVector.moleculeId) {
+        for (const moleculeProperty in moleculeList) {
+          if (moleculeList.hasOwnProperty(moleculeProperty)) {
+            let molecules = moleculeList[moleculeProperty];
+            let molecule = molecules.find(m => m.id === foundedVector.moleculeId);
+            if (molecule) {
               return molecule;
             }
           }