feat: sync blocks - wip

* feat: replace pdfjs-dist with firecrawl-pdf-inspector

* use modified firecrawl-pdf-inspector

* feat: pdf import

* increase single file upload size limit

* use npm package

* sync

* update package

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.80.0",
+  "version": "0.80.1",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
@@ -11,10 +11,6 @@
   },
   "dependencies": {
     "@casl/react": "^5.0.1",
-    "@dnd-kit/core": "^6.3.1",
-    "@dnd-kit/modifiers": "^9.0.0",
-    "@dnd-kit/sortable": "^10.0.0",
-    "@dnd-kit/utilities": "^3.2.2",
     "@docmost/editor-ext": "workspace:*",
     "@emoji-mart/data": "^1.2.1",
     "@emoji-mart/react": "^1.1.1",
@@ -27,9 +23,7 @@
     "@mantine/notifications": "^8.3.18",
     "@mantine/spotlight": "^8.3.18",
     "@tabler/icons-react": "^3.40.0",
-    "@tanstack/react-query": "5.99.1",
+    "@tanstack/react-query": "5.90.17",
-    "@tanstack/react-table": "^8.21.3",
-    "@tanstack/react-virtual": "^3.13.24",
     "alfaaz": "^1.1.0",
     "axios": "1.15.0",
     "blueimp-load-image": "^5.16.0",
@@ -37,8 +31,8 @@
     "emoji-mart": "^5.6.0",
     "file-saver": "^2.0.5",
     "highlightjs-sap-abap": "^0.3.0",
-    "i18next": "^25.10.1",
+    "i18next": "25.10.1",
-    "i18next-http-backend": "^3.0.2",
+    "i18next-http-backend": "3.0.6",
     "jotai": "^2.18.1",
     "jotai-optics": "^0.4.0",
     "js-cookie": "^3.0.5",
@@ -48,7 +42,7 @@
     "mantine-form-zod-resolver": "^1.3.0",
     "mermaid": "^11.13.0",
     "mitt": "^3.0.1",
-    "posthog-js": "1.363.1",
+    "posthog-js": "1.372.2",
     "react": "^18.3.1",
     "react-arborist": "3.4.0",
     "react-clear-modal": "^2.0.18",
@@ -56,11 +50,10 @@
     "react-drawio": "^1.0.7",
     "react-error-boundary": "^6.1.1",
     "react-helmet-async": "^3.0.0",
-    "react-i18next": "^16.5.8",
+    "react-i18next": "16.5.8",
     "react-router-dom": "^7.13.1",
     "semver": "^7.7.4",
     "socket.io-client": "^4.8.3",
-    "tiptap-extension-global-drag-handle": "^0.1.18",
     "zod": "^4.3.6"
   },
   "devDependencies": {
@@ -80,7 +73,7 @@
     "eslint-plugin-react-refresh": "^0.5.2",
     "globals": "^15.13.0",
     "optics-ts": "^2.4.1",
-    "postcss": "^8.5.8",
+    "postcss": "^8.5.12",
     "postcss-preset-mantine": "^1.18.0",
     "postcss-simple-vars": "^7.0.1",
     "prettier": "^3.8.1",

apps/client/public/locales/de-DE/translation.json

@@ -391,7 +391,7 @@
   "Write anything. Enter \"/\" for commands": "Schreiben Sie etwas. Geben Sie \"/\" für Befehle ein",
   "Write...": "\"Schreiben...\"",
   "Column count": "Spaltenanzahl",
-  "{{count}} Columns": "{count, plural, one {# Spalte} other {# Spalten}}",
+  "{{count}} Columns": "{{count}} Spalten",
   "Equal columns": "Gleich breite Spalten",
   "Left sidebar": "Linke Seitenleiste",
   "Right sidebar": "Rechte Seitenleiste",

apps/client/public/locales/en-US/translation.json

@@ -608,25 +608,21 @@
   "Image exceeds 10MB limit.": "Image exceeds 10MB limit.",
   "Image removed successfully": "Image removed successfully",
   "API key": "API key",
-  "API key created successfully": "API key created successfully",
   "API keys": "API keys",
   "API management": "API management",
-  "Are you sure you want to revoke this API key": "Are you sure you want to revoke this API key",
-  "Create API Key": "Create API Key",
   "Custom expiration date": "Custom expiration date",
   "Enter a descriptive token name": "Enter a descriptive token name",
   "Expiration": "Expiration",
   "Expired": "Expired",
   "Expires": "Expires",
-  "I've saved my API key": "I've saved my API key",
   "Last use": "Last Used",
   "No API keys found": "No API keys found",
   "No expiration": "No expiration",
-  "Revoke API key": "Revoke API key",
   "Revoked successfully": "Revoked successfully",
   "Select expiration date": "Select expiration date",
   "This action cannot be undone. Any applications using this API key will stop working.": "This action cannot be undone. Any applications using this API key will stop working.",
-  "Update API key": "Update API key",
+  "Update": "Update",
+  "Update {{credential}}": "Update {{credential}}",
   "Manage API keys for all users in the workspace": "Manage API keys for all users in the workspace",
   "Restrict API key creation to admins": "Restrict API key creation to admins",
   "Only admins and owners can create new API keys. Existing member keys will continue to work.": "Only admins and owners can create new API keys. Existing member keys will continue to work.",
@@ -880,5 +876,41 @@
   "Try a different search term.": "Try a different search term.",
   "Try again": "Try again",
   "Untitled chat": "Untitled chat",
-  "What can I help you with?": "What can I help you with?"
+  "What can I help you with?": "What can I help you with?",
+  "Are you sure you want to revoke this {{credential}}": "Are you sure you want to revoke this {{credential}}",
+  "Automatically provision users and groups from your identity provider via SCIM.": "Automatically provision users and groups from your identity provider via SCIM.",
+  "Configure your identity provider with this URL to provision users and groups.": "Configure your identity provider with this URL to provision users and groups.",
+  "Create {{credential}}": "Create {{credential}}",
+  "{{credential}} created": "{{credential}} created",
+  "{{credential}} created successfully": "{{credential}} created successfully",
+  "Created by": "Created by",
+  "Custom": "Custom",
+  "Enable SCIM": "Enable SCIM",
+  "Enter a descriptive name": "Enter a descriptive name",
+  "I've saved my {{credential}}": "I've saved my {{credential}}",
+  "Important": "Important",
+  "Make sure to copy your {{credential}} now. You won't be able to see it again!": "Make sure to copy your {{credential}} now. You won't be able to see it again!",
+  "Never": "Never",
+  "Revoke {{credential}}": "Revoke {{credential}}",
+  "SCIM endpoint URL": "SCIM endpoint URL",
+  "SCIM provisioning": "SCIM provisioning",
+  "SCIM takes precedence over SSO group sync while enabled.": "SCIM takes precedence over SSO group sync while enabled.",
+  "You have reached the maximum of {{max}} SCIM tokens. Delete an existing token to create a new one.": "You have reached the maximum of {{max}} SCIM tokens. Delete an existing token to create a new one.",
+  "SCIM token": "SCIM token",
+  "SCIM tokens": "SCIM tokens",
+  "This action cannot be undone. Your identity provider will stop syncing immediately.": "This action cannot be undone. Your identity provider will stop syncing immediately.",
+  "Toggle SCIM provisioning": "Toggle SCIM provisioning",
+  "Token": "Token",
+  "Sync block": "Sync block",
+  "Create a block that stays in sync across pages.": "Create a block that stays in sync across pages.",
+  "Sync block name": "Sync block name",
+  "Editing original": "Editing original",
+  "Copy synced block": "Copy synced block",
+  "Unsync": "Unsync",
+  "Delete sync block": "Delete sync block",
+  "Synced to {{count}} other page_one": "Synced to {{count}} other page",
+  "Synced to {{count}} other page_other": "Synced to {{count}} other pages",
+  "ORIGINAL": "ORIGINAL",
+  "THIS PAGE": "THIS PAGE",
+  "No pages": "No pages"
 }

apps/client/src/App.tsx

@@ -38,7 +38,6 @@ import SpaceTrash from "@/pages/space/space-trash.tsx";
 import UserApiKeys from "@/ee/api-key/pages/user-api-keys";
 import WorkspaceApiKeys from "@/ee/api-key/pages/workspace-api-keys";
 import AiSettings from "@/ee/ai/pages/ai-settings.tsx";
-import BasePage from "@/pages/base/base-page.tsx";
 import AuditLogs from "@/ee/audit/pages/audit-logs.tsx";
 import VerifiedPages from "@/ee/page-verification/pages/verified-pages.tsx";
 import TemplateList from "@/ee/template/pages/template-list";
@@ -105,8 +104,6 @@ export default function App() {
             element={<Page />}
           />
 
-          <Route path={"/base/:baseId"} element={<BasePage />} />
-
           <Route path={"/settings"}>
             <Route path={"account/profile"} element={<AccountSettings />} />
             <Route

apps/client/src/components/layouts/global/global-app-shell.tsx

@@ -116,7 +116,9 @@ export default function GlobalAppShell({
       </AppShell.Navbar>
       <AppShell.Main>
         {isSettingsRoute ? (
-          <Container size={900}>{children}</Container>
+          <Container size={900} pb={80}>
+            {children}
+          </Container>
         ) : (
           children
         )}

apps/client/src/components/settings/settings-queries.tsx

@@ -13,6 +13,7 @@ import { getShares } from "@/features/share/services/share-service.ts";
 import { getApiKeys } from "@/ee/api-key";
 import { getAuditLogs } from "@/ee/audit/services/audit-service";
 import { getVerificationList } from "@/ee/page-verification/services/page-verification-service";
+import { getScimTokens } from "@/ee/scim/services/scim-token-service";
 
 export const prefetchWorkspaceMembers = () => {
   const params: QueryParams = { limit: 100, query: "" };
@@ -98,3 +99,10 @@ export const prefetchVerifiedPages = () => {
     queryFn: () => getVerificationList(params),
   });
 };
+
+export const prefetchScimTokens = () => {
+  queryClient.prefetchQuery({
+    queryKey: ["scim-token-list", { cursor: undefined }],
+    queryFn: () => getScimTokens({}),
+  });
+};

apps/client/src/components/settings/settings-sidebar.tsx

@@ -31,6 +31,7 @@ import {
   prefetchBilling,
   prefetchGroups,
   prefetchLicense,
+  prefetchScimTokens,
   prefetchShares,
   prefetchSpaces,
   prefetchSsoProviders,
@@ -204,7 +205,10 @@ export default function SettingsSidebar() {
               }
               break;
             case "Security & SSO":
-              prefetchHandler = prefetchSsoProviders;
+              prefetchHandler = () => {
+                prefetchSsoProviders();
+                prefetchScimTokens();
+              };
               break;
             case "Public sharing":
               prefetchHandler = prefetchShares;

apps/client/src/ee/api-key/components/api-key-created-modal.tsx

@@ -31,7 +31,7 @@ export function ApiKeyCreatedModal({
     <Modal
       opened={opened}
       onClose={onClose}
-      title={t("API key created")}
+      title={t("{{credential}} created", { credential: t("API key") })}
       size="lg"
     >
       <Stack gap="md">
@@ -41,7 +41,8 @@ export function ApiKeyCreatedModal({
           color="red"
         >
           {t(
-            "Make sure to copy your API key now. You won't be able to see it again!",
+            "Make sure to copy your {{credential}} now. You won't be able to see it again!",
+            { credential: t("API key") },
           )}
         </Alert>
 
@@ -64,7 +65,7 @@ export function ApiKeyCreatedModal({
         </div>
 
         <Button fullWidth onClick={onClose} mt="md">
-          {t("I've saved my API key")}
+          {t("I've saved my {{credential}}", { credential: t("API key") })}
         </Button>
       </Stack>
     </Modal>

apps/client/src/ee/api-key/components/create-api-key-modal.tsx

@@ -105,7 +105,7 @@ export function CreateApiKeyModal({
     <Modal
       opened={opened}
       onClose={handleClose}
-      title={t("Create API Key")}
+      title={t("Create {{credential}}", { credential: t("API key") })}
       size="md"
     >
       <form onSubmit={form.onSubmit((values) => handleSubmit(values))}>

apps/client/src/ee/api-key/components/revoke-api-key-modal.tsx

@@ -30,12 +30,14 @@ export function RevokeApiKeyModal({
     <Modal
       opened={opened}
       onClose={onClose}
-      title={t("Revoke API key")}
+      title={t("Revoke {{credential}}", { credential: t("API key") })}
       size="md"
     >
       <Stack gap="md">
         <Text>
-          {t("Are you sure you want to revoke this API key")}{" "}
+          {t("Are you sure you want to revoke this {{credential}}", {
+            credential: t("API key"),
+          })}{" "}
           <strong>{apiKey?.name}</strong>?
         </Text>
         <Text size="sm" c="dimmed">

apps/client/src/ee/api-key/components/update-api-key-modal.tsx

@@ -53,7 +53,7 @@ export function UpdateApiKeyModal({
     <Modal
       opened={opened}
       onClose={onClose}
-      title={t("Update API key")}
+      title={t("Update {{credential}}", { credential: t("API key") })}
       size="md"
     >
       <form onSubmit={form.onSubmit((values) => handleSubmit(values))}>

apps/client/src/ee/api-key/queries/api-key-query.ts

@@ -63,7 +63,11 @@ export function useCreateApiKeyMutation() {
   return useMutation<IApiKey, Error, ICreateApiKeyRequest>({
     mutationFn: (data) => createApiKey(data),
     onSuccess: () => {
-      notifications.show({ message: t("API key created successfully") });
+      notifications.show({
+        message: t("{{credential}} created successfully", {
+          credential: t("API key"),
+        }),
+      });
       queryClient.invalidateQueries({
         predicate: (item) =>
           ["api-key-list"].includes(item.queryKey[0] as string),

apps/client/src/ee/audit/lib/audit-event-labels.ts

@@ -33,6 +33,10 @@ export const auditEventLabels: Record<string, string> = {
   "api_key.updated": "Updated API key",
   "api_key.deleted": "Deleted API key",
 
+  "scim_token.created": "Created SCIM token",
+  "scim_token.updated": "Updated SCIM token",
+  "scim_token.deleted": "Deleted SCIM token",
+
   "space.created": "Created space",
   "space.updated": "Updated space",
   "space.deleted": "Deleted space",
@@ -174,6 +178,14 @@ export const eventFilterOptions: EventGroup[] = [
       { value: "api_key.deleted", label: "Deleted API key" },
     ],
   },
+  {
+    group: "SCIM token",
+    items: [
+      { value: "scim_token.created", label: "Created SCIM token" },
+      { value: "scim_token.updated", label: "Updated SCIM token" },
+      { value: "scim_token.deleted", label: "Deleted SCIM token" },
+    ],
+  },
   {
     group: "License",
     items: [

apps/client/src/ee/features.ts

@@ -8,6 +8,7 @@ export const Feature = {
   AI: 'ai',
   CONFLUENCE_IMPORT: 'import:confluence',
   DOCX_IMPORT: 'import:docx',
+  PDF_IMPORT: 'import:pdf',
   ATTACHMENT_INDEXING: 'attachment:indexing',
   SECURITY_SETTINGS: 'security:settings',
   MCP: 'mcp',

apps/client/src/ee/page-permission/components/page-permission-list.tsx

@@ -140,7 +140,7 @@ export function PagePermissionList({
         )}
       </Group>
 
-      <ScrollArea mah={250} viewportRef={viewportRef}>
+      <ScrollArea.Autosize mah={400} viewportRef={viewportRef}>
         {sortedMembers.map((member) => (
           <PagePermissionItem
             key={`${member.type}-${member.id}`}
@@ -158,7 +158,7 @@ export function PagePermissionList({
             <Loader size="xs" />
           </Center>
         )}
-      </ScrollArea>
+      </ScrollArea.Autosize>
     </>
   );
 }

apps/client/src/ee/scim/components/create-scim-token-modal.tsx

@@ -0,0 +1,78 @@
+import { Modal, TextInput, Button, Group, Stack } from "@mantine/core";
+import { useForm } from "@mantine/form";
+import { zod4Resolver } from "mantine-form-zod-resolver";
+import { z } from "zod/v4";
+import { useTranslation } from "react-i18next";
+import { useCreateScimTokenMutation } from "@/ee/scim/queries/scim-token-query";
+import { IScimToken } from "@/ee/scim/types/scim-token.types";
+
+interface CreateScimTokenModalProps {
+  opened: boolean;
+  onClose: () => void;
+  onSuccess: (response: IScimToken) => void;
+}
+
+const formSchema = z.object({
+  name: z.string().min(1, "Name is required"),
+});
+type FormValues = z.infer<typeof formSchema>;
+
+export function CreateScimTokenModal({
+  opened,
+  onClose,
+  onSuccess,
+}: CreateScimTokenModalProps) {
+  const { t } = useTranslation();
+  const createMutation = useCreateScimTokenMutation();
+
+  const form = useForm<FormValues>({
+    validate: zod4Resolver(formSchema),
+    initialValues: { name: "" },
+  });
+
+  const handleSubmit = async (data: FormValues) => {
+    try {
+      const created = await createMutation.mutateAsync({ name: data.name });
+      onSuccess(created);
+      form.reset();
+      onClose();
+    } catch (err) {
+      //
+    }
+  };
+
+  const handleClose = () => {
+    form.reset();
+    onClose();
+  };
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={handleClose}
+      title={t("Create {{credential}}", { credential: t("SCIM token") })}
+      size="md"
+    >
+      <form onSubmit={form.onSubmit((values) => handleSubmit(values))}>
+        <Stack gap="md">
+          <TextInput
+            label={t("Name")}
+            placeholder={t("Enter a descriptive name")}
+            data-autofocus
+            required
+            {...form.getInputProps("name")}
+          />
+
+          <Group justify="flex-end" mt="md">
+            <Button variant="default" onClick={handleClose}>
+              {t("Cancel")}
+            </Button>
+            <Button type="submit" loading={createMutation.isPending}>
+              {t("Create")}
+            </Button>
+          </Group>
+        </Stack>
+      </form>
+    </Modal>
+  );
+}

apps/client/src/ee/scim/components/enable-scim.tsx

@@ -0,0 +1,55 @@
+import { Group, Text, Switch, Tooltip } from "@mantine/core";
+import { useAtom } from "jotai";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { updateWorkspace } from "@/features/workspace/services/workspace-service.ts";
+import { notifications } from "@mantine/notifications";
+import { useHasFeature } from "@/ee/hooks/use-feature.ts";
+import { Feature } from "@/ee/features.ts";
+import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label.ts";
+
+export default function EnableScim() {
+  const { t } = useTranslation();
+  const [workspace, setWorkspace] = useAtom(workspaceAtom);
+  const [checked, setChecked] = useState(workspace?.isScimEnabled ?? false);
+  const hasAccess = useHasFeature(Feature.SCIM);
+  const upgradeLabel = useUpgradeLabel();
+
+  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.currentTarget.checked;
+    try {
+      const updatedWorkspace = await updateWorkspace({ isScimEnabled: value });
+      setChecked(value);
+      setWorkspace(updatedWorkspace);
+    } catch (err) {
+      notifications.show({
+        message: err?.response?.data?.message,
+        color: "red",
+      });
+    }
+  };
+
+  return (
+    <Group justify="space-between" wrap="nowrap" gap="xl">
+      <div>
+        <Text size="md">{t("Enable SCIM")}</Text>
+        <Text size="sm" c="dimmed">
+          {t(
+            "Automatically provision users and groups from your identity provider via SCIM.",
+          )}
+        </Text>
+      </div>
+
+      <Tooltip label={upgradeLabel} disabled={hasAccess} refProp="rootRef">
+        <Switch
+          labelPosition="left"
+          defaultChecked={checked}
+          onChange={handleChange}
+          disabled={!hasAccess}
+          aria-label={t("Toggle SCIM provisioning")}
+        />
+      </Tooltip>
+    </Group>
+  );
+}

apps/client/src/ee/scim/components/revoke-scim-token-modal.tsx

@@ -0,0 +1,61 @@
+import { Modal, Text, Button, Group, Stack } from "@mantine/core";
+import { useTranslation } from "react-i18next";
+import { useRevokeScimTokenMutation } from "@/ee/scim/queries/scim-token-query";
+import { IScimToken } from "@/ee/scim/types/scim-token.types";
+
+interface RevokeScimTokenModalProps {
+  opened: boolean;
+  onClose: () => void;
+  scimToken: IScimToken | null;
+}
+
+export function RevokeScimTokenModal({
+  opened,
+  onClose,
+  scimToken,
+}: RevokeScimTokenModalProps) {
+  const { t } = useTranslation();
+  const revokeMutation = useRevokeScimTokenMutation();
+
+  const handleRevoke = async () => {
+    if (!scimToken) return;
+    await revokeMutation.mutateAsync({ tokenId: scimToken.id });
+    onClose();
+  };
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={onClose}
+      title={t("Revoke {{credential}}", { credential: t("SCIM token") })}
+      size="md"
+    >
+      <Stack gap="md">
+        <Text>
+          {t("Are you sure you want to revoke this {{credential}}", {
+            credential: t("SCIM token"),
+          })}{" "}
+          <strong>{scimToken?.name}</strong>?
+        </Text>
+        <Text size="sm" c="dimmed">
+          {t(
+            "This action cannot be undone. Your identity provider will stop syncing immediately.",
+          )}
+        </Text>
+
+        <Group justify="flex-end" mt="md">
+          <Button variant="default" onClick={onClose}>
+            {t("Cancel")}
+          </Button>
+          <Button
+            color="red"
+            onClick={handleRevoke}
+            loading={revokeMutation.isPending}
+          >
+            {t("Revoke")}
+          </Button>
+        </Group>
+      </Stack>
+    </Modal>
+  );
+}

apps/client/src/ee/scim/components/scim-token-created-modal.tsx

@@ -0,0 +1,69 @@
+import {
+  Modal,
+  Text,
+  Stack,
+  Alert,
+  Group,
+  Button,
+  TextInput,
+} from "@mantine/core";
+import { IconAlertTriangle } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import CopyTextButton from "@/components/common/copy.tsx";
+import { IScimToken } from "@/ee/scim/types/scim-token.types";
+
+interface ScimTokenCreatedModalProps {
+  opened: boolean;
+  onClose: () => void;
+  scimToken: IScimToken | null;
+}
+
+export function ScimTokenCreatedModal({
+  opened,
+  onClose,
+  scimToken,
+}: ScimTokenCreatedModalProps) {
+  const { t } = useTranslation();
+  if (!scimToken) return null;
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={onClose}
+      title={t("{{credential}} created", { credential: t("SCIM token") })}
+      size="lg"
+    >
+      <Stack gap="md">
+        <Alert
+          icon={<IconAlertTriangle size={16} />}
+          title={t("Important")}
+          color="red"
+        >
+          {t(
+            "Make sure to copy your {{credential}} now. You won't be able to see it again!",
+            { credential: t("SCIM token") },
+          )}
+        </Alert>
+
+        <div>
+          <Text size="sm" fw={500} mb="xs">
+            {t("SCIM token")}
+          </Text>
+          <Group gap="xs" wrap="nowrap">
+            <TextInput
+              variant="filled"
+              style={{ flex: 1 }}
+              value={scimToken.token}
+              readOnly
+            />
+            <CopyTextButton text={scimToken.token} />
+          </Group>
+        </div>
+
+        <Button fullWidth onClick={onClose} mt="md">
+          {t("I've saved my {{credential}}", { credential: t("SCIM token") })}
+        </Button>
+      </Stack>
+    </Modal>
+  );
+}

apps/client/src/ee/scim/components/scim-token-table.tsx

@@ -0,0 +1,130 @@
+import { ActionIcon, Group, Menu, Table, Text } from "@mantine/core";
+import { IconDots, IconEdit, IconTrash } from "@tabler/icons-react";
+import { format } from "date-fns";
+import { useTranslation } from "react-i18next";
+import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
+import React from "react";
+import NoTableResults from "@/components/common/no-table-results";
+import { IScimToken } from "@/ee/scim/types/scim-token.types";
+
+interface ScimTokenTableProps {
+  tokens: IScimToken[];
+  isLoading?: boolean;
+  onUpdate?: (token: IScimToken) => void;
+  onRevoke?: (token: IScimToken) => void;
+}
+
+export function ScimTokenTable({
+  tokens,
+  isLoading,
+  onUpdate,
+  onRevoke,
+}: ScimTokenTableProps) {
+  const { t } = useTranslation();
+
+  const formatDate = (date: Date | string | null) => {
+    if (!date) return t("Never");
+    return format(new Date(date), "MMM dd, yyyy");
+  };
+
+  return (
+    <Table.ScrollContainer minWidth={500}>
+      <Table highlightOnHover verticalSpacing="sm">
+        <Table.Thead>
+          <Table.Tr>
+            <Table.Th>{t("Name")}</Table.Th>
+            <Table.Th>{t("Token")}</Table.Th>
+            <Table.Th>{t("Created by")}</Table.Th>
+            <Table.Th>{t("Last used")}</Table.Th>
+            <Table.Th>{t("Created")}</Table.Th>
+            <Table.Th></Table.Th>
+          </Table.Tr>
+        </Table.Thead>
+
+        <Table.Tbody>
+          {tokens && tokens.length > 0 ? (
+            tokens.map((token) => (
+              <Table.Tr key={token.id}>
+                <Table.Td>
+                  <Text fz="sm" fw={500}>
+                    {token.name}
+                  </Text>
+                </Table.Td>
+
+                <Table.Td>
+                  <Text fz="sm" ff="monospace" c="dimmed">
+                    ••••{token.tokenLastFour}
+                  </Text>
+                </Table.Td>
+
+                {token.creator ? (
+                  <Table.Td>
+                    <Group gap="4" wrap="nowrap">
+                      <CustomAvatar
+                        avatarUrl={token.creator?.avatarUrl}
+                        name={token.creator.name}
+                        size="sm"
+                      />
+                      <Text fz="sm" lineClamp={1}>
+                        {token.creator.name}
+                      </Text>
+                    </Group>
+                  </Table.Td>
+                ) : (
+                  <Table.Td>
+                    <Text fz="sm" c="dimmed">
+                      —
+                    </Text>
+                  </Table.Td>
+                )}
+
+                <Table.Td>
+                  <Text fz="sm" style={{ whiteSpace: "nowrap" }}>
+                    {formatDate(token.lastUsedAt)}
+                  </Text>
+                </Table.Td>
+
+                <Table.Td>
+                  <Text fz="sm" style={{ whiteSpace: "nowrap" }}>
+                    {formatDate(token.createdAt)}
+                  </Text>
+                </Table.Td>
+
+                <Table.Td>
+                  <Menu position="bottom-end" withinPortal>
+                    <Menu.Target>
+                      <ActionIcon variant="subtle" color="gray">
+                        <IconDots size={16} />
+                      </ActionIcon>
+                    </Menu.Target>
+                    <Menu.Dropdown>
+                      {onUpdate && (
+                        <Menu.Item
+                          leftSection={<IconEdit size={16} />}
+                          onClick={() => onUpdate(token)}
+                        >
+                          {t("Rename")}
+                        </Menu.Item>
+                      )}
+                      {onRevoke && (
+                        <Menu.Item
+                          leftSection={<IconTrash size={16} />}
+                          color="red"
+                          onClick={() => onRevoke(token)}
+                        >
+                          {t("Revoke")}
+                        </Menu.Item>
+                      )}
+                    </Menu.Dropdown>
+                  </Menu>
+                </Table.Td>
+              </Table.Tr>
+            ))
+          ) : (
+            <NoTableResults colSpan={6} />
+          )}
+        </Table.Tbody>
+      </Table>
+    </Table.ScrollContainer>
+  );
+}

apps/client/src/ee/scim/components/scim-url-panel.tsx

@@ -0,0 +1,30 @@
+import { Group, Stack, Text, TextInput } from "@mantine/core";
+import { useTranslation } from "react-i18next";
+import CopyTextButton from "@/components/common/copy.tsx";
+
+export function ScimUrlPanel() {
+  const { t } = useTranslation();
+  const scimUrl = `${window.location.origin}/api/scim/v2`;
+
+  return (
+    <Stack gap="xs">
+      <Text size="sm" fw={500}>
+        {t("SCIM endpoint URL")}
+      </Text>
+      <Text size="xs" c="dimmed">
+        {t(
+          "Configure your identity provider with this URL to provision users and groups.",
+        )}
+      </Text>
+      <Group gap="xs" wrap="nowrap">
+        <TextInput
+          variant="filled"
+          style={{ flex: 1 }}
+          value={scimUrl}
+          readOnly
+        />
+        <CopyTextButton text={scimUrl} />
+      </Group>
+    </Stack>
+  );
+}

apps/client/src/ee/scim/components/update-scim-token-modal.tsx

@@ -0,0 +1,77 @@
+import { Modal, TextInput, Button, Group, Stack } from "@mantine/core";
+import { useForm } from "@mantine/form";
+import { zod4Resolver } from "mantine-form-zod-resolver";
+import { z } from "zod/v4";
+import { useTranslation } from "react-i18next";
+import { useEffect } from "react";
+import { useUpdateScimTokenMutation } from "@/ee/scim/queries/scim-token-query";
+import { IScimToken } from "@/ee/scim/types/scim-token.types";
+
+const formSchema = z.object({
+  name: z.string().min(1, "Name is required"),
+});
+type FormValues = z.infer<typeof formSchema>;
+
+interface UpdateScimTokenModalProps {
+  opened: boolean;
+  onClose: () => void;
+  scimToken: IScimToken | null;
+}
+
+export function UpdateScimTokenModal({
+  opened,
+  onClose,
+  scimToken,
+}: UpdateScimTokenModalProps) {
+  const { t } = useTranslation();
+  const updateMutation = useUpdateScimTokenMutation();
+
+  const form = useForm<FormValues>({
+    validate: zod4Resolver(formSchema),
+    initialValues: { name: "" },
+  });
+
+  useEffect(() => {
+    if (opened && scimToken) {
+      form.setValues({ name: scimToken.name });
+    }
+  }, [opened, scimToken]);
+
+  const handleSubmit = async (data: FormValues) => {
+    if (!scimToken) return;
+    await updateMutation.mutateAsync({
+      tokenId: scimToken.id,
+      name: data.name,
+    });
+    onClose();
+  };
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={onClose}
+      title={t("Update {{credential}}", { credential: t("SCIM token") })}
+      size="md"
+    >
+      <form onSubmit={form.onSubmit((values) => handleSubmit(values))}>
+        <Stack gap="md">
+          <TextInput
+            label={t("Name")}
+            placeholder={t("Enter a descriptive name")}
+            required
+            {...form.getInputProps("name")}
+          />
+
+          <Group justify="flex-end" mt="md">
+            <Button variant="default" onClick={onClose}>
+              {t("Cancel")}
+            </Button>
+            <Button type="submit" loading={updateMutation.isPending}>
+              {t("Update")}
+            </Button>
+          </Group>
+        </Stack>
+      </form>
+    </Modal>
+  );
+}

apps/client/src/ee/scim/index.ts

@@ -0,0 +1,2 @@
+export * from "./types/scim-token.types";
+export * from "./services/scim-token-service";

apps/client/src/ee/scim/queries/scim-token-query.ts

@@ -0,0 +1,96 @@
+import { IPagination, QueryParams } from "@/lib/types.ts";
+import {
+  keepPreviousData,
+  useMutation,
+  useQuery,
+  useQueryClient,
+  UseQueryResult,
+} from "@tanstack/react-query";
+import {
+  createScimToken,
+  getScimTokens,
+  revokeScimToken,
+  updateScimToken,
+} from "@/ee/scim/services/scim-token-service";
+import {
+  IScimToken,
+  ICreateScimTokenRequest,
+  IRevokeScimTokenRequest,
+  IUpdateScimTokenRequest,
+} from "@/ee/scim/types/scim-token.types";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
+
+export function useGetScimTokensQuery(
+  params?: QueryParams,
+): UseQueryResult<IPagination<IScimToken>, Error> {
+  return useQuery({
+    queryKey: ["scim-token-list", params],
+    queryFn: () => getScimTokens(params),
+    placeholderData: keepPreviousData,
+  });
+}
+
+export function useCreateScimTokenMutation() {
+  const queryClient = useQueryClient();
+  const { t } = useTranslation();
+
+  return useMutation<IScimToken, Error, ICreateScimTokenRequest>({
+    mutationFn: (data) => createScimToken(data),
+    onSuccess: () => {
+      notifications.show({
+        message: t("{{credential}} created successfully", {
+          credential: t("SCIM token"),
+        }),
+      });
+      queryClient.invalidateQueries({
+        predicate: (item) =>
+          ["scim-token-list"].includes(item.queryKey[0] as string),
+      });
+    },
+    onError: (error) => {
+      const errorMessage = error["response"]?.data?.message;
+      notifications.show({ message: errorMessage, color: "red" });
+    },
+  });
+}
+
+export function useUpdateScimTokenMutation() {
+  const queryClient = useQueryClient();
+  const { t } = useTranslation();
+
+  return useMutation<void, Error, IUpdateScimTokenRequest>({
+    mutationFn: (data) => updateScimToken(data),
+    onSuccess: () => {
+      notifications.show({ message: t("Updated successfully") });
+      queryClient.invalidateQueries({
+        predicate: (item) =>
+          ["scim-token-list"].includes(item.queryKey[0] as string),
+      });
+    },
+    onError: (error) => {
+      const errorMessage = error["response"]?.data?.message;
+      notifications.show({ message: errorMessage, color: "red" });
+    },
+  });
+}
+
+export function useRevokeScimTokenMutation() {
+  const queryClient = useQueryClient();
+  const { t } = useTranslation();
+
+  return useMutation<void, Error, IRevokeScimTokenRequest>({
+    mutationFn: (data) => revokeScimToken(data),
+    onSuccess: () => {
+      notifications.show({ message: t("Revoked successfully") });
+      queryClient.invalidateQueries({
+        predicate: (item) =>
+          ["scim-token-list"].includes(item.queryKey[0] as string),
+      });
+    },
+    onError: (error) => {
+      const errorMessage = error["response"]?.data?.message;
+      notifications.show({ message: errorMessage, color: "red" });
+    },
+  });
+}

apps/client/src/ee/scim/services/scim-token-service.ts

@@ -0,0 +1,34 @@
+import api from "@/lib/api-client";
+import {
+  IScimToken,
+  ICreateScimTokenRequest,
+  IRevokeScimTokenRequest,
+  IUpdateScimTokenRequest,
+} from "@/ee/scim/types/scim-token.types";
+import { IPagination, QueryParams } from "@/lib/types.ts";
+
+export async function getScimTokens(
+  params?: QueryParams,
+): Promise<IPagination<IScimToken>> {
+  const req = await api.post("/scim-tokens", { ...params });
+  return req.data;
+}
+
+export async function createScimToken(
+  data: ICreateScimTokenRequest,
+): Promise<IScimToken> {
+  const req = await api.post<IScimToken>("/scim-tokens/create", data);
+  return req.data;
+}
+
+export async function updateScimToken(
+  data: IUpdateScimTokenRequest,
+): Promise<void> {
+  await api.post("/scim-tokens/update", data);
+}
+
+export async function revokeScimToken(
+  data: IRevokeScimTokenRequest,
+): Promise<void> {
+  await api.post("/scim-tokens/revoke", data);
+}

apps/client/src/ee/scim/types/scim-token.types.ts

@@ -0,0 +1,27 @@
+import { IUser } from "@/features/user/types/user.types.ts";
+
+export interface IScimToken {
+  id: string;
+  name: string;
+  token?: string;
+  tokenLastFour: string;
+  isEnabled: boolean;
+  creatorId: string;
+  workspaceId: string;
+  lastUsedAt: string | null;
+  createdAt: string;
+  creator?: Partial<IUser>;
+}
+
+export interface ICreateScimTokenRequest {
+  name: string;
+}
+
+export interface IUpdateScimTokenRequest {
+  tokenId: string;
+  name: string;
+}
+
+export interface IRevokeScimTokenRequest {
+  tokenId: string;
+}

apps/client/src/ee/security/components/sso-provider-list.tsx

@@ -69,8 +69,8 @@ export default function SsoProviderList() {
   return (
     <>
       <Card shadow="sm" radius="sm">
-        <Table.ScrollContainer minWidth={600}>
+        <Table.ScrollContainer minWidth={600} maxHeight={400}>
-          <Table verticalSpacing="sm">
+          <Table verticalSpacing="sm" stickyHeader>
             <Table.Thead>
               <Table.Tr>
                 <Table.Th>{t("Name")}</Table.Th>

apps/client/src/ee/security/pages/security.tsx

@@ -1,8 +1,18 @@
 import { Helmet } from "react-helmet-async";
 import { getAppName, isCloud } from "@/lib/config.ts";
 import SettingsTitle from "@/components/settings/settings-title.tsx";
-import { Divider, Title } from "@mantine/core";
+import {
-import React from "react";
+  Alert,
+  Button,
+  Card,
+  Divider,
+  Group,
+  Space,
+  Title,
+  Tooltip,
+} from "@mantine/core";
+import { IconInfoCircle } from "@tabler/icons-react";
+import React, { useState } from "react";
 import useUserRole from "@/hooks/use-user-role.tsx";
 import SsoProviderList from "@/ee/security/components/sso-provider-list.tsx";
 import CreateSsoProvider from "@/ee/security/components/create-sso-provider.tsx";
@@ -12,16 +22,41 @@ import { useTranslation } from "react-i18next";
 import EnforceMfa from "@/ee/security/components/enforce-mfa.tsx";
 import DisablePublicSharing from "@/ee/security/components/disable-public-sharing.tsx";
 import TrashRetention from "@/ee/security/components/trash-retention.tsx";
-
+import { useAtom } from "jotai";
+import { workspaceAtom } from "@/features/user/atoms/current-user-atom.ts";
 import { useHasFeature } from "@/ee/hooks/use-feature";
 import { Feature } from "@/ee/features";
+import { useGetScimTokensQuery } from "@/ee/scim/queries/scim-token-query";
+import { ScimUrlPanel } from "@/ee/scim/components/scim-url-panel";
+import { ScimTokenTable } from "@/ee/scim/components/scim-token-table";
+import { CreateScimTokenModal } from "@/ee/scim/components/create-scim-token-modal";
+import { ScimTokenCreatedModal } from "@/ee/scim/components/scim-token-created-modal";
+import { RevokeScimTokenModal } from "@/ee/scim/components/revoke-scim-token-modal";
+import { UpdateScimTokenModal } from "@/ee/scim/components/update-scim-token-modal";
+import EnableScim from "@/ee/scim/components/enable-scim";
+import { useCursorPaginate } from "@/hooks/use-cursor-paginate";
+import Paginate from "@/components/common/paginate";
+import { IScimToken } from "@/ee/scim/types/scim-token.types";
+
+const SCIM_TOKEN_LIMIT = 5;
 
 export default function Security() {
   const { t } = useTranslation();
   const { isAdmin } = useUserRole();
   const hasCustomSso = useHasFeature(Feature.SSO_CUSTOM);
-  const hasRetention = useHasFeature(Feature.RETENTION);
+  const hasScim = useHasFeature(Feature.SCIM);
-  const hasSharingControls = useHasFeature(Feature.SHARING_CONTROLS);
+  const [workspace] = useAtom(workspaceAtom);
+  const isScimEnabled = workspace?.isScimEnabled ?? false;
+
+  const { cursor, goNext, goPrev } = useCursorPaginate();
+  const { data: scimData, isLoading: scimLoading } = useGetScimTokensQuery(
+    hasScim && isScimEnabled ? { cursor } : undefined,
+  );
+
+  const [createOpen, setCreateOpen] = useState(false);
+  const [createdToken, setCreatedToken] = useState<IScimToken | null>(null);
+  const [updateTarget, setUpdateTarget] = useState<IScimToken | null>(null);
+  const [revokeTarget, setRevokeTarget] = useState<IScimToken | null>(null);
 
   if (!isAdmin) {
     return null;
@@ -45,7 +80,7 @@ export default function Security() {
       <Divider my="lg" />
 
       <Title order={4} my="lg">
-        Single sign-on (SSO)
+        {t("Single sign-on (SSO)")}
       </Title>
 
       <EnforceSso />
@@ -66,6 +101,102 @@ export default function Security() {
       )}
 
       <SsoProviderList />
+
+      {hasScim && (
+        <>
+          <Divider my="xl" />
+
+          <Title order={4} my="lg">
+            {t("SCIM provisioning")}
+          </Title>
+
+          <Alert
+            icon={<IconInfoCircle size={16} />}
+            color="blue"
+            variant="light"
+            mb="md"
+          >
+            {t("SCIM takes precedence over SSO group sync while enabled.")}
+          </Alert>
+
+          <EnableScim />
+
+          <Divider my="lg" />
+
+          <ScimUrlPanel />
+
+          {isScimEnabled && (
+            <>
+              <Divider my="lg" />
+
+              <Group justify="space-between" mb="md">
+                <Title order={5}>{t("SCIM tokens")}</Title>
+                <Tooltip
+                  label={t(
+                    "You have reached the maximum of {{max}} SCIM tokens. Delete an existing token to create a new one.",
+                    { max: SCIM_TOKEN_LIMIT },
+                  )}
+                  disabled={(scimData?.items.length ?? 0) < SCIM_TOKEN_LIMIT}
+                  refProp="rootRef"
+                >
+                  <Button
+                    onClick={() => setCreateOpen(true)}
+                    disabled={(scimData?.items.length ?? 0) >= SCIM_TOKEN_LIMIT}
+                  >
+                    {t("Create {{credential}}", {
+                      credential: t("SCIM token"),
+                    })}
+                  </Button>
+                </Tooltip>
+              </Group>
+
+              <Card shadow="sm" radius="sm">
+                <ScimTokenTable
+                  tokens={scimData?.items}
+                  isLoading={scimLoading}
+                  onUpdate={setUpdateTarget}
+                  onRevoke={setRevokeTarget}
+                />
+              </Card>
+
+              <Space h="md" />
+
+              {scimData?.items.length > 0 && (
+                <Paginate
+                  hasPrevPage={scimData?.meta?.hasPrevPage}
+                  hasNextPage={scimData?.meta?.hasNextPage}
+                  onNext={() => goNext(scimData?.meta?.nextCursor)}
+                  onPrev={goPrev}
+                />
+              )}
+
+              <CreateScimTokenModal
+                opened={createOpen}
+                onClose={() => setCreateOpen(false)}
+                onSuccess={setCreatedToken}
+              />
+
+              <ScimTokenCreatedModal
+                opened={!!createdToken}
+                onClose={() => setCreatedToken(null)}
+                scimToken={createdToken}
+              />
+
+              <UpdateScimTokenModal
+                opened={!!updateTarget}
+                onClose={() => setUpdateTarget(null)}
+                scimToken={updateTarget}
+              />
+
+              <RevokeScimTokenModal
+                opened={!!revokeTarget}
+                onClose={() => setRevokeTarget(null)}
+                scimToken={revokeTarget}
+              />
+            </>
+          )}
+        </>
+      )}
     </>
   );
 }

apps/client/src/features/base/atoms/base-atoms.ts

@@ -1,15 +0,0 @@
-import { atom } from "jotai";
-import { EditingCell } from "@/features/base/types/base.types";
-
-export const activeViewIdAtom = atom<string | null>(null);
-
-export const editingCellAtom = atom<EditingCell>(null);
-
-export const activePropertyMenuAtom = atom<string | null>(null);
-
-export const propertyMenuDirtyAtom = atom<boolean>(false);
-
-export const propertyMenuCloseRequestAtom = atom<number>(0);
-
-export const selectedRowIdsAtom = atom<Set<string>>(new Set<string>());
-export const lastToggledRowIndexAtom = atom<number | null>(null);

apps/client/src/features/base/components/base-table-skeleton.tsx

@@ -1,84 +0,0 @@
-import { Skeleton } from "@mantine/core";
-import gridClasses from "@/features/base/styles/grid.module.css";
-import classes from "@/features/base/styles/base-table-skeleton.module.css";
-
-const ROW_NUMBER_WIDTH = 64;
-const COLUMN_WIDTH = 180;
-const COLUMN_COUNT = 6;
-const ROW_COUNT = 10;
-
-// Deterministic per-cell widths so the skeleton doesn't flicker between
-// renders. Values are rough normal distribution around 55-85 % of cell.
-const CELL_WIDTH_RATIOS = [0.78, 0.62, 0.84, 0.55, 0.71, 0.66];
-const HEADER_WIDTH_RATIOS = [0.42, 0.58, 0.5, 0.64, 0.46, 0.54];
-
-export function BaseTableSkeleton() {
-  const gridTemplateColumns = [
-    `${ROW_NUMBER_WIDTH}px`,
-    ...Array.from({ length: COLUMN_COUNT }, () => `${COLUMN_WIDTH}px`),
-  ].join(" ");
-
-  return (
-    <div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
-      <div className={classes.toolbar}>
-        <div className={classes.toolbarTabs}>
-          <Skeleton height={22} width={44} radius="sm" />
-          <Skeleton height={22} width={64} radius="sm" />
-          <Skeleton height={22} width={48} radius="sm" />
-        </div>
-        <div className={classes.toolbarActions}>
-          <Skeleton height={22} width={22} circle />
-          <Skeleton height={22} width={22} circle />
-          <Skeleton height={22} width={22} circle />
-          <Skeleton height={22} width={22} circle />
-        </div>
-      </div>
-
-      <div className={classes.gridWrapper}>
-        <div className={classes.grid} style={{ gridTemplateColumns }}>
-          <div className={gridClasses.headerCell}>
-            <div className={classes.headerCellInner}>
-              <Skeleton height={14} width={14} circle />
-            </div>
-          </div>
-          {Array.from({ length: COLUMN_COUNT }).map((_, colIndex) => (
-            <div key={`h-${colIndex}`} className={gridClasses.headerCell}>
-              <div className={classes.headerCellInner}>
-                <Skeleton height={14} width={14} circle />
-                <Skeleton
-                  height={10}
-                  width={`${HEADER_WIDTH_RATIOS[colIndex] * 100}%`}
-                  radius="sm"
-                />
-              </div>
-            </div>
-          ))}
-
-          {Array.from({ length: ROW_COUNT }).map((_, rowIndex) => (
-            <div key={`row-${rowIndex}`} style={{ display: "contents" }}>
-              <div className={gridClasses.cell}>
-                <div className={classes.cellInner}>
-                  <Skeleton height={10} width={18} radius="sm" />
-                </div>
-              </div>
-              {Array.from({ length: COLUMN_COUNT }).map((_, colIndex) => (
-                <div
-                  key={`cell-${rowIndex}-${colIndex}`}
-                  className={gridClasses.cell}
-                >
-                  <div className={classes.cellInner}>
-                    <Skeleton
-                      height={10}
-                      width={`${CELL_WIDTH_RATIOS[(rowIndex + colIndex) % CELL_WIDTH_RATIOS.length] * 100}%`}
-                      radius="sm"
-                    />
-                  </div>
-                </div>
-              ))}
-            </div>
-          ))}
-        </div>
-      </div>
-    </div>
-  );
-}

apps/client/src/features/base/components/base-table.tsx

@@ -1,216 +0,0 @@
-import { useCallback, useEffect, useMemo } from "react";
-import { Text, Stack } from "@mantine/core";
-import { useAtom } from "jotai";
-import { IconDatabase } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { arrayMove } from "@dnd-kit/sortable";
-import { generateJitteredKeyBetween } from "fractional-indexing-jittered";
-import { useBaseQuery } from "@/features/base/queries/base-query";
-import { useBaseSocket } from "@/features/base/hooks/use-base-socket";
-import {
-  useBaseRowsQuery,
-  flattenRows,
-} from "@/features/base/queries/base-row-query";
-import { useUpdateRowMutation } from "@/features/base/queries/base-row-query";
-import { useCreateRowMutation } from "@/features/base/queries/base-row-query";
-import { useReorderRowMutation } from "@/features/base/queries/base-row-query";
-import { useCreateViewMutation } from "@/features/base/queries/base-view-query";
-import { activeViewIdAtom } from "@/features/base/atoms/base-atoms";
-import { useBaseTable } from "@/features/base/hooks/use-base-table";
-import { useRowSelection } from "@/features/base/hooks/use-row-selection";
-import { GridContainer } from "@/features/base/components/grid/grid-container";
-import { BaseToolbar } from "@/features/base/components/base-toolbar";
-import { BaseTableSkeleton } from "@/features/base/components/base-table-skeleton";
-import classes from "@/features/base/styles/grid.module.css";
-
-type BaseTableProps = {
-  baseId: string;
-};
-
-export function BaseTable({ baseId }: BaseTableProps) {
-  const { t } = useTranslation();
-  // Subscribe to the base's realtime room so other clients' edits,
-  // schema changes, and async-job completions reconcile into our cache.
-  useBaseSocket(baseId);
-  const { data: base, isLoading: baseLoading, error: baseError } = useBaseQuery(baseId);
-
-  const [activeViewId, setActiveViewId] = useAtom(activeViewIdAtom) as unknown as [string | null, (val: string | null) => void];
-
-  const views = base?.views ?? [];
-  const activeView = useMemo(() => {
-    if (!views.length) return undefined;
-    return views.find((v) => v.id === activeViewId) ?? views[0];
-  }, [views, activeViewId]);
-
-  const activeFilter = activeView?.config?.filter;
-  const activeSorts = activeView?.config?.sorts;
-  // Hold the rows query until `base` has loaded. Otherwise the query
-  // fires once with `activeFilter` / `activeSorts` still undefined
-  // (a "bland" list request), then fires a second time as soon as the
-  // active view's config resolves — doubling network traffic on every
-  // base open for any view that has sort or filter.
-  const { data: rowsData, isLoading: rowsLoading, fetchNextPage, hasNextPage, isFetchingNextPage } =
-    useBaseRowsQuery(base ? baseId : undefined, activeFilter, activeSorts);
-
-  const updateRowMutation = useUpdateRowMutation();
-  const createRowMutation = useCreateRowMutation();
-  const reorderRowMutation = useReorderRowMutation();
-  const createViewMutation = useCreateViewMutation();
-
-  useEffect(() => {
-    if (activeView && activeViewId !== activeView.id) {
-      setActiveViewId(activeView.id);
-    }
-  }, [activeView, activeViewId, setActiveViewId]);
-
-  const { clear: clearSelection } = useRowSelection();
-  useEffect(() => {
-    clearSelection();
-  }, [baseId, activeView?.id, clearSelection]);
-
-  const rows = useMemo(() => {
-    const flat = flattenRows(rowsData);
-    // When a sort is active, the server returns rows in the requested
-    // sort order via keyset pagination. Re-sorting by `position` on the
-    // client would override that with fractional-index order — visibly
-    // breaking the sort as more pages load. Only apply the position
-    // sort when no view sort is active (where it keeps
-    // optimistically-created and ws-pushed rows in place without a
-    // refetch).
-    if (activeSorts && activeSorts.length > 0) {
-      return flat;
-    }
-    return flat.sort((a, b) =>
-      a.position < b.position ? -1 : a.position > b.position ? 1 : 0,
-    );
-  }, [rowsData, activeSorts]);
-
-  const { table, persistViewConfig } = useBaseTable(base, rows, activeView);
-
-  const handleCellUpdate = useCallback(
-    (rowId: string, propertyId: string, value: unknown) => {
-      updateRowMutation.mutate({
-        rowId,
-        baseId,
-        cells: { [propertyId]: value },
-      });
-    },
-    [baseId, updateRowMutation],
-  );
-
-  const handleAddRow = useCallback(() => {
-    createRowMutation.mutate({ baseId });
-  }, [baseId, createRowMutation]);
-
-  const handleViewChange = useCallback(
-    (viewId: string) => {
-      setActiveViewId(viewId);
-    },
-    [setActiveViewId],
-  );
-
-  const handleAddView = useCallback(() => {
-    createViewMutation.mutate({
-      baseId,
-      name: t("New view"),
-      type: "table",
-    });
-  }, [baseId, createViewMutation, t]);
-
-  const handleColumnReorder = useCallback(
-    (activeId: string, overId: string) => {
-      const currentOrder = table.getState().columnOrder;
-      const oldIndex = currentOrder.indexOf(activeId);
-      const newIndex = currentOrder.indexOf(overId);
-      if (oldIndex === -1 || newIndex === -1) return;
-
-      const newOrder = arrayMove(currentOrder, oldIndex, newIndex);
-      table.setColumnOrder(newOrder);
-      persistViewConfig();
-    },
-    [table, persistViewConfig],
-  );
-
-  const handleResizeEnd = useCallback(() => {
-    persistViewConfig();
-  }, [persistViewConfig]);
-
-  const handleRowReorder = useCallback(
-    (rowId: string, targetRowId: string, dropPosition: "above" | "below") => {
-      const remainingRows = rows.filter((r) => r.id !== rowId);
-      const targetIndex = remainingRows.findIndex((r) => r.id === targetRowId);
-      if (targetIndex === -1) return;
-
-      let lowerPos: string | null = null;
-      let upperPos: string | null = null;
-
-      if (dropPosition === "above") {
-        lowerPos = targetIndex > 0 ? remainingRows[targetIndex - 1]?.position : null;
-        upperPos = remainingRows[targetIndex]?.position ?? null;
-      } else {
-        lowerPos = remainingRows[targetIndex]?.position ?? null;
-        upperPos = targetIndex < remainingRows.length - 1 ? remainingRows[targetIndex + 1]?.position : null;
-      }
-
-      try {
-        let newPosition: string;
-        if (lowerPos && upperPos && lowerPos === upperPos) {
-          newPosition = generateJitteredKeyBetween(lowerPos, null);
-        } else {
-          newPosition = generateJitteredKeyBetween(lowerPos, upperPos);
-        }
-
-        reorderRowMutation.mutate({
-          rowId,
-          baseId,
-          position: newPosition,
-        });
-      } catch {
-        // Position computation failed — skip silently
-      }
-    },
-    [rows, baseId, reorderRowMutation],
-  );
-
-  if (baseLoading || rowsLoading) {
-    return <BaseTableSkeleton />;
-  }
-
-  if (baseError) {
-    return (
-      <Stack align="center" gap="sm" p="xl">
-        <IconDatabase size={40} color="var(--mantine-color-gray-5)" />
-        <Text c="dimmed">{t("Failed to load base")}</Text>
-      </Stack>
-    );
-  }
-
-  if (!base) return null;
-
-  return (
-    <div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
-      <BaseToolbar
-        base={base}
-        activeView={activeView}
-        views={views}
-        table={table}
-        onViewChange={handleViewChange}
-        onAddView={handleAddView}
-        onPersistViewConfig={persistViewConfig}
-      />
-      <GridContainer
-        table={table}
-        properties={base.properties}
-        onCellUpdate={handleCellUpdate}
-        onAddRow={handleAddRow}
-        baseId={baseId}
-        onColumnReorder={handleColumnReorder}
-        onResizeEnd={handleResizeEnd}
-        onRowReorder={handleRowReorder}
-        hasNextPage={hasNextPage}
-        isFetchingNextPage={isFetchingNextPage}
-        onFetchNextPage={fetchNextPage}
-      />
-    </div>
-  );
-}

apps/client/src/features/base/components/base-toolbar.tsx

@@ -1,310 +0,0 @@
-import { useEffect, useRef, useState, useCallback, useMemo } from "react";
-import { ActionIcon, Tooltip, Badge } from "@mantine/core";
-import { Table } from "@tanstack/react-table";
-import {
-  IconSortAscending,
-  IconFilter,
-  IconEye,
-  IconDownload,
-} from "@tabler/icons-react";
-import { notifications } from "@mantine/notifications";
-import {
-  IBase,
-  IBaseRow,
-  IBaseView,
-  ViewSortConfig,
-  FilterCondition,
-  FilterGroup,
-} from "@/features/base/types/base.types";
-import { useUpdateViewMutation } from "@/features/base/queries/base-view-query";
-import { buildViewConfigFromTable } from "@/features/base/hooks/use-base-table";
-import { exportBaseToCsv } from "@/features/base/services/base-service";
-import { ViewTabs } from "@/features/base/components/views/view-tabs";
-import { ViewSortConfigPopover } from "@/features/base/components/views/view-sort-config";
-import { ViewFilterConfigPopover } from "@/features/base/components/views/view-filter-config";
-import { ViewFieldVisibility } from "@/features/base/components/views/view-field-visibility";
-import { useTranslation } from "react-i18next";
-import classes from "@/features/base/styles/grid.module.css";
-
-type BaseToolbarProps = {
-  base: IBase;
-  activeView: IBaseView | undefined;
-  views: IBaseView[];
-  table: Table<IBaseRow>;
-  onViewChange: (viewId: string) => void;
-  onAddView?: () => void;
-  onPersistViewConfig: () => void;
-};
-
-export function BaseToolbar({
-  base,
-  activeView,
-  views,
-  table,
-  onViewChange,
-  onAddView,
-  onPersistViewConfig,
-}: BaseToolbarProps) {
-  const { t } = useTranslation();
-  const [sortOpened, setSortOpened] = useState(false);
-  const [filterOpened, setFilterOpened] = useState(false);
-  const [fieldsOpened, setFieldsOpened] = useState(false);
-  const [exporting, setExporting] = useState(false);
-  const toolbarRightRef = useRef<HTMLDivElement>(null);
-
-  // Mantine `<Popover>`'s built-in dismiss handlers don't fire reliably
-  // for the toolbar popovers (same issue that drove the property menu to
-  // use custom listeners in `grid-container.tsx`). Close any open toolbar
-  // popover on outside mousedown AND on ESC.
-  useEffect(() => {
-    if (!sortOpened && !filterOpened && !fieldsOpened) return;
-    const closeAll = () => {
-      setSortOpened(false);
-      setFilterOpened(false);
-      setFieldsOpened(false);
-    };
-    const mouseHandler = (e: MouseEvent) => {
-      const target = e.target as HTMLElement | null;
-      if (!target) return;
-      if (toolbarRightRef.current?.contains(target)) return;
-      // Ignore clicks that land inside any Mantine popover dropdown
-      // (role=dialog), any Select/Combobox dropdown (role=listbox, the
-      // container; option elements have role=option), or anything
-      // rendered into Mantine's shared portal node. Without these, a
-      // nested Select inside the popover would close the parent.
-      if (target.closest('[role="dialog"]')) return;
-      if (target.closest('[role="listbox"]')) return;
-      if (target.closest('[role="option"]')) return;
-      if (target.closest("[data-mantine-shared-portal-node]")) return;
-      closeAll();
-    };
-    const keyHandler = (e: KeyboardEvent) => {
-      if (e.key === "Escape") closeAll();
-    };
-    const id = setTimeout(() => {
-      document.addEventListener("mousedown", mouseHandler);
-    }, 0);
-    document.addEventListener("keydown", keyHandler);
-    return () => {
-      clearTimeout(id);
-      document.removeEventListener("mousedown", mouseHandler);
-      document.removeEventListener("keydown", keyHandler);
-    };
-  }, [sortOpened, filterOpened, fieldsOpened]);
-
-  const handleExport = useCallback(async () => {
-    if (exporting) return;
-    setExporting(true);
-    try {
-      await exportBaseToCsv(base.id);
-    } catch (err) {
-      notifications.show({
-        color: "red",
-        message: t("Failed to export CSV"),
-      });
-    } finally {
-      setExporting(false);
-    }
-  }, [base.id, exporting, t]);
-
-  const openToolbar = useCallback((panel: "sort" | "filter" | "fields") => {
-    setSortOpened(panel === "sort" ? (v) => !v : false);
-    setFilterOpened(panel === "filter" ? (v) => !v : false);
-    setFieldsOpened(panel === "fields" ? (v) => !v : false);
-  }, []);
-
-  const updateViewMutation = useUpdateViewMutation();
-
-  const sorts = activeView?.config?.sorts ?? [];
-  // Stored view config uses the engine's filter tree. The popover edits
-  // an AND-only flat list; we unwrap the top-level group's children when
-  // reading and rewrap on save.
-  const conditions = useMemo<FilterCondition[]>(() => {
-    const filter = activeView?.config?.filter;
-    if (!filter || filter.op !== "and") return [];
-    return filter.children.filter(
-      (c): c is FilterCondition => !("children" in c),
-    );
-  }, [activeView?.config?.filter]);
-
-  const hiddenFieldCount = useMemo(() => {
-    const cols = table.getAllLeafColumns().filter((col) => col.id !== "__row_number");
-    return cols.filter((col) => col.getCanHide() && !col.getIsVisible()).length;
-  }, [table, table.getState().columnVisibility]);
-
-  const handleSortsChange = useCallback(
-    (newSorts: ViewSortConfig[]) => {
-      if (!activeView) return;
-      const config = buildViewConfigFromTable(table, activeView.config, {
-        sorts: newSorts,
-      });
-      updateViewMutation.mutate({
-        viewId: activeView.id,
-        baseId: base.id,
-        config,
-      });
-    },
-    [activeView, base.id, table, updateViewMutation],
-  );
-
-  const handleFiltersChange = useCallback(
-    (newConditions: FilterCondition[]) => {
-      if (!activeView) return;
-      const filter: FilterGroup | undefined =
-        newConditions.length > 0
-          ? { op: "and", children: newConditions }
-          : undefined;
-      // `filter: undefined` in overrides removes the filter key; the helper's
-      // spread-then-overrides order means `undefined` wins over any base filter.
-      const config = buildViewConfigFromTable(table, activeView.config, {
-        filter,
-      });
-      updateViewMutation.mutate({
-        viewId: activeView.id,
-        baseId: base.id,
-        config,
-      });
-    },
-    [activeView, base.id, table, updateViewMutation],
-  );
-
-  return (
-    <div className={classes.toolbar}>
-      <ViewTabs
-        views={views}
-        activeViewId={activeView?.id}
-        baseId={base.id}
-        onViewChange={onViewChange}
-        onAddView={onAddView}
-      />
-
-      <div className={classes.toolbarRight} ref={toolbarRightRef}>
-        <Tooltip label={t("Export CSV")}>
-          <ActionIcon
-            variant="subtle"
-            size="sm"
-            color="gray"
-            loading={exporting}
-            onClick={handleExport}
-          >
-            <IconDownload size={16} />
-          </ActionIcon>
-        </Tooltip>
-
-        <ViewFilterConfigPopover
-          opened={filterOpened}
-          onClose={() => setFilterOpened(false)}
-          conditions={conditions}
-          properties={base.properties}
-          onChange={handleFiltersChange}
-        >
-          <Tooltip label={t("Filter")}>
-            <ActionIcon
-              variant="subtle"
-              size="sm"
-              color={conditions.length > 0 ? "blue" : "gray"}
-              onClick={() => openToolbar("filter")}
-            >
-              <IconFilter size={16} />
-              {conditions.length > 0 && (
-                <Badge
-                  size="xs"
-                  circle
-                  color="blue"
-                  style={{
-                    position: "absolute",
-                    top: -2,
-                    right: -2,
-                    padding: 0,
-                    width: 14,
-                    height: 14,
-                    minWidth: 14,
-                    fontSize: 9,
-                  }}
-                >
-                  {conditions.length}
-                </Badge>
-              )}
-            </ActionIcon>
-          </Tooltip>
-        </ViewFilterConfigPopover>
-
-        <ViewSortConfigPopover
-          opened={sortOpened}
-          onClose={() => setSortOpened(false)}
-          sorts={sorts}
-          properties={base.properties}
-          onChange={handleSortsChange}
-        >
-          <Tooltip label={t("Sort")}>
-            <ActionIcon
-              variant="subtle"
-              size="sm"
-              color={sorts.length > 0 ? "blue" : "gray"}
-              onClick={() => openToolbar("sort")}
-            >
-              <IconSortAscending size={16} />
-              {sorts.length > 0 && (
-                <Badge
-                  size="xs"
-                  circle
-                  color="blue"
-                  style={{
-                    position: "absolute",
-                    top: -2,
-                    right: -2,
-                    padding: 0,
-                    width: 14,
-                    height: 14,
-                    minWidth: 14,
-                    fontSize: 9,
-                  }}
-                >
-                  {sorts.length}
-                </Badge>
-              )}
-            </ActionIcon>
-          </Tooltip>
-        </ViewSortConfigPopover>
-
-        <ViewFieldVisibility
-          opened={fieldsOpened}
-          onClose={() => setFieldsOpened(false)}
-          table={table}
-          properties={base.properties}
-          onPersist={onPersistViewConfig}
-        >
-          <Tooltip label={t("Hide fields")}>
-            <ActionIcon
-              variant="subtle"
-              size="sm"
-              color={hiddenFieldCount > 0 ? "blue" : "gray"}
-              onClick={() => openToolbar("fields")}
-            >
-              <IconEye size={16} />
-              {hiddenFieldCount > 0 && (
-                <Badge
-                  size="xs"
-                  circle
-                  color="blue"
-                  style={{
-                    position: "absolute",
-                    top: -2,
-                    right: -2,
-                    padding: 0,
-                    width: 14,
-                    height: 14,
-                    minWidth: 14,
-                    fontSize: 9,
-                  }}
-                >
-                  {hiddenFieldCount}
-                </Badge>
-              )}
-            </ActionIcon>
-          </Tooltip>
-        </ViewFieldVisibility>
-      </div>
-    </div>
-  );
-}

apps/client/src/features/base/components/cells/cell-checkbox.tsx

@@ -1,36 +0,0 @@
-import { useCallback } from "react";
-import { Checkbox } from "@mantine/core";
-import { IBaseProperty } from "@/features/base/types/base.types";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type CellCheckboxProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-export function CellCheckbox({
-  value,
-  onCommit,
-}: CellCheckboxProps) {
-  const checked = value === true;
-
-  const handleChange = useCallback(() => {
-    onCommit(!checked);
-  }, [checked, onCommit]);
-
-  return (
-    <div className={cellClasses.checkboxCell} onClick={handleChange}>
-      <Checkbox
-        checked={checked}
-        onChange={() => {}}
-        size="xs"
-        tabIndex={-1}
-        styles={{ input: { cursor: "pointer", pointerEvents: "none" } }}
-      />
-    </div>
-  );
-}

apps/client/src/features/base/components/cells/cell-created-at.tsx

@@ -1,34 +0,0 @@
-import { IBaseProperty } from "@/features/base/types/base.types";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type CellCreatedAtProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-function formatTimestamp(val: unknown): string {
-  if (typeof val !== "string" || !val) return "";
-  const date = new Date(val);
-  if (isNaN(date.getTime())) return "";
-  return date.toLocaleDateString(undefined, {
-    month: "short",
-    day: "numeric",
-    year: "numeric",
-    hour: "numeric",
-    minute: "2-digit",
-  });
-}
-
-export function CellCreatedAt({ value }: CellCreatedAtProps) {
-  const formatted = formatTimestamp(value);
-
-  if (!formatted) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return <span className={cellClasses.dateValue}>{formatted}</span>;
-}

apps/client/src/features/base/components/cells/cell-date.tsx

@@ -1,141 +0,0 @@
-import { useCallback } from "react";
-import { Popover } from "@mantine/core";
-import { DatePicker } from "@mantine/dates";
-import {
-  IBaseProperty,
-  DateTypeOptions,
-} from "@/features/base/types/base.types";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type CellDateProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-function formatDateDisplay(
-  dateStr: string | null | undefined,
-  options: DateTypeOptions | undefined,
-): string {
-  if (!dateStr) return "";
-  try {
-    const date = new Date(dateStr);
-    if (isNaN(date.getTime())) return "";
-
-    const months = [
-      "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-      "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
-    ];
-    const month = months[date.getMonth()];
-    const day = date.getDate();
-    const year = date.getFullYear();
-
-    let result = `${month} ${day}, ${year}`;
-
-    if (options?.includeTime) {
-      if (options.timeFormat === "24h") {
-        const hours = String(date.getHours()).padStart(2, "0");
-        const minutes = String(date.getMinutes()).padStart(2, "0");
-        result += ` ${hours}:${minutes}`;
-      } else {
-        let hours = date.getHours();
-        const ampm = hours >= 12 ? "PM" : "AM";
-        hours = hours % 12 || 12;
-        const minutes = String(date.getMinutes()).padStart(2, "0");
-        result += ` ${hours}:${minutes} ${ampm}`;
-      }
-    }
-
-    return result;
-  } catch {
-    return "";
-  }
-}
-
-function toISODateString(dateStr: string | null): string | null {
-  if (!dateStr) return null;
-  try {
-    const date = new Date(dateStr);
-    if (isNaN(date.getTime())) return null;
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, "0");
-    const day = String(date.getDate()).padStart(2, "0");
-    return `${year}-${month}-${day}`;
-  } catch {
-    return null;
-  }
-}
-
-export function CellDate({
-  value,
-  property,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellDateProps) {
-  const typeOptions = property.typeOptions as DateTypeOptions | undefined;
-  const dateStr = typeof value === "string" ? value : null;
-  const pickerValue = toISODateString(dateStr);
-
-  const handleChange = useCallback(
-    (selected: string | null) => {
-      if (selected) {
-        const date = new Date(selected);
-        onCommit(date.toISOString());
-      } else {
-        onCommit(null);
-      }
-    },
-    [onCommit],
-  );
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Escape") {
-        e.preventDefault();
-        onCancel();
-      }
-    },
-    [onCancel],
-  );
-
-  if (isEditing) {
-    return (
-      <Popover
-        opened
-        onClose={onCancel}
-        position="bottom-start"
-        width="auto"
-        trapFocus
-      >
-        <Popover.Target>
-          <div style={{ width: "100%", height: "100%" }}>
-            <span className={cellClasses.dateValue}>
-              {formatDateDisplay(dateStr, typeOptions)}
-            </span>
-          </div>
-        </Popover.Target>
-        <Popover.Dropdown p="xs" onKeyDown={handleKeyDown}>
-          <DatePicker
-            value={pickerValue}
-            onChange={handleChange}
-            size="sm"
-          />
-        </Popover.Dropdown>
-      </Popover>
-    );
-  }
-
-  if (!dateStr) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return (
-    <span className={cellClasses.dateValue}>
-      {formatDateDisplay(dateStr, typeOptions)}
-    </span>
-  );
-}

apps/client/src/features/base/components/cells/cell-email.tsx

@@ -1,90 +0,0 @@
-import { useState, useRef, useEffect, useCallback } from "react";
-import { IBaseProperty } from "@/features/base/types/base.types";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type CellEmailProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-export function CellEmail({
-  value,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellEmailProps) {
-  const displayValue = typeof value === "string" ? value : "";
-  const [draft, setDraft] = useState(displayValue);
-  const inputRef = useRef<HTMLInputElement>(null);
-  const committedRef = useRef(false);
-
-  useEffect(() => {
-    if (isEditing) {
-      committedRef.current = false;
-      setDraft(displayValue);
-      requestAnimationFrame(() => {
-        inputRef.current?.focus();
-        inputRef.current?.select();
-      });
-    }
-  }, [isEditing, displayValue]);
-
-  const commitOnce = useCallback(
-    (val: unknown) => {
-      if (committedRef.current) return;
-      committedRef.current = true;
-      onCommit(val);
-    },
-    [onCommit],
-  );
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Enter") {
-        e.preventDefault();
-        commitOnce(draft || null);
-      } else if (e.key === "Escape") {
-        e.preventDefault();
-        onCancel();
-      }
-    },
-    [draft, commitOnce, onCancel],
-  );
-
-  const handleBlur = useCallback(() => {
-    commitOnce(draft || null);
-  }, [draft, commitOnce]);
-
-  if (isEditing) {
-    return (
-      <input
-        ref={inputRef}
-        type="email"
-        className={cellClasses.cellInput}
-        value={draft}
-        placeholder="email@example.com"
-        onChange={(e) => setDraft(e.target.value)}
-        onKeyDown={handleKeyDown}
-        onBlur={handleBlur}
-      />
-    );
-  }
-
-  if (!displayValue) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return (
-    <a
-      className={cellClasses.emailLink}
-      href={`mailto:${displayValue}`}
-      onClick={(e) => e.stopPropagation()}
-    >
-      {displayValue}
-    </a>
-  );
-}

apps/client/src/features/base/components/cells/cell-file.tsx

@@ -1,241 +0,0 @@
-import { useState, useRef, useCallback } from "react";
-import { Popover, ActionIcon, Text, UnstyledButton } from "@mantine/core";
-import {
-  IconPaperclip,
-  IconUpload,
-  IconFile,
-  IconX,
-} from "@tabler/icons-react";
-import { IBaseProperty } from "@/features/base/types/base.types";
-import cellClasses from "@/features/base/styles/cells.module.css";
-import api from "@/lib/api-client";
-
-export type FileValue = {
-  id: string;
-  fileName: string;
-  mimeType?: string;
-  fileSize?: number;
-  filePath?: string;
-};
-
-type CellFileProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-function formatFileSize(bytes?: number): string {
-  if (!bytes) return "";
-  if (bytes < 1024) return `${bytes} B`;
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
-  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
-}
-
-function parseFiles(value: unknown): FileValue[] {
-  if (!Array.isArray(value)) return [];
-  return value.filter(
-    (f): f is FileValue =>
-      f && typeof f === "object" && "id" in f && "fileName" in f,
-  );
-}
-
-export function CellFile({
-  value,
-  property,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellFileProps) {
-  const files = parseFiles(value);
-  const fileInputRef = useRef<HTMLInputElement>(null);
-  const [uploading, setUploading] = useState(false);
-
-  const handleRemove = useCallback(
-    (fileId: string) => {
-      const updated = files.filter((f) => f.id !== fileId);
-      onCommit(updated.length > 0 ? updated : null);
-    },
-    [files, onCommit],
-  );
-
-  const handleUpload = useCallback(
-    async (fileList: FileList | null) => {
-      if (!fileList || fileList.length === 0) return;
-      setUploading(true);
-
-      const newFiles: FileValue[] = [...files];
-
-      for (const file of Array.from(fileList)) {
-        try {
-          const formData = new FormData();
-          formData.append("file", file);
-          formData.append("baseId", property.baseId);
-
-          const res = await api.post<FileValue>(
-            "/bases/files/upload",
-            formData,
-            {
-              headers: { "Content-Type": "multipart/form-data" },
-            },
-          );
-
-          const attachment = res as unknown as FileValue;
-          newFiles.push({
-            id: attachment.id,
-            fileName: attachment.fileName,
-            mimeType: attachment.mimeType,
-            fileSize: attachment.fileSize,
-            filePath: attachment.filePath,
-          });
-        } catch (err) {
-          console.error("File upload failed:", err);
-        }
-      }
-
-      setUploading(false);
-      onCommit(newFiles.length > 0 ? newFiles : null);
-    },
-    [files, property.baseId, onCommit],
-  );
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Escape") {
-        e.preventDefault();
-        onCancel();
-      }
-    },
-    [onCancel],
-  );
-
-  const MAX_VISIBLE = 2;
-
-  if (isEditing) {
-    return (
-      <Popover
-        opened
-        onClose={onCancel}
-        position="bottom-start"
-        width={280}
-        trapFocus
-      >
-        <Popover.Target>
-          <div style={{ width: "100%", height: "100%" }}>
-            <FileList files={files} maxVisible={MAX_VISIBLE} />
-          </div>
-        </Popover.Target>
-        <Popover.Dropdown p={8} onKeyDown={handleKeyDown}>
-          {files.length === 0 && !uploading && (
-            <Text size="xs" c="dimmed" mb={8}>
-              No files attached
-            </Text>
-          )}
-
-          {files.map((file) => (
-            <div
-              key={file.id}
-              style={{
-                display: "flex",
-                alignItems: "center",
-                gap: 8,
-                padding: "4px 0",
-                borderBottom:
-                  "1px solid var(--mantine-color-default-border)",
-              }}
-            >
-              <IconFile
-                size={14}
-                style={{
-                  flexShrink: 0,
-                  color: "var(--mantine-color-gray-6)",
-                }}
-              />
-              <div style={{ flex: 1, minWidth: 0 }}>
-                <Text size="xs" truncate="end" fw={500}>
-                  {file.fileName}
-                </Text>
-                {file.fileSize != null && (
-                  <Text size="xs" c="dimmed">
-                    {formatFileSize(file.fileSize)}
-                  </Text>
-                )}
-              </div>
-              <ActionIcon
-                variant="subtle"
-                color="gray"
-                size="xs"
-                onClick={() => handleRemove(file.id)}
-              >
-                <IconX size={12} />
-              </ActionIcon>
-            </div>
-          ))}
-
-          <input
-            ref={fileInputRef}
-            type="file"
-            multiple
-            style={{ display: "none" }}
-            onChange={(e) => {
-              handleUpload(e.target.files);
-              e.target.value = "";
-            }}
-          />
-
-          <UnstyledButton
-            onClick={() => fileInputRef.current?.click()}
-            disabled={uploading}
-            style={{
-              display: "flex",
-              alignItems: "center",
-              gap: 6,
-              padding: "6px 0",
-              marginTop: 4,
-              fontSize: "var(--mantine-font-size-xs)",
-              color: uploading
-                ? "var(--mantine-color-gray-5)"
-                : "var(--mantine-color-blue-6)",
-            }}
-          >
-            <IconUpload size={14} />
-            {uploading ? "Uploading..." : "Add file"}
-          </UnstyledButton>
-        </Popover.Dropdown>
-      </Popover>
-    );
-  }
-
-  if (files.length === 0) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return <FileList files={files} maxVisible={MAX_VISIBLE} />;
-}
-
-function FileList({
-  files,
-  maxVisible,
-}: {
-  files: FileValue[];
-  maxVisible: number;
-}) {
-  const visible = files.slice(0, maxVisible);
-  const overflow = files.length - maxVisible;
-
-  return (
-    <div className={cellClasses.fileGroup}>
-      {visible.map((file) => (
-        <span key={file.id} className={cellClasses.fileBadge}>
-          <IconPaperclip size={12} />
-          {file.fileName}
-        </span>
-      ))}
-      {overflow > 0 && (
-        <span className={cellClasses.overflowCount}>+{overflow}</span>
-      )}
-    </div>
-  );
-}

apps/client/src/features/base/components/cells/cell-last-edited-at.tsx

@@ -1,34 +0,0 @@
-import { IBaseProperty } from "@/features/base/types/base.types";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type CellLastEditedAtProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-function formatTimestamp(val: unknown): string {
-  if (typeof val !== "string" || !val) return "";
-  const date = new Date(val);
-  if (isNaN(date.getTime())) return "";
-  return date.toLocaleDateString(undefined, {
-    month: "short",
-    day: "numeric",
-    year: "numeric",
-    hour: "numeric",
-    minute: "2-digit",
-  });
-}
-
-export function CellLastEditedAt({ value }: CellLastEditedAtProps) {
-  const formatted = formatTimestamp(value);
-
-  if (!formatted) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return <span className={cellClasses.dateValue}>{formatted}</span>;
-}

apps/client/src/features/base/components/cells/cell-last-edited-by.tsx

@@ -1,53 +0,0 @@
-import { useMemo } from "react";
-import { Group } from "@mantine/core";
-import { IBaseProperty } from "@/features/base/types/base.types";
-import { useWorkspaceMembersQuery } from "@/features/workspace/queries/workspace-query";
-import { CustomAvatar } from "@/components/ui/custom-avatar";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type CellLastEditedByProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-export function CellLastEditedBy({ value }: CellLastEditedByProps) {
-  const userId = typeof value === "string" ? value : null;
-
-  const { data: membersData } = useWorkspaceMembersQuery({ limit: 100 });
-
-  const user = useMemo(() => {
-    if (!userId || !membersData?.items) return null;
-    return membersData.items.find((u) => u.id === userId) ?? null;
-  }, [userId, membersData?.items]);
-
-  if (!userId) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return (
-    <Group gap={6} wrap="nowrap" style={{ overflow: "hidden" }}>
-      <CustomAvatar
-        avatarUrl={user?.avatarUrl ?? ""}
-        name={user?.name ?? ""}
-        size={20}
-        radius="xl"
-      />
-      {user?.name && (
-        <span
-          style={{
-            fontSize: "var(--mantine-font-size-sm)",
-            overflow: "hidden",
-            textOverflow: "ellipsis",
-            whiteSpace: "nowrap",
-          }}
-        >
-          {user.name}
-        </span>
-      )}
-    </Group>
-  );
-}

apps/client/src/features/base/components/cells/cell-multi-select.tsx

@@ -1,260 +0,0 @@
-import { useState, useRef, useEffect, useCallback, useMemo } from "react";
-import { Popover, TextInput } from "@mantine/core";
-import clsx from "clsx";
-import {
-  IBaseProperty,
-  SelectTypeOptions,
-  Choice,
-} from "@/features/base/types/base.types";
-import { choiceColor } from "@/features/base/components/cells/choice-color";
-import { useUpdatePropertyMutation } from "@/features/base/queries/base-property-query";
-import { v7 as uuid7 } from "uuid";
-import cellClasses from "@/features/base/styles/cells.module.css";
-import { useListKeyboardNav } from "@/features/base/hooks/use-list-keyboard-nav";
-
-const CHOICE_COLORS = [
-  "gray", "red", "pink", "grape", "violet", "indigo",
-  "blue", "cyan", "teal", "green", "lime", "yellow", "orange",
-];
-
-type NavItem =
-  | { kind: "choice"; choice: Choice }
-  | { kind: "add" };
-
-type CellMultiSelectProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-export function CellMultiSelect({
-  value,
-  property,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellMultiSelectProps) {
-  const typeOptions = property.typeOptions as SelectTypeOptions | undefined;
-  const choices = typeOptions?.choices ?? [];
-  const selectedIds = Array.isArray(value) ? (value as string[]) : [];
-  const selectedSet = new Set(selectedIds);
-
-  const selectedChoices = choices.filter((c) => selectedSet.has(c.id));
-
-  const [search, setSearch] = useState("");
-  const searchRef = useRef<HTMLInputElement>(null);
-
-  useEffect(() => {
-    if (isEditing) {
-      setSearch("");
-      requestAnimationFrame(() => searchRef.current?.focus());
-    }
-  }, [isEditing]);
-
-  const filteredChoices = search
-    ? choices.filter((c) => c.name.toLowerCase().includes(search.toLowerCase()))
-    : choices;
-
-  const handleToggle = useCallback(
-    (choice: Choice) => {
-      const newIds = selectedSet.has(choice.id)
-        ? selectedIds.filter((id) => id !== choice.id)
-        : [...selectedIds, choice.id];
-      onCommit(newIds);
-    },
-    [selectedIds, selectedSet, onCommit],
-  );
-
-  const updatePropertyMutation = useUpdatePropertyMutation();
-
-  const trimmedSearch = search.trim();
-  const hasExactMatch = useMemo(
-    () =>
-      trimmedSearch.length > 0 &&
-      choices.some((c) => c.name.toLowerCase() === trimmedSearch.toLowerCase()),
-    [choices, trimmedSearch],
-  );
-  const showAddOption = trimmedSearch.length > 0 && !hasExactMatch;
-
-  const addOptionColor = useMemo(
-    () => CHOICE_COLORS[choices.length % CHOICE_COLORS.length],
-    [choices.length],
-  );
-
-  const navItems = useMemo<NavItem[]>(
-    () => [
-      ...filteredChoices.map((c) => ({ kind: "choice" as const, choice: c })),
-      ...(showAddOption ? [{ kind: "add" as const }] : []),
-    ],
-    [filteredChoices, showAddOption],
-  );
-
-  const { activeIndex, setActiveIndex, handleNavKey, setOptionRef } =
-    useListKeyboardNav(navItems.length, [search, isEditing, showAddOption]);
-
-  const handleAddOption = useCallback(() => {
-    if (!trimmedSearch) return;
-    const newChoice: Choice = {
-      id: uuid7(),
-      name: trimmedSearch,
-      color: addOptionColor,
-    };
-    const newChoices = [...choices, newChoice];
-    updatePropertyMutation.mutate({
-      propertyId: property.id,
-      baseId: property.baseId,
-      typeOptions: {
-        ...typeOptions,
-        choices: newChoices,
-        choiceOrder: newChoices.map((c) => c.id),
-      },
-    });
-    onCommit([...selectedIds, newChoice.id]);
-    setSearch("");
-  }, [trimmedSearch, addOptionColor, choices, typeOptions, property, updatePropertyMutation, selectedIds, onCommit]);
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Escape") {
-        e.preventDefault();
-        onCancel();
-        return;
-      }
-      if (handleNavKey(e)) return;
-      if (e.key === "Enter") {
-        if (activeIndex >= 0 && activeIndex < navItems.length) {
-          e.preventDefault();
-          const item = navItems[activeIndex];
-          if (item.kind === "choice") handleToggle(item.choice);
-          else handleAddOption();
-          return;
-        }
-        if (showAddOption) {
-          e.preventDefault();
-          handleAddOption();
-        }
-      }
-    },
-    [onCancel, handleNavKey, activeIndex, navItems, handleToggle, handleAddOption, showAddOption],
-  );
-
-  const MAX_VISIBLE = 3;
-
-  if (isEditing) {
-    const addOptionIdx = filteredChoices.length;
-    return (
-      <Popover
-        opened
-        onClose={onCancel}
-        position="bottom-start"
-        width={220}
-        trapFocus
-      >
-        <Popover.Target>
-          <div style={{ width: "100%", height: "100%" }}>
-            <BadgeList choices={selectedChoices} maxVisible={MAX_VISIBLE} />
-          </div>
-        </Popover.Target>
-        <Popover.Dropdown p={4}>
-          <TextInput
-            ref={searchRef}
-            size="xs"
-            placeholder="Search..."
-            value={search}
-            onChange={(e) => setSearch(e.currentTarget.value)}
-            onKeyDown={handleKeyDown}
-            mb={4}
-          />
-          <div className={cellClasses.selectDropdown}>
-            {filteredChoices.map((choice, idx) => {
-              const isSelected = selectedSet.has(choice.id);
-              return (
-                <div
-                  key={choice.id}
-                  ref={setOptionRef(idx)}
-                  className={clsx(
-                    cellClasses.selectOption,
-                    isSelected && cellClasses.selectOptionActive,
-                    idx === activeIndex && cellClasses.selectOptionKeyboardActive,
-                  )}
-                  onMouseEnter={() => setActiveIndex(idx)}
-                  onMouseDown={(e) => {
-                    // Keep focus on the search input so click doesn't blur + close popover.
-                    e.preventDefault();
-                  }}
-                  onClick={() => handleToggle(choice)}
-                >
-                  <span
-                    className={cellClasses.badge}
-                    style={choiceColor(choice.color)}
-                  >
-                    {choice.name}
-                  </span>
-                </div>
-              );
-            })}
-            {showAddOption && (
-              <div
-                ref={setOptionRef(addOptionIdx)}
-                className={clsx(
-                  cellClasses.addOptionRow,
-                  addOptionIdx === activeIndex && cellClasses.selectOptionKeyboardActive,
-                )}
-                onMouseEnter={() => setActiveIndex(addOptionIdx)}
-                onMouseDown={(e) => {
-                  e.preventDefault();
-                }}
-                onClick={handleAddOption}
-              >
-                <span className={cellClasses.addOptionLabel}>Add option:</span>
-                <span
-                  className={cellClasses.badge}
-                  style={choiceColor(addOptionColor)}
-                >
-                  {trimmedSearch}
-                </span>
-              </div>
-            )}
-          </div>
-        </Popover.Dropdown>
-      </Popover>
-    );
-  }
-
-  if (selectedChoices.length === 0) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return <BadgeList choices={selectedChoices} maxVisible={MAX_VISIBLE} />;
-}
-
-function BadgeList({
-  choices,
-  maxVisible,
-}: {
-  choices: Choice[];
-  maxVisible: number;
-}) {
-  const visible = choices.slice(0, maxVisible);
-  const overflow = choices.length - maxVisible;
-
-  return (
-    <div className={cellClasses.badgeGroup}>
-      {visible.map((choice) => (
-        <span
-          key={choice.id}
-          className={cellClasses.badge}
-          style={choiceColor(choice.color)}
-        >
-          {choice.name}
-        </span>
-      ))}
-      {overflow > 0 && (
-        <span className={cellClasses.overflowCount}>+{overflow}</span>
-      )}
-    </div>
-  );
-}

apps/client/src/features/base/components/cells/cell-number.tsx

@@ -1,122 +0,0 @@
-import { useState, useRef, useEffect, useCallback } from "react";
-import {
-  IBaseProperty,
-  NumberTypeOptions,
-} from "@/features/base/types/base.types";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type CellNumberProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-function formatNumber(
-  val: number | null | undefined,
-  options: NumberTypeOptions | undefined,
-): string {
-  if (val == null) return "";
-  const precision = options?.precision ?? 0;
-  const format = options?.format ?? "plain";
-
-  switch (format) {
-    case "currency":
-      return `${options?.currencySymbol ?? "$"}${val.toFixed(precision)}`;
-    case "percent":
-      return `${val.toFixed(precision)}%`;
-    case "progress":
-      return `${Math.min(100, Math.max(0, val)).toFixed(0)}%`;
-    default:
-      return precision > 0 ? val.toFixed(precision) : String(val);
-  }
-}
-
-export function CellNumber({
-  value,
-  property,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellNumberProps) {
-  const numValue = typeof value === "number" ? value : null;
-  const typeOptions = property.typeOptions as NumberTypeOptions | undefined;
-  const [draft, setDraft] = useState(numValue != null ? String(numValue) : "");
-  const inputRef = useRef<HTMLInputElement>(null);
-  const committedRef = useRef(false);
-
-  useEffect(() => {
-    if (isEditing) {
-      committedRef.current = false;
-      setDraft(numValue != null ? String(numValue) : "");
-      requestAnimationFrame(() => {
-        inputRef.current?.focus();
-        inputRef.current?.select();
-      });
-    }
-  }, [isEditing, numValue]);
-
-  const parseDraft = useCallback(() => {
-    const parsed = draft === "" ? null : Number(draft);
-    return parsed != null && isNaN(parsed) ? null : parsed;
-  }, [draft]);
-
-  const commitOnce = useCallback(
-    (val: unknown) => {
-      if (committedRef.current) return;
-      committedRef.current = true;
-      onCommit(val);
-    },
-    [onCommit],
-  );
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Enter") {
-        e.preventDefault();
-        commitOnce(parseDraft());
-      } else if (e.key === "Escape") {
-        e.preventDefault();
-        onCancel();
-      }
-    },
-    [parseDraft, commitOnce, onCancel],
-  );
-
-  const handleBlur = useCallback(() => {
-    commitOnce(parseDraft());
-  }, [parseDraft, commitOnce]);
-
-  if (isEditing) {
-    return (
-      <input
-        ref={inputRef}
-        type="text"
-        inputMode="decimal"
-        className={cellClasses.cellInput}
-        style={{ textAlign: "right" }}
-        value={draft}
-        onChange={(e) => {
-          const v = e.target.value;
-          if (v === "" || v === "-" || /^-?\d*\.?\d*$/.test(v)) {
-            setDraft(v);
-          }
-        }}
-        onKeyDown={handleKeyDown}
-        onBlur={handleBlur}
-      />
-    );
-  }
-
-  if (numValue == null) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return (
-    <span className={cellClasses.numberValue}>
-      {formatNumber(numValue, typeOptions)}
-    </span>
-  );
-}

apps/client/src/features/base/components/cells/cell-person.tsx

@@ -1,263 +0,0 @@
-import { useState, useRef, useEffect, useCallback, useMemo } from "react";
-import { Popover } from "@mantine/core";
-import { IconX } from "@tabler/icons-react";
-import clsx from "clsx";
-import {
-  IBaseProperty,
-  PersonTypeOptions,
-} from "@/features/base/types/base.types";
-import { useWorkspaceMembersQuery } from "@/features/workspace/queries/workspace-query";
-import { CustomAvatar } from "@/components/ui/custom-avatar";
-import cellClasses from "@/features/base/styles/cells.module.css";
-import { useListKeyboardNav } from "@/features/base/hooks/use-list-keyboard-nav";
-
-type CellPersonProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-export function CellPerson({
-  value,
-  property,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellPersonProps) {
-  const allowMultiple =
-    (property.typeOptions as PersonTypeOptions)?.allowMultiple !== false;
-
-  const personIds = Array.isArray(value)
-    ? (value as string[])
-    : typeof value === "string"
-      ? [value]
-      : [];
-
-  const [search, setSearch] = useState("");
-  const searchRef = useRef<HTMLInputElement>(null);
-
-  useEffect(() => {
-    if (isEditing) {
-      setSearch("");
-      requestAnimationFrame(() => searchRef.current?.focus());
-    }
-  }, [isEditing]);
-
-  const { data: membersData } = useWorkspaceMembersQuery({ limit: 100 });
-  const members = membersData?.items ?? [];
-  const memberMap = useMemo(() => {
-    const map = new Map<string, (typeof members)[0]>();
-    for (const m of members) map.set(m.id, m);
-    return map;
-  }, [members]);
-
-  const filteredMembers = search
-    ? members.filter(
-        (m) =>
-          m.name.toLowerCase().includes(search.toLowerCase()) ||
-          (m.email && m.email.toLowerCase().includes(search.toLowerCase())),
-      )
-    : members;
-
-  const { activeIndex, setActiveIndex, handleNavKey, setOptionRef } =
-    useListKeyboardNav(filteredMembers.length, [search, isEditing]);
-
-  const handleSelect = useCallback(
-    (memberId: string) => {
-      if (allowMultiple) {
-        // Multi mode: toggle add/remove
-        if (personIds.includes(memberId)) {
-          const newIds = personIds.filter((id) => id !== memberId);
-          onCommit(newIds.length > 0 ? newIds : null);
-        } else {
-          onCommit([...personIds, memberId]);
-        }
-      } else {
-        // Single mode: replace or clear
-        if (personIds.includes(memberId)) {
-          onCommit(null);
-        } else {
-          onCommit(memberId);
-        }
-      }
-    },
-    [allowMultiple, personIds, onCommit],
-  );
-
-  const handleRemove = useCallback(
-    (memberId: string) => {
-      if (allowMultiple) {
-        const newIds = personIds.filter((id) => id !== memberId);
-        onCommit(newIds.length > 0 ? newIds : null);
-      } else {
-        onCommit(null);
-      }
-    },
-    [allowMultiple, personIds, onCommit],
-  );
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Escape") {
-        e.preventDefault();
-        onCancel();
-        return;
-      }
-      if (handleNavKey(e)) return;
-      if (e.key === "Enter") {
-        if (activeIndex < 0 || activeIndex >= filteredMembers.length) return;
-        e.preventDefault();
-        handleSelect(filteredMembers[activeIndex].id);
-        return;
-      }
-      if (e.key === "Backspace" && search === "" && personIds.length > 0) {
-        e.preventDefault();
-        handleRemove(personIds[personIds.length - 1]);
-      }
-    },
-    [onCancel, handleNavKey, activeIndex, filteredMembers, handleSelect, search, personIds, handleRemove],
-  );
-
-  const selectedSet = new Set(personIds);
-
-  if (isEditing) {
-    return (
-      <Popover
-        opened
-        onClose={onCancel}
-        position="bottom-start"
-        width={300}
-        trapFocus
-      >
-        <Popover.Target>
-          <div style={{ width: "100%", height: "100%" }}>
-            <PersonReadList personIds={personIds} memberMap={memberMap} />
-          </div>
-        </Popover.Target>
-        <Popover.Dropdown p={0}>
-          {/* Tag input area */}
-          <div className={cellClasses.personTagArea}>
-            {personIds.map((id) => {
-              const member = memberMap.get(id);
-              const name = member?.name ?? id.substring(0, 8);
-              return (
-                <span key={id} className={cellClasses.personTag}>
-                  <CustomAvatar
-                    avatarUrl={member?.avatarUrl ?? ""}
-                    name={name}
-                    size={18}
-                    radius="xl"
-                  />
-                  <span className={cellClasses.personTagName}>{name}</span>
-                  <button
-                    type="button"
-                    className={cellClasses.personTagRemove}
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      handleRemove(id);
-                    }}
-                  >
-                    <IconX size={10} />
-                  </button>
-                </span>
-              );
-            })}
-            <input
-              ref={searchRef}
-              className={cellClasses.personTagInput}
-              placeholder={personIds.length === 0 ? "Search for a person..." : ""}
-              value={search}
-              onChange={(e) => setSearch(e.currentTarget.value)}
-              onKeyDown={handleKeyDown}
-            />
-          </div>
-
-          {/* Dropdown */}
-          <div className={cellClasses.personDropdownDivider} />
-          {allowMultiple && (
-            <div className={cellClasses.personDropdownHint}>
-              Select as many as you like
-            </div>
-          )}
-          <div className={cellClasses.selectDropdown}>
-            {filteredMembers.map((member, idx) => {
-              const isSelected = selectedSet.has(member.id);
-              return (
-                <div
-                  key={member.id}
-                  ref={setOptionRef(idx)}
-                  className={clsx(
-                    cellClasses.selectOption,
-                    isSelected && cellClasses.selectOptionActive,
-                    idx === activeIndex && cellClasses.selectOptionKeyboardActive,
-                  )}
-                  onMouseEnter={() => setActiveIndex(idx)}
-                  onMouseDown={(e) => {
-                    // Keep focus on the search input so click doesn't blur + close popover.
-                    e.preventDefault();
-                  }}
-                  onClick={() => handleSelect(member.id)}
-                >
-                  <CustomAvatar
-                    avatarUrl={member.avatarUrl}
-                    name={member.name}
-                    size={24}
-                    radius="xl"
-                  />
-                  <span className={cellClasses.personOptionName}>
-                    {member.name}
-                  </span>
-                </div>
-              );
-            })}
-            {filteredMembers.length === 0 && (
-              <div className={cellClasses.personDropdownHint}>
-                No members found
-              </div>
-            )}
-          </div>
-        </Popover.Dropdown>
-      </Popover>
-    );
-  }
-
-  if (personIds.length === 0) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return <PersonReadList personIds={personIds} memberMap={memberMap} />;
-}
-
-function PersonReadList({
-  personIds,
-  memberMap,
-}: {
-  personIds: string[];
-  memberMap: Map<
-    string,
-    { id: string; name: string; email?: string; avatarUrl?: string }
-  >;
-}) {
-  return (
-    <div className={cellClasses.personGroup}>
-      {personIds.map((id) => {
-        const member = memberMap.get(id);
-        const name = member?.name ?? id.substring(0, 8);
-        return (
-          <div key={id} className={cellClasses.personRow}>
-            <CustomAvatar
-              avatarUrl={member?.avatarUrl ?? ""}
-              name={name}
-              size={20}
-              radius="xl"
-            />
-            <span className={cellClasses.personName}>{name}</span>
-          </div>
-        );
-      })}
-    </div>
-  );
-}

apps/client/src/features/base/components/cells/cell-select.tsx

@@ -1,242 +0,0 @@
-import { useState, useRef, useEffect, useCallback, useMemo } from "react";
-import { Popover, TextInput } from "@mantine/core";
-import clsx from "clsx";
-import {
-  IBaseProperty,
-  SelectTypeOptions,
-  Choice,
-} from "@/features/base/types/base.types";
-import { choiceColor } from "@/features/base/components/cells/choice-color";
-import { useUpdatePropertyMutation } from "@/features/base/queries/base-property-query";
-import { v7 as uuid7 } from "uuid";
-import cellClasses from "@/features/base/styles/cells.module.css";
-import { useListKeyboardNav } from "@/features/base/hooks/use-list-keyboard-nav";
-
-const CHOICE_COLORS = [
-  "gray", "red", "pink", "grape", "violet", "indigo",
-  "blue", "cyan", "teal", "green", "lime", "yellow", "orange",
-];
-
-type NavItem =
-  | { kind: "choice"; choice: Choice }
-  | { kind: "add" };
-
-type CellSelectProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-export function CellSelect({
-  value,
-  property,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellSelectProps) {
-  const typeOptions = property.typeOptions as SelectTypeOptions | undefined;
-  const choices = typeOptions?.choices ?? [];
-  const selectedId = typeof value === "string" ? value : null;
-  const selectedChoice = choices.find((c) => c.id === selectedId);
-
-  const [search, setSearch] = useState("");
-  const searchRef = useRef<HTMLInputElement>(null);
-
-  useEffect(() => {
-    if (isEditing) {
-      setSearch("");
-      requestAnimationFrame(() => searchRef.current?.focus());
-    }
-  }, [isEditing]);
-
-  const filteredChoices = search
-    ? choices.filter((c) =>
-        c.name.toLowerCase().includes(search.toLowerCase()),
-      )
-    : choices;
-
-  const handleSelect = useCallback(
-    (choice: Choice) => {
-      onCommit(choice.id === selectedId ? null : choice.id);
-    },
-    [selectedId, onCommit],
-  );
-
-  const updatePropertyMutation = useUpdatePropertyMutation();
-
-  const trimmedSearch = search.trim();
-  const hasExactMatch = useMemo(
-    () =>
-      trimmedSearch.length > 0 &&
-      choices.some((c) => c.name.toLowerCase() === trimmedSearch.toLowerCase()),
-    [choices, trimmedSearch],
-  );
-  const showAddOption = trimmedSearch.length > 0 && !hasExactMatch;
-
-  const addOptionColor = useMemo(
-    () => CHOICE_COLORS[choices.length % CHOICE_COLORS.length],
-    [choices.length],
-  );
-
-  const navItems = useMemo<NavItem[]>(
-    () => [
-      ...filteredChoices.map((c) => ({ kind: "choice" as const, choice: c })),
-      ...(showAddOption ? [{ kind: "add" as const }] : []),
-    ],
-    [filteredChoices, showAddOption],
-  );
-
-  const { activeIndex, setActiveIndex, handleNavKey, setOptionRef } =
-    useListKeyboardNav(navItems.length, [search, isEditing, showAddOption]);
-
-  const handleAddOption = useCallback(() => {
-    if (!trimmedSearch) return;
-    const newChoice: Choice = {
-      id: uuid7(),
-      name: trimmedSearch,
-      color: addOptionColor,
-    };
-    const newChoices = [...choices, newChoice];
-    updatePropertyMutation.mutate({
-      propertyId: property.id,
-      baseId: property.baseId,
-      typeOptions: {
-        ...typeOptions,
-        choices: newChoices,
-        choiceOrder: newChoices.map((c) => c.id),
-      },
-    });
-    onCommit(newChoice.id);
-  }, [trimmedSearch, addOptionColor, choices, typeOptions, property, updatePropertyMutation, onCommit]);
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Escape") {
-        e.preventDefault();
-        onCancel();
-        return;
-      }
-      if (handleNavKey(e)) return;
-      if (e.key === "Enter") {
-        if (activeIndex >= 0 && activeIndex < navItems.length) {
-          e.preventDefault();
-          const item = navItems[activeIndex];
-          if (item.kind === "choice") handleSelect(item.choice);
-          else handleAddOption();
-          return;
-        }
-        if (showAddOption) {
-          e.preventDefault();
-          handleAddOption();
-        }
-      }
-    },
-    [onCancel, handleNavKey, activeIndex, navItems, handleSelect, handleAddOption, showAddOption],
-  );
-
-  if (isEditing) {
-    const addOptionIdx = filteredChoices.length;
-    return (
-      <Popover
-        opened
-        onClose={onCancel}
-        position="bottom-start"
-        width={220}
-        trapFocus
-      >
-        <Popover.Target>
-          <div style={{ width: "100%", height: "100%" }}>
-            {selectedChoice ? (
-              <span
-                className={cellClasses.badge}
-                style={choiceColor(selectedChoice.color)}
-              >
-                {selectedChoice.name}
-              </span>
-            ) : (
-              <span className={cellClasses.emptyValue} />
-            )}
-          </div>
-        </Popover.Target>
-        <Popover.Dropdown p={4}>
-          <TextInput
-            ref={searchRef}
-            size="xs"
-            placeholder="Search..."
-            value={search}
-            onChange={(e) => setSearch(e.currentTarget.value)}
-            onKeyDown={handleKeyDown}
-            mb={4}
-          />
-          <div className={cellClasses.selectDropdown}>
-            {filteredChoices.map((choice, idx) => {
-              const isSelected = choice.id === selectedId;
-              return (
-                <div
-                  key={choice.id}
-                  ref={setOptionRef(idx)}
-                  className={clsx(
-                    cellClasses.selectOption,
-                    isSelected && cellClasses.selectOptionActive,
-                    idx === activeIndex && cellClasses.selectOptionKeyboardActive,
-                  )}
-                  onMouseEnter={() => setActiveIndex(idx)}
-                  onMouseDown={(e) => {
-                    // Keep focus on the search input so click doesn't blur + close popover.
-                    e.preventDefault();
-                  }}
-                  onClick={() => handleSelect(choice)}
-                >
-                  <span
-                    className={cellClasses.badge}
-                    style={choiceColor(choice.color)}
-                  >
-                    {choice.name}
-                  </span>
-                </div>
-              );
-            })}
-            {showAddOption && (
-              <div
-                ref={setOptionRef(addOptionIdx)}
-                className={clsx(
-                  cellClasses.addOptionRow,
-                  addOptionIdx === activeIndex && cellClasses.selectOptionKeyboardActive,
-                )}
-                onMouseEnter={() => setActiveIndex(addOptionIdx)}
-                onMouseDown={(e) => {
-                  e.preventDefault();
-                }}
-                onClick={handleAddOption}
-              >
-                <span className={cellClasses.addOptionLabel}>Add option:</span>
-                <span
-                  className={cellClasses.badge}
-                  style={choiceColor(addOptionColor)}
-                >
-                  {trimmedSearch}
-                </span>
-              </div>
-            )}
-          </div>
-        </Popover.Dropdown>
-      </Popover>
-    );
-  }
-
-  if (!selectedChoice) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return (
-    <span
-      className={cellClasses.badge}
-      style={choiceColor(selectedChoice.color)}
-    >
-      {selectedChoice.name}
-    </span>
-  );
-}

apps/client/src/features/base/components/cells/cell-status.tsx

@@ -1,202 +0,0 @@
-import { useState, useRef, useEffect, useCallback, useMemo } from "react";
-import { Popover, TextInput } from "@mantine/core";
-import {
-  IBaseProperty,
-  SelectTypeOptions,
-  Choice,
-} from "@/features/base/types/base.types";
-import { choiceColor } from "@/features/base/components/cells/choice-color";
-import cellClasses from "@/features/base/styles/cells.module.css";
-import clsx from "clsx";
-import { useListKeyboardNav } from "@/features/base/hooks/use-list-keyboard-nav";
-
-type CellStatusProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-type CategoryGroup = {
-  label: string;
-  choices: Choice[];
-};
-
-const categoryLabels: Record<string, string> = {
-  todo: "To Do",
-  inProgress: "In Progress",
-  complete: "Complete",
-};
-
-export function CellStatus({
-  value,
-  property,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellStatusProps) {
-  const typeOptions = property.typeOptions as SelectTypeOptions | undefined;
-  const choices = typeOptions?.choices ?? [];
-  const selectedId = typeof value === "string" ? value : null;
-  const selectedChoice = choices.find((c) => c.id === selectedId);
-
-  const [search, setSearch] = useState("");
-  const searchRef = useRef<HTMLInputElement>(null);
-
-  useEffect(() => {
-    if (isEditing) {
-      setSearch("");
-      requestAnimationFrame(() => searchRef.current?.focus());
-    }
-  }, [isEditing]);
-
-  const groups = useMemo(() => {
-    const filtered = search
-      ? choices.filter((c) =>
-          c.name.toLowerCase().includes(search.toLowerCase()),
-        )
-      : choices;
-
-    const grouped: Record<string, Choice[]> = {};
-    for (const choice of filtered) {
-      const cat = choice.category ?? "todo";
-      if (!grouped[cat]) grouped[cat] = [];
-      grouped[cat].push(choice);
-    }
-
-    const result: CategoryGroup[] = [];
-    for (const key of ["todo", "inProgress", "complete"]) {
-      if (grouped[key]?.length) {
-        result.push({ label: categoryLabels[key] ?? key, choices: grouped[key] });
-      }
-    }
-    return result;
-  }, [choices, search]);
-
-  const flatChoices = useMemo(
-    () => groups.flatMap((g) => g.choices),
-    [groups],
-  );
-  const choiceIdxMap = useMemo(() => {
-    const m = new Map<string, number>();
-    flatChoices.forEach((c, i) => m.set(c.id, i));
-    return m;
-  }, [flatChoices]);
-
-  const { activeIndex, setActiveIndex, handleNavKey, setOptionRef } =
-    useListKeyboardNav(flatChoices.length, [search, isEditing]);
-
-  const handleSelect = useCallback(
-    (choice: Choice) => {
-      onCommit(choice.id === selectedId ? null : choice.id);
-    },
-    [selectedId, onCommit],
-  );
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Escape") {
-        e.preventDefault();
-        onCancel();
-        return;
-      }
-      if (handleNavKey(e)) return;
-      if (e.key === "Enter") {
-        if (activeIndex < 0 || activeIndex >= flatChoices.length) return;
-        e.preventDefault();
-        handleSelect(flatChoices[activeIndex]);
-      }
-    },
-    [onCancel, handleNavKey, activeIndex, flatChoices, handleSelect],
-  );
-
-  if (isEditing) {
-    return (
-      <Popover
-        opened
-        onClose={onCancel}
-        position="bottom-start"
-        width={220}
-        trapFocus
-      >
-        <Popover.Target>
-          <div style={{ width: "100%", height: "100%" }}>
-            {selectedChoice ? (
-              <span
-                className={cellClasses.badge}
-                style={choiceColor(selectedChoice.color)}
-              >
-                {selectedChoice.name}
-              </span>
-            ) : (
-              <span className={cellClasses.emptyValue} />
-            )}
-          </div>
-        </Popover.Target>
-        <Popover.Dropdown p={4}>
-          <TextInput
-            ref={searchRef}
-            size="xs"
-            placeholder="Search..."
-            value={search}
-            onChange={(e) => setSearch(e.currentTarget.value)}
-            onKeyDown={handleKeyDown}
-            mb={4}
-          />
-          <div className={cellClasses.selectDropdown}>
-            {groups.map((group) => (
-              <div key={group.label}>
-                <div className={cellClasses.selectCategoryLabel}>
-                  {group.label}
-                </div>
-                {group.choices.map((choice) => {
-                  const idx = choiceIdxMap.get(choice.id) ?? -1;
-                  const isSelected = choice.id === selectedId;
-                  return (
-                    <div
-                      key={choice.id}
-                      ref={setOptionRef(idx)}
-                      className={clsx(
-                        cellClasses.selectOption,
-                        isSelected && cellClasses.selectOptionActive,
-                        idx === activeIndex && cellClasses.selectOptionKeyboardActive,
-                      )}
-                      onMouseEnter={() => setActiveIndex(idx)}
-                      onMouseDown={(e) => {
-                        // Keep focus on the search input so click doesn't blur + close popover.
-                        e.preventDefault();
-                      }}
-                      onClick={() => handleSelect(choice)}
-                    >
-                      <span
-                        className={cellClasses.badge}
-                        style={choiceColor(choice.color)}
-                      >
-                        {choice.name}
-                      </span>
-                    </div>
-                  );
-                })}
-              </div>
-            ))}
-          </div>
-        </Popover.Dropdown>
-      </Popover>
-    );
-  }
-
-  if (!selectedChoice) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return (
-    <span
-      className={cellClasses.badge}
-      style={choiceColor(selectedChoice.color)}
-    >
-      {selectedChoice.name}
-    </span>
-  );
-}

apps/client/src/features/base/components/cells/cell-text.tsx

@@ -1,82 +0,0 @@
-import { useState, useRef, useEffect, useCallback } from "react";
-import { IBaseProperty } from "@/features/base/types/base.types";
-import cellClasses from "@/features/base/styles/cells.module.css";
-import gridClasses from "@/features/base/styles/grid.module.css";
-
-type CellTextProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-export function CellText({
-  value,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellTextProps) {
-  const displayValue = typeof value === "string" ? value : "";
-  const [draft, setDraft] = useState(displayValue);
-  const inputRef = useRef<HTMLInputElement>(null);
-  const committedRef = useRef(false);
-
-  useEffect(() => {
-    if (isEditing) {
-      committedRef.current = false;
-      setDraft(displayValue);
-      requestAnimationFrame(() => {
-        inputRef.current?.focus();
-        inputRef.current?.select();
-      });
-    }
-  }, [isEditing, displayValue]);
-
-  const commitOnce = useCallback(
-    (val: unknown) => {
-      if (committedRef.current) return;
-      committedRef.current = true;
-      onCommit(val);
-    },
-    [onCommit],
-  );
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Enter") {
-        e.preventDefault();
-        commitOnce(draft);
-      } else if (e.key === "Escape") {
-        e.preventDefault();
-        onCancel();
-      }
-    },
-    [draft, commitOnce, onCancel],
-  );
-
-  const handleBlur = useCallback(() => {
-    commitOnce(draft);
-  }, [draft, commitOnce]);
-
-  if (isEditing) {
-    return (
-      <input
-        ref={inputRef}
-        type="text"
-        className={cellClasses.cellInput}
-        value={draft}
-        onChange={(e) => setDraft(e.target.value)}
-        onKeyDown={handleKeyDown}
-        onBlur={handleBlur}
-      />
-    );
-  }
-
-  if (!displayValue) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return <span className={gridClasses.cellContent}>{displayValue}</span>;
-}

apps/client/src/features/base/components/cells/cell-url.tsx

@@ -1,92 +0,0 @@
-import { useState, useRef, useEffect, useCallback } from "react";
-import { IBaseProperty } from "@/features/base/types/base.types";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type CellUrlProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-export function CellUrl({
-  value,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellUrlProps) {
-  const displayValue = typeof value === "string" ? value : "";
-  const [draft, setDraft] = useState(displayValue);
-  const inputRef = useRef<HTMLInputElement>(null);
-  const committedRef = useRef(false);
-
-  useEffect(() => {
-    if (isEditing) {
-      committedRef.current = false;
-      setDraft(displayValue);
-      requestAnimationFrame(() => {
-        inputRef.current?.focus();
-        inputRef.current?.select();
-      });
-    }
-  }, [isEditing, displayValue]);
-
-  const commitOnce = useCallback(
-    (val: unknown) => {
-      if (committedRef.current) return;
-      committedRef.current = true;
-      onCommit(val);
-    },
-    [onCommit],
-  );
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Enter") {
-        e.preventDefault();
-        commitOnce(draft || null);
-      } else if (e.key === "Escape") {
-        e.preventDefault();
-        onCancel();
-      }
-    },
-    [draft, commitOnce, onCancel],
-  );
-
-  const handleBlur = useCallback(() => {
-    commitOnce(draft || null);
-  }, [draft, commitOnce]);
-
-  if (isEditing) {
-    return (
-      <input
-        ref={inputRef}
-        type="url"
-        className={cellClasses.cellInput}
-        value={draft}
-        placeholder="https://..."
-        onChange={(e) => setDraft(e.target.value)}
-        onKeyDown={handleKeyDown}
-        onBlur={handleBlur}
-      />
-    );
-  }
-
-  if (!displayValue) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  return (
-    <a
-      className={cellClasses.urlLink}
-      href={displayValue}
-      target="_blank"
-      rel="noopener noreferrer"
-      onClick={(e) => e.stopPropagation()}
-    >
-      {displayValue}
-    </a>
-  );
-}

apps/client/src/features/base/components/cells/choice-color.ts

@@ -1,25 +0,0 @@
-import { CSSProperties } from "react";
-
-const colorMap: Record<string, { bg: string; bgDark: string; text: string; textDark: string }> = {
-  gray: { bg: "#f1f3f5", bgDark: "#373a40", text: "#495057", textDark: "#ced4da" },
-  red: { bg: "#ffe3e3", bgDark: "#4a1a1a", text: "#c92a2a", textDark: "#ffa8a8" },
-  pink: { bg: "#ffdeeb", bgDark: "#4a1a2e", text: "#a61e4d", textDark: "#faa2c1" },
-  grape: { bg: "#f3d9fa", bgDark: "#3b1a4a", text: "#862e9c", textDark: "#e599f7" },
-  violet: { bg: "#e5dbff", bgDark: "#2b1a4a", text: "#5f3dc4", textDark: "#b197fc" },
-  indigo: { bg: "#dbe4ff", bgDark: "#1a2b4a", text: "#364fc7", textDark: "#91a7ff" },
-  blue: { bg: "#d0ebff", bgDark: "#1a2e4a", text: "#1971c2", textDark: "#74c0fc" },
-  cyan: { bg: "#c3fae8", bgDark: "#1a3a3a", text: "#0c8599", textDark: "#66d9e8" },
-  teal: { bg: "#c3fae8", bgDark: "#1a3a2e", text: "#087f5b", textDark: "#63e6be" },
-  green: { bg: "#d3f9d8", bgDark: "#1a3a1a", text: "#2b8a3e", textDark: "#69db7c" },
-  lime: { bg: "#e9fac8", bgDark: "#2e3a1a", text: "#5c940d", textDark: "#a9e34b" },
-  yellow: { bg: "#fff3bf", bgDark: "#3a351a", text: "#e67700", textDark: "#ffd43b" },
-  orange: { bg: "#ffe8cc", bgDark: "#3a2a1a", text: "#d9480f", textDark: "#ffa94d" },
-};
-
-export function choiceColor(color: string): CSSProperties {
-  const c = colorMap[color] ?? colorMap.gray;
-  return {
-    backgroundColor: `light-dark(${c.bg}, ${c.bgDark})`,
-    color: `light-dark(${c.text}, ${c.textDark})`,
-  };
-}

apps/client/src/features/base/components/grid/add-row-button.tsx

@@ -1,26 +0,0 @@
-import { memo } from "react";
-import { IconPlus } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import classes from "@/features/base/styles/grid.module.css";
-
-type AddRowButtonProps = {
-  onClick?: () => void;
-};
-
-export const AddRowButton = memo(function AddRowButton({
-  onClick,
-}: AddRowButtonProps) {
-  const { t } = useTranslation();
-
-  return (
-    <div
-      className={classes.addRowButton}
-      onClick={onClick}
-      role="button"
-      tabIndex={0}
-    >
-      <IconPlus size={14} />
-      <span>{t("New row")}</span>
-    </div>
-  );
-});

apps/client/src/features/base/components/grid/grid-cell.tsx

@@ -1,149 +0,0 @@
-import { memo, useCallback } from "react";
-import { Cell } from "@tanstack/react-table";
-import { useAtom } from "jotai";
-import { IBaseRow, IBaseProperty, EditingCell } from "@/features/base/types/base.types";
-import { editingCellAtom } from "@/features/base/atoms/base-atoms";
-import { isSystemPropertyType } from "@/features/base/hooks/use-base-table";
-import { CellText } from "@/features/base/components/cells/cell-text";
-import { CellNumber } from "@/features/base/components/cells/cell-number";
-import { CellSelect } from "@/features/base/components/cells/cell-select";
-import { CellStatus } from "@/features/base/components/cells/cell-status";
-import { CellMultiSelect } from "@/features/base/components/cells/cell-multi-select";
-import { CellDate } from "@/features/base/components/cells/cell-date";
-import { CellCheckbox } from "@/features/base/components/cells/cell-checkbox";
-import { CellUrl } from "@/features/base/components/cells/cell-url";
-import { CellEmail } from "@/features/base/components/cells/cell-email";
-import { CellPerson } from "@/features/base/components/cells/cell-person";
-import { CellFile } from "@/features/base/components/cells/cell-file";
-import { CellCreatedAt } from "@/features/base/components/cells/cell-created-at";
-import { CellLastEditedAt } from "@/features/base/components/cells/cell-last-edited-at";
-import { CellLastEditedBy } from "@/features/base/components/cells/cell-last-edited-by";
-import { RowNumberCell } from "./row-number-cell";
-import classes from "@/features/base/styles/grid.module.css";
-
-type CellComponentProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-const cellComponents: Record<
-  string,
-  React.ComponentType<CellComponentProps>
-> = {
-  text: CellText,
-  number: CellNumber,
-  select: CellSelect,
-  status: CellStatus,
-  multiSelect: CellMultiSelect,
-  date: CellDate,
-  checkbox: CellCheckbox,
-  url: CellUrl,
-  email: CellEmail,
-  person: CellPerson,
-  file: CellFile,
-  createdAt: CellCreatedAt,
-  lastEditedAt: CellLastEditedAt,
-  lastEditedBy: CellLastEditedBy,
-};
-
-type RowDragProps = {
-  draggable: boolean;
-  onDragStart: (e: React.DragEvent) => void;
-};
-
-type GridCellProps = {
-  cell: Cell<IBaseRow, unknown>;
-  rowIndex: number;
-  onCellUpdate: (rowId: string, propertyId: string, value: unknown) => void;
-  rowDragProps?: RowDragProps;
-  orderedRowIds?: string[];
-};
-
-export const GridCell = memo(function GridCell({
-  cell,
-  rowIndex,
-  onCellUpdate,
-  rowDragProps,
-  orderedRowIds,
-}: GridCellProps) {
-  const property = cell.column.columnDef.meta?.property;
-  const isRowNumber = cell.column.id === "__row_number";
-  const isPinned = cell.column.getIsPinned();
-  const pinOffset = isPinned ? cell.column.getStart("left") : undefined;
-
-  const [editingCell, setEditingCell] = useAtom(editingCellAtom) as unknown as [EditingCell, (val: EditingCell) => void];
-
-  const rowId = cell.row.id;
-  const isEditing =
-    editingCell?.rowId === rowId &&
-    editingCell?.propertyId === property?.id;
-
-  const handleDoubleClick = useCallback(() => {
-    if (!property || isRowNumber) return;
-    if (property.type === "checkbox") return;
-    if (isSystemPropertyType(property.type)) return;
-    setEditingCell({ rowId, propertyId: property.id });
-  }, [property, isRowNumber, rowId, setEditingCell]);
-
-  const handleCommit = useCallback(
-    (value: unknown) => {
-      if (!property) return;
-      const currentValue = cell.getValue();
-      const hasChanged = value !== currentValue
-        && !(value === "" && (currentValue === null || currentValue === undefined))
-        && !(value === null && (currentValue === null || currentValue === undefined));
-      if (hasChanged) {
-        onCellUpdate(rowId, property.id, value);
-      }
-      setEditingCell(null);
-    },
-    [property, rowId, cell, onCellUpdate, setEditingCell],
-  );
-
-  const handleCancel = useCallback(() => {
-    setEditingCell(null);
-  }, [setEditingCell]);
-
-  if (isRowNumber) {
-    return (
-      <RowNumberCell
-        rowId={rowId}
-        rowIndex={rowIndex}
-        orderedRowIds={orderedRowIds ?? []}
-        isPinned={Boolean(isPinned)}
-        pinOffset={pinOffset}
-        rowDragProps={rowDragProps}
-      />
-    );
-  }
-
-  if (!property) return null;
-
-  const CellComponent = cellComponents[property.type];
-  if (!CellComponent) return null;
-
-  const value = cell.getValue();
-
-  return (
-    <div
-      className={`${classes.cell} ${isPinned ? classes.cellPinned : ""} ${isEditing ? classes.cellEditing : ""} ${property.isPrimary ? classes.primaryCell : ""}`}
-      style={{
-        ...(isPinned ? { left: pinOffset } : {}),
-      }}
-      onDoubleClick={handleDoubleClick}
-    >
-      <CellComponent
-        value={value}
-        property={property}
-        rowId={rowId}
-        isEditing={isEditing}
-        onCommit={handleCommit}
-        onCancel={handleCancel}
-      />
-    </div>
-  );
-});

apps/client/src/features/base/components/grid/grid-container.tsx

@@ -1,306 +0,0 @@
-import { useRef, useMemo, useCallback, useEffect } from "react";
-import { Table } from "@tanstack/react-table";
-import { useVirtualizer } from "@tanstack/react-virtual";
-import { useAtom } from "jotai";
-import {
-  DndContext,
-  closestCenter,
-  KeyboardSensor,
-  PointerSensor,
-  useSensor,
-  useSensors,
-  DragEndEvent,
-} from "@dnd-kit/core";
-import {
-  SortableContext,
-  horizontalListSortingStrategy,
-} from "@dnd-kit/sortable";
-import { restrictToHorizontalAxis } from "@dnd-kit/modifiers";
-import { IBaseRow, IBaseProperty, EditingCell } from "@/features/base/types/base.types";
-import { editingCellAtom, activePropertyMenuAtom, propertyMenuDirtyAtom, propertyMenuCloseRequestAtom } from "@/features/base/atoms/base-atoms";
-import { useColumnResize } from "@/features/base/hooks/use-column-resize";
-import { useGridKeyboardNav } from "@/features/base/hooks/use-grid-keyboard-nav";
-import { useRowDrag } from "@/features/base/hooks/use-row-drag";
-import { useRowSelection } from "@/features/base/hooks/use-row-selection";
-import { useDeleteSelectedRows } from "@/features/base/hooks/use-delete-selected-rows";
-import { GridHeader } from "./grid-header";
-import { GridRow } from "./grid-row";
-import { AddRowButton } from "./add-row-button";
-import { SelectionActionBar } from "./selection-action-bar";
-import classes from "@/features/base/styles/grid.module.css";
-
-const ROW_HEIGHT = 36;
-const OVERSCAN = 10;
-
-type GridContainerProps = {
-  table: Table<IBaseRow>;
-  properties: IBaseProperty[];
-  onCellUpdate: (rowId: string, propertyId: string, value: unknown) => void;
-  onAddRow?: () => void;
-  baseId?: string;
-  onColumnReorder?: (columnId: string, overColumnId: string) => void;
-  onResizeEnd?: () => void;
-  onRowReorder?: (rowId: string, targetRowId: string, position: "above" | "below") => void;
-  hasNextPage?: boolean;
-  isFetchingNextPage?: boolean;
-  onFetchNextPage?: () => void;
-};
-
-export function GridContainer({
-  table,
-  properties,
-  onCellUpdate,
-  onAddRow,
-  baseId,
-  onColumnReorder,
-  onResizeEnd,
-  onRowReorder,
-  hasNextPage,
-  isFetchingNextPage,
-  onFetchNextPage,
-}: GridContainerProps) {
-  const scrollRef = useRef<HTMLDivElement>(null);
-  const lastTriggeredRowsLenRef = useRef(0);
-  const rows = table.getRowModel().rows;
-
-  const [editingCell, setEditingCell] = useAtom(editingCellAtom) as unknown as [EditingCell, (val: EditingCell) => void];
-  const [, setActivePropertyMenu] = useAtom(activePropertyMenuAtom) as unknown as [string | null, (val: string | null) => void];
-  const [propertyMenuDirty] = useAtom(propertyMenuDirtyAtom) as unknown as [boolean];
-  const [, setCloseRequest] = useAtom(propertyMenuCloseRequestAtom) as unknown as [number, (val: number) => void];
-  const propertyMenuDirtyRef = useRef(propertyMenuDirty);
-  propertyMenuDirtyRef.current = propertyMenuDirty;
-  const closeRequestCounterRef = useRef(0);
-
-  const { selectionCount, clear: clearSelection } = useRowSelection();
-  const { deleteSelected } = useDeleteSelectedRows(baseId ?? "");
-
-  useEffect(() => {
-    const handleMouseDown = (e: MouseEvent) => {
-      const target = e.target as HTMLElement;
-      if (target.closest(`.${classes.headerCell}`)) return;
-      if (target.closest("[role=\"dialog\"]")) return;
-      if (target.closest("[role=\"listbox\"]")) return;
-      if (target.closest("[data-mantine-shared-portal-node]")) return;
-      if (target.closest(`.${classes.cellEditing}`)) return;
-      if (propertyMenuDirtyRef.current) {
-        closeRequestCounterRef.current += 1;
-        setCloseRequest(closeRequestCounterRef.current);
-      } else {
-        setActivePropertyMenu(null);
-      }
-      setEditingCell(null);
-    };
-    document.addEventListener("mousedown", handleMouseDown);
-    return () => document.removeEventListener("mousedown", handleMouseDown);
-  }, [setActivePropertyMenu, setEditingCell, setCloseRequest]);
-
-  useColumnResize(table, onResizeEnd ?? (() => {}));
-
-  useGridKeyboardNav({
-    table,
-    editingCell,
-    setEditingCell,
-    containerRef: scrollRef,
-  });
-
-  const virtualizer = useVirtualizer({
-    count: rows.length,
-    getScrollElement: () => scrollRef.current,
-    estimateSize: () => ROW_HEIGHT,
-    overscan: OVERSCAN,
-  });
-
-  const virtualItems = virtualizer.getVirtualItems();
-
-  useEffect(() => {
-    if (!hasNextPage || isFetchingNextPage || !onFetchNextPage) return;
-    const lastItem = virtualItems[virtualItems.length - 1];
-    if (!lastItem) return;
-    if (lastItem.index < rows.length - OVERSCAN * 2) return;
-    if (rows.length <= lastTriggeredRowsLenRef.current) return;
-    lastTriggeredRowsLenRef.current = rows.length;
-    onFetchNextPage();
-  }, [virtualItems, rows.length, hasNextPage, isFetchingNextPage, onFetchNextPage]);
-
-  useEffect(() => {
-    // When the underlying row set shrinks (filter changed, sort toggled,
-    // view switched) or resets to zero, we're on a fresh pagination
-    // sequence — un-gate the trigger so the first page triggers a
-    // potential next fetch correctly.
-    if (rows.length === 0 || rows.length < lastTriggeredRowsLenRef.current) {
-      lastTriggeredRowsLenRef.current = 0;
-    }
-  }, [rows.length]);
-
-  useEffect(() => {
-    const el = scrollRef.current;
-    if (!el || !baseId) return;
-    const handler = (e: KeyboardEvent) => {
-      if (editingCell) return;
-      const active = document.activeElement as HTMLElement | null;
-      if (!active || !el.contains(active)) return;
-      const tag = active.tagName;
-      if (tag === "INPUT" || tag === "TEXTAREA" || active.isContentEditable) {
-        return;
-      }
-      if (e.key === "Escape" && selectionCount > 0) {
-        clearSelection();
-        return;
-      }
-      if ((e.key === "Delete" || e.key === "Backspace") && selectionCount > 0) {
-        e.preventDefault();
-        void deleteSelected();
-      }
-    };
-    el.addEventListener("keydown", handler);
-    return () => el.removeEventListener("keydown", handler);
-  }, [editingCell, selectionCount, clearSelection, deleteSelected, baseId]);
-
-  const gridTemplateColumns = useMemo(() => {
-    const visibleColumns = table.getVisibleLeafColumns();
-    const columnWidths = visibleColumns.map((col) => `${col.getSize()}px`);
-    return columnWidths.join(" ") + (baseId ? " 40px" : "");
-  }, [table, table.getState().columnSizing, table.getState().columnVisibility, table.getState().columnOrder, baseId]);
-
-  const totalHeight = virtualizer.getTotalSize();
-
-  const paddingTop =
-    virtualItems.length > 0 ? virtualItems[0]?.start ?? 0 : 0;
-  const paddingBottom =
-    virtualItems.length > 0
-      ? totalHeight - (virtualItems[virtualItems.length - 1]?.end ?? 0)
-      : 0;
-
-  const rowIds = useMemo(() => rows.map((r) => r.id), [rows]);
-
-  const handleRowReorder = useCallback(
-    (rowId: string, targetRowId: string, position: "above" | "below") => {
-      onRowReorder?.(rowId, targetRowId, position);
-    },
-    [onRowReorder],
-  );
-
-  const {
-    dragState: rowDragState,
-    handleDragStart: handleRowDragStart,
-    handleDragOver: handleRowDragOver,
-    handleDragEnd: handleRowDragEnd,
-    handleDragLeave: handleRowDragLeave,
-  } = useRowDrag({ rowIds, onReorder: handleRowReorder });
-
-  const handleAddRow = useCallback(() => {
-    onAddRow?.();
-  }, [onAddRow]);
-
-  const handlePropertyCreated = useCallback(() => {
-    // Wait for React to re-render with the new column, then scroll to it
-    requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        scrollRef.current?.scrollTo({
-          left: scrollRef.current.scrollWidth,
-          behavior: "smooth",
-        });
-      });
-    });
-  }, []);
-
-  const sensors = useSensors(
-    useSensor(PointerSensor, {
-      activationConstraint: { distance: 8 },
-    }),
-    useSensor(KeyboardSensor),
-  );
-
-  const sortableColumnIds = useMemo(() => {
-    return table
-      .getVisibleLeafColumns()
-      .filter((col) => col.id !== "__row_number")
-      .map((col) => col.id);
-  }, [table, table.getState().columnOrder]);
-
-  const handleDragEnd = useCallback(
-    (event: DragEndEvent) => {
-      const { active, over } = event;
-      if (!over || active.id === over.id) return;
-      onColumnReorder?.(active.id as string, over.id as string);
-    },
-    [onColumnReorder],
-  );
-
-  const modifiers = useMemo(() => [restrictToHorizontalAxis], []);
-
-  return (
-    <DndContext
-      sensors={sensors}
-      collisionDetection={closestCenter}
-      onDragEnd={handleDragEnd}
-      modifiers={modifiers}
-    >
-      <div
-        className={classes.gridWrapper}
-        ref={scrollRef}
-        tabIndex={0}
-      >
-        <div
-          className={classes.grid}
-          style={{ gridTemplateColumns }}
-          role="grid"
-        >
-          <SortableContext
-            items={sortableColumnIds}
-            strategy={horizontalListSortingStrategy}
-          >
-            <GridHeader
-              table={table}
-              baseId={baseId}
-              columnOrder={table.getState().columnOrder}
-              columnVisibility={table.getState().columnVisibility}
-              properties={properties}
-              loadedRowIds={rowIds}
-              onPropertyCreated={handlePropertyCreated}
-            />
-          </SortableContext>
-
-          {paddingTop > 0 && (
-            <div style={{ height: paddingTop, gridColumn: "1 / -1" }} />
-          )}
-
-          {virtualItems.map((virtualRow) => {
-            const row = rows[virtualRow.index];
-            if (!row) return null;
-            return (
-              <GridRow
-                key={row.id}
-                row={row}
-                rowIndex={virtualRow.index}
-                onCellUpdate={onCellUpdate}
-                orderedRowIds={rowIds}
-                columnVisibility={table.getState().columnVisibility}
-                dragHandlers={
-                  onRowReorder
-                    ? {
-                        onDragStart: handleRowDragStart,
-                        onDragOver: handleRowDragOver,
-                        onDragEnd: handleRowDragEnd,
-                        onDragLeave: handleRowDragLeave,
-                        isDragging: rowDragState.dragRowId === row.id,
-                        isDropTarget: rowDragState.dropTargetRowId === row.id,
-                        dropPosition: rowDragState.dropTargetRowId === row.id ? rowDragState.dropPosition : null,
-                      }
-                    : undefined
-                }
-              />
-            );
-          })}
-
-          {paddingBottom > 0 && (
-            <div style={{ height: paddingBottom, gridColumn: "1 / -1" }} />
-          )}
-
-          <AddRowButton onClick={handleAddRow} />
-          {baseId && <SelectionActionBar baseId={baseId} />}
-        </div>
-      </div>
-    </DndContext>
-  );
-}

apps/client/src/features/base/components/grid/grid-header-cell.tsx

@@ -1,214 +0,0 @@
-import { memo, useCallback, useEffect, useRef } from "react";
-import { Header, flexRender } from "@tanstack/react-table";
-import { useSortable } from "@dnd-kit/sortable";
-import { CSS } from "@dnd-kit/utilities";
-import { Popover } from "@mantine/core";
-import { useAtom } from "jotai";
-import { IBaseRow, IBaseProperty, EditingCell } from "@/features/base/types/base.types";
-import { activePropertyMenuAtom, propertyMenuDirtyAtom, propertyMenuCloseRequestAtom, editingCellAtom } from "@/features/base/atoms/base-atoms";
-import {
-  IconLetterT,
-  IconHash,
-  IconCircleDot,
-  IconProgressCheck,
-  IconTags,
-  IconCalendar,
-  IconUser,
-  IconPaperclip,
-  IconCheckbox,
-  IconLink,
-  IconMail,
-  IconClockPlus,
-  IconClockEdit,
-  IconUserEdit,
-} from "@tabler/icons-react";
-import { PropertyMenuContent } from "@/features/base/components/property/property-menu";
-import { RowNumberHeaderCell } from "./row-number-header-cell";
-import { useRowSelection } from "@/features/base/hooks/use-row-selection";
-import classes from "@/features/base/styles/grid.module.css";
-
-const typeIcons: Record<string, typeof IconLetterT> = {
-  text: IconLetterT,
-  number: IconHash,
-  select: IconCircleDot,
-  status: IconProgressCheck,
-  multiSelect: IconTags,
-  date: IconCalendar,
-  person: IconUser,
-  file: IconPaperclip,
-  checkbox: IconCheckbox,
-  url: IconLink,
-  email: IconMail,
-  createdAt: IconClockPlus,
-  lastEditedAt: IconClockEdit,
-  lastEditedBy: IconUserEdit,
-};
-
-type GridHeaderCellProps = {
-  header: Header<IBaseRow, unknown>;
-  property: IBaseProperty | undefined;
-  loadedRowIds: string[];
-};
-
-export const GridHeaderCell = memo(function GridHeaderCell({
-  header,
-  property,
-  loadedRowIds,
-}: GridHeaderCellProps) {
-  const isRowNumber = header.column.id === "__row_number";
-  const isPinned = header.column.getIsPinned();
-  const pinOffset = isPinned ? header.column.getStart("left") : undefined;
-  const { selectionCount } = useRowSelection();
-  const hasSelection = selectionCount > 0;
-
-  const [activePropertyMenu, setActivePropertyMenu] = useAtom(activePropertyMenuAtom) as unknown as [string | null, (val: string | null) => void];
-  const menuOpened = activePropertyMenu === header.column.id;
-  const cellRef = useRef<HTMLDivElement>(null);
-  const [propertyMenuDirty, setPropertyMenuDirty] = useAtom(propertyMenuDirtyAtom) as unknown as [boolean, (val: boolean) => void];
-  const [closeRequest, setCloseRequest] = useAtom(propertyMenuCloseRequestAtom) as unknown as [number, (val: number) => void];
-  const [, setEditingCell] = useAtom(editingCellAtom) as unknown as [EditingCell, (val: EditingCell) => void];
-
-  const handleDirtyChange = useCallback((dirty: boolean) => {
-    setPropertyMenuDirty(dirty);
-  }, [setPropertyMenuDirty]);
-
-  const isSortableDisabled = isRowNumber || isPinned === "left";
-
-  const {
-    attributes,
-    listeners,
-    setNodeRef,
-    transform,
-    transition,
-    isDragging,
-  } = useSortable({
-    id: header.column.id,
-    disabled: isSortableDisabled,
-  });
-
-  const combinedRef = useCallback(
-    (node: HTMLDivElement | null) => {
-      setNodeRef(node);
-      (cellRef as React.MutableRefObject<HTMLDivElement | null>).current = node;
-    },
-    [setNodeRef],
-  );
-
-  const handleHeaderClick = useCallback(() => {
-    setEditingCell(null);
-    if (!isRowNumber && property && !isDragging) {
-      if (propertyMenuDirty && !menuOpened) return;
-      setActivePropertyMenu(menuOpened ? null : header.column.id);
-    }
-  }, [isRowNumber, property, isDragging, header.column.id, menuOpened, propertyMenuDirty, setActivePropertyMenu, setEditingCell]);
-
-  const handleMenuClose = useCallback(() => {
-    setActivePropertyMenu(null);
-  }, [setActivePropertyMenu]);
-
-  // Mantine's built-in `closeOnEscape` only fires when focus is inside the
-  // dropdown, but opening the property menu (clicking the header) leaves
-  // focus on the header itself. Mirror the click-outside path: when dirty,
-  // bump `propertyMenuCloseRequestAtom` so property-menu shows its
-  // "Unsaved changes" confirmation panel; otherwise close directly.
-  useEffect(() => {
-    if (!menuOpened) return;
-    const handler = (e: KeyboardEvent) => {
-      if (e.key !== "Escape") return;
-      if (propertyMenuDirty) {
-        setCloseRequest(closeRequest + 1);
-      } else {
-        handleMenuClose();
-      }
-    };
-    document.addEventListener("keydown", handler);
-    return () => document.removeEventListener("keydown", handler);
-  }, [menuOpened, propertyMenuDirty, closeRequest, setCloseRequest, handleMenuClose]);
-
-  const TypeIcon = property ? typeIcons[property.type] : undefined;
-
-  const sortableStyle = transform
-    ? {
-        transform: CSS.Transform.toString({
-          ...transform,
-          scaleX: 1,
-          scaleY: 1,
-        }),
-        transition,
-        opacity: isDragging ? 0.5 : 1,
-        zIndex: isDragging ? 10 : undefined,
-      }
-    : {};
-
-  return (
-    <div
-      ref={combinedRef}
-      className={`${classes.headerCell} ${isPinned ? classes.headerCellPinned : ""} ${hasSelection ? classes.hasSelection : ""}`}
-      style={{
-        ...(isPinned ? { left: pinOffset } : {}),
-        ...(isRowNumber ? {} : { cursor: "pointer" }),
-        ...sortableStyle,
-      }}
-      onClick={handleHeaderClick}
-      {...(isSortableDisabled ? {} : attributes)}
-      {...(isSortableDisabled ? {} : listeners)}
-    >
-      {isRowNumber ? (
-        <RowNumberHeaderCell loadedRowIds={loadedRowIds} />
-      ) : (
-        <div className={classes.headerCellContent}>
-          {TypeIcon && (
-            <TypeIcon size={14} className={classes.headerTypeIcon} />
-          )}
-          <span className={classes.headerCellName}>
-            {flexRender(header.column.columnDef.header, header.getContext())}
-          </span>
-        </div>
-      )}
-      {header.column.getCanResize() && (
-        <div
-          className={`${classes.resizeHandle} ${
-            header.column.getIsResizing() ? classes.resizeHandleActive : ""
-          }`}
-          onMouseDown={(e) => {
-            e.stopPropagation();
-            header.getResizeHandler()(e);
-          }}
-          onTouchStart={(e) => {
-            e.stopPropagation();
-            header.getResizeHandler()(e);
-          }}
-          onPointerDown={(e) => e.stopPropagation()}
-          onClick={(e) => e.stopPropagation()}
-        />
-      )}
-      {property && !isRowNumber && (
-        <Popover
-          opened={menuOpened}
-          onClose={handleMenuClose}
-          position="bottom-start"
-          shadow="md"
-          width={260}
-          withinPortal
-          closeOnClickOutside={false}
-        >
-          <Popover.Target>
-            <div style={{ position: "absolute", inset: 0, pointerEvents: "none" }} />
-          </Popover.Target>
-          <Popover.Dropdown
-            p={0}
-            onClick={(e) => e.stopPropagation()}
-            onKeyDown={(e) => e.stopPropagation()}
-          >
-            <PropertyMenuContent
-              property={property}
-              opened={menuOpened}
-              onClose={handleMenuClose}
-              onDirtyChange={handleDirtyChange}
-            />
-          </Popover.Dropdown>
-        </Popover>
-      )}
-    </div>
-  );
-});

apps/client/src/features/base/components/grid/grid-header.tsx

@@ -1,56 +0,0 @@
-import { memo, useMemo } from "react";
-import { Table, ColumnOrderState, VisibilityState } from "@tanstack/react-table";
-import { IBaseRow, IBaseProperty } from "@/features/base/types/base.types";
-import { GridHeaderCell } from "./grid-header-cell";
-import { CreatePropertyPopover } from "@/features/base/components/property/create-property-popover";
-import classes from "@/features/base/styles/grid.module.css";
-
-type GridHeaderProps = {
-  table: Table<IBaseRow>;
-  baseId?: string;
-  // Passed explicitly to break memo when columns change
-  // (table ref is stable from useReactTable, so memo won't fire without these)
-  columnOrder: ColumnOrderState;
-  columnVisibility: VisibilityState;
-  properties: IBaseProperty[];
-  loadedRowIds: string[];
-  onPropertyCreated?: () => void;
-};
-
-export const GridHeader = memo(function GridHeader({
-  table,
-  baseId,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  columnOrder: _columnOrder,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  columnVisibility: _columnVisibility,
-  properties,
-  loadedRowIds,
-  onPropertyCreated,
-}: GridHeaderProps) {
-  const headerGroups = table.getHeaderGroups();
-  const propertyById = useMemo(() => {
-    const map = new Map<string, IBaseProperty>();
-    for (const p of properties) map.set(p.id, p);
-    return map;
-  }, [properties]);
-
-  return (
-    <div className={classes.headerRow} role="row">
-      {headerGroups[0]?.headers.map((header) => (
-        <GridHeaderCell
-          key={header.id}
-          header={header}
-          property={propertyById.get(header.column.id)}
-          loadedRowIds={loadedRowIds}
-        />
-      ))}
-      {baseId && (
-        <CreatePropertyPopover
-          baseId={baseId}
-          onPropertyCreated={onPropertyCreated}
-        />
-      )}
-    </div>
-  );
-});

apps/client/src/features/base/components/grid/grid-row.tsx

@@ -1,92 +0,0 @@
-import { memo, useCallback } from "react";
-import { Row, VisibilityState } from "@tanstack/react-table";
-import { IBaseRow } from "@/features/base/types/base.types";
-import { useRowSelection } from "@/features/base/hooks/use-row-selection";
-import { GridCell } from "./grid-cell";
-import classes from "@/features/base/styles/grid.module.css";
-
-type RowDragHandlers = {
-  onDragStart: (rowId: string) => void;
-  onDragOver: (rowId: string, e: React.DragEvent) => void;
-  onDragEnd: () => void;
-  onDragLeave: () => void;
-  isDragging: boolean;
-  isDropTarget: boolean;
-  dropPosition: "above" | "below" | null;
-};
-
-type GridRowProps = {
-  row: Row<IBaseRow>;
-  rowIndex: number;
-  onCellUpdate: (rowId: string, propertyId: string, value: unknown) => void;
-  dragHandlers?: RowDragHandlers;
-  orderedRowIds: string[];
-  columnVisibility: VisibilityState;
-};
-
-export const GridRow = memo(function GridRow({
-  row,
-  rowIndex,
-  onCellUpdate,
-  dragHandlers,
-  orderedRowIds,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  columnVisibility: _columnVisibility,
-}: GridRowProps) {
-  const isSelected = useRowSelection().isSelected(row.id);
-  const handleDragStart = useCallback(
-    (e: React.DragEvent) => {
-      e.dataTransfer.effectAllowed = "move";
-      e.dataTransfer.setData("text/plain", row.id);
-      dragHandlers?.onDragStart(row.id);
-    },
-    [row.id, dragHandlers],
-  );
-
-  const handleDragOver = useCallback(
-    (e: React.DragEvent) => {
-      dragHandlers?.onDragOver(row.id, e);
-    },
-    [row.id, dragHandlers],
-  );
-
-  const dropIndicatorClass = dragHandlers?.isDropTarget
-    ? dragHandlers.dropPosition === "above"
-      ? classes.rowDropAbove
-      : classes.rowDropBelow
-    : "";
-
-  return (
-    <div
-      className={`${classes.row} ${dragHandlers?.isDragging ? classes.rowDragging : ""} ${dropIndicatorClass} ${isSelected ? classes.rowSelected : ""}`}
-      role="row"
-      onDragOver={handleDragOver}
-      onDrop={(e) => {
-        e.preventDefault();
-        dragHandlers?.onDragEnd();
-      }}
-      onDragLeave={dragHandlers?.onDragLeave}
-    >
-      {row.getVisibleCells().map((cell) => {
-        const isRowNumber = cell.column.id === "__row_number";
-        return (
-          <GridCell
-            key={cell.id}
-            cell={cell}
-            rowIndex={rowIndex}
-            onCellUpdate={onCellUpdate}
-            orderedRowIds={orderedRowIds}
-            rowDragProps={
-              isRowNumber && dragHandlers
-                ? {
-                    draggable: true,
-                    onDragStart: handleDragStart,
-                  }
-                : undefined
-            }
-          />
-        );
-      })}
-    </div>
-  );
-});

apps/client/src/features/base/components/grid/row-number-cell.tsx

@@ -1,70 +0,0 @@
-import { memo, useCallback } from "react";
-import { Checkbox } from "@mantine/core";
-import { IconGripVertical } from "@tabler/icons-react";
-import { useRowSelection } from "@/features/base/hooks/use-row-selection";
-import classes from "@/features/base/styles/grid.module.css";
-
-type RowDragProps = {
-  draggable: boolean;
-  onDragStart: (e: React.DragEvent) => void;
-};
-
-type RowNumberCellProps = {
-  rowId: string;
-  rowIndex: number;
-  orderedRowIds: string[];
-  isPinned: boolean;
-  pinOffset?: number;
-  rowDragProps?: RowDragProps;
-};
-
-export const RowNumberCell = memo(function RowNumberCell({
-  rowId,
-  rowIndex,
-  orderedRowIds,
-  isPinned,
-  pinOffset,
-  rowDragProps,
-}: RowNumberCellProps) {
-  const { isSelected, toggle } = useRowSelection();
-  const selected = isSelected(rowId);
-
-  const handleCheckboxChange = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
-      const nativeEvent = e.nativeEvent as MouseEvent;
-      toggle(rowId, {
-        shiftKey: nativeEvent.shiftKey === true,
-        rowIndex,
-        orderedRowIds,
-      });
-    },
-    [rowId, rowIndex, orderedRowIds, toggle],
-  );
-
-  return (
-    <div
-      className={`${classes.cell} ${classes.rowNumberCell} ${isPinned ? classes.cellPinned : ""}`}
-      style={isPinned ? { left: pinOffset } : undefined}
-    >
-      <div className={classes.rowNumberCellInner}>
-        <span
-          className={classes.rowNumberDragHandle}
-          draggable={rowDragProps?.draggable}
-          onDragStart={rowDragProps?.onDragStart}
-          aria-label="Drag row"
-        >
-          <IconGripVertical size={12} />
-        </span>
-        <span className={classes.rowNumberCheckbox}>
-          <Checkbox
-            size="xs"
-            checked={selected}
-            onChange={handleCheckboxChange}
-            aria-label="Select row"
-          />
-        </span>
-        <span className={classes.rowNumberIndex}>{rowIndex + 1}</span>
-      </div>
-    </div>
-  );
-});

apps/client/src/features/base/components/grid/row-number-header-cell.tsx

@@ -1,48 +0,0 @@
-import { memo, useMemo } from "react";
-import { Checkbox, Tooltip } from "@mantine/core";
-import { useRowSelection } from "@/features/base/hooks/use-row-selection";
-import classes from "@/features/base/styles/grid.module.css";
-
-type RowNumberHeaderCellProps = {
-  loadedRowIds: string[];
-};
-
-export const RowNumberHeaderCell = memo(function RowNumberHeaderCell({
-  loadedRowIds,
-}: RowNumberHeaderCellProps) {
-  const { selectedIds, toggleAll } = useRowSelection();
-
-  const { checked, indeterminate } = useMemo(() => {
-    if (loadedRowIds.length === 0) {
-      return { checked: false, indeterminate: false };
-    }
-    const selectedInLoaded = loadedRowIds.reduce(
-      (acc, id) => (selectedIds.has(id) ? acc + 1 : acc),
-      0,
-    );
-    return {
-      checked: selectedInLoaded === loadedRowIds.length,
-      indeterminate:
-        selectedInLoaded > 0 && selectedInLoaded < loadedRowIds.length,
-    };
-  }, [loadedRowIds, selectedIds]);
-
-  if (loadedRowIds.length === 0) return null;
-
-  return (
-    <div className={classes.rowNumberHeaderInner}>
-      <span className={classes.rowNumberHeaderHash}>#</span>
-      <span className={classes.rowNumberHeaderCheckbox}>
-        <Tooltip label="Select all loaded rows" withinPortal>
-          <Checkbox
-            size="xs"
-            checked={checked}
-            indeterminate={indeterminate}
-            onChange={() => toggleAll(loadedRowIds)}
-            aria-label="Select all loaded rows"
-          />
-        </Tooltip>
-      </span>
-    </div>
-  );
-});

apps/client/src/features/base/components/grid/selection-action-bar.tsx

@@ -1,52 +0,0 @@
-import { memo } from "react";
-import { Transition } from "@mantine/core";
-import { IconTrash, IconX } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import { useRowSelection } from "@/features/base/hooks/use-row-selection";
-import { useDeleteSelectedRows } from "@/features/base/hooks/use-delete-selected-rows";
-import classes from "@/features/base/styles/grid.module.css";
-
-type SelectionActionBarProps = {
-  baseId: string;
-};
-
-export const SelectionActionBar = memo(function SelectionActionBar({
-  baseId,
-}: SelectionActionBarProps) {
-  const { t } = useTranslation();
-  const { selectionCount, clear } = useRowSelection();
-  const { deleteSelected, isPending } = useDeleteSelectedRows(baseId);
-
-  const isOpen = selectionCount > 0;
-
-  return (
-    <Transition mounted={isOpen} transition="slide-up" duration={150}>
-      {(styles) => (
-        <div className={classes.selectionActionBarWrapper} style={styles}>
-          <div className={classes.selectionActionBar} role="toolbar">
-            <span className={classes.selectionActionBarCount}>
-              {t("{{count}} selected", { count: selectionCount })}
-            </span>
-            <button
-              type="button"
-              className={classes.selectionActionBarDelete}
-              disabled={isPending}
-              onClick={() => void deleteSelected()}
-            >
-              <IconTrash size={14} />
-              {t("Delete")}
-            </button>
-            <button
-              type="button"
-              className={classes.selectionActionBarClose}
-              onClick={clear}
-              aria-label={t("Clear selection")}
-            >
-              <IconX size={14} />
-            </button>
-          </div>
-        </div>
-      )}
-    </Transition>
-  );
-});

apps/client/src/features/base/components/property/choice-editor.tsx

@@ -1,547 +0,0 @@
-import { useState, useCallback, useMemo, useEffect, useRef } from "react";
-import {
-  TextInput,
-  Group,
-  Stack,
-  Text,
-  Button,
-  Popover,
-  SimpleGrid,
-  UnstyledButton,
-  CloseButton,
-  Divider,
-} from "@mantine/core";
-import {
-  IconPlus,
-  IconGripVertical,
-  IconArrowsSort,
-} from "@tabler/icons-react";
-import {
-  DndContext,
-  closestCenter,
-  PointerSensor,
-  useSensor,
-  useSensors,
-  DragEndEvent,
-} from "@dnd-kit/core";
-import {
-  SortableContext,
-  verticalListSortingStrategy,
-  useSortable,
-  arrayMove,
-} from "@dnd-kit/sortable";
-import { restrictToVerticalAxis } from "@dnd-kit/modifiers";
-import { CSS } from "@dnd-kit/utilities";
-import { Choice } from "@/features/base/types/base.types";
-import { choiceColor } from "@/features/base/components/cells/choice-color";
-import { useTranslation } from "react-i18next";
-import { v7 as uuid7 } from "uuid";
-
-const CHOICE_COLORS = [
-  "gray", "red", "pink", "grape", "violet", "indigo",
-  "blue", "cyan", "teal", "green", "lime", "yellow", "orange",
-];
-
-const STATUS_CATEGORIES = [
-  { value: "todo", label: "To Do" },
-  { value: "inProgress", label: "In Progress" },
-  { value: "complete", label: "Complete" },
-] as const;
-
-type ChoiceEditorProps = {
-  initialChoices: Choice[];
-  onSave: (choices: Choice[]) => void;
-  onClose: () => void;
-  onDirtyChange?: (dirty: boolean) => void;
-  showCategories?: boolean;
-  hideButtons?: boolean;
-};
-
-export function ChoiceEditor({
-  initialChoices,
-  onSave,
-  onClose,
-  onDirtyChange,
-  showCategories = false,
-  hideButtons = false,
-}: ChoiceEditorProps) {
-  const { t } = useTranslation();
-  const [draft, setDraft] = useState<Choice[]>(initialChoices);
-  const [focusChoiceId, setFocusChoiceId] = useState<string | null>(null);
-
-  // Sync from parent only when not in live mode (hideButtons = create flow)
-  useEffect(() => {
-    if (!hideButtons) {
-      setDraft(initialChoices);
-    }
-  }, [initialChoices, hideButtons]);
-
-  // In live mode, propagate draft changes to parent immediately
-  const onSaveRef = useRef(onSave);
-  onSaveRef.current = onSave;
-
-  useEffect(() => {
-    if (hideButtons) {
-      onSaveRef.current(draft.filter((c) => c.name.trim()));
-    }
-  }, [hideButtons, draft]);
-
-  const isDirty = useMemo(() => {
-    if (draft.length !== initialChoices.length) return true;
-    return draft.some((d, i) => {
-      const o = initialChoices[i];
-      return d.id !== o.id || d.name !== o.name || d.color !== o.color || d.category !== o.category;
-    });
-  }, [draft, initialChoices]);
-
-  useEffect(() => {
-    onDirtyChange?.(isDirty);
-  }, [isDirty, onDirtyChange]);
-
-  const hasEmptyNames = draft.some((c) => !c.name.trim());
-
-  const handleRename = useCallback((choiceId: string, name: string) => {
-    setDraft((prev) => prev.map((c) => (c.id === choiceId ? { ...c, name } : c)));
-  }, []);
-
-  const handleColorChange = useCallback((choiceId: string, color: string) => {
-    setDraft((prev) => prev.map((c) => (c.id === choiceId ? { ...c, color } : c)));
-  }, []);
-
-  const handleRemove = useCallback((choiceId: string) => {
-    setDraft((prev) => prev.filter((c) => c.id !== choiceId));
-  }, []);
-
-  const handleAdd = useCallback((category?: "todo" | "inProgress" | "complete") => {
-    const id = uuid7();
-    setDraft((prev) => {
-      const colorIndex = prev.length % CHOICE_COLORS.length;
-      const newChoice: Choice = {
-        id,
-        name: "",
-        color: CHOICE_COLORS[colorIndex],
-        ...(category ? { category } : {}),
-      };
-      return [...prev, newChoice];
-    });
-    setFocusChoiceId(id);
-  }, []);
-
-  const handleAlphabetize = useCallback(() => {
-    setDraft((prev) => [...prev].sort((a, b) => a.name.localeCompare(b.name)));
-  }, []);
-
-  const handleSave = useCallback(() => {
-    const cleaned = draft.filter((c) => c.name.trim());
-    onSave(cleaned);
-    onClose();
-  }, [draft, onSave, onClose]);
-
-  const handleCancel = useCallback(() => {
-    setDraft(initialChoices);
-    onDirtyChange?.(false);
-    onClose();
-  }, [initialChoices, onDirtyChange, onClose]);
-
-  const handleReorder = useCallback((activeId: string, overId: string) => {
-    setDraft((prev) => {
-      const oldIndex = prev.findIndex((c) => c.id === activeId);
-      const newIndex = prev.findIndex((c) => c.id === overId);
-      if (oldIndex === -1 || newIndex === -1) return prev;
-      return arrayMove(prev, oldIndex, newIndex);
-    });
-  }, []);
-
-  const handleCategoryReorder = useCallback(
-    (category: string, activeId: string, overId: string) => {
-      setDraft((prev) => {
-        const catChoices = prev.filter((c) => (c.category ?? "todo") === category);
-        const oldIndex = catChoices.findIndex((c) => c.id === activeId);
-        const newIndex = catChoices.findIndex((c) => c.id === overId);
-        if (oldIndex === -1 || newIndex === -1) return prev;
-        const reordered = arrayMove(catChoices, oldIndex, newIndex);
-        const result: Choice[] = [];
-        for (const cat of ["todo", "inProgress", "complete"]) {
-          if (cat === category) {
-            result.push(...reordered);
-          } else {
-            result.push(...prev.filter((c) => (c.category ?? "todo") === cat));
-          }
-        }
-        return result;
-      });
-    },
-    [],
-  );
-
-  return (
-    <Stack gap="xs">
-      <Group justify="space-between">
-        <Text size="xs" fw={600}>
-          {t("Options")}
-        </Text>
-        <UnstyledButton onClick={handleAlphabetize} style={{ display: "flex", alignItems: "center", gap: 4 }}>
-          <IconArrowsSort size={14} color="var(--mantine-color-dimmed)" />
-          <Text size="xs" c="dimmed">{t("Alphabetize")}</Text>
-        </UnstyledButton>
-      </Group>
-
-      {showCategories ? (
-        <StatusChoiceList
-          draft={draft}
-          focusChoiceId={focusChoiceId}
-          onFocused={() => setFocusChoiceId(null)}
-          onRename={handleRename}
-          onColorChange={handleColorChange}
-          onRemove={handleRemove}
-          onAdd={handleAdd}
-          onCategoryReorder={handleCategoryReorder}
-        />
-      ) : (
-        <FlatChoiceList
-          draft={draft}
-          focusChoiceId={focusChoiceId}
-          onFocused={() => setFocusChoiceId(null)}
-          onRename={handleRename}
-          onColorChange={handleColorChange}
-          onRemove={handleRemove}
-          onAdd={handleAdd}
-          onReorder={handleReorder}
-        />
-      )}
-
-      {!hideButtons && (
-        <>
-          <Divider />
-
-          <Group justify="flex-end" gap="xs">
-            <Button variant="default" size="xs" onClick={handleCancel}>
-              {t("Cancel")}
-            </Button>
-            <Button size="xs" onClick={handleSave} disabled={!isDirty || hasEmptyNames}>
-              {t("Save")}
-            </Button>
-          </Group>
-        </>
-      )}
-    </Stack>
-  );
-}
-
-function FlatChoiceList({
-  draft,
-  focusChoiceId,
-  onFocused,
-  onRename,
-  onColorChange,
-  onRemove,
-  onAdd,
-  onReorder,
-}: {
-  draft: Choice[];
-  focusChoiceId: string | null;
-  onFocused: () => void;
-  onRename: (id: string, name: string) => void;
-  onColorChange: (id: string, color: string) => void;
-  onRemove: (id: string) => void;
-  onAdd: () => void;
-  onReorder: (activeId: string, overId: string) => void;
-}) {
-  const { t } = useTranslation();
-  const choiceIds = useMemo(() => draft.map((c) => c.id), [draft]);
-
-  const sensors = useSensors(
-    useSensor(PointerSensor, { activationConstraint: { distance: 5 } }),
-  );
-
-  const handleDragEnd = useCallback(
-    (event: DragEndEvent) => {
-      const { active, over } = event;
-      if (!over || active.id === over.id) return;
-      onReorder(active.id as string, over.id as string);
-    },
-    [onReorder],
-  );
-
-  const modifiers = useMemo(() => [restrictToVerticalAxis], []);
-
-  return (
-    <Stack gap={4}>
-      <DndContext
-        sensors={sensors}
-        collisionDetection={closestCenter}
-        onDragEnd={handleDragEnd}
-        modifiers={modifiers}
-      >
-        <SortableContext items={choiceIds} strategy={verticalListSortingStrategy}>
-          {draft.map((choice) => (
-            <SortableChoiceRow
-              key={choice.id}
-              choice={choice}
-              autoFocus={choice.id === focusChoiceId}
-              onFocused={onFocused}
-              onRename={onRename}
-              onColorChange={onColorChange}
-              onRemove={onRemove}
-            />
-          ))}
-        </SortableContext>
-      </DndContext>
-
-      <UnstyledButton
-        onClick={() => onAdd()}
-        style={{ display: "flex", alignItems: "center", gap: 6, padding: "4px 0" }}
-      >
-        <IconPlus size={14} color="var(--mantine-color-dimmed)" />
-        <Text size="xs" c="dimmed">{t("Add option")}</Text>
-      </UnstyledButton>
-    </Stack>
-  );
-}
-
-function StatusChoiceList({
-  draft,
-  focusChoiceId,
-  onFocused,
-  onRename,
-  onColorChange,
-  onRemove,
-  onAdd,
-  onCategoryReorder,
-}: {
-  draft: Choice[];
-  focusChoiceId: string | null;
-  onFocused: () => void;
-  onRename: (id: string, name: string) => void;
-  onColorChange: (id: string, color: string) => void;
-  onRemove: (id: string) => void;
-  onAdd: (category: "todo" | "inProgress" | "complete") => void;
-  onCategoryReorder: (category: string, activeId: string, overId: string) => void;
-}) {
-  const grouped = useMemo(() => {
-    const groups: Record<string, Choice[]> = { todo: [], inProgress: [], complete: [] };
-    for (const choice of draft) {
-      const cat = choice.category ?? "todo";
-      (groups[cat] ?? groups.todo).push(choice);
-    }
-    return groups;
-  }, [draft]);
-
-  return (
-    <Stack gap="sm">
-      {STATUS_CATEGORIES.map(({ value: category, label }) => (
-        <CategorySection
-          key={category}
-          category={category as "todo" | "inProgress" | "complete"}
-          label={label}
-          choices={grouped[category] ?? []}
-          focusChoiceId={focusChoiceId}
-          onFocused={onFocused}
-          onRename={onRename}
-          onColorChange={onColorChange}
-          onRemove={onRemove}
-          onAdd={onAdd}
-          onReorder={onCategoryReorder}
-        />
-      ))}
-    </Stack>
-  );
-}
-
-function CategorySection({
-  category,
-  label,
-  choices,
-  focusChoiceId,
-  onFocused,
-  onRename,
-  onColorChange,
-  onRemove,
-  onAdd,
-  onReorder,
-}: {
-  category: "todo" | "inProgress" | "complete";
-  label: string;
-  choices: Choice[];
-  focusChoiceId: string | null;
-  onFocused: () => void;
-  onRename: (id: string, name: string) => void;
-  onColorChange: (id: string, color: string) => void;
-  onRemove: (id: string) => void;
-  onAdd: (category: "todo" | "inProgress" | "complete") => void;
-  onReorder: (category: string, activeId: string, overId: string) => void;
-}) {
-  const { t } = useTranslation();
-  const choiceIds = useMemo(() => choices.map((c) => c.id), [choices]);
-
-  const sensors = useSensors(
-    useSensor(PointerSensor, { activationConstraint: { distance: 5 } }),
-  );
-
-  const handleDragEnd = useCallback(
-    (event: DragEndEvent) => {
-      const { active, over } = event;
-      if (!over || active.id === over.id) return;
-      onReorder(category, active.id as string, over.id as string);
-    },
-    [category, onReorder],
-  );
-
-  const modifiers = useMemo(() => [restrictToVerticalAxis], []);
-
-  return (
-    <Stack gap={4}>
-      <Text size="xs" fw={600} c="dimmed">
-        {t(label)}
-      </Text>
-
-      <DndContext
-        sensors={sensors}
-        collisionDetection={closestCenter}
-        onDragEnd={handleDragEnd}
-        modifiers={modifiers}
-      >
-        <SortableContext items={choiceIds} strategy={verticalListSortingStrategy}>
-          {choices.map((choice) => (
-            <SortableChoiceRow
-              key={choice.id}
-              choice={choice}
-              autoFocus={choice.id === focusChoiceId}
-              onFocused={onFocused}
-              onRename={onRename}
-              onColorChange={onColorChange}
-              onRemove={onRemove}
-            />
-          ))}
-        </SortableContext>
-      </DndContext>
-
-      <UnstyledButton
-        onClick={() => onAdd(category)}
-        style={{ display: "flex", alignItems: "center", gap: 6, padding: "4px 0" }}
-      >
-        <IconPlus size={14} color="var(--mantine-color-dimmed)" />
-        <Text size="xs" c="dimmed">{t("Add option")}</Text>
-      </UnstyledButton>
-    </Stack>
-  );
-}
-
-function SortableChoiceRow({
-  choice,
-  autoFocus,
-  onFocused,
-  onRename,
-  onColorChange,
-  onRemove,
-}: {
-  choice: Choice;
-  autoFocus?: boolean;
-  onFocused?: () => void;
-  onRename: (id: string, name: string) => void;
-  onColorChange: (id: string, color: string) => void;
-  onRemove: (id: string) => void;
-}) {
-  const inputRef = useRef<HTMLInputElement>(null);
-  const {
-    attributes,
-    listeners,
-    setNodeRef,
-    transform,
-    transition,
-    isDragging,
-  } = useSortable({ id: choice.id });
-
-  useEffect(() => {
-    if (autoFocus) {
-      inputRef.current?.focus();
-      onFocused?.();
-    }
-  }, [autoFocus, onFocused]);
-
-  const style = {
-    transform: CSS.Transform.toString(transform ? { ...transform, scaleX: 1, scaleY: 1 } : null),
-    transition,
-    opacity: isDragging ? 0.5 : 1,
-    zIndex: isDragging ? 10 : undefined,
-  };
-
-  const hasError = !choice.name.trim();
-
-  return (
-    <Group ref={setNodeRef} style={style} gap={6} wrap="nowrap" align="center">
-      <div
-        {...attributes}
-        {...listeners}
-        style={{ flexShrink: 0, cursor: "grab", display: "flex", alignItems: "center" }}
-      >
-        <IconGripVertical size={14} style={{ opacity: 0.4 }} />
-      </div>
-      <ColorDot color={choice.color} onChange={(c) => onColorChange(choice.id, c)} />
-      <TextInput
-        ref={inputRef}
-        size="xs"
-        value={choice.name}
-        onChange={(e) => onRename(choice.id, e.currentTarget.value)}
-        style={{ flex: 1 }}
-        error={hasError}
-        styles={hasError ? { input: { borderColor: "var(--mantine-color-red-6)" } } : undefined}
-      />
-      <CloseButton size="sm" onClick={() => onRemove(choice.id)} />
-    </Group>
-  );
-}
-
-function ColorDot({
-  color,
-  onChange,
-}: {
-  color: string;
-  onChange: (color: string) => void;
-}) {
-  const [opened, setOpened] = useState(false);
-  const colors = choiceColor(color);
-
-  return (
-    <Popover opened={opened} onChange={setOpened} position="bottom" shadow="sm" withinPortal>
-      <Popover.Target>
-        <UnstyledButton
-          onClick={() => setOpened((o) => !o)}
-          style={{
-            width: 20,
-            height: 20,
-            borderRadius: "50%",
-            backgroundColor: colors.backgroundColor as string,
-            border: `2px solid ${colors.color as string}`,
-            flexShrink: 0,
-          }}
-        />
-      </Popover.Target>
-      <Popover.Dropdown p={8}>
-        <SimpleGrid cols={5} spacing={6}>
-          {CHOICE_COLORS.map((c) => {
-            const dotColors = choiceColor(c);
-            return (
-              <UnstyledButton
-                key={c}
-                onClick={() => {
-                  onChange(c);
-                  setOpened(false);
-                }}
-                style={{
-                  width: 24,
-                  height: 24,
-                  borderRadius: "50%",
-                  backgroundColor: dotColors.backgroundColor as string,
-                  border: c === color
-                    ? `2px solid ${dotColors.color as string}`
-                    : "2px solid transparent",
-                }}
-              />
-            );
-          })}
-        </SimpleGrid>
-      </Popover.Dropdown>
-    </Popover>
-  );
-}

apps/client/src/features/base/components/property/create-property-popover.tsx

@@ -1,316 +0,0 @@
-import { useState, useCallback, useRef, useEffect, useMemo } from "react";
-import {
-  Popover,
-  Portal,
-  TextInput,
-  Button,
-  Group,
-  Stack,
-  Divider,
-  UnstyledButton,
-  Text,
-  ScrollArea,
-} from "@mantine/core";
-import { IconPlus, IconChevronRight } from "@tabler/icons-react";
-import { useTranslation } from "react-i18next";
-import {
-  BasePropertyType,
-  IBaseProperty,
-  TypeOptions,
-} from "@/features/base/types/base.types";
-import { useCreatePropertyMutation } from "@/features/base/queries/base-property-query";
-import { PropertyTypePicker, propertyTypes } from "./property-type-picker";
-import { PropertyOptions } from "./property-options";
-import classes from "@/features/base/styles/grid.module.css";
-
-type CreatePropertyPopoverProps = {
-  baseId: string;
-  onPropertyCreated?: () => void;
-};
-
-type Panel = "typePicker" | "configure" | "confirmDiscard";
-
-const noop = () => {};
-
-// Keep in sync with the switch cases in PropertyOptions
-const typesWithOptions = new Set<BasePropertyType>([
-  "select",
-  "multiSelect",
-  "status",
-  "number",
-  "date",
-  "person",
-]);
-
-export function CreatePropertyPopover({ baseId, onPropertyCreated }: CreatePropertyPopoverProps) {
-  const { t } = useTranslation();
-  const [opened, setOpened] = useState(false);
-  const [panel, setPanel] = useState<Panel>("typePicker");
-  const [selectedType, setSelectedType] = useState<BasePropertyType | null>(null);
-  const [name, setName] = useState("");
-  const [typeOptions, setTypeOptions] = useState<Record<string, unknown>>({});
-  const nameInputRef = useRef<HTMLInputElement>(null);
-
-  const createPropertyMutation = useCreatePropertyMutation();
-
-  const selectedTypeDef = useMemo(
-    () => propertyTypes.find((pt) => pt.type === selectedType),
-    [selectedType],
-  );
-  const selectedTypeLabel = selectedTypeDef ? t(selectedTypeDef.labelKey) : "";
-  const selectedTypeIcon = selectedTypeDef?.icon;
-
-  const hasContent = useMemo(() => {
-    return name.trim().length > 0 || Object.keys(typeOptions).length > 0;
-  }, [name, typeOptions]);
-
-  const resetState = useCallback(() => {
-    setPanel("typePicker");
-    setSelectedType(null);
-    setName("");
-    setTypeOptions({});
-  }, []);
-
-  const handleOpen = useCallback(() => {
-    resetState();
-    setOpened(true);
-  }, [resetState]);
-
-  const handleClose = useCallback(() => {
-    setOpened(false);
-    resetState();
-  }, [resetState]);
-
-  const attemptClose = useCallback(() => {
-    if (panel === "configure" && hasContent) {
-      setPanel("confirmDiscard");
-    } else {
-      handleClose();
-    }
-  }, [panel, hasContent, handleClose]);
-
-  const handleConfirmDiscard = useCallback(() => {
-    handleClose();
-  }, [handleClose]);
-
-  const handleCancelDiscard = useCallback(() => {
-    setPanel("configure");
-  }, []);
-
-  const handleTypeSelect = useCallback((type: BasePropertyType) => {
-    setSelectedType(type);
-    setTypeOptions({});
-    setPanel("configure");
-  }, []);
-
-  useEffect(() => {
-    if (panel === "configure") {
-      setTimeout(() => nameInputRef.current?.focus(), 0);
-    }
-  }, [panel]);
-
-  const handleCreate = useCallback(() => {
-    if (!selectedType) return;
-    const finalName = name.trim() || selectedTypeLabel;
-    createPropertyMutation.mutate(
-      {
-        baseId,
-        name: finalName,
-        type: selectedType,
-        typeOptions: Object.keys(typeOptions).length > 0
-          ? typeOptions as TypeOptions
-          : undefined,
-      },
-      {
-        onSuccess: () => {
-          onPropertyCreated?.();
-        },
-      },
-    );
-    handleClose();
-  }, [selectedType, name, selectedTypeLabel, typeOptions, baseId, createPropertyMutation, handleClose, onPropertyCreated]);
-
-  const handleBackToTypePicker = useCallback(() => {
-    setPanel("typePicker");
-    setTypeOptions({});
-  }, []);
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Escape") {
-        e.preventDefault();
-        e.stopPropagation();
-        if (panel === "confirmDiscard") {
-          handleCancelDiscard();
-        } else if (panel === "configure") {
-          handleBackToTypePicker();
-        } else {
-          handleClose();
-        }
-      }
-    },
-    [panel, handleBackToTypePicker, handleClose, handleCancelDiscard],
-  );
-
-  const handleNameKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Enter") {
-        e.preventDefault();
-        handleCreate();
-      }
-    },
-    [handleCreate],
-  );
-
-  const handleOptionsUpdate = useCallback(
-    (newTypeOptions: Record<string, unknown>) => {
-      setTypeOptions(newTypeOptions);
-    },
-    [],
-  );
-
-  const syntheticProperty: IBaseProperty = useMemo(() => ({
-    id: "",
-    baseId,
-    name: name || "",
-    type: selectedType ?? "text",
-    position: "",
-    typeOptions: typeOptions as TypeOptions,
-    isPrimary: false,
-    workspaceId: "",
-    createdAt: "",
-    updatedAt: "",
-  }), [baseId, name, selectedType, typeOptions]);
-
-  const TypeIcon = selectedTypeIcon;
-  const showOptions = selectedType && typesWithOptions.has(selectedType);
-
-  return (
-    <>
-      {opened && (
-        <Portal>
-          <div
-            style={{
-              position: "fixed",
-              inset: 0,
-              zIndex: 299,
-            }}
-            onClick={attemptClose}
-          />
-        </Portal>
-      )}
-      <Popover
-        opened={opened}
-        onClose={noop}
-        position="bottom-start"
-        shadow="md"
-        width={320}
-        withinPortal
-      >
-        <Popover.Target>
-          <div
-            className={classes.addColumnButton}
-            onClick={handleOpen}
-            role="button"
-            tabIndex={0}
-          >
-            <IconPlus size={16} />
-          </div>
-        </Popover.Target>
-        <Popover.Dropdown
-          p={0}
-          onClick={(e) => e.stopPropagation()}
-          onKeyDown={handleKeyDown}
-          style={{ zIndex: 300 }}
-        >
-          {panel === "typePicker" && (
-            <Stack gap={0} p={4}>
-              <PropertyTypePicker
-                onSelect={handleTypeSelect}
-                showSearch
-              />
-            </Stack>
-          )}
-          {(panel === "configure" || panel === "confirmDiscard") && (
-            <Stack gap={0} p="sm" style={panel === "confirmDiscard" ? { display: "none" } : undefined}>
-              <TextInput
-                ref={nameInputRef}
-                size="xs"
-                placeholder={selectedTypeLabel}
-                value={name}
-                onChange={(e) => setName(e.currentTarget.value)}
-                onKeyDown={handleNameKeyDown}
-                mb="xs"
-              />
-              <UnstyledButton
-                onClick={handleBackToTypePicker}
-                py={6}
-                px={0}
-                mb={showOptions ? "xs" : 0}
-              >
-                <Group gap={8} wrap="nowrap">
-                  {TypeIcon && <TypeIcon size={14} />}
-                  <Text size="sm" style={{ flex: 1 }}>
-                    {selectedTypeLabel}
-                  </Text>
-                  <IconChevronRight size={14} />
-                </Group>
-              </UnstyledButton>
-
-              {showOptions && (
-                <>
-                  <Divider mb="xs" />
-                  <ScrollArea.Autosize mah={300} scrollbarSize={6} offsetScrollbars>
-                    <PropertyOptions
-                      property={syntheticProperty}
-                      onUpdate={handleOptionsUpdate}
-                      onClose={noop}
-                      onDirtyChange={noop}
-                      hideButtons
-                    />
-                  </ScrollArea.Autosize>
-                </>
-              )}
-
-              <Divider my="xs" />
-              <Group gap="xs" justify="flex-end">
-                <Button variant="default" size="xs" onClick={attemptClose}>
-                  {t("Cancel")}
-                </Button>
-                <Button size="xs" onClick={handleCreate}>
-                  {t("Create field")}
-                </Button>
-              </Group>
-            </Stack>
-          )}
-          {panel === "confirmDiscard" && (
-            <Stack gap="xs" p="sm">
-              <Text size="sm" fw={600}>
-                {t("Unsaved changes")}
-              </Text>
-              <Text size="xs" c="dimmed">
-                {t("You have unsaved changes. Do you want to discard them?")}
-              </Text>
-              <Group gap="xs" justify="flex-end">
-                <Button
-                  variant="default"
-                  size="xs"
-                  onClick={handleCancelDiscard}
-                >
-                  {t("Keep editing")}
-                </Button>
-                <Button
-                  color="red"
-                  size="xs"
-                  onClick={handleConfirmDiscard}
-                >
-                  {t("Discard")}
-                </Button>
-              </Group>
-            </Stack>
-          )}
-        </Popover.Dropdown>
-      </Popover>
-    </>
-  );
-}

apps/client/src/features/base/components/property/property-menu.tsx

@@ -1,416 +0,0 @@
-import { useState, useCallback, useRef, useEffect } from "react";
-import {
-  UnstyledButton,
-  TextInput,
-  Button,
-  Stack,
-  Text,
-  Group,
-  ActionIcon,
-  Divider,
-  ScrollArea,
-} from "@mantine/core";
-import {
-  IconTrash,
-  IconPencil,
-  IconChevronRight,
-  IconSettings,
-} from "@tabler/icons-react";
-import { IBaseProperty } from "@/features/base/types/base.types";
-import { useAtom } from "jotai";
-import { propertyMenuCloseRequestAtom } from "@/features/base/atoms/base-atoms";
-import {
-  useUpdatePropertyMutation,
-  useDeletePropertyMutation,
-} from "@/features/base/queries/base-property-query";
-import { propertyTypes } from "./property-type-picker";
-import { PropertyOptions } from "./property-options";
-import { useTranslation } from "react-i18next";
-import { isSystemPropertyType } from "@/features/base/hooks/use-base-table";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type PropertyMenuContentProps = {
-  property: IBaseProperty;
-  opened: boolean;
-  onClose: () => void;
-  onDirtyChange?: (dirty: boolean) => void;
-};
-
-type MenuPanel = "main" | "rename" | "options" | "confirmDelete" | "confirmDiscard";
-
-export function PropertyMenuContent({
-  property,
-  opened,
-  onClose,
-  onDirtyChange,
-}: PropertyMenuContentProps) {
-  const { t } = useTranslation();
-  const [panel, setPanel] = useState<MenuPanel>("main");
-  const [renameValue, setRenameValue] = useState(property.name);
-  const renameInputRef = useRef<HTMLInputElement>(null);
-  const [optionsDirty, setOptionsDirty] = useState(false);
-  const pendingActionRef = useRef<"back" | "close" | null>(null);
-  const sourcePanelRef = useRef<"rename" | "options" | null>(null);
-  const [closeRequest] = useAtom(propertyMenuCloseRequestAtom) as unknown as [number];
-  const closeRequestRef = useRef(closeRequest);
-
-  const renameDirty = renameValue !== property.name;
-
-  const updatePropertyMutation = useUpdatePropertyMutation();
-  const deletePropertyMutation = useDeletePropertyMutation();
-
-  useEffect(() => {
-    if (opened) {
-      setPanel("main");
-      setRenameValue(property.name);
-      setOptionsDirty(false);
-    }
-  }, [opened, property.name]);
-
-  useEffect(() => {
-    if (panel === "rename") {
-      setTimeout(() => renameInputRef.current?.select(), 0);
-    }
-  }, [panel]);
-
-  const handleOptionsDirtyChange = useCallback((dirty: boolean) => {
-    setOptionsDirty(dirty);
-  }, []);
-
-  // Single dirty signal to the outside — reflects whichever panel is
-  // currently accumulating unsaved work. Keeps rename and options in
-  // lockstep with the `propertyMenuDirtyAtom` so the grid-container's
-  // outside-click handler and the header's ESC handler both prompt
-  // "Unsaved changes" consistently.
-  useEffect(() => {
-    const dirty =
-      (panel === "rename" && renameDirty) ||
-      (panel === "options" && optionsDirty);
-    onDirtyChange?.(dirty);
-  }, [panel, renameDirty, optionsDirty, onDirtyChange]);
-
-  const commitRename = useCallback(() => {
-    const trimmed = renameValue.trim();
-    if (trimmed && trimmed !== property.name) {
-      updatePropertyMutation.mutate({
-        propertyId: property.id,
-        baseId: property.baseId,
-        name: trimmed,
-      });
-    }
-  }, [renameValue, property, updatePropertyMutation]);
-
-  const handleRenameAndClose = useCallback(() => {
-    commitRename();
-    onClose();
-  }, [commitRename, onClose]);
-
-  const requestClose = useCallback(() => {
-    if (panel === "rename" && renameDirty) {
-      sourcePanelRef.current = "rename";
-      pendingActionRef.current = "close";
-      setPanel("confirmDiscard");
-    } else if (panel === "options" && optionsDirty) {
-      sourcePanelRef.current = "options";
-      pendingActionRef.current = "close";
-      setPanel("confirmDiscard");
-    } else {
-      onClose();
-    }
-  }, [panel, renameDirty, optionsDirty, onClose]);
-
-  const handleRenameKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      e.stopPropagation();
-      if (e.key === "Enter") {
-        e.preventDefault();
-        handleRenameAndClose();
-      }
-      if (e.key === "Escape") {
-        e.preventDefault();
-        requestClose();
-      }
-    },
-    [handleRenameAndClose, requestClose],
-  );
-
-  const handleOptionsUpdate = useCallback(
-    (typeOptions: Record<string, unknown>) => {
-      updatePropertyMutation.mutate({
-        propertyId: property.id,
-        baseId: property.baseId,
-        typeOptions,
-      });
-      setOptionsDirty(false);
-    },
-    [property, updatePropertyMutation],
-  );
-
-  const handleDelete = useCallback(() => {
-    deletePropertyMutation.mutate({
-      propertyId: property.id,
-      baseId: property.baseId,
-    });
-    onClose();
-  }, [property, deletePropertyMutation, onClose]);
-
-  const handleOptionsBack = useCallback(() => {
-    if (optionsDirty) {
-      sourcePanelRef.current = "options";
-      pendingActionRef.current = "back";
-      setPanel("confirmDiscard");
-    } else {
-      setPanel("main");
-    }
-  }, [optionsDirty]);
-
-  useEffect(() => {
-    if (closeRequest !== closeRequestRef.current) {
-      closeRequestRef.current = closeRequest;
-      if (opened) {
-        requestClose();
-      }
-    }
-  }, [closeRequest, opened, requestClose]);
-
-  const handleConfirmDiscard = useCallback(() => {
-    setOptionsDirty(false);
-    setRenameValue(property.name);
-    const action = pendingActionRef.current;
-    pendingActionRef.current = null;
-    sourcePanelRef.current = null;
-    if (action === "back") {
-      setPanel("main");
-    } else {
-      onClose();
-    }
-  }, [property.name, onClose]);
-
-  const handleCancelDiscard = useCallback(() => {
-    const source = sourcePanelRef.current ?? "options";
-    pendingActionRef.current = null;
-    sourcePanelRef.current = null;
-    setPanel(source);
-  }, []);
-
-  return (
-    <>
-      {panel === "main" && (
-        <MainPanel
-          property={property}
-          onRename={() => setPanel("rename")}
-          onOptions={() => setPanel("options")}
-          onDelete={() => setPanel("confirmDelete")}
-        />
-      )}
-      {panel === "rename" && (
-        <Stack gap="xs" p="sm">
-          <Text size="xs" fw={600} c="dimmed">
-            {t("Rename property")}
-          </Text>
-          <TextInput
-            ref={renameInputRef}
-            size="xs"
-            value={renameValue}
-            onChange={(e) => setRenameValue(e.currentTarget.value)}
-            onKeyDown={handleRenameKeyDown}
-          />
-          <Divider />
-          <Group justify="flex-end" gap="xs">
-            <Button variant="default" size="xs" onClick={requestClose}>
-              {t("Cancel")}
-            </Button>
-            <Button
-              size="xs"
-              onClick={handleRenameAndClose}
-              disabled={!renameValue.trim() || renameValue.trim() === property.name}
-            >
-              {t("Save")}
-            </Button>
-          </Group>
-        </Stack>
-      )}
-      {(panel === "options" || panel === "confirmDiscard") && (
-        <Stack gap="xs" p="sm" style={panel === "confirmDiscard" ? { display: "none" } : undefined}>
-          <Group gap="xs">
-            <ActionIcon
-              variant="subtle"
-              color="gray"
-              size="xs"
-              onClick={handleOptionsBack}
-            >
-              <IconChevronRight
-                size={14}
-                style={{ transform: "rotate(180deg)" }}
-              />
-            </ActionIcon>
-            <Text size="xs" fw={600} c="dimmed">
-              {t("Property options")}
-            </Text>
-          </Group>
-          <ScrollArea.Autosize mah={400} scrollbarSize={6} offsetScrollbars>
-            <PropertyOptions
-              property={property}
-              onUpdate={handleOptionsUpdate}
-              onClose={onClose}
-              onDirtyChange={handleOptionsDirtyChange}
-            />
-          </ScrollArea.Autosize>
-        </Stack>
-      )}
-      {panel === "confirmDelete" && (
-        <Stack gap="xs" p="sm">
-          <Text size="sm" fw={600}>
-            {t("Delete property")}
-          </Text>
-          <Text size="xs" c="dimmed">
-            {t("Are you sure you want to delete")} <b>{property.name}</b>?{" "}
-            {t("All data in this column will be lost.")}
-          </Text>
-          <Group gap="xs" justify="flex-end">
-            <Button
-              variant="default"
-              size="xs"
-              onClick={() => setPanel("main")}
-            >
-              {t("Cancel")}
-            </Button>
-            <Button
-              color="red"
-              size="xs"
-              onClick={handleDelete}
-            >
-              {t("Delete")}
-            </Button>
-          </Group>
-        </Stack>
-      )}
-      {panel === "confirmDiscard" && (
-        <Stack gap="xs" p="sm">
-          <Text size="sm" fw={600}>
-            {t("Unsaved changes")}
-          </Text>
-          <Text size="xs" c="dimmed">
-            {t("You have unsaved changes. Do you want to discard them?")}
-          </Text>
-          <Group gap="xs" justify="flex-end">
-            <Button
-              variant="default"
-              size="xs"
-              onClick={handleCancelDiscard}
-            >
-              {t("Keep editing")}
-            </Button>
-            <Button
-              color="red"
-              size="xs"
-              onClick={handleConfirmDiscard}
-            >
-              {t("Discard")}
-            </Button>
-          </Group>
-        </Stack>
-      )}
-    </>
-  );
-}
-
-// Expose requestClose for use by parent (grid-header-cell)
-PropertyMenuContent.displayName = "PropertyMenuContent";
-
-function MenuItem({
-  icon,
-  label,
-  rightIcon,
-  color,
-  onClick,
-}: {
-  icon: React.ReactNode;
-  label: string;
-  rightIcon?: React.ReactNode;
-  color?: string;
-  onClick: () => void;
-}) {
-  return (
-    <UnstyledButton
-      className={cellClasses.menuItem}
-      onClick={onClick}
-      style={{ color: color ? `var(--mantine-color-${color}-6)` : undefined }}
-    >
-      <Group gap={8} wrap="nowrap" style={{ flex: 1 }}>
-        {icon}
-        <Text size="sm">{label}</Text>
-      </Group>
-      {rightIcon}
-    </UnstyledButton>
-  );
-}
-
-function MainPanel({
-  property,
-  onRename,
-  onOptions,
-  onDelete,
-}: {
-  property: IBaseProperty;
-  onRename: () => void;
-  onOptions: () => void;
-  onDelete: () => void;
-}) {
-  const { t } = useTranslation();
-
-  const isSystem = isSystemPropertyType(property.type);
-
-  const hasOptions =
-    !isSystem &&
-    (property.type === "select" ||
-    property.type === "multiSelect" ||
-    property.type === "status" ||
-    property.type === "number" ||
-    property.type === "date");
-
-  const typeDef = propertyTypes.find((pt) => pt.type === property.type);
-  const TypeIcon = typeDef?.icon;
-
-  return (
-    <Stack gap={0} p={4}>
-      <MenuItem
-        icon={<IconPencil size={14} />}
-        label={t("Rename")}
-        onClick={onRename}
-      />
-      {!isSystem && (
-        <Stack gap={4} px="sm" py={6}>
-          <Text size="xs" c="dimmed">{t("Type")}</Text>
-          <TextInput
-            size="xs"
-            value={typeDef ? t(typeDef.labelKey) : property.type}
-            disabled
-            leftSection={TypeIcon ? <TypeIcon size={14} /> : null}
-            readOnly
-          />
-        </Stack>
-      )}
-      {hasOptions && (
-        <MenuItem
-          icon={<IconSettings size={14} />}
-          label={t("Options")}
-          rightIcon={<IconChevronRight size={14} />}
-          onClick={onOptions}
-        />
-      )}
-      {!property.isPrimary && (
-        <>
-          <Divider my={4} />
-          <MenuItem
-            icon={<IconTrash size={14} />}
-            label={t("Delete property")}
-            color="red"
-            onClick={onDelete}
-          />
-        </>
-      )}
-    </Stack>
-  );
-}
-

apps/client/src/features/base/components/property/property-options.tsx

@@ -1,263 +0,0 @@
-import { useCallback } from "react";
-import { Stack, NumberInput, Select, Switch, Text } from "@mantine/core";
-import {
-  IBaseProperty,
-  SelectTypeOptions,
-  NumberTypeOptions,
-  DateTypeOptions,
-  PersonTypeOptions,
-  Choice,
-} from "@/features/base/types/base.types";
-import { ChoiceEditor } from "./choice-editor";
-import { useTranslation } from "react-i18next";
-
-type PropertyOptionsProps = {
-  property: IBaseProperty;
-  onUpdate: (typeOptions: Record<string, unknown>) => void;
-  onClose: () => void;
-  onDirtyChange?: (dirty: boolean) => void;
-  hideButtons?: boolean;
-};
-
-export function PropertyOptions({ property, onUpdate, onClose, onDirtyChange, hideButtons }: PropertyOptionsProps) {
-  const { t } = useTranslation();
-
-  switch (property.type) {
-    case "select":
-    case "multiSelect":
-      return (
-        <SelectOptions
-          property={property}
-          onUpdate={onUpdate}
-          onClose={onClose}
-          onDirtyChange={onDirtyChange}
-          hideButtons={hideButtons}
-        />
-      );
-    case "status":
-      return (
-        <StatusOptions
-          property={property}
-          onUpdate={onUpdate}
-          onClose={onClose}
-          onDirtyChange={onDirtyChange}
-          hideButtons={hideButtons}
-        />
-      );
-    case "number":
-      return (
-        <NumberOptions
-          property={property}
-          onUpdate={onUpdate}
-        />
-      );
-    case "date":
-      return (
-        <DateOptions
-          property={property}
-          onUpdate={onUpdate}
-        />
-      );
-    case "person":
-      return (
-        <PersonOptions
-          property={property}
-          onUpdate={onUpdate}
-        />
-      );
-    default:
-      return (
-        <Text size="xs" c="dimmed">
-          {t("No options for this property type")}
-        </Text>
-      );
-  }
-}
-
-function SelectOptions({
-  property,
-  onUpdate,
-  onClose,
-  onDirtyChange,
-  hideButtons,
-}: {
-  property: IBaseProperty;
-  onUpdate: (typeOptions: Record<string, unknown>) => void;
-  onClose: () => void;
-  onDirtyChange?: (dirty: boolean) => void;
-  hideButtons?: boolean;
-}) {
-  const options = property.typeOptions as SelectTypeOptions | undefined;
-  const choices = options?.choices ?? [];
-
-  const handleSave = useCallback(
-    (newChoices: Choice[]) => {
-      onUpdate({
-        ...property.typeOptions,
-        choices: newChoices,
-        choiceOrder: newChoices.map((c) => c.id),
-      });
-    },
-    [property.typeOptions, onUpdate],
-  );
-
-  return (
-    <ChoiceEditor
-      initialChoices={choices}
-      onSave={handleSave}
-      onClose={onClose}
-      onDirtyChange={onDirtyChange}
-      showCategories={false}
-      hideButtons={hideButtons}
-    />
-  );
-}
-
-function StatusOptions({
-  property,
-  onUpdate,
-  onClose,
-  onDirtyChange,
-  hideButtons,
-}: {
-  property: IBaseProperty;
-  onUpdate: (typeOptions: Record<string, unknown>) => void;
-  onClose: () => void;
-  onDirtyChange?: (dirty: boolean) => void;
-  hideButtons?: boolean;
-}) {
-  const options = property.typeOptions as SelectTypeOptions | undefined;
-  const choices = options?.choices ?? [];
-
-  const handleSave = useCallback(
-    (newChoices: Choice[]) => {
-      onUpdate({
-        ...property.typeOptions,
-        choices: newChoices,
-        choiceOrder: newChoices.map((c) => c.id),
-      });
-    },
-    [property.typeOptions, onUpdate],
-  );
-
-  return (
-    <ChoiceEditor
-      initialChoices={choices}
-      onSave={handleSave}
-      onClose={onClose}
-      onDirtyChange={onDirtyChange}
-      showCategories
-      hideButtons={hideButtons}
-    />
-  );
-}
-
-function NumberOptions({
-  property,
-  onUpdate,
-}: {
-  property: IBaseProperty;
-  onUpdate: (typeOptions: Record<string, unknown>) => void;
-}) {
-  const { t } = useTranslation();
-  const options = property.typeOptions as NumberTypeOptions | undefined;
-
-  return (
-    <Stack gap="xs">
-      <Select
-        size="xs"
-        label={t("Format")}
-        allowDeselect={false}
-        data={[
-          { value: "plain", label: t("Number") },
-          { value: "currency", label: t("Currency") },
-          { value: "percent", label: t("Percent") },
-          { value: "progress", label: t("Progress") },
-        ]}
-        value={options?.format ?? "plain"}
-        onChange={(val) =>
-          onUpdate({ ...property.typeOptions, format: val ?? "plain" })
-        }
-      />
-      <NumberInput
-        size="xs"
-        label={t("Decimal places")}
-        min={0}
-        max={8}
-        value={options?.precision ?? 0}
-        onChange={(val) =>
-          onUpdate({ ...property.typeOptions, precision: val })
-        }
-      />
-    </Stack>
-  );
-}
-
-function DateOptions({
-  property,
-  onUpdate,
-}: {
-  property: IBaseProperty;
-  onUpdate: (typeOptions: Record<string, unknown>) => void;
-}) {
-  const { t } = useTranslation();
-  const options = property.typeOptions as DateTypeOptions | undefined;
-
-  return (
-    <Stack gap="xs">
-      <Switch
-        size="xs"
-        label={t("Include time")}
-        checked={options?.includeTime ?? false}
-        onChange={(e) =>
-          onUpdate({
-            ...property.typeOptions,
-            includeTime: e.currentTarget.checked,
-          })
-        }
-      />
-      {options?.includeTime && (
-        <Select
-          size="xs"
-          label={t("Time format")}
-          allowDeselect={false}
-          data={[
-            { value: "12h", label: "12-hour" },
-            { value: "24h", label: "24-hour" },
-          ]}
-          value={options?.timeFormat ?? "12h"}
-          onChange={(val) =>
-            onUpdate({ ...property.typeOptions, timeFormat: val ?? "12h" })
-          }
-        />
-      )}
-    </Stack>
-  );
-}
-
-function PersonOptions({
-  property,
-  onUpdate,
-}: {
-  property: IBaseProperty;
-  onUpdate: (typeOptions: Record<string, unknown>) => void;
-}) {
-  const { t } = useTranslation();
-  const options = property.typeOptions as PersonTypeOptions | undefined;
-
-  return (
-    <Stack gap="xs">
-      <Switch
-        size="xs"
-        label={t("Allow multiple people")}
-        checked={options?.allowMultiple !== false}
-        onChange={(e) =>
-          onUpdate({
-            ...property.typeOptions,
-            allowMultiple: e.currentTarget.checked,
-          })
-        }
-      />
-    </Stack>
-  );
-}

apps/client/src/features/base/components/property/property-type-picker.tsx

@@ -1,110 +0,0 @@
-import { UnstyledButton, Group, Text, TextInput } from "@mantine/core";
-import {
-  IconLetterT,
-  IconHash,
-  IconCircleDot,
-  IconProgressCheck,
-  IconTags,
-  IconCalendar,
-  IconUser,
-  IconPaperclip,
-  IconCheckbox,
-  IconLink,
-  IconMail,
-  IconClockPlus,
-  IconClockEdit,
-  IconUserEdit,
-  IconCheck,
-  IconSearch,
-} from "@tabler/icons-react";
-import { BasePropertyType } from "@/features/base/types/base.types";
-import { useTranslation } from "react-i18next";
-import { useState, useRef, useEffect } from "react";
-import classes from "@/features/base/styles/cells.module.css";
-
-const propertyTypes: {
-  type: BasePropertyType;
-  icon: typeof IconLetterT;
-  labelKey: string;
-}[] = [
-  { type: "text", icon: IconLetterT, labelKey: "Text" },
-  { type: "number", icon: IconHash, labelKey: "Number" },
-  { type: "select", icon: IconCircleDot, labelKey: "Select" },
-  { type: "status", icon: IconProgressCheck, labelKey: "Status" },
-  { type: "multiSelect", icon: IconTags, labelKey: "Multi-select" },
-  { type: "date", icon: IconCalendar, labelKey: "Date" },
-  { type: "person", icon: IconUser, labelKey: "Person" },
-  { type: "file", icon: IconPaperclip, labelKey: "File" },
-  { type: "checkbox", icon: IconCheckbox, labelKey: "Checkbox" },
-  { type: "url", icon: IconLink, labelKey: "URL" },
-  { type: "email", icon: IconMail, labelKey: "Email" },
-  { type: "createdAt", icon: IconClockPlus, labelKey: "Created at" },
-  { type: "lastEditedAt", icon: IconClockEdit, labelKey: "Last edited at" },
-  { type: "lastEditedBy", icon: IconUserEdit, labelKey: "Last edited by" },
-];
-
-type PropertyTypePickerProps = {
-  onSelect: (type: BasePropertyType) => void;
-  currentType?: BasePropertyType;
-  excludeTypes?: Set<BasePropertyType>;
-  showSearch?: boolean;
-};
-
-export function PropertyTypePicker({
-  onSelect,
-  currentType,
-  excludeTypes,
-  showSearch,
-}: PropertyTypePickerProps) {
-  const { t } = useTranslation();
-  const [search, setSearch] = useState("");
-  const searchRef = useRef<HTMLInputElement>(null);
-
-  useEffect(() => {
-    if (showSearch) {
-      setTimeout(() => searchRef.current?.focus(), 0);
-    }
-  }, [showSearch]);
-
-  const types = propertyTypes
-    .filter(({ type }) => !excludeTypes?.has(type))
-    .filter(({ labelKey }) =>
-      !search || t(labelKey).toLowerCase().includes(search.toLowerCase())
-    );
-
-  return (
-    <>
-      {showSearch && (
-        <TextInput
-          ref={searchRef}
-          size="xs"
-          placeholder={t("Find a field type")}
-          leftSection={<IconSearch size={14} />}
-          value={search}
-          onChange={(e) => setSearch(e.currentTarget.value)}
-          mx="sm"
-          mt="sm"
-          mb={4}
-        />
-      )}
-      {types.map(({ type, icon: Icon, labelKey }) => (
-        <UnstyledButton
-          key={type}
-          className={classes.menuItem}
-          onClick={() => onSelect(type)}
-          style={{
-            fontWeight: type === currentType ? 600 : 400,
-          }}
-        >
-          <Group gap={8} wrap="nowrap" style={{ flex: 1 }}>
-            <Icon size={14} />
-            <Text size="sm">{t(labelKey)}</Text>
-          </Group>
-          {type === currentType && <IconCheck size={14} />}
-        </UnstyledButton>
-      ))}
-    </>
-  );
-}
-
-export { propertyTypes };

apps/client/src/features/base/components/views/view-field-visibility.tsx

@@ -1,161 +0,0 @@
-import { useMemo, useCallback } from "react";
-import { Popover, Switch, Stack, Text, Group, Divider, UnstyledButton } from "@mantine/core";
-import { IconEye, IconEyeOff } from "@tabler/icons-react";
-import { Table } from "@tanstack/react-table";
-import { IBaseRow, IBaseProperty } from "@/features/base/types/base.types";
-import { propertyTypes } from "@/features/base/components/property/property-type-picker";
-import { useTranslation } from "react-i18next";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type ViewFieldVisibilityProps = {
-  opened: boolean;
-  onClose: () => void;
-  table: Table<IBaseRow>;
-  properties: IBaseProperty[];
-  onPersist: () => void;
-  children: React.ReactNode;
-};
-
-export function ViewFieldVisibility({
-  opened,
-  onClose,
-  table,
-  properties,
-  onPersist,
-  children,
-}: ViewFieldVisibilityProps) {
-  const { t } = useTranslation();
-
-  const columns = useMemo(() => {
-    return table
-      .getAllLeafColumns()
-      .filter((col) => col.id !== "__row_number");
-  }, [table, properties]);
-
-  const allVisible = columns.every((col) => col.getIsVisible());
-  const noneVisible = columns.filter((col) => col.getCanHide()).every((col) => !col.getIsVisible());
-
-  const handleToggle = useCallback(
-    (columnId: string, visible: boolean) => {
-      const col = table.getColumn(columnId);
-      if (!col) return;
-      col.toggleVisibility(visible);
-      onPersist();
-    },
-    [table, onPersist],
-  );
-
-  const handleShowAll = useCallback(() => {
-    columns.forEach((col) => {
-      if (col.getCanHide()) {
-        col.toggleVisibility(true);
-      }
-    });
-    onPersist();
-  }, [columns, onPersist]);
-
-  const handleHideAll = useCallback(() => {
-    columns.forEach((col) => {
-      if (col.getCanHide()) {
-        col.toggleVisibility(false);
-      }
-    });
-    onPersist();
-  }, [columns, onPersist]);
-
-  return (
-    <Popover
-      opened={opened}
-      onClose={onClose}
-      position="bottom-end"
-      shadow="md"
-      width={260}
-      trapFocus
-      closeOnEscape
-      closeOnClickOutside
-      withinPortal
-    >
-      <Popover.Target>{children}</Popover.Target>
-      <Popover.Dropdown p="xs">
-        <Stack gap={4}>
-          <Group justify="space-between" px={4} py={2}>
-            <Text size="xs" fw={600} c="dimmed">
-              {t("Fields")}
-            </Text>
-            <Group gap={8}>
-              <UnstyledButton
-                onClick={handleShowAll}
-                disabled={allVisible}
-                style={{ opacity: allVisible ? 0.4 : 1 }}
-              >
-                <Text size="xs" c="blue">
-                  {t("Show all")}
-                </Text>
-              </UnstyledButton>
-              <UnstyledButton
-                onClick={handleHideAll}
-                disabled={noneVisible}
-                style={{ opacity: noneVisible ? 0.4 : 1 }}
-              >
-                <Text size="xs" c="blue">
-                  {t("Hide all")}
-                </Text>
-              </UnstyledButton>
-            </Group>
-          </Group>
-
-          <Divider />
-
-          <Stack gap={0}>
-            {columns.map((col) => {
-              const property = col.columnDef.meta?.property as IBaseProperty | undefined;
-              if (!property) return null;
-
-              const canHide = col.getCanHide();
-              const isVisible = col.getIsVisible();
-              const typeConfig = propertyTypes.find((pt) => pt.type === property.type);
-              const TypeIcon = typeConfig?.icon;
-
-              return (
-                <UnstyledButton
-                  key={col.id}
-                  className={cellClasses.menuItem}
-                  onClick={() => {
-                    if (canHide) {
-                      handleToggle(col.id, !isVisible);
-                    }
-                  }}
-                  style={{ opacity: canHide ? 1 : 0.5 }}
-                >
-                  <Group gap={8} wrap="nowrap" style={{ flex: 1 }}>
-                    {TypeIcon && <TypeIcon size={14} style={{ flexShrink: 0 }} />}
-                    <Text size="sm" style={{ flex: 1, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
-                      {property.name}
-                    </Text>
-                  </Group>
-                  <Switch
-                    size="xs"
-                    checked={isVisible}
-                    disabled={!canHide}
-                    onChange={() => {}}
-                    // Mantine's Switch spreads `onClick` onto its hidden
-                    // <input>. When the user clicks the visible track, the
-                    // label's default action synthesizes a second click on
-                    // that input — both clicks bubble to the parent
-                    // UnstyledButton and fire handleToggle twice (hide then
-                    // immediately unhide, net zero). stopPropagation here
-                    // blocks ONLY the synthesized input click from reaching
-                    // UnstyledButton; the original track click still bubbles
-                    // normally, so handleToggle fires exactly once.
-                    onClick={(e) => e.stopPropagation()}
-                    styles={{ track: { cursor: canHide ? "pointer" : "not-allowed" } }}
-                  />
-                </UnstyledButton>
-              );
-            })}
-          </Stack>
-        </Stack>
-      </Popover.Dropdown>
-    </Popover>
-  );
-}

apps/client/src/features/base/components/views/view-filter-config.tsx

@@ -1,445 +0,0 @@
-import { useCallback, useEffect, useState } from "react";
-import {
-  Popover,
-  Stack,
-  Group,
-  Select,
-  TextInput,
-  ActionIcon,
-  Text,
-  UnstyledButton,
-  Button,
-} from "@mantine/core";
-import { IconPlus, IconTrash } from "@tabler/icons-react";
-import {
-  IBaseProperty,
-  SelectTypeOptions,
-  FilterCondition,
-  FilterOperator,
-} from "@/features/base/types/base.types";
-import { useTranslation } from "react-i18next";
-
-/*
- * Operator metadata for the filter popover. Values use the server
- * engine's operator set (`core/base/engine/schema.zod.ts`); labels are
- * i18n-translated display strings.
- */
-const OPERATORS: { value: FilterOperator; labelKey: string }[] = [
-  { value: "eq", labelKey: "Equals" },
-  { value: "neq", labelKey: "Not equals" },
-  { value: "contains", labelKey: "Contains" },
-  { value: "ncontains", labelKey: "Not contains" },
-  { value: "isEmpty", labelKey: "Is empty" },
-  { value: "isNotEmpty", labelKey: "Is not empty" },
-  { value: "gt", labelKey: "Greater than" },
-  { value: "lt", labelKey: "Less than" },
-  { value: "before", labelKey: "Before" },
-  { value: "after", labelKey: "After" },
-  { value: "any", labelKey: "Any of" },
-  { value: "none", labelKey: "None of" },
-];
-
-const NO_VALUE_OPERATORS: FilterOperator[] = ["isEmpty", "isNotEmpty"];
-
-function getOperatorsForType(type: string): FilterOperator[] {
-  switch (type) {
-    case "text":
-    case "email":
-    case "url":
-      return ["eq", "neq", "contains", "ncontains", "isEmpty", "isNotEmpty"];
-    case "number":
-      return ["eq", "neq", "gt", "lt", "isEmpty", "isNotEmpty"];
-    case "date":
-    case "createdAt":
-    case "lastEditedAt":
-      return ["eq", "neq", "before", "after", "isEmpty", "isNotEmpty"];
-    case "select":
-    case "status":
-      return ["eq", "neq", "any", "none", "isEmpty", "isNotEmpty"];
-    case "multiSelect":
-      return ["any", "none", "isEmpty", "isNotEmpty"];
-    case "checkbox":
-      return ["eq", "isEmpty", "isNotEmpty"];
-    case "person":
-    case "lastEditedBy":
-      return ["eq", "neq", "any", "none", "isEmpty", "isNotEmpty"];
-    case "file":
-      return ["isEmpty", "isNotEmpty"];
-    default:
-      return ["eq", "neq", "isEmpty", "isNotEmpty"];
-  }
-}
-
-function FilterValueInput({
-  condition,
-  property,
-  onChange,
-  t,
-}: {
-  condition: FilterCondition;
-  property: IBaseProperty | undefined;
-  onChange: (value: string) => void;
-  t: (key: string) => string;
-}) {
-  if (!property) {
-    return (
-      <TextInput
-        size="xs"
-        placeholder={t("Value")}
-        value={(condition.value as string) ?? ""}
-        onChange={(e) => onChange(e.currentTarget.value)}
-        w={100}
-      />
-    );
-  }
-
-  const type = property.type;
-
-  if (type === "select" || type === "status" || type === "multiSelect") {
-    const typeOptions = property.typeOptions as SelectTypeOptions | undefined;
-    const choices = typeOptions?.choices ?? [];
-    const choiceOptions = choices.map((c) => ({ value: c.id, label: c.name }));
-    return (
-      <Select
-        size="xs"
-        data={choiceOptions}
-        value={(condition.value as string) ?? null}
-        onChange={(val) => onChange(val ?? "")}
-        w={120}
-        placeholder={t("Select")}
-      />
-    );
-  }
-
-  if (type === "number") {
-    return (
-      <TextInput
-        size="xs"
-        type="number"
-        placeholder={t("Value")}
-        value={(condition.value as string) ?? ""}
-        onChange={(e) => onChange(e.currentTarget.value)}
-        w={100}
-      />
-    );
-  }
-
-  if (type === "checkbox") {
-    return (
-      <Select
-        size="xs"
-        data={[
-          { value: "true", label: t("True") },
-          { value: "false", label: t("False") },
-        ]}
-        value={(condition.value as string) ?? null}
-        onChange={(val) => onChange(val ?? "")}
-        w={100}
-      />
-    );
-  }
-
-  return (
-    <TextInput
-      size="xs"
-      placeholder={t("Value")}
-      value={(condition.value as string) ?? ""}
-      onChange={(e) => onChange(e.currentTarget.value)}
-      w={100}
-    />
-  );
-}
-
-type ViewFilterConfigProps = {
-  opened: boolean;
-  onClose: () => void;
-  conditions: FilterCondition[];
-  properties: IBaseProperty[];
-  onChange: (conditions: FilterCondition[]) => void;
-  children: React.ReactNode;
-};
-
-export function ViewFilterConfigPopover({
-  opened,
-  onClose,
-  conditions,
-  properties,
-  onChange,
-  children,
-}: ViewFilterConfigProps) {
-  const { t } = useTranslation();
-
-  const propertyOptions = properties.map((p) => ({
-    value: p.id,
-    label: p.name,
-  }));
-
-  const [draft, setDraft] = useState<FilterCondition | null>(null);
-
-  useEffect(() => {
-    if (!opened) setDraft(null);
-  }, [opened]);
-
-  const handleStartDraft = useCallback(() => {
-    const firstProperty = properties[0];
-    if (!firstProperty) return;
-    const validOperators = getOperatorsForType(firstProperty.type);
-    const defaultOperator = validOperators.includes("contains")
-      ? ("contains" as FilterOperator)
-      : validOperators[0];
-    setDraft({ propertyId: firstProperty.id, op: defaultOperator });
-  }, [properties]);
-
-  const handleSaveDraft = useCallback(() => {
-    if (!draft) return;
-    onChange([...conditions, draft]);
-    setDraft(null);
-  }, [draft, conditions, onChange]);
-
-  const handleCancelDraft = useCallback(() => {
-    setDraft(null);
-  }, []);
-
-  const handleDraftPropertyChange = useCallback(
-    (propertyId: string | null) => {
-      if (!propertyId || !draft) return;
-      const newProperty = properties.find((p) => p.id === propertyId);
-      if (!newProperty) {
-        setDraft({ ...draft, propertyId });
-        return;
-      }
-      const validOperators = getOperatorsForType(newProperty.type);
-      const currentOperatorValid = validOperators.includes(draft.op);
-      setDraft({
-        ...draft,
-        propertyId,
-        op: currentOperatorValid ? draft.op : validOperators[0],
-        value: currentOperatorValid ? draft.value : undefined,
-      });
-    },
-    [draft, properties],
-  );
-
-  const handleDraftOperatorChange = useCallback(
-    (operator: string | null) => {
-      if (!operator || !draft) return;
-      const op = operator as FilterOperator;
-      const needsValue = !NO_VALUE_OPERATORS.includes(op);
-      setDraft({ ...draft, op, value: needsValue ? draft.value : undefined });
-    },
-    [draft],
-  );
-
-  const handleDraftValueChange = useCallback(
-    (value: string) => {
-      if (!draft) return;
-      setDraft({ ...draft, value: value || undefined });
-    },
-    [draft],
-  );
-
-  const handleRemove = useCallback(
-    (index: number) => {
-      onChange(conditions.filter((_, i) => i !== index));
-    },
-    [conditions, onChange],
-  );
-
-  const handlePropertyChange = useCallback(
-    (index: number, propertyId: string | null) => {
-      if (!propertyId) return;
-      const newProperty = properties.find((p) => p.id === propertyId);
-      onChange(
-        conditions.map((f, i) => {
-          if (i !== index) return f;
-          if (newProperty) {
-            const validOperators = getOperatorsForType(newProperty.type);
-            const currentOperatorValid = validOperators.includes(f.op);
-            return {
-              ...f,
-              propertyId,
-              op: currentOperatorValid ? f.op : validOperators[0],
-              value: currentOperatorValid ? f.value : undefined,
-            };
-          }
-          return { ...f, propertyId };
-        }),
-      );
-    },
-    [conditions, properties, onChange],
-  );
-
-  const handleOperatorChange = useCallback(
-    (index: number, operator: string | null) => {
-      if (!operator) return;
-      const op = operator as FilterOperator;
-      const needsValue = !NO_VALUE_OPERATORS.includes(op);
-      onChange(
-        conditions.map((f, i) =>
-          i === index
-            ? {
-                ...f,
-                op,
-                value: needsValue ? f.value : undefined,
-              }
-            : f,
-        ),
-      );
-    },
-    [conditions, onChange],
-  );
-
-  const handleValueChange = useCallback(
-    (index: number, value: string) => {
-      onChange(
-        conditions.map((f, i) =>
-          i === index ? { ...f, value: value || undefined } : f,
-        ),
-      );
-    },
-    [conditions, onChange],
-  );
-
-  return (
-    <Popover
-      opened={opened}
-      onClose={onClose}
-      position="bottom-end"
-      shadow="md"
-      width={440}
-      trapFocus
-      withinPortal
-    >
-      <Popover.Target>{children}</Popover.Target>
-      <Popover.Dropdown>
-        <Stack gap="xs">
-          <Text size="xs" fw={600} c="dimmed">
-            {t("Filter by")}
-          </Text>
-
-          {conditions.length === 0 && !draft && (
-            <Text size="xs" c="dimmed">
-              {t("No filters applied")}
-            </Text>
-          )}
-
-          {conditions.map((condition, index) => {
-            const needsValue = !NO_VALUE_OPERATORS.includes(condition.op);
-            const property = properties.find(
-              (p) => p.id === condition.propertyId,
-            );
-            const validOperators = property
-              ? getOperatorsForType(property.type)
-              : OPERATORS.map((op) => op.value);
-            const operatorOptions = OPERATORS.filter((op) =>
-              validOperators.includes(op.value),
-            ).map((op) => ({
-              value: op.value,
-              label: t(op.labelKey),
-            }));
-
-            return (
-              <Group key={index} gap="xs" wrap="nowrap">
-                <Select
-                  size="xs"
-                  data={propertyOptions}
-                  value={condition.propertyId}
-                  onChange={(val) => handlePropertyChange(index, val)}
-                  style={{ flex: 1 }}
-                />
-                <Select
-                  size="xs"
-                  data={operatorOptions}
-                  value={condition.op}
-                  onChange={(val) => handleOperatorChange(index, val)}
-                  w={130}
-                />
-                {needsValue && (
-                  <FilterValueInput
-                    condition={condition}
-                    property={property}
-                    onChange={(val) => handleValueChange(index, val)}
-                    t={t}
-                  />
-                )}
-                <ActionIcon
-                  variant="subtle"
-                  color="gray"
-                  size="sm"
-                  onClick={() => handleRemove(index)}
-                >
-                  <IconTrash size={14} />
-                </ActionIcon>
-              </Group>
-            );
-          })}
-
-          {draft && (() => {
-            const needsValue = !NO_VALUE_OPERATORS.includes(draft.op);
-            const property = properties.find((p) => p.id === draft.propertyId);
-            const validOperators = property
-              ? getOperatorsForType(property.type)
-              : OPERATORS.map((op) => op.value);
-            const operatorOptions = OPERATORS.filter((op) =>
-              validOperators.includes(op.value),
-            ).map((op) => ({ value: op.value, label: t(op.labelKey) }));
-
-            return (
-              <Stack gap={6}>
-                <Group gap="xs" wrap="nowrap">
-                  <Select
-                    size="xs"
-                    data={propertyOptions}
-                    value={draft.propertyId}
-                    onChange={handleDraftPropertyChange}
-                    style={{ flex: 1 }}
-                  />
-                  <Select
-                    size="xs"
-                    data={operatorOptions}
-                    value={draft.op}
-                    onChange={handleDraftOperatorChange}
-                    w={130}
-                  />
-                  {needsValue && (
-                    <FilterValueInput
-                      condition={draft}
-                      property={property}
-                      onChange={handleDraftValueChange}
-                      t={t}
-                    />
-                  )}
-                </Group>
-                <Group justify="flex-end" gap="xs">
-                  <Button variant="default" size="xs" onClick={handleCancelDraft}>
-                    {t("Cancel")}
-                  </Button>
-                  <Button size="xs" onClick={handleSaveDraft}>
-                    {t("Save")}
-                  </Button>
-                </Group>
-              </Stack>
-            );
-          })()}
-
-          {!draft && (
-            <UnstyledButton
-              onClick={handleStartDraft}
-              style={{
-                display: "flex",
-                alignItems: "center",
-                gap: 6,
-                padding: "4px 0",
-                fontSize: "var(--mantine-font-size-xs)",
-                color: "var(--mantine-color-blue-6)",
-              }}
-            >
-              <IconPlus size={14} />
-              {t("Add filter")}
-            </UnstyledButton>
-          )}
-        </Stack>
-      </Popover.Dropdown>
-    </Popover>
-  );
-}

apps/client/src/features/base/components/views/view-sort-config.tsx

@@ -1,215 +0,0 @@
-import { useCallback, useEffect, useState } from "react";
-import {
-  Popover,
-  Stack,
-  Group,
-  Select,
-  ActionIcon,
-  Text,
-  UnstyledButton,
-  Button,
-} from "@mantine/core";
-import { IconPlus, IconTrash } from "@tabler/icons-react";
-import {
-  IBaseProperty,
-  ViewSortConfig,
-} from "@/features/base/types/base.types";
-import { useTranslation } from "react-i18next";
-
-type ViewSortConfigProps = {
-  opened: boolean;
-  onClose: () => void;
-  sorts: ViewSortConfig[];
-  properties: IBaseProperty[];
-  onChange: (sorts: ViewSortConfig[]) => void;
-  children: React.ReactNode;
-};
-
-export function ViewSortConfigPopover({
-  opened,
-  onClose,
-  sorts,
-  properties,
-  onChange,
-  children,
-}: ViewSortConfigProps) {
-  const { t } = useTranslation();
-  const [draft, setDraft] = useState<ViewSortConfig | null>(null);
-
-  // Discard any half-configured draft when the popover closes.
-  useEffect(() => {
-    if (!opened) setDraft(null);
-  }, [opened]);
-
-  const propertyOptions = properties.map((p) => ({
-    value: p.id,
-    label: p.name,
-  }));
-
-  const directionOptions = [
-    { value: "asc", label: t("Ascending") },
-    { value: "desc", label: t("Descending") },
-  ];
-
-  const handleStartDraft = useCallback(() => {
-    const usedIds = new Set(sorts.map((s) => s.propertyId));
-    const available = properties.find((p) => !usedIds.has(p.id));
-    if (!available) return;
-    setDraft({ propertyId: available.id, direction: "asc" });
-  }, [sorts, properties]);
-
-  const handleSaveDraft = useCallback(() => {
-    if (!draft) return;
-    onChange([...sorts, draft]);
-    setDraft(null);
-  }, [draft, sorts, onChange]);
-
-  const handleCancelDraft = useCallback(() => {
-    setDraft(null);
-  }, []);
-
-  const handleRemove = useCallback(
-    (index: number) => {
-      onChange(sorts.filter((_, i) => i !== index));
-    },
-    [sorts, onChange],
-  );
-
-  const handlePropertyChange = useCallback(
-    (index: number, propertyId: string | null) => {
-      if (!propertyId) return;
-      onChange(
-        sorts.map((s, i) => (i === index ? { ...s, propertyId } : s)),
-      );
-    },
-    [sorts, onChange],
-  );
-
-  const handleDirectionChange = useCallback(
-    (index: number, direction: string | null) => {
-      if (!direction) return;
-      onChange(
-        sorts.map((s, i) =>
-          i === index
-            ? { ...s, direction: direction as "asc" | "desc" }
-            : s,
-        ),
-      );
-    },
-    [sorts, onChange],
-  );
-
-  const canAddMore = properties.length > sorts.length + (draft ? 1 : 0);
-
-  return (
-    <Popover
-      opened={opened}
-      onClose={onClose}
-      position="bottom-end"
-      shadow="md"
-      width={340}
-      trapFocus
-      withinPortal
-    >
-      <Popover.Target>{children}</Popover.Target>
-      <Popover.Dropdown>
-        <Stack gap="xs">
-          <Text size="xs" fw={600} c="dimmed">
-            {t("Sort by")}
-          </Text>
-
-          {sorts.length === 0 && !draft && (
-            <Text size="xs" c="dimmed">
-              {t("No sorts applied")}
-            </Text>
-          )}
-
-          {sorts.map((sort, index) => (
-            <Group key={index} gap="xs" wrap="nowrap">
-              <Select
-                size="xs"
-                data={propertyOptions}
-                value={sort.propertyId}
-                onChange={(val) => handlePropertyChange(index, val)}
-                style={{ flex: 1 }}
-              />
-              <Select
-                size="xs"
-                data={directionOptions}
-                value={sort.direction}
-                onChange={(val) => handleDirectionChange(index, val)}
-                w={110}
-              />
-              <ActionIcon
-                variant="subtle"
-                color="gray"
-                size="sm"
-                onClick={() => handleRemove(index)}
-              >
-                <IconTrash size={14} />
-              </ActionIcon>
-            </Group>
-          ))}
-
-          {draft && (
-            <Stack gap={6}>
-              <Group gap="xs" wrap="nowrap">
-                <Select
-                  size="xs"
-                  data={propertyOptions}
-                  value={draft.propertyId}
-                  onChange={(val) =>
-                    val && setDraft({ ...draft, propertyId: val })
-                  }
-                  style={{ flex: 1 }}
-                />
-                <Select
-                  size="xs"
-                  data={directionOptions}
-                  value={draft.direction}
-                  onChange={(val) =>
-                    val &&
-                    setDraft({
-                      ...draft,
-                      direction: val as "asc" | "desc",
-                    })
-                  }
-                  w={110}
-                />
-              </Group>
-              <Group justify="flex-end" gap="xs">
-                <Button
-                  variant="default"
-                  size="xs"
-                  onClick={handleCancelDraft}
-                >
-                  {t("Cancel")}
-                </Button>
-                <Button size="xs" onClick={handleSaveDraft}>
-                  {t("Save")}
-                </Button>
-              </Group>
-            </Stack>
-          )}
-
-          {!draft && canAddMore && (
-            <UnstyledButton
-              onClick={handleStartDraft}
-              style={{
-                display: "flex",
-                alignItems: "center",
-                gap: 6,
-                padding: "4px 0",
-                fontSize: "var(--mantine-font-size-xs)",
-                color: "var(--mantine-color-blue-6)",
-              }}
-            >
-              <IconPlus size={14} />
-              {t("Add sort")}
-            </UnstyledButton>
-          )}
-        </Stack>
-      </Popover.Dropdown>
-    </Popover>
-  );
-}

apps/client/src/features/base/components/views/view-tabs.tsx

@@ -1,237 +0,0 @@
-import { useState, useCallback } from "react";
-import {
-  Group,
-  UnstyledButton,
-  Text,
-  ActionIcon,
-  Tooltip,
-  TextInput,
-  Popover,
-  Stack,
-  Divider,
-} from "@mantine/core";
-import { IconPlus, IconPencil, IconTrash, IconTable } from "@tabler/icons-react";
-import { IBaseView } from "@/features/base/types/base.types";
-import {
-  useUpdateViewMutation,
-  useDeleteViewMutation,
-} from "@/features/base/queries/base-view-query";
-import { useTranslation } from "react-i18next";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type ViewTabsProps = {
-  views: IBaseView[];
-  activeViewId: string | undefined;
-  baseId: string;
-  onViewChange: (viewId: string) => void;
-  onAddView?: () => void;
-};
-
-export function ViewTabs({
-  views,
-  activeViewId,
-  baseId,
-  onViewChange,
-  onAddView,
-}: ViewTabsProps) {
-  const { t } = useTranslation();
-  const [editingViewId, setEditingViewId] = useState<string | null>(null);
-  const [editingName, setEditingName] = useState("");
-
-  const updateViewMutation = useUpdateViewMutation();
-  const deleteViewMutation = useDeleteViewMutation();
-
-  const handleRenameStart = useCallback(
-    (view: IBaseView) => {
-      setEditingViewId(view.id);
-      setEditingName(view.name);
-    },
-    [],
-  );
-
-  const handleRenameCommit = useCallback(() => {
-    if (!editingViewId) return;
-    const trimmed = editingName.trim();
-    const view = views.find((v) => v.id === editingViewId);
-    if (trimmed && view && trimmed !== view.name) {
-      updateViewMutation.mutate({
-        viewId: editingViewId,
-        baseId,
-        name: trimmed,
-      });
-    }
-    setEditingViewId(null);
-  }, [editingViewId, editingName, views, baseId, updateViewMutation]);
-
-  const handleRenameKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      if (e.key === "Enter") {
-        e.preventDefault();
-        handleRenameCommit();
-      }
-      if (e.key === "Escape") {
-        e.preventDefault();
-        setEditingViewId(null);
-      }
-    },
-    [handleRenameCommit],
-  );
-
-  const handleDelete = useCallback(
-    (viewId: string) => {
-      if (views.length <= 1) return;
-      deleteViewMutation.mutate({ viewId, baseId });
-      if (viewId === activeViewId && views.length > 1) {
-        const remaining = views.filter((v) => v.id !== viewId);
-        onViewChange(remaining[0].id);
-      }
-    },
-    [views, baseId, activeViewId, deleteViewMutation, onViewChange],
-  );
-
-  return (
-    <Group gap={4}>
-      {views.map((view) => (
-        <ViewTab
-          key={view.id}
-          view={view}
-          isActive={view.id === activeViewId}
-          isEditing={view.id === editingViewId}
-          editingName={editingName}
-          canDelete={views.length > 1}
-          onClick={() => onViewChange(view.id)}
-          onRenameStart={() => handleRenameStart(view)}
-          onRenameChange={setEditingName}
-          onRenameCommit={handleRenameCommit}
-          onRenameKeyDown={handleRenameKeyDown}
-          onDelete={() => handleDelete(view.id)}
-        />
-      ))}
-      {onAddView && (
-        <Tooltip label={t("Add view")}>
-          <ActionIcon
-            variant="subtle"
-            size="sm"
-            color="gray"
-            onClick={onAddView}
-          >
-            <IconPlus size={14} />
-          </ActionIcon>
-        </Tooltip>
-      )}
-    </Group>
-  );
-}
-
-function ViewTab({
-  view,
-  isActive,
-  isEditing,
-  editingName,
-  canDelete,
-  onClick,
-  onRenameStart,
-  onRenameChange,
-  onRenameCommit,
-  onRenameKeyDown,
-  onDelete,
-}: {
-  view: IBaseView;
-  isActive: boolean;
-  isEditing: boolean;
-  editingName: string;
-  canDelete: boolean;
-  onClick: () => void;
-  onRenameStart: () => void;
-  onRenameChange: (name: string) => void;
-  onRenameCommit: () => void;
-  onRenameKeyDown: (e: React.KeyboardEvent) => void;
-  onDelete: () => void;
-}) {
-  const { t } = useTranslation();
-  const [menuOpened, setMenuOpened] = useState(false);
-
-  if (isEditing) {
-    return (
-      <TextInput
-        size="xs"
-        w={120}
-        value={editingName}
-        onChange={(e) => onRenameChange(e.currentTarget.value)}
-        onBlur={onRenameCommit}
-        onKeyDown={onRenameKeyDown}
-        autoFocus
-      />
-    );
-  }
-
-  return (
-    <Popover
-      opened={menuOpened}
-      onClose={() => setMenuOpened(false)}
-      position="bottom-start"
-      shadow="md"
-      width={180}
-      withinPortal
-    >
-      <Popover.Target>
-        <UnstyledButton
-          onClick={onClick}
-          onContextMenu={(e) => {
-            e.preventDefault();
-            setMenuOpened(true);
-          }}
-          style={{
-            padding: "4px 10px",
-            borderRadius: "var(--mantine-radius-sm)",
-            fontWeight: isActive ? 600 : 400,
-          }}
-        >
-          <Group gap={6} wrap="nowrap">
-            <IconTable size={14} opacity={0.5} />
-            <Text
-              size="sm"
-              c={isActive ? undefined : "dimmed"}
-            >
-              {view.name}
-            </Text>
-          </Group>
-        </UnstyledButton>
-      </Popover.Target>
-      <Popover.Dropdown p={4}>
-        <Stack gap={0}>
-          <UnstyledButton
-            className={cellClasses.menuItem}
-            onClick={() => {
-              setMenuOpened(false);
-              onRenameStart();
-            }}
-          >
-            <Group gap={8} wrap="nowrap">
-              <IconPencil size={14} />
-              <Text size="sm">{t("Rename")}</Text>
-            </Group>
-          </UnstyledButton>
-          {canDelete && (
-            <>
-              <Divider my={4} />
-              <UnstyledButton
-                className={cellClasses.menuItem}
-                onClick={() => {
-                  setMenuOpened(false);
-                  onDelete();
-                }}
-                style={{ color: "var(--mantine-color-red-6)" }}
-              >
-                <Group gap={8} wrap="nowrap">
-                  <IconTrash size={14} />
-                  <Text size="sm">{t("Delete view")}</Text>
-                </Group>
-              </UnstyledButton>
-            </>
-          )}
-        </Stack>
-      </Popover.Dropdown>
-    </Popover>
-  );
-}

apps/client/src/features/base/hooks/use-base-socket.ts

@@ -1,269 +0,0 @@
-import { useEffect } from "react";
-import { useAtomValue, getDefaultStore } from "jotai";
-import { useQueryClient, InfiniteData } from "@tanstack/react-query";
-import { socketAtom } from "@/features/websocket/atoms/socket-atom";
-import {
-  IBaseProperty,
-  IBaseRow,
-  IBaseView,
-} from "@/features/base/types/base.types";
-import { selectedRowIdsAtom } from "@/features/base/atoms/base-atoms";
-import { IPagination } from "@/lib/types";
-
-type BaseRowCreated = {
-  operation: "base:row:created";
-  baseId: string;
-  row: IBaseRow;
-  requestId?: string | null;
-};
-
-type BaseRowUpdated = {
-  operation: "base:row:updated";
-  baseId: string;
-  rowId: string;
-  updatedCells: Record<string, unknown>;
-  requestId?: string | null;
-};
-
-type BaseRowDeleted = {
-  operation: "base:row:deleted";
-  baseId: string;
-  rowId: string;
-  requestId?: string | null;
-};
-
-type BaseRowsDeleted = {
-  operation: "base:rows:deleted";
-  baseId: string;
-  rowIds: string[];
-  requestId?: string | null;
-};
-
-type BaseRowReordered = {
-  operation: "base:row:reordered";
-  baseId: string;
-  rowId: string;
-  position: string;
-  requestId?: string | null;
-};
-
-type BasePropertyEvent = {
-  operation:
-    | "base:property:created"
-    | "base:property:updated"
-    | "base:property:deleted"
-    | "base:property:reordered";
-  baseId: string;
-  property?: IBaseProperty;
-  propertyId?: string;
-  requestId?: string | null;
-};
-
-type BaseViewEvent = {
-  operation:
-    | "base:view:created"
-    | "base:view:updated"
-    | "base:view:deleted";
-  baseId: string;
-  view?: IBaseView;
-  viewId?: string;
-};
-
-type BaseInboundEvent =
-  | BaseRowCreated
-  | BaseRowUpdated
-  | BaseRowDeleted
-  | BaseRowsDeleted
-  | BaseRowReordered
-  | BasePropertyEvent
-  | BaseViewEvent
-  | { operation: string; baseId: string };
-
-/*
- * Module-level set of requestIds we've just sent to the server. When the
- * socket echoes back the mutation as a `base:row:*` / `base:property:*`
- * event with a matching `requestId`, the socket handler drops it because
- * the local mutation already updated the cache. Bounded so it can't grow
- * unbounded on a long-lived tab.
- */
-const outboundRequestIds = new Set<string>();
-const OUTBOUND_MAX = 256;
-
-export function markRequestIdOutbound(requestId: string): void {
-  outboundRequestIds.add(requestId);
-  if (outboundRequestIds.size > OUTBOUND_MAX) {
-    const oldest = outboundRequestIds.values().next().value;
-    if (oldest) outboundRequestIds.delete(oldest);
-  }
-}
-
-/*
- * Realtime bridge for a single base. Joins the server's `base-{baseId}`
- * room on mount, leaves on unmount, and reconciles the React Query caches
- * (`["base-rows", baseId, ...]` and `["bases", baseId]`) when events
- * arrive from other clients.
- */
-export function useBaseSocket(baseId: string | undefined): void {
-  const socket = useAtomValue(socketAtom);
-  const queryClient = useQueryClient();
-
-  useEffect(() => {
-    if (!socket || !baseId) return;
-
-    socket.emit("message", { operation: "base:subscribe", baseId });
-
-    const handler = (raw: unknown) => {
-      if (!raw || typeof raw !== "object") return;
-      const event = raw as BaseInboundEvent;
-      if (event.baseId !== baseId) return;
-
-      const requestId = (event as any).requestId as string | undefined;
-      if (requestId && outboundRequestIds.has(requestId)) {
-        outboundRequestIds.delete(requestId);
-        return;
-      }
-
-      switch (event.operation) {
-        case "base:row:created": {
-          const e = event as BaseRowCreated;
-          queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-            { queryKey: ["base-rows", baseId] },
-            (old) => {
-              if (!old) return old;
-              const lastPageIndex = old.pages.length - 1;
-              return {
-                ...old,
-                pages: old.pages.map((page, index) =>
-                  index === lastPageIndex
-                    ? { ...page, items: [...page.items, e.row] }
-                    : page,
-                ),
-              };
-            },
-          );
-          break;
-        }
-        case "base:row:updated": {
-          const e = event as BaseRowUpdated;
-          queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-            { queryKey: ["base-rows", baseId] },
-            (old) =>
-              !old
-                ? old
-                : {
-                    ...old,
-                    pages: old.pages.map((page) => ({
-                      ...page,
-                      items: page.items.map((row) =>
-                        row.id === e.rowId
-                          ? {
-                              ...row,
-                              cells: { ...row.cells, ...e.updatedCells },
-                            }
-                          : row,
-                      ),
-                    })),
-                  },
-          );
-          break;
-        }
-        case "base:row:deleted": {
-          const e = event as BaseRowDeleted;
-          queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-            { queryKey: ["base-rows", baseId] },
-            (old) =>
-              !old
-                ? old
-                : {
-                    ...old,
-                    pages: old.pages.map((page) => ({
-                      ...page,
-                      items: page.items.filter((row) => row.id !== e.rowId),
-                    })),
-                  },
-          );
-          const store = getDefaultStore();
-          const current = store.get(selectedRowIdsAtom);
-          if (current.has(e.rowId)) {
-            const next = new Set(current);
-            next.delete(e.rowId);
-            store.set(selectedRowIdsAtom, next);
-          }
-          break;
-        }
-        case "base:rows:deleted": {
-          const e = event as BaseRowsDeleted;
-          const removeSet = new Set(e.rowIds);
-          queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-            { queryKey: ["base-rows", baseId] },
-            (old) => {
-              if (!old) return old;
-              return {
-                ...old,
-                pages: old.pages.map((page) => ({
-                  ...page,
-                  items: page.items.filter((row) => !removeSet.has(row.id)),
-                })),
-              };
-            },
-          );
-          const store = getDefaultStore();
-          const current = store.get(selectedRowIdsAtom);
-          if (current.size > 0) {
-            let changed = false;
-            const next = new Set(current);
-            for (const id of e.rowIds) {
-              if (next.delete(id)) changed = true;
-            }
-            if (changed) store.set(selectedRowIdsAtom, next);
-          }
-          break;
-        }
-        case "base:row:reordered": {
-          const e = event as BaseRowReordered;
-          queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-            { queryKey: ["base-rows", baseId] },
-            (old) =>
-              !old
-                ? old
-                : {
-                    ...old,
-                    pages: old.pages.map((page) => ({
-                      ...page,
-                      items: page.items.map((row) =>
-                        row.id === e.rowId
-                          ? { ...row, position: e.position }
-                          : row,
-                      ),
-                    })),
-                  },
-          );
-          break;
-        }
-        case "base:property:created":
-        case "base:property:updated":
-        case "base:property:deleted":
-        case "base:property:reordered":
-        case "base:view:created":
-        case "base:view:updated":
-        case "base:view:deleted": {
-          // Schema/metadata events only touch the base's `properties` /
-          // `views`, not the cell data — so we invalidate just
-          // `["bases", baseId]` here. Row reconciliation is handled
-          // per-event by the row cases above.
-          queryClient.invalidateQueries({ queryKey: ["bases", baseId] });
-          break;
-        }
-        default:
-          break;
-      }
-    };
-
-    socket.on("message", handler);
-
-    return () => {
-      socket.off("message", handler);
-      socket.emit("message", { operation: "base:unsubscribe", baseId });
-    };
-  }, [socket, baseId, queryClient]);
-}

apps/client/src/features/base/hooks/use-base-table.ts

@@ -1,399 +0,0 @@
-import { useMemo, useCallback, useRef, useState, useEffect } from "react";
-import {
-  useReactTable,
-  getCoreRowModel,
-  getSortedRowModel,
-  getFilteredRowModel,
-  createColumnHelper,
-  ColumnDef,
-  SortingState,
-  ColumnSizingState,
-  VisibilityState,
-  ColumnOrderState,
-  ColumnPinningState,
-  Table,
-} from "@tanstack/react-table";
-import {
-  IBase,
-  IBaseProperty,
-  IBaseRow,
-  IBaseView,
-  ViewConfig,
-} from "@/features/base/types/base.types";
-import { useUpdateViewMutation } from "@/features/base/queries/base-view-query";
-
-const DEFAULT_COLUMN_WIDTH = 180;
-const MIN_COLUMN_WIDTH = 80;
-const MAX_COLUMN_WIDTH = 600;
-const ROW_NUMBER_COLUMN_WIDTH = 64;
-
-export const SYSTEM_PROPERTY_TYPES = new Set(["createdAt", "lastEditedAt", "lastEditedBy"]);
-
-export function isSystemPropertyType(type: string): boolean {
-  return SYSTEM_PROPERTY_TYPES.has(type);
-}
-
-const columnHelper = createColumnHelper<IBaseRow>();
-
-function getSystemAccessor(type: string): ((row: IBaseRow) => unknown) | null {
-  switch (type) {
-    case "createdAt":
-      return (row) => row.createdAt;
-    case "lastEditedAt":
-      return (row) => row.updatedAt;
-    case "lastEditedBy":
-      return (row) => row.lastUpdatedById ?? row.creatorId;
-    default:
-      return null;
-  }
-}
-
-function buildColumns(properties: IBaseProperty[]): ColumnDef<IBaseRow, unknown>[] {
-  const rowNumberColumn = columnHelper.display({
-    id: "__row_number",
-    header: "#",
-    size: ROW_NUMBER_COLUMN_WIDTH,
-    minSize: ROW_NUMBER_COLUMN_WIDTH,
-    maxSize: ROW_NUMBER_COLUMN_WIDTH,
-    enableResizing: false,
-    enableSorting: false,
-    enableHiding: false,
-  });
-
-  const propertyColumns = properties.map((property) => {
-    const sysAccessor = getSystemAccessor(property.type);
-    if (sysAccessor) {
-      return columnHelper.accessor(sysAccessor, {
-        id: property.id,
-        header: property.name,
-        size: DEFAULT_COLUMN_WIDTH,
-        minSize: MIN_COLUMN_WIDTH,
-        maxSize: MAX_COLUMN_WIDTH,
-        enableResizing: true,
-        enableSorting: false,
-        enableHiding: !property.isPrimary,
-        meta: { property },
-      });
-    }
-
-    return columnHelper.accessor((row) => row.cells[property.id], {
-      id: property.id,
-      header: property.name,
-      size: DEFAULT_COLUMN_WIDTH,
-      minSize: MIN_COLUMN_WIDTH,
-      maxSize: MAX_COLUMN_WIDTH,
-      enableResizing: true,
-      enableSorting: true,
-      enableHiding: !property.isPrimary,
-      meta: { property },
-    });
-  });
-
-  return [rowNumberColumn, ...propertyColumns];
-}
-
-function buildSortingState(config: ViewConfig | undefined): SortingState {
-  if (!config?.sorts?.length) return [];
-  return config.sorts.map((sort) => ({
-    id: sort.propertyId,
-    desc: sort.direction === "desc",
-  }));
-}
-
-function buildColumnSizing(
-  config: ViewConfig | undefined,
-): ColumnSizingState {
-  const sizing: ColumnSizingState = {
-    __row_number: ROW_NUMBER_COLUMN_WIDTH,
-  };
-  if (config?.propertyWidths) {
-    Object.entries(config.propertyWidths).forEach(([id, width]) => {
-      sizing[id] = width;
-    });
-  }
-  return sizing;
-}
-
-function buildColumnVisibility(
-  config: ViewConfig | undefined,
-  properties: IBaseProperty[],
-): VisibilityState {
-  const visibility: VisibilityState = { __row_number: true };
-
-  if (config?.hiddenPropertyIds) {
-    const hiddenSet = new Set(config.hiddenPropertyIds);
-    properties.forEach((p) => {
-      visibility[p.id] = !hiddenSet.has(p.id);
-    });
-    return visibility;
-  }
-
-  if (config?.visiblePropertyIds?.length) {
-    const visibleSet = new Set(config.visiblePropertyIds);
-    properties.forEach((p) => {
-      visibility[p.id] = visibleSet.has(p.id);
-    });
-    return visibility;
-  }
-
-  properties.forEach((p) => {
-    visibility[p.id] = true;
-  });
-  return visibility;
-}
-
-function buildColumnOrder(
-  config: ViewConfig | undefined,
-  properties: IBaseProperty[],
-): ColumnOrderState {
-  if (config?.propertyOrder?.length) {
-    const orderSet = new Set(config.propertyOrder);
-    const missing = properties
-      .filter((p) => !orderSet.has(p.id))
-      .sort((a, b) => (a.position < b.position ? -1 : a.position > b.position ? 1 : 0))
-      .map((p) => p.id);
-    return ["__row_number", ...config.propertyOrder, ...missing];
-  }
-  const sorted = [...properties].sort((a, b) => {
-    if (a.isPrimary) return -1;
-    if (b.isPrimary) return 1;
-    return a.position < b.position ? -1 : a.position > b.position ? 1 : 0;
-  });
-  return ["__row_number", ...sorted.map((p) => p.id)];
-}
-
-function buildColumnPinning(
-  properties: IBaseProperty[],
-): ColumnPinningState {
-  const primary = properties.find((p) => p.isPrimary);
-  return {
-    left: primary ? ["__row_number", primary.id] : ["__row_number"],
-    right: [],
-  };
-}
-
-// Serializes the live react-table state into a persisted ViewConfig.
-// Sort/filter toolbar mutations and the debounced `persistViewConfig`
-// both go through this so a direct mutation (e.g. adding a sort) can't
-// clobber a pending hide/reorder/resize by reading stale `activeView.config`.
-export function buildViewConfigFromTable(
-  table: Table<IBaseRow>,
-  base: ViewConfig | undefined,
-  overrides: Partial<ViewConfig> = {},
-): ViewConfig {
-  // Guard against corrupted persisted configs — if `base` ever comes
-  // back as something other than a plain object (e.g. a jsonb-stored
-  // string `"{}"` from a buggy seed), spreading it would iterate its
-  // characters into keys `0`, `1`, … and poison the config forever.
-  const safeBase =
-    base && typeof base === "object" && !Array.isArray(base) ? base : {};
-  const state = table.getState();
-
-  const sorts = state.sorting.map((s) => ({
-    propertyId: s.id,
-    direction: (s.desc ? "desc" : "asc") as "asc" | "desc",
-  }));
-
-  const propertyWidths: Record<string, number> = {};
-  Object.entries(state.columnSizing).forEach(([id, width]) => {
-    if (id !== "__row_number") propertyWidths[id] = width;
-  });
-
-  const propertyOrder = state.columnOrder.filter((id) => id !== "__row_number");
-
-  const hiddenPropertyIds = Object.entries(state.columnVisibility)
-    .filter(([id, visible]) => id !== "__row_number" && !visible)
-    .map(([id]) => id);
-
-  return {
-    ...safeBase,
-    sorts,
-    propertyWidths,
-    propertyOrder,
-    hiddenPropertyIds,
-    visiblePropertyIds: undefined,
-    ...overrides,
-  };
-}
-
-export type UseBaseTableResult = {
-  table: Table<IBaseRow>;
-  persistViewConfig: () => void;
-};
-
-export function useBaseTable(
-  base: IBase | undefined,
-  rows: IBaseRow[],
-  activeView: IBaseView | undefined,
-): UseBaseTableResult {
-  const updateViewMutation = useUpdateViewMutation();
-  const persistTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  // While a local edit is pending (debounce scheduled OR mutation in
-  // flight), the reconcile effect preserves local state so we don't
-  // stomp the user's in-flight toggle. When no local edit is pending,
-  // the effect adopts server state — that's what makes remote updates
-  // (another client hiding a column) actually show up on this client.
-  const [hasPendingEdit, setHasPendingEdit] = useState(false);
-
-  // `base?.properties ?? []` minted a fresh `[]` every render while the
-  // base query was loading, which invalidated every downstream memo and
-  // tripped the setState-in-useEffect pairs below → "Maximum update
-  // depth exceeded". Memoize so the identity is stable.
-  const properties = useMemo(() => base?.properties ?? [], [base?.properties]);
-  const viewConfig = activeView?.config;
-
-  const columns = useMemo(
-    () => buildColumns(properties),
-    [properties],
-  );
-
-  const initialSorting = useMemo(
-    () => buildSortingState(viewConfig),
-    [viewConfig],
-  );
-
-  const initialColumnSizing = useMemo(
-    () => buildColumnSizing(viewConfig),
-    [viewConfig],
-  );
-
-  const derivedColumnOrder = useMemo(
-    () => buildColumnOrder(viewConfig, properties),
-    [viewConfig, properties],
-  );
-
-  const derivedColumnVisibility = useMemo(
-    () => buildColumnVisibility(viewConfig, properties),
-    [viewConfig, properties],
-  );
-
-  const [columnOrder, setColumnOrder] = useState<ColumnOrderState>(derivedColumnOrder);
-  const [columnVisibility, setColumnVisibility] = useState<VisibilityState>(derivedColumnVisibility);
-
-  // Re-seed from server only when the user switches views. Within the same
-  // view, local state is the source of truth — the debounced persist flushes
-  // it. Without this guard, any ws-driven `invalidateQueries(["bases", baseId])`
-  // or concurrent view mutation lands a new `derivedColumnVisibility`
-  // reference and the effect would overwrite a pending hide/reorder toggle
-  // before `persistViewConfig` has a chance to flush it.
-  const lastSyncedViewIdRef = useRef<string | undefined>(activeView?.id);
-  useEffect(() => {
-    const currentViewId = activeView?.id;
-
-    // View switch → full re-seed from the server's stored config.
-    if (currentViewId !== lastSyncedViewIdRef.current) {
-      lastSyncedViewIdRef.current = currentViewId;
-      setColumnOrder(derivedColumnOrder);
-      setColumnVisibility(derivedColumnVisibility);
-      return;
-    }
-
-    // Same view. If a local edit is pending (user just toggled and
-    // the debounce hasn't flushed yet, or the mutation is in flight),
-    // preserve local state — only reconcile the id set so that newly
-    // created columns show up and deleted columns drop out without
-    // stomping the user's toggle. If nothing local is pending, adopt
-    // the server's state — this is what lets remote updates from
-    // other clients show up here.
-    const validIds = new Set<string>(["__row_number"]);
-    for (const p of properties) validIds.add(p.id);
-
-    if (hasPendingEdit) {
-      setColumnOrder((prev) => {
-        const prevSet = new Set(prev);
-        const kept = prev.filter((id) => validIds.has(id));
-        const appended = derivedColumnOrder.filter(
-          (id) => !prevSet.has(id) && validIds.has(id),
-        );
-        if (appended.length === 0 && kept.length === prev.length) return prev;
-        return [...kept, ...appended];
-      });
-
-      setColumnVisibility((prev) => {
-        let changed = false;
-        const next: VisibilityState = {};
-        for (const [id, visible] of Object.entries(prev)) {
-          if (validIds.has(id)) {
-            next[id] = visible;
-          } else {
-            changed = true;
-          }
-        }
-        for (const id of derivedColumnOrder) {
-          if (!(id in next)) {
-            next[id] = derivedColumnVisibility[id] ?? true;
-            changed = true;
-          }
-        }
-        return changed ? next : prev;
-      });
-    } else {
-      setColumnOrder(derivedColumnOrder);
-      setColumnVisibility(derivedColumnVisibility);
-    }
-  }, [
-    activeView?.id,
-    derivedColumnOrder,
-    derivedColumnVisibility,
-    properties,
-    hasPendingEdit,
-  ]);
-
-  const columnPinning = useMemo(
-    () => buildColumnPinning(properties),
-    [properties],
-  );
-
-  const table = useReactTable({
-    data: rows,
-    columns,
-    state: {
-      columnPinning,
-      columnOrder,
-      columnVisibility,
-    },
-    onColumnOrderChange: setColumnOrder,
-    onColumnVisibilityChange: setColumnVisibility,
-    initialState: {
-      sorting: initialSorting,
-      columnSizing: initialColumnSizing,
-    },
-    getCoreRowModel: getCoreRowModel(),
-    getSortedRowModel: getSortedRowModel(),
-    getFilteredRowModel: getFilteredRowModel(),
-    columnResizeMode: "onChange",
-    enableColumnResizing: true,
-    enableSorting: true,
-    enableHiding: true,
-    getRowId: (row) => row.id,
-  });
-
-  const persistViewConfig = useCallback(() => {
-    if (!activeView || !base) return;
-
-    if (persistTimerRef.current) {
-      clearTimeout(persistTimerRef.current);
-    }
-
-    setHasPendingEdit(true);
-
-    persistTimerRef.current = setTimeout(() => {
-      persistTimerRef.current = null;
-      const config = buildViewConfigFromTable(table, activeView.config);
-      updateViewMutation.mutate(
-        { viewId: activeView.id, baseId: base.id, config },
-        {
-          onSettled: () => {
-            // Don't clear if the user has already scheduled another
-            // debounce while this one was in flight.
-            if (persistTimerRef.current === null) {
-              setHasPendingEdit(false);
-            }
-          },
-        },
-      );
-    }, 300);
-  }, [activeView, base, table, updateViewMutation]);
-
-  return { table, persistViewConfig };
-}

apps/client/src/features/base/hooks/use-column-resize.ts

@@ -1,26 +0,0 @@
-import { useEffect, useRef, useCallback } from "react";
-import { Table } from "@tanstack/react-table";
-import { IBaseRow } from "@/features/base/types/base.types";
-
-export function useColumnResize(
-  table: Table<IBaseRow>,
-  onResizeEnd: () => void,
-) {
-  const wasResizingRef = useRef(false);
-
-  const checkResizeEnd = useCallback(() => {
-    const isResizing = table.getState().columnSizingInfo.isResizingColumn;
-    if (wasResizingRef.current && !isResizing) {
-      onResizeEnd();
-    }
-    wasResizingRef.current = !!isResizing;
-  }, [table, onResizeEnd]);
-
-  useEffect(() => {
-    checkResizeEnd();
-  });
-
-  return {
-    isResizing: !!table.getState().columnSizingInfo.isResizingColumn,
-  };
-}

apps/client/src/features/base/hooks/use-delete-selected-rows.tsx

@@ -1,55 +0,0 @@
-import { useCallback } from "react";
-import { notifications } from "@mantine/notifications";
-import { modals } from "@mantine/modals";
-import { Text } from "@mantine/core";
-import { useTranslation } from "react-i18next";
-import { useRowSelection } from "@/features/base/hooks/use-row-selection";
-import { useDeleteRowsMutation } from "@/features/base/queries/base-row-query";
-
-const BATCH_SIZE = 500;
-
-export function useDeleteSelectedRows(baseId: string) {
-  const { t } = useTranslation();
-  const { selectedIds, clear } = useRowSelection();
-  const mutation = useDeleteRowsMutation();
-
-  const runDelete = useCallback(
-    async (ids: string[]) => {
-      const chunks: string[][] = [];
-      for (let i = 0; i < ids.length; i += BATCH_SIZE) {
-        chunks.push(ids.slice(i, i + BATCH_SIZE));
-      }
-      try {
-        for (const chunk of chunks) {
-          await mutation.mutateAsync({ baseId, rowIds: chunk });
-        }
-        notifications.show({
-          message: t("{{count}} rows deleted", { count: ids.length }),
-        });
-        clear();
-      } catch {
-        // mutation onError already shows notification
-      }
-    },
-    [baseId, mutation, clear, t],
-  );
-
-  const deleteSelected = useCallback(() => {
-    const ids = Array.from(selectedIds);
-    if (ids.length === 0) return;
-    modals.openConfirmModal({
-      title: t("Delete {{count}} rows?", { count: ids.length }),
-      centered: true,
-      children: (
-        <Text size="sm">
-          {t("This action cannot be undone.")}
-        </Text>
-      ),
-      labels: { confirm: t("Delete"), cancel: t("Cancel") },
-      confirmProps: { color: "red" },
-      onConfirm: () => void runDelete(ids),
-    });
-  }, [selectedIds, runDelete, t]);
-
-  return { deleteSelected, isPending: mutation.isPending };
-}

apps/client/src/features/base/hooks/use-grid-keyboard-nav.ts

@@ -1,117 +0,0 @@
-import { useCallback, useEffect } from "react";
-import { Table } from "@tanstack/react-table";
-import { IBaseRow, EditingCell } from "@/features/base/types/base.types";
-
-type UseGridKeyboardNavOptions = {
-  table: Table<IBaseRow>;
-  editingCell: EditingCell;
-  setEditingCell: (cell: EditingCell) => void;
-  containerRef: React.RefObject<HTMLDivElement | null>;
-};
-
-export function useGridKeyboardNav({
-  table,
-  editingCell,
-  setEditingCell,
-  containerRef,
-}: UseGridKeyboardNavOptions) {
-  const getNavigableColumns = useCallback(() => {
-    return table
-      .getVisibleLeafColumns()
-      .filter((col) => col.id !== "__row_number")
-      .map((col) => col.id);
-  }, [table]);
-
-  const getRowIds = useCallback(() => {
-    return table.getRowModel().rows.map((row) => row.id);
-  }, [table]);
-
-  const navigate = useCallback(
-    (rowDelta: number, colDelta: number) => {
-      if (!editingCell) return;
-
-      const columns = getNavigableColumns();
-      const rowIds = getRowIds();
-
-      const currentColIndex = columns.indexOf(editingCell.propertyId);
-      const currentRowIndex = rowIds.indexOf(editingCell.rowId);
-
-      if (currentColIndex === -1 || currentRowIndex === -1) return;
-
-      let nextColIndex = currentColIndex + colDelta;
-      let nextRowIndex = currentRowIndex + rowDelta;
-
-      if (nextColIndex < 0) {
-        nextColIndex = columns.length - 1;
-        nextRowIndex -= 1;
-      } else if (nextColIndex >= columns.length) {
-        nextColIndex = 0;
-        nextRowIndex += 1;
-      }
-
-      if (nextRowIndex < 0 || nextRowIndex >= rowIds.length) return;
-
-      setEditingCell({
-        rowId: rowIds[nextRowIndex],
-        propertyId: columns[nextColIndex],
-      });
-    },
-    [editingCell, getNavigableColumns, getRowIds, setEditingCell],
-  );
-
-  const handleKeyDown = useCallback(
-    (e: KeyboardEvent) => {
-      if (!editingCell) return;
-
-      const target = e.target as HTMLElement;
-      const isInputActive =
-        target.tagName === "INPUT" ||
-        target.tagName === "TEXTAREA" ||
-        target.isContentEditable;
-
-      switch (e.key) {
-        case "ArrowUp":
-          if (!isInputActive) {
-            e.preventDefault();
-            navigate(-1, 0);
-          }
-          break;
-        case "ArrowDown":
-          if (!isInputActive) {
-            e.preventDefault();
-            navigate(1, 0);
-          }
-          break;
-        case "ArrowLeft":
-          if (!isInputActive) {
-            e.preventDefault();
-            navigate(0, -1);
-          }
-          break;
-        case "ArrowRight":
-          if (!isInputActive) {
-            e.preventDefault();
-            navigate(0, 1);
-          }
-          break;
-        case "Tab":
-          e.preventDefault();
-          navigate(0, e.shiftKey ? -1 : 1);
-          break;
-        case "Escape":
-          e.preventDefault();
-          setEditingCell(null);
-          break;
-      }
-    },
-    [editingCell, navigate, setEditingCell],
-  );
-
-  useEffect(() => {
-    const container = containerRef.current;
-    if (!container) return;
-
-    container.addEventListener("keydown", handleKeyDown);
-    return () => container.removeEventListener("keydown", handleKeyDown);
-  }, [containerRef, handleKeyDown]);
-}

apps/client/src/features/base/hooks/use-list-keyboard-nav.ts

@@ -1,65 +0,0 @@
-import { useCallback, useEffect, useRef, useState } from "react";
-
-type UseListKeyboardNavResult = {
-  activeIndex: number;
-  setActiveIndex: (idx: number) => void;
-  handleNavKey: (e: React.KeyboardEvent) => boolean;
-  setOptionRef: (idx: number) => (el: HTMLElement | null) => void;
-};
-
-export function useListKeyboardNav(
-  itemCount: number,
-  resetDeps: ReadonlyArray<unknown>,
-): UseListKeyboardNavResult {
-  const [activeIndex, setActiveIndex] = useState(-1);
-  const optionRefs = useRef<Array<HTMLElement | null>>([]);
-
-  // Reset highlight when filter/open-state changes. resetDeps is intentional.
-  useEffect(() => {
-    setActiveIndex(-1);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, resetDeps);
-
-  useEffect(() => {
-    if (activeIndex < 0) return;
-    const el = optionRefs.current[activeIndex];
-    if (el) el.scrollIntoView({ block: "nearest" });
-  }, [activeIndex]);
-
-  const setOptionRef = useCallback(
-    (idx: number) => (el: HTMLElement | null) => {
-      optionRefs.current[idx] = el;
-    },
-    [],
-  );
-
-  const handleNavKey = useCallback(
-    (e: React.KeyboardEvent): boolean => {
-      if (itemCount === 0) return false;
-      if (e.key === "ArrowDown") {
-        e.preventDefault();
-        setActiveIndex((idx) => (idx < itemCount - 1 ? idx + 1 : 0));
-        return true;
-      }
-      if (e.key === "ArrowUp") {
-        e.preventDefault();
-        setActiveIndex((idx) => (idx <= 0 ? itemCount - 1 : idx - 1));
-        return true;
-      }
-      if (e.key === "Home") {
-        e.preventDefault();
-        setActiveIndex(0);
-        return true;
-      }
-      if (e.key === "End") {
-        e.preventDefault();
-        setActiveIndex(itemCount - 1);
-        return true;
-      }
-      return false;
-    },
-    [itemCount],
-  );
-
-  return { activeIndex, setActiveIndex, handleNavKey, setOptionRef };
-}

apps/client/src/features/base/hooks/use-row-drag.ts

@@ -1,115 +0,0 @@
-import { useState, useCallback, useRef, useEffect } from "react";
-
-type RowDragState = {
-  dragRowId: string | null;
-  dropTargetRowId: string | null;
-  dropPosition: "above" | "below" | null;
-};
-
-type UseRowDragOptions = {
-  rowIds: string[];
-  onReorder: (rowId: string, targetRowId: string, position: "above" | "below") => void;
-};
-
-export function useRowDrag({ rowIds, onReorder }: UseRowDragOptions) {
-  const [dragState, setDragState] = useState<RowDragState>({
-    dragRowId: null,
-    dropTargetRowId: null,
-    dropPosition: null,
-  });
-
-  const dragRowIdRef = useRef<string | null>(null);
-  const dropTargetRef = useRef<string | null>(null);
-  const dropPositionRef = useRef<"above" | "below" | null>(null);
-  const onReorderRef = useRef(onReorder);
-  onReorderRef.current = onReorder;
-
-  const handleDragStart = useCallback((rowId: string) => {
-    dragRowIdRef.current = rowId;
-    dropTargetRef.current = null;
-    dropPositionRef.current = null;
-    setDragState({
-      dragRowId: rowId,
-      dropTargetRowId: null,
-      dropPosition: null,
-    });
-  }, []);
-
-  const handleDragOver = useCallback(
-    (targetRowId: string, e: React.DragEvent) => {
-      e.preventDefault();
-      if (!dragRowIdRef.current || dragRowIdRef.current === targetRowId) return;
-
-      const rect = e.currentTarget.getBoundingClientRect();
-      const midY = rect.top + rect.height / 2;
-      const position: "above" | "below" = e.clientY < midY ? "above" : "below";
-
-      if (dropTargetRef.current === targetRowId && dropPositionRef.current === position) {
-        return;
-      }
-
-      dropTargetRef.current = targetRowId;
-      dropPositionRef.current = position;
-
-      setDragState({
-        dragRowId: dragRowIdRef.current,
-        dropTargetRowId: targetRowId,
-        dropPosition: position,
-      });
-    },
-    [],
-  );
-
-  const handleDragEnd = useCallback(() => {
-    const dragRowId = dragRowIdRef.current;
-    const dropTargetRowId = dropTargetRef.current;
-    const dropPosition = dropPositionRef.current;
-
-    if (dragRowId && dropTargetRowId && dropPosition && dragRowId !== dropTargetRowId) {
-      onReorderRef.current(dragRowId, dropTargetRowId, dropPosition);
-    }
-
-    dragRowIdRef.current = null;
-    dropTargetRef.current = null;
-    dropPositionRef.current = null;
-    setDragState({
-      dragRowId: null,
-      dropTargetRowId: null,
-      dropPosition: null,
-    });
-  }, []);
-
-  const handleDragLeave = useCallback(() => {
-    dropTargetRef.current = null;
-    dropPositionRef.current = null;
-    setDragState((prev) => ({
-      ...prev,
-      dropTargetRowId: null,
-      dropPosition: null,
-    }));
-  }, []);
-
-  useEffect(() => {
-    const handleGlobalDragEnd = () => {
-      dragRowIdRef.current = null;
-      dropTargetRef.current = null;
-      dropPositionRef.current = null;
-      setDragState({
-        dragRowId: null,
-        dropTargetRowId: null,
-        dropPosition: null,
-      });
-    };
-
-    document.addEventListener("dragend", handleGlobalDragEnd);
-    return () => document.removeEventListener("dragend", handleGlobalDragEnd);
-  }, []);
-
-  return {
-    dragState,
-    handleDragStart,
-    handleDragOver,
-    handleDragEnd,
-    handleDragLeave,
-  };
-}

apps/client/src/features/base/hooks/use-row-selection.ts

@@ -1,99 +0,0 @@
-import { useCallback } from "react";
-import { useAtom } from "jotai";
-import {
-  selectedRowIdsAtom,
-  lastToggledRowIndexAtom,
-} from "@/features/base/atoms/base-atoms";
-
-type ToggleOpts = {
-  shiftKey: boolean;
-  rowIndex: number;
-  orderedRowIds: string[];
-};
-
-export function useRowSelection() {
-  const [selectedIds, setSelectedIds] = useAtom(selectedRowIdsAtom) as unknown as [
-    Set<string>,
-    (val: Set<string> | ((prev: Set<string>) => Set<string>)) => void,
-  ];
-  const [lastToggledIndex, setLastToggledIndex] = useAtom(
-    lastToggledRowIndexAtom,
-  ) as unknown as [number | null, (val: number | null) => void];
-
-  const isSelected = useCallback(
-    (rowId: string) => selectedIds.has(rowId),
-    [selectedIds],
-  );
-
-  const toggle = useCallback(
-    (rowId: string, opts: ToggleOpts) => {
-      const { shiftKey, rowIndex, orderedRowIds } = opts;
-      const next = new Set(selectedIds);
-
-      if (shiftKey && lastToggledIndex !== null && lastToggledIndex !== rowIndex) {
-        const start = Math.min(lastToggledIndex, rowIndex);
-        const end = Math.max(lastToggledIndex, rowIndex);
-        const anchorId = orderedRowIds[lastToggledIndex];
-        const turnOn = anchorId ? next.has(anchorId) : true;
-        for (let i = start; i <= end; i += 1) {
-          const id = orderedRowIds[i];
-          if (!id) continue;
-          if (turnOn) next.add(id);
-          else next.delete(id);
-        }
-      } else {
-        if (next.has(rowId)) next.delete(rowId);
-        else next.add(rowId);
-      }
-
-      setSelectedIds(next);
-      setLastToggledIndex(rowIndex);
-    },
-    [selectedIds, lastToggledIndex, setSelectedIds, setLastToggledIndex],
-  );
-
-  const toggleAll = useCallback(
-    (loadedRowIds: string[]) => {
-      if (loadedRowIds.length === 0) return;
-      const allSelected = loadedRowIds.every((id) => selectedIds.has(id));
-      if (allSelected) {
-        setSelectedIds(new Set());
-      } else {
-        setSelectedIds(new Set(loadedRowIds));
-      }
-      setLastToggledIndex(null);
-    },
-    [selectedIds, setSelectedIds, setLastToggledIndex],
-  );
-
-  const clear = useCallback(() => {
-    setSelectedIds(new Set());
-    setLastToggledIndex(null);
-  }, [setSelectedIds, setLastToggledIndex]);
-
-  const removeIds = useCallback(
-    (rowIds: string[]) => {
-      if (rowIds.length === 0) return;
-      setSelectedIds((prev) => {
-        if (prev.size === 0) return prev;
-        let changed = false;
-        const next = new Set(prev);
-        for (const id of rowIds) {
-          if (next.delete(id)) changed = true;
-        }
-        return changed ? next : prev;
-      });
-    },
-    [setSelectedIds],
-  );
-
-  return {
-    selectedIds,
-    selectionCount: selectedIds.size,
-    isSelected,
-    toggle,
-    toggleAll,
-    clear,
-    removeIds,
-  };
-}

apps/client/src/features/base/queries/base-property-query.ts

@@ -1,164 +0,0 @@
-import { InfiniteData, useMutation } from "@tanstack/react-query";
-import {
-  createProperty,
-  updateProperty,
-  deleteProperty,
-  reorderProperty,
-} from "@/features/base/services/base-service";
-import {
-  IBase,
-  IBaseProperty,
-  IBaseRow,
-  CreatePropertyInput,
-  UpdatePropertyInput,
-  DeletePropertyInput,
-  ReorderPropertyInput,
-  UpdatePropertyResult,
-} from "@/features/base/types/base.types";
-import { notifications } from "@mantine/notifications";
-import { queryClient } from "@/main";
-import { useTranslation } from "react-i18next";
-import { IPagination } from "@/lib/types";
-
-export function useCreatePropertyMutation() {
-  const { t } = useTranslation();
-  return useMutation<IBaseProperty, Error, CreatePropertyInput>({
-    mutationFn: (data) => createProperty(data),
-    onSuccess: (newProperty) => {
-      queryClient.setQueryData<IBase>(
-        ["bases", newProperty.baseId],
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            properties: [...old.properties, newProperty],
-          };
-        },
-      );
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to create property"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useUpdatePropertyMutation() {
-  const { t } = useTranslation();
-  return useMutation<UpdatePropertyResult, Error, UpdatePropertyInput>({
-    mutationFn: (data) => updateProperty(data),
-    onSuccess: (result, variables) => {
-      queryClient.setQueryData<IBase>(
-        ["bases", variables.baseId],
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            properties: old.properties.map((p) =>
-              p.id === result.property.id ? result.property : p,
-            ),
-          };
-        },
-      );
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to update property"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useDeletePropertyMutation() {
-  const { t } = useTranslation();
-  return useMutation<void, Error, DeletePropertyInput>({
-    mutationFn: (data) => deleteProperty(data),
-    onSuccess: (_, variables) => {
-      queryClient.setQueryData<IBase>(
-        ["bases", variables.baseId],
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            properties: old.properties.filter(
-              (p) => p.id !== variables.propertyId,
-            ),
-          };
-        },
-      );
-
-      queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-        { queryKey: ["base-rows", variables.baseId] },
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            pages: old.pages.map((page) => ({
-              ...page,
-              items: page.items.map((row) => {
-                if (!(variables.propertyId in row.cells)) return row;
-                const { [variables.propertyId]: _, ...rest } = row.cells;
-                return { ...row, cells: rest };
-              }),
-            })),
-          };
-        },
-      );
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to delete property"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useReorderPropertyMutation() {
-  const { t } = useTranslation();
-  return useMutation<void, Error, ReorderPropertyInput, { previous: IBase | undefined }>({
-    mutationFn: (data) => reorderProperty(data),
-    onMutate: async (variables) => {
-      await queryClient.cancelQueries({
-        queryKey: ["bases", variables.baseId],
-      });
-
-      const previous = queryClient.getQueryData<IBase>([
-        "bases",
-        variables.baseId,
-      ]);
-
-      queryClient.setQueryData<IBase>(
-        ["bases", variables.baseId],
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            properties: old.properties.map((p) =>
-              p.id === variables.propertyId
-                ? { ...p, position: variables.position }
-                : p,
-            ),
-          };
-        },
-      );
-
-      return { previous };
-    },
-    onError: (_, variables, context) => {
-      if (context?.previous) {
-        queryClient.setQueryData(
-          ["bases", variables.baseId],
-          context.previous,
-        );
-      }
-      notifications.show({
-        message: t("Failed to reorder property"),
-        color: "red",
-      });
-    },
-  });
-}

apps/client/src/features/base/queries/base-query.ts

@@ -1,87 +0,0 @@
-import {
-  useMutation,
-  useQuery,
-  UseQueryResult,
-} from "@tanstack/react-query";
-import {
-  createBase,
-  getBaseInfo,
-  updateBase,
-  deleteBase,
-} from "@/features/base/services/base-service";
-import {
-  IBase,
-  CreateBaseInput,
-  UpdateBaseInput,
-} from "@/features/base/types/base.types";
-import { notifications } from "@mantine/notifications";
-import { queryClient } from "@/main";
-import { useTranslation } from "react-i18next";
-
-export function useBaseQuery(
-  baseId: string | undefined,
-): UseQueryResult<IBase, Error> {
-  return useQuery({
-    queryKey: ["bases", baseId],
-    queryFn: () => getBaseInfo(baseId!),
-    enabled: !!baseId,
-    staleTime: 5 * 60 * 1000,
-  });
-}
-
-export function useCreateBaseMutation() {
-  const { t } = useTranslation();
-  return useMutation<IBase, Error, CreateBaseInput>({
-    mutationFn: (data) => createBase(data),
-    onSuccess: (data) => {
-      queryClient.invalidateQueries({
-        queryKey: ["bases", "list", data.spaceId],
-      });
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to create base"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useUpdateBaseMutation() {
-  const { t } = useTranslation();
-  return useMutation<IBase, Error, UpdateBaseInput>({
-    mutationFn: (data) => updateBase(data),
-    onSuccess: (data) => {
-      queryClient.setQueryData<IBase>(["bases", data.id], (old) => {
-        if (!old) return old;
-        return { ...old, ...data };
-      });
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to update base"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useDeleteBaseMutation() {
-  const { t } = useTranslation();
-  return useMutation<void, Error, { baseId: string; spaceId: string }>({
-    mutationFn: ({ baseId }) => deleteBase(baseId),
-    onSuccess: (_, { baseId, spaceId }) => {
-      queryClient.removeQueries({ queryKey: ["bases", baseId] });
-      queryClient.invalidateQueries({
-        queryKey: ["bases", "list", spaceId],
-      });
-      notifications.show({ message: t("Base deleted") });
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to delete base"),
-        color: "red",
-      });
-    },
-  });
-}

apps/client/src/features/base/queries/base-row-query.ts

@@ -1,314 +0,0 @@
-import {
-  useInfiniteQuery,
-  useMutation,
-  InfiniteData,
-} from "@tanstack/react-query";
-import {
-  createRow,
-  updateRow,
-  deleteRow,
-  deleteRows,
-  listRows,
-  reorderRow,
-} from "@/features/base/services/base-service";
-import {
-  IBaseRow,
-  CreateRowInput,
-  UpdateRowInput,
-  DeleteRowInput,
-  DeleteRowsInput,
-  ReorderRowInput,
-  FilterNode,
-  SearchSpec,
-  ViewSortConfig,
-} from "@/features/base/types/base.types";
-import { notifications } from "@mantine/notifications";
-import { queryClient } from "@/main";
-import { useTranslation } from "react-i18next";
-import { IPagination } from "@/lib/types";
-import { markRequestIdOutbound } from "@/features/base/hooks/use-base-socket";
-
-type RowCacheContext = {
-  snapshots: [readonly unknown[], InfiniteData<IPagination<IBaseRow>> | undefined][];
-};
-
-// Generate a fresh requestId and pre-register it as outbound so the
-// incoming socket echo is suppressed by `useBaseSocket`.
-function newRequestId(): string {
-  const id =
-    typeof crypto !== "undefined" &&
-    typeof (crypto as any).randomUUID === "function"
-      ? (crypto as any).randomUUID()
-      : `${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
-  markRequestIdOutbound(id);
-  return id;
-}
-
-export function useBaseRowsQuery(
-  baseId: string | undefined,
-  filter?: FilterNode,
-  sorts?: ViewSortConfig[],
-  search?: SearchSpec,
-) {
-  const activeFilter = filter ?? undefined;
-  const activeSorts = sorts?.length ? sorts : undefined;
-  const activeSearch = search?.query ? search : undefined;
-
-  return useInfiniteQuery({
-    queryKey: ["base-rows", baseId, activeFilter, activeSorts, activeSearch],
-    queryFn: ({ pageParam }) =>
-      listRows(baseId!, {
-        cursor: pageParam,
-        limit: 100,
-        filter: activeFilter,
-        sorts: activeSorts,
-        search: activeSearch,
-      }),
-    enabled: !!baseId,
-    initialPageParam: undefined as string | undefined,
-    getNextPageParam: (lastPage: IPagination<IBaseRow>) =>
-      lastPage.meta?.nextCursor ?? undefined,
-    staleTime: 5 * 60 * 1000,
-  });
-}
-
-export function flattenRows(
-  data: InfiniteData<IPagination<IBaseRow>> | undefined,
-): IBaseRow[] {
-  if (!data) return [];
-  return data.pages.flatMap((page) => page.items);
-}
-
-export function useCreateRowMutation() {
-  const { t } = useTranslation();
-  return useMutation<IBaseRow, Error, CreateRowInput>({
-    mutationFn: (data) => createRow({ ...data, requestId: newRequestId() }),
-    onSuccess: (newRow) => {
-      queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-        { queryKey: ["base-rows", newRow.baseId] },
-        (old) => {
-          if (!old) return old;
-          const lastPageIndex = old.pages.length - 1;
-          return {
-            ...old,
-            pages: old.pages.map((page, index) => {
-              if (index === lastPageIndex) {
-                return { ...page, items: [...page.items, newRow] };
-              }
-              return page;
-            }),
-          };
-        },
-      );
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to create row"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useUpdateRowMutation() {
-  const { t } = useTranslation();
-  return useMutation<IBaseRow, Error, UpdateRowInput, RowCacheContext>({
-    mutationFn: (data) => updateRow({ ...data, requestId: newRequestId() }),
-    onMutate: async (variables) => {
-      await queryClient.cancelQueries({
-        queryKey: ["base-rows", variables.baseId],
-      });
-
-      const snapshots = queryClient.getQueriesData<
-        InfiniteData<IPagination<IBaseRow>>
-      >({ queryKey: ["base-rows", variables.baseId] });
-
-      queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-        { queryKey: ["base-rows", variables.baseId] },
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            pages: old.pages.map((page) => ({
-              ...page,
-              items: page.items.map((row) =>
-                row.id === variables.rowId
-                  ? {
-                      ...row,
-                      cells: { ...row.cells, ...variables.cells },
-                    }
-                  : row,
-              ),
-            })),
-          };
-        },
-      );
-
-      return { snapshots };
-    },
-    onError: (_, variables, context) => {
-      if (context?.snapshots) {
-        for (const [key, data] of context.snapshots) {
-          queryClient.setQueryData(key, data);
-        }
-      }
-      notifications.show({
-        message: t("Failed to update row"),
-        color: "red",
-      });
-    },
-    onSuccess: (updatedRow) => {
-      queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-        { queryKey: ["base-rows", updatedRow.baseId] },
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            pages: old.pages.map((page) => ({
-              ...page,
-              items: page.items.map((row) =>
-                row.id === updatedRow.id
-                  ? { ...row, ...updatedRow, cells: { ...row.cells, ...updatedRow.cells } }
-                  : row,
-              ),
-            })),
-          };
-        },
-      );
-    },
-  });
-}
-
-export function useDeleteRowMutation() {
-  const { t } = useTranslation();
-  return useMutation<void, Error, DeleteRowInput, RowCacheContext>({
-    mutationFn: (data) => deleteRow({ ...data, requestId: newRequestId() }),
-    onMutate: async (variables) => {
-      await queryClient.cancelQueries({
-        queryKey: ["base-rows", variables.baseId],
-      });
-
-      const snapshots = queryClient.getQueriesData<
-        InfiniteData<IPagination<IBaseRow>>
-      >({ queryKey: ["base-rows", variables.baseId] });
-
-      queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-        { queryKey: ["base-rows", variables.baseId] },
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            pages: old.pages.map((page) => ({
-              ...page,
-              items: page.items.filter((row) => row.id !== variables.rowId),
-            })),
-          };
-        },
-      );
-
-      return { snapshots };
-    },
-    onError: (_, variables, context) => {
-      if (context?.snapshots) {
-        for (const [key, data] of context.snapshots) {
-          queryClient.setQueryData(key, data);
-        }
-      }
-      notifications.show({
-        message: t("Failed to delete row"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useDeleteRowsMutation() {
-  const { t } = useTranslation();
-  return useMutation<void, Error, DeleteRowsInput, RowCacheContext>({
-    mutationFn: (data) => deleteRows({ ...data, requestId: newRequestId() }),
-    onMutate: async (variables) => {
-      await queryClient.cancelQueries({
-        queryKey: ["base-rows", variables.baseId],
-      });
-
-      const snapshots = queryClient.getQueriesData<
-        InfiniteData<IPagination<IBaseRow>>
-      >({ queryKey: ["base-rows", variables.baseId] });
-
-      const removeSet = new Set(variables.rowIds);
-      queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-        { queryKey: ["base-rows", variables.baseId] },
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            pages: old.pages.map((page) => ({
-              ...page,
-              items: page.items.filter((row) => !removeSet.has(row.id)),
-            })),
-          };
-        },
-      );
-
-      return { snapshots };
-    },
-    onError: (_, __, context) => {
-      if (context?.snapshots) {
-        for (const [key, data] of context.snapshots) {
-          queryClient.setQueryData(key, data);
-        }
-      }
-      notifications.show({
-        message: t("Failed to delete rows"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useReorderRowMutation() {
-  const { t } = useTranslation();
-  return useMutation<void, Error, ReorderRowInput, RowCacheContext>({
-    mutationFn: (data) => reorderRow({ ...data, requestId: newRequestId() }),
-    onMutate: async (variables) => {
-      await queryClient.cancelQueries({
-        queryKey: ["base-rows", variables.baseId],
-      });
-
-      const snapshots = queryClient.getQueriesData<
-        InfiniteData<IPagination<IBaseRow>>
-      >({ queryKey: ["base-rows", variables.baseId] });
-
-      queryClient.setQueriesData<InfiniteData<IPagination<IBaseRow>>>(
-        { queryKey: ["base-rows", variables.baseId] },
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            pages: old.pages.map((page) => ({
-              ...page,
-              items: page.items.map((row) =>
-                row.id === variables.rowId
-                  ? { ...row, position: variables.position }
-                  : row,
-              ),
-            })),
-          };
-        },
-      );
-
-      return { snapshots };
-    },
-    onError: (_, variables, context) => {
-      if (context?.snapshots) {
-        for (const [key, data] of context.snapshots) {
-          queryClient.setQueryData(key, data);
-        }
-      }
-      notifications.show({
-        message: t("Failed to reorder row"),
-        color: "red",
-      });
-    },
-  });
-}

apps/client/src/features/base/queries/base-view-query.ts

@@ -1,137 +0,0 @@
-import { useMutation } from "@tanstack/react-query";
-import {
-  createView,
-  updateView,
-  deleteView,
-} from "@/features/base/services/base-service";
-import {
-  IBase,
-  IBaseView,
-  CreateViewInput,
-  UpdateViewInput,
-  DeleteViewInput,
-} from "@/features/base/types/base.types";
-import { notifications } from "@mantine/notifications";
-import { queryClient } from "@/main";
-import { useTranslation } from "react-i18next";
-
-export function useCreateViewMutation() {
-  const { t } = useTranslation();
-  return useMutation<IBaseView, Error, CreateViewInput>({
-    mutationFn: (data) => createView(data),
-    onSuccess: (newView) => {
-      queryClient.setQueryData<IBase>(
-        ["bases", newView.baseId],
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            views: [...old.views, newView],
-          };
-        },
-      );
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to create view"),
-        color: "red",
-      });
-    },
-  });
-}
-
-export function useUpdateViewMutation() {
-  const { t } = useTranslation();
-  return useMutation<IBaseView, Error, UpdateViewInput, { previous: IBase | undefined }>({
-    mutationFn: (data) => updateView(data),
-    onMutate: async (variables) => {
-      await queryClient.cancelQueries({
-        queryKey: ["bases", variables.baseId],
-      });
-
-      const previous = queryClient.getQueryData<IBase>([
-        "bases",
-        variables.baseId,
-      ]);
-
-      queryClient.setQueryData<IBase>(
-        ["bases", variables.baseId],
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            views: old.views.map((v) =>
-              v.id === variables.viewId
-                ? {
-                    ...v,
-                    ...(variables.name !== undefined && {
-                      name: variables.name,
-                    }),
-                    ...(variables.type !== undefined && {
-                      type: variables.type,
-                    }),
-                    ...(variables.config !== undefined && {
-                      config: variables.config,
-                    }),
-                  }
-                : v,
-            ),
-          };
-        },
-      );
-
-      return { previous };
-    },
-    onError: (_, variables, context) => {
-      if (context?.previous) {
-        queryClient.setQueryData(
-          ["bases", variables.baseId],
-          context.previous,
-        );
-      }
-      notifications.show({
-        message: t("Failed to update view"),
-        color: "red",
-      });
-    },
-    onSuccess: (updatedView) => {
-      queryClient.setQueryData<IBase>(
-        ["bases", updatedView.baseId],
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            views: old.views.map((v) =>
-              v.id === updatedView.id ? updatedView : v,
-            ),
-          };
-        },
-      );
-    },
-  });
-}
-
-export function useDeleteViewMutation() {
-  const { t } = useTranslation();
-  return useMutation<void, Error, DeleteViewInput>({
-    mutationFn: (data) => deleteView(data),
-    onSuccess: (_, variables) => {
-      queryClient.setQueryData<IBase>(
-        ["bases", variables.baseId],
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            views: old.views.filter((v) => v.id !== variables.viewId),
-          };
-        },
-      );
-    },
-    onError: () => {
-      notifications.show({
-        message: t("Failed to delete view"),
-        color: "red",
-      });
-    },
-  });
-}

apps/client/src/features/base/services/base-service.ts

@@ -1,173 +0,0 @@
-import api from "@/lib/api-client";
-import { saveAs } from "file-saver";
-import {
-  IBase,
-  IBaseProperty,
-  IBaseRow,
-  IBaseView,
-  CreateBaseInput,
-  UpdateBaseInput,
-  CreatePropertyInput,
-  UpdatePropertyInput,
-  DeletePropertyInput,
-  ReorderPropertyInput,
-  CreateRowInput,
-  UpdateRowInput,
-  DeleteRowInput,
-  DeleteRowsInput,
-  ReorderRowInput,
-  CreateViewInput,
-  UpdateViewInput,
-  DeleteViewInput,
-  UpdatePropertyResult,
-  FilterNode,
-  SearchSpec,
-  ViewSortConfig,
-} from "@/features/base/types/base.types";
-import { IPagination } from "@/lib/types";
-
-// --- Bases ---
-
-export async function createBase(data: CreateBaseInput): Promise<IBase> {
-  const req = await api.post<IBase>("/bases/create", data);
-  return req.data;
-}
-
-export async function getBaseInfo(baseId: string): Promise<IBase> {
-  const req = await api.post<IBase>("/bases/info", { baseId });
-  return req.data;
-}
-
-export async function updateBase(data: UpdateBaseInput): Promise<IBase> {
-  const req = await api.post<IBase>("/bases/update", data);
-  return req.data;
-}
-
-export async function deleteBase(baseId: string): Promise<void> {
-  await api.post("/bases/delete", { baseId });
-}
-
-export async function exportBaseToCsv(baseId: string): Promise<void> {
-  const req = await api.post(
-    "/bases/export-csv",
-    { baseId },
-    { responseType: "blob" },
-  );
-
-  const header = (req?.headers?.["content-disposition"] as string) ?? "";
-  const utf8Match = header.match(/filename\*=UTF-8''([^;]+)/i);
-  const plainMatch = header.match(/filename="?([^";]+)"?/i);
-  let fileName = utf8Match?.[1] ?? plainMatch?.[1] ?? "base.csv";
-  try {
-    fileName = decodeURIComponent(fileName);
-  } catch {
-    // fallback to raw filename
-  }
-
-  saveAs(req.data, fileName);
-}
-
-export async function listBases(
-  spaceId: string,
-  params?: { cursor?: string; limit?: number },
-): Promise<IPagination<IBase>> {
-  const req = await api.post("/bases", { spaceId, ...params });
-  return req.data;
-}
-
-// --- Properties ---
-
-export async function createProperty(
-  data: CreatePropertyInput,
-): Promise<IBaseProperty> {
-  const req = await api.post<IBaseProperty>("/bases/properties/create", data);
-  return req.data;
-}
-
-export async function updateProperty(
-  data: UpdatePropertyInput,
-): Promise<UpdatePropertyResult> {
-  const req = await api.post<UpdatePropertyResult>(
-    "/bases/properties/update",
-    data,
-  );
-  return req.data;
-}
-
-export async function deleteProperty(data: DeletePropertyInput): Promise<void> {
-  await api.post("/bases/properties/delete", data);
-}
-
-export async function reorderProperty(
-  data: ReorderPropertyInput,
-): Promise<void> {
-  await api.post("/bases/properties/reorder", data);
-}
-
-// --- Rows ---
-
-export async function createRow(data: CreateRowInput): Promise<IBaseRow> {
-  const req = await api.post<IBaseRow>("/bases/rows/create", data);
-  return req.data;
-}
-
-export async function getRowInfo(
-  rowId: string,
-  baseId: string,
-): Promise<IBaseRow> {
-  const req = await api.post<IBaseRow>("/bases/rows/info", { rowId, baseId });
-  return req.data;
-}
-
-export async function updateRow(data: UpdateRowInput): Promise<IBaseRow> {
-  const req = await api.post<IBaseRow>("/bases/rows/update", data);
-  return req.data;
-}
-
-export async function deleteRow(data: DeleteRowInput): Promise<void> {
-  await api.post("/bases/rows/delete", data);
-}
-
-export async function deleteRows(data: DeleteRowsInput): Promise<void> {
-  await api.post("/bases/rows/delete-many", data);
-}
-
-export async function listRows(
-  baseId: string,
-  params?: {
-    viewId?: string;
-    cursor?: string;
-    limit?: number;
-    filter?: FilterNode;
-    sorts?: ViewSortConfig[];
-    search?: SearchSpec;
-  },
-): Promise<IPagination<IBaseRow>> {
-  const req = await api.post("/bases/rows", { baseId, ...params });
-  return req.data;
-}
-
-export async function reorderRow(data: ReorderRowInput): Promise<void> {
-  await api.post("/bases/rows/reorder", data);
-}
-
-// --- Views ---
-
-export async function createView(data: CreateViewInput): Promise<IBaseView> {
-  const req = await api.post<IBaseView>("/bases/views/create", data);
-  return req.data;
-}
-
-export async function updateView(data: UpdateViewInput): Promise<IBaseView> {
-  const req = await api.post<IBaseView>("/bases/views/update", data);
-  return req.data;
-}
-
-export async function deleteView(data: DeleteViewInput): Promise<void> {
-  await api.post("/bases/views/delete", data);
-}
-
-export async function listViews(baseId: string): Promise<IBaseView[]> {
-  const req = await api.post<IBaseView[]>("/bases/views", { baseId });
-  return req.data;
-}

apps/client/src/features/base/styles/base-table-skeleton.module.css

@@ -1,47 +0,0 @@
-.toolbar {
-  display: flex;
-  align-items: center;
-  gap: var(--mantine-spacing-xs);
-  padding: var(--mantine-spacing-xs) 0;
-  margin-bottom: var(--mantine-spacing-xs);
-}
-
-.toolbarTabs {
-  display: flex;
-  gap: 6px;
-  flex: 1;
-}
-
-.toolbarActions {
-  display: flex;
-  gap: var(--mantine-spacing-xs);
-  margin-left: auto;
-}
-
-.gridWrapper {
-  overflow: hidden;
-  flex: 1;
-  border-top: 1px solid
-    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-}
-
-.grid {
-  display: grid;
-}
-
-.cellInner {
-  display: flex;
-  align-items: center;
-  height: 100%;
-  width: 100%;
-  padding: 0 8px;
-}
-
-.headerCellInner {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  height: 100%;
-  width: 100%;
-  padding: 0 8px;
-}

apps/client/src/features/base/styles/cells.module.css

@@ -1,297 +0,0 @@
-.cellInput {
-  width: 100%;
-  height: 100%;
-  border: none;
-  outline: none;
-  background: transparent;
-  font-size: var(--mantine-font-size-sm);
-  font-family: inherit;
-  color: inherit;
-  padding: 0 8px;
-}
-
-.cellInput::placeholder {
-  color: light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-3));
-}
-
-.numberValue {
-  text-align: right;
-  width: 100%;
-}
-
-.badge {
-  display: inline-flex;
-  align-items: center;
-  padding: 1px 8px;
-  border-radius: 12px;
-  font-size: var(--mantine-font-size-xs);
-  font-weight: 500;
-  line-height: 1.5;
-  white-space: nowrap;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.badgeGroup {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  overflow: hidden;
-}
-
-.overflowCount {
-  font-size: 11px;
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-  flex-shrink: 0;
-  white-space: nowrap;
-}
-
-.checkboxCell {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  cursor: pointer;
-}
-
-.urlLink {
-  color: light-dark(var(--mantine-color-blue-6), var(--mantine-color-blue-4));
-  text-decoration: none;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  max-width: 100%;
-}
-
-.urlLink:hover {
-  text-decoration: underline;
-}
-
-.emailLink {
-  color: light-dark(var(--mantine-color-blue-6), var(--mantine-color-blue-4));
-  text-decoration: none;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  max-width: 100%;
-}
-
-.emailLink:hover {
-  text-decoration: underline;
-}
-
-.dateValue {
-  color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
-}
-
-.emptyValue {
-  color: light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-4));
-}
-
-/* Person cell — read mode (vertical list like Notion) */
-
-.personGroup {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-  padding: 4px 0;
-}
-
-.personRow {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-}
-
-.personName {
-  font-size: var(--mantine-font-size-xs);
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-/* Person cell — edit mode (tag input + dropdown) */
-
-.personTagArea {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: 4px;
-  padding: 6px 8px;
-  min-height: 34px;
-}
-
-.personTag {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  padding: 2px 4px 2px 2px;
-  border-radius: 3px;
-  background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
-  font-size: var(--mantine-font-size-xs);
-  white-space: nowrap;
-  max-width: 160px;
-}
-
-.personTagName {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.personTagRemove {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 16px;
-  height: 16px;
-  padding: 0;
-  border: none;
-  border-radius: 2px;
-  background: transparent;
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-2));
-  cursor: pointer;
-  flex-shrink: 0;
-}
-
-.personTagRemove:hover {
-  background-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-  color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-0));
-}
-
-.personTagInput {
-  flex: 1;
-  min-width: 60px;
-  border: none;
-  outline: none;
-  background: transparent;
-  font-size: var(--mantine-font-size-xs);
-  font-family: inherit;
-  color: inherit;
-  padding: 2px 0;
-}
-
-.personTagInput::placeholder {
-  color: light-dark(var(--mantine-color-gray-4), var(--mantine-color-dark-3));
-}
-
-.personDropdownDivider {
-  height: 1px;
-  background-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-}
-
-.personDropdownHint {
-  padding: 6px 8px;
-  font-size: 11px;
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-}
-
-.personOptionName {
-  font-size: 13px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.fileGroup {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  overflow: hidden;
-}
-
-.fileBadge {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  padding: 1px 6px;
-  border-radius: var(--mantine-radius-sm);
-  font-size: 11px;
-  background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
-  color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
-  white-space: nowrap;
-  max-width: 120px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.selectDropdown {
-  max-height: 240px;
-  overflow-y: auto;
-}
-
-.selectOption {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 6px 8px;
-  cursor: pointer;
-  border-radius: var(--mantine-radius-sm);
-  transition: background-color 100ms ease;
-}
-
-.selectOption:hover {
-  background-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-}
-
-.selectOptionActive {
-  background-color: light-dark(var(--mantine-color-blue-0), var(--mantine-color-blue-9));
-}
-
-.selectOptionKeyboardActive {
-  background-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-}
-
-.selectOptionActive.selectOptionKeyboardActive {
-  background-color: light-dark(var(--mantine-color-blue-1), var(--mantine-color-blue-8));
-}
-
-.selectCategoryLabel {
-  font-size: 11px;
-  font-weight: 600;
-  text-transform: uppercase;
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-  padding: 8px 8px 4px;
-  letter-spacing: 0.5px;
-}
-
-.menuItem {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  width: 100%;
-  padding: 6px 10px;
-  border-radius: var(--mantine-radius-sm);
-  font-size: var(--mantine-font-size-sm);
-  color: light-dark(var(--mantine-color-black), var(--mantine-color-dark-0));
-  cursor: pointer;
-  transition: background-color 100ms ease;
-}
-
-.menuItem:hover {
-  background-color: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-5));
-}
-
-.addOptionRow {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 6px 8px;
-  cursor: pointer;
-  border-radius: var(--mantine-radius-sm);
-  transition: background-color 100ms ease;
-  border-top: 1px solid light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-  margin-top: 4px;
-}
-
-.addOptionRow:hover {
-  background-color: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-5));
-}
-
-.addOptionLabel {
-  font-size: var(--mantine-font-size-xs);
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-  white-space: nowrap;
-  flex-shrink: 0;
-}

apps/client/src/features/base/styles/grid.module.css

@@ -1,466 +0,0 @@
-.gridWrapper {
-  position: relative;
-  overflow: auto;
-  overflow-anchor: none;
-  flex: 1;
-  min-height: 0;
-  padding-left: 6px;
-}
-
-.grid {
-  display: grid;
-  min-width: max-content;
-  border: 1px solid
-    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-  border-radius: var(--mantine-radius-sm);
-}
-
-.headerRow {
-  display: grid;
-  grid-column: 1 / -1;
-  grid-template-columns: subgrid;
-}
-
-.headerCell {
-  position: relative;
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  height: 34px;
-  padding: 0 8px;
-  font-size: var(--mantine-font-size-xs);
-  font-weight: 600;
-  color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
-  background-color: light-dark(
-    var(--mantine-color-gray-0),
-    var(--mantine-color-dark-6)
-  );
-  border-bottom: 1px solid
-    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-  border-right: 1px solid
-    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-  user-select: none;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  cursor: default;
-}
-
-.headerCell:last-child {
-  border-right: none;
-}
-
-.headerCellPinned {
-  position: sticky;
-  z-index: 2;
-  background-color: light-dark(
-    var(--mantine-color-gray-0),
-    var(--mantine-color-dark-6)
-  );
-}
-
-.headerCellContent {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  flex: 1;
-  min-width: 0;
-  overflow: hidden;
-}
-
-.headerCellName {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.headerTypeIcon {
-  flex-shrink: 0;
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-}
-
-.headerConvertingSpinner {
-  flex-shrink: 0;
-  margin-left: auto;
-}
-
-.resizeHandle {
-  position: absolute;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  width: 4px;
-  cursor: col-resize;
-  user-select: none;
-  touch-action: none;
-  z-index: 3;
-}
-
-.resizeHandle::after {
-  content: "";
-  position: absolute;
-  right: 0;
-  top: 4px;
-  bottom: 4px;
-  width: 2px;
-  border-radius: 1px;
-  background-color: transparent;
-  transition: background-color 150ms ease;
-}
-
-.resizeHandle:hover::after,
-.resizeHandleActive::after {
-  background-color: var(--mantine-color-blue-5);
-}
-
-.rowContainer {
-  display: contents;
-}
-
-.row {
-  display: grid;
-  grid-column: 1 / -1;
-  grid-template-columns: subgrid;
-}
-
-.row:hover .cell {
-  background-color: light-dark(
-    var(--mantine-color-gray-0),
-    var(--mantine-color-dark-7)
-  );
-}
-
-.cell {
-  display: flex;
-  align-items: center;
-  min-height: 36px;
-  padding: 0 8px;
-  font-size: var(--mantine-font-size-sm);
-  color: light-dark(var(--mantine-color-black), var(--mantine-color-dark-0));
-  background-color: light-dark(
-    var(--mantine-color-white),
-    var(--mantine-color-dark-7)
-  );
-  border-bottom: 1px solid
-    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-  border-right: 1px solid
-    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-  overflow: hidden;
-  cursor: default;
-  outline: none;
-}
-
-.cell:last-child {
-  border-right: none;
-}
-
-.cellPinned {
-  position: sticky;
-  z-index: 1;
-  background-color: light-dark(
-    var(--mantine-color-white),
-    var(--mantine-color-dark-7)
-  );
-}
-
-.row:hover .cellPinned {
-  background-color: light-dark(
-    var(--mantine-color-gray-0),
-    var(--mantine-color-dark-7)
-  );
-}
-
-.cellEditing {
-  outline: 2px solid var(--mantine-color-blue-5);
-  outline-offset: -2px;
-  z-index: 1;
-  padding: 0;
-}
-
-.cellContent {
-  flex: 1;
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.rowNumberCell {
-  justify-content: center;
-  font-size: var(--mantine-font-size-xs);
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-}
-
-.rowNumberDraggable {
-  cursor: grab;
-}
-
-.rowNumberDraggable:active {
-  cursor: grabbing;
-}
-
-.rowDragging .cell {
-  opacity: 0.4;
-}
-
-.rowDropAbove .cell {
-  box-shadow: inset 0 2px 0 0 var(--mantine-color-blue-5);
-}
-
-.rowDropBelow .cell {
-  box-shadow: inset 0 -2px 0 0 var(--mantine-color-blue-5);
-}
-
-.addRowButton {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  height: 34px;
-  padding: 0 8px;
-  font-size: var(--mantine-font-size-sm);
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-  border-top: 1px dashed
-    light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
-  cursor: pointer;
-  user-select: none;
-  transition: background-color 150ms ease;
-  grid-column: 1 / -1;
-}
-
-.addRowButton:hover {
-  background-color: light-dark(
-    var(--mantine-color-gray-0),
-    var(--mantine-color-dark-6)
-  );
-  color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
-}
-
-.addColumnButton {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 34px;
-  min-width: 40px;
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-  background-color: light-dark(
-    var(--mantine-color-gray-0),
-    var(--mantine-color-dark-6)
-  );
-  border-bottom: 1px solid
-    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-  cursor: pointer;
-  user-select: none;
-  transition: background-color 150ms ease;
-}
-
-.addColumnButton:hover {
-  background-color: light-dark(
-    var(--mantine-color-gray-1),
-    var(--mantine-color-dark-5)
-  );
-  color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
-}
-
-.emptyState {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  gap: var(--mantine-spacing-md);
-  padding: var(--mantine-spacing-xl) var(--mantine-spacing-md);
-  grid-column: 1 / -1;
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-}
-
-.toolbar {
-  display: flex;
-  align-items: center;
-  gap: var(--mantine-spacing-xs);
-  padding: var(--mantine-spacing-xs) 0;
-  margin-bottom: var(--mantine-spacing-xs);
-  flex-wrap: wrap;
-}
-
-.toolbarRight {
-  margin-left: auto;
-  display: flex;
-  align-items: center;
-  gap: var(--mantine-spacing-xs);
-}
-
-.primaryCell {
-  font-weight: 500;
-}
-
-.rowNumberCellInner {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-
-.rowNumberIndex,
-.rowNumberCheckbox {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.rowNumberCheckbox {
-  display: none;
-}
-
-.rowNumberDragHandle {
-  position: absolute;
-  top: 50%;
-  left: -6px;
-  transform: translateY(-50%);
-  display: none;
-  align-items: center;
-  justify-content: center;
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-  cursor: grab;
-}
-
-.rowNumberDragHandle:active {
-  cursor: grabbing;
-}
-
-/* On row hover: swap index for checkbox, reveal drag handle */
-.row:hover .rowNumberIndex {
-  display: none;
-}
-.row:hover .rowNumberCheckbox,
-.row:hover .rowNumberDragHandle {
-  display: inline-flex;
-}
-
-/* Selected row: checkbox always visible, drag handle still only on hover */
-.rowSelected .rowNumberIndex {
-  display: none;
-}
-.rowSelected .rowNumberCheckbox {
-  display: inline-flex;
-}
-.rowSelected .cell {
-  background: light-dark(var(--mantine-color-blue-0), var(--mantine-color-dark-6));
-}
-
-.row.rowSelected:hover .cell,
-.row.rowSelected:hover .cellPinned {
-  background-color: light-dark(var(--mantine-color-blue-1), var(--mantine-color-dark-5));
-}
-
-.rowNumberHeaderInner {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-}
-
-.rowNumberHeaderHash {
-  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
-  font-size: var(--mantine-font-size-xs);
-}
-
-.rowNumberHeaderCheckbox {
-  display: none;
-}
-
-.headerCell:hover .rowNumberHeaderHash,
-.hasSelection .rowNumberHeaderHash {
-  display: none;
-}
-
-.headerCell:hover .rowNumberHeaderCheckbox,
-.hasSelection .rowNumberHeaderCheckbox {
-  display: inline-flex;
-}
-
-.selectionActionBarWrapper {
-  position: fixed;
-  left: 50%;
-  bottom: 24px;
-  transform: translateX(-50%);
-  display: flex;
-  justify-content: center;
-  pointer-events: none;
-  z-index: 200;
-}
-
-.selectionActionBar {
-  pointer-events: auto;
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  padding: 6px 6px 6px 14px;
-  border-radius: 999px;
-  box-shadow:
-    0 10px 30px rgba(0, 0, 0, 0.25),
-    0 2px 8px rgba(0, 0, 0, 0.18);
-  background: light-dark(
-    var(--mantine-color-dark-8),
-    var(--mantine-color-dark-5)
-  );
-  color: var(--mantine-color-white);
-  border: 1px solid light-dark(
-    var(--mantine-color-dark-9),
-    var(--mantine-color-dark-4)
-  );
-}
-
-.selectionActionBarCount {
-  font-size: var(--mantine-font-size-sm);
-  font-weight: 500;
-  color: var(--mantine-color-white);
-  padding-right: 10px;
-  margin-right: 2px;
-  border-right: 1px solid rgba(255, 255, 255, 0.15);
-}
-
-.selectionActionBarDelete {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  padding: 4px 10px;
-  border: none;
-  background: transparent;
-  color: var(--mantine-color-red-4);
-  font-size: var(--mantine-font-size-sm);
-  font-weight: 500;
-  border-radius: 999px;
-  cursor: pointer;
-  transition: background 120ms ease;
-}
-
-.selectionActionBarDelete:hover:not(:disabled) {
-  background: rgba(255, 255, 255, 0.08);
-}
-
-.selectionActionBarDelete:disabled {
-  opacity: 0.6;
-  cursor: default;
-}
-
-.selectionActionBarClose {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 26px;
-  height: 26px;
-  border: none;
-  background: transparent;
-  color: var(--mantine-color-gray-3);
-  border-radius: 999px;
-  cursor: pointer;
-  transition: background 120ms ease, color 120ms ease;
-}
-
-.selectionActionBarClose:hover {
-  background: rgba(255, 255, 255, 0.08);
-  color: var(--mantine-color-white);
-}

apps/client/src/features/base/types/base.types.ts

@@ -1,297 +0,0 @@
-export type BasePropertyType =
-  | 'text'
-  | 'number'
-  | 'select'
-  | 'status'
-  | 'multiSelect'
-  | 'date'
-  | 'person'
-  | 'file'
-  | 'checkbox'
-  | 'url'
-  | 'email'
-  | 'createdAt'
-  | 'lastEditedAt'
-  | 'lastEditedBy';
-
-export type Choice = {
-  id: string;
-  name: string;
-  color: string;
-  category?: 'todo' | 'inProgress' | 'complete';
-};
-
-export type SelectTypeOptions = {
-  choices: Choice[];
-  choiceOrder: string[];
-  disableColors?: boolean;
-  defaultValue?: string | string[] | null;
-};
-
-export type NumberTypeOptions = {
-  format?: 'plain' | 'currency' | 'percent' | 'progress';
-  precision?: number;
-  currencySymbol?: string;
-  defaultValue?: number | null;
-};
-
-export type DateTypeOptions = {
-  dateFormat?: string;
-  timeFormat?: '12h' | '24h';
-  includeTime?: boolean;
-  defaultValue?: string | null;
-};
-
-export type TextTypeOptions = {
-  richText?: boolean;
-  defaultValue?: string | null;
-};
-
-export type CheckboxTypeOptions = {
-  defaultValue?: boolean;
-};
-
-export type UrlTypeOptions = {
-  defaultValue?: string | null;
-};
-
-export type EmailTypeOptions = {
-  defaultValue?: string | null;
-};
-
-export type PersonTypeOptions = {
-  allowMultiple?: boolean;
-};
-
-export type TypeOptions =
-  | SelectTypeOptions
-  | NumberTypeOptions
-  | DateTypeOptions
-  | TextTypeOptions
-  | CheckboxTypeOptions
-  | UrlTypeOptions
-  | EmailTypeOptions
-  | PersonTypeOptions
-  | Record<string, unknown>;
-
-export type IBaseProperty = {
-  id: string;
-  baseId: string;
-  name: string;
-  type: BasePropertyType;
-  position: string;
-  typeOptions: TypeOptions;
-  // Set while a background type-conversion job is rewriting cells. The
-  // live `type` stays on the old kind until the job commits, so cells
-  // render correctly; the column header shows a "Converting…" badge.
-  pendingType?: BasePropertyType | null;
-  pendingTypeOptions?: TypeOptions | null;
-  isPrimary: boolean;
-  workspaceId: string;
-  createdAt: string;
-  updatedAt: string;
-};
-
-export type IBaseRow = {
-  id: string;
-  baseId: string;
-  cells: Record<string, unknown>;
-  position: string;
-  creatorId: string;
-  lastUpdatedById: string | null;
-  workspaceId: string;
-  createdAt: string;
-  updatedAt: string;
-};
-
-export type ViewSortConfig = {
-  propertyId: string;
-  direction: 'asc' | 'desc';
-};
-
-// Matches the server's engine operator set (core/base/engine/schema.zod.ts).
-export type FilterOperator =
-  | 'eq'
-  | 'neq'
-  | 'gt'
-  | 'gte'
-  | 'lt'
-  | 'lte'
-  | 'contains'
-  | 'ncontains'
-  | 'startsWith'
-  | 'endsWith'
-  | 'isEmpty'
-  | 'isNotEmpty'
-  | 'before'
-  | 'after'
-  | 'onOrBefore'
-  | 'onOrAfter'
-  | 'any'
-  | 'none'
-  | 'all';
-
-export type FilterCondition = {
-  propertyId: string;
-  op: FilterOperator;
-  value?: unknown;
-};
-
-export type FilterGroup = {
-  op: 'and' | 'or';
-  children: Array<FilterCondition | FilterGroup>;
-};
-
-export type FilterNode = FilterCondition | FilterGroup;
-
-export type SearchSpec = {
-  query: string;
-  mode?: 'trgm' | 'fts';
-};
-
-export type ViewConfig = {
-  sorts?: ViewSortConfig[];
-  filter?: FilterGroup;
-  visiblePropertyIds?: string[];
-  hiddenPropertyIds?: string[];
-  propertyWidths?: Record<string, number>;
-  propertyOrder?: string[];
-};
-
-export type IBaseView = {
-  id: string;
-  baseId: string;
-  name: string;
-  type: 'table' | 'kanban' | 'calendar';
-  config: ViewConfig;
-  workspaceId: string;
-  creatorId: string;
-  createdAt: string;
-  updatedAt: string;
-};
-
-export type IBase = {
-  id: string;
-  name: string;
-  description?: string;
-  icon?: string;
-  pageId?: string;
-  spaceId: string;
-  workspaceId: string;
-  creatorId: string;
-  properties: IBaseProperty[];
-  views: IBaseView[];
-  createdAt: string;
-  updatedAt: string;
-};
-
-export type EditingCell = {
-  rowId: string;
-  propertyId: string;
-} | null;
-
-export type CreateBaseInput = {
-  name: string;
-  description?: string;
-  icon?: string;
-  pageId?: string;
-  spaceId: string;
-};
-
-export type UpdateBaseInput = {
-  baseId: string;
-  name?: string;
-  description?: string;
-  icon?: string;
-};
-
-export type CreatePropertyInput = {
-  baseId: string;
-  name: string;
-  type: BasePropertyType;
-  typeOptions?: TypeOptions;
-  requestId?: string;
-};
-
-export type UpdatePropertyInput = {
-  propertyId: string;
-  baseId: string;
-  name?: string;
-  typeOptions?: TypeOptions;
-  requestId?: string;
-};
-
-export type DeletePropertyInput = {
-  propertyId: string;
-  baseId: string;
-  requestId?: string;
-};
-
-export type ReorderPropertyInput = {
-  propertyId: string;
-  baseId: string;
-  position: string;
-  requestId?: string;
-};
-
-export type CreateRowInput = {
-  baseId: string;
-  cells?: Record<string, unknown>;
-  afterRowId?: string;
-  requestId?: string;
-};
-
-export type UpdateRowInput = {
-  rowId: string;
-  baseId: string;
-  cells: Record<string, unknown>;
-  requestId?: string;
-};
-
-export type DeleteRowInput = {
-  rowId: string;
-  baseId: string;
-  requestId?: string;
-};
-
-export type DeleteRowsInput = {
-  baseId: string;
-  rowIds: string[];
-  requestId?: string;
-};
-
-export type ReorderRowInput = {
-  rowId: string;
-  baseId: string;
-  position: string;
-  requestId?: string;
-};
-
-export type CreateViewInput = {
-  baseId: string;
-  name: string;
-  type?: 'table' | 'kanban' | 'calendar';
-  config?: ViewConfig;
-};
-
-export type UpdateViewInput = {
-  viewId: string;
-  baseId: string;
-  name?: string;
-  type?: 'table' | 'kanban' | 'calendar';
-  config?: ViewConfig;
-};
-
-export type DeleteViewInput = {
-  viewId: string;
-  baseId: string;
-};
-
-export type UpdatePropertyResult = {
-  property: IBaseProperty;
-  // Non-null when the property change kicked off a BullMQ type-conversion
-  // job (select/multiSelect/person/file → anything, or any → system type).
-  // Client can listen for `base:schema:bumped` on the base room to know
-  // when the job finished migrating cells.
-  jobId: string | null;
-};

apps/client/src/features/base/types/react-table.d.ts

@@ -1,8 +0,0 @@
-import "@tanstack/react-table";
-import { IBaseProperty } from "@/features/base/types/base.types";
-
-declare module "@tanstack/react-table" {
-  interface ColumnMeta<TData extends RowData, TValue> {
-    property?: IBaseProperty;
-  }
-}

apps/client/src/features/comment/components/comment-editor.tsx

@@ -10,6 +10,7 @@ import { useTranslation } from "react-i18next";
 import EmojiCommand from "@/features/editor/extensions/emoji-command";
 import mentionRenderItems from "@/features/editor/components/mention/mention-suggestion";
 import MentionView from "@/features/editor/components/mention/mention-view";
+import { platformModifierKey } from "@/lib";
 
 interface CommentEditorProps {
   defaultContent?: any;
@@ -83,7 +84,7 @@ const CommentEditor = forwardRef(
               }
             }
 
-            if ((event.ctrlKey || event.metaKey) && event.key === "Enter") {
+            if (platformModifierKey(event) && event.code === "Enter") {
               event.preventDefault();
               if (onSave) onSave();
 

apps/client/src/features/editor/components/attachment/upload-attachment-action.tsx

@@ -19,7 +19,9 @@ export const uploadAttachmentAction = handleAttachmentUpload({
   },
   validateFn: (file, allowMedia: boolean) => {
     if (
-      (file.type.includes("image/") || file.type.includes("video/")) &&
+      (file.type.includes("image/") ||
+        file.type.includes("video/") ||
+        file.type === "application/pdf") &&
       !allowMedia
     ) {
       return false;

apps/client/src/features/editor/components/bubble-menu/node-selector.tsx

@@ -12,6 +12,7 @@ import {
   IconInfoCircle,
   IconList,
   IconListNumbers,
+  IconQuote,
   IconTypography,
 } from "@tabler/icons-react";
 import { Popover, Button, ScrollArea, Tooltip } from "@mantine/core";
@@ -59,6 +60,7 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
         isCodeBlock: ctx.editor.isActive("codeBlock"),
         isCallout: ctx.editor.isActive("callout"),
         isDetails: ctx.editor.isActive("details"),
+        isTransclusion: ctx.editor.isActive("transclusion"),
       };
     },
   });
@@ -140,6 +142,12 @@ export const NodeSelector: FC<NodeSelectorProps> = ({
       command: () => editor.chain().focus().setDetails().run(),
       isActive: () => editorState?.isDetails,
     },
+    {
+      name: "Sync block",
+      icon: IconQuote,
+      command: () => editor.chain().focus().toggleTransclusion().run(),
+      isActive: () => editorState?.isTransclusion,
+    },
   ];
 
   const activeItem = items.filter((item) => item.isActive()).pop() ?? {

apps/client/src/features/editor/components/slash-menu/menu-items.ts

@@ -25,6 +25,7 @@ import {
   IconColumns3,
   IconColumns2,
   IconTag,
+  IconRotate2,
 } from "@tabler/icons-react";
 import {
   CommandProps,
@@ -477,6 +478,23 @@ const CommandGroups: SlashMenuGroupedItemsType = {
         editor.chain().focus().deleteRange(range).insertSubpages().run();
       },
     },
+    {
+      title: "Sync block",
+      description: "Create a block that stays in sync across pages.",
+      searchTerms: [
+        "sync",
+        "synced",
+        "sync block",
+        "excerpt",
+        "transclusion",
+        "reusable",
+        "snippet",
+      ],
+      icon: IconRotate2,
+      command: ({ editor, range }: CommandProps) => {
+        editor.chain().focus().deleteRange(range).insertTransclusion().run();
+      },
+    },
     {
       title: "2 Columns",
       description: "Split content into two columns.",

apps/client/src/features/editor/components/transclusion/error-placeholder.tsx

@@ -0,0 +1,22 @@
+import { IconAlertTriangle } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import classes from "./transclusion.module.css";
+
+export default function ErrorPlaceholder() {
+  const { t } = useTranslation();
+  return (
+    <div className={classes.placeholder}>
+      <IconAlertTriangle
+        size={20}
+        stroke={1.5}
+        className={classes.placeholderIcon}
+      />
+      <div className={classes.placeholderTitle}>
+        {t("Failed to load transclusion")}
+      </div>
+      <div className={classes.placeholderSubtext}>
+        {t("An error occurred while rendering this reference")}
+      </div>
+    </div>
+  );
+}

apps/client/src/features/editor/components/transclusion/no-access-placeholder.tsx

@@ -0,0 +1,16 @@
+import { IconEyeOff } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import classes from "./transclusion.module.css";
+
+export default function NoAccessPlaceholder() {
+  const { t } = useTranslation();
+  return (
+    <div className={classes.placeholder}>
+      <IconEyeOff size={20} stroke={1.5} className={classes.placeholderIcon} />
+      <div className={classes.placeholderTitle}>{t("No access")}</div>
+      <div className={classes.placeholderSubtext}>
+        {t("You don't have access to this content")}
+      </div>
+    </div>
+  );
+}

apps/client/src/features/editor/components/transclusion/not-found-placeholder.tsx

@@ -0,0 +1,24 @@
+import { IconQuestionMark } from "@tabler/icons-react";
+import { useTranslation } from "react-i18next";
+import classes from "./transclusion.module.css";
+
+export default function NotFoundPlaceholder() {
+  const { t } = useTranslation();
+  return (
+    <div className={classes.placeholder}>
+      <IconQuestionMark
+        size={20}
+        stroke={1.5}
+        className={classes.placeholderIcon}
+      />
+      <div className={classes.placeholderTitle}>
+        {t("Synced block unavailable")}
+      </div>
+      <div className={classes.placeholderSubtext}>
+        {t(
+          "The source may have been removed, or embedding it here would create a loop.",
+        )}
+      </div>
+    </div>
+  );
+}

apps/client/src/features/editor/components/transclusion/transclusion-content.tsx

@@ -0,0 +1,52 @@
+import { EditorProvider } from "@tiptap/react";
+import { useMemo } from "react";
+import { mainExtensions } from "@/features/editor/extensions/extensions";
+import { UniqueID } from "@docmost/editor-ext";
+import { TransclusionLookupProvider } from "./transclusion-lookup-context";
+
+type Props = {
+  hostPageId: string;
+  content: unknown;
+};
+
+export default function TransclusionContent({ hostPageId, content }: Props) {
+  const extensions = useMemo(() => {
+    const filtered = mainExtensions.filter(
+      (e: any) => e.name !== "uniqueID" && e.name !== "globalDragHandle",
+    );
+    return [
+      ...filtered,
+      UniqueID.configure({
+        types: ["heading", "paragraph", "transclusion"],
+        updateDocument: false,
+      }),
+    ];
+  }, []);
+
+  // Isolate the nested read-only editor's events from the host editor:
+  // - mousedown/click would otherwise make the host node-select the atom
+  //   wrapper, blocking native text selection inside.
+  // - dragstart/dragover/drop would otherwise let the host treat events
+  //   inside the nested view as drops on the host, duplicating dropped
+  //   files at the transclusion's position.
+  const stop = (e: React.SyntheticEvent) => e.stopPropagation();
+
+  return (
+    <TransclusionLookupProvider hostPageId={hostPageId}>
+      <div
+        onMouseDown={stop}
+        onClick={stop}
+        onDragStart={stop}
+        onDragOver={stop}
+        onDrop={stop}
+      >
+        <EditorProvider
+          editable={false}
+          immediatelyRender={true}
+          extensions={extensions}
+          content={content as any}
+        />
+      </div>
+    </TransclusionLookupProvider>
+  );
+}

apps/client/src/features/editor/components/transclusion/transclusion-lookup-context.tsx

@@ -0,0 +1,198 @@
+import React, {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { lookupTransclusion } from "@/features/transclusion/services/transclusion-api";
+import type { TransclusionLookup } from "@/features/transclusion/types/transclusion.types";
+
+type LookupKey = string; // `${sourcePageId}::${transclusionId}`
+
+type Subscriber = {
+  key: LookupKey;
+  sourcePageId: string;
+  transclusionId: string;
+  setResult: (r: TransclusionLookup) => void;
+};
+
+type ContextValue = {
+  /** Register a subscriber. Returns an unsubscribe function. */
+  subscribe: (s: Subscriber) => () => void;
+  /**
+   * Force a re-fetch of `key` and resolve when the response arrives (or the
+   * request fails). Bypasses the cache and any in-flight de-dup so the user
+   * always sees a fresh server read.
+   */
+  refresh: (key: LookupKey) => Promise<void>;
+};
+
+const TransclusionLookupContext = createContext<ContextValue | null>(null);
+
+export function TransclusionLookupProvider({
+  children,
+}: {
+  /**
+   * Retained for API compatibility with previous callers that passed the
+   * host page id; no longer used internally now that cycle prevention lives
+   * on the server side and lookups are stateless.
+   */
+  hostPageId?: string;
+  children: React.ReactNode;
+}) {
+  const subscribersRef = useRef(new Map<LookupKey, Subscriber[]>());
+  const queueRef = useRef(new Set<LookupKey>());
+  const tickRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  // Last looked-up value for each key. Re-subscribers (e.g. when the editor
+  // remounts after switching from static to live) get this immediately
+  // instead of triggering a duplicate fetch.
+  const resultCacheRef = useRef(new Map<LookupKey, TransclusionLookup>());
+  // Keys that are currently in flight in a batch request. A second subscribe
+  // for the same key while the first request is pending is a no-op; the
+  // subscriber is added to subscribersRef and will be notified when the
+  // pending request completes.
+  const inFlightRef = useRef(new Set<LookupKey>());
+  // Resolvers waiting on the next response for a key. Populated by refresh()
+  // so callers can await the fetch round-trip; resolved on success and on
+  // network error so the UI never hangs in a loading state.
+  const pendingRef = useRef(new Map<LookupKey, Array<() => void>>());
+
+  const flush = useCallback(async () => {
+    tickRef.current = null;
+    const keys = Array.from(queueRef.current);
+    queueRef.current.clear();
+    if (keys.length === 0) return;
+
+    for (const k of keys) inFlightRef.current.add(k);
+
+    const references = keys.map((k) => {
+      const [sourcePageId, transclusionId] = k.split("::");
+      return { sourcePageId, transclusionId };
+    });
+
+    const resolveWaiters = (key: LookupKey) => {
+      const waiters = pendingRef.current.get(key);
+      if (!waiters) return;
+      pendingRef.current.delete(key);
+      for (const w of waiters) w();
+    };
+
+    try {
+      const { items } = await lookupTransclusion({ references });
+      for (const r of items) {
+        const key = `${r.sourcePageId}::${r.transclusionId}`;
+        resultCacheRef.current.set(key, r);
+        inFlightRef.current.delete(key);
+        const subs = subscribersRef.current.get(key);
+        if (subs) {
+          for (const s of subs) s.setResult(r);
+        }
+        resolveWaiters(key);
+      }
+    } catch {
+      // Network error — leave subscribers in pending state and clear the
+      // in-flight flag so a future subscribe can retry.
+      for (const k of keys) {
+        inFlightRef.current.delete(k);
+        resolveWaiters(k);
+      }
+    }
+  }, []);
+
+  const enqueue = useCallback(
+    (key: LookupKey) => {
+      queueRef.current.add(key);
+      if (tickRef.current === null) {
+        tickRef.current = setTimeout(flush, 10);
+      }
+    },
+    [flush],
+  );
+
+  const subscribe = useCallback<ContextValue["subscribe"]>(
+    (s) => {
+      const list = subscribersRef.current.get(s.key) ?? [];
+      list.push(s);
+      subscribersRef.current.set(s.key, list);
+
+      const cached = resultCacheRef.current.get(s.key);
+      if (cached) {
+        s.setResult(cached);
+      } else if (!inFlightRef.current.has(s.key)) {
+        enqueue(s.key);
+      }
+
+      return () => {
+        const cur = subscribersRef.current.get(s.key) ?? [];
+        const next = cur.filter((x) => x !== s);
+        if (next.length === 0) subscribersRef.current.delete(s.key);
+        else subscribersRef.current.set(s.key, next);
+      };
+    },
+    [enqueue],
+  );
+
+  const refresh = useCallback<ContextValue["refresh"]>(
+    (key) =>
+      new Promise<void>((resolve) => {
+        resultCacheRef.current.delete(key);
+        inFlightRef.current.delete(key);
+        const waiters = pendingRef.current.get(key) ?? [];
+        waiters.push(resolve);
+        pendingRef.current.set(key, waiters);
+        enqueue(key);
+      }),
+    [enqueue],
+  );
+
+  useEffect(
+    () => () => {
+      if (tickRef.current) clearTimeout(tickRef.current);
+    },
+    [],
+  );
+
+  const value = useMemo<ContextValue>(
+    () => ({ subscribe, refresh }),
+    [subscribe, refresh],
+  );
+
+  return (
+    <TransclusionLookupContext.Provider value={value}>
+      {children}
+    </TransclusionLookupContext.Provider>
+  );
+}
+
+export function useTransclusionLookup(
+  sourcePageId: string | null | undefined,
+  transclusionId: string | null | undefined,
+): {
+  result: TransclusionLookup | null;
+  refresh: () => Promise<void>;
+} {
+  const ctx = useContext(TransclusionLookupContext);
+  const [result, setResult] = useState<TransclusionLookup | null>(null);
+
+  useEffect(() => {
+    if (!ctx || !sourcePageId || !transclusionId) return;
+    const key = `${sourcePageId}::${transclusionId}`;
+    const unsubscribe = ctx.subscribe({
+      key,
+      sourcePageId,
+      transclusionId,
+      setResult,
+    });
+    return unsubscribe;
+  }, [ctx, sourcePageId, transclusionId]);
+
+  const refresh = useCallback(async () => {
+    if (!ctx || !sourcePageId || !transclusionId) return;
+    await ctx.refresh(`${sourcePageId}::${transclusionId}`);
+  }, [ctx, sourcePageId, transclusionId]);
+
+  return { result, refresh };
+}

apps/client/src/features/editor/components/transclusion/transclusion-reference-view.tsx

@@ -0,0 +1,204 @@
+import { NodeViewProps, NodeViewWrapper } from "@tiptap/react";
+import { ActionIcon, Menu, Tooltip } from "@mantine/core";
+import {
+  IconDots,
+  IconExternalLink,
+  IconLinkOff,
+  IconRefresh,
+  IconTrash,
+} from "@tabler/icons-react";
+import { useState } from "react";
+import { Link } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import { ErrorBoundary } from "react-error-boundary";
+import { useTransclusionLookup } from "./transclusion-lookup-context";
+import TransclusionContent from "./transclusion-content";
+import NoAccessPlaceholder from "./no-access-placeholder";
+import NotFoundPlaceholder from "./not-found-placeholder";
+import ErrorPlaceholder from "./error-placeholder";
+import classes from "./transclusion.module.css";
+import SyncBlockReferencesDropdown from "@/features/transclusion/components/sync-block-references-dropdown";
+import {
+  useReferencesQuery,
+  useUnsyncReferenceMutation,
+} from "@/features/transclusion/queries/transclusion-query";
+import { buildPageUrl } from "@/features/page/page.utils";
+
+export default function TransclusionReferenceView(props: NodeViewProps) {
+  const isEditable = props.editor.isEditable;
+  const sourcePageId: string | null = props.node.attrs.sourcePageId ?? null;
+  const transclusionId: string | null = props.node.attrs.transclusionId ?? null;
+  const [openMenus, setOpenMenus] = useState(0);
+  const trackOpen = (open: boolean) =>
+    setOpenMenus((n) => Math.max(0, n + (open ? 1 : -1)));
+
+  return (
+    <NodeViewWrapper
+      className={classes.includeWrap}
+      data-focused={isEditable && props.selected ? "true" : "false"}
+      data-menu-open={openMenus > 0 ? "true" : "false"}
+      contentEditable={false}
+    >
+      <ErrorBoundary
+        resetKeys={[sourcePageId, transclusionId]}
+        fallback={<ErrorPlaceholder />}
+      >
+        <TransclusionReferenceBody {...props} trackOpen={trackOpen} />
+      </ErrorBoundary>
+    </NodeViewWrapper>
+  );
+}
+
+function TransclusionReferenceBody({
+  editor,
+  node,
+  deleteNode,
+  getPos,
+  trackOpen,
+}: NodeViewProps & { trackOpen: (open: boolean) => void }) {
+  const { t } = useTranslation();
+  const sourcePageId: string | null = node.attrs.sourcePageId ?? null;
+  const transclusionId: string | null = node.attrs.transclusionId ?? null;
+  const isEditable = editor.isEditable;
+
+  const { result, refresh } = useTransclusionLookup(
+    sourcePageId,
+    transclusionId,
+  );
+  const [refreshing, setRefreshing] = useState(false);
+  const handleRefresh = async () => {
+    setRefreshing(true);
+    try {
+      await refresh();
+    } finally {
+      setRefreshing(false);
+    }
+  };
+  // @ts-ignore - editor.storage.pageId is set by the host editor
+  const hostPageId: string | undefined = editor.storage?.pageId;
+  const unsyncMutation = useUnsyncReferenceMutation();
+  // Cached against the dropdown's identical query so the source link target
+  // is ready as soon as the controls fade in on hover, without a second
+  // fetch.
+  const referencesQuery = useReferencesQuery(
+    sourcePageId,
+    transclusionId,
+    isEditable,
+  );
+  const sourcePageHref = (() => {
+    const source = referencesQuery.data?.source;
+    if (source?.spaceSlug) {
+      return buildPageUrl(source.spaceSlug, source.slugId, source.title);
+    }
+    return sourcePageId ? `/p/${sourcePageId}` : null;
+  })();
+
+  const handleUnsync = async () => {
+    if (!hostPageId || !sourcePageId || !transclusionId) return;
+    try {
+      const { content } = await unsyncMutation.mutateAsync({
+        referencePageId: hostPageId,
+        sourcePageId,
+        transclusionId,
+      });
+      const pos = getPos();
+      if (typeof pos !== "number") return;
+      const from = pos;
+      const to = pos + node.nodeSize;
+      editor
+        .chain()
+        .focus()
+        .insertContentAt({ from, to }, content as any)
+        .run();
+    } catch {
+      // mutation surfaces errors via React Query; node stays as-is
+    }
+  };
+
+  return (
+    <>
+      {isEditable && (
+        <div className={classes.includeControls} contentEditable={false}>
+          {sourcePageId && transclusionId && hostPageId && (
+            <SyncBlockReferencesDropdown
+              sourcePageId={sourcePageId}
+              transclusionId={transclusionId}
+              currentPageId={hostPageId}
+              mode="reference"
+              onOpenChange={trackOpen}
+            />
+          )}
+          <span className={classes.controlsDivider} />
+          <Tooltip label={t("Refresh")}>
+            <ActionIcon
+              variant="subtle"
+              color="gray"
+              size="sm"
+              onClick={handleRefresh}
+              loading={refreshing}
+              disabled={!sourcePageId || !transclusionId}
+            >
+              <IconRefresh size={14} />
+            </ActionIcon>
+          </Tooltip>
+          {sourcePageHref && (
+            <Tooltip label={t("Go to source page")}>
+              <ActionIcon
+                component={Link}
+                to={sourcePageHref}
+                variant="subtle"
+                color="gray"
+                size="sm"
+              >
+                <IconExternalLink size={14} />
+              </ActionIcon>
+            </Tooltip>
+          )}
+          <Menu position="bottom-end" withinPortal onChange={trackOpen}>
+            <Menu.Target>
+              <ActionIcon variant="subtle" color="gray" size="sm">
+                <IconDots size={14} />
+              </ActionIcon>
+            </Menu.Target>
+            <Menu.Dropdown>
+              <Menu.Item
+                leftSection={<IconLinkOff size={14} />}
+                onClick={handleUnsync}
+                disabled={
+                  unsyncMutation.isPending ||
+                  !hostPageId ||
+                  !sourcePageId ||
+                  !transclusionId
+                }
+              >
+                {t("Unsync")}
+              </Menu.Item>
+              <Menu.Item
+                color="red"
+                leftSection={<IconTrash size={14} />}
+                onClick={() => deleteNode()}
+              >
+                {t("Remove from page")}
+              </Menu.Item>
+            </Menu.Dropdown>
+          </Menu>
+        </div>
+      )}
+
+      {!sourcePageId || !transclusionId ? (
+        <NotFoundPlaceholder />
+      ) : !result ? (
+        <div style={{ minHeight: 24 }} />
+      ) : !("status" in result) ? (
+        <TransclusionContent
+          hostPageId={hostPageId ?? sourcePageId}
+          content={result.content}
+        />
+      ) : result.status === "no_access" ? (
+        <NoAccessPlaceholder />
+      ) : (
+        <NotFoundPlaceholder />
+      )}
+    </>
+  );
+}

apps/client/src/features/editor/components/transclusion/transclusion-view.tsx

@@ -0,0 +1,122 @@
+import {
+  NodeViewContent,
+  NodeViewProps,
+  NodeViewWrapper,
+} from "@tiptap/react";
+import { ActionIcon, Menu, Tooltip } from "@mantine/core";
+import { notifications } from "@mantine/notifications";
+import {
+  IconCheck,
+  IconCopy,
+  IconDots,
+  IconLinkOff,
+  IconTrash,
+} from "@tabler/icons-react";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import classes from "./transclusion.module.css";
+import SyncBlockReferencesDropdown from "@/features/transclusion/components/sync-block-references-dropdown";
+
+export default function TransclusionView(props: NodeViewProps) {
+  const { editor, node, deleteNode } = props;
+  const { t } = useTranslation();
+  const [openMenus, setOpenMenus] = useState(0);
+  const trackOpen = (open: boolean) =>
+    setOpenMenus((n) => Math.max(0, n + (open ? 1 : -1)));
+
+  const isEditable = editor.isEditable;
+  // @ts-ignore - editor.storage.pageId is set by the host editor (page-editor.tsx onCreate)
+  const sourcePageId: string | undefined = editor.storage?.pageId;
+  const transclusionId: string | null = node.attrs.id ?? null;
+
+  const [copied, setCopied] = useState(false);
+  const handleCopy = async () => {
+    if (!sourcePageId || !transclusionId) return;
+    const html = `<div data-type="transclusionReference" data-source-page-id="${sourcePageId}" data-transclusion-id="${transclusionId}"></div>`;
+    try {
+      await navigator.clipboard.write([
+        new ClipboardItem({
+          "text/html": new Blob([html], { type: "text/html" }),
+          "text/plain": new Blob([html], { type: "text/plain" }),
+        }),
+      ]);
+    } catch {
+      // Fallback for browsers without ClipboardItem write support
+      try {
+        await navigator.clipboard.writeText(html);
+      } catch {
+        return;
+      }
+    }
+    setCopied(true);
+    window.setTimeout(() => setCopied(false), 2000);
+    notifications.show({
+      message: t("Copied. Paste on any page to embed this synced block."),
+    });
+  };
+
+  const handleUnsync = () => {
+    editor.chain().focus().unsyncTransclusion().run();
+  };
+
+  return (
+    <NodeViewWrapper
+      className={classes.transclusionWrap}
+      data-drag-handle
+      data-menu-open={openMenus > 0 ? "true" : "false"}
+    >
+      {isEditable && (
+        <div className={classes.transclusionControls} contentEditable={false}>
+          {sourcePageId && transclusionId && (
+            <SyncBlockReferencesDropdown
+              sourcePageId={sourcePageId}
+              transclusionId={transclusionId}
+              currentPageId={sourcePageId}
+              mode="source"
+              onOpenChange={trackOpen}
+            />
+          )}
+
+          <span className={classes.controlsDivider} />
+
+          <Tooltip label={copied ? t("Copied") : t("Copy synced block")}>
+            <ActionIcon
+              variant="subtle"
+              color={copied ? "teal" : "gray"}
+              size="sm"
+              onClick={handleCopy}
+              disabled={!sourcePageId || !transclusionId}
+            >
+              {copied ? <IconCheck size={14} /> : <IconCopy size={14} />}
+            </ActionIcon>
+          </Tooltip>
+
+          <Menu position="bottom-end" withinPortal onChange={trackOpen}>
+            <Menu.Target>
+              <ActionIcon variant="subtle" color="gray" size="sm">
+                <IconDots size={14} />
+              </ActionIcon>
+            </Menu.Target>
+            <Menu.Dropdown>
+              <Menu.Item
+                leftSection={<IconLinkOff size={14} />}
+                onClick={handleUnsync}
+              >
+                {t("Unsync")}
+              </Menu.Item>
+              <Menu.Item
+                color="red"
+                leftSection={<IconTrash size={14} />}
+                onClick={() => deleteNode()}
+              >
+                {t("Delete sync block")}
+              </Menu.Item>
+            </Menu.Dropdown>
+          </Menu>
+        </div>
+      )}
+
+      <NodeViewContent />
+    </NodeViewWrapper>
+  );
+}

apps/client/src/features/editor/components/transclusion/transclusion.module.css

@@ -0,0 +1,199 @@
+.placeholder {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+  padding: var(--mantine-spacing-md);
+  border-radius: var(--mantine-radius-md);
+  background: light-dark(
+    var(--mantine-color-gray-0),
+    var(--mantine-color-dark-6)
+  );
+  border: 1px dashed
+    light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
+  color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
+}
+
+.placeholderIcon {
+  color: light-dark(var(--mantine-color-gray-5), var(--mantine-color-dark-3));
+}
+
+.placeholderTitle {
+  font-weight: 600;
+  font-size: var(--mantine-font-size-sm);
+}
+
+.placeholderSubtext {
+  font-size: var(--mantine-font-size-xs);
+  color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-2));
+  text-align: center;
+}
+
+.transclusionBadge {
+  display: inline-block;
+  padding: 2px 8px;
+  font-size: var(--mantine-font-size-xs);
+  font-weight: 600;
+  color: light-dark(var(--mantine-color-gray-7), var(--mantine-color-dark-1));
+  background: light-dark(
+    var(--mantine-color-gray-1),
+    var(--mantine-color-dark-5)
+  );
+  border-radius: var(--mantine-radius-sm);
+  margin-bottom: 4px;
+}
+
+.transclusionWrap {
+  position: relative;
+  margin-left: -3rem;
+  margin-right: -3rem;
+  width: calc(100% + 6rem);
+  padding: 0.5em 3rem;
+  border-radius: 4px;
+  border: 1px solid transparent;
+  transition: border 0.3s;
+}
+
+.transclusionWrap:hover,
+.transclusionWrap:focus-within {
+  border: 1px solid
+    light-dark(var(--mantine-color-gray-3), var(--mantine-color-gray-7));
+}
+
+.transclusionControls {
+  position: absolute;
+  bottom: calc(100% + 8px);
+  right: 4px;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  background: var(--mantine-color-body);
+  border: 1px solid var(--mantine-color-default-border);
+  border-radius: 6px;
+  padding: 4px 6px;
+  opacity: 0;
+  pointer-events: none;
+  transition: opacity 0.15s ease;
+  z-index: 2;
+}
+
+/* Hover bridge: keeps :hover on the wrap while the cursor crosses the
+   8px gap between wrap and floating chrome, so the menu doesn't fade out
+   on the way to it. */
+.transclusionControls::after {
+  content: "";
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  height: 8px;
+}
+
+.transclusionWrap:hover .transclusionControls,
+.transclusionWrap:focus-within .transclusionControls,
+.transclusionWrap[data-menu-open="true"] .transclusionControls {
+  opacity: 1;
+  pointer-events: auto;
+}
+
+.controlsDivider {
+  display: inline-block;
+  width: 1px;
+  height: 16px;
+  background: var(--mantine-color-default-border);
+}
+
+.includeWrap {
+  position: relative;
+  margin-left: -3rem;
+  margin-right: -3rem;
+  width: calc(100% + 6rem);
+  padding: 0.5em 0;
+  border-radius: 4px;
+  border: 1px solid transparent;
+  transition: border 0.3s;
+}
+
+.includeWrap:hover,
+.includeWrap[data-focused="true"],
+.includeWrap[data-menu-open="true"] {
+  border: 1px solid
+    light-dark(var(--mantine-color-gray-3), var(--mantine-color-gray-7));
+}
+
+.includeControls {
+  position: absolute;
+  bottom: calc(100% + 8px);
+  right: 4px;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  background: var(--mantine-color-body);
+  border: 1px solid var(--mantine-color-default-border);
+  border-radius: 6px;
+  padding: 4px 6px;
+  opacity: 0;
+  pointer-events: none;
+  transition: opacity 0.15s ease;
+  z-index: 2;
+}
+
+/* Hover bridge: keeps :hover on the wrap while the cursor crosses the
+   8px gap between wrap and floating chrome, so the menu doesn't fade out
+   on the way to it. */
+.includeControls::after {
+  content: "";
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  height: 8px;
+}
+
+.includeWrap:hover .includeControls,
+.includeWrap:focus-within .includeControls,
+.includeWrap[data-focused="true"] .includeControls,
+.includeWrap[data-menu-open="true"] .includeControls {
+  opacity: 1;
+  pointer-events: auto;
+}
+
+:global(.react-renderer.node-transclusion.ProseMirror-selectednode),
+:global(.react-renderer.node-transclusionReference.ProseMirror-selectednode) {
+  outline: none;
+}
+
+@media (max-width: 48em) {
+  .transclusionWrap,
+  .includeWrap {
+    margin-left: -1rem;
+    margin-right: -1rem;
+    width: calc(100% + 2rem);
+  }
+
+  .transclusionWrap {
+    padding-left: 1rem;
+    padding-right: 1rem;
+  }
+}
+
+@media print {
+  .transclusionControls,
+  .includeControls {
+    display: none !important;
+  }
+}
+
+.editingOriginalTag {
+  display: inline-block;
+  padding: 0 6px;
+  font-size: var(--mantine-font-size-xs);
+  font-weight: 500;
+  color: var(--mantine-color-blue-7);
+  background: light-dark(
+    var(--mantine-color-blue-0),
+    var(--mantine-color-blue-9)
+  );
+  border-radius: var(--mantine-radius-sm);
+}

apps/client/src/features/editor/extensions/drag-handle.ts

@@ -0,0 +1,419 @@
+import { Extension } from "@tiptap/core";
+import {
+  NodeSelection,
+  Plugin,
+  PluginKey,
+  TextSelection,
+} from "@tiptap/pm/state";
+import { Fragment, Slice, Node } from "@tiptap/pm/model";
+import { EditorView } from "@tiptap/pm/view";
+
+export interface GlobalDragHandleOptions {
+  /**
+   * The width of the drag handle
+   */
+  dragHandleWidth: number;
+
+  /**
+   * The treshold for scrolling
+   */
+  scrollThreshold: number;
+
+  /*
+   * The css selector to query for the drag handle. (eg: '.custom-handle').
+   * If handle element is found, that element will be used as drag handle. If not, a default handle will be created
+   */
+  dragHandleSelector?: string;
+
+  /**
+   * Tags to be excluded for drag handle
+   */
+  excludedTags: string[];
+
+  /**
+   * Custom nodes to be included for drag handle
+   */
+  customNodes: string[];
+}
+function absoluteRect(node: Element) {
+  const data = node.getBoundingClientRect();
+  const modal = node.closest('[role="dialog"]');
+
+  if (modal && window.getComputedStyle(modal).transform !== "none") {
+    const modalRect = modal.getBoundingClientRect();
+
+    return {
+      top: data.top - modalRect.top,
+      left: data.left - modalRect.left,
+      width: data.width,
+    };
+  }
+  return {
+    top: data.top,
+    left: data.left,
+    width: data.width,
+  };
+}
+
+function nodeDOMAtCoords(
+  coords: { x: number; y: number },
+  options: GlobalDragHandleOptions,
+  view: EditorView,
+) {
+  const selectors = [
+    "li",
+    "p:not(:first-child)",
+    "pre",
+    "blockquote",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    ...options.customNodes.map((node) => `[data-type=${node}]`),
+  ].join(", ");
+  return document
+    .elementsFromPoint(coords.x, coords.y)
+    .find((elem: Element) => {
+      // Skip elements that belong to a nested editor (e.g. transclusion
+      // references render their own ProseMirror instance). Only consider
+      // elements whose closest editor is this host view.
+      if (elem.closest(".ProseMirror") !== view.dom) return false;
+      return (
+        elem.parentElement?.matches?.(".ProseMirror") ||
+        elem.matches(selectors)
+      );
+    });
+}
+function nodePosAtDOM(
+  node: Element,
+  view: EditorView,
+  options: GlobalDragHandleOptions,
+) {
+  const boundingRect = node.getBoundingClientRect();
+
+  return view.posAtCoords({
+    left: boundingRect.left + 50 + options.dragHandleWidth,
+    top: boundingRect.top + 1,
+  })?.inside;
+}
+
+function calcNodePos(pos: number, view: EditorView) {
+  const $pos = view.state.doc.resolve(pos);
+  if ($pos.depth > 1) return $pos.before($pos.depth);
+  return pos;
+}
+
+export function DragHandlePlugin(
+  options: GlobalDragHandleOptions & { pluginKey: string },
+) {
+  let listType = "";
+  function handleDragStart(event: DragEvent, view: EditorView) {
+    view.focus();
+
+    if (!event.dataTransfer) return;
+
+    const node = nodeDOMAtCoords(
+      {
+        x: event.clientX + 50 + options.dragHandleWidth,
+        y: event.clientY,
+      },
+      options,
+      view,
+    );
+
+    if (!(node instanceof Element)) return;
+
+    let draggedNodePos = nodePosAtDOM(node, view, options);
+    if (draggedNodePos == null || draggedNodePos < 0) return;
+    draggedNodePos = calcNodePos(draggedNodePos, view);
+
+    const { from, to } = view.state.selection;
+    const diff = from - to;
+
+    const fromSelectionPos = calcNodePos(from, view);
+    let differentNodeSelected = false;
+
+    const nodePos = view.state.doc.resolve(fromSelectionPos);
+
+    // Check if nodePos points to the top level node
+    if (nodePos.node().type.name === "doc") differentNodeSelected = true;
+    else {
+      const nodeSelection = NodeSelection.create(
+        view.state.doc,
+        nodePos.before(),
+      );
+
+      // Check if the node where the drag event started is part of the current selection
+      differentNodeSelected = !(
+        draggedNodePos + 1 >= nodeSelection.$from.pos &&
+        draggedNodePos <= nodeSelection.$to.pos
+      );
+    }
+    let selection = view.state.selection;
+    if (
+      !differentNodeSelected &&
+      diff !== 0 &&
+      !(view.state.selection instanceof NodeSelection)
+    ) {
+      const endSelection = NodeSelection.create(view.state.doc, to - 1);
+      selection = TextSelection.create(
+        view.state.doc,
+        draggedNodePos,
+        endSelection.$to.pos,
+      );
+    } else {
+      selection = NodeSelection.create(view.state.doc, draggedNodePos);
+
+      // if inline node is selected, e.g mention -> go to the parent node to select the whole node
+      // if table row is selected, go to the parent node to select the whole node
+      if (
+        (selection as NodeSelection).node.type.isInline ||
+        (selection as NodeSelection).node.type.name === "tableRow"
+      ) {
+        let $pos = view.state.doc.resolve(selection.from);
+        selection = NodeSelection.create(view.state.doc, $pos.before());
+      }
+    }
+    view.dispatch(view.state.tr.setSelection(selection));
+
+    // If the selected node is a list item, we need to save the type of the wrapping list e.g. OL or UL
+    if (
+      view.state.selection instanceof NodeSelection &&
+      view.state.selection.node.type.name === "listItem"
+    ) {
+      listType = node.parentElement!.tagName;
+    }
+
+    const slice = view.state.selection.content();
+    const { dom, text } = view.serializeForClipboard(slice);
+
+    event.dataTransfer.clearData();
+    event.dataTransfer.setData("text/html", dom.innerHTML);
+    event.dataTransfer.setData("text/plain", text);
+    event.dataTransfer.effectAllowed = "move";
+
+    event.dataTransfer.setDragImage(node, 0, 0);
+
+    view.dragging = { slice, move: event.ctrlKey };
+  }
+
+  let dragHandleElement: HTMLElement | null = null;
+
+  function hideDragHandle() {
+    if (dragHandleElement) {
+      dragHandleElement.classList.add("hide");
+    }
+  }
+
+  function showDragHandle() {
+    if (dragHandleElement) {
+      dragHandleElement.classList.remove("hide");
+    }
+  }
+
+  function hideHandleOnEditorOut(event: MouseEvent) {
+    if (event.target instanceof Element) {
+      // Check if the relatedTarget class is still inside the editor
+      const relatedTarget = event.relatedTarget as HTMLElement;
+      const isInsideEditor =
+        relatedTarget?.classList.contains("tiptap") ||
+        relatedTarget?.classList.contains("drag-handle");
+
+      if (isInsideEditor) return;
+    }
+    hideDragHandle();
+  }
+
+  return new Plugin({
+    key: new PluginKey(options.pluginKey),
+    view: (view) => {
+      const handleBySelector = options.dragHandleSelector
+        ? document.querySelector<HTMLElement>(options.dragHandleSelector)
+        : null;
+      dragHandleElement = handleBySelector ?? document.createElement("div");
+      dragHandleElement.draggable = true;
+      dragHandleElement.dataset.dragHandle = "";
+      dragHandleElement.classList.add("drag-handle");
+
+      function onDragHandleDragStart(e: DragEvent) {
+        handleDragStart(e, view);
+      }
+
+      dragHandleElement.addEventListener("dragstart", onDragHandleDragStart);
+
+      function onDragHandleDrag(e: DragEvent) {
+        hideDragHandle();
+        let scrollY = window.scrollY;
+        if (e.clientY < options.scrollThreshold) {
+          window.scrollTo({ top: scrollY - 30, behavior: "smooth" });
+        } else if (window.innerHeight - e.clientY < options.scrollThreshold) {
+          window.scrollTo({ top: scrollY + 30, behavior: "smooth" });
+        }
+      }
+
+      dragHandleElement.addEventListener("drag", onDragHandleDrag);
+
+      hideDragHandle();
+
+      if (!handleBySelector) {
+        view?.dom?.parentElement?.appendChild(dragHandleElement);
+      }
+      view?.dom?.parentElement?.addEventListener(
+        "mouseout",
+        hideHandleOnEditorOut,
+      );
+
+      return {
+        destroy: () => {
+          if (!handleBySelector) {
+            dragHandleElement?.remove?.();
+          }
+          dragHandleElement?.removeEventListener("drag", onDragHandleDrag);
+          dragHandleElement?.removeEventListener(
+            "dragstart",
+            onDragHandleDragStart,
+          );
+          dragHandleElement = null;
+          view?.dom?.parentElement?.removeEventListener(
+            "mouseout",
+            hideHandleOnEditorOut,
+          );
+        },
+      };
+    },
+    props: {
+      handleDOMEvents: {
+        mousemove: (view, event) => {
+          if (!view.editable) {
+            return;
+          }
+
+          const node = nodeDOMAtCoords(
+            {
+              x: event.clientX + 50 + options.dragHandleWidth,
+              y: event.clientY,
+            },
+            options,
+            view,
+          );
+
+          const notDragging = node?.closest(".not-draggable");
+          const excludedTagList = options.excludedTags
+            .concat(["ol", "ul"])
+            .join(", ");
+
+          if (
+            !(node instanceof Element) ||
+            node.matches(excludedTagList) ||
+            notDragging
+          ) {
+            hideDragHandle();
+            return;
+          }
+
+          const compStyle = window.getComputedStyle(node);
+          const parsedLineHeight = parseInt(compStyle.lineHeight, 10);
+          const lineHeight = isNaN(parsedLineHeight)
+            ? parseInt(compStyle.fontSize) * 1.2
+            : parsedLineHeight;
+          const paddingTop = parseInt(compStyle.paddingTop, 10);
+
+          const rect = absoluteRect(node);
+
+          rect.top += (lineHeight - 24) / 2;
+          rect.top += paddingTop;
+          // Li markers
+          if (node.matches("ul:not([data-type=taskList]) li, ol li")) {
+            rect.left -= options.dragHandleWidth;
+          }
+          rect.width = options.dragHandleWidth;
+
+          if (!dragHandleElement) return;
+
+          dragHandleElement.style.left = `${rect.left - rect.width}px`;
+          dragHandleElement.style.top = `${rect.top}px`;
+          showDragHandle();
+        },
+        keydown: () => {
+          hideDragHandle();
+        },
+        mousewheel: () => {
+          hideDragHandle();
+        },
+        // dragging class is used for CSS
+        dragstart: (view) => {
+          view.dom.classList.add("dragging");
+        },
+        drop: (view, event) => {
+          view.dom.classList.remove("dragging");
+          hideDragHandle();
+          let droppedNode: Node | null = null;
+          const dropPos = view.posAtCoords({
+            left: event.clientX,
+            top: event.clientY,
+          });
+
+          if (!dropPos) return;
+
+          if (view.state.selection instanceof NodeSelection) {
+            droppedNode = view.state.selection.node;
+          }
+          if (!droppedNode) return;
+
+          const resolvedPos = view.state.doc.resolve(dropPos.pos);
+
+          const isDroppedInsideList =
+            resolvedPos.parent.type.name === "listItem";
+
+          // If the selected node is a list item and is not dropped inside a list, we need to wrap it inside <ol> tag otherwise ol list items will be transformed into ul list item when dropped
+          if (
+            view.state.selection instanceof NodeSelection &&
+            view.state.selection.node.type.name === "listItem" &&
+            !isDroppedInsideList &&
+            listType == "OL"
+          ) {
+            const newList = view.state.schema.nodes.orderedList?.createAndFill(
+              null,
+              droppedNode,
+            );
+            const slice = new Slice(Fragment.from(newList), 0, 0);
+            view.dragging = { slice, move: event.ctrlKey };
+          }
+        },
+        dragend: (view) => {
+          view.dom.classList.remove("dragging");
+        },
+      },
+    },
+  });
+}
+
+const GlobalDragHandle = Extension.create({
+  name: "globalDragHandle",
+
+  addOptions() {
+    return {
+      dragHandleWidth: 20,
+      scrollTreshold: 100,
+      excludedTags: [],
+      customNodes: [],
+    };
+  },
+
+  addProseMirrorPlugins() {
+    return [
+      DragHandlePlugin({
+        pluginKey: "globalDragHandle",
+        dragHandleWidth: this.options.dragHandleWidth,
+        scrollThreshold: this.options.scrollThreshold,
+        dragHandleSelector: this.options.dragHandleSelector,
+        excludedTags: this.options.excludedTags,
+        customNodes: this.options.customNodes,
+      }),
+    ];
+  },
+});
+
+export default GlobalDragHandle;

apps/client/src/features/editor/extensions/extensions.ts

@@ -9,7 +9,6 @@ import SubScript from "@tiptap/extension-subscript";
 import { Typography } from "@tiptap/extension-typography";
 import { TextStyle } from "@tiptap/extension-text-style";
 import { Color } from "@tiptap/extension-color";
-import GlobalDragHandle from "tiptap-extension-global-drag-handle";
 import { Youtube } from "@tiptap/extension-youtube";
 import SlashCommand, { SlashCommandExtension as Command } from "@/features/editor/extensions/slash-command";
 import renderItems from "@/features/editor/components/slash-menu/render-items";
@@ -52,6 +51,8 @@ import {
   Columns,
   Column,
   Status,
+  Transclusion,
+  TransclusionReference,
 } from "@docmost/editor-ext";
 import {
   randomElement,
@@ -80,6 +81,8 @@ import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-v
 import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
 import PdfView from "@/features/editor/components/pdf/pdf-view.tsx";
 import SubpagesView from "@/features/editor/components/subpages/subpages-view.tsx";
+import TransclusionView from "@/features/editor/components/transclusion/transclusion-view.tsx";
+import TransclusionReferenceView from "@/features/editor/components/transclusion/transclusion-reference-view.tsx";
 import { common, createLowlight } from "lowlight";
 import plaintext from "highlight.js/lib/languages/plaintext";
 import powershell from "highlight.js/lib/languages/powershell";
@@ -100,6 +103,7 @@ import { MarkdownClipboard } from "@/features/editor/extensions/markdown-clipboa
 import EmojiCommand from "./emoji-command";
 import { countWords } from "alfaaz";
 import AutoJoiner from "@/features/editor/extensions/autojoiner.ts";
+import GlobalDragHandle from "@/features/editor/extensions/drag-handle.ts";
 
 const lowlight = createLowlight(common);
 lowlight.register("mermaid", plaintext);
@@ -167,7 +171,7 @@ export const mainExtensions = [
   SharedStorage,
   Heading,
   UniqueID.configure({
-    types: ["heading", "paragraph"],
+    types: ["heading", "paragraph", "transclusion"],
     filterTransaction: (transaction) => !isChangeOrigin(transaction),
   }),
   Placeholder.configure({
@@ -215,7 +219,9 @@ export const mainExtensions = [
   }),
   Typography,
   TrailingNode,
-  GlobalDragHandle,
+  GlobalDragHandle.configure({
+    customNodes: ["transclusion", "transclusionReference"],
+  }),
   TextStyle,
   Color,
   SlashCommand,
@@ -351,6 +357,12 @@ export const mainExtensions = [
   Status.configure({
     view: StatusView,
   }),
+  Transclusion.configure({
+    view: TransclusionView,
+  }),
+  TransclusionReference.configure({
+    view: TransclusionReferenceView,
+  }),
   MarkdownClipboard.configure({
     transformPastedText: true,
   }),

apps/client/src/features/editor/extensions/markdown-clipboard.ts

@@ -80,10 +80,12 @@ export const MarkdownClipboard = Extension.create({
             const { from, to } = view.state.selection;
 
             const parsed = markdownToHtml(text.replace(/\n+$/, ""));
+            const body = elementFromString(parsed);
+            normalizeTableColumnWidths(body);
 
             const contentNodes = DOMParser.fromSchema(
               this.editor.schema,
-            ).parseSlice(elementFromString(parsed), {
+            ).parseSlice(body, {
               preserveWhitespace: true,
             });
 
@@ -137,3 +139,92 @@ function elementFromString(value) {
 
   return new window.DOMParser().parseFromString(wrappedValue, "text/html").body;
 }
+
+const DEFAULT_PASTE_COL_WIDTH_PX = 150;
+
+function parsePixelWidth(el: Element): number | null {
+  const attr = el.getAttribute("width");
+  if (attr) {
+    const n = parseInt(attr, 10);
+    if (Number.isFinite(n) && n > 0) return n;
+  }
+  const style = el.getAttribute("style") || "";
+  const m = style.match(/(?:^|;)\s*width\s*:\s*([\d.]+)\s*px/i);
+  if (m) {
+    const n = parseInt(m[1], 10);
+    if (Number.isFinite(n) && n > 0) return n;
+  }
+  return null;
+}
+
+function getFirstRow(table: Element): Element | null {
+  const tbodyRow = table.querySelector(":scope > tbody > tr");
+  if (tbodyRow) return tbodyRow;
+  const theadRow = table.querySelector(":scope > thead > tr");
+  if (theadRow) return theadRow;
+  return table.querySelector(":scope > tr");
+}
+
+function deriveColumnWidths(table: Element): (number | null)[] | null {
+  const cols = table.querySelectorAll(":scope > colgroup > col");
+  if (cols.length > 0) {
+    const widths: (number | null)[] = [];
+    cols.forEach((col) => widths.push(parsePixelWidth(col)));
+    if (widths.some((w) => w !== null)) return widths;
+  }
+
+  const firstRow = getFirstRow(table);
+  if (!firstRow) return null;
+
+  const widths: (number | null)[] = [];
+  Array.from(firstRow.children)
+    .filter((c) => c.tagName === "TD" || c.tagName === "TH")
+    .forEach((cell) => {
+      const colspan = parseInt(cell.getAttribute("colspan") || "1", 10) || 1;
+      const w = parsePixelWidth(cell);
+      for (let i = 0; i < colspan; i++) {
+        widths.push(w !== null ? Math.round(w / colspan) : null);
+      }
+    });
+  if (widths.length === 0 || widths.every((w) => w === null)) return null;
+  return widths;
+}
+
+// Mirror of server normalizeTableColumnWidths (see import/utils/table-utils.ts):
+// markdown source has no widths, so without this every pasted table renders
+// at table-layout:fixed/100% and squashes columns to fit the editor instead of
+// letting .tableWrapper's overflow-x: auto scroll.
+export function normalizeTableColumnWidths(root: Element): void {
+  root.querySelectorAll("table").forEach((table) => {
+    const firstRow = getFirstRow(table);
+    if (!firstRow) return;
+
+    let colWidths = deriveColumnWidths(table);
+    if (!colWidths) {
+      let count = 0;
+      Array.from(firstRow.children)
+        .filter((c) => c.tagName === "TD" || c.tagName === "TH")
+        .forEach((cell) => {
+          count += parseInt(cell.getAttribute("colspan") || "1", 10) || 1;
+        });
+      if (count === 0) return;
+      colWidths = new Array(count).fill(DEFAULT_PASTE_COL_WIDTH_PX);
+    }
+
+    let col = 0;
+    Array.from(firstRow.children)
+      .filter((c) => c.tagName === "TD" || c.tagName === "TH")
+      .forEach((cell) => {
+        if (cell.getAttribute("colwidth")) {
+          col += parseInt(cell.getAttribute("colspan") || "1", 10) || 1;
+          return;
+        }
+        const colspan = parseInt(cell.getAttribute("colspan") || "1", 10) || 1;
+        const slice = colWidths!.slice(col, col + colspan);
+        col += colspan;
+        if (slice.length === 0 || slice.every((w) => w === null)) return;
+        const values = slice.map((w) => (w == null ? 100 : w));
+        cell.setAttribute("colwidth", values.join(","));
+      });
+  });
+}

apps/client/src/features/editor/page-editor.tsx

@@ -62,7 +62,7 @@ import { useIdle } from "@/hooks/use-idle.ts";
 import { queryClient } from "@/main.tsx";
 import { IPage } from "@/features/page/types/page.types.ts";
 import { useParams } from "react-router-dom";
-import { extractPageSlugId } from "@/lib";
+import { extractPageSlugId, platformModifierKey } from "@/lib";
 import { FIVE_MINUTES } from "@/lib/constants.ts";
 import { PageEditMode } from "@/features/user/types/user.types.ts";
 import { jwtDecode } from "jwt-decode";
@@ -71,6 +71,7 @@ import { useEditorScroll } from "./hooks/use-editor-scroll";
 import { EditorAiMenu } from "@/ee/ai/components/editor/ai-menu/ai-menu";
 import { EditorLinkMenu } from "@/features/editor/components/link/link-menu";
 import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
+import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
 
 interface PageEditorProps {
   pageId: string;
@@ -232,11 +233,19 @@ export default function PageEditor({
         scrollMargin: 80,
         handleDOMEvents: {
           keydown: (_view, event) => {
-            if ((event.ctrlKey || event.metaKey) && event.code === "KeyS") {
+            if (platformModifierKey(event) && event.code === "KeyS") {
               event.preventDefault();
               return true;
             }
-            if ((event.ctrlKey || event.metaKey) && event.code === "KeyK") {
+            if (event.key === "Tab") {
+                const editor = editorRef.current;
+                if (!editor) return false;
+                event.preventDefault();
+                return editor.view.someProp("handleKeyDown", (f) =>
+                  f(editor.view, event)
+                );
+            }
+            if (platformModifierKey(event) && event.code === "KeyK") {
               searchSpotlight.open();
               return true;
             }
@@ -391,18 +400,16 @@ export default function PageEditor({
     }
   }, [yjsConnectionStatus, isSynced]);
 
-  if (showStatic) {
   return (
+    <TransclusionLookupProvider hostPageId={pageId}>
+      {showStatic ? (
         <EditorProvider
           editable={false}
           immediatelyRender={true}
           extensions={mainExtensions}
           content={content}
         />
-    );
+      ) : (
-  }
-
-  return (
         <div className="editor-container" style={{ position: "relative" }}>
           <div ref={menuContainerRef}>
             <EditorContent editor={editor} />
@@ -428,10 +435,15 @@ export default function PageEditor({
                 <ColumnsMenu editor={editor} />
               </div>
             )}
-        {editor && !editorIsEditable && (editable || canComment) && providersRef.current && (
+            {editor &&
+              !editorIsEditable &&
+              (editable || canComment) &&
+              providersRef.current && (
                 <ReadonlyBubbleMenu editor={editor} />
               )}
-        {showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
+            {showCommentPopup && (
+              <CommentDialog editor={editor} pageId={pageId} />
+            )}
             {showReadOnlyCommentPopup && (
               <CommentDialog editor={editor} pageId={pageId} readOnly />
             )}
@@ -441,5 +453,7 @@ export default function PageEditor({
             style={{ paddingBottom: "20vh" }}
           ></div>
         </div>
+      )}
+    </TransclusionLookupProvider>
   );
 }

apps/client/src/features/editor/readonly-page-editor.tsx

@@ -9,6 +9,7 @@ import { Placeholder } from "@tiptap/extension-placeholder";
 import { useAtom } from "jotai";
 import { readOnlyEditorAtom } from "@/features/editor/atoms/editor-atoms.ts";
 import { useEditorScroll } from "./hooks/use-editor-scroll";
+import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
 
 interface PageEditorProps {
   title: string;
@@ -65,7 +66,7 @@ export default function ReadonlyPageEditor({
   ];
 
   return (
-    <>
+    <TransclusionLookupProvider hostPageId={pageId ?? "anonymous"}>
       <div className="page-title">
         <EditorProvider
           editable={false}
@@ -95,6 +96,6 @@ export default function ReadonlyPageEditor({
         }}
       ></EditorProvider>
       <div style={{ paddingBottom: "20vh" }}></div>
-    </>
+    </TransclusionLookupProvider>
   );
 }