qdadm 0.25.0 → 0.26.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qdadm",
-  "version": "0.25.0",
+  "version": "0.26.1",
   "description": "Vue 3 framework for admin dashboards with PrimeVue",
   "author": "quazardous",
   "license": "MIT",

package/src/composables/useListPageBuilder.js

@@ -1,4 +1,4 @@
-import { ref, computed, watch, onMounted, inject, provide } from 'vue'
+import { ref, computed, watch, onMounted, inject, provide, nextTick } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useToast } from 'primevue/usetoast'
 import { useConfirm } from 'primevue/useconfirm'
@@ -170,6 +170,7 @@ export function useListPageBuilder(config = {}) {
   const loading = ref(false)
   const selected = ref([])
   const deleting = ref(false)
+  let isRestoringFilters = false  // Flag to skip watch during restore
 
   // Pagination (load from cookie if available)
   const page = ref(1)
@@ -508,7 +509,7 @@ export function useListPageBuilder(config = {}) {
   function onFiltersChanged() {
     page.value = 1
     loadItems()
-    // Persist filters to session storage
+    // Persist filters + search to session storage
     if (persistFilters) {
       const toPersist = {}
       for (const [name, value] of Object.entries(filterValues.value)) {
@@ -517,6 +518,10 @@ export function useListPageBuilder(config = {}) {
           toPersist[name] = value
         }
       }
+      // Also persist search query
+      if (searchQuery.value) {
+        toPersist._search = searchQuery.value
+      }
       setSessionFilters(filterSessionKey, toPersist)
     }
     // Sync to URL query params
@@ -895,6 +900,8 @@ export function useListPageBuilder(config = {}) {
    * Restore filter values from URL query params (priority) or session storage
    */
   function restoreFilters() {
+    isRestoringFilters = true  // Prevent watch from triggering during restore
+
     // Priority 1: URL query params
     const urlFilters = {}
     for (const key of filtersMap.value.keys()) {
@@ -913,8 +920,17 @@ export function useListPageBuilder(config = {}) {
       searchQuery.value = route.query.search
     }
 
-    // Priority 2: Session storage (only for filters not in URL)
-    const sessionFilters = persistFilters ? getSessionFilters(filterSessionKey) : null
+    // Priority 2: Session storage (only for filters/search not in URL)
+    const sessionData = persistFilters ? getSessionFilters(filterSessionKey) : null
+
+    // Extract search from session (stored as _search)
+    if (sessionData?._search && !route.query.search) {
+      searchQuery.value = sessionData._search
+    }
+
+    // Remove _search from session data before merging with filters
+    const sessionFilters = sessionData ? { ...sessionData } : null
+    if (sessionFilters) delete sessionFilters._search
 
     // Merge: URL takes priority over session
     const restoredFilters = { ...sessionFilters, ...urlFilters }
@@ -925,6 +941,11 @@ export function useListPageBuilder(config = {}) {
         filterValues.value[name] = value
       }
     }
+
+    // Reset flag after Vue processes updates
+    nextTick(() => {
+      isRestoringFilters = false
+    })
   }
 
   // ============ ACTIONS ============
@@ -1221,6 +1242,8 @@ export function useListPageBuilder(config = {}) {
   // ============ WATCHERS ============
   let searchTimeout = null
   watch(searchQuery, () => {
+    // Skip watch during restore (loadItems will be called after restore)
+    if (isRestoringFilters) return
     clearTimeout(searchTimeout)
     searchTimeout = setTimeout(() => {
       // Use onFiltersChanged to also sync URL params