Explore E2E pass 1 - Fix model and explore editing

web-common/src/features/dashboards/workspace/DashboardCTAs.svelte

@@ -2,18 +2,18 @@
   import MetricsIcon from "@rilldata/web-common/components/icons/Metrics.svelte";
   import LocalAvatarButton from "@rilldata/web-common/features/authentication/LocalAvatarButton.svelte";
   import GlobalDimensionSearch from "@rilldata/web-common/features/dashboards/dimension-search/GlobalDimensionSearch.svelte";
+  import { useExplore } from "@rilldata/web-common/features/explores/selectors";
   import { Button } from "../../../components/button";
   import { runtime } from "../../../runtime-client/runtime-store";
   import { featureFlags } from "../../feature-flags";
   import ViewAsButton from "../granular-access-policies/ViewAsButton.svelte";
   import { useDashboardPolicyCheck } from "../granular-access-policies/useDashboardPolicyCheck";
-  import { useMetricsView } from "../selectors";
   import DeployDashboardCta from "./DeployDashboardCTA.svelte";
 
-  export let metricsViewName: string;
+  export let exploreName: string;
 
-  $: metricsViewQuery = useMetricsView($runtime.instanceId, metricsViewName);
-  $: filePath = $metricsViewQuery.data?.meta?.filePaths?.[0] ?? "";
+  $: exploreQuery = useExplore($runtime.instanceId, exploreName);
+  $: filePath = $exploreQuery.data?.explore?.meta?.filePaths?.[0] ?? "";
 
   $: dashboardPolicyCheck = useDashboardPolicyCheck(
     $runtime.instanceId,

web-common/src/features/file-explorer/new-files.ts

@@ -126,7 +126,7 @@ export function getBaseNameForNewResourceFile(
         ? `${baseResource.meta!.name!.name}_explore`
         : ResourceKindMap[newKind].baseName;
     default:
-      return ResourceKindMap[newKind].baseFileName;
+      return ResourceKindMap[newKind].baseName;
   }
 }
 

web-local/src/routes/(viz)/+layout.svelte

@@ -66,7 +66,7 @@
     </span>
     {#if route.id?.includes("explore") && metricsViewName}
       <StateManagersProvider {metricsViewName} exploreName={dashboardName}>
-        <DashboardCtAs {metricsViewName} />
+        <DashboardCtAs {metricsViewName} exploreName={dashboardName} />
       </StateManagersProvider>
     {/if}
   </header>

web-local/tests/dashboards/dashboard-flow-template.ts → web-local/tests/explores/dashboard-flow-template.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "@playwright/test";
-import { useDashboardFlowTestSetup } from "web-local/tests/dashboards/dashboard-flow-test-setup";
+import { useDashboardFlowTestSetup } from "web-local/tests/explores/dashboard-flow-test-setup";
 import { startRuntimeForEachTest } from "../utils/startRuntimeForEachTest";
 
 test.describe("~~~~~~~~~~~~~~~~~~~~FIXME RENAME THIS~~~~~~~~~~~~~~~~~~~~~~~", () => {

web-local/tests/dashboards/dashboard-flow-test-setup.ts → web-local/tests/explores/dashboard-flow-test-setup.ts

@@ -1,4 +1,4 @@
-import { createDashboardFromModel } from "web-local/tests/utils/dashboardHelpers";
+import { createMetricsViewFromModel } from "web-local/tests/utils/metricsViewHelpers";
 import { createAdBidsModel } from "web-local/tests/utils/dataSpecifcHelpers";
 import { test } from "../utils/test";
 import { waitForFileNavEntry } from "../utils/waitHelpers";
@@ -14,7 +14,7 @@ export function useDashboardFlowTestSetup() {
         `/dashboards/AdBids_model_dashboard.yaml`,
         true,
       ),
-      createDashboardFromModel(page, "/models/AdBids_model.sql"),
+      createMetricsViewFromModel(page, "/models/AdBids_model.sql"),
     ]);
   });
 }

web-local/tests/dashboards/dimension-and-measure-selection.spec.ts → web-local/tests/explores/dimension-and-measure-selection.spec.ts

@@ -1,5 +1,5 @@
 import { expect } from "@playwright/test";
-import { useDashboardFlowTestSetup } from "web-local/tests/dashboards/dashboard-flow-test-setup";
+import { useDashboardFlowTestSetup } from "web-local/tests/explores/dashboard-flow-test-setup";
 import { test } from "../utils/test";
 import { clickMenuButton } from "../utils/commonHelpers";
 

web-local/tests/dashboards/dashboards.spec.ts → web-local/tests/explores/explores.spec.ts

@@ -1,12 +1,16 @@
 import { expect } from "@playwright/test";
