Merge pull request #409 from UMD-ARLIS/feat/tabId

Feature: Adding tabId to log
apache · Feb 8, 2024 · 36b5bb3 · 36b5bb3
2 parents 5ab92db + 8a54754
commit 36b5bb3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 19 deletions.
diff --git a/build/UserALEWebExtension/background.js b/build/UserALEWebExtension/background.js
@@ -415,7 +415,7 @@ function createVersionParts(count) {
  * limitations under the License.
  */
 
-var browser$1 = detect();
+var browserInfo = detect();
 var logs$1;
 var config$1;
 
@@ -706,8 +706,8 @@ function selectorizePath(path) {
 }
 function detectBrowser() {
   return {
-    'browser': browser$1 ? browser$1.name : '',
-    'version': browser$1 ? browser$1.version : ''
+    'browser': browserInfo ? browserInfo.name : '',
+    'version': browserInfo ? browserInfo.version : ''
   };
 }
 
@@ -1143,11 +1143,15 @@ function dispatchTabMessage(message) {
     });
   });
 }
-browser.runtime.onMessage.addListener(function (message) {
+browser.runtime.onMessage.addListener(function (message, sender, sendResponse) {
   switch (message.type) {
     // Handles logs rerouted from content and option scripts 
     case ADD_LOG:
-      log(message.payload);
+      var log$1 = message.payload;
+      if ("tab" in sender && "id" in sender.tab) {
+        log$1["tabId"] = sender.tab.id;
+      }
+      log(log$1);
       break;
     case CONFIG_CHANGE:
       console.log(message);

diff --git a/build/UserALEWebExtension/content.js b/build/UserALEWebExtension/content.js
@@ -405,7 +405,7 @@ function createVersionParts(count) {
  * limitations under the License.
  */
 
-var browser$1 = detect();
+var browserInfo = detect();
 var logs$1;
 var config$1;
 
@@ -720,8 +720,8 @@ function selectorizePath(path) {
 }
 function detectBrowser() {
   return {
-    'browser': browser$1 ? browser$1.name : '',
-    'version': browser$1 ? browser$1.version : ''
+    'browser': browserInfo ? browserInfo.name : '',
+    'version': browserInfo ? browserInfo.version : ''
   };
 }
 

diff --git a/build/UserALEWebExtension/options.js b/build/UserALEWebExtension/options.js
@@ -405,7 +405,7 @@ function createVersionParts(count) {
  * limitations under the License.
  */
 
-var browser$1 = detect();
+var browserInfo = detect();
 var logs$1;
 var config$1;
 
@@ -720,8 +720,8 @@ function selectorizePath(path) {
 }
 function detectBrowser() {
   return {
-    'browser': browser$1 ? browser$1.name : '',
-    'version': browser$1 ? browser$1.version : ''
+    'browser': browserInfo ? browserInfo.name : '',
+    'version': browserInfo ? browserInfo.version : ''
   };
 }
 

diff --git a/build/userale-2.4.0.js b/build/userale-2.4.0.js
@@ -418,7 +418,7 @@
    * limitations under the License.
    */
 
-  var browser = detect();
+  var browserInfo = detect();
   var logs$1;
   var config$1;
 
@@ -745,8 +745,8 @@
   }
   function detectBrowser() {
     return {
-      'browser': browser ? browser.name : '',
-      'version': browser ? browser.version : ''
+      'browser': browserInfo ? browserInfo.name : '',
+      'version': browserInfo ? browserInfo.version : ''
     };
   }
 

diff --git a/src/UserALEWebExtension/background.js b/src/UserALEWebExtension/background.js
@@ -44,11 +44,15 @@ function dispatchTabMessage(message) {
   });
 }
 
-browser.runtime.onMessage.addListener(function (message) {
+browser.runtime.onMessage.addListener(function (message, sender, sendResponse) {
   switch (message.type) {
     // Handles logs rerouted from content and option scripts 
     case MessageTypes.ADD_LOG:
-      userale.log(message.payload);
+      let log = message.payload;
+      if("tab" in sender && "id" in sender.tab) {
+        log["tabId"] = sender.tab.id;
+      }
+      userale.log(log);
       break;
 
     case MessageTypes.CONFIG_CHANGE:

diff --git a/src/packageLogs.js b/src/packageLogs.js
@@ -16,7 +16,7 @@
  */
 
 import { detect } from 'detect-browser';
-const browser = detect();
+const browserInfo = detect();
 
 export let logs;
 let config;
@@ -391,7 +391,7 @@ export function selectorizePath(path) {
 
 export function detectBrowser() {
     return {
-        'browser': browser ? browser.name : '',
-        'version': browser ? browser.version : ''
+        'browser': browserInfo ? browserInfo.name : '',
+        'version': browserInfo ? browserInfo.version : ''
     };
 }