Concluding work on Import/Export functionality. And some small fixes. Version bump to 1.3.0

Author: Nyanraltotlapun

src/extension/extButtonAction.js

@@ -7,11 +7,28 @@ if (typeof browser === "undefined") {
   var browser = chrome;
 }
 
+var extension_tab_id = null;
+
+function onCreated(tab) {
+  extension_tab_id = tab.id;
+  console.debug(`Created new tab: ${tab.id}`);
+}
+
+function onError(error) {
+  console.error(`Error: ${error}`);
+}
+
 function openWindow() {
   console.log("injecting");
-   browser.tabs.create({
-     "url": "/window/window.html",
-   });
+  if (extension_tab_id) {
+    browser.tabs.update(extension_tab_id, { active: true });
+  }
+  else {
+    let creating = browser.tabs.create({
+      "url": "/window/window.html",
+    });
+    creating.then(onCreated, onError);
+  }
 }
 
 browser.action.onClicked.addListener(openWindow);

src/extension/manifest_chrome.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "Time Tracker",
-    "version": "1.2.5",
+    "version": "1.3.0",
 
     "author": "Anna Molodtsova and Kirill Shakirov",
 

src/extension/manifest_firefox.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "Time Tracker",
-    "version": "1.2.3",
+    "version": "1.3.0",
 
     "author": "Anna Molodtsova and Kirill Shakirov",
 

src/extension/window/window.css

@@ -37,7 +37,7 @@ footer {
   gap: 0.6rem;
   margin-top: 1rem;
   background-color: #ed556408;
-  border: 1px solid #d55642;
+  border: 2px solid #d55642;
   border-radius: 2px;
 
 

src/extension/window/window.html

@@ -31,7 +31,7 @@
         </li>
     </template>
 
-    <input type="file" id="file_input" style="display: none;" />
+    <input type="file" id="file_input" accept=".json" style="display: none;" />
 
     <main>
         <section id="main-section">

src/extension/window/window.js

@@ -54,8 +54,7 @@ function main() {
             if (menu_section.classList.toggle("show")) {
                 console.log("Toggle show!");
             }
-            else
-            {
+            else {
                 console.log("Toggle Hide!");
             }
         }
@@ -64,21 +63,29 @@ function main() {
         export_button.onclick = () => {
             export_db(db);
         }
+
         export_button.disabled = false;
 
         file_input.onchange = (e) => {
             if (e.target.files.length > 0) {
-                const file = e.target.files[0];
-                const reader = new FileReader();
+                let file = e.target.files[0];
+                // Reset the input value to allow same file selection
+                e.target.value = null;
+                
+                let reader = new FileReader();
                 reader.onload = (e) => {
                     import_db(db, e.target.result);
                 };
                 reader.onerror = (e) => {
                     console.error("Error reading file: ", e);
                     alert("Error reading file!");
                 };
-                reader.readAsText(file);
-                console.log('Selected file:', file.name);
+
+                let confirm_result = confirm("This will replace records if they present in import file. Do you wish to continue?");
+                if (confirm_result === true) {
+                    //console.debug('Selected file:', file.name);
+                    reader.readAsText(file);
+                }
             }
         }
 
@@ -144,7 +151,7 @@ function main() {
                 let blob_url = URL.createObjectURL(blob);
                 let a = document.createElement("a");
                 a.href = blob_url;
-                a.download = `time_tracker_export-${new Date().toISOString()}.json`;
+                a.download = `timetracker_export_${new Date().toISOString()}.json`;
                 a.click();
                 URL.revokeObjectURL(blob_url);
             }
@@ -158,7 +165,7 @@ function main() {
     function import_db(db, import_data) {
         let json_data = null;
         try {
-            json_data = JSON.parse(e.target.result);
+            json_data = JSON.parse(import_data);
         } catch (err) {
             console.error('Invalid JSON:', err);
             alert("Error reading file! (Invalid JSON)");
@@ -172,6 +179,8 @@ function main() {
                     console.error("Error importing record from json to DB: ", e);
                 };
             });
+            // refreshing window content
+            window.location.reload();
         }
     }