+import {
+  createExploreFromModel,
+  createExploreFromSource,
+} from "web-local/tests/utils/exploreHelpers";
 import { ResourceWatcher } from "web-local/tests/utils/ResourceWatcher";
 import { updateCodeEditor, wrapRetryAssertion } from "../utils/commonHelpers";
 import {
   assertLeaderboards,
-  createDashboardFromModel,
-  createDashboardFromSource,
+  createMetricsViewFromModel,
+  createMetricsViewFromSource,
   interactWithTimeRangeMenu,
-} from "../utils/dashboardHelpers";
+} from "web-local/tests/utils/metricsViewHelpers";
 import {
   assertAdBidsDashboard,
   createAdBidsModel,
@@ -15,26 +19,38 @@ import { createSource } from "../utils/sourceHelpers";
 import { test } from "../utils/test";
 import { waitForFileNavEntry } from "../utils/waitHelpers";
 
-test.describe("dashboard", () => {
-  test("Autogenerate dashboard from source", async ({ page }) => {
+test.describe("explores", () => {
+  test("Autogenerate explore from source", async ({ page }) => {
     await createSource(page, "AdBids.csv", "/sources/AdBids.yaml");
-    await createDashboardFromSource(page, "/sources/AdBids.yaml");
-    await waitForFileNavEntry(page, `/dashboards/AdBids_dashboard.yaml`, true);
+    await createExploreFromSource(
+      page,
+      "/sources/AdBids.yaml",
+      "/metrics/AdBids_metrics.yaml",
+    );
+    await waitForFileNavEntry(
+      page,
+      "/explore-dashboards/AdBids_metrics_explore.yaml",
+      true,
+    );
     await page.getByRole("button", { name: "Preview" }).click();
     // Temporary timeout while the issue is looked into
     await page.waitForTimeout(1000);
     await assertAdBidsDashboard(page);
   });
 
-  test("Autogenerate dashboard from model", async ({ page }) => {
+  test("Autogenerate explore from model", async ({ page }) => {
     await createAdBidsModel(page);
     await Promise.all([
       waitForFileNavEntry(
         page,
-        `/dashboards/AdBids_model_dashboard.yaml`,
+        "/explore-dashboards/AdBids_model_metrics_explore.yaml",
         true,
       ),
-      createDashboardFromModel(page, "/models/AdBids_model.sql"),
+      createExploreFromModel(
+        page,
+        "/models/AdBids_model.sql",
+        "/metrics/AdBids_model_metrics.yaml",
+      ),
     ]);
 
     await page.getByRole("button", { name: "Preview" }).click();
@@ -69,7 +85,7 @@ test.describe("dashboard", () => {
     const watcher = new ResourceWatcher(page);
 
     await createAdBidsModel(page);
-    await createDashboardFromModel(page, "/models/AdBids_model.sql");
+    await createMetricsViewFromModel(page, "/models/AdBids_model.sql");
     await page.getByRole("button", { name: "Preview" }).click();
 
     // Check the total records are 100k

web-local/tests/dashboards/leaderboard-and-dim-table-sort.spec.ts → web-local/tests/explores/leaderboard-and-dim-table-sort.spec.ts

@@ -1,5 +1,5 @@
 import { expect, type Locator } from "@playwright/test";
-import { useDashboardFlowTestSetup } from "web-local/tests/dashboards/dashboard-flow-test-setup";
+import { useDashboardFlowTestSetup } from "web-local/tests/explores/dashboard-flow-test-setup";
 import { test } from "../utils/test";
 
 async function assertAAboveB(locA: Locator, locB: Locator) {

web-local/tests/dashboards/leaderboard-context-column.spec.ts → web-local/tests/explores/leaderboard-context-column.spec.ts

@@ -1,7 +1,7 @@
 import { expect } from "@playwright/test";
 import { ResourceWatcher } from "web-local/tests/utils/ResourceWatcher";
 import { clickMenuButton } from "../utils/commonHelpers";
-import { interactWithTimeRangeMenu } from "../utils/dashboardHelpers";
+import { interactWithTimeRangeMenu } from "web-local/tests/utils/metricsViewHelpers";
 import { test } from "../utils/test";
 import { useDashboardFlowTestSetup } from "./dashboard-flow-test-setup";
 

web-local/tests/dashboards/number-formatting.spec.ts → web-local/tests/explores/number-formatting.spec.ts

@@ -1,6 +1,6 @@
-import { useDashboardFlowTestSetup } from "web-local/tests/dashboards/dashboard-flow-test-setup";
+import { useDashboardFlowTestSetup } from "web-local/tests/explores/dashboard-flow-test-setup";
 import { ResourceWatcher } from "web-local/tests/utils/ResourceWatcher";
-import { interactWithTimeRangeMenu } from "../utils/dashboardHelpers";
+import { interactWithTimeRangeMenu } from "web-local/tests/utils/metricsViewHelpers";
 import { expect } from "@playwright/test";
 import { test } from "../utils/test";
 

web-local/tests/dashboards/time-controls-from-config.spec.ts → web-local/tests/explores/time-controls-from-config.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from "@playwright/test";
-import { useDashboardFlowTestSetup } from "web-local/tests/dashboards/dashboard-flow-test-setup";
-import { interactWithTimeRangeMenu } from "web-local/tests/utils/dashboardHelpers";
+import { useDashboardFlowTestSetup } from "web-local/tests/explores/dashboard-flow-test-setup";
+import { interactWithTimeRangeMenu } from "web-local/tests/utils/metricsViewHelpers";
 import { ResourceWatcher } from "web-local/tests/utils/ResourceWatcher";
 import { test } from "../utils/test";
 

web-local/tests/utils/dataSpecifcHelpers.ts

@@ -4,7 +4,7 @@ import {
   waitForProfiling,
   wrapRetryAssertion,
 } from "./commonHelpers";
-import { assertLeaderboards } from "./dashboardHelpers";
+import { assertLeaderboards } from "web-local/tests/utils/metricsViewHelpers";
 import { createModel } from "./modelHelpers";
 import { uploadFile, waitForSource } from "./sourceHelpers";