Show profile name and metastore separately in topbar, fix modal close buttons

Topbar now shows CLI profile name (instead of workspace name) when
connected via profile mode, with metastore name displayed separately
next to the host URL. Extracted get_metastore_name() from
get_workspace_name() to avoid duplication. Fixed modal close buttons
invisible in dark mode by replacing filter-based approach with pure
CSS white X pseudo-elements.

Co-authored-by: Isaac

Author: guidooswaldDB

app.py

@@ -50,6 +50,7 @@
     get_cli_profiles,
     get_current_user_info,
     get_host,
+    get_metastore_name,
     get_workspace_name,
     make_api_call,
     resolve_account_connection,
@@ -1212,7 +1213,10 @@ def _theme_card(tid: str, t: dict) -> html.Div:
             _MODE_BADGE,
             html.Div([
                 html.Span(id="workspace-name-display", className="workspace-name"),
-                html.Span(id="host-display", className="host-display"),
+                html.Div([
+                    html.Span(id="host-display", className="host-display"),
+                    html.Span(id="metastore-display", className="metastore-display"),
+                ], className="workspace-info-row"),
             ], className="workspace-info ms-3"),
             html.Button(
                 html.I(className="bi bi-gear-fill"),
@@ -1487,18 +1491,20 @@ def rebuild_sidebar_for_scope(scope):
     Output("user-display", "children"),
     Output("host-display", "children"),
     Output("workspace-name-display", "children"),
+    Output("metastore-display", "children"),
     Input("url", "pathname"),
     Input("conn-config", "data"),
 )
 def init_on_load(_, conn_config):
-    """Callback 1: Populate topbar user chip, host label, and workspace name."""
+    """Callback 1: Populate topbar user chip, host label, workspace name, and metastore."""
     host, token = _resolve_conn(conn_config)
     host_label = html.Span(
         (host or "").replace("https://", ""),
         className="text-muted",
     ) if host else html.Span("(not connected)", className="text-warning")
 
     ws_name = None
+    ms_name = None
     if token and host:
         info = get_current_user_info(token, host)
         name = info.get("display_name") or info.get("user_name") or "Unknown"
@@ -1507,7 +1513,13 @@ def init_on_load(_, conn_config):
             name,
             html.I(className="bi bi-chevron-down ms-1 small"),
         ], className="user-chip")
-        ws_name = get_workspace_name(token, host)
+        # Use CLI profile name when in profile mode, otherwise workspace name
+        conn_mode = (conn_config or {}).get("mode")
+        if conn_mode == "profile":
+            ws_name = (conn_config or {}).get("profile") or DATABRICKS_PROFILE
+        else:
+            ws_name = get_workspace_name(token, host)
+        ms_name = get_metastore_name(token, host)
     else:
         user_el = html.Span([
             html.I(className="bi bi-person-circle me-1"),
@@ -1516,11 +1528,16 @@ def init_on_load(_, conn_config):
         ], className="user-chip text-warning")
 
     ws_name_el = html.Span(
-        [html.I(className="bi bi-building me-1"), ws_name],
+        [html.I(className="bi bi-tag me-1"), ws_name],
         className="workspace-name-text"
     ) if ws_name else None
 
-    return user_el, host_label, ws_name_el
+    ms_name_el = html.Span(
+        [html.I(className="bi bi-layers me-1"), ms_name],
+        className="metastore-name-text"
+    ) if ms_name else None
+
+    return user_el, host_label, ws_name_el, ms_name_el
 
 
 # 1b. Toggle deploy modal

assets/style.css

