diff --git a/js/components/datasets/redux/dispatchActions.js b/js/components/datasets/redux/dispatchActions.js index 0f3a0dcc5..6d84221a6 100644 --- a/js/components/datasets/redux/dispatchActions.js +++ b/js/components/datasets/redux/dispatchActions.js @@ -204,7 +204,22 @@ export const addDatasetLigand = ( representations: representations, datasetID: datasetID }) - ); + ).finally(() => { + const skipOrientation = false; //state.trackingReducers.skipOrientationChange; + if (!skipOrientation) { + const ligandOrientation = stage.viewerControls.getOrientation(); + dispatch(setOrientation(VIEWS.MAJOR_VIEW, ligandOrientation)); + + dispatch(appendMoleculeOrientation(getDatasetMoleculeID(datasetID, data?.id), ligandOrientation)); + + // keep current orientation of NGL View + if (!skipOrientation) { + console.count(`Before applying orientation after loading dataset ligand.`); + stage.viewerControls.orient(currentOrientation); + console.count(`After applying orientation after loading dataset ligand.`); + } + } + }); }; export const removeDatasetLigand = (stage, data, colourToggle, datasetID, skipTracking = false) => dispatch => { diff --git a/js/components/preview/projectHistoryPanel/ProjectHistory.js b/js/components/preview/projectHistoryPanel/ProjectHistory.js index 14fdd6013..264de76c0 100644 --- a/js/components/preview/projectHistoryPanel/ProjectHistory.js +++ b/js/components/preview/projectHistoryPanel/ProjectHistory.js @@ -120,7 +120,7 @@ export const ProjectHistory = memo(({ showFullHistory, graphKey, expanded, onExp setTryToOpen(false); dispatch(changeSnapshot(sessionProjectID, transitionToSnapshot.hash)); } else if (!isSnapshotDirty && tryToOpen && transitionToSnapshot) { - dispatch(changeSnapshot(sessionProjectID, transitionToSnapshot.hash)); + // dispatch(changeSnapshot(sessionProjectID, transitionToSnapshot.hash, nglViewList, stage)); setTryToOpen(false); } }, [dispatch, isSnapshotDirty, nglViewList, sessionProjectID, stage, transitionToSnapshot, tryToOpen]);