From 185759d563b97e573f47ee4912a271c578a3913d Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 22 Apr 2026 12:44:37 -0400
Subject: [PATCH 1/4] fix: trust YAML for live-connector metrics views to avoid
 BQ table-list hang

For a metrics view with an explicit connector/database/database_schema/table,
the visual editor was blocking the table display on OLAPListTables, which walks
every dataset in BigQuery and rarely completes. The editor now trusts the YAML
fields directly in that case, and hides the 'Select model' mode switch since
live-connector views never select a Rill model.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../features/workspaces/VisualMetrics.svelte  | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/web-common/src/features/workspaces/VisualMetrics.svelte b/web-common/src/features/workspaces/VisualMetrics.svelte
index a3936d3bb39..0c380f3b826 100644
--- a/web-common/src/features/workspaces/VisualMetrics.svelte
+++ b/web-common/src/features/workspaces/VisualMetrics.svelte
@@ -266,6 +266,13 @@
     measureNamesAndLabels.label,
   );
 
+  // When the metrics view YAML already specifies a live connector, trust the
+  // YAML fields (connector/database/database_schema/table) directly rather than
+  // walking every dataset via OLAPListTables. For warehouses like BigQuery, that
+  // enumeration issues an INFORMATION_SCHEMA.TABLES query per dataset and often
+  // never completes in projects with many datasets.
+  $: hasLiveConnectorYAML = Boolean(yamlConnector && modelOrSourceOrTableName);
+
   $: tablesQuery = createConnectorServiceOLAPListTables(
     runtimeClient,
     { connector },
@@ -274,7 +281,8 @@
         enabled:
           !!runtimeClient.instanceId &&
           !!connector &&
-          !hasValidModelOrSourceSelection,
+          !hasValidModelOrSourceSelection &&
+          !hasLiveConnectorYAML,
       },
     },
   );
@@ -284,12 +292,13 @@
   $: hasValidOLAPTableSelected =
     !hasValidModelOrSourceSelection &&
     modelOrSourceOrTableName &&
-    tables.find(
-      (table) =>
-        table.name === modelOrSourceOrTableName &&
-        (!database || table.database === database) &&
-        (!databaseSchema || table.databaseSchema === databaseSchema),
-    );
+    (hasLiveConnectorYAML ||
+      tables.find(
+        (table) =>
+          table.name === modelOrSourceOrTableName &&
+          (!database || table.database === database) &&
+          (!databaseSchema || table.databaseSchema === databaseSchema),
+      ));
 
   $: tableMode = Boolean(hasValidOLAPTableSelected);
 
@@ -552,7 +561,7 @@
         <div class="flex flex-col gap-y-1 w-full">
           <InputLabel label="Table" id="table">
             <svelte:fragment slot="mode-switch">
