Fix test

AdityaHegde · AdityaHegde · commit 0c3df08fdbbb · 2025-12-30T20:12:51.000+05:30
diff --git a/web-admin/src/features/alerts/selectors.ts b/web-admin/src/features/alerts/selectors.ts
@@ -9,7 +9,7 @@ import {
   createRuntimeServiceListResources,
   type V1AlertSpec,
 } from "@rilldata/web-common/runtime-client";
-import { smartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
+import { smartRefetchIntervalFunc } from "@rilldata/web-admin/lib/refetch-interval-store";
 import { derived, type Readable, readable } from "svelte/store";
 
 export function useAlerts(instanceId: string, enabled = true) {
@@ -22,7 +22,7 @@ export function useAlerts(instanceId: string, enabled = true) {
       query: {
         enabled: enabled && !!instanceId,
         refetchOnMount: true,
-        refetchInterval: smartRefetchInterval,
+        refetchInterval: smartRefetchIntervalFunc,
       },
     },
   );
diff --git a/web-admin/src/features/dashboards/listing/deploying-dashboards.ts b/web-admin/src/features/dashboards/listing/deploying-dashboards.ts
@@ -5,7 +5,10 @@ import {
   type V1Resource,
 } from "@rilldata/web-common/runtime-client";
 import type { CreateQueryResult } from "@tanstack/svelte-query";
-import { isResourceReconciling } from "@rilldata/web-admin/lib/refetch-interval-store.ts";
+import {
+  isResourceReconciling,
+  smartRefetchIntervalFunc,
+} from "@rilldata/web-admin/lib/refetch-interval-store.ts";
 
 export function useDeployingDashboards(
   instanceId: string,
@@ -72,6 +75,7 @@ export function useDeployingDashboards(
           dashboardsErrored: false,
         };
       },
+      refetchInterval: smartRefetchIntervalFunc,
     },
   });
 }
@@ -108,10 +112,6 @@ function isDashboard(res: V1Resource) {
   return res.canvas || res.explore;
 }
 
-function isValidDashboard(res: V1Resource) {
-  return Boolean(res.canvas?.state?.validSpec || res.explore?.state?.validSpec);
-}
-
 function hasErrored(res: V1Resource) {
   return (
     res.meta?.reconcileStatus === V1ReconcileStatus.RECONCILE_STATUS_IDLE &&
diff --git a/web-admin/src/features/dashboards/listing/selectors.ts b/web-admin/src/features/dashboards/listing/selectors.ts
@@ -4,7 +4,7 @@ import type { V1Resource } from "@rilldata/web-common/runtime-client";
 import { createRuntimeServiceListResources } from "@rilldata/web-common/runtime-client";
 import type { CreateQueryResult } from "@tanstack/svelte-query";
 import { derived } from "svelte/store";
-import { smartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
+import { smartRefetchIntervalFunc } from "@rilldata/web-admin/lib/refetch-interval-store";
 
 export function useDashboardsLastUpdated(
   instanceId: string,
@@ -42,7 +42,7 @@ export function useDashboards(
       select: (data) => {
         return data.resources.filter((res) => res.canvas || res.explore);
       },
-      refetchInterval: smartRefetchInterval,
+      refetchInterval: smartRefetchIntervalFunc,
     },
   });
 }
diff --git a/web-admin/src/features/projects/status/selectors.ts b/web-admin/src/features/projects/status/selectors.ts
@@ -7,7 +7,7 @@ import {
   type V1ListResourcesResponse,
 } from "@rilldata/web-common/runtime-client";
 import { ResourceKind } from "@rilldata/web-common/features/entity-management/resource-selectors";
-import { smartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
+import { smartRefetchIntervalFunc } from "@rilldata/web-admin/lib/refetch-interval-store";
 
 export function useProjectDeployment(orgName: string, projName: string) {
   return createAdminServiceGetProject<V1Deployment | undefined>(
@@ -42,7 +42,7 @@ export function useResources(instanceId: string) {
             resources: filtered,
           };
         },
-        refetchInterval: smartRefetchInterval,
+        refetchInterval: smartRefetchIntervalFunc,
       },
     },
   );
