refactor(datagrid): extract filter tri-state logic and fix changelog sections

Author: datlechin

CHANGELOG.md

@@ -11,13 +11,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - The tree sidebar can show only the databases you pick. Use the filter button to check the ones you want, with a search box for long lists. The choice is saved per connection. (#1667)
 - Closing a query tab no longer loses unsaved SQL. The next blank query tab you open for the same connection brings the last closed draft back. (#1686)
+- A checkbox in the filter panel header turns every filter row on or off at once. It shows a dash when only some rows are on.
+
+### Changed
+
+- The filter panel's "Unset" button is now "Clear". It keeps your filter rows and only drops the applied state, so the table returns to unfiltered results. To remove the rows themselves, use "Remove All Filters" in the filter options menu.
+- Apply a single filter on its own from a row's right-click menu with "Apply Only This Filter". The inline per-row Apply button is gone.
 
 ### Fixed
 
-- Switcher, menus, and alerts now use each database's own container name: Dataset for BigQuery, Keyspace for Cassandra and ScyllaDB. (#509)
-- Filter panel header "Unset" renamed to "Clear": it now keeps filter rows in place and only removes the applied state, returning the table to unfiltered results. Use "Remove All Filters" in the filter options menu to discard all filter rows at once.
-- Per-row Apply and Applied buttons removed from the filter panel; "Apply Only This Filter" is now in each row's right-click context menu.
-- A tri-state checkbox in the filter panel header toggles all filter rows enabled or disabled at once.
 - Oracle connections no longer crash the app during connect. A short or unexpected handshake packet from the server (such as session-setup metadata or an error) now surfaces the error or continues instead of trapping. (#1683)
 - MongoDB filters on `_id` and other ObjectId fields now match. A 24-character hex value is matched as an ObjectId as well as a string, so filtering by `_id` returns the row instead of nothing. (#1682)
 - The sidebar and inspector keep their width per connection, the sidebar keeps its collapsed state, and the inspector keeps its selected tab, when you quit and reopen the app.

TablePro/Models/Database/TableFilter.swift

@@ -232,4 +232,11 @@ struct TabFilterState: Equatable, Hashable, Codable {
     var hasAppliedFilters: Bool {
         !appliedFilters.isEmpty
     }
+
+    var allEnabledState: Bool? {
+        guard !filters.isEmpty else { return false }
+        if filters.allSatisfy({ $0.isEnabled }) { return true }
+        if filters.allSatisfy({ !$0.isEnabled }) { return false }
+        return nil
+    }
 }

TablePro/Views/Filter/FilterPanelView.swift

@@ -68,24 +68,15 @@ struct FilterPanelView: View {
     }
 
     private var allFiltersCheckboxImage: String {
-        switch allFiltersEnabledState {
-        case true: return "checkmark.square.fill"
-        case false: return "square"
+        switch filterState.allEnabledState {
+        case .some(true): return "checkmark.square.fill"
+        case .some(false): return "square"
         case .none: return "minus.square.fill"
         }
     }
 
-    private var allFiltersEnabledState: Bool? {
-        guard !filterState.filters.isEmpty else { return false }
-        let enabledCount = filterState.filters.count { $0.isEnabled }
-        if enabledCount == filterState.filters.count { return true }
-        if enabledCount == 0 { return false }
-        return nil
-    }
-
     private func toggleAllFiltersEnabled() {
-        let allEnabled = filterState.filters.allSatisfy { $0.isEnabled }
-        let newState = !allEnabled
+        let newState = filterState.allEnabledState != true
         for filter in filterState.filters {
             var updated = filter
             updated.isEnabled = newState

TableProTests/Models/TabFilterStateTests.swift

@@ -75,6 +75,42 @@ struct TabFilterStateTests {
         #expect(decoded.appliedFilters.map(\.id) == [filter.id])
     }
 
+    @Test("allEnabledState is false when there are no filters")
+    func allEnabledStateEmpty() {
+        let state = TabFilterState()
+        #expect(state.allEnabledState == false)
+    }
+
+    @Test("allEnabledState is true when every filter is enabled")
+    func allEnabledStateAllOn() {
+        var state = TabFilterState()
+        state.filters = [
+            TestFixtures.makeTableFilter(column: "id"),
+            TestFixtures.makeTableFilter(column: "name")
+        ]
+        #expect(state.allEnabledState == true)
+    }
+
+    @Test("allEnabledState is false when every filter is disabled")
+    func allEnabledStateAllOff() {
+        var state = TabFilterState()
+        state.filters = [
+            TestFixtures.makeTableFilter(column: "id", isEnabled: false),
+            TestFixtures.makeTableFilter(column: "name", isEnabled: false)
+        ]
+        #expect(state.allEnabledState == false)
+    }
+
+    @Test("allEnabledState is nil when filters are mixed")
+    func allEnabledStateMixed() {
+        var state = TabFilterState()
+        state.filters = [
+            TestFixtures.makeTableFilter(column: "id"),
+            TestFixtures.makeTableFilter(column: "name", isEnabled: false)
+        ]
+        #expect(state.allEnabledState == nil)
+    }
+
     @Test("browseSearch reads and writes the key pattern fields")
     func browseSearchAccessor() {
         var state = TabFilterState()