fix(coordinator): make the window title a function of the pane it is showing (#2054)

Author: datlechin

CHANGELOG.md

@@ -32,6 +32,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- A window being connected is now named after the connection instead of "SQL Query", which named a tab it did not have yet.
+- A window that loses its connection no longer keeps the name of the table it stopped showing. Its name and its native tab label now follow what the window is actually displaying.
+- The titlebar no longer repeats itself, so a window with no tabs open reads "My Database" rather than "My Database - My Database".
+- A tab you named yourself is no longer renamed behind your back when the window reconnects. Any title ending in "Query" used to be treated as a placeholder and replaced.
+- Window naming now works in translated builds. The rule that decided whether a title was a placeholder compared it against English text, so it never matched outside English.
+- Renaming a connection now updates the name of any window already open on it.
 - A dropped SSH tunnel that ran out of reconnect attempts left the window spinning forever with no way back. It now reports what happened and offers to try again.
 - A brief tunnel reconnect no longer closes your tabs. The window used to tear down the whole session on the blip, taking unsaved query edits with it.
 - The sidebar's filter field no longer sits over an empty sidebar while a connection is still being established.

TablePro/Core/Services/Infrastructure/MainSplitViewController.swift

@@ -20,7 +20,9 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
     // MARK: - Payload & Session
 
     let payload: EditorTabPayload?
-    let payloadConnection: DatabaseConnection?
+    /// Re-read when the connection record changes, so a rename reaches the window's name and
+    /// the connecting screen instead of freezing whatever the record said at creation.
+    private(set) var payloadConnection: DatabaseConnection?
     private var currentSession: ConnectionSession?
     private var sessionState: SessionStateFactory.SessionState?
     private var rightPanelState: RightPanelState?
@@ -82,6 +84,7 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
 
     private var connectionStatusCancellable: AnyCancellable?
     private var railVisibilityCancellable: AnyCancellable?
+    private var connectionUpdatedCancellable: AnyCancellable?
 
     // MARK: - Init
 
@@ -95,14 +98,6 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
             self.payloadConnection = nil
         }
 
-        let queryLanguageName: String? = {
-            guard let connectionId = payload?.connectionId,
-                  let connection = DatabaseManager.shared.activeSessions[connectionId]?.connection else {
-                return nil
-            }
-            return PluginManager.shared.queryLanguageName(for: connection.type)
-        }()
-
         var resolvedSession: ConnectionSession?
         if let connectionId = payload?.connectionId {
             resolvedSession = DatabaseManager.shared.activeSessions[connectionId]
@@ -111,17 +106,8 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
         }
         self.currentSession = resolvedSession
 
-        let titleConnection = self.payloadConnection ?? resolvedSession?.connection
-        self.windowTitle = WindowTitleResolver.resolveTitle(
-            payload: payload,
-            databaseType: titleConnection?.type,
-            queryLanguageName: queryLanguageName
-        )
-        if let titleConnection {
-            self.windowSubtitle = WindowTitleResolver.resolveSubtitle(payload: payload, connection: titleConnection)
-        } else {
-            self.windowSubtitle = ""
-        }
+        self.windowTitle = ""
+        self.windowSubtitle = ""
 
         if let session = resolvedSession {
             self.rightPanelState = RightPanelState(connectionId: session.connection.id)
@@ -136,11 +122,6 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
                 state = SessionStateFactory.create(connection: session.connection, payload: payload)
             }
             self.sessionState = state
-            if payload?.intent == .newEmptyTab,
-               let tabTitle = state.coordinator.tabManager.selectedTab?.title,
-               !tabTitle.isBlank {
-                self.windowTitle = tabTitle
-            }
         }
 
         if resolvedSession?.driver != nil {
@@ -152,6 +133,10 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
         }
 
         super.init(nibName: nil, bundle: nil)
+
+        /// AppKit renders a native tab's label even for a tab that is never activated, so the
+        /// title has to be right at creation rather than at first appearance.
+        applyWindowTitle()
     }
 
     @available(*, unavailable)
@@ -260,13 +245,30 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
             .sink { [weak self] _ in
                 self?.applyRailVisibility(workspaceCount: WorkspaceRailStore.entries.count)
             }
+        connectionUpdatedCancellable = AppEvents.shared.connectionUpdated
+            .receive(on: RunLoop.main)
+            .sink { [weak self] changedId in
+                self?.handleConnectionRecordChange(changedId)
+            }
         handleConnectionStatusChange()
         applyRailVisibility(workspaceCount: WorkspaceRailStore.entries.count)
     }
 
     private func removeObservers() {
         connectionStatusCancellable = nil
         railVisibilityCancellable = nil
+        connectionUpdatedCancellable = nil
+    }
+
+    /// `nil` is the documented bulk-update payload, so it has to repaint too.
+    private func handleConnectionRecordChange(_ changedId: UUID?) {
+        guard let connectionId = payload?.connectionId ?? currentSession?.connection.id else { return }
+        guard changedId == nil || changedId == connectionId else { return }
+        guard let stored = ConnectionStorage.shared.loadConnections().first(where: { $0.id == connectionId })
+            ?? DatabaseManager.shared.activeSessions[connectionId]?.connection else { return }
+        payloadConnection = stored
+        applyWindowTitle()
+        rebuildPanes()
     }
 
     // MARK: - Toolbar
