Merge pull request #281 from datlechin/refactor/remove-dead-notifications

datlechin · web-flow · commit 585ab9013878 · 2026-03-12T10:10:21.000+07:00
refactor: remove 11 dead notifications and their observers
diff --git a/TablePro/ContentView.swift b/TablePro/ContentView.swift
@@ -69,25 +69,6 @@ struct ContentView: View {
             .onReceive(NotificationCenter.default.publisher(for: .newConnection)) { _ in
                 openWindow(id: "connection-form", value: nil as UUID?)
             }
-            .onReceive(NotificationCenter.default.publisher(for: .deselectConnection)) { _ in
-                let sessionId = payload?.connectionId ?? DatabaseManager.shared.currentSessionId
-                if let sessionId {
-                    Task { @MainActor in
-                        let window = NSApp.keyWindow
-                        let confirmed = await AlertHelper.confirmDestructive(
-                            title: String(localized: "Disconnect"),
-                            message: String(localized: "Are you sure you want to disconnect from this database?"),
-                            confirmButton: String(localized: "Disconnect"),
-                            cancelButton: String(localized: "Cancel"),
-                            window: window
-                        )
-
-                        if confirmed {
-                            await DatabaseManager.shared.disconnectSession(sessionId)
-                        }
-                    }
-                }
-            }
             // Right sidebar toggle is handled by MainContentView (has the binding)
             // Left sidebar toggle uses native NSSplitViewController.toggleSidebar via responder chain
             .onChange(of: DatabaseManager.shared.currentSessionId, initial: true) { _, newSessionId in
diff --git a/TablePro/Core/Plugins/PluginManager.swift b/TablePro/Core/Plugins/PluginManager.swift
@@ -402,7 +402,6 @@ final class PluginManager {
         }
 
         Self.logger.info("Plugin '\(pluginId)' \(enabled ? "enabled" : "disabled")")
-        NotificationCenter.default.post(name: .pluginStateDidChange, object: nil, userInfo: ["pluginId": pluginId])
     }
 
     // MARK: - Install / Uninstall
diff --git a/TablePro/Core/Services/Infrastructure/AppNotifications.swift b/TablePro/Core/Services/Infrastructure/AppNotifications.swift
@@ -12,8 +12,6 @@ import Foundation
 extension Notification.Name {
     // MARK: - Query Editor
 
-    static let formatQueryRequested = Notification.Name("formatQueryRequested")
-    static let sendAIPrompt = Notification.Name("sendAIPrompt")
     static let aiFixError = Notification.Name("aiFixError")
     static let aiExplainSelection = Notification.Name("aiExplainSelection")
     static let aiOptimizeSelection = Notification.Name("aiOptimizeSelection")
@@ -28,14 +26,9 @@ extension Notification.Name {
 
     static let connectionUpdated = Notification.Name("connectionUpdated")
     static let databaseDidConnect = Notification.Name("databaseDidConnect")
-    static let connectionHealthStateChanged = Notification.Name("connectionHealthStateChanged")
 
     // MARK: - SSH
 
     static let sshTunnelDied = Notification.Name("sshTunnelDied")
     static let lastWindowDidClose = Notification.Name("lastWindowDidClose")
-
-    // MARK: - Plugins
-
-    static let pluginStateDidChange = Notification.Name("pluginStateDidChange")
 }
diff --git a/TablePro/Core/Services/Licensing/LicenseManager.swift b/TablePro/Core/Services/Licensing/LicenseManager.swift
@@ -143,7 +143,6 @@ final class LicenseManager {
             license = newLicense
             evaluateStatus()
 
-            NotificationCenter.default.post(name: .licenseStatusDidChange, object: nil)
             Self.logger.info("License activated for \(payloadData.email)")
         } catch let error as LicenseError {
             lastError = error
@@ -187,7 +186,6 @@ final class LicenseManager {
         revalidationTask?.cancel()
         revalidationTask = nil
 
-        NotificationCenter.default.post(name: .licenseStatusDidChange, object: nil)
         Self.logger.info("License deactivated")
     }
 
@@ -232,8 +230,6 @@ final class LicenseManager {
             }
             // Otherwise keep using cached license (still within grace period)
         }
-
-        NotificationCenter.default.post(name: .licenseStatusDidChange, object: nil)
     }
 
     // MARK: - Status Evaluation
diff --git a/TablePro/TableProApp.swift b/TablePro/TableProApp.swift
@@ -449,13 +449,10 @@ struct TableProApp: App {
 extension Notification.Name {
     // Connection lifecycle
     static let newConnection = Notification.Name("newConnection")
-    static let deselectConnection = Notification.Name("deselectConnection")
     static let openConnectionSwitcher = Notification.Name("openConnectionSwitcher")
-    static let reconnectDatabase = Notification.Name("reconnectDatabase")
 
     // Multi-listener broadcasts (Sidebar + Coordinator + StructureView)
     static let refreshData = Notification.Name("refreshData")
-    static let refreshAll = Notification.Name("refreshAll")
 
     // Data operations (still posted by DataGrid / context menus / StructureView subscribers)
     static let deleteSelectedRows = Notification.Name("deleteSelectedRows")
@@ -486,11 +483,6 @@ extension Notification.Name {
     static let showTableStructure = Notification.Name("showTableStructure")
     static let editViewDefinition = Notification.Name("editViewDefinition")
 
-    // Filter notifications
-    static let applyAllFilters = Notification.Name("applyAllFilters")
-    static let duplicateFilter = Notification.Name("duplicateFilter")
-    static let removeFilter = Notification.Name("removeFilter")
-
     // File opening notifications
     static let openSQLFiles = Notification.Name("openSQLFiles")
 
@@ -502,9 +494,6 @@ extension Notification.Name {
     // Database URL handling notifications
     static let switchSchemaFromURL = Notification.Name("switchSchemaFromURL")
     static let applyURLFilter = Notification.Name("applyURLFilter")
-
-    // License notifications
-    static let licenseStatusDidChange = Notification.Name("licenseStatusDidChange")
 }
 
 // MARK: - Check for Updates
diff --git a/TablePro/ViewModels/SidebarViewModel.swift b/TablePro/ViewModels/SidebarViewModel.swift
@@ -152,10 +152,9 @@ final class SidebarViewModel {
         guard !hasSetupNotifications else { return }
         hasSetupNotifications = true
 
-        Publishers.Merge3(
+        Publishers.Merge(
             NotificationCenter.default.publisher(for: .databaseDidConnect),
-            NotificationCenter.default.publisher(for: .refreshData),
-            NotificationCenter.default.publisher(for: .refreshAll)
+            NotificationCenter.default.publisher(for: .refreshData)
         )
         .receive(on: DispatchQueue.main)
         .sink { [weak self] _ in
diff --git a/TablePro/Views/AIChat/AIChatPanelView.swift b/TablePro/Views/AIChat/AIChatPanelView.swift
@@ -69,14 +69,6 @@ struct AIChatPanelView: View {
         .task(id: tables) {
             await fetchSchemaContext()
         }
-        .onReceive(NotificationCenter.default.publisher(for: .sendAIPrompt)) { notification in
-            guard let userInfo = notification.userInfo,
-                  let prompt = userInfo["prompt"] as? String,
-                  let featureRaw = userInfo["feature"] as? String,
-                  let feature = AIFeature(rawValue: featureRaw) else { return }
-            updateContext()
-            viewModel.sendWithContext(prompt: prompt, feature: feature)
-        }
         .onReceive(NotificationCenter.default.publisher(for: .aiFixError)) { notification in
             guard let userInfo = notification.userInfo,
                   let query = userInfo["query"] as? String,
diff --git a/TablePro/Views/Editor/QueryEditorView.swift b/TablePro/Views/Editor/QueryEditorView.swift
@@ -50,9 +50,6 @@ struct QueryEditorView: View {
             .clipped()
         }
         .background(Color(nsColor: .textBackgroundColor))
-        .onReceive(NotificationCenter.default.publisher(for: .formatQueryRequested)) { _ in
-            formatQuery()
-        }
         .onReceive(NotificationCenter.default.publisher(for: .editorSettingsDidChange)) { _ in
             isVimEnabled = AppSettingsManager.shared.editor.vimModeEnabled
         }
diff --git a/TablePro/Views/Main/Extensions/MainContentCoordinator+Alerts.swift b/TablePro/Views/Main/Extensions/MainContentCoordinator+Alerts.swift
@@ -95,7 +95,7 @@ extension MainContentCoordinator {
     /// Generate appropriate message for discard action type
     private func discardMessage(for action: DiscardAction) -> String {
         switch action {
-        case .refresh, .refreshAll:
+        case .refresh:
             return String(localized: "Refreshing will discard all unsaved changes.")
         }
     }
diff --git a/TablePro/Views/Main/Extensions/MainContentCoordinator+Refresh.swift b/TablePro/Views/Main/Extensions/MainContentCoordinator+Refresh.swift
@@ -11,35 +11,6 @@ import Foundation
 extension MainContentCoordinator {
     // MARK: - Refresh Handling
 
-    func handleRefreshAll(
-        hasPendingTableOps: Bool,
-        onDiscard: @escaping () -> Void
-    ) {
-        // If showing structure view, let it handle refresh notifications
-        if let tabIndex = tabManager.selectedTabIndex,
-           tabManager.tabs[tabIndex].showStructure {
-            return
-        }
-
-        let hasEditedCells = changeManager.hasChanges
-
-        if hasEditedCells || hasPendingTableOps {
-            Task { @MainActor in
-                let window = NSApp.keyWindow
-                let confirmed = await confirmDiscardChanges(action: .refreshAll, window: window)
-                if confirmed {
-                    onDiscard()
-                    changeManager.clearChanges()
-                    NotificationCenter.default.post(name: .databaseDidConnect, object: nil)
-                    runQuery()
-                }
-            }
-        } else {
-            NotificationCenter.default.post(name: .databaseDidConnect, object: nil)
-            runQuery()
-        }
-    }
-
     func handleRefresh(
         hasPendingTableOps: Bool,
         onDiscard: @escaping () -> Void
diff --git a/TablePro/Views/Main/MainContentCommandActions.swift b/TablePro/Views/Main/MainContentCommandActions.swift
@@ -139,14 +139,12 @@ final class MainContentCommandActions {
 
     private func setupObservers() {
         setupNonMenuNotificationObservers()
-        setupFilterBroadcastObservers()
         setupDataBroadcastObservers()
         setupTabBroadcastObservers()
         setupDatabaseBroadcastObservers()
         setupUIBroadcastObservers()
         setupWindowObservers()
         setupFileOpenObservers()
-        setupReconnectObservers()
     }
 
     /// Observers for notifications still posted by non-menu views (DataGrid, SidebarView,
@@ -546,38 +544,10 @@ final class MainContentCommandActions {
 
     // MARK: - Group B Broadcast Subscribers
 
-    // MARK: Filter Broadcasts
-
-    private func setupFilterBroadcastObservers() {
-        observeKeyWindowOnly(.applyAllFilters) { [weak self] _ in self?.handleApplyAllFilters() }
-        observeKeyWindowOnly(.duplicateFilter) { [weak self] _ in self?.handleDuplicateFilter() }
-        observeKeyWindowOnly(.removeFilter) { [weak self] _ in self?.handleRemoveFilter() }
-    }
-
-    private func handleApplyAllFilters() {
-        if filterStateManager.hasSelectedFilters {
-            filterStateManager.applySelectedFilters()
-            coordinator?.applyFilters(filterStateManager.appliedFilters)
-        }
-    }
-
-    private func handleDuplicateFilter() {
-        if filterStateManager.isVisible, let focusedFilter = filterStateManager.focusedFilter {
-            filterStateManager.duplicateFilter(focusedFilter)
-        }
-    }
-
-    private func handleRemoveFilter() {
-        if filterStateManager.isVisible, let focusedFilter = filterStateManager.focusedFilter {
-            filterStateManager.removeFilter(focusedFilter)
-        }
-    }
-
     // MARK: Data Broadcasts
 
     private func setupDataBroadcastObservers() {
         observeKeyWindowOnly(.refreshData) { [weak self] _ in self?.handleRefreshData() }
-        observeKeyWindowOnly(.refreshAll) { [weak self] _ in self?.handleRefreshAll() }
 
         observeKeyWindowOnly(.showTableStructure) { [weak self] notification in
             if let tableName = notification.object as? String {
@@ -597,17 +567,6 @@ final class MainContentCommandActions {
         )
     }
 
-    private func handleRefreshAll() {
-        let hasPendingTableOps = !pendingTruncates.wrappedValue.isEmpty || !pendingDeletes.wrappedValue.isEmpty
-        coordinator?.handleRefreshAll(
-            hasPendingTableOps: hasPendingTableOps,
-            onDiscard: { [weak self] in
-                self?.pendingTruncates.wrappedValue.removeAll()
-                self?.pendingDeletes.wrappedValue.removeAll()
-            }
-        )
-    }
-
     // MARK: Tab Broadcasts
 
     private func setupTabBroadcastObservers() {
@@ -798,17 +757,6 @@ final class MainContentCommandActions {
         }
     }
 
-    // MARK: Reconnect Broadcasts
-
-    private func setupReconnectObservers() {
-        observeKeyWindowOnly(.reconnectDatabase) { [weak self] _ in self?.handleReconnect() }
-    }
-
-    private func handleReconnect() {
-        Task { @MainActor in
-            await DatabaseManager.shared.reconnectSession(self.connection.id)
-        }
-    }
 }
 
 // MARK: - Focused Value Key
diff --git a/TablePro/Views/Main/MainContentCoordinator.swift b/TablePro/Views/Main/MainContentCoordinator.swift
@@ -14,7 +14,7 @@ import SwiftUI
 
 /// Discard action types for unified alert handling
 enum DiscardAction {
-    case refresh, refreshAll
+    case refresh
 }
 
 /// Cache entry for async-sorted query tab rows (stores index permutation, not row copies)

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,6 @@ final class PluginManager {`
`402`	`402`	`}`
`403`	`403`
`404`	`404`	`Self.logger.info("Plugin '\(pluginId)' \(enabled ? "enabled" : "disabled")")`
`405`		`- NotificationCenter.default.post(name: .pluginStateDidChange, object: nil, userInfo: ["pluginId": pluginId])`
`406`	`405`	`}`
`407`	`406`
`408`	`407`	`// MARK: - Install / Uninstall`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,6 @@ final class LicenseManager {`
`143`	`143`	`license = newLicense`
`144`	`144`	`evaluateStatus()`
`145`	`145`
`146`		`- NotificationCenter.default.post(name: .licenseStatusDidChange, object: nil)`
`147`	`146`	`Self.logger.info("License activated for \(payloadData.email)")`
`148`	`147`	`} catch let error as LicenseError {`
`149`	`148`	`lastError = error`
`@@ -187,7 +186,6 @@ final class LicenseManager {`
`187`	`186`	`revalidationTask?.cancel()`
`188`	`187`	`revalidationTask = nil`
`189`	`188`
`190`		`- NotificationCenter.default.post(name: .licenseStatusDidChange, object: nil)`
`191`	`189`	`Self.logger.info("License deactivated")`
`192`	`190`	`}`
`193`	`191`
`@@ -232,8 +230,6 @@ final class LicenseManager {`
`232`	`230`	`}`
`233`	`231`	`// Otherwise keep using cached license (still within grace period)`
`234`	`232`	`}`
`235`		`-`
`236`		`- NotificationCenter.default.post(name: .licenseStatusDidChange, object: nil)`
`237`	`233`	`}`
`238`	`234`
`239`	`235`	`// MARK: - Status Evaluation`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,6 @@ struct QueryEditorView: View {`
`50`	`50`	`.clipped()`
`51`	`51`	`}`
`52`	`52`	`.background(Color(nsColor: .textBackgroundColor))`
`53`		`- .onReceive(NotificationCenter.default.publisher(for: .formatQueryRequested)) { _ in`
`54`		`- formatQuery()`
`55`		`- }`
`56`	`53`	`.onReceive(NotificationCenter.default.publisher(for: .editorSettingsDidChange)) { _ in`
`57`	`54`	`isVimEnabled = AppSettingsManager.shared.editor.vimModeEnabled`
`58`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ extension MainContentCoordinator {`
`95`	`95`	`/// Generate appropriate message for discard action type`
`96`	`96`	`private func discardMessage(for action: DiscardAction) -> String {`
`97`	`97`	`switch action {`
`98`		`- case .refresh, .refreshAll:`
	`98`	`+ case .refresh:`
`99`	`99`	`return String(localized: "Refreshing will discard all unsaved changes.")`
`100`	`100`	`}`
`101`	`101`	`}`