@@ -889,6 +889,7 @@ export const resetRestoringState = () => (dispatch, getState) => {
889889} ;
890890
891891export const restoreCurrentActionsList = snapshotID => async ( dispatch , getState ) => {
892+ const state = getState ( ) ;
892893 dispatch ( resetTrackingState ( ) ) ;
893894 dispatch ( resetTargetState ( ) ) ;
894895 dispatch ( setTargetOn ( undefined ) ) ;
@@ -904,25 +905,34 @@ export const restoreCurrentActionsList = snapshotID => async (dispatch, getState
904905} ;
905906
906907const restoreTrackingActions = snapshotID => async ( dispatch , getState ) => {
908+ // console.log(`snapshotDebug - restoreTrackingActions - start`);
907909 if ( snapshotID ) {
908910 try {
909- const response = await api ( {
911+ // console.log(`snapshotDebug - restoreTrackingActions - before getting actions`);
912+ return api ( {
910913 url : `${ base_url } ${ snapshotID }
911- } ) ;
912- let results = response . data . results ;
913- let listToSet = [ ] ;
914- results . forEach ( r => {
915- let resultActions = JSON . parse ( r . actions ) ;
916- listToSet . push ( ...resultActions ) ;
917- } ) ;
914+ } ) . then ( response => {
915+ // console.log(`snapshotDebug - restoreTrackingActions - after getting actions`);
916+ let results = response . data . results ;
917+ // console.log(`snapshotDebug - restoreTrackingActions - no. of actions: ${results.length}`);
918+ let listToSet = [ ] ;
919+ results . forEach ( r => {
920+ let resultActions = JSON . parse ( r . actions ) ;
921+ listToSet . push ( ...resultActions ) ;
922+ } ) ;
918923
919- let snapshotActions = [ ...listToSet ] ;
920- dispatch ( setCurrentActionsList ( snapshotActions ) ) ;
924+ let snapshotActions = [ ...listToSet ] ;
925+ dispatch ( setCurrentActionsList ( snapshotActions ) ) ;
926+ // console.log(`snapshotDebug - restoreTrackingActions - end - success`);
927+ return Promise . resolve ( snapshotActions ) ;
928+ // return Promise.resolve();
929+ } ) ;
921930 } catch ( error ) {
922931 throw new Error ( error ) ;
923932 }
924933 } else {
925- return Promise . resolve ( ) ;
934+ // console.log(`snapshotDebug - restoreTrackingActions - end - no snapshot`);
935+ return Promise . resolve ( [ ] ) ;
926936 }
927937} ;
928938
@@ -958,11 +968,14 @@ const restoreTargetActions = orderedActionList => (dispatch, getState) => {
958968 }
959969} ;
960970
961- export const restoreAfterTargetActions = ( stages , projectId ) => async ( dispatch , getState ) => {
971+ export const restoreAfterTargetActions = ( stages , projectId , snapshotId ) => async ( dispatch , getState ) => {
972+ const currentActionList = await dispatch ( restoreTrackingActions ( snapshotId ) ) ;
973+
962974 const state = getState ( ) ;
963975
964- const currentActionList = state . trackingReducers . current_actions_list ;
976+ // const currentActionList = state.trackingReducers.current_actions_list;
965977 const orderedActionList = currentActionList . sort ( ( a , b ) => a . timestamp - b . timestamp ) ;
978+ // console.log(`snapshotDebug - restoreAfterTargetActions - no. of actions: ${orderedActionList.length}`);
966979 const targetId = state . apiReducers . target_on ;
967980
968981 if ( targetId && stages && stages . length > 0 ) {
@@ -983,8 +996,12 @@ export const restoreAfterTargetActions = (stages, projectId) => async (dispatch,
983996 . finally ( ( ) => { } ) ;
984997
985998 await dispatch ( restoreSitesActions ( orderedActionList ) ) ;
999+ // console.log(`snapshotDebug - restoreAfterTargetActions - before loadData`);
9861000 await dispatch ( loadData ( orderedActionList , targetId , majorView ) ) ;
1001+ // console.log(`snapshotDebug - restoreAfterTargetActions - after loadData`);
1002+ // console.log(`snapshotDebug - restoreAfterTargetActions - before restoreTagActions`);
9871003 await dispatch ( restoreTagActions ( orderedActionList ) ) ;
1004+ // console.log(`snapshotDebug - restoreAfterTargetActions - after restoreTagActions`);
9881005 await dispatch ( restoreMoleculesActions ( orderedActionList , majorView . stage ) ) ;
9891006 await dispatch ( restoreRepresentationActions ( orderedActionList , stages ) ) ;
9901007 await dispatch ( restoreProject ( projectId ) ) ;
@@ -1385,8 +1402,12 @@ export const restoreNglOrientationAnim = (orderedActionList, stages) => async (d
13851402} ;
13861403
13871404const loadData = ( orderedActionList , targetId , majorView ) => async ( dispatch , getState ) => {
1405+ // console.log(`snapshotDebug - loadData - before loadAllMolecules`);
13881406 await dispatch ( loadAllMolecules ( targetId ) ) ;
1407+ // console.log(`snapshotDebug - loadData - after loadAllMolecules`);
1408+ // console.log(`snapshotDebug - loadData - before loadAllDatasets`);
13891409 await dispatch ( loadAllDatasets ( orderedActionList , targetId , majorView . stage ) ) ;
1410+ // console.log(`snapshotDebug - loadData - after loadAllDatasets`);
13901411} ;
13911412
13921413const loadAllDatasets = ( orderedActionList , target_on , stage ) => async ( dispatch , getState ) => {
0 commit comments