Skip to content

Commit

Permalink
Implements fix for #1440 (#428)
Browse files Browse the repository at this point in the history
* #1403 fixed timer when services are not available

* #1389 applied tag.hidden logic, reduced autohide time for tags toasts to 5 seconds

* Squashed commit of the following:

commit 7511b57
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Apr 23 08:27:24 2024 +0200

    - finished #1348

commit 6074d79
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Apr 17 09:50:06 2024 +0200

    - #1348 - fixed cases when all pdbs are missing

commit 49f0ae8
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Apr 10 13:41:50 2024 +0200

    - checkpoint

commit 13a315e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Apr 3 12:30:06 2024 +0200

    - checkpoint

commit a5b8cca
Merge: 34b75f7 756a25b
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Mar 25 12:24:01 2024 +0100

    Merge branch '#1348' of https://github.com/m2ms/fragalysis-frontend into #1348

commit 34b75f7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 12:35:21 2024 +0100

    - latest backend

commit 1308cb2
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 1ee15e7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit a033b68
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 7149081
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 623de4f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 09:48:51 2024 +0100

    - using official backend version

commit eec204c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 12:16:45 2024 +0100

    - checkpoint

commit dbc93a7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 10:27:08 2024 +0100

    - checkpoint

commit b933243
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 4a0e171
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 634ed03
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 6e65fae
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 1bff7bf
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 07f21b6
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 021366e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 36f87b4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 87e765a
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 12:35:21 2024 +0100

    - latest backend

commit 72c94f0
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 224ca23
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 36f03f8
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 8072920
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit e319056
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 09:48:51 2024 +0100

    - using official backend version

commit 187e7f3
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 12:16:45 2024 +0100

    - checkpoint

commit b6aa0a4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 10:27:08 2024 +0100

    - checkpoint

commit fccf976
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 965be5e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit b01cdbf
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit e04fbf2
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 5d64c26
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit dbb155c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit b1c0f3c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 29 10:32:27 2024 +0100

    - checkpoint

commit abc8cc9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 2ef004a
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 756a25b
Merge: f686ef4 f474ff6
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Mar 14 10:00:02 2024 +0100

    Merge branch '#1348' of https://github.com/m2ms/fragalysis-frontend into #1348

commit f686ef4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 12:35:21 2024 +0100

    - latest backend

commit df6209c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit f5a842f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 83ffccc
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 0ecff35
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit d3a90c7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 09:48:51 2024 +0100

    - using official backend version

commit 50800b9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 12:16:45 2024 +0100

    - checkpoint

commit 2af18fd
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 10:27:08 2024 +0100

    - checkpoint

commit cd75a27
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit c485389
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 96296e9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 760152b
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 8a30204
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 6235e9c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit e2e46cb
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 29 10:32:27 2024 +0100

    - checkpoint

commit 8176514
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 6aa5108
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit f474ff6
Merge: 56c0b85 e728f49
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Mar 14 08:30:00 2024 +0100

    Merge branch '#1348' of https://github.com/m2ms/fragalysis-frontend into #1348

    # Conflicts:
    #	js/components/preview/tags/details/tagDetails.js

commit 56c0b85
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit a185933
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 09c97b5
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit c6d0738
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 72f36b0
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 29 10:32:27 2024 +0100

    - checkpoint

commit 971799d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 1bb5326
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit e728f49
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 12:35:21 2024 +0100

    - latest backend

commit 125b8d4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit 0e41551
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 8cf43e0
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit d336352
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

commit 2fb59dc
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 12 09:48:51 2024 +0100

    - using official backend version

commit 9439f5d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Mar 7 13:59:03 2024 +0100

    - partial fix for purple release for #1370

commit 4ff5f94
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Mar 7 10:10:41 2024 +0100

    - implemented #1376
    - also fixed bug in download structures dialog where only first download got added to the dropdown menu

commit 66a98f3
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Mar 6 09:47:12 2024 +0100

    - implemented #1361
    - improvements for #1354

commit 8a193a5
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 5 13:24:11 2024 +0100

    - cleanup for #1354

commit bb3bf3b
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 5 13:21:32 2024 +0100

    - updated message for #1354

commit a3dc819
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 5 13:05:12 2024 +0100

    - first implementation of #1354

commit 4121519
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Mar 5 08:17:49 2024 +0100

    - implemented #1357

commit 4d96ff4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Mar 4 10:07:06 2024 +0100

    - implemented changes requested in #1326

commit 03158be
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Mar 4 08:45:22 2024 +0100

    - fixed problem with tags not visually updating on observations

commit 8765a3c
Author: matej <matej.vavrek@m2ms.sk>
Date:   Mon Feb 26 21:36:12 2024 +0100

    #1341 "pin" edit tag row outside of tag list

commit 6db8b22
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 29 10:32:27 2024 +0100

    - checkpoint

commit 027eaf0
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 12:16:45 2024 +0100

    - checkpoint

