fixes

* 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

.claude/superpowers/specs/2026-04-20-base-page-property-design.md

@@ -1,309 +0,0 @@
-# Base `page` Property Type — Design Spec
-
-**Date:** 2026-04-20
-**Status:** Draft
-**Feature area:** `apps/server/src/core/base`, `apps/client/src/features/base`, `apps/server/src/core/page`
-
-## Goal
-
-Add a new base property type `page` that lets a user search for and link **one existing page** per cell. Modeled on how the editor's `@` page-mention works — the picker searches existing pages workspace-wide (with current-space prioritized) and the cell renders a live pill with the page's icon and title. No page is auto-created from the picker; users can only link pages that already exist.
-
-Why: today users who want a page-reference column would have to paste a URL into a `url` cell, which loses the icon + title and doesn't validate. We also want to avoid the Focalboard-style pattern of auto-creating a page-row per table row, which would bloat the pages tree.
-
-## Non-goals (v1)
-
-- **Multiple pages per cell.** Single page only. Forward-compatible: the schema widens trivially to `z.union([z.uuid(), z.array(z.uuid())])` + an `allowMultiple` type option later, with zero data migration (see "Future extension" below).
-- **Sorting by page title.** Would require a JOIN against `pages` in the row-list query; skip in v1. Filter suffices.
-- **Creating pages from within the picker.**
-- **Cross-workspace page linking.**
-- **Rich previews / hover cards** showing page excerpts — pill-only.
-- **Confluence-style section grouping** in the property type picker (e.g. the "Page and live doc" section in the screenshot). Flat list for v1; grouping is a separate polish task.
-
-## UX overview
-
-### Picker (edit mode)
-
-- Popover modeled on [cell-person.tsx](../../../apps/client/src/features/base/components/cells/cell-person.tsx) but stripped for single-select. `width=300`, `position="bottom-start"`, `trapFocus`.
-- Top: search input, auto-focused. If a page is currently linked, a removable "tag" for it sits above the search (same shape as `personTag`).
-- Body: results list (max 25), fed by `searchSuggestions({ query, includePages: true, spaceId: base.spaceId, limit: 25 })` — reuses the existing suggestion endpoint, which prioritizes `spaceId` results.
-- Each row: `{icon or IconFileDescription} {title}` + muted space name on the right (so cross-space picks are visually distinct).
-- Empty-query state: if pulling recent-pages is easy to plug in, show recent pages; otherwise "Type to search…" hint.
-- Click or Enter on a highlighted row → `onCommit(pageId)`, popover closes.
-- Esc / click-outside → `onCancel`.
-- Clicking the "Remove" affordance on the current tag → `onCommit(null)`.
-- Keyboard: reuse `useListKeyboardNav`.
-
-### View mode
-
-- Empty cell → empty placeholder (same class as `cellClasses.emptyValue`).
-- Resolved page → pill `{icon or IconFileDescription} {title}`, anchor that navigates to `buildPageUrl(space.slug, slugId, title)` using the helper that [mention-view.tsx](../../../apps/client/src/features/editor/components/mention/mention-view.tsx) already uses.
-- Unresolved (deleted or viewer has no access) → greyed pill "Page not found", no link, `aria-disabled`.
-- Single click on the pill = navigate. Double-click on the cell = open picker (same rule grid-cell applies to other types).
-
-### Sort / filter UI
-
-- [view-sort-config.tsx](../../../apps/client/src/features/base/components/views/view-sort-config.tsx): exclude `page` properties from the sortable set.
-- [view-filter-config.tsx](../../../apps/client/src/features/base/components/views/view-filter-config.tsx): filter editor branch for `page` with operators `isEmpty`, `isNotEmpty`, `any`, `none`. The value picker reuses the same search dropdown from the cell picker.
-
-## Data model
-
-### Cell value
-
-- **Stored shape:** `string` (page UUID) or `null`. Parallels `person` in single mode.
-- **Example:** `{ "01998b7e-...": "01998b80-..." }` — property UUID → page UUID.
-
-### Property type options
-
-- **v1:** empty `{}` (reuse `emptyTypeOptionsSchema`).
-- **Future:** `{ allowMultiple?: boolean }`.
-
-### Schema additions
-
-**Server — [base.schemas.ts](../../../apps/server/src/core/base/base.schemas.ts):**
-
-```ts
-export const BasePropertyType = {
-  // ...existing entries...
-  PAGE: 'page',
-} as const;
-
-// typeOptionsSchemaMap
-[BasePropertyType.PAGE]: emptyTypeOptionsSchema,
-
-// cellValueSchemaMap
-[BasePropertyType.PAGE]: z.uuid(),
-```
-
-**Client — [base.types.ts](../../../apps/client/src/features/base/types/base.types.ts):**
-
-```ts
-export type BasePropertyType = ... | 'page';
-export type PageTypeOptions = Record<string, never>;
-```
-
-### Property kind & engine
-
-**[engine/kinds.ts](../../../apps/server/src/core/base/engine/kinds.ts):**
-
-```ts
-export const PropertyKind = {
-  // ...existing...
-  PAGE: 'page',
-} as const;
-
-// propertyKind()
-case BasePropertyType.PAGE:
-  return PropertyKind.PAGE;
-```
-
-**[engine/predicate.ts](../../../apps/server/src/core/base/engine/predicate.ts):** new `pageCondition()` handler — shape follows `selectCondition()` (single UUID stored as text):
-
-- `isEmpty` / `isNotEmpty` → `textCell` is null or empty
-- `eq` / `neq` → text equality / inequality (null-safe for `neq`)
-- `any` → `textCell IN (...)`
-- `none` → `textCell NOT IN (...)` or null
-
-Wired into the `switch (kind)` in `buildCondition`:
-```ts
-case PropertyKind.PAGE:
-  return pageCondition(eb, cond);
-```
-
-**[engine/sort.ts](../../../apps/server/src/core/base/engine/sort.ts):** no new branch. `page` falls into the default text-sentinel path (sorts by raw UUID string, which is unhelpful but harmless — the sort UI won't expose this type in v1).
-
-### Type conversion
-
-**[base.schemas.ts `CellConversionContext`](../../../apps/server/src/core/base/base.schemas.ts:191):** add a new field:
-
-```ts
-export type CellConversionContext = {
-  fromTypeOptions?: unknown;
-  userNames?: Map<string, string>;
-  attachmentNames?: Map<string, string>;
-  pageTitles?: Map<string, string>; // NEW
-};
-```
-
-**[base-type-conversion.task.ts](../../../apps/server/src/core/base/tasks/base-type-conversion.task.ts):** when `fromType === 'page'`, batch-load titles via the same page repo path used by the new resolver endpoint (see below) and populate `ctx.pageTitles`.
-
-**`attemptCellConversion` branches:**
-- `page → text`: resolve `ctx.pageTitles.get(uuid)` → title (or `""` if missing).
-- `page → *` (anything else): return `{converted: true, value: null}`.
-- `* → page`: return `{converted: true, value: null}` (free text or other IDs can't be coerced to a valid page UUID).
-
-## Server: page resolver endpoint
-
-New endpoint for cell hydration on the client. Reusing `/pages/info` is inappropriate — it returns full page content and is one-at-a-time.
-
-### `POST /bases/pages/resolve`
-
-**Request:**
-```ts
-{ pageIds: string[] }  // 1 <= length <= 100, enforced server-side; 400 on violation
-```
-
-**Response:**
-```ts
-{
-  items: Array<{
-    id: string;
-    slugId: string;
-    title: string | null;
-    icon: string | null;
-    spaceId: string;
-    space: { id: string; slug: string; name: string };
-  }>;
-}
-```
-
-### Behavior
-
-1. Deduplicate input IDs.
-2. Select from `pages` where `id IN (...)` AND `deletedAt IS NULL` AND `workspaceId = current`.
-3. Filter the result set through `pagePermissionRepo.filterAccessiblePageIds({ pageIds, userId })` — same mechanism used by [search.service.ts:131-139](../../../apps/server/src/core/search/search.service.ts).
-4. Join `spaces` to include `space.slug` and `space.name` for navigation.
-5. Silently omit any ID the user can't see (deleted, restricted, cross-workspace). The client treats any requested ID missing from `items` as "Page not found".
-
-### Code layout
-
-- **Controller:** add method to [base.controller.ts](../../../apps/server/src/core/base/controllers/base.controller.ts) at path `@Post('pages/resolve')`. Guarded by the same `JwtAuthGuard` + workspace check the rest of `/bases/*` uses.
-- **Service:** new file `apps/server/src/core/base/services/base-page-resolver.service.ts` with `resolvePagesForBase(pageIds, workspaceId, userId)`. Keeps the coupling to `PageRepo` + `PagePermissionRepo` isolated to this one file.
-- **Module:** wire the new service into [base.module.ts](../../../apps/server/src/core/base/base.module.ts). `PageRepo` + `PagePermissionRepo` are already shared modules.
-
-## Client: cell component & resolver
-
-### Batch resolver hook
-
-New file `apps/client/src/features/base/queries/base-page-resolver-query.ts`:
-
-```ts
-export function useResolvedPages(pageIds: string[]): Map<string, ResolvedPage | null>
-```
-
-- Deduplicate + sort IDs to form a stable React Query key.
-- Fetch `POST /bases/pages/resolve` with `{ pageIds }`.
-- Return a `Map` keyed by every requested ID — `null` for any ID absent from the server response.
-- `staleTime: 30_000`, `gcTime: 5 * 60_000`.
-- Realtime invalidation: listen for existing page-level websocket events (rename, delete) and invalidate the query when a touched ID intersects our key. Exact event names to be surveyed during plan writing.
-
-### Cell component
-
-New file `apps/client/src/features/base/components/cells/cell-page.tsx`:
-
-```ts
-type CellPageProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-```
-
-**Behavior:**
-- Parse value: accept `string` only (ignore arrays — they'd be from a future multi mode that we drop until upgraded).
-- `useResolvedPages([value])` — yes even for single lookups; the hook dedupes internally so multiple cells sharing the same page ID hit one request.
-- View mode: resolved → pill with icon+title, anchor to `buildPageUrl`. Unresolved → greyed "Page not found".
-- Edit mode: popover picker (see UX overview). Search via existing `searchSuggestions`.
-
-Wire into [grid-cell.tsx](../../../apps/client/src/features/base/components/grid/grid-cell.tsx):
-
-```ts
-const cellComponents = {
-  // ...existing...
-  page: CellPage,
-};
-```
-
-### Property type picker
-
-[property-type-picker.tsx](../../../apps/client/src/features/base/components/property/property-type-picker.tsx): append one entry (after `file`):
-
-```ts
-{ type: "page", icon: IconFileDescription, labelKey: "Page" },
-```
-
-### Filter editor
-
-[view-filter-config.tsx](../../../apps/client/src/features/base/components/views/view-filter-config.tsx): new branch for `page`:
-- Operators: `isEmpty`, `isNotEmpty`, `any`, `none`.
-- Value picker for `any`/`none`: reuses the same `searchSuggestions`-backed search dropdown from the cell picker — user picks one or more pages as filter operands.
-
-### Sort editor
-
-[view-sort-config.tsx](../../../apps/client/src/features/base/components/views/view-sort-config.tsx): exclude `page` from the list of sortable property types.
-
-## Testing
-
-### Server — unit
-
-- **Schema:** `validateCellValue('page', uuid)` passes; with garbage string / number → fails; with `null` → passes (null = empty).
-- **Conversion:**
-  - `attemptCellConversion('page', 'text', uuid, { pageTitles: Map<uuid,title> })` → resolved title.
-  - Same call with empty `pageTitles` → `""`.
-  - `page → number/date/select/…` → `{converted: true, value: null}`.
-  - `text → page` with any string input → `{converted: true, value: null}`.
-- **Predicate:** for each operator (`isEmpty`, `isNotEmpty`, `eq`, `neq`, `any`, `none`), `pageCondition()` returns the expected Kysely expression shape.
-
-### Server — integration
-
-- **Resolver endpoint `POST /bases/pages/resolve`:**
-  - valid IDs in an accessible space → present in `items`
-  - deleted pages (trash) → absent
-  - pages in a space the user isn't a member of → absent
-  - pages in another workspace → absent
-  - empty array → 400
-  - array length > 100 → 400
-- **Row CRUD:** create a property of type `page`, write a cell with a UUID, read back → round-trip shape is `string`.
-- **View filter:** create a view config with `{ op: 'any', propertyId, value: [uuidA, uuidB] }`, hit row-list, verify only matching rows returned.
-
-### Client — unit (Vitest + React Testing Library)
-
-- `cell-page.test.tsx`:
-  - view mode with resolved page → renders pill with icon + title and an `<a>` to the computed URL
-  - view mode with unresolved page (null in resolver map) → renders greyed "Page not found", no `<a>`
-  - double-click opens picker
-  - Enter on highlighted result commits `pageId`
-  - Esc cancels
-  - Remove tag button commits `null`
-- `base-page-resolver-query.test.ts`:
-  - dedupes IDs
-  - stable query key across re-renders with same set
-  - missing IDs render as `null` in the returned map
-
-### Manual QA checklist
-
-- Link a page in the same space.
-- Link a page in another space → pill shows, picker shows muted space-name hint.
-- Remove link → cell empties.
-- Delete linked page (via trash) → cell flips to "Page not found" on next resolver refetch.
-- Viewer loses space access → same "Page not found" fallback.
-- Rename linked page → within ≤30s (staleTime) the pill reflects the new title; realtime event should also trigger refetch.
-- Filter: `isEmpty`, `isNotEmpty`, `any` (multi-select), `none`.
-- Conversion `page → text` populates cells with page titles.
-- Conversion `text → page` wipes cells.
-
-## Rollout
-
-- **No DB migration.** All changes are code-only: new enum value, new cell-value validator entry, new engine kind branch, new endpoint.
-- **No feature flag.** The type appears in the picker as soon as the build ships. Backwards-compatible since `'page'` is a new type identifier.
-- Existing bases continue to work unchanged.
-
-## Risks & open questions
-
-- **30s staleTime.** Renames take up to 30s to propagate without realtime invalidation. The realtime hook should shrink this to near-zero in practice; verify in QA. If it feels slow, drop `staleTime` to `0` and rely solely on realtime + refetch-on-window-focus.
-- **"Page not found" label.** i18n-friendly; run through the translation pipeline. Consider whether to differentiate deleted vs. restricted — current answer: no, one label covers both and matches Confluence's behavior.
-- **Cross-space name exposure.** The picker surfaces the space name of pages the user can access cross-space. This is already exposed via the existing page-mention flow, so no new exposure, but flag in review.
-
-## Future extension (multiple pages per cell)
-
-When `allowMultiple` lands:
-
-1. Widen cell-value schema: `z.uuid()` → `z.union([z.uuid(), z.array(z.uuid())])`. Existing single-UUID cells continue to validate.
-2. Add `allowMultiple` boolean to `pageTypeOptionsSchema` (default `false` for existing properties).
-3. In [predicate.ts](../../../apps/server/src/core/base/engine/predicate.ts), branch `pageCondition` on `allowMultiple`: `true` → reuse `arrayOfIdsCondition`; `false` → keep the current text-based path.
-4. Client cell normalizes on read (`Array.isArray(value) ? value : typeof value === 'string' ? [value] : []`), mirrors [cell-person.tsx:33](../../../apps/client/src/features/base/components/cells/cell-person.tsx).
-5. No data writes required for existing cells.
-
-This spec leaves room for that change without locking the storage shape.

.claude/superpowers/specs/2026-04-20-base-view-draft-design.md

@@ -1,479 +0,0 @@
-# Base View Draft (Local-First Filter & Sort) — Design Spec
-
-**Date:** 2026-04-20
-**Status:** Draft
-**Feature area:** `apps/client/src/features/base` (client-only)
-
-## Goal
-
-Make filter and sort changes on a base view **local-first**: they apply instantly for the editing user, are scoped to their own browser/profile, and never touch the server baseline until the user explicitly clicks "Save for everyone". A banner at the top of the table surfaces the draft state and lets the user either promote the draft to the shared baseline or discard it.
-
-This removes the current Notion-unlike behavior where every filter/sort tweak is auto-persisted and immediately inflicted on every teammate viewing the same view.
-
-## Non-goals (v1)
-
-- **Column layout in draft mode.** Column visibility, order, and widths continue to flow through the existing debounced `persistViewConfig` path in [use-base-table.ts:371-396](../../../apps/client/src/features/base/hooks/use-base-table.ts). No draft behavior for them. (Listed as a future extension.)
-- **Server-side per-user drafts.** localStorage only. A user clearing their browser storage, switching devices, or using a different browser profile loses drafts — by design.
-- **"Save as new view".** The screenshot hints at a dropdown caret next to the Save button for a "save as new view" split-action. Not in v1.
-- **Kanban / calendar.** Only the `table` view type exists today; spec scopes to it but the hook is type-agnostic and will apply trivially when other view types land.
-- **Automatic garbage collection of stale drafts.** Drafts persist indefinitely until the user resets or saves. No TTL, no eager cleanup when baseline values match the draft.
-- **Conflict UI.** If another user writes a new baseline while I have local drafts, my draft silently wins on my client. No "baseline changed" warning.
-
-## UX overview
-
-### Draft banner
-
-Placement: **between** the page title and [BaseToolbar](../../../apps/client/src/features/base/components/base-toolbar.tsx), inside [base-table.tsx](../../../apps/client/src/features/base/components/base-table.tsx) above the `<BaseToolbar />` node (around [base-table.tsx:192](../../../apps/client/src/features/base/components/base-table.tsx)). The banner is part of the table's own layout, not a workspace-level chrome element, because it's tied to a specific view.
-
-Render condition: `isDirty === true` (see "Dirty check").
-
-Layout (match the reference screenshot):
-
-- Mantine `<Paper withBorder radius="sm" px="md" py="xs">` with a soft background (`bg="yellow.0"` or `bg="orange.0"` depending on theme palette — pick whichever tolerates dark mode) and a small info icon on the left.
-- Left region: short message — `t("Filter and sort changes are visible only to you.")`.
-- Right region (a `<Group gap="sm">`):
-  - `<Button variant="subtle" color="gray" size="xs">{t("Reset")}</Button>` — underline-on-hover "text link" feel; wipes the draft.
-  - `<Button variant="filled" size="xs">{t("Save for everyone")}</Button>` — primary accent (project's default theme color — orange in the screenshot maps to Mantine's configured `primaryColor`, so `color` is omitted and the theme default is used).
-- The "Save for everyone" button is **omitted entirely** for users without edit permission (see "Permission gating"). "Reset" always shows.
-- The banner never animates in/out on every keystroke — it only appears/disappears when `isDirty` flips. Add a Mantine `<Transition mounted={isDirty} transition="slide-down" duration={120}>` wrap if the flip is jarring; otherwise mount unconditionally with a `{isDirty && ...}` guard.
-
-### Filter/sort editors in draft mode
-
-No UI affordance changes inside the filter or sort popovers themselves. They keep the same open-on-click, add/remove/edit flow. The only behavioral change is that their `onChange` callback writes to the draft store rather than firing `updateView` — completely transparent to the editor components.
-
-### Reset behavior
-
-Click Reset → the draft hook removes its localStorage entry → the table re-renders reading filter/sorts from `activeView.config` (the server baseline). Any currently-open filter/sort popover closes on outside click as usual; if it's open when the user clicks Reset, the next render shows the baseline values. No notification — the banner disappearing is sufficient feedback.
-
-### Save for everyone
-
-Click Save → call the existing `useUpdateViewMutation` from [base-view-query.ts:43-112](../../../apps/client/src/features/base/queries/base-view-query.ts) with `{ viewId, baseId, config: { ...serverBaseline, filter: draft.filter, sorts: draft.sorts } }`. On success, clear the localStorage key and show a Mantine notification `t("View updated for everyone")`. On error, keep the draft; the mutation already wires the error toast.
-
-### Permission gating
-
-A user can edit this base iff their space membership grants `SpaceCaslAction.Edit, SpaceCaslSubject.Base` — the same check the server enforces in [base-view.controller.ts:68](../../../apps/server/src/core/base/controllers/base-view.controller.ts). Viewers still get local drafts (the entire point is that local changes don't require edit permission), but their "Save for everyone" button is hidden.
-
-**Client caveat:** [permissions.type.ts](../../../apps/client/src/features/space/permissions/permissions.type.ts) currently only exports `Settings`, `Member`, and `Page` subjects. The server enum has `Base` but the client enum doesn't. The spec adds `Base = "base"` to `SpaceCaslSubject` and widens the `SpaceAbility` union — that's a one-line change plus import fix.
-
-## Data model
-
-### localStorage key
-
-```
-docmost:base-view-draft:v1:{userId}:{baseId}:{viewId}
-```
-
-- Namespace prefix `docmost:base-view-draft:` keeps us from colliding with other consumers.
-- `v1` is the schema version so a future breaking change can shed old entries by skipping.
-- `{userId}` scopes drafts so a shared-device login-swap doesn't leak drafts across accounts. `userId` comes from the existing `useCurrentUser()` hook (returns `{ data: ICurrentUser }` — read `user?.user.id`), the same helper used by other authenticated client code.
-- `{baseId}` and `{viewId}` together uniquely identify which table state the draft applies to.
-
-### Value shape
-
-```ts
-// apps/client/src/features/base/types/base.types.ts (additive)
-export type BaseViewDraft = {
-  filter?: FilterGroup;
-  sorts?: ViewSortConfig[];
-  updatedAt: string; // ISO timestamp, written on each put — used only for diagnostics
-};
-```
-
-Both `filter` and `sorts` are optional, independently. An absent field means "inherit baseline for that axis". That matters because a user who's only dirtied sorts but not filters should see the baseline filter unchanged if the baseline's filter later shifts.
-
-Serialized as JSON by Jotai's `atomWithStorage` (which JSON-stringifies on write and parses on read). No schema validation on read — if the parse fails or the shape looks wrong, Jotai yields `null` and the hook falls back to baseline.
-
-## Client architecture
-
-### Storage atom family
-
-**File:** `apps/client/src/features/base/atoms/view-draft-atom.ts`
-
-Follow the existing Jotai storage pattern in [home-tab-atom.ts](../../../apps/client/src/features/home/atoms/home-tab-atom.ts) and [auth-tokens-atom.ts](../../../apps/client/src/features/auth/atoms/auth-tokens-atom.ts) — `atomWithStorage` is the codebase convention for localStorage-backed state. Since our key is dynamic per (user, base, view), pair it with `atomFamily` from `jotai/utils`:
-
-```ts
-import { atomFamily, atomWithStorage } from "jotai/utils";
-import { BaseViewDraft } from "@/features/base/types/base.types";
-
-export type ViewDraftKey = {
-  userId: string;
-  baseId: string;
-  viewId: string;
-};
-
-const keyFor = (k: ViewDraftKey) =>
-  `docmost:base-view-draft:v1:${k.userId}:${k.baseId}:${k.viewId}`;
-
-export const viewDraftAtomFamily = atomFamily(
-  (k: ViewDraftKey) =>
-    atomWithStorage<BaseViewDraft | null>(keyFor(k), null),
-  (a, b) =>
-    a.userId === b.userId && a.baseId === b.baseId && a.viewId === b.viewId,
-);
-```
-
-`atomWithStorage` handles JSON serialization, cross-tab sync via the `storage` event, and SSR-safe lazy reads out of the box — no hand-rolled `localStorage.getItem/setItem` or `window.addEventListener("storage", ...)` needed. The comparator passed as `atomFamily`'s second argument ensures the same (user, base, view) triple always resolves to the same atom instance, so React Query-style object identity issues don't cause atoms to be recreated per render.
-
-### Hook: `useViewDraft`
-
-**File:** `apps/client/src/features/base/hooks/use-view-draft.ts`
-
-Thin wrapper that binds the atom family to the rendering layer, adds the passthrough-when-undefined guard, and derives `effectiveFilter` / `effectiveSorts` / `isDirty` / `buildPromotedConfig` from the atom's value:
-
-```ts
-export type ViewDraftState = {
-  draft: BaseViewDraft | null;
-  effectiveFilter: FilterGroup | undefined;
-  effectiveSorts: ViewSortConfig[] | undefined;
-  isDirty: boolean;
-  setFilter: (filter: FilterGroup | undefined) => void;
-  setSorts: (sorts: ViewSortConfig[] | undefined) => void;
-  reset: () => void;
-  buildPromotedConfig: (baseline: ViewConfig) => ViewConfig;
-};
-
-export function useViewDraft(args: {
-  userId: string | undefined;
-  baseId: string | undefined;
-  viewId: string | undefined;
-  baselineFilter: FilterGroup | undefined;
-  baselineSorts: ViewSortConfig[] | undefined;
-}): ViewDraftState;
-```
-
-**Behavior:**
-
-1. If any of `userId / baseId / viewId` is undefined → return a passthrough state (`draft=null`, `isDirty=false`, setters no-op, `effective*` fall through to baseline). Guards the initial-load window where auth / activeView hasn't resolved yet.
-2. Otherwise, `useAtom(viewDraftAtomFamily({ userId, baseId, viewId }))` gives `[draft, setDraft]`. Jotai reads from localStorage on first access and writes on every set.
-3. `setFilter(next)` and `setSorts(next)` compute `merged = { ...(draft ?? {}), [axis]: next, updatedAt: new Date().toISOString() }`. If the result has both `filter` and `sorts` back to `undefined` (the user cleared all local divergence), call `setDraft(RESET)` instead of writing an empty object. (`RESET` is `jotai/utils`' sentinel — it removes the key from localStorage.) This keeps "orphan" drafts from lingering.
-4. `reset()` is `setDraft(RESET)`.
-5. `isDirty` is `draft !== null && (!shallowEqualFilter(draft.filter, baselineFilter) || !shallowEqualSorts(draft.sorts, baselineSorts))`. Note the per-axis `??` fallback doesn't appear here because `null/undefined` is the "no local divergence" signal for that axis; only a defined-and-different value counts as dirty.
-6. `buildPromotedConfig(baseline)` returns `{ ...baseline, filter: draft?.filter ?? baseline.filter, sorts: draft?.sorts ?? baseline.sorts }`. Preserves all non-draft config fields (widths, order, visibility) and only overwrites the two axes that may have diverged.
-
-**Return composition:**
-
-- `effectiveFilter = draft?.filter ?? baselineFilter`
-- `effectiveSorts = draft?.sorts ?? baselineSorts`
-
-**Cross-tab sync is free.** `atomWithStorage` subscribes to the `storage` event internally — a filter change in tab A triggers a re-render in tab B with no extra code. No manual listener required.
-
-### Integration into `useBaseTable` and `base-table.tsx`
-
-`useBaseTable` at [use-base-table.ts:224](../../../apps/client/src/features/base/hooks/use-base-table.ts) currently derives the table's initial sort from `activeView.config.sorts`. In the new world the table's sort/filter state must come from the **effective** values (draft-or-baseline), not the raw `activeView.config`.
-
-Two cut options were considered:
-
-**Option A (chosen): drive from effective values via props.** `useBaseTable` takes an additional `effectiveConfig?: ViewConfig` parameter (or, cleaner, the caller passes a shallow-merged `activeView` whose `config` is `{ ...activeView.config, filter: effective.filter, sorts: effective.sorts }`). `buildSortingState` and the row query already read from `activeView.config`, so the cleanest shape is to mutate the config the hook receives, not to introduce a new parameter.
-
-**Option B (rejected): thread draft deep into `useBaseTable`.** Adds the concept of drafts to a hook that only cares about the rendered state. Muddies responsibilities.
-
-Going with A. In [base-table.tsx](../../../apps/client/src/features/base/components/base-table.tsx):
-
-```ts
-// NEW: wire the draft hook
-const { data: user } = useCurrentUser();
-const { draft, effectiveFilter, effectiveSorts, isDirty, setFilter, setSorts, reset, buildPromotedConfig } =
-  useViewDraft({
-    userId: user?.user.id,
-    baseId,
-    viewId: activeView?.id,
-    baselineFilter: activeView?.config?.filter,
-    baselineSorts: activeView?.config?.sorts,
-  });
-
-// Swap the raw `activeView` for a view with effective config so the table and row query see drafts.
-const effectiveView = useMemo(
-  () =>
-    activeView
-      ? { ...activeView, config: { ...activeView.config, filter: effectiveFilter, sorts: effectiveSorts } }
-      : undefined,
-  [activeView, effectiveFilter, effectiveSorts],
-);
-
-// Row query reads effective filter/sorts.
-const { data: rowsData, ... } = useBaseRowsQuery(
-  base ? baseId : undefined,
-  effectiveFilter,
-  effectiveSorts,
-);
-
-// Table is seeded from effectiveView for rendering, but the auto-persist
-// write-path uses the real `activeView.config` as the baseline so draft
-// filter/sort values can never leak into a column-layout save.
-// See "Filter & sort write-path changes" below for the exact mechanism.
-const { table, persistViewConfig } = useBaseTable(base, rows, effectiveView, {
-  baselineConfig: activeView?.config,
-});
-```
-
-The server-roundtrip `persistViewConfig` keeps being called for column layout changes. It reads from `baselineConfig` — never from the effective/draft state — so a pending layout write cannot bake draft filter/sort values into the server baseline. See the next subsection for the exact implementation.
-
-### Filter & sort write-path changes
-
-Today, filter/sort editors feed `BaseToolbar`'s handlers:
-
-- [base-toolbar.tsx:135-148](../../../apps/client/src/features/base/components/base-toolbar.tsx) `handleSortsChange` → builds config via `buildViewConfigFromTable(table, activeView.config, { sorts: newSorts })` → `updateViewMutation.mutate(...)`.
-- [base-toolbar.tsx:150-169](../../../apps/client/src/features/base/components/base-toolbar.tsx) `handleFiltersChange` → same pattern with `{ filter }`.
-
-Both write directly to the server. That's the exact site to branch.
-
-**New `base-toolbar.tsx`:** accept two new callbacks from `base-table.tsx`:
-
-```ts
-onDraftSortsChange: (sorts: ViewSortConfig[]) => void;
-onDraftFiltersChange: (filter: FilterGroup | undefined) => void;
-```
-
-The toolbar drops its internal `updateViewMutation.mutate` calls for sort/filter (retains them for view tabs / view type flip if any exists elsewhere). `handleSortsChange` becomes:
-
-```ts
-const handleSortsChange = useCallback(
-  (newSorts: ViewSortConfig[]) => {
-    onDraftSortsChange(newSorts); // writes to useViewDraft via base-table
-  },
-  [onDraftSortsChange],
-);
-```
-
-Same for filters — the FilterCondition[]→FilterGroup wrapping logic at [base-toolbar.tsx:152-157](../../../apps/client/src/features/base/components/base-toolbar.tsx) stays; only the final dispatch target changes.
-
-**`base-table.tsx`** wires those callbacks to the draft hook:
-
-```ts
-const handleDraftSortsChange = useCallback(
-  (sorts: ViewSortConfig[]) => setSorts(sorts.length ? sorts : undefined),
-  [setSorts],
-);
-const handleDraftFiltersChange = useCallback(
-  (filter: FilterGroup | undefined) => setFilter(filter),
-  [setFilter],
-);
-```
-
-The "normalize empty to undefined" rule is how we let the draft go clean after the user deletes every filter — the draft hook's "remove key if both axes are undefined" rule then kicks in.
-
-**Toolbar badge counts:** [base-toolbar.tsx:118-128](../../../apps/client/src/features/base/components/base-toolbar.tsx) currently derives `sorts` and `conditions` from `activeView.config`. Switch these to read from the **effective** config (`effectiveView.config`) so the toolbar badges reflect the draft's count, not the baseline. The toolbar already accepts `activeView` — pass it `effectiveView` instead, since everything the toolbar reads from `activeView` (name, sorts, filter) should be in the effective form.
-
-**The `buildViewConfigFromTable` call site in `handleColumnReorder` / `handleResizeEnd` / field-visibility:** these continue reading from `activeView.config` (the real baseline) and going through `updateViewMutation`. They do **not** read from the draft. This is deliberate — column layout stays auto-persisted.
-
-However: `buildViewConfigFromTable` currently spreads its `base` argument and emits `sorts` from the live table state. For the debounced `persistViewConfig` call at [use-base-table.ts:382](../../../apps/client/src/features/base/hooks/use-base-table.ts), the `base` arg is the effective config (because we pass `effectiveView` into `useBaseTable`), but the emitted `sorts` comes from the table's live state — which was seeded from effective. That means if the user drafts a sort and then reorders a column, the debounced persist would write `{ ...effectiveConfig, sorts: draftSorts }` back to the server. **Bug.**
-
-Fix: when building the config for the auto-persist path in `persistViewConfig`, override the emitted `sorts` and `filter` with the **baseline** values, not the effective ones. Concretely, change [use-base-table.ts:382](../../../apps/client/src/features/base/hooks/use-base-table.ts) to
-
-```ts
-const config = buildViewConfigFromTable(table, activeView.config, {
-  sorts: activeView.config?.sorts,
-  filter: activeView.config?.filter,
-});
-```
-
-where `activeView` in that callsite is the **real** activeView (not the effective one). So `useBaseTable` needs both: the effective view for seeding and rendering, and the real baseline for the persist path.
-
-Simplest refactor: give `useBaseTable` an optional `baselineConfig?: ViewConfig` argument. If omitted (existing callers), behave as today. If provided, `persistViewConfig` uses `baselineConfig` for sort/filter overrides. `base-table.tsx` passes `activeView.config` as the baseline and the effective-wrapped view as the active.
-
-This keeps `useBaseTable`'s own responsibilities tidy and makes the "drafts don't leak into the layout write-path" rule explicit.
-
-**Note on `useBaseTable`'s re-seed effect:** A draft edit changes `effectiveView.config.filter/sorts`, which propagates through the `derivedColumnOrder` / `derivedColumnVisibility` memos and re-fires the sync effect at [use-base-table.ts:280](../../../apps/client/src/features/base/hooks/use-base-table.ts). This is harmless because (a) `activeView.id` is unchanged, so the full re-seed branch doesn't trigger, and (b) the `hasPendingEdit` branch preserves live column state when no layout mutation is pending, and adopts derived values otherwise — those derived values are still driven by the same `properties`, so they're content-equal. No action required, but worth naming so the implementer doesn't chase a non-issue.
-
-## Banner component
-
-**File:** `apps/client/src/features/base/components/base-view-draft-banner.tsx`
-
-```ts
-type BaseViewDraftBannerProps = {
-  isDirty: boolean;
-  canSave: boolean;
-  onReset: () => void;
-  onSave: () => void;
-  saving: boolean;
-};
-
-export function BaseViewDraftBanner({ isDirty, canSave, onReset, onSave, saving }: BaseViewDraftBannerProps) {
-  const { t } = useTranslation();
-  if (!isDirty) return null;
-  return (
-    <Paper withBorder radius="sm" px="md" py="xs" /* soft bg per theme */>
-      <Group justify="space-between" wrap="nowrap">
-        <Group gap="xs" wrap="nowrap">
-          <IconInfoCircle size={16} />
-          <Text size="sm">{t("Filter and sort changes are visible only to you.")}</Text>
-        </Group>
-        <Group gap="sm" wrap="nowrap">
-          <Button variant="subtle" color="gray" size="xs" onClick={onReset}>{t("Reset")}</Button>
-          {canSave && (
-            <Button size="xs" onClick={onSave} loading={saving}>{t("Save for everyone")}</Button>
-          )}
-        </Group>
-      </Group>
-    </Paper>
-  );
-}
-```
-
-Wiring in [base-table.tsx](../../../apps/client/src/features/base/components/base-table.tsx), inserted between the existing page chrome and `<BaseToolbar />`:
-
-```ts
-const { data: space } = useSpaceQuery(base?.spaceId ?? "");
-const spaceAbility = useSpaceAbility(space?.membership?.permissions);
-const canSave = spaceAbility.can(SpaceCaslAction.Edit, SpaceCaslSubject.Base);
-const updateViewMutation = useUpdateViewMutation();
-const handleSaveDraft = useCallback(async () => {
-  if (!activeView || !base) return;
-  const config = buildPromotedConfig(activeView.config);
-  await updateViewMutation.mutateAsync({ viewId: activeView.id, baseId: base.id, config });
-  reset();
-  notifications.show({ message: t("View updated for everyone") });
-}, [activeView, base, buildPromotedConfig, reset, updateViewMutation, t]);
-
-return (
-  <div style={{...}}>
-    <BaseViewDraftBanner
-      isDirty={isDirty}
-      canSave={canSave}
-      onReset={reset}
-      onSave={handleSaveDraft}
-      saving={updateViewMutation.isPending}
-    />
-    <BaseToolbar ... />
-    <GridContainer ... />
-  </div>
-);
-```
-
-The `useSpaceQuery`/`useSpaceAbility` pair follows the same pattern as [use-history-restore.tsx:35-41](../../../apps/client/src/features/page-history/hooks/use-history-restore.tsx).
-
-## Cross-tab sync
-
-Inherited from `atomWithStorage`. Its internal subscription to the `storage` event re-notifies any Jotai-connected component on other tabs when the matching localStorage key changes, triggering a re-render with the new draft value. No hand-rolled listener in `useViewDraft`.
-
-React Query's row cache is keyed by `(baseId, filter, sorts, search)` — when the updated draft flows through `effectiveFilter` / `effectiveSorts` on the other tab, the row query refetches as a fresh infinite query via the normal path.
-
-Edge case: two tabs editing simultaneously — both writes land in localStorage, last-write-wins (same-user scope, acceptable).
-
-## Save flow (pseudocode)
-
-```ts
-async function onSaveForEveryone() {
-  if (!activeView || !base) return;
-  // 1. Compose the promoted config from the server baseline + draft values.
-  //    baseline is activeView.config (NOT effectiveView.config) because the
-  //    baseline might include layout fields (propertyWidths, propertyOrder,
-  //    hiddenPropertyIds, visiblePropertyIds) that we must preserve verbatim.
-  const config: ViewConfig = {
-    ...activeView.config,
-    filter: draft.filter ?? activeView.config.filter,
-    sorts: draft.sorts ?? activeView.config.sorts,
-  };
-  // 2. Fire the existing mutation. `updateViewMutation` already:
-  //    - optimistically updates the ["bases", baseId] query cache
-  //    - rolls back on error
-  //    - writes the server response back on success
-  await updateViewMutation.mutateAsync({ viewId: activeView.id, baseId: base.id, config });
-  // 3. Clear the draft. Because the baseline has now caught up to what the
-  //    draft said, isDirty flips to false and the banner unmounts.
-  reset();
-  notifications.show({ message: t("View updated for everyone") });
-}
-```
-
-Error handling: `useUpdateViewMutation` already shows a red toast and rolls back the optimistic cache update on failure. We do *not* call `reset()` in that case — the draft stays, the banner stays, the user can retry.
-
-## Dirty check
-
-`isDirty` lives inside `useViewDraft`. Returns `true` iff the draft file exists AND at least one of these is true:
-
-- `draft.filter !== undefined` AND `!deepEqualFilter(draft.filter, baselineFilter)`
-- `draft.sorts !== undefined` AND `!deepEqualSorts(draft.sorts, baselineSorts)`
-
-**Deep equality:** the codebase has no `lodash` or `fast-deep-equal` in [client package.json](../../../apps/client/package.json). Options:
-
-1. **`JSON.stringify` both sides and compare strings.** Trivially correct for `FilterGroup` (a pure data tree) and `ViewSortConfig[]`. Key ordering inside objects is deterministic in V8+ for non-numeric keys, which is the case here. Pick this — it's 4 lines and good enough for this shape.
-2. Hand-written structural compare — overkill for two types with known finite shapes.
-
-Go with option 1. Helpers live in `use-view-draft.ts`:
-
-```ts
-function filterEq(a: FilterGroup | undefined, b: FilterGroup | undefined) {
-  return JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
-}
-function sortsEq(a: ViewSortConfig[] | undefined, b: ViewSortConfig[] | undefined) {
-  return JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
-}
-```
-
-**Orphan suppression.** The agreed rule: when the draft's values equal the baseline, the banner hides. The dirty check above already does that — a draft with `filter: X` where baseline is also `X` yields `filterEq === true` for that axis, and if the sorts axis is also equal (or absent), `isDirty === false`. The key stays in localStorage (no eager GC), but the banner is invisible until the user next diverges or another tab updates the baseline.
-
-## Testing
-
-Per [CLAUDE.md](../../../CLAUDE.md), the client has no test infrastructure (no `vitest` in the workspace). This spec does not block on adding one. Testing is primarily manual QA + optional unit tests if Vitest is introduced alongside this feature.
-
-### Unit tests (proposed, Vitest — gated on harness being added)
-
-`use-view-draft.test.ts`:
-
-- **Initialize with no stored value.** Hook returns `draft=null`, `isDirty=false`, effective values fall through to baseline.
-- **`setFilter` writes to localStorage and updates state.** After `setFilter(X)`, `localStorage.getItem(key)` parses back to `{ filter: X, updatedAt: ... }`, `draft.filter === X`, `isDirty === true`.
-- **`setSorts` writes independently.** `draft.filter` stays undefined even after `setSorts(...)`, and vice versa.
-- **`setFilter(undefined)` then `setSorts(undefined)` removes the key.** After both axes are cleared, `localStorage.getItem(key)` is null.
-- **`reset` clears both state and storage.**
-- **Draft values equal to baseline → `isDirty === false` without clearing storage.** Set baseline to `B`, set draft filter to `B`, assert `isDirty === false` and `localStorage.getItem(key)` is still non-null (no eager GC).
-- **Baseline change while draft exists.** Baseline shifts from `B1` to `B2`, draft filter is `X`. Effective filter stays `X`, `isDirty` stays `true`. Then baseline shifts again to `X` — `isDirty` flips to `false` without draft being cleared.
-- **Cross-tab propagation (integration-level, not strictly a unit test).** `atomWithStorage` handles the `storage` event internally; the only thing our hook contributes is the derivation of `effectiveFilter` / `effectiveSorts` / `isDirty` from the atom value. A single assertion that writing to the atom value in one `Provider` context reflects in another suffices.
-- **Malformed storage value.** Seed localStorage with garbage under the computed key → `atomWithStorage` yields `null`, hook reports `draft=null`, `isDirty=false`, table receives baseline.
-- **`userId` missing → passthrough.** All setters are no-ops, `isDirty=false`, effective = baseline.
-
-### Manual QA checklist
-
-**Single user, single tab.**
-- Apply a filter. Banner appears. Row list updates locally.
-- Click Reset. Banner disappears. Filter in the popover reverts to baseline. Row list reverts.
-- Apply a filter and a sort. Click Save for everyone. Banner disappears. Refresh the page — the filter/sort is now the new baseline (i.e. came back from the server).
-- Apply a filter, then manually delete it via the filter popover. Banner disappears. Subsequent refresh does not restore the deleted filter (baseline untouched).
-
-**Single user, multiple tabs.**
-- Open base in tab A and tab B. In tab A, add a sort. Tab B re-renders with the same sort applied (verified by checking the sort popover badge and the row order). Tab B shows the banner.
-- In tab B, click Reset. Tab A's banner disappears and sort reverts.
-
-**Multi-user baseline race.**
-- User X (editor) opens base. Applies a filter (draft). User Y (editor) in another session saves a brand-new baseline via their own Save flow. User X's client receives the websocket `base:schema:bumped` → `["bases", baseId]` invalidates → `activeView.config` updates. User X's `effectiveFilter` still shows X's draft filter (draft wins). Banner stays. No UI prompt. If X now clicks Reset, they see Y's new baseline.
-
-**Permission gating.**
-- As a space Viewer (who has Read but not Edit on `Base`): open base, apply a filter. Banner appears but shows only "Reset" — no "Save for everyone" button.
-- Server check: attempting Save as a viewer would have been blocked by [base-view.controller.ts:68](../../../apps/server/src/core/base/controllers/base-view.controller.ts) anyway; the UI gate is belt-and-suspenders.
-
-**Reset with popover open.**
-- Open the filter popover and add conditions. Without closing the popover, click Reset (the banner is visible behind the popover dropdown — it's positioned above). Popover closes on outside-click, baseline conditions show next open.
-
-**Save clears draft + updates server.**
-- Save. Banner vanishes. localStorage key for `{user,base,view}` is absent. Re-open the base in an incognito/second-account browser — the filter/sort shows too (from the server).
-
-**Browser storage cleared.**
-- In DevTools, wipe `localStorage`. Base re-renders with baseline. Banner gone. Expected.
-
-## Rollout
-
-- **No DB migration.** No server change.
-- **No feature flag.** Behavior change ships as-is.
-- **No data migration.** Existing users have no drafts; the system starts empty.
-- **Behavioral change vs. today.** Existing users' muscle memory is "touch a filter → auto-saves for everyone". After this ships, that becomes "touch a filter → only I see it until I hit Save for everyone". This is the entire point of the feature but will surprise power users on day one.
-  - Mitigation: none in v1. A one-time popover/tooltip pointing at the banner ("New: filter and sort changes are now a draft until you save") is worth doing, but falls squarely in YAGNI territory for the first ship.
-  - **Followup:** consider a dismissible one-time in-product hint the first time a user diverges from baseline after the deploy. Flag this as a follow-up task; do not ship with v1.
-
-## Risks & open questions
-
-- **localStorage quota.** `FilterGroup` + `ViewSortConfig[]` is tiny — a realistic draft is under 2KB. A worst-case malicious user with thousands of views could hit the 5–10MB per-origin cap, but practically negligible. No cleanup logic needed.
-- **Users losing drafts via browser data clear.** Expected. The banner is a live indicator, not a durable source of truth. Flagged in non-goals.
-- **Multi-device divergence.** Same user on laptop and phone: drafts don't sync. Expected and flagged.
-- **Dropdown caret ("Save as new view") in the screenshot.** Explicitly out of scope for v1. If we add it, the caret menu would include:
-  1. "Save for everyone" (current behavior)
-  2. "Save as new view" (creates a new `IBaseView` with draft values baked into `config`)
-- **Baseline layout fields overriding draft.** Save flow does `{ ...activeView.config, filter: X, sorts: Y }`. If another user changed column widths right before Save, those widths land in the Save's payload (we already read the latest optimistic cache). Acceptable — the alternative (send a sparse patch with only `{filter, sorts}`) would require a server-side partial-update endpoint we don't have.
-- **Invalid draft for stale schema.** If a property is deleted while a user's draft references it by id, the predicate/sort engine on the server silently drops unknown property ids. Client-side, the sort/filter popover shows the condition with a missing-property label (existing behavior — the toolbar already does `properties.find((p) => p.id === …)` and tolerates the `undefined` case). No special handling needed here; the draft just falls away when the user next edits and doesn't re-add the dead condition.
-- **`SpaceCaslSubject.Base` missing from client enum.** Single-line fix at [permissions.type.ts:12](../../../apps/client/src/features/space/permissions/permissions.type.ts). Flagged so reviewers notice.
-
-## Future extension
-
-1. **Draft column layout.** Extend the draft shape to carry `propertyWidths`, `propertyOrder`, `hiddenPropertyIds`, `visiblePropertyIds`. Column reorder / hide / resize call the draft hook instead of `persistViewConfig`. `useBaseTable` then seeds column state from effective values. Mechanically identical to filter/sort — the hook already takes arbitrary ViewConfig fragments. The only reason this isn't in v1 is to minimize behavioral change surface and keep the spec scope narrow.
-2. **Server-side per-user drafts.** For cross-device sync, add a `base_view_drafts` table keyed by `(userId, viewId)` storing the same shape. The client hook swaps localStorage for a paired mutation + query. The banner UX stays identical.
-3. **Split-button save.** Dropdown caret next to "Save for everyone" offering "Save as new view" — creates an `IBaseView` via `createView` with the effective config. Deepens the Notion parallel.
-4. **Draft conflict hint.** When baseline changes while I have drafts, show a subtle "Baseline has changed since your last edit" line inside the banner with a "Discard draft and load latest" affordance. Expected to be low value in practice — flag once real users report it.

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,7 +50,7 @@
     "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",
@@ -80,7 +74,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

@@ -416,6 +416,7 @@
   "{{latestVersion}} is available": "{{latestVersion}} is available",
   "Default page edit mode": "Default page edit mode",
   "Choose your preferred page edit mode. Avoid accidental edits.": "Choose your preferred page edit mode. Avoid accidental edits.",
+  "Choose {{format}} file": "Choose {{format}} file",
   "Reading": "Reading",
   "Delete member": "Delete member",
   "Member deleted successfully": "Member deleted successfully",
@@ -608,25 +609,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 +877,54 @@
   "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",
+  "Page menu": "Page menu",
+  "Expand": "Expand",
+  "Collapse": "Collapse",
+  "Comment menu": "Comment menu",
+  "Group menu": "Group menu",
+  "Show hidden breadcrumbs": "Show hidden breadcrumbs",
+  "Breadcrumbs": "Breadcrumbs",
+  "Page actions": "Page actions",
+  "Pick emoji": "Pick emoji",
+  "Template menu": "Template menu",
+  "Chat menu": "Chat menu",
+  "API key menu": "API key menu",
+  "Jump to comment selection": "Jump to comment selection",
+  "Slash commands": "Slash commands",
+  "Mention suggestions": "Mention suggestions",
+  "Link suggestions": "Link suggestions",
+  "Diagram editor": "Diagram editor",
+  "Add comment": "Add comment",
+  "Find and replace": "Find and replace",
+  "Main navigation": "Main navigation",
+  "Space navigation": "Space navigation",
+  "Settings navigation": "Settings navigation",
+  "AI navigation": "AI navigation",
+  "Breadcrumb": "Breadcrumb",
+  "Skip to main content": "Skip to main content"
 }

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/common/avatar-uploader.tsx

@@ -80,6 +80,12 @@ export default function AvatarUploader({
     }
   };
 
+  const ariaLabel = {
+    [AvatarIconType.AVATAR]: t("Change avatar"),
+    [AvatarIconType.SPACE_ICON]: t("Change space icon"),
+    [AvatarIconType.WORKSPACE_ICON]: t("Change workspace icon"),
+  }[type];
+
   const handleRemove = async () => {
     if (disabled) return;
 
@@ -104,6 +110,8 @@ export default function AvatarUploader({
         ref={fileInputRef}
         onChange={handleFileInputChange}
         accept="image/png,image/jpeg,image/jpg"
+        aria-label={ariaLabel}
+        tabIndex={-1}
         style={{ display: "none" }}
       />
 
@@ -115,6 +123,8 @@ export default function AvatarUploader({
               size={size}
               avatarUrl={currentImageUrl}
               name={fallbackName}
+              aria-label={ariaLabel}
+              aria-haspopup="menu"
               style={{
                 cursor: disabled || isLoading ? "default" : "pointer",
                 opacity: isLoading ? 0.6 : 1,

apps/client/src/components/common/copy.tsx

@@ -25,6 +25,7 @@ export default function CopyTextButton({ text, size }: CopyProps) {
             variant="subtle"
             onClick={copy}
             size={size}
+            aria-label={copied ? t("Copied") : t("Copy")}
           >
             {copied ? <IconCheck size={16} /> : <IconCopy size={16} />}
           </ActionIcon>

apps/client/src/components/common/recent-changes.tsx

@@ -4,7 +4,7 @@ import {
   UnstyledButton,
   Badge,
   Table,
-  ActionIcon,
+  ThemeIcon,
   Button,
 } from "@mantine/core";
 import { Link } from "react-router-dom";
@@ -49,9 +49,9 @@ export default function RecentChanges({ spaceId }: Props) {
                   >
                     <Group wrap="nowrap">
                       {page.icon || (
-                        <ActionIcon variant="transparent" color="gray" size={18}>
+                        <ThemeIcon variant="transparent" color="gray" size={18}>
                           <IconFileDescription size={18} />
-                        </ActionIcon>
+                        </ThemeIcon>
                       )}
 
                       <Text fw={500} size="md" lineClamp={1}>

apps/client/src/components/common/search-input.tsx

@@ -6,12 +6,14 @@ import { useTranslation } from "react-i18next";
 
 export interface SearchInputProps {
   placeholder?: string;
+  ariaLabel?: string;
   debounceDelay?: number;
   onSearch: (value: string) => void;
 }
 
 export function SearchInput({
   placeholder,
+  ariaLabel,
   debounceDelay = 500,
   onSearch,
 }: SearchInputProps) {
@@ -28,6 +30,7 @@ export function SearchInput({
       <TextInput
         size="sm"
         placeholder={placeholder || t("Search...")}
+        aria-label={ariaLabel || placeholder || t("Search")}
         leftSection={<IconSearch size={16} />}
         value={value}
         onChange={(e) => setValue(e.currentTarget.value)}

apps/client/src/components/icons/icon-people-circle.tsx

@@ -1,11 +1,11 @@
-import { ActionIcon, rem } from "@mantine/core";
+import { ThemeIcon } from "@mantine/core";
 import React from "react";
 import { IconUsersGroup } from "@tabler/icons-react";
 
 export function IconGroupCircle() {
   return (
-    <ActionIcon variant="light" size="lg" color="gray" radius="xl">
+    <ThemeIcon variant="light" size="lg" color="gray" radius="xl">
       <IconUsersGroup stroke={1.5} />
-    </ActionIcon>
+    </ThemeIcon>
   );
 }

apps/client/src/components/layouts/global/app-shell.module.css

@@ -28,4 +28,22 @@
   }
 }
 
+.skipLink {
+  position: fixed;
+  left: 8px;
+  top: 8px;
+  padding: 8px 12px;
+  background: var(--mantine-color-blue-6);
+  color: #fff;
+  border-radius: 4px;
+  text-decoration: none;
+  z-index: 1000;
+  transform: translateY(-150%);
+
+  &:focus {
+    transform: translateY(0);
+    outline: 2px solid var(--mantine-color-blue-3);
+  }
+}
+
 

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

@@ -1,6 +1,7 @@
 import { AppShell, Container } from "@mantine/core";
 import React, { useEffect, useRef, useState } from "react";
 import { useLocation } from "react-router-dom";
+import { useTranslation } from "react-i18next";
 import SettingsSidebar from "@/components/settings/settings-sidebar.tsx";
 import { useAtom } from "jotai";
 import {
@@ -23,11 +24,12 @@ export default function GlobalAppShell({
 }: {
   children: React.ReactNode;
 }) {
+  const { t } = useTranslation();
   useTrialEndAction();
   const [mobileOpened] = useAtom(mobileSidebarAtom);
   const toggleMobile = useToggleSidebar(mobileSidebarAtom);
   const [desktopOpened] = useAtom(desktopSidebarAtom);
-  const [{ isAsideOpen }] = useAtom(asideStateAtom);
+  const [{ isAsideOpen, tab: asideTab }] = useAtom(asideStateAtom);
   const [sidebarWidth, setSidebarWidth] = useAtom(sidebarWidthAtom);
   const [isResizing, setIsResizing] = useState(false);
   const sidebarRef = useRef(null);
@@ -79,7 +81,11 @@ export default function GlobalAppShell({
   const showGlobalSidebar = !isSpaceRoute && !isSettingsRoute && !isAiRoute;
 
   return (
-    <AppShell
+    <>
+      <a href="#main-content" className={classes.skipLink}>
+        {t("Skip to main content")}
+      </a>
+      <AppShell
       header={{ height: 45 }}
       navbar={{
         width: isSpaceRoute ? sidebarWidth : 300,
@@ -105,6 +111,15 @@ export default function GlobalAppShell({
         className={classes.navbar}
         withBorder={false}
         ref={sidebarRef}
+        aria-label={
+          isSpaceRoute
+            ? t("Space navigation")
+            : isSettingsRoute
+              ? t("Settings navigation")
+              : isAiRoute
+                ? t("AI navigation")
+                : t("Main navigation")
+        }
       >
         {isSpaceRoute && (
           <div className={classes.resizeHandle} onMouseDown={startResizing} />
@@ -114,19 +129,35 @@ export default function GlobalAppShell({
         {isAiRoute && <AiChatSidebar />}
         {showGlobalSidebar && <GlobalSidebar />}
       </AppShell.Navbar>
-      <AppShell.Main>
+      <AppShell.Main id="main-content">
         {isSettingsRoute ? (
-          <Container size={900}>{children}</Container>
+          <Container size={900} pb={80}>
+            {children}
+          </Container>
         ) : (
           children
         )}
       </AppShell.Main>
 
       {isPageRoute && (
-        <AppShell.Aside className={classes.aside} p="md" withBorder={false}>
+        <AppShell.Aside
+          className={classes.aside}
+          p="md"
+          withBorder={false}
+          aria-label={
+            asideTab === "comments"
+              ? t("Comments")
+              : asideTab === "toc"
+                ? t("Table of contents")
+                : asideTab === "chat"
+                  ? t("AI Chat")
+                  : undefined
+          }
+        >
           <Aside />
         </AppShell.Aside>
       )}
     </AppShell>
+    </>
   );
 }

apps/client/src/components/layouts/global/global-sidebar.module.css

@@ -50,7 +50,7 @@
 .sectionHeader {
     padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
     font-size: var(--mantine-font-size-xs);
-    color: light-dark(var(--mantine-color-gray-6), var(--mantine-color-dark-3));
+    color: var(--mantine-color-dimmed);
     font-weight: 600;
     text-transform: uppercase;
     letter-spacing: 0.5px;

apps/client/src/components/layouts/global/global-sidebar.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { ScrollArea, Text, Divider, Modal } from "@mantine/core";
+import { ScrollArea, Text, Divider, Modal, UnstyledButton } from "@mantine/core";
 import {
   IconHome,
   IconClock,
@@ -119,17 +119,13 @@ export default function GlobalSidebar() {
       </ScrollArea>
 
       <div className={classes.bottomSection}>
-        <a
+        <UnstyledButton
           className={classes.link}
-          onClick={(e) => {
+          onClick={openInvite}
-            e.preventDefault();
-            openInvite();
-          }}
-          href="#"
         >
           <IconUserPlus className={classes.linkIcon} stroke={2} />
           <span>{t("Invite People")}</span>
-        </a>
+        </UnstyledButton>
         <Link
           className={classes.link}
           data-active={active.startsWith("/settings") || undefined}

apps/client/src/components/settings/app-version.tsx

@@ -29,7 +29,7 @@ export default function AppVersion() {
       >
         <Indicator
           label={t("New update")}
-          color="gray"
+          color="dark"
           inline
           size={16}
           position="middle-end"

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;
@@ -226,32 +230,6 @@ export default function SettingsSidebar() {
           }
 
           const isDisabled = isItemDisabled(item);
-          const linkElement = (
-            <Link
-              onMouseEnter={!isDisabled ? prefetchHandler : undefined}
-              className={classes.link}
-              data-active={active.startsWith(item.path) || undefined}
-              data-disabled={isDisabled || undefined}
-              key={item.label}
-              to={isDisabled ? "#" : item.path}
-              onClick={(e) => {
-                if (isDisabled) {
-                  e.preventDefault();
-                  return;
-                }
-                if (mobileSidebarOpened) {
-                  toggleMobileSidebar();
-                }
-              }}
-              style={{
-                opacity: isDisabled ? 0.5 : 1,
-                cursor: isDisabled ? "not-allowed" : "pointer",
-              }}
-            >
-              <item.icon className={classes.linkIcon} stroke={2} />
-              <span>{t(item.label)}</span>
-            </Link>
-          );
 
           if (isDisabled) {
             return (
@@ -261,12 +239,41 @@ export default function SettingsSidebar() {
                 position="right"
                 withArrow
               >
-                {linkElement}
+                <span
+                  className={classes.link}
+                  data-disabled
+                  role="link"
+                  aria-disabled="true"
+                  tabIndex={0}
+                  style={{
+                    opacity: 0.5,
+                    cursor: "not-allowed",
+                  }}
+                >
+                  <item.icon className={classes.linkIcon} stroke={2} />
+                  <span>{t(item.label)}</span>
+                </span>
               </Tooltip>
             );
           }
 
-          return linkElement;
+          return (
+            <Link
+              onMouseEnter={prefetchHandler}
+              className={classes.link}
+              data-active={active.startsWith(item.path) || undefined}
+              key={item.label}
+              to={item.path}
+              onClick={() => {
+                if (mobileSidebarOpened) {
+                  toggleMobileSidebar();
+                }
+              }}
+            >
+              <item.icon className={classes.linkIcon} stroke={2} />
+              <span>{t(item.label)}</span>
+            </Link>
+          );
         })}
       </div>
     );
@@ -284,7 +291,7 @@ export default function SettingsSidebar() {
           }}
           variant="transparent"
           c="gray"
-          aria-label="Back"
+          aria-label={t("Back")}
         >
           <IconArrowLeft stroke={2} />
         </ActionIcon>

apps/client/src/components/ui/custom-avatar.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Avatar } from "@mantine/core";
+import { Avatar, MantineColor } from "@mantine/core";
 import { getAvatarUrl } from "@/lib/config.ts";
 import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";
 
@@ -16,11 +16,39 @@ interface CustomAvatarProps {
   mt?: string | number;
 }
 
+// `color.shade` pairs whose filled background meets WCAG AA (4.5:1) against
+// white text. Avoids lime/yellow/green/orange — even their dark shades have
+// weak white-text contrast.
+const SAFE_INITIALS_COLORS: MantineColor[] = [
+  "blue.8",
+  "cyan.9",
+  "grape.7",
+  "indigo.7",
+  "pink.8",
+  "red.8",
+  "violet.7",
+];
+
+function hashName(input: string) {
+  let hash = 0;
+  for (let i = 0; i < input.length; i += 1) {
+    hash = (hash << 5) - hash + input.charCodeAt(i);
+    hash |= 0;
+  }
+  return Math.abs(hash);
+}
+
+function pickInitialsColor(name: string) {
+  return SAFE_INITIALS_COLORS[hashName(name) % SAFE_INITIALS_COLORS.length];
+}
+
 export const CustomAvatar = React.forwardRef<
   HTMLInputElement,
   CustomAvatarProps
->(({ avatarUrl, name, type, ...props }: CustomAvatarProps, ref) => {
+>(({ avatarUrl, name, type, color, ...props }: CustomAvatarProps, ref) => {
   const avatarLink = getAvatarUrl(avatarUrl, type);
+  const resolvedColor =
+    !color || color === "initials" ? pickInitialsColor(name ?? "") : color;
 
   return (
     <Avatar
@@ -28,7 +56,7 @@ export const CustomAvatar = React.forwardRef<
       src={avatarLink}
       name={name}
       alt={name}
-      color="initials"
+      color={resolvedColor}
       {...props}
     />
   );

apps/client/src/components/ui/destination-picker/page-children.tsx

@@ -74,7 +74,18 @@ export function PageChildren({
         />
       ))}
       {hasNextPage && (
-        <div className={classes.loadMore} onClick={() => fetchNextPage()}>
+        <div
+          className={classes.loadMore}
+          onClick={() => fetchNextPage()}
+          onKeyDown={(e) => {
+            if (e.key === "Enter" || e.key === " ") {
+              e.preventDefault();
+              fetchNextPage();
+            }
+          }}
+          role="button"
+          tabIndex={0}
+        >
           {t("Load more")}
         </div>
       )}

apps/client/src/components/ui/emoji-picker.tsx

@@ -70,11 +70,14 @@ function EmojiPicker({
       closeOnEscape={true}
     >
       <Popover.Target ref={setTarget}>
-        <ActionIcon 
+        <ActionIcon
-          c={actionIconProps?.c || "gray"} 
+          c={actionIconProps?.c || "gray"}
-          variant={actionIconProps?.variant || "transparent"} 
+          variant={actionIconProps?.variant || "transparent"}
           size={actionIconProps?.size}
           onClick={handlers.toggle}
+          aria-label={t("Pick emoji")}
+          aria-haspopup="dialog"
+          aria-expanded={opened}
         >
           {icon}
         </ActionIcon>

apps/client/src/ee/ai-chat/components/ai-chat-sidebar-item.tsx

@@ -132,6 +132,7 @@ export default function AiChatSidebarItem({
               size="xs"
               color="gray"
               onClick={(e) => e.preventDefault()}
+              aria-label={t("Chat menu")}
             >
               <IconDots size={14} />
             </ActionIcon>

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/api-key-table.tsx

@@ -44,7 +44,7 @@ export function ApiKeyTable({
             <Table.Th>{t("Last used")}</Table.Th>
             <Table.Th>{t("Expires")}</Table.Th>
             <Table.Th>{t("Created")}</Table.Th>
-            <Table.Th></Table.Th>
+            <Table.Th aria-label={t("Action")} />
           </Table.Tr>
         </Table.Thead>
 
@@ -106,7 +106,11 @@ export function ApiKeyTable({
                 <Table.Td>
                   <Menu position="bottom-end" withinPortal>
                     <Menu.Target>
-                      <ActionIcon variant="subtle" color="gray">
+                      <ActionIcon
+                        variant="subtle"
+                        color="gray"
+                        aria-label={t("API key menu")}
+                      >
                         <IconDots size={16} />
                       </ActionIcon>
                     </Menu.Target>

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/page-verification/components/page-verification-modal.tsx

@@ -1,4 +1,12 @@
-import { ActionIcon, Group, Menu, Modal, Text, Tooltip } from "@mantine/core";
+import {
+  ActionIcon,
+  Group,
+  Menu,
+  Modal,
+  Text,
+  ThemeIcon,
+  Tooltip,
+} from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
 import {
   IconRosetteDiscountCheckFilled,
@@ -38,6 +46,7 @@ export function PageVerificationModal({
     <Modal
       opened={opened}
       onClose={onClose}
+      aria-label={status === "none" ? t("Set up verification") : t("Verify page")}
       title={
         <Group gap="xs">
           <IconShieldCheck
@@ -97,9 +106,9 @@ export function PageVerificationBadge({
         withArrow
         openDelay={250}
       >
-        <ActionIcon variant="subtle" color="gray">
+        <ThemeIcon variant="subtle" color="gray">
           <IconShieldCheck size={20} stroke={1.5} />
-        </ActionIcon>
+        </ThemeIcon>
       </Tooltip>
     );
   }
@@ -130,7 +139,12 @@ export function PageVerificationBadge({
         </Tooltip>
       ) : !readOnly ? (
         <Tooltip label={t("Set up verification")} withArrow openDelay={250}>
-          <ActionIcon variant="subtle" color="gray" onClick={open}>
+          <ActionIcon
+            variant="subtle"
+            color="gray"
+            aria-label={t("Set up verification")}
+            onClick={open}
+          >
             <IconShieldCheck size={20} stroke={1.5} />
           </ActionIcon>
         </Tooltip>

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 aria-label={t("Action")} />
+          </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>
@@ -141,6 +141,7 @@ export default function SsoProviderList() {
                         <ActionIcon
                           variant="subtle"
                           color="gray"
+                          aria-label={t("Edit {{name}}", { name: provider.name })}
                           onClick={() => handleEdit(provider)}
                         >
                           <IconPencil size={16} />
@@ -152,7 +153,13 @@ export default function SsoProviderList() {
                           withinPortal
                         >
                           <Menu.Target>
-                            <ActionIcon variant="subtle" color="gray">
+                            <ActionIcon
+                              variant="subtle"
+                              color="gray"
+                              aria-label={t("More actions for {{name}}", {
+                                name: provider.name,
+                              })}
+                            >
                               <IconDots size={16} />
                             </ActionIcon>
                           </Menu.Target>

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/ee/template/components/template-card.tsx

@@ -56,6 +56,7 @@ export default function TemplateCard({
                     color="gray"
                     className={classes.menuTarget}
                     onClick={(e) => e.stopPropagation()}
+                    aria-label={t("Template menu")}
                   >
                     <IconDots size={16} />
                   </ActionIcon>

apps/client/src/ee/template/components/template-preview-modal.tsx

@@ -24,7 +24,7 @@ export default function TemplatePreviewModal({
   const title = template?.title || t("Untitled");
 
   return (
-    <Modal.Root size={1200} opened={opened} onClose={onClose}>
+    <Modal.Root size={1200} opened={opened} onClose={onClose} aria-label={title}>
       <Modal.Overlay />
       <Modal.Content style={{ overflow: "hidden" }}>
         <Modal.Header>

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/atoms/view-draft-atom.ts

@@ -1,22 +0,0 @@
-import { atomFamily, atomWithStorage } from "jotai/utils";
-import { BaseViewDraft } from "@/features/base/types/base.types";
-
-export type ViewDraftKey = {
-  userId: string;
-  baseId: string;
-  viewId: string;
-};
-
-export const viewDraftStorageKey = (k: ViewDraftKey) =>
-  `docmost:base-view-draft:v1:${k.userId}:${k.baseId}:${k.viewId}`;
-
-// `atomWithStorage` handles JSON serialization, cross-tab sync via the
-// `storage` event, and lazy first-read out of the box. `atomFamily`'s
-// comparator ensures the same triple resolves to the same atom instance
-// across renders, so identity-equality cache hits in Jotai still work.
-export const viewDraftAtomFamily = atomFamily(
-  (k: ViewDraftKey) =>
-    atomWithStorage<BaseViewDraft | null>(viewDraftStorageKey(k), null),
-  (a, b) =>
-    a.userId === b.userId && a.baseId === b.baseId && a.viewId === b.viewId,
-);

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,338 +0,0 @@
-import { useCallback, useEffect, useMemo } from "react";
-import { Text, Stack } from "@mantine/core";
-import { notifications } from "@mantine/notifications";
-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 {
-  FilterGroup,
-  ViewSortConfig,
-} from "@/features/base/types/base.types";
-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,
-  useUpdateViewMutation,
-} 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 useCurrentUser from "@/features/user/hooks/use-current-user";
-import { useViewDraft } from "@/features/base/hooks/use-view-draft";
-import { useSpaceQuery } from "@/features/space/queries/space-query";
-import { useSpaceAbility } from "@/features/space/permissions/use-space-ability";
-import {
-  SpaceCaslAction,
-  SpaceCaslSubject,
-} from "@/features/space/permissions/permissions.type";
-import { GridContainer } from "@/features/base/components/grid/grid-container";
-import { BaseToolbar } from "@/features/base/components/base-toolbar";
-import { BaseViewDraftBanner } from "@/features/base/components/base-view-draft-banner";
-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 { data: currentUser } = useCurrentUser();
-  const {
-    draft: _draft,
-    effectiveFilter,
-    effectiveSorts,
-    isDirty,
-    setFilter: setDraftFilter,
-    setSorts: setDraftSorts,
-    reset: resetDraft,
-    buildPromotedConfig,
-  } = useViewDraft({
-    userId: currentUser?.user.id,
-    baseId,
-    viewId: activeView?.id,
-    baselineFilter: activeView?.config?.filter,
-    baselineSorts: activeView?.config?.sorts,
-  });
-
-  // Render view: baseline merged with any local draft. Passed to
-  // `useBaseTable` (for table state seeding) and to the toolbar (for badge
-  // counts). The real `activeView` is still used as the auto-persist
-  // baseline so drafts can't leak into column-layout writes.
-  const effectiveView = useMemo(
-    () =>
-      activeView
-        ? {
-            ...activeView,
-            config: {
-              ...activeView.config,
-              filter: effectiveFilter,
-              sorts: effectiveSorts,
-            },
-          }
-        : undefined,
-    [activeView, effectiveFilter, effectiveSorts],
-  );
-
-  // Effective values drive the row query and the client-side position
-  // sort guard below. The old `activeView.config` reads are no longer the
-  // source of truth once drafts are involved.
-  const activeFilter = effectiveFilter;
-  const activeSorts = effectiveSorts;
-
-  // `useSpaceQuery` is guarded by `enabled: !!spaceId` internally, so
-  // passing `""` when `base` hasn't loaded yet is safe. See
-  // use-history-restore.tsx for the same pattern.
-  const { data: space } = useSpaceQuery(base?.spaceId ?? "");
-  const spaceAbility = useSpaceAbility(space?.membership?.permissions);
-  const canSave = spaceAbility.can(
-    SpaceCaslAction.Edit,
-    SpaceCaslSubject.Base,
-  );
-
-  // 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();
-  const updateViewMutation = useUpdateViewMutation();
-
-  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, effectiveView, {
-    baselineConfig: activeView?.config,
-  });
-
-  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 handleDraftSortsChange = useCallback(
-    (sorts: ViewSortConfig[] | undefined) => {
-      setDraftSorts(sorts && sorts.length > 0 ? sorts : undefined);
-    },
-    [setDraftSorts],
-  );
-
-  const handleDraftFiltersChange = useCallback(
-    (filter: FilterGroup | undefined) => {
-      setDraftFilter(filter);
-    },
-    [setDraftFilter],
-  );
-
-  const handleSaveDraft = useCallback(async () => {
-    if (!activeView || !base) return;
-    // `buildPromotedConfig` preserves all non-draft baseline fields
-    // (widths/order/visibility) and only overwrites filter/sorts when the
-    // draft has divergent values.
-    const config = buildPromotedConfig(activeView.config);
-    try {
-      await updateViewMutation.mutateAsync({
-        viewId: activeView.id,
-        baseId: base.id,
-        config,
-      });
-      resetDraft();
-      notifications.show({ message: t("View updated for everyone") });
-    } catch {
-      // `useUpdateViewMutation` already shows a red toast on error and
-      // rolls back the optimistic cache; keep the draft so the user can
-      // retry without re-typing.
-    }
-  }, [
-    activeView,
-    base,
-    buildPromotedConfig,
-    resetDraft,
-    t,
-    updateViewMutation,
-  ]);
-
-  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%" }}>
-      <BaseViewDraftBanner
-        isDirty={isDirty}
-        canSave={canSave}
-        onReset={resetDraft}
-        onSave={handleSaveDraft}
-        saving={updateViewMutation.isPending}
-      />
-      <BaseToolbar
-        base={base}
-        activeView={effectiveView}
-        views={views}
-        table={table}
-        onViewChange={handleViewChange}
-        onAddView={handleAddView}
-        onPersistViewConfig={persistViewConfig}
-        onDraftSortsChange={handleDraftSortsChange}
-        onDraftFiltersChange={handleDraftFiltersChange}
-      />
-      <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,300 +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 { 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;
-  // Effective view — baseline merged with any local draft. Badge counts
-  // and sort/filter popover seed data read from this. The real baseline
-  // only enters via `onDraftSortsChange` / `onDraftFiltersChange`
-  // callbacks defined by the parent.
-  activeView: IBaseView | undefined;
-  views: IBaseView[];
-  table: Table<IBaseRow>;
-  onViewChange: (viewId: string) => void;
-  onAddView?: () => void;
-  onPersistViewConfig: () => void;
-  onDraftSortsChange: (sorts: ViewSortConfig[] | undefined) => void;
-  onDraftFiltersChange: (filter: FilterGroup | undefined) => void;
-};
-
-export function BaseToolbar({
-  base,
-  activeView,
-  views,
-  table,
-  onViewChange,
-  onAddView,
-  onPersistViewConfig,
-  onDraftSortsChange,
-  onDraftFiltersChange,
-}: 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 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[]) => {
-      // Normalize empty to undefined so the draft hook can drop the `sorts`
-      // axis (and remove its localStorage entry when both axes go clean).
-      onDraftSortsChange(newSorts.length > 0 ? newSorts : undefined);
-    },
-    [onDraftSortsChange],
-  );
-
-  const handleFiltersChange = useCallback(
-    (newConditions: FilterCondition[]) => {
-      // Wrap the AND-flat popover output into the engine's FilterGroup shape.
-      // Pass `undefined` to drop the filter axis from the draft entirely.
-      const filter: FilterGroup | undefined =
-        newConditions.length > 0
-          ? { op: "and", children: newConditions }
-          : undefined;
-      onDraftFiltersChange(filter);
-    },
-    [onDraftFiltersChange],
-  );
-
-  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/base-view-draft-banner.tsx

@@ -1,45 +0,0 @@
-import { Group, Button, Tooltip } from "@mantine/core";
-import { useTranslation } from "react-i18next";
-
-type BaseViewDraftBannerProps = {
-  isDirty: boolean;
-  canSave: boolean;
-  onReset: () => void;
-  onSave: () => void;
-  saving: boolean;
-};
-
-export function BaseViewDraftBanner({
-  isDirty,
-  canSave,
-  onReset,
-  onSave,
-  saving,
-}: BaseViewDraftBannerProps) {
-  const { t } = useTranslation();
-  if (!isDirty) return null;
-  return (
-    <Group justify="flex-end" gap="xs" px="md" py={6} wrap="nowrap">
-      <Button variant="subtle" color="gray" size="xs" onClick={onReset}>
-        {t("Reset")}
-      </Button>
-      {canSave && (
-        <Tooltip
-          label={t("Filter and sort changes are visible only to you")}
-          position="bottom"
-          withArrow
-        >
-          <Button
-            variant="light"
-            color="orange"
-            size="xs"
-            onClick={onSave}
-            loading={saving}
-          >
-            {t("Save for everyone")}
-          </Button>
-        </Tooltip>
-      )}
-    </Group>
-  );
-}

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-page.tsx

@@ -1,268 +0,0 @@
-import { useState, useRef, useEffect, useCallback, useMemo } from "react";
-import { Popover, ActionIcon, Text } from "@mantine/core";
-import { useDebouncedValue } from "@mantine/hooks";
-import { useQuery } from "@tanstack/react-query";
-import { IconX, IconFileDescription } from "@tabler/icons-react";
-import { Link } from "react-router-dom";
-import clsx from "clsx";
-import { IBaseProperty } from "@/features/base/types/base.types";
-import { useResolvedPages } from "@/features/base/queries/base-page-resolver-query";
-import { useBaseQuery } from "@/features/base/queries/base-query";
-import { searchSuggestions } from "@/features/search/services/search-service";
-import { buildPageUrl } from "@/features/page/page.utils";
-import { useListKeyboardNav } from "@/features/base/hooks/use-list-keyboard-nav";
-import cellClasses from "@/features/base/styles/cells.module.css";
-
-type CellPageProps = {
-  value: unknown;
-  property: IBaseProperty;
-  rowId: string;
-  isEditing: boolean;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-type PageSuggestion = {
-  id: string;
-  slugId: string;
-  title: string | null;
-  icon: string | null;
-  spaceId: string;
-  space?: { id: string; slug: string; name: string } | null;
-};
-
-function parsePageId(value: unknown): string | null {
-  if (typeof value === "string" && value.length > 0) return value;
-  return null;
-}
-
-export function CellPage({
-  value,
-  property,
-  isEditing,
-  onCommit,
-  onCancel,
-}: CellPageProps) {
-  const pageId = parsePageId(value);
-  const { data: base } = useBaseQuery(property.baseId);
-
-  const ids = useMemo(() => (pageId ? [pageId] : []), [pageId]);
-  const { pages } = useResolvedPages(ids);
-  const resolvedPage = pageId ? pages.get(pageId) : undefined;
-
-  if (isEditing) {
-    return (
-      <PagePicker
-        pageId={pageId}
-        resolvedPage={resolvedPage ?? null}
-        spaceId={base?.spaceId}
-        onCommit={onCommit}
-        onCancel={onCancel}
-      />
-    );
-  }
-
-  if (!pageId) {
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  if (resolvedPage === undefined) {
-    // Still resolving — render an empty pill-shaped placeholder to avoid
-    // the "Page not found" flicker on initial load.
-    return <span className={cellClasses.emptyValue} />;
-  }
-
-  if (resolvedPage === null) {
-    return (
-      <span className={cellClasses.pageMissing}>
-        <IconFileDescription size={14} />
-        <span>Page not found</span>
-      </span>
-    );
-  }
-
-  return <PagePill page={resolvedPage} />;
-}
-
-type PillPage = {
-  slugId: string;
-  title: string | null;
-  icon: string | null;
-  space: { slug: string } | null;
-};
-
-function PagePill({ page }: { page: PillPage }) {
-  const title = page.title || "Untitled";
-  const spaceSlug = page.space?.slug ?? "";
-  const url = buildPageUrl(spaceSlug, page.slugId, title);
-
-  return (
-    <Link
-      to={url}
-      className={cellClasses.pagePill}
-      onClick={(e) => e.stopPropagation()}
-      onDoubleClick={(e) => e.stopPropagation()}
-    >
-      {page.icon ? (
-        <span className={cellClasses.pagePillIcon}>{page.icon}</span>
-      ) : (
-        <IconFileDescription size={14} className={cellClasses.pagePillIconFallback} />
-      )}
-      <span className={cellClasses.pagePillText}>{title}</span>
-    </Link>
-  );
-}
-
-type PagePickerProps = {
-  pageId: string | null;
-  resolvedPage: { id: string; slugId: string; title: string | null; icon: string | null; space: { id: string; slug: string; name: string } | null } | null;
-  spaceId?: string;
-  onCommit: (value: unknown) => void;
-  onCancel: () => void;
-};
-
-function PagePicker({
-  pageId,
-  resolvedPage,
-  spaceId,
-  onCommit,
-  onCancel,
-}: PagePickerProps) {
-  const [search, setSearch] = useState("");
-  const [debouncedSearch] = useDebouncedValue(search, 250);
-  const searchRef = useRef<HTMLInputElement>(null);
-
-  useEffect(() => {
-    requestAnimationFrame(() => searchRef.current?.focus());
-  }, []);
-
-  const trimmed = debouncedSearch.trim();
-  const { data: suggestions = [] } = useQuery({
-    queryKey: ["bases", "pages", "search", trimmed, spaceId ?? ""],
-    queryFn: async () => {
-      const res = await searchSuggestions({
-        query: trimmed,
-        includePages: true,
-        spaceId,
-        limit: trimmed ? 25 : 5,
-      });
-      return (res.pages ?? []) as PageSuggestion[];
-    },
-    staleTime: 15_000,
-  });
-
-  const { activeIndex, setActiveIndex, handleNavKey, setOptionRef } =
-    useListKeyboardNav(suggestions.length, [debouncedSearch]);
-
-  const handleSelect = useCallback(
-    (id: string) => {
-      onCommit(id === pageId ? null : id);
-    },
-    [pageId, onCommit],
-  );
-
-  const handleRemove = useCallback(() => {
-    onCommit(null);
-  }, [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 >= suggestions.length) return;
-        e.preventDefault();
-        handleSelect(suggestions[activeIndex].id);
-      }
-    },
-    [onCancel, handleNavKey, activeIndex, suggestions, handleSelect],
-  );
-
-  return (
-    <Popover opened onClose={onCancel} position="bottom-start" width={320} trapFocus>
-      <Popover.Target>
-        <div style={{ width: "100%", height: "100%" }}>
-          {resolvedPage ? <PagePill page={resolvedPage} /> : <span className={cellClasses.emptyValue} />}
-        </div>
-      </Popover.Target>
-      <Popover.Dropdown p={0}>
-        <div className={cellClasses.personTagArea}>
-          {pageId && resolvedPage && (
-            <span className={cellClasses.personTag}>
-              {resolvedPage.icon ? (
-                <span>{resolvedPage.icon}</span>
-              ) : (
-                <IconFileDescription size={14} />
-              )}
-              <span className={cellClasses.personTagName}>
-                {resolvedPage.title || "Untitled"}
-              </span>
-              <button
-                type="button"
-                className={cellClasses.personTagRemove}
-                onClick={(e) => {
-                  e.stopPropagation();
-                  handleRemove();
-                }}
-              >
-                <IconX size={10} />
-              </button>
-            </span>
-          )}
-          <input
-            ref={searchRef}
-            className={cellClasses.personTagInput}
-            placeholder={pageId ? "" : "Search for a page..."}
-            value={search}
-            onChange={(e) => setSearch(e.currentTarget.value)}
-            onKeyDown={handleKeyDown}
-          />
-        </div>
-
-        <div className={cellClasses.personDropdownDivider} />
-        <div className={cellClasses.selectDropdown}>
-          {suggestions.length === 0 && (
-            <div className={cellClasses.personDropdownHint}>
-              {trimmed ? "No pages found" : "No pages yet"}
-            </div>
-          )}
-          {suggestions.map((page, idx) => {
-            const isSelected = page.id === pageId;
-            return (
-              <div
-                key={page.id}
-                ref={setOptionRef(idx)}
-                className={clsx(
-                  cellClasses.selectOption,
-                  isSelected && cellClasses.selectOptionActive,
-                  idx === activeIndex && cellClasses.selectOptionKeyboardActive,
-                )}
-                onMouseEnter={() => setActiveIndex(idx)}
-                onMouseDown={(e) => e.preventDefault()}
-                onClick={() => handleSelect(page.id)}
-              >
-                {page.icon ? (
-                  <span>{page.icon}</span>
-                ) : (
-                  <IconFileDescription size={14} />
-                )}
-                <span className={cellClasses.personOptionName}>
-                  {page.title || "Untitled"}
-                </span>
-                {page.space?.name && (
-                  <Text size="xs" c="dimmed" ml="auto" truncate>
-                    {page.space.name}
-                  </Text>
-                )}
-              </div>
-            );
-          })}
-        </div>
-      </Popover.Dropdown>
-    </Popover>
-  );
-}

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,151 +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 { CellPage } from "@/features/base/components/cells/cell-page";
-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,
-  page: CellPage,
-  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,317 +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"
-                label={t("Name")}
-                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, useMemo } 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 = useMemo(() => options?.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 = useMemo(() => options?.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,112 +0,0 @@
-import { UnstyledButton, Group, Text, TextInput } from "@mantine/core";
-import {
-  IconLetterT,
-  IconHash,
-  IconCircleDot,
-  IconProgressCheck,
-  IconTags,
-  IconCalendar,
-  IconUser,
-  IconPaperclip,
-  IconFileDescription,
-  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: "page", icon: IconFileDescription, labelKey: "Page" },
-  { 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,447 +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"];
-    case "page":
-      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,220 +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]);
-
-  // Page properties store a UUID; sorting by raw UUID is unhelpful and
-  // title-based sort would require a join. Hide until we support it properly.
-  const sortableProperties = properties.filter((p) => p.type !== "page");
-
-  const propertyOptions = sortableProperties.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 = sortableProperties.find((p) => !usedIds.has(p.id));
-    if (!available) return;
-    setDraft({ propertyId: available.id, direction: "asc" });
-  }, [sorts, sortableProperties]);
-
-  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 =
-    sortableProperties.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,418 +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 type UseBaseTableOptions = {
-  // When provided, `persistViewConfig` uses this as the authoritative
-  // filter/sorts for the server write. The table's live sorting state is
-  // ignored for that axis so a locally-drafted sort/filter (kept in
-  // `activeView.config` for rendering purposes) cannot leak into the
-  // auto-persist column-layout path. Optional to preserve existing
-  // callers that pass the real baseline as `activeView`.
-  baselineConfig?: ViewConfig;
-};
-
-export function useBaseTable(
-  base: IBase | undefined,
-  rows: IBaseRow[],
-  activeView: IBaseView | undefined,
-  opts: UseBaseTableOptions = {},
-): 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;
-      // `baseline` is the server-side-of-truth config. When the caller has
-      // wrapped `activeView` with draft filter/sort values for render, they
-      // pass the pre-wrap config here so we never round-trip drafts through
-      // the column-layout auto-save path.
-      const baseline = opts.baselineConfig ?? activeView.config;
-      const config = buildViewConfigFromTable(table, baseline, {
-        sorts: baseline?.sorts,
-        filter: baseline?.filter,
-      });
-      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, opts.baselineConfig]);
-
-  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/hooks/use-view-draft.ts

@@ -1,156 +0,0 @@
-import { useCallback, useMemo } from "react";
-import { useAtom } from "jotai";
-import { RESET } from "jotai/utils";
-import {
-  BaseViewDraft,
-  FilterGroup,
-  ViewConfig,
-  ViewSortConfig,
-} from "@/features/base/types/base.types";
-import { viewDraftAtomFamily } from "@/features/base/atoms/view-draft-atom";
-
-export type UseViewDraftArgs = {
-  userId: string | undefined;
-  baseId: string | undefined;
-  viewId: string | undefined;
-  baselineFilter: FilterGroup | undefined;
-  baselineSorts: ViewSortConfig[] | undefined;
-};
-
-export type ViewDraftState = {
-  draft: BaseViewDraft | null;
-  effectiveFilter: FilterGroup | undefined;
-  effectiveSorts: ViewSortConfig[] | undefined;
-  isDirty: boolean;
-  setFilter: (filter: FilterGroup | undefined) => void;
-  setSorts: (sorts: ViewSortConfig[] | undefined) => void;
-  reset: () => void;
-  buildPromotedConfig: (baseline: ViewConfig) => ViewConfig;
-};
-
-// JSON-stringify equality is good enough for FilterGroup (pure data tree)
-// and ViewSortConfig[] — V8 preserves non-numeric key insertion order so
-// the same object graph serializes identically. Avoids pulling in
-// lodash/fast-deep-equal for two known-shaped types. (Spec "Dirty check".)
-function filterEq(a: FilterGroup | undefined, b: FilterGroup | undefined) {
-  return JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
-}
-function sortsEq(
-  a: ViewSortConfig[] | undefined,
-  b: ViewSortConfig[] | undefined,
-) {
-  return JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
-}
-
-export function useViewDraft(args: UseViewDraftArgs): ViewDraftState {
-  const { userId, baseId, viewId, baselineFilter, baselineSorts } = args;
-  const ready = !!(userId && baseId && viewId);
-
-  // Always mount an atom with a stable shape so hook order is consistent.
-  // When not ready we still feed a key, but we won't read/write it.
-  const atomKey = useMemo(
-    () => ({
-      userId: userId ?? "",
-      baseId: baseId ?? "",
-      viewId: viewId ?? "",
-    }),
-    [userId, baseId, viewId],
-  );
-  const [storedDraft, setDraft] = useAtom(viewDraftAtomFamily(atomKey));
-
-  const draft = ready ? storedDraft : null;
-
-  const setFilter = useCallback(
-    (next: FilterGroup | undefined) => {
-      if (!ready) return;
-      const current = storedDraft ?? null;
-      const mergedFilter = next;
-      const mergedSorts = current?.sorts;
-      if (mergedFilter === undefined && (mergedSorts === undefined || mergedSorts === null)) {
-        setDraft(RESET);
-        return;
-      }
-      setDraft({
-        filter: mergedFilter,
-        sorts: mergedSorts,
-        updatedAt: new Date().toISOString(),
-      });
-    },
-    [ready, storedDraft, setDraft],
-  );
-
-  const setSorts = useCallback(
-    (next: ViewSortConfig[] | undefined) => {
-      if (!ready) return;
-      const current = storedDraft ?? null;
-      const mergedFilter = current?.filter;
-      const mergedSorts = next;
-      if (mergedFilter === undefined && (mergedSorts === undefined || mergedSorts === null)) {
-        setDraft(RESET);
-        return;
-      }
-      setDraft({
-        filter: mergedFilter,
-        sorts: mergedSorts,
-        updatedAt: new Date().toISOString(),
-      });
-    },
-    [ready, storedDraft, setDraft],
-  );
-
-  const reset = useCallback(() => {
-    if (!ready) return;
-    setDraft(RESET);
-  }, [ready, setDraft]);
-
-  const effectiveFilter = useMemo(
-    () => (draft?.filter !== undefined ? draft.filter : baselineFilter),
-    [draft?.filter, baselineFilter],
-  );
-  const effectiveSorts = useMemo(
-    () => (draft?.sorts !== undefined ? draft.sorts : baselineSorts),
-    [draft?.sorts, baselineSorts],
-  );
-
-  const isDirty = useMemo(() => {
-    if (!draft) return false;
-    const filterDirty =
-      draft.filter !== undefined && !filterEq(draft.filter, baselineFilter);
-    const sortsDirty =
-      draft.sorts !== undefined && !sortsEq(draft.sorts, baselineSorts);
-    return filterDirty || sortsDirty;
-  }, [draft, baselineFilter, baselineSorts]);
-
-  const buildPromotedConfig = useCallback(
-    (baseline: ViewConfig): ViewConfig => ({
-      ...baseline,
-      filter: draft?.filter ?? baseline.filter,
-      sorts: draft?.sorts ?? baseline.sorts,
-    }),
-    [draft],
-  );
-
-  if (!ready) {
-    return {
-      draft: null,
-      effectiveFilter: baselineFilter,
-      effectiveSorts: baselineSorts,
-      isDirty: false,
-      setFilter: () => {},
-      setSorts: () => {},
-      reset: () => {},
-      buildPromotedConfig: (baseline) => baseline,
-    };
-  }
-
-  return {
-    draft,
-    effectiveFilter,
-    effectiveSorts,
-    isDirty,
-    setFilter,
-    setSorts,
-    reset,
-    buildPromotedConfig,
-  };
-}

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

@@ -1,65 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { useMemo } from "react";
-import api from "@/lib/api-client";
-
-export type ResolvedPage = {
-  id: string;
-  slugId: string;
-  title: string | null;
-  icon: string | null;
-  spaceId: string;
-  space: { id: string; slug: string; name: string } | null;
-};
-
-async function resolvePages(pageIds: string[]): Promise<ResolvedPage[]> {
-  if (pageIds.length === 0) return [];
-  const res = await api.post<{ items: ResolvedPage[] }>(
-    "/bases/pages/resolve",
-    { pageIds },
-  );
-  return res.data.items;
-}
-
-// Stable, sorted, deduped list so the query key is consistent across renders
-// no matter what order the caller hands us the ids in.
-function normalize(ids: (string | null | undefined)[]): string[] {
-  const set = new Set<string>();
-  for (const id of ids) {
-    if (typeof id === "string" && id.length > 0) set.add(id);
-  }
-  return Array.from(set).sort();
-}
-
-export type PageResolution = {
-  // Map distinguishes three states via lookup:
-  //   - key absent            → id not requested
-  //   - value undefined       → still resolving (query pending, or stale fetch in flight)
-  //   - value null            → resolved and not accessible (deleted, restricted, cross-workspace)
-  //   - value ResolvedPage    → resolved and accessible
-  pages: Map<string, ResolvedPage | null | undefined>;
-  isLoading: boolean;
-};
-
-export function useResolvedPages(
-  pageIds: (string | null | undefined)[],
-): PageResolution {
-  const normalized = useMemo(() => normalize(pageIds), [pageIds]);
-
-  const { data, isSuccess, isLoading } = useQuery({
-    queryKey: ["bases", "pages", "resolve", normalized],
-    queryFn: () => resolvePages(normalized),
-    enabled: normalized.length > 0,
-    staleTime: 30_000,
-    gcTime: 5 * 60_000,
-  });
-
-  const pages = useMemo(() => {
-    const map = new Map<string, ResolvedPage | null | undefined>();
-    // Seed with undefined (= "still resolving") until the fetch succeeds.
-    for (const id of normalized) map.set(id, isSuccess ? null : undefined);
-    for (const item of data ?? []) map.set(item.id, item);
-    return map;
-  }, [normalized, data, isSuccess]);
-
-  return { pages, isLoading };
-}

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",
-      });
-    },
-  });
-}