From 8719932474e67729c2acdbd7a8c487199b24046a Mon Sep 17 00:00:00 2001
From: Aditya Hegde <adityahegderocks@gmail.com>
Date: Mon, 17 Jul 2023 11:31:21 +0530
Subject: [PATCH] Run profile queries after fetching columns (#2677)

* Run profile queries after fetching columns

* Fixing prettier

* Moving query matching to a new file

* Fix lint

* Updated E2E

* Fix source profiling

* TopLevelProfiling => TableProfiling
---
 .../column-profile/ColumnProfile.svelte       |   5 +-
 .../column-types/NestedProfile.svelte         |  31 ++++--
 .../column-types/NumericProfile.svelte        |  32 ++++--
 .../column-types/TimestampProfile.svelte      |  10 +-
 .../column-types/VarcharProfile.svelte        |  28 +++--
 .../column-types/details/TopK.svelte          |   9 +-
 .../src/components/column-profile/queries.ts  | 101 ++++++++++++++----
 .../models/workspace/ModelBody.svelte         |  10 +-
 .../sources/workspace/SourceInspector.svelte  |   8 +-
 web-common/src/runtime-client/invalidation.ts |  29 ++---
 .../src/runtime-client/query-matcher.ts       |  55 ++++++++++
 web-local/test/ui/dashboards.spec.ts          |   2 +-
 12 files changed, 243 insertions(+), 77 deletions(-)
 create mode 100644 web-common/src/runtime-client/query-matcher.ts

diff --git a/web-common/src/components/column-profile/ColumnProfile.svelte b/web-common/src/components/column-profile/ColumnProfile.svelte
index fd1b11055e1..8341d783922 100644
--- a/web-common/src/components/column-profile/ColumnProfile.svelte
+++ b/web-common/src/components/column-profile/ColumnProfile.svelte
@@ -52,7 +52,7 @@
     nestedColumnProfileQuery = getSummaries(
       objectName,
       $runtime?.instanceId,
-      $profileColumns?.data?.profileColumns
+      $profileColumns
     );
   }
 
@@ -83,11 +83,11 @@
     <option value={sortByName}>sort by name</option>
   </select>
   <select
-    style:transform="translateX(4px)"
     bind:value={mode}
     class={NATIVE_SELECT}
     class:hidden={containerWidth < 325}
     style:font-size="11px"
+    style:transform="translateX(4px)"
   >
     <option value="summaries">show summary&nbsp;</option>
     <option value="example">show example</option>
@@ -113,6 +113,7 @@
         {hideRight}
         {hideNullPercentage}
         {compact}
+        enableProfiling={!$profileColumns?.isFetching}
       />
     {/each}
   {/if}
diff --git a/web-common/src/components/column-profile/column-types/NestedProfile.svelte b/web-common/src/components/column-profile/column-types/NestedProfile.svelte
index b80c4f308cf..a4b8098a3ba 100644
--- a/web-common/src/components/column-profile/column-types/NestedProfile.svelte
+++ b/web-common/src/components/column-profile/column-types/NestedProfile.svelte
@@ -28,19 +28,32 @@
   export let compact = false;
   export let hideNullPercentage = false;
 
+  export let enableProfiling = true;
+
   let topKLimit = 15;
 
   let active = false;
 
-  $: nulls = getNullPercentage($runtime?.instanceId, objectName, columnName);
+  $: nulls = getNullPercentage(
+    $runtime?.instanceId,
+    objectName,
+    columnName,
+    enableProfiling
+  );
 
   $: columnCardinality = getCountDistinct(
     $runtime?.instanceId,
     objectName,
-    columnName
+    columnName,
+    enableProfiling
   );
 