@@ -955,7 +955,32 @@ body {
 .deploy-modal .modal-header {
   border-bottom: 1px solid rgba(255,255,255,0.06);
 }
-.deploy-modal .btn-close { filter: invert(1) grayscale(1) brightness(0.7); }
+.deploy-modal .btn-close,
+.settings-modal .btn-close {
+  background: transparent !important;
+  opacity: 0.7 !important;
+  padding: 0 !important;
+  width: 28px;
+  height: 28px;
+  position: relative;
+}
+.deploy-modal .btn-close::before,
+.deploy-modal .btn-close::after,
+.settings-modal .btn-close::before,
+.settings-modal .btn-close::after {
+  content: "";
+  position: absolute;
+  top: 50%; left: 50%;
+  width: 18px; height: 2px;
+  background: #f8fafc;
+  border-radius: 1px;
+}
+.deploy-modal .btn-close::before,
+.settings-modal .btn-close::before { transform: translate(-50%,-50%) rotate(45deg); }
+.deploy-modal .btn-close::after,
+.settings-modal .btn-close::after { transform: translate(-50%,-50%) rotate(-45deg); }
+.deploy-modal .btn-close:hover,
+.settings-modal .btn-close:hover { opacity: 1 !important; }
 .deploy-section-title {
   color: var(--accent-primary, #7f4bc4);
   margin-top: 0.5rem;
@@ -996,7 +1021,7 @@ body {
 }
 
 .workspace-name-text {
-  font-size: 13px;
+  font-size: 14px;
   font-weight: 600;
   color: var(--text-hi);
   white-space: nowrap;
@@ -1007,16 +1032,41 @@ body {
   align-items: center;
 }
 
+.workspace-info-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+}
+
 .host-display {
   font-family: var(--font-mono);
-  font-size: 10px;
+  font-size: 11.5px;
   color: var(--text-3);
   max-width: 280px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
+.metastore-display { display: flex; align-items: center; min-width: 0; }
+.metastore-name-text {
+  font-size: 11.5px;
+  color: var(--text-3);
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 200px;
+  display: flex;
+  align-items: center;
+  gap: 2px;
+}
+.metastore-name-text::before {
+  content: "|";
+  margin-right: 6px;
+  color: var(--border);
+}
+
 .user-chip {
   font-size: 12px;
   color: var(--text-2);
@@ -1296,7 +1346,6 @@ body {
 .settings-modal .modal-header {
   border-bottom: 1px solid rgba(255,255,255,0.06);
 }
-.settings-modal .btn-close { filter: invert(1) grayscale(1) brightness(0.7); }
 
 .settings-group {
   margin-bottom: 20px;

auth.py

@@ -282,11 +282,12 @@ def get_workspace_name(token: str, host: str) -> Optional[str]:
 
     1. ``GET /api/2.0/workspace-conf?keys=workspaceName`` -- admin-set
        workspace display name.
-    2. ``GET /api/2.1/unity-catalog/metastore_summary`` -- metastore
-       name (often mirrors the workspace name).
-    3. Parse the hostname (e.g. ``adb-123.azuredatabricks.net`` →
+    2. Parse the hostname (e.g. ``adb-123.azuredatabricks.net`` →
        ``adb-123``).
 
+    Note: the metastore name fallback was removed because
+    :func:`get_metastore_name` is now displayed separately.
+
     Args:
         token: Bearer token for the workspace.
         host: Full workspace URL including scheme.
@@ -303,18 +304,29 @@ def get_workspace_name(token: str, host: str) -> Optional[str]:
         if name:
             return name
 
-    # 2 — Unity Catalog metastore summary
+    # 2 — parse hostname: "adb-123.azuredatabricks.net" → "adb-123"
+    #     custom domains:  "myco.databricks.com"        → "myco"
+    import re as _re
+    m = _re.match(r"https?://([^./]+)", host)
+    return m.group(1) if m else None
+
+
+def get_metastore_name(token: str, host: str) -> Optional[str]:
+    """Return the name of the Unity Catalog metastore attached to this workspace.
+
+    Args:
+        token: Bearer token for the workspace.
+        host: Full workspace URL including scheme.
+
+    Returns:
+        The metastore display name, or ``None`` if not available.
+    """
     r = make_api_call("GET", "/api/2.1/unity-catalog/metastore_summary", token, host)
     if r["success"]:
         name = (r["data"] or {}).get("name", "")
         if name:
             return name
-
-    # 3 — parse hostname: "adb-123.azuredatabricks.net" → "adb-123"
-    #     custom domains:  "myco.databricks.com"        → "myco"
-    import re as _re
-    m = _re.match(r"https?://([^./]+)", host)
-    return m.group(1) if m else None
+    return None
 
 
 # ── User Info ─────────────────────────────────────────────────────────────────