commit 7407dbd
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 10:27:08 2024 +0100

    - checkpoint

commit c13628b
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 27 09:23:04 2024 +0100

    - checkpoint

commit e39721c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 26 08:42:49 2024 +0100

    - checkpoint

* - using official backend now

* Squashed commit of the following:

commit 8fe886a
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed May 15 09:00:04 2024 +0200

    Squashed commit of the following:

    commit 6813219
    Author: matej <matej.vavrek@m2ms.sk>
    Date:   Mon Apr 29 07:38:30 2024 +0200

        #1261 added icon for "Manage grouping" button

    commit a665ed5
    Author: matej <matej.vavrek@m2ms.sk>
    Date:   Sun Apr 28 23:23:25 2024 +0200

        #1261 added buttons into observation dialog for later poses handling

commit 70a5e70
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Apr 29 09:20:46 2024 +0200

    - #1261 - initial implementation

* - now FE point to local dev env

* - pointing to correct backend

* - #1440 implemented fix

---------

Co-authored-by: matej <matej.vavrek@m2ms.sk>
  • Loading branch information
boriskovar-m2ms and matej-vavrek authored May 28, 2024
1 parent ab94457 commit e7e5c95
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 27 deletions.
4 changes: 2 additions & 2 deletions docker-compose.dev.vector.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ services:
start_period: 10s
web:
container_name: web_dock
# image: xchem/fragalysis-stack:latest
image: xchem/fragalysis-stack:latest
# image: alanbchristie/fragalysis-backend:1187.3
# image: boriskovarm2ms/fragalysis-stack:experiment2
image: kaliif/fragalysis-backend:latest
# image: kaliif/fragalysis-backend:latest
command: /bin/bash /code/launch-stack.sh
volumes:
- ../data/logs:/code/logs/
Expand Down
2 changes: 1 addition & 1 deletion js/components/preview/redux/dispatchActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export const shouldLoadProtein = ({
(!routeSnapshotID || routeSnapshotID === currentSnapshotID.toString()) &&
isRestoring === true
) {
dispatch(restoreAfterTargetActions(nglViewList, routeProjectID));
dispatch(restoreAfterTargetActions(nglViewList, routeProjectID, currentSnapshotID));
}

if (targetOnName !== undefined) {
Expand Down
26 changes: 15 additions & 11 deletions js/components/preview/tags/redux/dispatchActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,16 +186,25 @@ const getTagsForMol = (molId, tagList) => {
};

export const loadMoleculesAndTagsNew = targetId => async (dispatch, getState) => {
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - before getTags`);
let tags = await getTags(targetId);
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - after getTags`);
tags = tags.results;
if (tags?.length > 0) {
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - no. of tags received: ${tags?.length}`);
dispatch(setNoTagsReceived(false));
}
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - before getTagCategories`);
const tagCategories = await getTagCategories();
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - no. of tag categories received: ${tagCategories?.length}`);
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - after getTagCategories`);
// const canonSitesList = await getCanonSites(targetId);
// const canonConformSitest = await getCanonConformSites(targetId);

// console.log(`snapshotDebug - loadMoleculesAndTagsNew - before getAllDataNew`);
const data = await getAllDataNew(targetId);
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - after getAllDataNew`);
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - no. of molecules received: ${data?.results?.length}`);
let allMolecules = [];
data?.results?.forEach(mol => {
let newObject = { ...mol };
Expand Down Expand Up @@ -226,31 +235,25 @@ export const loadMoleculesAndTagsNew = targetId => async (dispatch, getState) =>
});

