feat(linux-workspace): name a tab's database in its title when not the connection's own

linux/changelog.d/3904.added.md

@@ -0,0 +1 @@
+A query tab in another of the connection's databases names it in its title, as "Query 1 (analytics)".

linux/crates/app/src/ui/editor/tab_scope.rs

@@ -186,11 +186,18 @@ impl SqlEditor {
             };
             if let Some(editor) = editor.upgrade() {
                 let imp = editor.imp();
-                let own = databases.iter().find(|database| database.is_default);
-                imp.listed_own_database
-                    .replace(own.map(|database| database.name.clone()));
+                let own = databases
+                    .iter()
+                    .find(|database| database.is_default)
+                    .map(|database| database.name.clone());
+                let own_changed = imp.listed_own_database.replace(own.clone()) != own;
                 imp.scope_button.set_menu_model(database_menu(&databases).as_ref());
                 editor.show_scope();
+                // A tab already in the database the server now calls the
+                // connection's own is no longer a moved one.
+                if own_changed {
+                    editor.emit_by_name::<()>("database-changed", &[]);
+                }
             }
         });
     }

linux/crates/app/src/ui/editor/tests.rs

@@ -2850,6 +2850,41 @@ fn a_connection_in_no_database_offers_one() {
     assert_eq!(harness.editor.imp().scope_button_label.label(), "analytics");
 }
 
+/// A tab in the database the server names as the connection's own once
+/// it lists them again is no longer a moved one, for its title and its
+/// record.
+#[gtk4::test]
+fn a_tab_in_the_database_the_server_then_calls_its_own_is_not_moved() {
+    let database = |name: &str, is_default: bool| tablepro_core::meta::SchemaInfo {
+        name: name.to_owned(),
+        is_default,
+        is_system: false,
+    };
+    let harness = scoped_editor_with(mysql_dialect(), &[], answering(), |script, request| {
+        if let tablepro_session::connect::RequestTarget::Network { database, .. } = &mut request.target {
+            *database = None;
+        }
+        script
+            .list_databases
+            .once(FakeReply::ok(vec![
+                database("analytics", false),
+                database("app", false),
+            ]))
+            .always(FakeReply::ok(vec![database("analytics", false), database("app", true)]));
+    });
+    let button = harness.editor.imp().scope_button.get();
+    wait_until(WAIT, || button.is_visible()).expect("the database menu");
+    let changed = SignalLog::connect(&harness.editor, "database-changed", |_| ());
+    pick_database(&harness, "app");
+    assert_eq!(harness.editor.tab_database().as_deref(), Some("app"));
+
+    harness.editor.buffer().set_text("CREATE DATABASE scratch");
+    run_and_wait(&harness);
+
+    wait_until(WAIT, || changed.count() == 2).expect("the workspace to hear the tab is in its own database");
+    assert_eq!(harness.editor.tab_database(), None);
+}
+
 /// All Rows runs the statement again on the connection, in another
 /// database than a moved tab's, so only the rows shown are offered.
 #[gtk4::test]

linux/crates/app/src/ui/workspace/mod.rs

@@ -412,6 +412,14 @@ impl WorkspaceTab {
         }
     }
 
