tabsets-355 Merge filter widgets in openTabs view

Author: evandor

commands/AddTabToTabsetCommand.ts

@@ -15,7 +15,6 @@ import { useFeaturesStore } from 'src/features/stores/featuresStore'
 import { useRequestsService } from 'src/requests/services/RequestsService'
 import { useRequestsStore } from 'src/requests/stores/requestsStore'
 import { useLogger } from 'src/services/Logger'
-import { useAuthStore } from 'src/stores/authStore'
 import { Tab } from 'src/tabsets/models/Tab'
 import { ChangeInfo, Tabset, TabsetSharing } from 'src/tabsets/models/Tabset'
 import { useTabsetService } from 'src/tabsets/services/TabsetService2'
@@ -107,15 +106,6 @@ export class AddTabToTabsetCommand implements Command<any> {
 
       Analytics.fireEvent('tabset_tab_added', { tabsCount: tabset.tabs.length })
 
-      // Analysis not needed, remove
-      if (useAuthStore().user.uid && this.tab.url?.startsWith('https://')) {
-        const userId = useAuthStore().user.uid
-        // setDoc(doc(FirebaseServices.getFirestore(), 'users', userId, 'queue', uid()), {
-        //   event: 'new-tab',
-        //   url: this.tab.url,
-        // })
-      }
-
       // Sharing
       if (tabset.sharing?.sharedId && tabset.sharing.sharing === TabsetSharing.PUBLIC_LINK && !this.activeFolder) {
         tabset.sharing.sharing = TabsetSharing.PUBLIC_LINK_OUTDATED
@@ -162,7 +152,7 @@ export class AddTabToTabsetCommand implements Command<any> {
       }
 
       // add to search index via App Dispatcher
-      AppEventDispatcher.dispatchEvent('add-to-search', {
+      await AppEventDispatcher.dispatchEvent('add-to-search', {
         name: this.tab.name || '',
         title: this.tab.title || '',
         url: this.tab.url || '',

dialogues/AddUrlDialog.vue

@@ -23,6 +23,13 @@
           :disable="url.trim().length === 0"
           v-close-popup
           @click="createNewUrl()" />
+        <DialogButton
+          label="Add URL"
+          color="primary"
+          @was-clicked="createNewUrl()"
+          :disable="url.trim().length === 0"
+          v-close-popup
+          data-testid="add_url_submit" />
       </q-card-actions>
     </q-card>
   </q-dialog>
@@ -31,6 +38,7 @@
 <script lang="ts" setup>
 import { uid, useDialogPluginComponent } from 'quasar'
 import ChromeApi from 'src/app/BrowserApi'
+import DialogButton from 'src/core/dialog/buttons/DialogButton.vue'
 import { useUtils } from 'src/core/services/Utils'
 import { useAuthStore } from 'src/stores/authStore'
 import { Tab } from 'src/tabsets/models/Tab'

layouts/SidePanelPageTabList.vue

@@ -86,6 +86,14 @@ watch(
   },
 )
 
+watch(
+  () => props.tabset?.tabs || [],
+  (a: Tab[], b: Tab[]) => {
+    console.log('--------', a)
+    tabs.value = tabsForColumn()
+  },
+)
+
 const handleDragAndDrop = async (event: any, column: TabsetColumn) => {
   console.log('SidePanelPageTabList d&d event:', event)
   const { moved, added } = event

stores/tabsetsStore.ts

@@ -22,7 +22,8 @@ import { computed, ref, watch } from 'vue'
  * Elements are persisted to the storage provided in the initialize function
  */
 export const useTabsetsStore = defineStore('tabsets', () => {
-  let loaded = ref(false)
+  const loaded = ref(false)
+  const lastUpdate = ref(new Date().getTime())
 
   /**
    * the (internal) storage for this store to use
@@ -46,8 +47,8 @@ export const useTabsetsStore = defineStore('tabsets', () => {
 
   const getCurrentTabsetId = async (): Promise<string | undefined> => {
     if (chrome && chrome.windows) {
-    return useSelectedTabsetService().getSelectedTabsetId()
-  }
+      return useSelectedTabsetService().getSelectedTabsetId()
+    }
     return currentTabsetId.value
   }
 
@@ -190,7 +191,9 @@ export const useTabsetsStore = defineStore('tabsets', () => {
     ts.lastChange = changeInfo
     const tabsetWithType: Tabset = JSON.parse(JSON.stringify(ts))
     //console.log('--- storing tabset! ---', tabsetWithType.lastChange)
-    return await storage.saveTabset(tabsetWithType)
+    const res = await storage.saveTabset(tabsetWithType)
+    lastUpdate.value = new Date().getTime()
+    return res
   }
 
   function deleteTabset(tsId: string) {
@@ -226,7 +229,7 @@ export const useTabsetsStore = defineStore('tabsets', () => {
       //       selectCurrentTabset(tabsetId, true)
       //     })
       // } else {
-        console.debug(`did not find tabset ${tabsetId}, not trying to reload`)
+      console.debug(`did not find tabset ${tabsetId}, not trying to reload`)
       // }
     }
     return undefined
@@ -435,5 +438,6 @@ export const useTabsetsStore = defineStore('tabsets', () => {
     removeReminder,
     activeReminders,
     loaded,
+    lastUpdate,
   }
 })