fix: workspace review fixes — auth view, clone errors, remove order, approval filter, cleanup ::migration::

Author: kof

apps/builder/app/dashboard/dashboard-utils.test.ts

@@ -1,5 +1,8 @@
 import { describe, test, expect } from "vitest";
-import { resolveCurrentWorkspace } from "./dashboard-utils";
+import {
+  resolveCurrentWorkspace,
+  isDowngradedForMember,
+} from "./dashboard-utils";
 import type { WorkspaceWithRelation } from "@webstudio-is/project";
 
 const createWorkspace = (
@@ -8,6 +11,7 @@ const createWorkspace = (
   id: "ws-1",
   name: "Workspace",
   isDefault: false,
+  isDeleted: false,
   createdAt: "2024-01-01T00:00:00.000Z",
   userId: "user-1",
   workspaceRelation: "own",
@@ -98,3 +102,52 @@ describe("resolveCurrentWorkspace", () => {
     }
   });
 });
+
+describe("isDowngradedForMember", () => {
+  test("returns false for undefined workspace", () => {
+    expect(isDowngradedForMember(undefined)).toBe(false);
+  });
+
+  test("returns false for non-downgraded workspace", () => {
+    expect(
+      isDowngradedForMember(
+        createWorkspace({ isDowngraded: false, workspaceRelation: "editors" })
+      )
+    ).toBe(false);
+  });
+
+  test("returns false for downgraded workspace owned by current user", () => {
+    expect(
+      isDowngradedForMember(
+        createWorkspace({ isDowngraded: true, workspaceRelation: "own" })
+      )
+    ).toBe(false);
+  });
+
+  test("returns true for downgraded workspace where user is a member", () => {
+    expect(
+      isDowngradedForMember(
+        createWorkspace({ isDowngraded: true, workspaceRelation: "editors" })
+      )
+    ).toBe(true);
+  });
+
+  test("returns true for downgraded workspace with viewer relation", () => {
+    expect(
+      isDowngradedForMember(
+        createWorkspace({ isDowngraded: true, workspaceRelation: "viewers" })
+      )
+    ).toBe(true);
+  });
+
+  test("returns true for downgraded workspace with admin relation", () => {
+    expect(
+      isDowngradedForMember(
+        createWorkspace({
+          isDowngraded: true,
+          workspaceRelation: "administrators",
+        })
+      )
+    ).toBe(true);
+  });
+});

apps/builder/app/dashboard/dashboard-utils.ts

@@ -21,3 +21,13 @@ export const resolveCurrentWorkspace = (
   }
   return { type: "resolved", workspace: workspaces.find((w) => w.isDefault) };
 };
+
+/**
+ * Pure function: returns true when the workspace owner's plan has been
+ * downgraded and the current user is a non-owner member.
+ * In that case the dashboard should hide shared projects on reload.
+ */
+export const isDowngradedForMember = (
+  workspace: WorkspaceWithRelation | undefined
+): boolean =>
+  workspace?.isDowngraded === true && workspace.workspaceRelation !== "own";

apps/builder/app/dashboard/projects/project-dialogs.tsx

