rilldata · royendo · May 1, 2026 · May 1, 2026 · May 1, 2026 · May 1, 2026
diff --git a/scripts/check-edit-route-parity.js b/scripts/check-edit-route-parity.js
@@ -50,6 +50,18 @@ const ADMIN_ONLY_ALLOWLIST = [
   "/welcome/+page.svelte",
   "/welcome/add-data/+page.svelte",
   "/welcome/add-data/+page.ts",
+
+  // Dev-preview routes inside the cloud editor. Locally these surfaces live
+  // at the top level (`/dashboards`, `/status*`, `/ai`) since the local app
+  // toggles into Preview mode via the navbar instead of nesting it under an
+  // editor URL. Each editor page thinly wraps the same shared
+  // `web-common/features/preview-mode/*` component the local routes use.
+  "/dashboards/+page.svelte",
+  "/status/+layout.svelte",
+  "/status/+page.svelte",
+  "/status/resources/+page.svelte",
+  "/status/tables/+page.svelte",
+  "/ai/+page.svelte",
 ];
 
 function walkRoutes(absRoot) {

@@ -26,7 +26,6 @@
     createAdminServiceGetCurrentUser,
     type V1ProjectPermissions,
   } from "../../client";
-  import ViewAsUserPopover from "../view-as-user/ViewAsUserPopover.svelte";
   import ThemeToggle from "@rilldata/web-common/features/themes/ThemeToggle.svelte";
 
   export let projectPermissions: V1ProjectPermissions | undefined = undefined;
@@ -35,7 +34,6 @@
 
   let imgContainer: HTMLElement;
   let primaryMenuOpen = false;
