Merge pull request #352 from datlechin/fix/filter-state-persistence

fix: persist filter state across tab switches and clear on table replacement

Author: datlechin

TablePro/Views/Main/Extensions/MainContentCoordinator+Filtering.swift

@@ -59,6 +59,9 @@ extension MainContentCoordinator {
                 self.filterStateManager.saveLastFilters(for: capturedTableName)
             }
 
+            // Persist filter state to tab so it survives tab switches
+            self.tabManager.tabs[capturedTabIndex].filterState = self.filterStateManager.saveToTabState()
+
             self.runQuery()
         }
     }
@@ -107,6 +110,7 @@ extension MainContentCoordinator {
             }
 
             self.tabManager.tabs[capturedTabIndex].query = newQuery
+            self.tabManager.tabs[capturedTabIndex].filterState = self.filterStateManager.saveToTabState()
             self.runQuery()
         }
     }
@@ -146,6 +150,7 @@ extension MainContentCoordinator {
             }
 
             self.tabManager.tabs[capturedTabIndex].query = newQuery
+            self.tabManager.tabs[capturedTabIndex].filterState = self.filterStateManager.saveToTabState()
             self.runQuery()
         }
     }

TablePro/Views/Main/Extensions/MainContentCoordinator+Navigation.swift

@@ -113,6 +113,7 @@ extension MainContentCoordinator {
                 databaseType: connection.type,
                 databaseName: currentDatabase
             ) {
+                filterStateManager.clearAll()
                 if let tabIndex = tabManager.selectedTabIndex {
                     tabManager.tabs[tabIndex].pagination.reset()
                     toolbarState.isTableTab = true
@@ -180,6 +181,7 @@ extension MainContentCoordinator {
                     databaseName: databaseName,
                     isPreview: true
                 )
+                previewCoordinator.filterStateManager.clearAll()
                 if let tabIndex = previewCoordinator.tabManager.selectedTabIndex {
                     previewCoordinator.tabManager.tabs[tabIndex].showStructure = showStructure
                     previewCoordinator.tabManager.tabs[tabIndex].pagination.reset()
@@ -206,6 +208,7 @@ extension MainContentCoordinator {
                 databaseName: databaseName,
                 isPreview: true
             )
+            filterStateManager.clearAll()
             if let tabIndex = tabManager.selectedTabIndex {
                 tabManager.tabs[tabIndex].showStructure = showStructure
                 tabManager.tabs[tabIndex].pagination.reset()

TablePro/Views/Main/Extensions/MainContentCoordinator+TabSwitch.swift

@@ -18,12 +18,14 @@ extension MainContentCoordinator {
         isHandlingTabSwitch = true
         defer { isHandlingTabSwitch = false }
 
-        // Persist the outgoing tab's unsaved changes so they survive the switch
+        // Persist the outgoing tab's unsaved changes and filter state so they survive the switch
         if let oldId = oldTabId,
-           let oldIndex = tabManager.tabs.firstIndex(where: { $0.id == oldId }),
-           changeManager.hasChanges
+           let oldIndex = tabManager.tabs.firstIndex(where: { $0.id == oldId })
         {
-            tabManager.tabs[oldIndex].pendingChanges = changeManager.saveState()
+            if changeManager.hasChanges {
+                tabManager.tabs[oldIndex].pendingChanges = changeManager.saveState()
+            }
+            tabManager.tabs[oldIndex].filterState = filterStateManager.saveToTabState()
         }
 
         if tabManager.tabs.count > 2 {

TablePro/Views/Main/MainContentView.swift

@@ -336,13 +336,14 @@ struct MainContentView: View {
                 // Skip if the user has unsaved changes (in-memory or tab-level).
                 let hasPendingEdits = changeManager.hasChanges
                     || (tabManager.selectedTab?.pendingChanges.hasChanges ?? false)
+                let isConnected = DatabaseManager.shared.activeSessions[connection.id]?.isConnected ?? false
                 let needsLazyLoad = tabManager.selectedTab.map { tab in
                     tab.tabType == .table
                         && (tab.resultRows.isEmpty || tab.rowBuffer.isEvicted)
                         && (tab.lastExecutedAt == nil || tab.rowBuffer.isEvicted)
                         && !tab.query.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
                 } ?? false
-                if needsLazyLoad && !hasPendingEdits {
+                if needsLazyLoad && !hasPendingEdits && isConnected {
                     coordinator.runQuery()
                 }
             }