From cce0498a1f491b4e1ad1b54df4b61f26d017ec33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1na=20Kohanov=C3=A1?= Date: Tue, 20 Oct 2020 10:12:32 +0200 Subject: [PATCH] #407 Properly turn on/off inspiration fragments when using the next/previous arrows (bug of #384) --- js/components/datasets/datasetMoleculeView.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/js/components/datasets/datasetMoleculeView.js b/js/components/datasets/datasetMoleculeView.js index ffd88b284..a449f257c 100644 --- a/js/components/datasets/datasetMoleculeView.js +++ b/js/components/datasets/datasetMoleculeView.js @@ -31,13 +31,13 @@ import { appendMoleculeToCompoundsOfDatasetToBuy, removeMoleculeFromCompoundsOfDatasetToBuy, setCrossReferenceCompoundName, - setIsOpenCrossReferenceDialog + setIsOpenCrossReferenceDialog, + setInspirationFragmentList } from './redux/actions'; import { centerOnLigandByMoleculeID } from '../../reducers/ngl/dispatchActions'; import { ArrowDownward, ArrowUpward, MyLocation } from '@material-ui/icons'; import { isNumber, isString } from 'lodash'; import { SvgTooltip } from '../common'; -import { loadInspirationMoleculesDataList, clearAllInspirationsOfDataset } from './redux/dispatchActions'; import { OBJECT_TYPE } from '../nglView/constants'; import { getRepresentationsByType } from '../nglView/generatingObjects'; @@ -522,9 +522,15 @@ export const DatasetMoleculeView = memo( const nextItem = (nextItemData.hasOwnProperty('molecule') && nextItemData.molecule) || nextItemData; const nextDatasetID = (nextItemData.hasOwnProperty('datasetID') && nextItemData.datasetID) || datasetID; + const moleculeTitleNext = nextItem && nextItem.name; moveSelectedMoleculeSettings(nextItem, nextDatasetID); dispatch(moveSelectedMoleculeInspirationsSettings(data, nextItem)); + dispatch(setInspirationFragmentList(nextItem.computed_inspirations)); + dispatch(setCrossReferenceCompoundName(moleculeTitleNext)); + if (setRef) { + setRef(ref.current.nextSibling); + } }; const handleClickOnUpArrow = () => { @@ -535,9 +541,15 @@ export const DatasetMoleculeView = memo( (previousItemData.hasOwnProperty('molecule') && previousItemData.molecule) || previousItemData; const previousDatasetID = (previousItemData.hasOwnProperty('datasetID') && previousItemData.datasetID) || datasetID; + const moleculeTitlePrev = previousItem && previousItem.name; moveSelectedMoleculeSettings(previousItem, previousDatasetID); dispatch(moveSelectedMoleculeInspirationsSettings(data, previousItem)); + dispatch(setInspirationFragmentList(previousItem.computed_inspirations)); + dispatch(setCrossReferenceCompoundName(moleculeTitlePrev)); + if (setRef) { + setRef(ref.current.previousSibling); + } }; const moleculeTitle = data && data.name;