+    /// The database an editor tab moved to off the connection's.
+    pub(crate) fn moved_to(&self) -> Option<String> {
+        match self {
+            WorkspaceTab::Editor(slot) => slot.editor.tab_database(),
+            _ => None,
+        }
+    }
+
     /// What the tab's title is made from.
     pub(crate) fn identity(&self) -> tab_identity::TabIdentity {
         use tab_identity::TabIdentity;
@@ -500,8 +508,9 @@ pub(crate) enum WorkspaceInput {
     /// An editor tab was saved, opened a file, or its text came to
     /// differ from its file's or match it again.
     EditorTabFileChanged(Uuid),
-    /// An editor tab moved to another database, which its record keeps.
-    EditorTabDatabaseChanged,
+    /// An editor tab moved to another database, which its record keeps
+    /// and its title names.
+    EditorTabDatabaseChanged(Uuid),
     /// The session's saved tabs and their editor text, read off the GTK
     /// thread.
     WorkspaceLoaded(workspace_tabs::LoadedWorkspace),
@@ -1122,7 +1131,7 @@ impl WorkspaceModel {
             return;
         };
         if let Some(tab) = self.workspace_tabs.borrow().get(&id) {
-            tab_title::apply_tab_title(tab.page(), &title, &self.label);
+            tab_title::apply_tab_title(tab.page(), &title, &self.label, tab.moved_to().as_deref());
         }
         if self.index.last_selected() == Some(id) {
             self.refresh_title();
@@ -1266,7 +1275,7 @@ impl WorkspaceModel {
             }
             WorkspaceInput::EditorTabContentChanged(id) => self.on_editor_tab_content_changed(id),
             WorkspaceInput::EditorTabFileChanged(id) => self.on_editor_tab_file_changed(id),
-            WorkspaceInput::EditorTabDatabaseChanged => self.persist_workspace_state(),
+            WorkspaceInput::EditorTabDatabaseChanged(id) => self.on_editor_tab_database_changed(id),
             WorkspaceInput::WorkspaceLoaded(loaded) => self.on_workspace_loaded(loaded),
             WorkspaceInput::ResetWorkspaceLayout => self.on_reset_workspace_layout(),
             WorkspaceInput::SafeModeChanged => self.refresh_title(),

linux/crates/app/src/ui/workspace/tab_factory.rs

@@ -139,6 +139,7 @@ impl TabFactory {
             &page,
             &resolve_tab_title(&slot.identity(), self.parts.naming.get()),
             &self.parts.label,
+            slot.moved_to().as_deref(),
         );
         self.parts.tabs.borrow_mut().insert(id, slot);
         self.parts.input.deliver(WorkspaceInput::WorkspaceTabsChanged);
@@ -497,7 +498,7 @@ pub(super) fn connect_editor(
     let file = input.clone();
     editor.connect_file_changed(move |_| file.deliver(WorkspaceInput::EditorTabFileChanged(tab_id)));
     let database = input.clone();
-    editor.connect_database_changed(move |_| database.deliver(WorkspaceInput::EditorTabDatabaseChanged));
+    editor.connect_database_changed(move |_| database.deliver(WorkspaceInput::EditorTabDatabaseChanged(tab_id)));
     let transaction = input.clone();
     editor.connect_transaction_changed(move |_, _| transaction.deliver(WorkspaceInput::EditorTransactionChanged));
     let toast = input.clone();

linux/crates/app/src/ui/workspace/tab_title.rs

@@ -56,6 +56,13 @@ impl ConnectionLabel {
         self.shares_bar.get()
     }
 
+    /// What a tab names after its title: the connection while the bar is
+    /// shared, and the tab's database when it moved off the connection's.
+    fn suffix(&self, moved_to: Option<&str>) -> Option<String> {
+        let connection = self.shares_bar().then(|| self.name());
+        suffix(connection, moved_to)
+    }
+
     /// True when that changed, and the tabs have to be titled again.
     pub(crate) fn set_shares_bar(&self, shares: bool) -> bool {
         self.shares_bar.replace(shares) != shares
@@ -67,13 +74,17 @@ impl ConnectionLabel {
 /// what the unsaved icon shows, since a screen reader reads a tab's
 /// tooltip and not its icon, and it is escaped: AdwTab shows it as Pango
 /// markup.
-pub(crate) fn apply_tab_title(page: &adw::TabPage, title: &TabTitle, connection: &ConnectionLabel) {
-    let name = connection.name();
+pub(crate) fn apply_tab_title(
+    page: &adw::TabPage,
+    title: &TabTitle,
+    connection: &ConnectionLabel,
+    moved_to: Option<&str>,
+) {
     // The overview's search finds a connection's tabs by its name.
-    page.set_keyword(&name);
-    let title = match connection.shares_bar() {
-        true => name_connection(title.clone(), &name),
-        false => title.clone(),
+    page.set_keyword(&connection.name());
+    let title = match connection.suffix(moved_to) {
+        Some(suffix) => name_place(title.clone(), &suffix),
+        None => title.clone(),
     };
     page.set_title(&title.label);
     let unsaved = page.icon().is_some().then(|| crate::i18n::gettext("Unsaved changes"));
@@ -84,16 +95,29 @@ pub(crate) fn apply_tab_title(page: &adw::TabPage, title: &TabTitle, connection:
     page.set_tooltip(&glib::markup_escape_text(&lines.join("\n")));
 }
 
-/// A tab beside another connection's names its own after its title,
-/// which stays the useful part once ellipsized. The tooltip names it on a
-/// line of its own, which a cut label loses.
-fn name_connection(title: TabTitle, connection: &str) -> TabTitle {
-    let tooltip = [title.tooltip.as_deref().unwrap_or(&title.label), connection].join("\n");
+/// The connection, the database, or both, as "prod, analytics".
+fn suffix(connection: Option<String>, database: Option<&str>) -> Option<String> {
+    match (connection, database) {
+        // Translators: a connection and one of its databases, after a tab's title.
+        (Some(connection), Some(database)) => Some(crate::i18n::gettext_f(
+            "{connection}, {database}",
+            &[("connection", &connection), ("database", database)],
+        )),
+        (connection, database) => connection.or_else(|| database.map(str::to_owned)),
+    }
+}
+
+/// A tab beside another connection's names its own after its title, and
+/// a tab in another database names that, since the title stays the
+/// useful part once ellipsized. The tooltip names them on a line of its
+/// own, which a cut label loses.
+fn name_place(title: TabTitle, place: &str) -> TabTitle {
+    let tooltip = [title.tooltip.as_deref().unwrap_or(&title.label), place].join("\n");
     TabTitle {
-        // Translators: a tab's title and its connection, while several connections share the tab bar.
+        // Translators: a tab's title and its connection while several connections share the tab bar, or the database it runs in when not the connection's.
         label: crate::i18n::gettext_f(
             "{title} ({connection})",
-            &[("title", &title.label), ("connection", connection)],
+            &[("title", &title.label), ("connection", place)],
         ),
         tooltip: Some(tooltip),
     }
@@ -274,7 +298,7 @@ mod tests {
 
     #[test]
     fn a_tab_beside_another_connections_names_its_own_after_its_title() {
-        let title = name_connection(
+        let title = name_place(
             resolve_tab_title(&TabIdentity::Table(orders()), TableNaming::Bare),
             "Shop",
         );
@@ -284,6 +308,17 @@ mod tests {
         assert!(!title.label.contains('·'));
     }
 
+    #[test]
+    fn a_tab_names_its_database_and_the_connection_it_shares_the_bar_with() {
+        assert_eq!(suffix(None, Some("analytics")).as_deref(), Some("analytics"));
+        assert_eq!(
+            suffix(Some("Shop".to_owned()), Some("analytics")).as_deref(),
+            Some("Shop, analytics")
+        );
+        assert_eq!(suffix(Some("Shop".to_owned()), None).as_deref(), Some("Shop"));
+        assert_eq!(suffix(None, None), None);
+    }
+
     #[test]
     fn a_script_its_label_shows_whole_has_no_tooltip() {
         let title = resolve_tab_title(

linux/crates/app/src/ui/workspace/tests/tab_title.rs

@@ -385,3 +385,22 @@ fn a_renamed_connection_retitles_its_tabs_and_the_window() {
     assert_eq!(page.keyword().as_deref(), Some("Shop"));
     assert_eq!(test.workspace().connection_name(), "Shop");
 }
+
+/// A tab moved off the connection's database names the one it runs in.
+#[gtk4::test]
+fn a_tab_moved_to_another_database_names_it() {
+    let test = TestWindow::connected_with("MovedTabTitle", |script| {
+        script.dialect = Arc::new(tablepro_driver_mysql::MySqlDialect::new(
+            tablepro_driver_mysql::MySqlFlavour::MySql,
+            &tablepro_core::ServerInfo::new("MySQL", "8.4.0", 8, 4, 0),
+        ));
+    });
+    let page = open_editor(&test.workspace());
+    let editor = editors(&test.window).pop().expect("the editor");
+
+    WidgetExt::activate_action(&editor, "editor.database", Some(&"analytics".to_variant())).expect("editor.database");
+
+    wait_until(WAIT, || page.title() == "Query 1 (analytics)").expect("the tab to name its database");
+    let tooltip = page.tooltip().map(|tooltip| tooltip.to_string()).unwrap_or_default();
+    assert_eq!(tooltip, "Query 1\nanalytics");
+}

linux/crates/app/src/ui/workspace/workspace_tabs.rs

@@ -530,6 +530,13 @@ impl WorkspaceModel {
         self.persist_workspace_state();
     }
 
+    /// A tab that moved to another database is restored there and names
+    /// it in its title.
+    pub(super) fn on_editor_tab_database_changed(&self, id: Uuid) {
+        self.retitle_tab(id);
+        self.persist_workspace_state();
+    }
+
     pub(super) fn on_editor_tab_run_state_changed(&self, id: Uuid, running: bool) {
         if let Some(WorkspaceTab::Editor(slot)) = self.workspace_tabs.borrow().get(&id) {
             slot.page.set_loading(running);