-  $: topK = getTopK($runtime?.instanceId, objectName, columnName);
+  $: topK = getTopK(
+    $runtime?.instanceId,
+    objectName,
+    columnName,
+    enableProfiling
+  );
 
   function toggleColumnProfile() {
     active = !active;
@@ -51,20 +64,20 @@
 </script>
 
 <ProfileContainer
-  isFetching={fetchingSummaries}
   {active}
   {compact}
   emphasize={active}
   {example}
   {hideNullPercentage}
   {hideRight}
+  isFetching={fetchingSummaries}
   {mode}
   on:select={toggleColumnProfile}
   on:shift-click={() =>
     copyToClipboard(columnName, `copied ${columnName} to clipboard`)}
   {type}
 >
-  <ColumnProfileIcon slot="icon" isFetching={fetchingSummaries} {type} />
+  <ColumnProfileIcon isFetching={fetchingSummaries} slot="icon" {type} />
 
   <svelte:fragment slot="left">{columnName}</svelte:fragment>
 
@@ -83,15 +96,15 @@
   />
   <div
     class="pl-10 pr-4 py-4"
-    slot="details"
     class:hidden={INTERVALS.has(type)}
+    slot="details"
   >
     <TopK
-      {type}
-      topK={$topK}
+      colorClass={DATA_TYPE_COLORS["STRUCT"].bgClass}
       k={topKLimit}
+      topK={$topK}
       totalRows={$columnCardinality?.totalRows}
-      colorClass={DATA_TYPE_COLORS["STRUCT"].bgClass}
+      {type}
     />
   </div>
 </ProfileContainer>
diff --git a/web-common/src/components/column-profile/column-types/NumericProfile.svelte b/web-common/src/components/column-profile/column-types/NumericProfile.svelte
index d5d76a3f498..1f92a3838e8 100644
--- a/web-common/src/components/column-profile/column-types/NumericProfile.svelte
+++ b/web-common/src/components/column-profile/column-types/NumericProfile.svelte
@@ -37,15 +37,23 @@
   export let compact = false;
   export let hideNullPercentage = false;
 
+  export let enableProfiling = true;
+
   let active = false;
 
-  $: nulls = getNullPercentage($runtime?.instanceId, objectName, columnName);
+  $: nulls = getNullPercentage(
+    $runtime?.instanceId,
+    objectName,
+    columnName,
+    enableProfiling
+  );
 
   $: diagnosticHistogram = getNumericHistogram(
     $runtime?.instanceId,
     objectName,
     columnName,
     QueryServiceColumnNumericHistogramHistogramMethod.HISTOGRAM_METHOD_DIAGNOSTIC,
+    enableProfiling,
     active
   );
   let fdHistogram;
@@ -55,6 +63,7 @@
       objectName,
       columnName,
       QueryServiceColumnNumericHistogramHistogramMethod.HISTOGRAM_METHOD_FD,
+      enableProfiling,
       active
     );
   }
@@ -81,10 +90,16 @@
         select($query) {
           return $query?.numericSummary?.numericOutliers?.outliers;
         },
+        enabled: enableProfiling,
       },
     }
   );
