Block A of the EchoDo plan. Workspaces used to live as `objects(type='workspace')`,
which made it impossible to put a real RLS-friendly tenant boundary on the schema
or to give each workspace a stable URL slug. This commit:
- Adds a top-level `workspaces` table (slug unique, owner FK, plan_tier hook).
- Migrates the 8 anchor tables (objects, workspace_members, object_type_defs,
property_definitions, templates, forms, markdown_backlog_items,
cursor_sync_mappings) to FK into `workspaces.id` instead of `objects.id`,
with a hand-augmented data-copy migration that preserves IDs and slug-collision-
proofs on backfill.
- Introduces a `workspaceProcedure` tRPC middleware + `resolveWorkspace` helper
that take a UUID-or-slug `workspace` handle and expose `ctx.workspace`. All
tenant-scoped routers (objects, types, properties, templates, forms, search,
ai, relations, favorites) now flow through it.
- Updates the web app to pass `workspace` slugs from the URL (or store) instead
of the old `workspaceId`, including a workspace-sync layer that rewrites
/<UUID>/... links to /<slug>/...
- Updates the MCP tools (list_objects, create_object, search_objects) and the
workspace://{handle}/tree resource to accept either a slug or UUID so existing
agents keep working.
- Adds a Create Workspace dialog and a Workspace Settings page (rename + slug
rename with redirect, owner-only archive).
Verified locally against a fresh Postgres: migration applies cleanly, slug
uniqueness holds, tenant data is isolated by workspace_id, slug↔UUID resolution
works in both directions, and ON DELETE CASCADE cleans up child rows in the
correct workspace only.
Co-authored-by: Cursor <cursoragent@cursor.com>
60 lines
1.7 KiB
TypeScript
60 lines
1.7 KiB
TypeScript
"use client";
|
|
|
|
import type { ReactNode } from "react";
|
|
import { useEffect } from "react";
|
|
import { useRouter } from "next/navigation";
|
|
|
|
import { useWorkspaceStore } from "@/lib/stores/workspace-store";
|
|
import { api } from "@/lib/trpc";
|
|
|
|
/**
|
|
* Resolves the URL workspace handle (slug or UUID) to a full workspace record
|
|
* and seeds the global workspace store. Other client components read from the
|
|
* store and pass `currentWorkspace.slug` as the `workspace` arg to tenant-scoped
|
|
* tRPC procedures.
|
|
*/
|
|
export function WorkspaceSync({
|
|
workspaceSlug,
|
|
children,
|
|
}: {
|
|
workspaceSlug: string;
|
|
children: ReactNode;
|
|
}) {
|
|
const router = useRouter();
|
|
const setWorkspace = useWorkspaceStore((s) => s.setWorkspace);
|
|
|
|
const { data, isError } = api.workspaces.resolve.useQuery({
|
|
handle: workspaceSlug,
|
|
});
|
|
|
|
useEffect(() => {
|
|
if (data) {
|
|
setWorkspace({
|
|
id: data.id,
|
|
slug: data.slug,
|
|
name: data.name,
|
|
});
|
|
// URL backcompat: if the user landed on /<UUID>/... but the workspace
|
|
// has a slug, rewrite the URL to the slug form so future links/share
|
|
// surfaces are slug-shaped.
|
|
if (workspaceSlug !== data.slug && typeof window !== "undefined") {
|
|
const next = window.location.pathname.replace(
|
|
`/${workspaceSlug}`,
|
|
`/${data.slug}`,
|
|
);
|
|
router.replace(next + window.location.search);
|
|
}
|
|
}
|
|
return () => setWorkspace(null);
|
|
}, [workspaceSlug, data, setWorkspace, router]);
|
|
|
|
if (isError) {
|
|
return (
|
|
<div className="flex h-full items-center justify-center p-8 text-sm text-muted-foreground">
|
|
Workspace not found.
|
|
</div>
|
|
);
|
|
}
|
|
|
|
return <>{children}</>;
|
|
}
|