Fix explorer database labels and expansion

Author: Maxteabag

sqlit/domains/explorer/ui/mixins/tree.py

@@ -62,6 +62,16 @@ def _schedule_timer(self: TreeMixinHost, delay_s: float, callback: Any) -> Any |
             pass
         return None
 
+    def _collapse_other_database_nodes(self: TreeMixinHost, node: Any) -> None:
+        parent = getattr(node, "parent", None)
+        if not parent:
+            return
+        for sibling in list(parent.children):
+            if sibling is node:
+                continue
+            if self._get_node_kind(sibling) == "database" and getattr(sibling, "is_expanded", False):
+                sibling.collapse()
+
     def on_tree_node_collapsed(self: TreeMixinHost, event: Tree.NodeCollapsed) -> None:
         """Save state when a node is collapsed."""
         tree_expansion_state.update_expanded_state(self, event.node, expanded=False)
@@ -80,6 +90,7 @@ def on_tree_node_expanded(self: TreeMixinHost, event: Tree.NodeExpanded) -> None
         data = node.data
 
         if self._get_node_kind(node) == "database":
+            self._collapse_other_database_nodes(node)
             self._ensure_database_connection_async(data.name)
 
         if self._get_node_kind(node) == "connection":

sqlit/domains/explorer/ui/tree/builder.py

@@ -62,11 +62,10 @@ def _find_connection_folder_child(host: TreeMixinHost, parent: Any, name: str) -
 
 def _ensure_connection_folder_path(host: TreeMixinHost, folder_parts: list[str]) -> Any:
     parent = host.object_tree.root
-    primary = getattr(getattr(host, "current_theme", None), "primary", "#7E9CD8")
     for part in folder_parts:
         node = _find_connection_folder_child(host, parent, part)
         if node is None:
-            node = parent.add(f"[{primary}]📁 {part}[/]")
+            node = parent.add(f"📁 {escape_markup(part)}")
             node.data = ConnectionFolderNode(name=part)
             node.allow_expand = True
         parent = node
@@ -683,10 +682,9 @@ def add_database_object_nodes(host: TreeMixinHost, parent_node: Any, database: s
     caps = host.current_provider.capabilities
     node_provider = host.current_provider.explorer_nodes
 
-    primary = getattr(getattr(host, "current_theme", None), "primary", "#7E9CD8")
     for folder in node_provider.get_root_folders(caps):
         if folder.requires(caps):
-            folder_node = parent_node.add(f"[{primary}]{folder.label}[/]")
+            folder_node = parent_node.add(escape_markup(folder.label))
             folder_node.data = FolderNode(folder_type=folder.kind, database=database)
             folder_node.allow_expand = True
         else:

sqlit/domains/explorer/ui/tree/expansion_state.py

@@ -67,6 +67,14 @@ def update_expanded_state(host: TreeMixinHost, node: Any, expanded: bool) -> Non
     expanded_paths = getattr(host, "_expanded_paths", set())
     if expanded:
         expanded_paths.add(path)
+        if host._get_node_kind(node) == "database":
+            parent_path = path.rsplit("/", 1)[0] if "/" in path else ""
+            prefix = f"{parent_path}/db:" if parent_path else "db:"
+            for item in list(expanded_paths):
+                if item == path or item.startswith(f"{path}/"):
+                    continue
+                if item.startswith(prefix):
+                    expanded_paths.discard(item)
         host._expanded_paths = expanded_paths
         return
     expanded_paths.discard(path)

sqlit/domains/explorer/ui/tree/loaders.py

@@ -276,12 +276,12 @@ def on_folder_loaded(
         active_db = None
         if hasattr(host, "_get_effective_database"):
             active_db = host._get_effective_database()
-        primary = getattr(getattr(host, "current_theme", None), "primary", "#7E9CD8")
         for db in items:
             if active_db and str(db).lower() == str(active_db).lower():
-                db_label = f"[#4ADE80]* {escape_markup(str(db))}[/]"
+                primary = getattr(getattr(host, "current_theme", None), "primary", "#7E9CD8")
+                db_label = f"[{primary}]* {escape_markup(str(db))}[/]"
             else:
-                db_label = f"[{primary}]{escape_markup(str(db))}[/]"
+                db_label = escape_markup(str(db))
             db_node = node.add(db_label)
             db_node.data = DatabaseNode(name=str(db))
             db_node.allow_expand = True