@@ -330,14 +332,6 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
     private func adoptSession(_ session: ConnectionSession) {
         currentSession = session
 
-        if payload?.tableName == nil,
-           windowTitle.isBlank
-           || windowTitle == WindowTitleResolver.fallbackTitle
-           || windowTitle.hasSuffix(" Query") {
-            windowTitle = session.connection.name
-            windowSubtitle = session.connection.name
-        }
-
         if rightPanelState == nil {
             rightPanelState = RightPanelState(connectionId: session.connection.id)
         }
@@ -368,9 +362,25 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
     private func applyPhase() {
         rebuildPanes()
         applyPaneChrome()
+        applyWindowTitle()
         SessionRecoveryTracker.sync()
     }
 
+    /// Repainted on every phase change for the same reason the panes are. Leaving it out is
+    /// what let a window keep the name of a table it had stopped showing after the session
+    /// underneath it went away.
+    internal func applyWindowTitle() {
+        let resolved = WindowTitleResolver.resolveWindow(
+            pane: currentPane,
+            connection: paneConnection,
+            tab: sessionState?.tabManager.selectedTab,
+            hasTabs: !(sessionState?.tabManager.tabs.isEmpty ?? true),
+            queryLanguageName: paneConnection.map { PluginManager.shared.queryLanguageName(for: $0.type) } ?? nil
+        )
+        windowTitle = resolved.title
+        windowSubtitle = resolved.subtitle
+    }
+
     internal func transition(to next: ConnectionWindowPhase) {
         phase = next
     }

TablePro/Core/Services/Infrastructure/WindowTitleResolver.swift

@@ -7,12 +7,50 @@
 
 import Foundation
 
+/// Title and subtitle decided together. Resolving them apart is how a window ended up
+/// announcing "TablePro - TablePro": two callers each picked the connection name without
+/// knowing the other had.
+struct ResolvedWindowTitle: Equatable {
+    let title: String
+    let subtitle: String
+}
+
 @MainActor
 enum WindowTitleResolver {
     static var fallbackTitle: String {
         String(localized: "SQL Query")
     }
 
+    /// The window's name is a function of the pane it is showing, exactly like its content and
+    /// its chrome. A window that is not showing content is not showing a document, so naming it
+    /// after a tab is naming something that is not there: that is how a connecting window came
+    /// to be called "SQL Query", and how a window that lost its session kept the name of the
+    /// table it had stopped displaying.
+    static func resolveWindow(
+        pane: ConnectionWindowPane,
+        connection: DatabaseConnection?,
+        tab: QueryTab?,
+        hasTabs: Bool,
+        queryLanguageName: String?
+    ) -> ResolvedWindowTitle {
+        let connectionName = connection?.name ?? ""
+
+        guard pane == .content else {
+            return connectionTitle(connectionName)
+        }
+        guard hasTabs, let connection else {
+            return connectionTitle(connectionName)
+        }
+
+        let title = resolveTitle(tab: tab, connection: connection, queryLanguageName: queryLanguageName)
+        let subtitle = resolveSubtitle(tab: tab, connection: connection)
+        return ResolvedWindowTitle(title: title, subtitle: subtitle == title ? "" : subtitle)
+    }
+
+    private static func connectionTitle(_ name: String) -> ResolvedWindowTitle {
+        ResolvedWindowTitle(title: name.isBlank ? fallbackTitle : name, subtitle: "")
+    }
+
     static func resolveTitle(
         payload: EditorTabPayload?,
         databaseType: DatabaseType?,

TablePro/Views/Main/Extensions/MainContentView+Setup.swift

@@ -278,16 +278,15 @@ extension MainContentView {
     /// Update window title, proxy icon, and dirty dot based on the selected tab.
     func updateWindowTitleAndFileState() {
         let selectedTab = tabManager.selectedTab
-        if selectedTab == nil, tabManager.tabs.isEmpty {
-            windowTitle = connection.name
-        } else {
-            windowTitle = WindowTitleResolver.resolveTitle(
-                tab: selectedTab,
-                connection: connection,
-                queryLanguageName: PluginManager.shared.queryLanguageName(for: connection.type)
-            )
-        }
-        windowSubtitle = WindowTitleResolver.resolveSubtitle(tab: selectedTab, connection: connection)
+        let resolved = WindowTitleResolver.resolveWindow(
+            pane: .content,
+            connection: connection,
+            tab: selectedTab,
+            hasTabs: !tabManager.tabs.isEmpty,
+            queryLanguageName: PluginManager.shared.queryLanguageName(for: connection.type)
+        )
+        windowTitle = resolved.title
+        windowSubtitle = resolved.subtitle
         coordinator.splitViewController?.updateDetailMinimumThickness(for: selectedTab?.tabType)
         viewWindow?.representedURL = selectedTab?.content.sourceFileURL
         viewWindow?.isDocumentEdited = selectedTab?.showsUnsavedIndicator ?? false

TablePro/Views/Main/MainContentView.swift

@@ -323,11 +323,6 @@ struct MainContentView: View {
                     "[open] MainContentView.onAppear start windowId=\(windowId, privacy: .public) connId=\(connection.id, privacy: .public) tabs=\(tabManager.tabs.count)"
                 )
                 coordinator.markActivated()
-
-                // Set window title for empty state (no tabs restored)
-                if tabManager.tabs.isEmpty {
-                    windowTitle = connection.name
-                }
                 setupCommandActions()
                 updateToolbarPendingState()
                 updateInspectorContext()