#267 moved logic from rebase to follow right side changes

m2ms · Apr 30, 2020 · 91ea286 · 91ea286
1 parent 1ad5079
commit 91ea286
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 56 deletions.
diff --git a/js/components/preview/molecule/hitNavigator.js b/js/components/preview/molecule/hitNavigator.js
@@ -21,6 +21,7 @@ import { MoleculeList } from './moleculeList';
 import { hideAllSelectedMolecules, initializeMolecules } from './redux/dispatchActions';
 import { PREDEFINED_FILTERS, DEFAULT_FILTER } from '../../../reducers/selection/constants';
 import { initializeDatasetMoleculeLists } from '../../datasets/redux/dispatchActions';
+import { useRouteMatch } from 'react-router-dom';
 
 const useStyles = makeStyles(theme => ({
   formControl: {
@@ -74,6 +75,9 @@ const HitNavigator = memo(
       oldUrl.current = url;
     };
 
+    let match = useRouteMatch();
+    const target = match && match.params && match.params.target;
+
     const isActiveFilter = !!(filterSettings || {}).active;
     const [sortDialogAnchorEl, setSortDialogAnchorEl] = useState(null);
     const [currentMolecules, setCurrentMolecules] = useState(null);
@@ -121,7 +125,8 @@ const HitNavigator = memo(
             cached_mol_lists[mol_group_on] &&
             firstLoadRef &&
             firstLoadRef.current &&
-            hideProjects
+            hideProjects &&
+            target !== undefined
           ) {
             console.log('initializing molecules');
             firstLoadRef.current = false;
@@ -141,8 +146,9 @@ const HitNavigator = memo(
       target_on,
       setCachedMolLists,
       cached_mol_lists,
+      dispatch,
       hideProjects,
-      dispatch
+      target
     ]);
 
     useEffect(() => {

diff --git a/js/components/preview/molecule/moleculeList.js b/js/components/preview/molecule/moleculeList.js
@@ -29,7 +29,6 @@ import {
   addLigand,
   removeLigand
 } from './redux/dispatchActions';
-import { useRouteMatch } from 'react-router-dom';
 
 const useStyles = makeStyles(theme => ({
   container: {
@@ -162,8 +161,6 @@ export const MoleculeList = memo(
     const imgHeight = 34;
     const imgWidth = 150;
     const sortDialogOpen = useSelector(state => state.previewReducers.molecule.sortDialogOpen);
-    let match = useRouteMatch();
-    const target = match && match.params && match.params.target;
 
     const isActiveFilter = !!(filterSettings || {}).active;
 
@@ -192,57 +189,6 @@ export const MoleculeList = memo(
       setCurrentPage(currentPage + 1);
     };
 
-    // prevent loading molecules multiple times
-    const firstLoadRef = useRef(!firstLoad);
-
-    useEffect(() => {
-      // TODO this reloads too much..
-      loadFromServer({
-        url: getUrl({ list_type, target_on, mol_group_on }),
-        setOldUrl: url => setOldUrl(url),
-        old_url: oldUrl.current,
-        list_type,
-        setObjectList: setMoleculeList,
-        setCachedMolLists,
-        mol_group_on,
-        cached_mol_lists
-      })
-        .then(() => {
-          console.log('initializing filter');
-          setPredefinedFilter(dispatch(initializeFilter()).predefined);
-          // initialize molecules on first target load
-          if (
-            stage &&
-            cached_mol_lists &&
-            cached_mol_lists[mol_group_on] &&
-            firstLoadRef &&
-            firstLoadRef.current &&
-            hideProjects &&
-            target !== undefined
-          ) {
-            console.log('initializing molecules');
-            firstLoadRef.current = false;
-            dispatch(setFirstLoad(false));
-            dispatch(initializeMolecules(stage, cached_mol_lists[mol_group_on].results));
-          }
-        })
-        .catch(error => {
-          throw new Error(error);
-        });
-    }, [
-      list_type,
-      mol_group_on,
-      setMoleculeList,
-      stage,
-      firstLoad,
-      target_on,
-      setCachedMolLists,
-      cached_mol_lists,
-      dispatch,
-      hideProjects,
-      target
-    ]);
-
     const listItemOffset = (currentPage + 1) * moleculesPerPage;
     const currentMolecules = joinedMoleculeLists.slice(0, listItemOffset);
     // setCurrentMolecules(currentMolecules);