dispatch(setAllMolLists([...allMolecules]));
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - no. of molecules stored: ${allMolecules?.length}`);
//need to do this this way because only categories which have at least one tag assigned are sent from backend
tags = tags.sort(compareTagsAsc);
dispatch(setMoleculeTags(tags));
dispatch(setTagSelectorData(tagCategories, tags));
dispatch(setAllDataLoaded(true));

// console.log(`snapshotDebug - loadMoleculesAndTagsNew - before getPoses`);
return getPoses(targetId).then(poses => {
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - after getPoses`);
const modifiedPoses = [];
// let newIdStart = Math.max(...poses?.map(c => c.id)) + 1;
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - no. of poses received: ${poses?.length}`);
poses?.forEach(pose => {
const siteObs = allMolecules.filter(m => pose.site_observations.includes(m.id));
const firstObs = siteObs[0];
// const canonConformSites = siteObs?.map(so => {
// return {
// smiles: so.smiles,
// code: so.code,
// canon_site_conf: so.canon_site_conf,
// canon_site: canonConformSitest.find(ccf => ccf.id === so.canon_site_conf)?.canon_site
// };
// });

let newObject = { ...pose };
newObject['smiles'] = firstObs?.smiles;
newObject['code'] = `${pose.display_name}`;
// newObject['id'] = newIdStart++;
// newObject['origId'] = pose.id;
newObject['canonSiteConf'] = firstObs?.canon_site_conf;
newObject['canonSite'] = pose.canon_site;

Expand All @@ -277,5 +280,6 @@ export const loadMoleculesAndTagsNew = targetId => async (dispatch, getState) =>
return 0;
});
dispatch(setLHSCompoundsLIst(modifiedPoses));
// console.log(`snapshotDebug - loadMoleculesAndTagsNew - end of function`);
});
};
47 changes: 34 additions & 13 deletions js/reducers/tracking/dispatchActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,7 @@ export const resetRestoringState = () => (dispatch, getState) => {
};

export const restoreCurrentActionsList = snapshotID => async (dispatch, getState) => {
const state = getState();
dispatch(resetTrackingState());
dispatch(resetTargetState());
dispatch(setTargetOn(undefined));
Expand All @@ -904,25 +905,34 @@ export const restoreCurrentActionsList = snapshotID => async (dispatch, getState
};

const restoreTrackingActions = snapshotID => async (dispatch, getState) => {
// console.log(`snapshotDebug - restoreTrackingActions - start`);
if (snapshotID) {
try {
const response = await api({
// console.log(`snapshotDebug - restoreTrackingActions - before getting actions`);
return api({
url: `${base_url}/api/snapshot-actions/?snapshot=${snapshotID}`
});
let results = response.data.results;
let listToSet = [];
results.forEach(r => {
let resultActions = JSON.parse(r.actions);
listToSet.push(...resultActions);
});
}).then(response => {
// console.log(`snapshotDebug - restoreTrackingActions - after getting actions`);
let results = response.data.results;
// console.log(`snapshotDebug - restoreTrackingActions - no. of actions: ${results.length}`);
let listToSet = [];
results.forEach(r => {
let resultActions = JSON.parse(r.actions);
listToSet.push(...resultActions);
});

let snapshotActions = [...listToSet];
dispatch(setCurrentActionsList(snapshotActions));
let snapshotActions = [...listToSet];
dispatch(setCurrentActionsList(snapshotActions));
// console.log(`snapshotDebug - restoreTrackingActions - end - success`);
return Promise.resolve(snapshotActions);
// return Promise.resolve();
});
} catch (error) {
throw new Error(error);
}
} else {
return Promise.resolve();
// console.log(`snapshotDebug - restoreTrackingActions - end - no snapshot`);
return Promise.resolve([]);
}
};

Expand Down Expand Up @@ -958,11 +968,14 @@ const restoreTargetActions = orderedActionList => (dispatch, getState) => {
}
};

export const restoreAfterTargetActions = (stages, projectId) => async (dispatch, getState) => {
export const restoreAfterTargetActions = (stages, projectId, snapshotId) => async (dispatch, getState) => {
const currentActionList = await dispatch(restoreTrackingActions(snapshotId));

const state = getState();

const currentActionList = state.trackingReducers.current_actions_list;
// const currentActionList = state.trackingReducers.current_actions_list;
const orderedActionList = currentActionList.sort((a, b) => a.timestamp - b.timestamp);
// console.log(`snapshotDebug - restoreAfterTargetActions - no. of actions: ${orderedActionList.length}`);
const targetId = state.apiReducers.target_on;

if (targetId && stages && stages.length > 0) {
Expand All @@ -983,8 +996,12 @@ export const restoreAfterTargetActions = (stages, projectId) => async (dispatch,
.finally(() => {});

await dispatch(restoreSitesActions(orderedActionList));
// console.log(`snapshotDebug - restoreAfterTargetActions - before loadData`);
await dispatch(loadData(orderedActionList, targetId, majorView));
// console.log(`snapshotDebug - restoreAfterTargetActions - after loadData`);
// console.log(`snapshotDebug - restoreAfterTargetActions - before restoreTagActions`);
await dispatch(restoreTagActions(orderedActionList));
// console.log(`snapshotDebug - restoreAfterTargetActions - after restoreTagActions`);
await dispatch(restoreMoleculesActions(orderedActionList, majorView.stage));
await dispatch(restoreRepresentationActions(orderedActionList, stages));
await dispatch(restoreProject(projectId));
Expand Down Expand Up @@ -1385,8 +1402,12 @@ export const restoreNglOrientationAnim = (orderedActionList, stages) => async (d
};

const loadData = (orderedActionList, targetId, majorView) => async (dispatch, getState) => {
// console.log(`snapshotDebug - loadData - before loadAllMolecules`);
await dispatch(loadAllMolecules(targetId));
// console.log(`snapshotDebug - loadData - after loadAllMolecules`);
// console.log(`snapshotDebug - loadData - before loadAllDatasets`);
await dispatch(loadAllDatasets(orderedActionList, targetId, majorView.stage));
// console.log(`snapshotDebug - loadData - after loadAllDatasets`);
};

const loadAllDatasets = (orderedActionList, target_on, stage) => async (dispatch, getState) => {
Expand Down

0 comments on commit e7e5c95

Please sign in to comment.