import reducer in mainReducer and background js fixed

Author: yididiaketema

src/app/containers/ButtonsContainer.tsx

@@ -81,7 +81,7 @@ function ButtonsContainer(): JSX.Element {
         {paused ? <FontAwesomeIcon icon={faLock} /> : <FontAwesomeIcon icon={faUnlock} />}
         {paused ? 'Locked' : 'Unlocked'}
       </button>
-      <button className='export-button' type='button' onClick={() => exportHandler(snapshots)}>
+      <button className='export-button' type='button' onClick={() => exportHandler(tabs[currentTab])}>
         <FontAwesomeIcon icon={faDownload} />
         Download
       </button>

src/app/reducers/mainReducer.js

@@ -185,21 +185,28 @@ export default (state, action) =>
         break;
       }
       case types.EMPTY: {
-        // send msg to background script
         console.log('-----clear snapshots reducer----')
         console.log('state before:', state.tabs[currentTab])
 
-        port.postMessage({ action: 'emptySnap', tabId: currentTab });
+        // send msg to background script
+        port.postMessage({ action: 'emptySnap', tabId: currentTab }); //communicate with background.js
+
+        // properties associated with timetravel + seek bar
         tabs[currentTab].sliderIndex = 0;
         tabs[currentTab].viewIndex = 0;
         tabs[currentTab].playing = false;
-        const lastSnapshot = tabs[currentTab].snapshots[tabs[currentTab].snapshots.length - 1];
+
+        const lastSnapshot = tabs[currentTab].snapshots[tabs[currentTab].snapshots.length - 1]; // first snapshot?
+
         // resets hierarchy to page last state recorded
         tabs[currentTab].hierarchy.stateSnapshot = { ...lastSnapshot };
+
         // resets hierarchy
         tabs[currentTab].hierarchy.children = [];
+
         // resets snapshots to page last state recorded
         tabs[currentTab].snapshots = [lastSnapshot];
+
         // resets currLocation to page last state recorded
         tabs[currentTab].currLocation = tabs[currentTab].hierarchy;
         tabs[currentTab].index = 1;
@@ -216,16 +223,40 @@ export default (state, action) =>
           // Log the value of tabs[currentTab].snapshots before the update
         console.log('-----import snapshots reducer----')
         console.log('state before:', state.tabs[currentTab])
-        
+        console.log('action payload:', action.payload)
 
         port.postMessage({
           action: 'import',
-          payload: action.payload,
+          payload: action.payload, //.snapshots,
           tabId: currentTab,
         });
+
+        //============
+        const savedSnapshot = action.payload;
+
+        tabs[currentTab].sliderIndex = savedSnapshot.sliderIndex;
+        tabs[currentTab].viewIndex = savedSnapshot.viewIndex;
+        tabs[currentTab].playing = false;
+
+        // resets hierarchy to page last state recorded
+        tabs[currentTab].hierarchy.stateSnapshot = savedSnapshot.hierarchy.stateSnapshot;
+
+        // resets hierarchy
+        tabs[currentTab].hierarchy.children = savedSnapshot.hierarchy.children;
+
+        // resets snapshots to page last state recorded
+        tabs[currentTab].snapshots = savedSnapshot.snapshots;
+
+        // resets currLocation to page last state recorded
+        tabs[currentTab].currLocation = tabs[currentTab].hierarchy;
+        tabs[currentTab].index = savedSnapshot.index;
+        tabs[currentTab].currParent = savedSnapshot.currParent;
+        tabs[currentTab].currBranch = savedSnapshot.Branch;
+        tabs[currentTab].seriesSavedStatus = false;
+
 
-    
-        tabs[currentTab].snapshots = action.payload;
+        //============
+        //tabs[currentTab].snapshots = action.payload.snapshots;
 
 
 

src/extension/background.js

@@ -181,8 +181,26 @@ chrome.runtime.onConnect.addListener((port) => {
 
     switch (action) {
       case 'import': // create a snapshot property on tabId and set equal to tabs object
+        const savedSnapshot = payload
+        console.log('background.js savedSnapshot:', savedSnapshot)
         // may need do something like filter payload from stateless
-        tabsObj[tabId].snapshots = payload;
+        tabsObj[tabId].snapshots = savedSnapshot.snapshots;
+
+        // reset snapshots to page last state recorded
+        tabsObj[tabId].snapshots = savedSnapshot.snapshots
+
+
+
+        // resets hierarchy
+        tabsObj[tabId].hierarchy.children = savedSnapshot.hierarchy.children;
+        // resets hierarchy to page last state recorded
+        tabsObj[tabId].hierarchy.stateSnapshot = savedSnapshot.hierarchy.stateSnapshot
+        // resets currLocation to page last state recorded
+        tabsObj[tabId].currLocation = savedSnapshot.currLocation;
+        tabsObj[tabId].index = savedSnapshot.index;
+        tabsObj[tabId].currParent = savedSnapshot.currParent;
+        tabsObj[tabId].currBranch = savedSnapshot.currBranch;
+
         return true;
       case 'emptySnap':
         // reset snapshots to page last state recorded