-  $: topK = getTopK($runtime?.instanceId, objectName, columnName);
+  $: topK = getTopK(
+    $runtime?.instanceId,
+    objectName,
+    columnName,
+    enableProfiling
+  );
 
   $: summary = derived(
     createQueryServiceColumnDescriptiveStatistics(
@@ -93,6 +108,11 @@
       {
         columnName: columnName,
         priority: getPriorityForColumn("descriptive-statistics", active),
+      },
+      {
+        query: {
+          enabled: enableProfiling,
+        },
       }
     ),
     ($query) => {
@@ -146,23 +166,23 @@
 </script>
 
 <ProfileContainer
-  isFetching={fetchingSummaries}
   {active}
   {compact}
   emphasize={active}
   {example}
   {hideNullPercentage}
   {hideRight}
+  isFetching={fetchingSummaries}
   {mode}
   on:select={toggleColumnProfile}
   on:shift-click={() =>
     copyToClipboard(columnName, `copied ${columnName} to clipboard`)}
   {type}
 >
-  <ColumnProfileIcon slot="icon" isFetching={fetchingSummaries} {type} />
+  <ColumnProfileIcon isFetching={fetchingSummaries} slot="icon" {type} />
 
   <svelte:fragment slot="left">{columnName}</svelte:fragment>
-  <NumericSpark {type} {compact} data={histogramData} slot="summary" />
+  <NumericSpark {compact} data={histogramData} slot="summary" {type} />
   <NullPercentageSpark
     nullCount={$nulls?.nullCount}
     slot="nullity"
@@ -171,8 +191,8 @@
   />
   <div
     class="pl-10 pr-4 py-4"
-    slot="details"
     class:hidden={INTERVALS.has(type)}
+    slot="details"
   >
     <NumericPlot
       data={histogramData}
diff --git a/web-common/src/components/column-profile/column-types/TimestampProfile.svelte b/web-common/src/components/column-profile/column-types/TimestampProfile.svelte
index 292bc720c0e..9f47b437bf2 100644
--- a/web-common/src/components/column-profile/column-types/TimestampProfile.svelte
+++ b/web-common/src/components/column-profile/column-types/TimestampProfile.svelte
@@ -25,6 +25,8 @@
   export let compact = false;
   export let hideNullPercentage = false;
 
+  export let enableProfiling = true;
+
   let timestampDetailHeight = 160;
 
   let active = false;
@@ -33,13 +35,15 @@
   $: nullPercentage = getNullPercentage(
     $runtime?.instanceId,
     objectName,
-    columnName
+    columnName,
+    enableProfiling
   );
 
   $: timeSeries = getTimeSeriesAndSpark(
     $runtime?.instanceId,
     objectName,
     columnName,
+    enableProfiling,
     active
   );
 
@@ -52,20 +56,20 @@
 </script>
 
 <ProfileContainer
-  isFetching={fetchingSummaries}
   {active}
   {compact}
   emphasize={active}
   {example}
   {hideNullPercentage}
   {hideRight}
+  isFetching={fetchingSummaries}
   {mode}
   on:select={toggleColumnProfile}
   on:shift-click={() =>
     copyToClipboard(columnName, `copied ${columnName} to clipboard`)}
   {type}
 >
-  <ColumnProfileIcon slot="icon" {type} isFetching={fetchingSummaries} />
+  <ColumnProfileIcon isFetching={fetchingSummaries} slot="icon" {type} />
   <div slot="left">{columnName}</div>
 
   <!-- wrap in div to get size of grid item -->
diff --git a/web-common/src/components/column-profile/column-types/VarcharProfile.svelte b/web-common/src/components/column-profile/column-types/VarcharProfile.svelte
index 0d3a24fb2c9..f19fdf25bb4 100644
--- a/web-common/src/components/column-profile/column-types/VarcharProfile.svelte
+++ b/web-common/src/components/column-profile/column-types/VarcharProfile.svelte
@@ -24,19 +24,33 @@
   export let hideNullPercentage = false;
   export let mode: "example" | "summaries" = "summaries";
 
+  export let enableProfiling = true;
+
   let active = false;
 
   let topKLimit = 15;
 
-  $: nulls = getNullPercentage($runtime?.instanceId, objectName, columnName);
+  $: nulls = getNullPercentage(
+    $runtime?.instanceId,
+    objectName,
+    columnName,
+    enableProfiling
+  );
 
   $: columnCardinality = getCountDistinct(
     $runtime?.instanceId,
     objectName,
-    columnName
+    columnName,
+    enableProfiling
   );
 
-  $: topK = getTopK($runtime?.instanceId, objectName, columnName, active);
+  $: topK = getTopK(
+    $runtime?.instanceId,
+    objectName,
+    columnName,
+    enableProfiling,
+    active
+  );
 
   function toggleColumnProfile() {
     active = !active;
@@ -47,19 +61,19 @@
 </script>
 
 <ProfileContainer
-  isFetching={fetchingSummaries}
   {active}
   emphasize={active}
   {example}
   {hideNullPercentage}
   {hideRight}
+  isFetching={fetchingSummaries}
   {mode}
   on:select={toggleColumnProfile}
   on:shift-click={() =>
     copyToClipboard(columnName, `copied ${columnName} to clipboard`)}
   {type}
 >
-  <ColumnProfileIcon slot="icon" {type} isFetching={fetchingSummaries} />
+  <ColumnProfileIcon isFetching={fetchingSummaries} slot="icon" {type} />
   <svelte:fragment slot="left">{columnName}</svelte:fragment>
 
   <ColumnCardinalitySpark
@@ -84,10 +98,10 @@
   >
     <div>
       <TopK
-        {type}
-        topK={$topK}
         k={topKLimit}
+        topK={$topK}
         totalRows={$columnCardinality?.totalRows}
+        {type}
       />
     </div>
   </div>
diff --git a/web-common/src/components/column-profile/column-types/details/TopK.svelte b/web-common/src/components/column-profile/column-types/details/TopK.svelte
index 4b73de7ea6f..fea59032e9e 100644
--- a/web-common/src/components/column-profile/column-types/details/TopK.svelte
+++ b/web-common/src/components/column-profile/column-types/details/TopK.svelte
@@ -44,6 +44,11 @@
       ? format("0.1%")
       : () => "";
 
+  // We need this to get transition working properly.
+  // Since the topk query is in a reactive statement with `enable`, `topK` can be undefined.
+  // This leads to unexpected issues when paired with transition
+  $: topKCopy = topK ?? topKCopy;
+
   function ensureSpaces(str: string, n = 6) {
     return `${Array.from({ length: n - str.length })
       .fill("&nbsp;")
@@ -67,9 +72,9 @@
   /** handle LISTs and STRUCTs */
 </script>
 
-{#if topK && totalRows}
+{#if topKCopy && totalRows}
   <div transition:slide|local={{ duration: LIST_SLIDE_DURATION }}>
-    {#each topK.slice(0, k) as item (item.value)}
+    {#each topKCopy.slice(0, k) as item (item.value)}
       {@const negligiblePercentage = item.count / totalRows < 0.0002}
       {@const percentage = negligiblePercentage
         ? "<.01%"
diff --git a/web-common/src/components/column-profile/queries.ts b/web-common/src/components/column-profile/queries.ts
index 8c64aec2922..6f7905cbf8f 100644
--- a/web-common/src/components/column-profile/queries.ts
+++ b/web-common/src/components/column-profile/queries.ts
@@ -10,8 +10,10 @@ import {
   createQueryServiceTableCardinality,
   QueryServiceColumnNumericHistogramHistogramMethod,
   V1ProfileColumn,
+  V1TableColumnsResponse,
 } from "@rilldata/web-common/runtime-client";
 import { getPriorityForColumn } from "@rilldata/web-common/runtime-client/http-request-queue/priorities";
+import type { QueryObserverResult } from "@tanstack/query-core";
 import { derived, Readable, writable } from "svelte/store";
 
 export function isFetching(...queries) {
@@ -28,11 +30,11 @@ export type ColumnSummary = V1ProfileColumn & {
 export function getSummaries(
   objectName: string,
   instanceId: string,
-  profileColumnResults: Array<V1ProfileColumn>
+  profileColumnResponse: QueryObserverResult<V1TableColumnsResponse>
 ): Readable<Array<ColumnSummary>> {
-  if (!profileColumnResults && !profileColumnResults?.length) return;
+  if (!profileColumnResponse && !profileColumnResponse?.data) return;
   return derived(
-    profileColumnResults.map((column) => {
+    profileColumnResponse.data.profileColumns.map((column) => {
       return derived(
         [
           writable(column),
@@ -41,14 +43,22 @@ export function getSummaries(
             objectName,
             { columnName: column.name },
             {
-              query: { keepPreviousData: true },
+              query: {
+                keepPreviousData: true,
+                enabled: !profileColumnResponse.isFetching,
+              },
             }
           ),
           createQueryServiceColumnCardinality(
             instanceId,
             objectName,
             { columnName: column.name },
-            { query: { keepPreviousData: true } }
+            {
+              query: {
+                keepPreviousData: true,
+                enabled: !profileColumnResponse.isFetching,
+              },
+            }
           ),
         ],
         ([col, nullValues, cardinality]) => {
@@ -56,7 +66,10 @@ export function getSummaries(
             ...col,
             nullCount: +nullValues?.data?.count,
             cardinality: +cardinality?.data?.categoricalSummary?.cardinality,
-            isFetching: nullValues?.isFetching || cardinality?.isFetching,
+            isFetching:
+              profileColumnResponse.isFetching ||
+              nullValues?.isFetching ||
+              cardinality?.isFetching,
           };
         }
       );
@@ -71,14 +84,30 @@ export function getSummaries(
 export function getNullPercentage(
   instanceId: string,
   objectName: string,
-  columnName: string
+  columnName: string,
+  enabled = true
 ) {
-  const nullQuery = createQueryServiceColumnNullCount(instanceId, objectName, {
-    columnName,
-  });
+  const nullQuery = createQueryServiceColumnNullCount(
+    instanceId,
+    objectName,
+    {
+      columnName,
+    },
+    {
+      query: {
+        enabled,
+      },
+    }
+  );
   const totalRowsQuery = createQueryServiceTableCardinality(
     instanceId,
-    objectName
+    objectName,
+    {},
+    {
+      query: {
+        enabled,
+      },
+    }
   );
   return derived([nullQuery, totalRowsQuery], ([nulls, totalRows]) => {
     return {
@@ -92,17 +121,25 @@ export function getNullPercentage(
 export function getCountDistinct(
   instanceId: string,
   objectName: string,
-  columnName: string
+  columnName: string,
+  enabled = true
 ) {
   const cardinalityQuery = createQueryServiceColumnCardinality(
     instanceId,
     objectName,
-    { columnName }
+    { columnName },
+    {
+      query: { enabled },
+    }
   );
 
   const totalRowsQuery = createQueryServiceTableCardinality(
     instanceId,
-    objectName
+    objectName,
+    {},
+    {
+      query: { enabled },
+    }
   );
 
   return derived(
@@ -121,14 +158,24 @@ export function getTopK(
   instanceId: string,
   objectName: string,
   columnName: string,
+  enabled = true,
   active = false
 ) {
-  const topKQuery = createQueryServiceColumnTopK(instanceId, objectName, {
-    columnName: columnName,
-    agg: "count(*)",
-    k: 75,
-    priority: getPriorityForColumn("topk", active),
-  });
+  const topKQuery = createQueryServiceColumnTopK(
+    instanceId,
+    objectName,
+    {
+      columnName: columnName,
+      agg: "count(*)",
+      k: 75,
+      priority: getPriorityForColumn("topk", active),
+    },
+    {
+      query: {
+        enabled,
+      },
+    }
+  );
   return derived(topKQuery, ($topKQuery) => {
     return $topKQuery?.data?.categoricalSummary?.topK?.entries;
   });
@@ -138,6 +185,7 @@ export function getTimeSeriesAndSpark(
   instanceId: string,
   objectName: string,
   columnName: string,
+  enabled = true,
   active = false
 ) {
   const query = createQueryServiceColumnTimeSeries(
@@ -153,12 +201,18 @@ export function getTimeSeriesAndSpark(
       ],
       pixels: 92,
       priority: getPriorityForColumn("timeseries", active),
+    },
+    {
+      query: { enabled },
     }
   );
   const estimatedInterval = createQueryServiceColumnRollupInterval(
     instanceId,
     objectName,
-    { columnName, priority: getPriorityForColumn("rollup-interval", active) }
+    { columnName, priority: getPriorityForColumn("rollup-interval", active) },
+    {
+      query: { enabled },
+    }
   );
 
   const smallestTimeGrain = createQueryServiceColumnTimeGrain(
@@ -167,6 +221,9 @@ export function getTimeSeriesAndSpark(
     {
       columnName,
       priority: getPriorityForColumn("smallest-time-grain", active),
+    },
+    {
+      query: { enabled },
     }
   );
 
@@ -205,6 +262,7 @@ export function getNumericHistogram(
   objectName: string,
   columnName: string,
   histogramMethod: QueryServiceColumnNumericHistogramHistogramMethod,
+  enabled = true,
   active = false
 ) {
   return createQueryServiceColumnNumericHistogram(
@@ -220,6 +278,7 @@ export function getNumericHistogram(
         select(query) {
           return query?.numericSummary?.numericHistogramBins?.bins;
         },
+        enabled,
       },
     }
   );
diff --git a/web-common/src/features/models/workspace/ModelBody.svelte b/web-common/src/features/models/workspace/ModelBody.svelte
index cb1a2ae8ff6..3ae618d0a49 100644
--- a/web-common/src/features/models/workspace/ModelBody.svelte
+++ b/web-common/src/features/models/workspace/ModelBody.svelte
@@ -25,10 +25,8 @@
     V1CatalogEntry,
     V1PutFileAndReconcileResponse,
   } from "@rilldata/web-common/runtime-client";
-  import {
-    invalidateAfterReconcile,
-    isProfilingQuery,
-  } from "@rilldata/web-common/runtime-client/invalidation";
+  import { invalidateAfterReconcile } from "@rilldata/web-common/runtime-client/invalidation";
+  import { isProfilingQuery } from "@rilldata/web-common/runtime-client/query-matcher";
   import type { LayoutElement } from "@rilldata/web-local/lib/types";
   import { useQueryClient } from "@tanstack/svelte-query";
   import { getContext } from "svelte";
@@ -137,9 +135,7 @@
         // cancel all existing analytical queries currently running.
         await queryClient.cancelQueries({
           fetchStatus: "fetching",
-          predicate: (query) => {
-            return isProfilingQuery(query.queryHash, modelName);
-          },
+          predicate: (query) => isProfilingQuery(query, modelName),
         });
       }
 
diff --git a/web-common/src/features/sources/workspace/SourceInspector.svelte b/web-common/src/features/sources/workspace/SourceInspector.svelte
index 46fa69df81f..aa194ab3a0e 100644
--- a/web-common/src/features/sources/workspace/SourceInspector.svelte
+++ b/web-common/src/features/sources/workspace/SourceInspector.svelte
@@ -105,11 +105,9 @@
   );
 
   let summaries: Readable<Array<ColumnSummary>>;
-  $: summaries = getSummaries(
-    sourceName,
-    $runtime?.instanceId,
-    $profileColumns?.data?.profileColumns
-  );
+  $: if ($profileColumns?.data?.profileColumns) {
+    summaries = getSummaries(sourceName, $runtime?.instanceId, $profileColumns);
+  }
 
   let totalNulls = undefined;
 
diff --git a/web-common/src/runtime-client/invalidation.ts b/web-common/src/runtime-client/invalidation.ts
index 8fef3a34818..233641b44fe 100644
--- a/web-common/src/runtime-client/invalidation.ts
+++ b/web-common/src/runtime-client/invalidation.ts
@@ -8,6 +8,11 @@ import {
   getRuntimeServiceListCatalogEntriesQueryKey,
   getRuntimeServiceListFilesQueryKey,
 } from "@rilldata/web-common/runtime-client";
+import {
+  isColumnProfilingQuery,
+  isProfilingQuery,
+  isTableProfilingQuery,
+} from "@rilldata/web-common/runtime-client/query-matcher";
 import type { QueryClient } from "@tanstack/svelte-query";
 import { get } from "svelte/store";
 
@@ -98,13 +103,6 @@ export function invalidationForMetricsViewData(query, metricsViewName: string) {
   );
 }
 
-export function isProfilingQuery(queryHash: string, name: string) {
-  const r = new RegExp(
-    `/v1/instances/[a-zA-Z0-9-]+/queries/[a-zA-Z0-9-]+/tables/${name}`
-  );
-  return r.test(queryHash);
-}
-
 export const invalidateMetricsViewData = (
   queryClient: QueryClient,
   metricsViewName: string,
@@ -128,20 +126,25 @@ export const invalidateMetricsViewData = (
   });
 };
 
-export function invalidateProfilingQueries(
+export async function invalidateProfilingQueries(
   queryClient: QueryClient,
   name: string,
   failed: boolean
 ) {
   queryClient.removeQueries({
-    predicate: (query) => isProfilingQuery(query.queryHash, name),
+    predicate: (query) => isProfilingQuery(query, name),
     type: "inactive",
   });
   // do not re-fetch for failed entities.
   if (failed) return Promise.resolve();
 
-  return queryClient.refetchQueries({
-    predicate: (query) => isProfilingQuery(query.queryHash, name),
+  queryClient.removeQueries({
+    predicate: (query) => isColumnProfilingQuery(query, name),
+    type: "active",
+  });
+
+  await queryClient.invalidateQueries({
+    predicate: (query) => isTableProfilingQuery(query, name),
     type: "active",
   });
 }
@@ -171,9 +174,7 @@ export const removeEntityQueries = async (
   } else {
     // remove profiling queries
     return queryClient.removeQueries({
-      predicate: (query) => {
-        return isProfilingQuery(query.queryHash, name);
-      },
+      predicate: (query) => isProfilingQuery(query, name),
     });
   }
 };
diff --git a/web-common/src/runtime-client/query-matcher.ts b/web-common/src/runtime-client/query-matcher.ts
new file mode 100644
index 00000000000..f59e866371c
--- /dev/null
+++ b/web-common/src/runtime-client/query-matcher.ts
@@ -0,0 +1,55 @@
+import type { Query } from "@tanstack/query-core";
+
+export enum QueryRequestType {
+  MetricsViewTopList = "toplist",
+  MetricsViewCompareTopList = "compare-toplist",
+  MetricsViewTimeSeries = "timeseries",
+  MetricsViewTotals = "totals",
+  MetricsViewRows = "rows",
+  ColumnRollupInterval = "rollup-interval",
+  ColumnTopK = "topk",
+  ColumnNullCount = "null-count",
+  ColumnDescriptiveStatistics = "descriptive-statistics",
+  ColumnTimeGrain = "smallest-time-grain",
+  ColumnNumericHistogram = "numeric-histogram",
+  ColumnRugHistogram = "rug-histogram",
+  ColumnTimeRange = "time-range-summary",
+  ColumnCardinality = "column-cardinality",
+  ColumnTimeSeries = "timeseries",
+  TableCardinality = "table-cardinality",
+  TableColumns = "columns-profile",
+  TableRows = "rows",
+}
+
+const TableProfilingQuery: Partial<Record<QueryRequestType, boolean>> = {
+  [QueryRequestType.TableCardinality]: true,
+  [QueryRequestType.TableColumns]: true,
+  [QueryRequestType.TableRows]: true,
+};
+
+const ProfilingQueryExtractor =
+  /v1\/instances\/[a-zA-Z0-9-]+\/queries\/([a-zA-Z0-9-]+)\/tables\/(.+?)"/;
+
+export function isProfilingQuery(query: Query, name: string): boolean {
+  const queryExtractorMatch = ProfilingQueryExtractor.exec(query.queryHash);
+  if (!queryExtractorMatch) return false;
+
+  const [, , table] = queryExtractorMatch;
+  return table === name;
+}
+
+export function isTableProfilingQuery(query: Query, name: string): boolean {
+  const queryExtractorMatch = ProfilingQueryExtractor.exec(query.queryHash);
+  if (!queryExtractorMatch) return false;
+
+  const [, type, table] = queryExtractorMatch;
+  return table === name && type in TableProfilingQuery;
+}
+
+export function isColumnProfilingQuery(query: Query, name: string) {
+  const queryExtractorMatch = ProfilingQueryExtractor.exec(query.queryHash);
+  if (!queryExtractorMatch) return false;
+
+  const [, type, table] = queryExtractorMatch;
+  return table === name && !(type in TableProfilingQuery);
+}
diff --git a/web-local/test/ui/dashboards.spec.ts b/web-local/test/ui/dashboards.spec.ts
index 8641e955732..547e858120c 100644
--- a/web-local/test/ui/dashboards.spec.ts
+++ b/web-local/test/ui/dashboards.spec.ts
@@ -41,7 +41,6 @@ describe("dashboards", () => {
     const { page } = testBrowser;
 
     await createAdBidsModel(page);
-    await createDashboardFromModel(page, "AdBids_model");
     await Promise.all([
       waitForEntity(
         page,
@@ -51,6 +50,7 @@ describe("dashboards", () => {
       ),
       waitForTimeSeries(page, "AdBids_model_dashboard"),
       waitForTopLists(page, "AdBids_model_dashboard", ["domain"]),
+      createDashboardFromModel(page, "AdBids_model"),
     ]);
     await assertAdBidsDashboard(page);