Fixed: Store tabs data in both session and global storages

(v5 prep)

src/sidebar/actions/panels.js

@@ -95,10 +95,8 @@ async function updatePanels(newPanels) {
   }
 
   // Save state
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') {
-    this.state.tabs.forEach(t => this.actions.saveTabData(t))
-  }
+  this.actions.saveTabsData()
+  this.state.tabs.forEach(t => this.actions.saveTabData(t))
 }
 
 /**

src/sidebar/actions/settings.js

@@ -20,7 +20,6 @@ function updateSettings(settings) {
   let toggleBookmarks = this.state.bookmarksPanel !== settings.bookmarksPanel
   let theme = this.state.theme !== settings.theme
   let highlightOpenBookmarks = this.state.highlightOpenBookmarks !== settings.highlightOpenBookmarks
-  let stateStorage = this.state.stateStorage !== settings.stateStorage
   let bgNoise = this.state.bgNoise !== settings.bgNoise
   let ctxMenuCtrIgnore = this.state.ctxMenuIgnoreContainers !== settings.ctxMenuIgnoreContainers
 
@@ -87,21 +86,6 @@ function updateSettings(settings) {
     Actions.initTheme()
   }
 
-  if (stateStorage) {
-    if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-    if (this.state.stateStorage === 'session') {
-      for (let tab of this.state.tabs) {
-        browser.sessions.setTabValue(tab.id, 'data', {
-          id: tab.id,
-          panelId: tab.panelId,
-          parentId: tab.parentId,
-          folded: tab.folded,
-        })
-      }
-      this.actions.saveGroups()
-    }
-  }
-
   if (bgNoise) {
     if (this.state.bgNoise) this.actions.applyNoiseBg()
     else this.actions.removeNoiseBg()

src/sidebar/actions/tabs.js

@@ -247,8 +247,6 @@ async function loadTabsFromSessionStorage() {
     let target = Utils.findSuccessorTab(this.state, activeTab)
     if (target) browser.tabs.moveInSuccession([activeTab.id], target.id)
   }
-
-  this.state.tabs.forEach(t => this.actions.saveTabData(t))
 }
 
 /**
@@ -429,11 +427,9 @@ async function loadTabsFromInlineData(tabs, dataTabIndex) {
     if (target) browser.tabs.moveInSuccession([activeTab.id], target.id)
   }
 
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') {
-    this.state.tabs.forEach(t => this.actions.saveTabData(t))
-    this.actions.saveGroups()
-  }
+  this.actions.saveTabsData()
+  this.state.tabs.forEach(t => this.actions.saveTabData(t))
+  this.actions.saveGroups()
 }
 
 /**
@@ -496,7 +492,6 @@ function saveTabData(tabOrId) {
     panelId: tabOrId.panelId,
     parentId: tabOrId.parentId,
     folded: tabOrId.folded,
-    lvl: tabOrId.lvl,
   })
 }
 
@@ -628,11 +623,9 @@ function normalizeTabs(delay = 500) {
     this.state.tabsNormalizing = false
     this._normTabsMoving = false
 
-    if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-    if (this.state.stateStorage === 'session') {
-      this.state.tabs.forEach(t => this.actions.saveTabData(t))
-      this.actions.saveGroups()
-    }
+    this.actions.saveTabsData()
+    this.state.tabs.forEach(t => this.actions.saveTabData(t))
+    this.actions.saveGroups()
   }, delay)
 }
 
@@ -1418,7 +1411,7 @@ async function moveTabsToNewWin(tabIds, incognito = false) {
 
   await Promise.all(moving)
 
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
+  this.actions.saveTabsData()
 }
 
 /**
@@ -1475,7 +1468,7 @@ async function moveTabsToWin(tabIds, windowOrConfig) {
     )
   }
 
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
+  this.actions.saveTabsData()
 }
 
 /**
@@ -1606,10 +1599,8 @@ async function moveTabsToPanel(tabIds, panelId) {
     this.actions.updateTabsTree(activePanel.startIndex, activePanel.endIndex + 1)
   }
   if (activeTab) this.state.panelIndex = targetPanel.index
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') {
-    tabs.forEach(t => this.actions.saveTabData(t))
-  }
+  this.actions.saveTabsData()
+  tabs.forEach(t => this.actions.saveTabData(t))
 }
 
 /**
@@ -1697,8 +1688,8 @@ function foldTabsBranch(tabId) {
   if (this.state.hideFoldedTabs && toHide.length) {
     browser.tabs.hide(toHide)
   }
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') this.actions.saveTabData(tabId)
+  this.actions.saveTabsData()
+  this.actions.saveTabData(tabId)
 }
 
 /**
@@ -1758,8 +1749,8 @@ function expTabsBranch(tabId) {
   if (this.state.hideFoldedTabs && toShow.length) {
     browser.tabs.show(toShow)
   }
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') this.actions.saveTabData(tabId)
+  this.actions.saveTabsData()
+  this.actions.saveTabData(tabId)
 }
 
 /**
@@ -1980,10 +1971,8 @@ async function moveDroppedNodes(dropIndex, dropParent, nodes, pin, currentPanel)
 
     // If there are no moving, just update tabs tree
     this.actions.updateTabsTree(currentPanel.startIndex, currentPanel.endIndex + 1)
-    if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-    if (this.state.stateStorage === 'session') {
-      tabs.forEach(t => this.actions.saveTabData(t))
-    }
+    this.actions.saveTabsData()
+    tabs.forEach(t => this.actions.saveTabData(t))
   }
 
   // Hide/Show tabs
@@ -2151,10 +2140,8 @@ function flattenTabs(tabIds) {
   }
 
   this.actions.updateTabsTree(ttf[0].index - 1, ttf[ttf.length - 1].index + 1)
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') {
-    ttf.forEach(t => this.actions.saveTabData(t))
-  }
+  this.actions.saveTabsData()
+  ttf.forEach(t => this.actions.saveTabData(t))
 }
 
 /**
@@ -2228,10 +2215,8 @@ async function groupTabs(tabIds, conf = {}) {
     }
   }
   this.actions.updateTabsTree(tabs[0].index - 2, tabs[tabs.length - 1].index + 1)
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') {
-    tabs.forEach(t => this.actions.saveTabData(t))
-  }
+  this.actions.saveTabsData()
+  tabs.forEach(t => this.actions.saveTabData(t))
 }
 
 /**

src/sidebar/handlers/keybindings.js

@@ -551,10 +551,8 @@ function onKeyTabsIndent() {
   align.forEach(([a, b]) => (a.parentId = b.parentId))
 
   this.actions.updateTabsTree()
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') {
-    selected.forEach(id => this.actions.saveTabData(id))
-  }
+  this.actions.saveTabsData()
+  selected.forEach(id => this.actions.saveTabData(id))
 }
 
 function onKeyTabsOutdent() {
@@ -589,10 +587,8 @@ function onKeyTabsOutdent() {
   }
 
   this.actions.updateTabsTree()
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') {
-    selected.forEach(id => this.actions.saveTabData(id))
-  }
+  this.actions.saveTabsData()
+  selected.forEach(id => this.actions.saveTabData(id))
 }
 
 function onKeyMoveTabsUp() {
@@ -643,10 +639,8 @@ function onKeyMoveTabsUp() {
   }
 
   this.actions.updateTabsTree()
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') {
-    toMove.forEach(t => this.actions.saveTabData(t))
-  }
+  this.actions.saveTabsData()
+  toMove.forEach(t => this.actions.saveTabData(t))
 
   if (this._preserveSelectionTimeout) {
     clearTimeout(this._preserveSelectionTimeout)
@@ -707,10 +701,8 @@ function onKeyMoveTabsDown() {
   }
 
   this.actions.updateTabsTree()
-  if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-  if (this.state.stateStorage === 'session') {
-    toMove.forEach(t => this.actions.saveTabData(t))
-  }
+  this.actions.saveTabsData()
+  toMove.forEach(t => this.actions.saveTabData(t))
 
   if (this._preserveSelectionTimeout) {
     clearTimeout(this._preserveSelectionTimeout)

src/sidebar/handlers/tabs.js

@@ -137,8 +137,8 @@ function onTabCreated(tab) {
       }
     }
 
-    if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-    if (this.state.stateStorage === 'session') this.actions.saveTabData(tab)
+    this.actions.saveTabsData()
+    this.actions.saveTabData(tab)
 
     const groupTab = this.actions.getGroupTab(tab)
     if (groupTab && !groupTab.discarded) {
@@ -168,9 +168,7 @@ function onTabCreated(tab) {
     }
   }
 
-  if (this.state.stateStorage === 'session' && tab.url.startsWith(GROUP_URL)) {
-    this.actions.saveGroups()
-  }
+  if (tab.url.startsWith(GROUP_URL)) this.actions.saveGroups()
 
   this.actions.recalcPanelScroll()
 
@@ -246,7 +244,7 @@ function onTabUpdated(tabId, change, tab) {
 
   // Url
   if (change.url !== undefined && change.url !== localTab.url) {
-    if (this.state.stateStorage === 'global') this.actions.saveTabsData()
+    this.actions.saveTabsData()
     if (this.state.highlightOpenBookmarks && this.state.bookmarksUrlMap) {
       if (this.state.bookmarksUrlMap[localTab.url]) {
         for (let b of this.state.bookmarksUrlMap[localTab.url]) {
@@ -262,9 +260,7 @@ function onTabUpdated(tabId, change, tab) {
     if (!change.url.startsWith(localTab.url.slice(0, 16))) {
       localTab.favIconUrl = ''
     }
-    if (this.state.stateStorage === 'session' && change.url.startsWith(GROUP_URL)) {
-      this.actions.saveGroups()
-    }
+    if (change.url.startsWith(GROUP_URL)) this.actions.saveGroups()
     if (
       this.state.urlRules &&
       this.state.urlRules.length &&
@@ -353,7 +349,7 @@ function onTabUpdated(tabId, change, tab) {
       if (localTab.moveTime + 1000 > Date.now()) {
         localTab.panelId = localTab.prevPanelId
         panel = this.state.panelsMap[localTab.panelId]
-        if (this.state.stateStorage === 'session') this.actions.saveTabData(localTab)
+        this.actions.saveTabData(localTab)
       }
     }
 
@@ -496,8 +492,8 @@ function onTabRemoved(tabId, info, childfree) {
     }
 
     // Save new tabs state
-    if (this.state.stateStorage === 'global') this.actions.saveTabsData()
-    if (this.state.stateStorage === 'session') this.actions.saveGroups()
+    this.actions.saveTabsData()
+    this.actions.saveGroups()
 
     // Update succession
     if (this.state.activateAfterClosing !== 'none') {
@@ -561,10 +557,8 @@ function onTabMoved(id, info) {
   if (info.toIndex > info.fromIndex) toIndex = toIndex - mvLen
   let tabAtTargetPlace = this.state.tabs[toIndex]
   if (tabAtTargetPlace && tabAtTargetPlace.id === id) {
-    if (this.state.stateStorage === 'global' && !this.state.movingTabs.length) {
-      this.actions.saveTabsData()
-    }
-    if (this.state.stateStorage === 'session') this.actions.saveTabData(id)
+    if (!this.state.movingTabs.length) this.actions.saveTabsData()
+    this.actions.saveTabData(id)
     if (this.state.tabsMap[id]) this.state.tabsMap[id].destPanelId = undefined
     return
   }
@@ -640,10 +634,8 @@ function onTabMoved(id, info) {
     this.actions.setPanel(this.state.panelsMap[movedTab.panelId].index)
   }
 
-  if (this.state.stateStorage === 'global' && !this.state.movingTabs.length) {
-    this.actions.saveTabsData()
-  }
-  if (this.state.stateStorage === 'session') this.actions.saveTabData(movedTab)
+  if (!this.state.movingTabs.length) this.actions.saveTabsData()
+  this.actions.saveTabData(movedTab)
 
   // Update succession
   if (!this.state.movingTabs.length && this.state.activateAfterClosing !== 'none') {

src/sidebar/sidebar.js

@@ -62,8 +62,9 @@ export default new Vue({
     Actions.loadFavicons()
     Actions.loadPermissions(true)
     Actions.updateTabsVisability()
-    if (State.stateStorage === 'global') Actions.saveTabsData()
-    if (State.stateStorage === 'session') Actions.saveGroups()
+    Actions.saveTabsData()
+    Actions.saveGroups()
+    State.tabs.forEach(t => Actions.saveTabData(t))
 
     Actions.updateActiveGroupPage()
     Actions.connectToBG()