Added unsort tabs functionality

src/js/background/backgroundLogic.js

@@ -4,6 +4,8 @@
 
 const DEFAULT_TAB = "about:newtab";
 
+// let originalTabs = [];
+
 const backgroundLogic = {
   NEW_TAB_PAGES: new Set([
     "about:startpage",
@@ -330,11 +332,33 @@ const backgroundLogic = {
   },
 
   async sortTabs() {
-    const windows = await browser.windows.getAll();
-    for (let windowObj of windows) { // eslint-disable-line prefer-const
-      // First the pinned tabs, then the normal ones.
-      await this._sortTabsInternal(windowObj, true);
-      await this._sortTabsInternal(windowObj, false);
+    const windowObj = await browser.windows.getCurrent();
+    const tabs = await browser.tabs.query({windowId: windowObj.id});
+    for (const tab of tabs){
+      if(!(windowObj.id in ORIGINAL_TABS)){
+        ORIGINAL_TABS[windowObj.id] = [];
+      }
+      ORIGINAL_TABS[windowObj.id].push(tab.id);     
+    }
+    let jsonarray = JSON.stringify(ORIGINAL_TABS);
+    localStorage.setItem("originalTabs", jsonarray);
+
+    // First the pinned tabs, then the normal ones.
+    await this._sortTabsInternal(windowObj, true);
+    await this._sortTabsInternal(windowObj, false);
+
+  },
+
+  async _unsortTabsInternal(windowObj){
+    let pos = 0;
+    let parsedOriginalTabs = JSON.parse(localStorage.getItem("originalTabs"));
+    let windowSpecificOriginalTabs = parsedOriginalTabs[windowObj.id];
+    for (const tab of windowSpecificOriginalTabs) {
+      ++pos;
+      browser.tabs.move(tab, {
+        windowId: windowObj.id,
+        index: pos
+      });
     }
   },
 

src/js/background/messageHandler.js

@@ -54,6 +54,9 @@ const messageHandler = {
       case "sortTabs":
         backgroundLogic.sortTabs();
         break;
+      case "unsortTabs":
+        backgroundLogic.unsortTabs();
+        break;
       case "showTabs":
         backgroundLogic.unhideContainer(m.cookieStoreId);
         break;

src/js/popup.js

@@ -766,6 +766,17 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
         window.close();
       }
     });
+    Utils.addEnterHandler(document.querySelector("#unsort-containers-link"), async () => {
+      try {
+        await browser.runtime.sendMessage({
+          method: "unsortTabs"
+        });
+        window.close();
+      } catch (e) {
+        window.close();
+      }
+
+    });
 
     const mozillaVpnToutName = "moz-tout-main-panel";
     const mozillaVpnPermissionsWarningDotName = "moz-permissions-warning-dot";
@@ -911,6 +922,16 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
     document.addEventListener("input", Logic.filterContainerList);
 
     MozillaVPN.handleContainerList(identities);
+    // document.querySelector("#unsort-containers-link").setAttribute("disabled", "true");
+    if (localStorage.getItem("originalTabs") == null){
+      document.querySelector("#unsort-containers-link").setAttribute("disabled", "true");
+    }
+
+    else {
+      document.querySelector("#unsort-containers-link").removeAttribute("disabled");
+    }
+
+    // console.log(localStorage.getItem("originalTabs"));
 
     // reset path
     this._previousPanelPath = [];

src/js/utils.js

@@ -4,6 +4,7 @@ const DEFAULT_FAVICON = "/img/blank-favicon.svg";
 
 // eslint-disable-next-line
 const CONTAINER_ORDER_STORAGE_KEY = "container-order";
+const ORIGINAL_TABS = {};
 
 // TODO use export here instead of globals
 const Utils = {

src/popup.html

@@ -140,6 +140,15 @@ <h3 class="title">Firefox Multi-Account Containers</h3>
             </span>
         </td>
       </tr>
+      <tr class="menu-item hover-highlight keyboard-nav" id="unsort-containers-link" tabindex="0">
+        <td>
+          <img class="menu-icon" alt="" src="/img/sort-16_1.svg" />
+          <span class="menu-text" data-i18n-message-id="unsortTabsByContainer"></span>
+            <span class="menu-arrow">
+            </span>
+        </td>
+
+      </tr>
       <tr class="menu-item hover-highlight keyboard-nav" id="always-open-in" tabindex="0">
         <td>
           <img class="menu-icon" alt="" src="/img/container-openin-16.svg" />