Merge pull request #33 from oslabs-beta/josh/react-router

snapshot list is reset when page is refreshed

Author: mylee1995

src/extension/background.js

@@ -2,6 +2,8 @@ console.log('background.js file is running');
 
 let bg;
 
+// when tab refreshes, empty snapshotArr
+
 // need a function to clear snapshotArr when either tab is closed or page is refreshed
 let snapshotArr = [];
 
@@ -34,11 +36,19 @@ chrome.runtime.onConnect.addListener((port) => {
 chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
   console.log('npm -> background', request);
   // if port is not null, send a message to devtools
-  if (bg) {
-    // get active tab id
-    // get snapshot arr from tab object
-    snapshotArr.push(request);
-    bg.postMessage(snapshotArr);
-    // else, push snapshot into an array
-  } else snapshotArr.push(request);
+
+  if (request.action === 'tabReload') {
+    console.log('tabReload');
+    snapshotArr = [];
+  }
+
+  console.log(request);
+  if (request.action === 'recordSnap') {
+    snapshotArr.push(request.payload);
+    if (bg) {
+      // get active tab id
+      // get snapshot arr from tab object
+      bg.postMessage(snapshotArr);
+    }
+  }
 });

src/extension/contentScript.js

@@ -2,9 +2,10 @@ console.log('contentScript running');
 
 // listening for messages from npm package
 window.addEventListener('message', (msg) => {
+  // post initial Message to npm package
   const { action, payload } = msg.data;
   console.log('npm -> contentScript', msg.data);
-  if (action === 'recordSnap') chrome.runtime.sendMessage(payload);
+  if (action === 'recordSnap') chrome.runtime.sendMessage(msg.data);
 });
 
 // listening for messages from background.js
@@ -23,3 +24,10 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
       break;
   }
 });
+
+// since contentScript is run everytime a page is refreshed
+// tell the background script that the tab has reloaded
+chrome.runtime.sendMessage({ action: 'tabReload' });
+
+window.postMessage({ action: 'contentScriptStarted' });
+console.log('contentScriptStarted msg sent');