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>
88 lines
2.5 KiB
TypeScript
88 lines
2.5 KiB
TypeScript
"use client";
|
|
|
|
import { ChevronDown } from "lucide-react";
|
|
|
|
import { Button } from "@/components/ui/button";
|
|
import {
|
|
DropdownMenu,
|
|
DropdownMenuContent,
|
|
DropdownMenuItem,
|
|
DropdownMenuLabel,
|
|
DropdownMenuSeparator,
|
|
DropdownMenuTrigger,
|
|
} from "@/components/ui/dropdown-menu";
|
|
import { api } from "@/lib/trpc";
|
|
import { cn } from "@/lib/utils";
|
|
|
|
const BUILTIN = [
|
|
{ value: "title", label: "Task title" },
|
|
{ value: "description", label: "Description" },
|
|
{ value: "status", label: "Status" },
|
|
] as const;
|
|
|
|
export function FormMappingPicker({
|
|
workspaceHandle,
|
|
value,
|
|
onChange,
|
|
disabled,
|
|
className,
|
|
}: {
|
|
workspaceHandle: string;
|
|
value: string | null;
|
|
onChange: (next: string | null) => void;
|
|
disabled?: boolean;
|
|
className?: string;
|
|
}) {
|
|
const { data, isLoading } = api.properties.listDefinitions.useQuery(
|
|
{ workspace: workspaceHandle },
|
|
{ enabled: Boolean(workspaceHandle) },
|
|
);
|
|
|
|
const definitions = data?.definitions ?? [];
|
|
|
|
const labelFor = (v: string | null) => {
|
|
if (v === null || v === "") return "No mapping";
|
|
const builtin = BUILTIN.find((b) => b.value === v);
|
|
if (builtin) return builtin.label;
|
|
const def = definitions.find((d) => d.id === v);
|
|
return def?.name ?? v;
|
|
};
|
|
|
|
return (
|
|
<DropdownMenu>
|
|
<DropdownMenuTrigger asChild>
|
|
<Button
|
|
type="button"
|
|
variant="outline"
|
|
disabled={disabled || isLoading}
|
|
className={cn("w-full justify-between font-normal", className)}
|
|
>
|
|
<span className="truncate">{labelFor(value)}</span>
|
|
<ChevronDown className="size-4 shrink-0 opacity-50" />
|
|
</Button>
|
|
</DropdownMenuTrigger>
|
|
<DropdownMenuContent className="max-h-64 w-[var(--radix-dropdown-menu-trigger-width)] overflow-y-auto">
|
|
<DropdownMenuLabel>Task fields</DropdownMenuLabel>
|
|
<DropdownMenuItem onClick={() => onChange(null)}>
|
|
No mapping
|
|
</DropdownMenuItem>
|
|
{BUILTIN.map((b) => (
|
|
<DropdownMenuItem key={b.value} onClick={() => onChange(b.value)}>
|
|
{b.label}
|
|
</DropdownMenuItem>
|
|
))}
|
|
<DropdownMenuSeparator />
|
|
<DropdownMenuLabel>Custom properties</DropdownMenuLabel>
|
|
{definitions.length === 0 ? (
|
|
<DropdownMenuItem disabled>No custom properties</DropdownMenuItem>
|
|
) : (
|
|
definitions.map((d) => (
|
|
<DropdownMenuItem key={d.id} onClick={() => onChange(d.id)}>
|
|
{d.name}
|
|
</DropdownMenuItem>
|
|
))
|
|
)}
|
|
</DropdownMenuContent>
|
|
</DropdownMenu>
|
|
);
|
|
}
|