@@ -224,10 +224,14 @@ const useRenameProject = ({
         : undefined;
     setErrors(errors);
     if (parsed.success) {
-      send({ projectId, title }, () => {
+      send({ projectId, title }, (result) => {
+        if (result && "error" in result) {
+          setErrors(result.error);
+          return;
+        }
+        onOpenChange(false);
         revalidator.revalidate();
       });
-      onOpenChange(false);
     }
   };
 

apps/builder/app/dashboard/projects/transfer-dialog.stories.tsx

@@ -24,21 +24,34 @@ const createRouter = (element: React.ReactElement) =>
 
 export const OwnedAndSharedWorkspaces: StoryFn = () => {
   $workspaces.set([
-    { id: "ws-1", name: "My workspace", workspaceRelation: "own" },
-    { id: "ws-2", name: "Client projects", workspaceRelation: "own" },
+    {
+      id: "ws-1",
+      name: "My workspace",
+      isDefault: true,
+      workspaceRelation: "own",
+    },
+    {
+      id: "ws-2",
+      name: "Client projects",
+      isDefault: false,
+      workspaceRelation: "own",
+    },
     {
       id: "ws-3",
       name: "Team workspace (admin)",
+      isDefault: false,
       workspaceRelation: "administrators",
     },
     {
       id: "ws-4",
       name: "Agency workspace (editor)",
+      isDefault: false,
       workspaceRelation: "editors",
     },
     {
       id: "ws-5",
       name: "Partner workspace (builder)",
+      isDefault: false,
       workspaceRelation: "builders",
     },
   ]);

apps/builder/app/dashboard/projects/transfer-dialog.tsx

@@ -87,21 +87,23 @@ export const TransferProjectDialog = ({
       return urlWorkspaceId;
     }
     // When no workspaceId in URL, the user is on the default workspace
-    return ownedWorkspaces[0]?.id;
+    return (
+      ownedWorkspaces.find((w) => w.isDefault)?.id ?? ownedWorkspaces[0]?.id
+    );
   };
 
   // Reset state when dialog opens — pre-select the current workspace
   useEffect(() => {
     if (isOpen) {
       setSelectedWorkspaceId(getCurrentWorkspaceId());
-      return;
+    } else {
+      setEmail("");
+      setSelectedWorkspaceId(undefined);
+      setFilteredWorkspaces([]);
+      setIsFiltered(false);
+      setError(undefined);
+      clearTimeout(debounceTimerRef.current);
     }
-    setEmail("");
-    setSelectedWorkspaceId(undefined);
-    setFilteredWorkspaces([]);
-    setIsFiltered(false);
-    setError(undefined);
-    clearTimeout(debounceTimerRef.current);
 
     return () => clearTimeout(debounceTimerRef.current);
     // eslint-disable-next-line react-hooks/exhaustive-deps

apps/builder/app/dashboard/shared/subscription.ts

@@ -88,11 +88,13 @@ export const startDashboardSubscription = () => {
 export const stopDashboardSubscription = () => {
   subscription?.unsubscribe();
   subscription = undefined;
+  manager?.destroy();
+  manager = undefined;
   isFirstLoad = true;
 };
 
 /**
  * Force an immediate refresh — useful after accept/decline mutations
  * so the popover updates without waiting for the next poll cycle.
  */
-export const refreshNotifications = () => getManager().refresh();
+export const refreshNotifications = () => manager?.refresh();

apps/builder/app/dashboard/workspace-dialogs.stories.tsx

@@ -17,6 +17,7 @@ const createWorkspace = (overrides: Partial<Workspace> = {}): Workspace => ({
   id: "ws-1",
   name: "Client projects",
   isDefault: false,
+  isDeleted: false,
   createdAt: new Date().toISOString(),
   userId: "user-1",
   ...overrides,

apps/builder/app/dashboard/workspace-dialogs.tsx

@@ -216,7 +216,7 @@ const MemberRow = (props: MemberRowProps) => {
           workspaceRelationLabels[option]
         }
         onChange={handleChange}
-        disabled={!props.canRemove}
+        disabled={!props.canRemove || role === "pending"}
       />
     );
   })();

apps/builder/app/dashboard/workspace-selector.stories.tsx

@@ -16,6 +16,7 @@ const createWorkspace = (
   id: "ws-1",
   name: "My workspace",
   isDefault: false,
+  isDeleted: false,
   createdAt: new Date().toISOString(),
   userId: "user-1",
   workspaceRelation: "own",

apps/builder/app/dashboard/workspace-selector.test.ts

@@ -10,6 +10,7 @@ const createWorkspace = (
   id: "ws-1",
   name: "Workspace",
   isDefault: false,
+  isDeleted: false,
   createdAt: "2024-01-01T00:00:00.000Z",
   userId: "user-1",
   workspaceRelation: "own",