diff --git a/web-admin/src/features/scheduled-reports/selectors.ts b/web-admin/src/features/scheduled-reports/selectors.ts
@@ -5,7 +5,7 @@ import {
   createRuntimeServiceGetResource,
   createRuntimeServiceListResources,
 } from "@rilldata/web-common/runtime-client";
-import { smartRefetchInterval } from "@rilldata/web-admin/lib/refetch-interval-store";
+import { smartRefetchIntervalFunc } from "@rilldata/web-admin/lib/refetch-interval-store";
 
 export function useReports(instanceId: string, enabled = true) {
   return createRuntimeServiceListResources(
@@ -17,7 +17,7 @@ export function useReports(instanceId: string, enabled = true) {
       query: {
         enabled: enabled && !!instanceId,
         refetchOnMount: true,
-        refetchInterval: smartRefetchInterval,
+        refetchInterval: smartRefetchIntervalFunc,
       },
     },
   );
diff --git a/web-admin/src/lib/refetch-interval-store.ts b/web-admin/src/lib/refetch-interval-store.ts
@@ -64,13 +64,13 @@ const queryRefetchStateMap = new WeakMap<
 >();
 
 /**
- * Creates a smart refetch interval function that uses a WeakMap to store state.
+ * A smart refetch interval function that uses a WeakMap to store state.
  * This approach keeps refetch state per query without mutating the query object.
  *
  * @param query The TanStack query object
  * @returns The refetch interval (number in ms or false to disable)
  */
-export function smartRefetchInterval(
+export function smartRefetchIntervalFunc(
   query: Query<
     V1ListResourcesResponse,
     HTTPError,
diff --git a/web-admin/src/routes/[organization]/[project]/-/invite/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/invite/+page.svelte
@@ -69,6 +69,7 @@
   function getDeployLandingPage() {
     const u = new URL($page.url);
     u.pathname = `/${organization}/${project}/-/deploy-landing-page`;
+    console.log("Redirecting to deploy landing page: ", u.toString());
     return u.toString();
   }
 </script>
diff --git a/web-common/src/features/dashboards/workspace/DeployProjectCTA.svelte b/web-common/src/features/dashboards/workspace/DeployProjectCTA.svelte
@@ -66,6 +66,7 @@
   $: redirectPageUrl = copyWithAdditionalArguments($page.url, {
     deploy: "true",
   });
+  $: console.log("Deploy route:", $deployPageUrl);
 
   async function onDeploy(resumingDeploy = false) {
     await waitUntil(() => !get(deploymentState).loading);
diff --git a/web-common/src/features/entity-management/file-artifacts.ts b/web-common/src/features/entity-management/file-artifacts.ts
@@ -8,8 +8,9 @@ import {
   type V1ResourceName,
 } from "@rilldata/web-common/runtime-client";
 import type { QueryClient } from "@tanstack/svelte-query";
-import { derived, get, writable } from "svelte/store";
+import { derived, get, writable, type Readable } from "svelte/store";
 import { FileArtifact } from "./file-artifact";
+import { page } from "$app/stores";
 
 class UnsavedFilesStore {
   private unsavedFiles = writable(new Set<string>());
@@ -171,6 +172,14 @@ export class FileArtifacts {
     }
     return null;
   }
+
+  public createCurrentResourceStore(): Readable<V1ResourceName | undefined> {
+    return derived(page, (pageState, set) => {
+      const filePath = pageState.url.pathname.replace("/files", "");
+      const fileArtifact = this.getFileArtifact(filePath);
+      return fileArtifact.resourceName.subscribe(set);
+    });
+  }
 }
 
 export const fileArtifacts = new FileArtifacts();
diff --git a/web-common/src/features/project/deploy/UpdateProjectPopup.svelte b/web-common/src/features/project/deploy/UpdateProjectPopup.svelte
@@ -9,6 +9,7 @@
   import { getManageProjectAccess } from "@rilldata/web-common/features/project/selectors.ts";
   import type { Project } from "@rilldata/web-common/proto/gen/rill/admin/v1/api_pb";
   import Rocket from "svelte-radix/Rocket.svelte";
+  import { fileArtifacts } from "@rilldata/web-common/features/entity-management/file-artifacts.ts";
 
   export let open = false;
   export let matchingProjects: Project[];
@@ -22,9 +23,11 @@
 
   $: enableUpdate = !!selectedProject;
 
+  const currentResource = fileArtifacts.createCurrentResourceStore();
   $: deployUrl = selectedProject
     ? getUpdateProjectRoute(
         $page,
+        $currentResource,
         selectedProject.orgName,
         selectedProject.name,
       )
diff --git a/web-common/src/features/project/deploy/route-utils.ts b/web-common/src/features/project/deploy/route-utils.ts
@@ -3,7 +3,6 @@ import { ResourceKind } from "@rilldata/web-common/features/entity-management/re
 import {
   DeployingDashboardUrlParam,
   getDeployingDashboard,
-  getDeployingDashboardFromUrl,
 } from "@rilldata/web-common/features/project/deploy/utils.ts";
 import { addPosthogSessionIdToUrl } from "@rilldata/web-common/lib/analytics/posthog.ts";
 import { createLocalServiceGitStatus } from "@rilldata/web-common/runtime-client/local-service";
@@ -12,6 +11,7 @@ import { derived, readable } from "svelte/store";
 import { getLocalGitRepoStatus } from "../selectors";
 import { page } from "$app/stores";
 import { featureFlags } from "../../feature-flags";
+import type { V1ResourceName } from "@rilldata/web-common/runtime-client";
 
 /**
  * Returns a {@link Readable} with a route to deploy.
@@ -43,6 +43,7 @@ export function getCreateProjectRoute(orgName: string, useGit = false) {
 
 export function getUpdateProjectRoute(
   page: Page,
+  currentResource: V1ResourceName | undefined,
   orgName: string,
   projectName: string,
   createManagedRepo = false,
@@ -57,7 +58,15 @@ export function getUpdateProjectRoute(
     deployUrl.searchParams.set("create_managed_repo", "true");
   }
 
-  if (isDashboardVizRoute(page)) {
+  if (
+    currentResource?.kind === ResourceKind.Explore ||
+    currentResource?.kind === ResourceKind.Canvas
+  ) {
+    deployUrl.searchParams.set(
+      DeployingDashboardUrlParam,
+      currentResource.name!,
+    );
+  } else if (isDashboardVizRoute(page)) {
     deployUrl.searchParams.set(DeployingDashboardUrlParam, page.params.name);
   }
 
@@ -82,7 +91,7 @@ export function getSelectOrganizationRoute() {
 
 export function getDeployLandingPage(frontendUrl: string, isInvite: boolean) {
   const url = new URL(frontendUrl);
-  const deployingDashboard = getDeployingDashboardFromUrl();
+  const deployingDashboard = getDeployingDashboard();
   if (deployingDashboard) {
     url.searchParams.set(DeployingDashboardUrlParam, deployingDashboard);
   }
diff --git a/web-common/src/features/project/deploy/utils.ts b/web-common/src/features/project/deploy/utils.ts
@@ -16,10 +16,9 @@ export function maybeSetDeployingDashboard(url: URL) {
 }
 
 export function getDeployingDashboard() {
-  return sessionStorage.getItem(deployingDashboardKey);
-}
-
-export function getDeployingDashboardFromUrl() {
   const url = new URL(window.location.href);
-  return url.searchParams.get(DeployingDashboardUrlParam);
+  return (
+    sessionStorage.getItem(deployingDashboardKey) ||
+    url.searchParams.get(DeployingDashboardUrlParam)
+  );
 }
diff --git a/web-integration/tests/deploy.spec.ts b/web-integration/tests/deploy.spec.ts
@@ -77,6 +77,15 @@ test.describe("Deploy journey", () => {
         rillDevPage.getByText("Deploy this project for free"),
       ).toBeVisible();
       // Hit continue to start deployment
+      await expect
+        .poll(
+          () =>
+            rillDevPage
+              .getByRole("button", { name: "Continue" })
+              .getAttribute("href"),
+          { intervals: Array(15).fill(1_000), timeout: 15_000 },
+        )
+        .toMatch(/deploying_dashboard/);
       await rillDevPage.getByRole("button", { name: "Continue" }).click();
 
       // Await for the popped up deploy page after hitting deploy
@@ -131,6 +140,10 @@ test.describe("Deploy journey", () => {
       await rillDevPage
         .getByTitle("Display name")
         .fill("Adbids dashboard edited first org");
+      // Wait for reconcile to complete and dashboard is ready
+      await expect(rillDevPage.getByText("Total records 100k")).toBeVisible({
+        timeout: 30_000,
+      });
 
       // Start waiting for popup before clicking Deploy.
       const popupPromise = rillDevPage.waitForEvent("popup");
@@ -152,12 +165,10 @@ test.describe("Deploy journey", () => {
       // Await for the popped up deploy page after hitting deploy
       const deployPage = await popupPromise;
 
-      await ensureProjectRedeployed(deployPage);
-
-      await ensureDashboardTitle(
-        deployPage,
-        "Adbids dashboard edited first org",
-      );
+      // Explore is opened with updated title after a re-deploying.
+      await expect(
+        deployPage.getByLabel("Breadcrumb navigation, level 2"),
+      ).toHaveText("Adbids dashboard edited first org", { timeout: 120_000 });
     });
   });
 
@@ -197,10 +208,10 @@ test.describe("Deploy journey", () => {
 
     await assertAndSkipInvite(deployPage);
 
-    // Canvas is opened.
-    await expect(
-      deployPage.getByLabel("Breadcrumb navigation, level 2"),
-    ).toHaveText("Adbids Canvas Dashboard");
+    // Project homepage is opened on since we are not deploying from any dashboard.
+    await expect(deployPage.getByText("Welcome to")).toBeVisible({
+      timeout: 120_000,
+    });
 
     // Org title is correct
     await expect(
@@ -225,18 +236,3 @@ async function assertAndSkipInvite(page: Page) {
   // Skip invite and continue to status page.
   await page.getByRole("button", { name: "Skip for now" }).click();
 }
-
-async function ensureProjectRedeployed(page: Page) {
-  // Project homepage is opened on a re-deploy. This can take a while, so it has increased timeout.
-  await expect(page.getByText("Welcome to")).toBeVisible({
-    timeout: 120_000,
-  });
-}
-
-async function ensureDashboardTitle(page: Page, title: string) {
-  await expect(
-    page.getByRole("link", {
-      name: title,
-    }),
-  ).toBeVisible({ timeout: 60_000 });
-}
diff --git a/web-local/src/routes/(misc)/deploy/+page.svelte b/web-local/src/routes/(misc)/deploy/+page.svelte
@@ -78,7 +78,12 @@
       const singleProject = $matchingProjects.data!.projects[0];
       // Project already exists. Run a redeploy
       return goto(
-        getUpdateProjectRoute($page, singleProject.orgName, singleProject.name),
+        getUpdateProjectRoute(
+          $page,
+          undefined,
+          singleProject.orgName,
+          singleProject.name,
+        ),
       );
     } else {
       return goto(getSelectProjectRoute());
diff --git a/web-local/src/routes/(misc)/deploy/project/select/+page.svelte b/web-local/src/routes/(misc)/deploy/project/select/+page.svelte
@@ -15,6 +15,7 @@
 
   $: deployUrl = getUpdateProjectRoute(
     $page,
+    undefined,
     selectedProject?.orgName ?? "",
     selectedProject?.name ?? "",
   );

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@`
`69`	`69`	`function getDeployLandingPage() {`
`70`	`70`	`const u = new URL($page.url);`
`71`	`71`	u.pathname = `/${organization}/${project}/-/deploy-landing-page`;
	`72`	`+ console.log("Redirecting to deploy landing page: ", u.toString());`
`72`	`73`	`return u.toString();`
`73`	`74`	`}`
`74`	`75`	`</script>`