-              {#if isModelingSupported}
+              {#if isModelingSupported && !yamlConnector}
                 <button
                   onclick={switchTableMode}
                   class="ml-auto text-primary-600 font-medium text-xs"

From 4b9b24dad6ef8702347f0d6573e0b78920e8fce4 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 22 Apr 2026 12:56:01 -0400
Subject: [PATCH 2/4] feat: show connector icon next to table name in visual
 metrics editor

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../features/workspaces/VisualMetrics.svelte  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/web-common/src/features/workspaces/VisualMetrics.svelte b/web-common/src/features/workspaces/VisualMetrics.svelte
index 0c380f3b826..a0edec98080 100644
--- a/web-common/src/features/workspaces/VisualMetrics.svelte
+++ b/web-common/src/features/workspaces/VisualMetrics.svelte
@@ -28,6 +28,8 @@
   import { parseDocument, Scalar, YAMLMap, YAMLSeq } from "yaml";
   import ConnectorExplorer from "../connectors/explorer/ConnectorExplorer.svelte";
   import { connectorExplorerStore } from "../connectors/explorer/connector-explorer-store";
+  import { connectorIconMapping } from "../connectors/connector-metadata";
+  import { getConnectorIconKey } from "../connectors/connectors-utils";
   import { useIsModelingSupportedForConnectorOLAP as useIsModelingSupportedForConnector } from "../connectors/selectors";
   import { FileArtifact } from "../entity-management/file-artifact";
   import {
@@ -170,6 +172,14 @@
   );
   $: hasNonDuckDBOLAPConnector = $hasNonDuckDBOLAPConnectorQuery.data;
 
+  $: analyzedConnectorsQuery = createRuntimeServiceAnalyzeConnectors(
+    runtimeClient,
+    {},
+  );
+  $: analyzedConnector = $analyzedConnectorsQuery.data?.connectors?.find(
+    (c) => c.name === connector,
+  );
+
   $: resourceKind = hasSourceSelected
     ? ResourceKind.Source
     : hasModelSelected
@@ -583,6 +593,16 @@
                   {#if !hasValidOLAPTableSelected}
                     <span class="text-fg-muted truncate">Select table</span>
                   {:else}
+                    {#if analyzedConnector}
+                      <span class="flex-none">
+                        <svelte:component
+                          this={connectorIconMapping[
+                            getConnectorIconKey(analyzedConnector)
+                          ]}
+                          size="14px"
+                        />
+                      </span>
+                    {/if}
                     <span class="text-fg-secondary truncate">
                       {modelOrSourceOrTableName}
                     </span>

From bfcee4874852f011b98754de44c3eaf336d6a35a Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 22 Apr 2026 13:04:01 -0400
Subject: [PATCH 3/4] fix: show connector icon even before table is selected

Icon resolves via the existing `connector` fallback chain, so when the YAML has
no connector set, it defaults to the project's OLAP connector.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../features/workspaces/VisualMetrics.svelte  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web-common/src/features/workspaces/VisualMetrics.svelte b/web-common/src/features/workspaces/VisualMetrics.svelte
index a0edec98080..e4eef61a2f3 100644
--- a/web-common/src/features/workspaces/VisualMetrics.svelte
+++ b/web-common/src/features/workspaces/VisualMetrics.svelte
@@ -590,19 +590,19 @@
                   focus:ring-2 focus:ring-primary-100 focus:border-primary-600 break-all overflow-hidden
                  "
                 >
+                  {#if analyzedConnector}
+                    <span class="flex-none">
+                      <svelte:component
+                        this={connectorIconMapping[
+                          getConnectorIconKey(analyzedConnector)
+                        ]}
+                        size="14px"
+                      />
+                    </span>
+                  {/if}
                   {#if !hasValidOLAPTableSelected}
                     <span class="text-fg-muted truncate">Select table</span>
                   {:else}
-                    {#if analyzedConnector}
-                      <span class="flex-none">
-                        <svelte:component
-                          this={connectorIconMapping[
-                            getConnectorIconKey(analyzedConnector)
-                          ]}
-                          size="14px"
-                        />
-                      </span>
-                    {/if}
                     <span class="text-fg-secondary truncate">
                       {modelOrSourceOrTableName}
                     </span>

From 288821287d829c12f65f2e22f674a6ac8a8e1619 Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Wed, 22 Apr 2026 13:15:53 -0400
Subject: [PATCH 4/4] fix: show connector icon on model-side dropdown, hide on
 unselected table

Adds a leadingIcon prop to Select/Input so the visual metrics editor can show
the project OLAP icon inside the Model dropdown. The table-side icon is
restored to show only once a table is selected.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 web-common/src/components/forms/Input.svelte  |  6 ++++-
 web-common/src/components/forms/Select.svelte |  8 +++++++
 .../features/workspaces/VisualMetrics.svelte  | 23 +++++++++++--------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/web-common/src/components/forms/Input.svelte b/web-common/src/components/forms/Input.svelte
index ffd0203a367..93e51f6cd30 100644
--- a/web-common/src/components/forms/Input.svelte
+++ b/web-common/src/components/forms/Input.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { IconButton } from "@rilldata/web-common/components/button";
   import { EyeIcon, EyeOffIcon } from "lucide-svelte";
-  import { onMount } from "svelte";
+  import { onMount, type ComponentType, type SvelteComponent } from "svelte";
   import { slide } from "svelte/transition";
   import FieldSwitcher from "./FieldSwitcher.svelte";
   import InputLabel from "./InputLabel.svelte";
@@ -42,6 +42,9 @@
   export let textInputPrefix = "";
   export let lockTooltip: string | undefined = undefined;
   export let disabledMessage = "No valid options";
+  /** Optional icon rendered inside the Select trigger when `options` is set. */
+  export let leadingIcon: ComponentType<SvelteComponent> | undefined =
+    undefined;
   export let options:
     | { value: string; label: string; type?: string }[]
     | undefined = undefined;
@@ -245,6 +248,7 @@
       {size}
       fontSize={size === "sm" ? 12 : 14}
       {truncate}
+      {leadingIcon}
       placeholder={disabled ? disabledMessage : placeholder}
     />
   {/if}
diff --git a/web-common/src/components/forms/Select.svelte b/web-common/src/components/forms/Select.svelte
index 8f51c9278c7..41b0b3c1f94 100644
--- a/web-common/src/components/forms/Select.svelte
+++ b/web-common/src/components/forms/Select.svelte
@@ -46,6 +46,9 @@
   export let forcedTriggerStyle = "";
   /** When true, shows an X button to clear the selection back to empty */
   export let clearable = false;
+  /** Optional icon rendered inside the trigger, before the label. */
+  export let leadingIcon: ComponentType<SvelteComponent> | undefined =
+    undefined;
   export let onChange: (value: string) => void = () => {};
 
   let searchText = "";
@@ -133,6 +136,11 @@
           : ''} {forcedTriggerStyle} {outline ? '' : 'border-0'}"
         aria-label={label || ariaLabel}
       >
+        {#if leadingIcon}
+          <span class="flex-none">
+            <svelte:component this={leadingIcon} size="14px" />
+          </span>
+        {/if}
         <span
           class="text-[{fontSize}px] {!selected
             ? 'text-fg-secondary'
diff --git a/web-common/src/features/workspaces/VisualMetrics.svelte b/web-common/src/features/workspaces/VisualMetrics.svelte
index e4eef61a2f3..5e1eb4690e7 100644
--- a/web-common/src/features/workspaces/VisualMetrics.svelte
+++ b/web-common/src/features/workspaces/VisualMetrics.svelte
@@ -590,19 +590,19 @@
                   focus:ring-2 focus:ring-primary-100 focus:border-primary-600 break-all overflow-hidden
                  "
                 >
-                  {#if analyzedConnector}
-                    <span class="flex-none">
-                      <svelte:component
-                        this={connectorIconMapping[
-                          getConnectorIconKey(analyzedConnector)
-                        ]}
-                        size="14px"
-                      />
-                    </span>
-                  {/if}
                   {#if !hasValidOLAPTableSelected}
                     <span class="text-fg-muted truncate">Select table</span>
                   {:else}
+                    {#if analyzedConnector}
+                      <span class="flex-none">
+                        <svelte:component
+                          this={connectorIconMapping[
+                            getConnectorIconKey(analyzedConnector)
+                          ]}
+                          size="14px"
+                        />
+                      </span>
+                    {/if}
                     <span class="text-fg-secondary truncate">
                       {modelOrSourceOrTableName}
                     </span>
@@ -639,6 +639,9 @@
             options={modelAndSourceOptions}
             placeholder="Select a model"
             label="Model"
+            leadingIcon={analyzedConnector
+              ? connectorIconMapping[getConnectorIconKey(analyzedConnector)]
+              : undefined}
             onChange={async (newModelOrSourceName) => {
               if (modelOrSourceOrTableName === newModelOrSourceName) return;
               if (!modelOrSourceOrTableName) {