-  let subMenuOpen = false;
 
   onMount(() => {
     const photoUrl = $user.data?.user?.photoUrl;
@@ -90,29 +88,6 @@
   </DropdownMenu.Trigger>
   <DropdownMenu.Content align="end">
     {#if params.organization && params.project && projectPermissions}
-      {#if projectPermissions.manageProject}
-        <DropdownMenu.Sub bind:open={subMenuOpen}>
-          <DropdownMenu.SubTrigger
-            onclick={() => {
-              subMenuOpen = !subMenuOpen;
-            }}
-          >
-            View as
-          </DropdownMenu.SubTrigger>
-          <DropdownMenu.SubContent
-            class="flex flex-col min-w-[150px] max-w-[300px]"
-          >
-            <ViewAsUserPopover
-              organization={params.organization}
-              project={params.project}
-              onSelectUser={() => {
-                subMenuOpen = false;
-                primaryMenuOpen = false;
-              }}
-            />
-          </DropdownMenu.SubContent>
-        </DropdownMenu.Sub>
-      {/if}
       {#if params.dashboard}
         <DropdownMenu.Item
           href={`/${params.organization}/${params.project}/-/alerts`}

@@ -261,5 +261,23 @@ describe("deployment-utils", () => {
       const result = await call("/rilldata/openrtb");
       expect(result).toBeUndefined();
     });
+
+    it("does not redirect away from the deploying page", async () => {
+      // Conditions that would otherwise trigger a redirect:
+      // no prod deployment, an active editable dev deployment, no @branch in URL.
+      listDeploymentsMock.mockResolvedValue({
+        deployments: [
+          makeDeployment({
+            environment: "dev",
+            editable: true,
+            branch: "edit-branch",
+            status: V1DeploymentStatus.DEPLOYMENT_STATUS_RUNNING,
+          }),
+        ],
+      });
+
+      const result = await call("/rilldata/openrtb/-/deploying");
+      expect(result).toBeUndefined();
+    });
   });
 });
@@ -40,6 +40,10 @@ export async function maybeRedirectToEditableDeployment(
   project: string,
   url: URL,
 ) {
+  // The deploying page is a transitional progress screen for a prod deployment
+  // that is still provisioning. Do not redirect away from it.
+  if (url.pathname.endsWith("/-/deploying")) return;
+
   const deploymentsResp = await queryClient.fetchQuery({
     queryKey: getAdminServiceListDeploymentsQueryKey(organization, project, {}),
     queryFn: () => adminServiceListDeployments(organization, project, {}),

@@ -3,20 +3,52 @@
   import { Button } from "@rilldata/web-common/components/button";
   import Tooltip from "@rilldata/web-common/components/tooltip/Tooltip.svelte";
   import TooltipContent from "@rilldata/web-common/components/tooltip/TooltipContent.svelte";
-  import { LogOut } from "lucide-svelte";
+  import { extractErrorMessage } from "@rilldata/web-common/lib/errors";
+  import { createRuntimeServiceGitStatus } from "@rilldata/web-common/runtime-client";
+  import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
+  import { GitBranch, LogOut } from "lucide-svelte";
   import CommitPopover from "./CommitPopover.svelte";
   import MergePopover from "./MergePopover.svelte";
+  import PublishPopover from "./PublishPopover.svelte";
 
   export let organization: string;
   export let project: string;
   export let branch: string;
   export let primaryBranch: string | undefined = undefined;
 
+  const client = useRuntimeClient();
+  const gitStatusQuery = createRuntimeServiceGitStatus(client, {});
+
   $: closeHref = `/${organization}/${project}${branchPathPrefix(branch)}`;
+  $: managedGit = $gitStatusQuery.data?.managedGit;
+  $: gitStatusLoaded = $gitStatusQuery.data !== undefined;
+  // Show the parent-level error UI only when GitStatus has never loaded.
+  // After a successful load, TanStack keeps `data` populated through transient
+  // refetch errors, so the popovers stay mounted and the user keeps the toolbar.
+  $: gitStatusErrorMessage =
+    !gitStatusLoaded && $gitStatusQuery.isError
+      ? extractErrorMessage($gitStatusQuery.error)
+      : "";
 </script>
 
-<CommitPopover />
-<MergePopover {organization} {project} {primaryBranch} />
+{#if gitStatusLoaded}
+  {#if managedGit}
+    <PublishPopover {organization} {project} {primaryBranch} />
+  {:else}
+    <CommitPopover />
+    <MergePopover {organization} {project} {primaryBranch} />
+  {/if}
+{:else if gitStatusErrorMessage}
+  <Tooltip distance={8}>
+    <Button type="primary" disabled>
+      <GitBranch size="14" />
+      Git unavailable
+    </Button>
+    <TooltipContent slot="tooltip-content" maxWidth="220px">
+      <span class="text-xs">{gitStatusErrorMessage}</span>
+    </TooltipContent>
+  </Tooltip>
+{/if}
 
 <Tooltip distance={8}>
   <Button type="secondary" href={closeHref}>

@@ -1,21 +1,17 @@
 <script lang="ts">
   import { goto } from "$app/navigation";
-  import {
-    createAdminServiceDeleteDeployment,
-    createAdminServiceListDeployments,
-  } from "@rilldata/web-admin/client";
-  import { getRpcErrorMessage } from "@rilldata/web-admin/components/errors/error-utils";
-  import { optimisticallyRemoveDeployment } from "@rilldata/web-admin/features/branches/branch-actions";
   import { requestSkipBranchInjection } from "@rilldata/web-admin/features/branches/branch-utils";
   import { Button } from "@rilldata/web-common/components/button";
   import * as Popover from "@rilldata/web-common/components/popover";
   import Tooltip from "@rilldata/web-common/components/tooltip/Tooltip.svelte";
   import TooltipContent from "@rilldata/web-common/components/tooltip/TooltipContent.svelte";
   import { getGitUrlFromRemote } from "@rilldata/web-common/features/project/deploy/github-utils";
+  import { extractErrorMessage } from "@rilldata/web-common/lib/errors";
+  import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import {
     createRuntimeServiceGitMergeToBranchMutation,
     createRuntimeServiceGitStatus,
-    type RpcStatus,
+    getRuntimeServiceGitStatusQueryKey,
   } from "@rilldata/web-common/runtime-client";
   import { useRuntimeClient } from "@rilldata/web-common/runtime-client/v2";
   import { ExternalLink, GitPullRequest } from "lucide-svelte";
@@ -31,21 +27,8 @@
   const client = useRuntimeClient();
   const gitMergeMutation = createRuntimeServiceGitMergeToBranchMutation(client);
   const gitStatusQuery = createRuntimeServiceGitStatus(client, {});
-  const deploymentsQuery = createAdminServiceListDeployments(
-    organization,
-    project,
-    {},
-  );
-  const deleteDeploymentMutation = createAdminServiceDeleteDeployment();
 
   $: currentBranch = $gitStatusQuery.data?.branch ?? "";
-  $: gitStatusErrorMessage = $gitStatusQuery.isError
-    ? (getRpcErrorMessage($gitStatusQuery.error as RpcStatus) ??
-      "Couldn't load branch info")
-    : "";
-  $: devDeploymentId = $deploymentsQuery.data?.deployments?.find(
-    (d) => d.runtimeInstanceId === client.instanceId,
-  )?.id;
   $: branchUrl =
     $gitStatusQuery.data?.githubUrl && currentBranch
       ? `${getGitUrlFromRemote($gitStatusQuery.data.githubUrl)}/tree/${encodeURIComponent(currentBranch)}`
@@ -68,29 +51,27 @@
         branch: primaryBranch,
         force: false,
       });
+      // gitStatus tracks currentBranch; refresh so subscribers see the merge.
+      await queryClient.invalidateQueries({
+        queryKey: getRuntimeServiceGitStatusQueryKey(client.instanceId, {}),
+      });
     } catch (err) {
-      errorMessage = getRpcErrorMessage(err as RpcStatus) ?? "Failed to merge";
+      errorMessage = extractErrorMessage(err) || "Failed to merge";
       isMerging = false;
       return;
     }
 
-    // First, leave the edit page. Deleting the deployment while the page is still
-    // mounted would 404 its deployment queries and flash an error. The skip call
-    // opts out of the project layout's `beforeNavigate` branch injection so we
-    // actually land on the production project home, not back on the dev branch.
-    requestSkipBranchInjection();
-    await goto(`/${organization}/${project}`);
+    isMerging = false;
+    open = false;
 
-    // Second, delete the dev deployment. On success, drop it from the
-    // ListDeployments cache so the BranchSelector on the destination page
-    // doesn't show the now-deleted branch.
-    // Note that the browser may cancel this request on page tear-down, so a better approach may be to
-    // hand off the deployment id via sessionStorage and fire the delete from the destination.
-    if (devDeploymentId) {
-      const id = devDeploymentId;
-      $deleteDeploymentMutation.mutate({ deploymentId: id });
-      void optimisticallyRemoveDeployment(organization, project, id);
-    }
+    // Defer goto to the next task. Calling it synchronously after a mutation
+    // races with TanStack's invalidation/refetch teardown, whose abort listeners
+    // can throw and silently cancel the navigation. Same workaround as
+    // welcome/organization/+page.svelte after createOrg.
+    setTimeout(() => {
+      requestSkipBranchInjection();
+      void goto(`/${organization}/${project}`);
+    });
   }
 </script>
 
@@ -106,16 +87,12 @@
     </Popover.Trigger>
     <Popover.Content align="end" class="!w-[320px]">
       <div class="flex flex-col gap-y-3">
-        {#if gitStatusErrorMessage}
-          <p class="text-xs text-red-600">{gitStatusErrorMessage}</p>
-        {:else}
-          <p class="text-xs text-fg-secondary">
-            Merging pushes changes from
-            <span class="font-semibold text-fg-primary">"{currentBranch}"</span>
-            to production and returns you to the project home. Viewers will see updates
-            as the project reconciles.
-          </p>
-        {/if}
+        <p class="text-xs text-fg-secondary">
+          Merging pushes changes from
+          <span class="font-semibold text-fg-primary">"{currentBranch}"</span>
+          to production and returns you to the project home. Viewers will see updates
+          as the project reconciles.
+        </p>
         {#if branchUrl}
           <a
             class="github-link"
@@ -147,8 +124,6 @@
     <span class="text-xs">
       {#if alreadyOnPrimary}
         Already on production
-      {:else if gitStatusErrorMessage}
-        {gitStatusErrorMessage}
       {:else if !primaryBranch || !currentBranch}
         Loading project...
       {:else}