Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(react): SQL Editor worksheet panel and UX (#20112)
ecmadao7592ea9d6599
diff --git a/docs/superpowers/specs/2026-04-23-sql-editor-react-migration-stage-12-design.md b/docs/superpowers/specs/2026-04-23-sql-editor-react-migration-stage-12-design.mdnew file mode 100644index 0000000000..ba4dd46974--- /dev/null+++ b/docs/superpowers/specs/2026-04-23-sql-editor-react-migration-stage-12-design.md@@ -0,0 +1,302 @@+# SQL Editor React Migration — Stage 12 Design++**Date:** 2026-04-23+**Author:** [email protected]+**Status:** Draft++## 1. Goal & non-goals++**Goal:** Retire the `WorksheetPane` Vue subtree (`WorksheetPane.vue` + `SheetTree.vue` + `TreeNodeSuffix.vue` + `dropdown.ts` + `common.ts`) by porting it to React end-to-end. After this stage, the SQL editor's worksheet sidebar is fully React, and the SQL editor's `AsidePanel.vue` mounts it via `ReactPageMount`.++This builds on Stage 11's infrastructure: the `Tree` primitive, the `useSQLEditorWorksheetStore` Pinia store (delegated via `useSheetContextByView`), the React `TreeNodePrefix.tsx`, and the React `FolderForm.tsx` (used by the move-to-folder modal).++**Non-goals:**+- Migrating `AsidePanel.vue` itself — it stays Vue. Only the inline `<WorksheetPane>` mount swaps to `<ReactPageMount page="WorksheetPane" />`.+- Migrating `SchemaPane.vue`, `ConnectionPane.vue`, `HistoryPane.vue` (already React), `AccessPane.tsx` (already React) — other AsidePanel tabs are out of scope.+- Refactoring the existing `useSQLEditorWorksheetStore` (Stage 11 finished it).+- Adding any new sidebar feature — visual + behavioral parity only.++## 2. Architecture overview++```+Phase 1 — context-menu primitive+ frontend/src/react/components/ui/context-menu.tsx (new, ~100 lines + tests)++Phase 2 — helpers+ frontend/src/react/components/sql-editor/useDropdown.ts (new, ~250 lines, ports dropdown.ts)+ frontend/src/react/components/sql-editor/TreeNodeSuffix.tsx (new, ~150 lines)+ frontend/src/react/components/sql-editor/filterNode.ts (new, ~25 lines, ports common.ts)++Phase 3 — SheetTree+ frontend/src/react/components/sql-editor/SheetTree.tsx (new, ~700 lines)++Phase 4 — WorksheetPane+ frontend/src/react/components/sql-editor/WorksheetPane.tsx (new, ~300 lines)+ frontend/src/react/components/sql-editor/FilterMenuItem.tsx (new, ~30 lines)++Phase 5 — Vue caller swap & cleanup+ frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue (modify: 1-line swap)+ frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue (delete)+ frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue (delete)+ frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeSuffix.vue (delete)+ frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts (delete)+ frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/common.ts (delete)+ frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/index.ts (delete)+ frontend/src/views/sql-editor/AsidePanel/WorksheetPane/index.ts (delete)+ frontend/src/views/sql-editor/AsidePanel/WorksheetPane/FilterMenuItem.vue (delete if unused outside scope)+```++Each phase is commit-able independently.++## 3. Phase 1 — `context-menu.tsx` primitive++### 3.1 File++`frontend/src/react/components/ui/context-menu.tsx`++### 3.2 Wraps++`@base-ui/react/context-menu` (Base UI ships this — confirmed via `node_modules/@base-ui/react/context-menu/`).++### 3.3 Exports++Following the shadcn pattern used by `dropdown-menu.tsx`:++```ts+export {+ ContextMenu, // BaseContextMenu.Root+ ContextMenuTrigger, // BaseContextMenu.Trigger — wraps a target element+ ContextMenuContent, // Portal + Positioner + Popup + styling+ ContextMenuItem, // BaseContextMenu.Item — styled with hover/disabled states+ ContextMenuSeparator,+ ContextMenuLabel, // optional section label+};+```++### 3.4 Styling++Same shadcn aesthetic as `dropdown-menu.tsx`. Uses semantic tokens (`bg-background`, `border-control-border`, `text-control`), `LAYER_SURFACE_CLASS` z-index, portal to `getLayerRoot("overlay")`.++### 3.5 Tests++`context-menu.test.tsx` — 4 scenarios:+- Right-click on trigger opens the content+- Clicking an item fires its `onClick`+- ESC closes+- `disabled` items don't fire onClick++## 4. Phase 2 — Helpers++### 4.1 `filterNode.ts`++Direct port of `common.ts`'s `filterNode` helper. Pure function, no UI, no Vue. Used by `useDropdown` to filter visible nodes during multi-select.++### 4.2 `useDropdown.ts`++React port of Vue `dropdown.ts` (~230 lines). Returns the same shape:+```ts+{+ context: { showDropdown, x, y, currentNode, … },+ options: ContextMenuOption[], // computed from currentNode + view + multiSelectMode + worksheetFilter+ worksheetEntity, // for the share popover+ handleSharePanelShow,+ handleMenuShow, // imperative open at coordinates+ handleClickOutside, // close handler+}+```++Key differences from Vue:+- Vue uses `naive-ui`'s `NDropdown` with manual `x`/`y` positioning. React equivalent is `ContextMenu` from Phase 1, which Base UI handles positioning internally on right-click. Adjust the API: drop `x`/`y` and the `handleMenuShow(e: MouseEvent, node)` becomes the trigger element's `onContextMenu`.+- All naive-ui imports replaced with React equivalents.+- Vue refs become React `useState`.+- `t()` from `@/plugins/i18n` becomes `useTranslation` from `react-i18next`.++### 4.3 `TreeNodeSuffix.tsx`++React port of Vue `TreeNodeSuffix.vue` (147 lines). Renders the right-side controls of a tree row:+- Star/unstar button (heart icon, debounced toggle via `worksheetV1Store.upsertWorksheetOrganizer`)+- Visibility badge (private / project-read / project-write)+- "More" button that triggers the context menu++Props:+```ts+{+ readonly node: WorksheetFolderNode;+ readonly view: SheetViewMode;+ readonly onSharePanelShow: (...) => void;+ readonly onContextMenuShow: (e: MouseEvent, node) => void;+ readonly onToggleStar: ({ worksheet, starred }) => void;+}+```++i18n keys verified in all 5 React locales; add missing keys with byte-exact Vue values.++## 5. Phase 3 — `SheetTree.tsx`++### 5.1 Props++```ts+{+ readonly view: SheetViewMode;+ readonly multiSelectMode?: boolean;+ readonly checkedNodes?: WorksheetFolderNode[];+ readonly onMultiSelectModeChange: (next: boolean) => void;+ readonly onCheckedNodesChange: (nodes: WorksheetFolderNode[]) => void;+}+```++### 5.2 Feature parity audit (the 11 features)++1. **Tree display** — `Tree<WorksheetFolderNode>` from Phase 1 of Stage 11. Data via `useSheetContextByView(view).sheetTree` from the Pinia store.+2. **Click worksheet → open** — row `onClick`. cmd/ctrl-click → `forceNewTab=true`. Calls `openWorksheetByName({ worksheet, forceNewTab })` from `Sheet/context.ts`.+3. **Click folder → expand/collapse** — chevron toggle (matches FolderForm pattern).+4. **Multi-select mode (checkbox column)** — when `multiSelectMode`, `renderNode` shows a checkbox before the prefix icon. Checkbox state derived from `checkedNodes`. Toggling fires `onCheckedNodesChange`.+5. **Drag-and-drop** — react-arborist's built-in `onMove` callback. Handler ports `handleDrop` from Vue: validates target, calls `batchUpdateWorksheetFolders` for moved worksheets and `folderContext.moveFolder` for moved folders. Disabled when `view === 'draft'`, when editing a node, or when in multi-select mode (matches `:draggable` Vue binding).+6. **In-place rename** — when `editingNode === node`, `renderNode` swaps the label `<span>` for an `<Input>` with `autofocus`, `onBlur` + Enter handlers calling `handleRenameNode` (ports the Vue logic line-for-line, including the folder-name "/", "." restriction). Auto-focus via `useEffect` + `inputRef.focus()`.+7. **Context menu (right-click)** — wrap each row in `ContextMenu` from Phase 1. `ContextMenuContent` items computed from `useDropdown(view, worksheetFilter)` (Phase 2). Menu items: Open, Open in new tab, Copy link, Star/Unstar, Share, Rename, Delete.+8. **Star/unstar** — handled by `TreeNodeSuffix` from Phase 2.+9. **Delete (with confirm)** — `handleDeleteFolders` (ports the Vue logic) opens a shadcn `AlertDialog` instead of naive-ui `useDialog`. Same content: warning, list of affected folders/worksheets, Cancel + Delete buttons. On confirm: deletes worksheets via `worksheetV1Store.deleteWorksheetByName` and folders via `folderContext.removeFolder`, closes affected tabs.+10. **Highlighted matching label** — port the existing React `HighlightLabelText` if it exists; else inline a small helper (we have one in `ClassificationTree.tsx` from the recent refactor — but since that's not exported, port the same approach).+11. **Loading spinner** — port `BBSpin` use during fetch. Use the existing React `Spinner` if it exists; else use `Loader2` from `lucide-react` with `animate-spin`.++### 5.3 Tests++`SheetTree.test.tsx` — 6 scenarios:+- Renders tree from store data+- Click worksheet → fires `openWorksheetByName`+- Click folder → toggles expand+- Multi-select mode renders checkboxes; toggle fires `onCheckedNodesChange`+- Right-click → opens context menu (mock the menu primitive)+- Delete confirm → fires `worksheetV1Store.deleteWorksheetByName`++Mock the Tree primitive, ContextMenu primitive, AlertDialog, and Pinia stores following existing test patterns.++## 6. Phase 4 — `WorksheetPane.tsx`++### 6.1 Layout++Ports `WorksheetPane.vue` (262 lines):+- View tabs at top (My / Shared / Draft) — uses Tabs primitive (already in shadcn lib at `tabs.tsx` if present; otherwise build a thin wrapper)+- Search input below tabs+- Filter menu (FunnelIcon dropdown) — uses `DropdownMenu` from `dropdown-menu.tsx` (existing primitive)+- Multi-select mode toolbar (FolderInputIcon "move", TrashIcon "delete", XIcon "exit") visible when `multiSelectMode === true`+- `<SheetTree>` (from Phase 3) below++### 6.2 State++- `view: SheetViewMode` — local React state, defaults to `useSheetContext().view.value` if persisted+- `multiSelectMode: boolean` — local+- `checkedNodes: WorksheetFolderNode[]` — local+- Move-to-folder modal (uses existing React `FolderForm` via direct import + shadcn `Dialog`)+- Filter (search keyword, only-starred, etc.) — read from Pinia store via `useVueState`++### 6.3 Move modal++The existing flow: WorksheetPane.vue has a BBModal containing `<ReactPageMount page="FolderForm" :folder :onFolderChange />`. In React, this becomes a shadcn `Dialog` containing `<FolderForm folder onFolderChange />` (direct import, no ReactPageMount needed since both are React).++Same submit behavior: `batchUpdateWorksheetFolders` from Pinia store.++### 6.4 i18n++Verify all keys exist in React locales. Likely: `sql-editor.sheet.view.my`, `sql-editor.sheet.view.shared`, `sql-editor.sheet.view.draft`, `sql-editor.sheet.move-to-folder`, `sql-editor.sheet.delete-selected`, etc.++### 6.5 Tests++`WorksheetPane.test.tsx` — 5 scenarios:+- Renders all three view tabs+- Switching view updates `<SheetTree>` view prop+- Filter menu toggle fires search+- Multi-select toolbar appears when checked nodes exist+- Move modal opens + submits++## 7. Phase 5 — Caller swap & cleanup++### 7.1 `AsidePanel.vue` swap++Replace:+```vue+<WorksheetPane v-if="asidePanelTab === 'WORKSHEET'" />+```++With:+```vue+<ReactPageMount v-if="asidePanelTab === 'WORKSHEET'" page="WorksheetPane" />+```++Drop the `import WorksheetPane from "./WorksheetPane";` line. Add `ReactPageMount` import if not present.++### 7.2 Delete++After verifying zero remaining references:+- `frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue`+- `frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue`+- `frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeSuffix.vue`+- `frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts`+- `frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/common.ts`+- `frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/index.ts`+- `frontend/src/views/sql-editor/AsidePanel/WorksheetPane/index.ts`+- `frontend/src/views/sql-editor/AsidePanel/WorksheetPane/FilterMenuItem.vue` (only if unused elsewhere — verify via grep)++After deletion the directory `frontend/src/views/sql-editor/AsidePanel/WorksheetPane/` should be empty. Remove it.++### 7.3 Verify++- `rg "WorksheetPane\.vue|SheetTree\.vue|TreeNodeSuffix\.vue"` → zero results+- `rg "from.*SheetList"` → zero results+- `pnpm fix && type-check && test --run && check` all green++## 8. Per-phase checklist++### Phase 1+- [ ] `context-menu.tsx` + 4 tests+- [ ] `fix && type-check && test --run` green++### Phase 2+- [ ] `filterNode.ts` + (unit test if non-trivial)+- [ ] `useDropdown.ts` (no separate test — covered by SheetTree)+- [ ] `TreeNodeSuffix.tsx` + 3 tests (renders icons by view, star toggle fires callback, share button fires)+- [ ] i18n keys verified+- [ ] `fix && type-check && test --run` green++### Phase 3+- [ ] `SheetTree.tsx` + 6 tests+- [ ] All 11 features parity-verified+- [ ] `fix && type-check && test --run` green++### Phase 4+- [ ] `WorksheetPane.tsx` + 5 tests+- [ ] `FilterMenuItem.tsx` (small)+- [ ] Move modal works with React `FolderForm`+- [ ] `fix && type-check && test --run` green++### Phase 5+- [ ] `AsidePanel.vue` swapped to `ReactPageMount`+- [ ] All Vue files deleted+- [ ] Empty directory removed+- [ ] `rg` confirms zero references+- [ ] `fix && type-check && test --run && check` green++## 9. Manual UX verification (after all phases)++1. SQL Editor open → click "Worksheets" tab in aside panel → tree of folders + worksheets renders+2. Switch view (My / Shared / Draft) → tree refetches and re-renders+3. Type in search → tree filters with highlighted matches+4. Click worksheet → opens in editor; cmd-click → opens in new tab+5. Click folder chevron → expands / collapses+6. Right-click row → context menu opens; click items work+7. Hover → star button appears; click → toggles starred state+8. Drag worksheet onto folder → moves it; refresh confirms+9. Filter menu → toggle "only starred" works+10. Toggle multi-select → checkboxes appear; check multiple → toolbar shows count+11. Toolbar "Move to folder" → modal opens with React `FolderForm`; pick folder → submit moves all checked+12. Toolbar "Delete" → AlertDialog confirms → deletes selected+13. Click row label twice (or via context menu Rename) → in-place input; Enter saves new name+14. Loading spinner appears briefly on tab switch / project switch++## 10. Out of scope (deferred)++- AsidePanel.vue React migration — this stage only swaps one mount inside it.+- SchemaPane / ConnectionPane / other AsidePanel tabs.+- AI plugin context bridge (deferred from earlier discussions).+- Refactor of `useSQLEditorWorksheetStore` (already shaped the way React needs it).+- New features in the worksheet pane.diff --git a/frontend/src/react/components/sql-editor/FilterMenuItem.tsx b/frontend/src/react/components/sql-editor/FilterMenuItem.tsxnew file mode 100644index 0000000000..a2bfe5b46a--- /dev/null+++ b/frontend/src/react/components/sql-editor/FilterMenuItem.tsx@@ -0,0 +1,16 @@+import { Switch } from "@/react/components/ui/switch";++type Props = {+ readonly label: string;+ readonly value: boolean;+ readonly onValueChange: (value: boolean) => void;+};++export function FilterMenuItem({ label, value, onValueChange }: Props) {+ return (+ <div className="flex flex-row items-center justify-between gap-x-4 px-3 py-2 text-sm">+ <span>{label}</span>+ <Switch size="sm" checked={value} onCheckedChange={onValueChange} />+ </div>+ );+}diff --git a/frontend/src/react/components/sql-editor/SheetTree.test.tsx b/frontend/src/react/components/sql-editor/SheetTree.test.tsxnew file mode 100644index 0000000000..fb1f1f2fd6--- /dev/null+++ b/frontend/src/react/components/sql-editor/SheetTree.test.tsx@@ -0,0 +1,748 @@+import type { ReactElement } from "react";+import { act } from "react";+import { createRoot } from "react-dom/client";+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";+import type { WorksheetFolderNode } from "@/views/sql-editor/Sheet";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++// Stub ResizeObserver — not provided by jsdom+globalThis.ResizeObserver = class ResizeObserver {+ observe() {}+ unobserve() {}+ disconnect() {}+};++// ---- hoisted mocks ----------------------------------------------------------++const mocks = vi.hoisted(() => ({+ useTranslation: vi.fn(() => ({ t: (key: string) => key })),+ useVueState: vi.fn<(getter: () => unknown) => unknown>(),+ useWorkSheetStore: vi.fn(),+ useSQLEditorTabStore: vi.fn(),+ useSQLEditorStore: vi.fn(),+ useSQLEditorWorksheetStore: vi.fn(),+ useSheetContext: vi.fn(),+ useSheetContextByView: vi.fn(),+ useDropdown: vi.fn(),+ openWorksheetByName: vi.fn(),+ pushNotification: vi.fn(),+}));++vi.mock("react-i18next", () => ({+ useTranslation: mocks.useTranslation,+}));++vi.mock("@/react/hooks/useVueState", () => ({+ useVueState: mocks.useVueState,+}));++vi.mock("@/store", () => ({+ useWorkSheetStore: mocks.useWorkSheetStore,+ useSQLEditorTabStore: mocks.useSQLEditorTabStore,+ useSQLEditorStore: mocks.useSQLEditorStore,+ useSQLEditorWorksheetStore: mocks.useSQLEditorWorksheetStore,+ pushNotification: mocks.pushNotification,+}));++vi.mock("@/views/sql-editor/Sheet", () => ({+ useSheetContext: mocks.useSheetContext,+ useSheetContextByView: mocks.useSheetContextByView,+ openWorksheetByName: mocks.openWorksheetByName,+ revealNodes: (+ node: WorksheetFolderNode,+ cb: (n: WorksheetFolderNode) => unknown+ ) => {+ const results: unknown[] = [];+ const walk = (n: WorksheetFolderNode) => {+ const r = cb(n);+ if (r !== undefined) results.push(r);+ for (const c of n.children) walk(c);+ };+ walk(node);+ return results;+ },+ revealWorksheets: (+ node: WorksheetFolderNode,+ cb: (n: WorksheetFolderNode) => unknown+ ) => {+ const results: unknown[] = [];+ const walk = (n: WorksheetFolderNode) => {+ if (n.worksheet) {+ const r = cb(n);+ if (r !== undefined) results.push(r);+ }+ for (const c of n.children) walk(c);+ };+ walk(node);+ return results;+ },+}));++vi.mock("./useDropdown", () => ({+ useDropdown: mocks.useDropdown,+}));++vi.mock("./filterNode", () => ({+ filterNode: () => () => true,+}));++// Mock Tree primitive — renders all nodes (recursively) via renderNode+type MockTreeItem = {+ id: string;+ data: WorksheetFolderNode;+ children?: MockTreeItem[];+};+type MockRenderArgs = {+ node: {+ id: string;+ data: MockTreeItem;+ isSelected: boolean;+ isOpen?: boolean;+ };+ style: React.CSSProperties;+};++vi.mock("@/react/components/ui/tree", () => ({+ Tree: ({+ data,+ renderNode,+ }: {+ data: MockTreeItem[];+ renderNode: (args: MockRenderArgs) => React.ReactNode;+ }) => {+ const renderAll = (items: MockTreeItem[]): React.ReactNode[] =>+ items.flatMap((item) => [+ renderNode({+ node: { id: item.id, data: item, isSelected: false, isOpen: false },+ style: {},+ }),+ ...(item.children ? renderAll(item.children) : []),+ ]);+ return <div data-testid="tree">{renderAll(data)}</div>;+ },+}));++vi.mock("@/react/components/ui/dropdown-menu", () => ({+ DropdownMenu: ({+ children,+ open,+ }: {+ children: React.ReactNode;+ open?: boolean;+ onOpenChange?: (open: boolean) => void;+ }) => (+ <div data-testid="dropdown-menu" data-open={String(open ?? false)}>+ {children}+ </div>+ ),+ DropdownMenuTrigger: ({ render }: { render?: React.ReactElement }) => (+ <div data-testid="dropdown-menu-trigger">{render}</div>+ ),+ DropdownMenuContent: ({ children }: { children: React.ReactNode }) => (+ <div data-testid="dropdown-menu-content">{children}</div>+ ),+ DropdownMenuItem: ({+ children,+ onClick,+ }: {+ children: React.ReactNode;+ onClick?: () => void;+ }) => (+ <div data-testid="dropdown-menu-item" onClick={onClick}>+ {children}+ </div>+ ),+ DropdownMenuSeparator: () => <hr data-testid="dropdown-menu-separator" />,+}));++// Mock AlertDialog — renders children when open+vi.mock("@/react/components/ui/alert-dialog", () => ({+ AlertDialog: ({+ children,+ open,+ }: {+ children: React.ReactNode;+ open?: boolean;+ }) => (+ <div data-testid="alert-dialog" data-open={String(open ?? false)}>+ {open ? children : null}+ </div>+ ),+ AlertDialogContent: ({ children }: { children: React.ReactNode }) => (+ <div data-testid="alert-dialog-content">{children}</div>+ ),+ AlertDialogTitle: ({ children }: { children: React.ReactNode }) => (+ <h2 data-testid="alert-dialog-title">{children}</h2>+ ),+ AlertDialogDescription: ({ children }: { children?: React.ReactNode }) => (+ <p data-testid="alert-dialog-description">{children ?? null}</p>+ ),+ AlertDialogFooter: ({ children }: { children: React.ReactNode }) => (+ <div data-testid="alert-dialog-footer">{children}</div>+ ),+}));++// Mock Button+vi.mock("@/react/components/ui/button", () => ({+ Button: ({+ children,+ onClick,+ }: {+ children: React.ReactNode;+ onClick?: () => void;+ }) => (+ <button data-testid="button" onClick={onClick}>+ {children}+ </button>+ ),+}));++// Mock Input+vi.mock("@/react/components/ui/input", () => ({+ Input: ({+ value,+ onChange,+ onBlur,+ onKeyDown,+ id,+ }: {+ value?: string;+ onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;+ onBlur?: () => void;+ onKeyDown?: (e: React.KeyboardEvent<HTMLInputElement>) => void;+ id?: string;+ }) => (+ <input+ data-testid="rename-input"+ id={id}+ value={value ?? ""}+ onChange={onChange}+ onBlur={onBlur}+ onKeyDown={onKeyDown}+ readOnly={!onChange}+ />+ ),+}));++// Mock HighlightLabelText+vi.mock("@/react/components/HighlightLabelText", () => ({+ HighlightLabelText: ({+ text,+ className,+ }: {+ text: string;+ className?: string;+ }) => (+ <span data-testid="highlight-label" className={className}>+ {text}+ </span>+ ),+}));++// Mock TreeNodePrefix+vi.mock("./TreeNodePrefix", () => ({+ TreeNodePrefix: () => <span data-testid="tree-node-prefix" />,+}));++// Mock SharePopoverBody — its router/store imports pull in native deps that+// jsdom can't load; the share popover behavior is covered by its own suite.+vi.mock("./SharePopoverBody", () => ({+ SharePopoverBody: () => <div data-testid="share-popover-body" />,+}));++// Mock Popover primitives to avoid Base UI Popover portal internals.+vi.mock("@/react/components/ui/popover", () => ({+ Popover: ({+ children,+ open,+ }: {+ children: React.ReactNode;+ open?: boolean;+ onOpenChange?: (open: boolean) => void;+ }) => (+ <div data-testid="popover" data-open={String(open ?? false)}>+ {children}+ </div>+ ),+ PopoverTrigger: () => <div data-testid="popover-trigger" />,+ PopoverContent: ({ children }: { children: React.ReactNode }) => (+ <div data-testid="popover-content">{children}</div>+ ),+}));++// Mock TreeNodeSuffix+vi.mock("./TreeNodeSuffix", () => ({+ TreeNodeSuffix: ({+ onToggleStar,+ node,+ }: {+ node: WorksheetFolderNode;+ view: string;+ onToggleStar?: (args: { worksheet: string; starred: boolean }) => void;+ onSharePanelShow?: (e: React.MouseEvent, node: WorksheetFolderNode) => void;+ onContextMenuShow?: (+ e: React.MouseEvent,+ node: WorksheetFolderNode+ ) => void;+ }) => (+ <div+ data-testid="tree-node-suffix"+ onClick={() => {+ if (node.worksheet) {+ onToggleStar?.({ worksheet: node.worksheet.name, starred: true });+ }+ }}+ />+ ),+}));++// ---- helpers ----------------------------------------------------------------++const makeFolderNode = (+ key: string,+ children: WorksheetFolderNode[] = [],+ editable = false+): WorksheetFolderNode => ({+ key,+ label: key.split("/").slice(-1)[0],+ editable,+ children,+ empty: children.length === 0,+});++const makeWorksheetNode = (+ key: string,+ name = "worksheets/ws1"+): WorksheetFolderNode => ({+ key,+ label: key.split("/").slice(-1)[0],+ editable: false,+ children: [],+ empty: true,+ worksheet: {+ name,+ title: "My Query",+ folders: [],+ type: "worksheet",+ },+});++const makeExpandedKeysRef = (keys: string[] = []) => ({+ value: new Set(keys),+});+const makeSelectedKeysRef = (keys: string[] = []) => ({+ value: new Set(keys),+});+const makeEditingNodeRef = () => ({ value: undefined as unknown });++const setupDefaultMocks = () => {+ mocks.useTranslation.mockReturnValue({ t: (key: string) => key });++ const rootNode = makeFolderNode("/my", [+ makeFolderNode("/my/folder1", [makeWorksheetNode("/my/folder1/ws1")]),+ makeWorksheetNode("/my/ws2"),+ ]);++ const expandedKeys = makeExpandedKeysRef(["/my"]);+ const selectedKeys = makeSelectedKeysRef();+ const editingNode = makeEditingNodeRef();++ mocks.useVueState.mockImplementation((getter: () => unknown) => getter());++ const folderContext = {+ rootPath: { value: "/my" },+ isSubFolder: vi.fn(() => false),+ moveFolder: vi.fn(),+ removeFolder: vi.fn(),+ addFolder: vi.fn((path: string) => path),+ ensureFolderPath: vi.fn((path: string) => path),+ };++ const sheetContext = {+ filter: { value: { keyword: "", onlyShowStarred: false } },+ selectedKeys: selectedKeys,+ expandedKeys: expandedKeys,+ editingNode: editingNode,+ batchUpdateWorksheetFolders: vi.fn(),+ };++ const viewContext = {+ isInitialized: { value: true },+ isLoading: { value: false },+ sheetTree: { value: rootNode },+ fetchSheetList: vi.fn(),+ folderContext,+ getFoldersForWorksheet: vi.fn((path: string) => [path]),+ events: {+ on: vi.fn(() => () => {}),+ emit: vi.fn(),+ },+ };++ mocks.useSheetContext.mockReturnValue(sheetContext);+ mocks.useSheetContextByView.mockReturnValue(viewContext);+ mocks.useSQLEditorStore.mockReturnValue({+ project: "projects/proj1",+ });+ mocks.useWorkSheetStore.mockReturnValue({+ getWorksheetByName: vi.fn((name: string) => ({+ name,+ title: "My Query",+ folders: [],+ database: "",+ starred: false,+ creator: "users/[email protected]",+ })),+ deleteWorksheetByName: vi.fn().mockResolvedValue(undefined),+ patchWorksheet: vi.fn().mockResolvedValue({}),+ upsertWorksheetOrganizer: vi.fn().mockResolvedValue(undefined),+ });+ mocks.useSQLEditorTabStore.mockReturnValue({+ getTabByWorksheet: vi.fn(() => null),+ closeTab: vi.fn(),+ updateTab: vi.fn(),+ setCurrentTabId: vi.fn(),+ });+ mocks.useSQLEditorWorksheetStore.mockReturnValue({+ createWorksheet: vi.fn().mockResolvedValue({}),+ });+ mocks.useDropdown.mockReturnValue({+ currentNode: undefined,+ options: [],+ worksheetEntity: undefined,+ showSharePanel: false,+ handleContextMenu: vi.fn(),+ handleSharePanelShow: vi.fn(),+ handleClickOutside: vi.fn(),+ });+ mocks.openWorksheetByName.mockResolvedValue(undefined);++ return {+ rootNode,+ expandedKeys,+ selectedKeys,+ editingNode,+ folderContext,+ sheetContext,+ viewContext,+ };+};++const renderIntoContainer = (element: ReactElement) => {+ const container = document.createElement("div");+ const root = createRoot(container);+ document.body.appendChild(container);+ return {+ container,+ render: () => {+ act(() => {+ root.render(element);+ });+ },+ update: (next: ReactElement) => {+ act(() => {+ root.render(next);+ });+ },+ unmount: () => {+ act(() => {+ root.unmount();+ });+ container.remove();+ },+ };+};++let SheetTree: typeof import("./SheetTree").SheetTree;++beforeEach(async () => {+ vi.clearAllMocks();+ setupDefaultMocks();+ ({ SheetTree } = await import("./SheetTree"));+});++afterEach(() => {+ document.body.innerHTML = "";+ vi.resetModules();+});++// ---- tests ------------------------------------------------------------------++describe("SheetTree", () => {+ test("1. Renders tree from store data", () => {+ const { container, render, unmount } = renderIntoContainer(+ <SheetTree+ view="my"+ onMultiSelectModeChange={vi.fn()}+ onCheckedNodesChange={vi.fn()}+ />+ );+ render();++ // Tree primitive is rendered+ const tree = document.body.querySelector("[data-testid='tree']");+ expect(tree).not.toBeNull();++ // HighlightLabelText nodes are rendered (root node + children)+ const labels = container.querySelectorAll(+ "[data-testid='highlight-label']"+ );+ expect(labels.length).toBeGreaterThan(0);++ unmount();+ });++ test("2. Click worksheet → fires openWorksheetByName", () => {+ const defaultMocks = setupDefaultMocks();+ // Root node is a folder with a worksheet child+ const wsNode = makeWorksheetNode("/my/ws2");+ const rootNode = makeFolderNode("/my", [wsNode]);+ defaultMocks.viewContext.sheetTree.value = rootNode;++ // Make useDropdown return the worksheet node as current+ mocks.useDropdown.mockReturnValue({+ currentNode: undefined,+ options: [],+ worksheetEntity: undefined,+ showSharePanel: false,+ handleContextMenu: vi.fn(),+ handleSharePanelShow: vi.fn(),+ handleClickOutside: vi.fn(),+ });++ const { container, render, unmount } = renderIntoContainer(+ <SheetTree+ view="my"+ onMultiSelectModeChange={vi.fn()}+ onCheckedNodesChange={vi.fn()}+ />+ );+ render();++ // Find tree row for the worksheet node — it has data-item-key+ const row = container.querySelector(+ `[data-item-key="/my/ws2"]`+ ) as HTMLElement | null;+ expect(row).not.toBeNull();++ // Click on the label area+ const label = row?.querySelector("[data-testid='highlight-label']");+ act(() => {+ label?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ expect(mocks.openWorksheetByName).toHaveBeenCalledWith(+ expect.objectContaining({+ worksheet: "worksheets/ws1",+ forceNewTab: false,+ })+ );++ unmount();+ });++ test("3. Click folder → toggles expand in Pinia store", () => {+ const defaultMocks = setupDefaultMocks();+ const folder = makeFolderNode("/my/folder1", []);+ const rootNode = makeFolderNode("/my", [folder]);+ defaultMocks.viewContext.sheetTree.value = rootNode;+ // expandedKeys starts without /my/folder1+ defaultMocks.expandedKeys.value = new Set(["/my"]);++ const { container, render, unmount } = renderIntoContainer(+ <SheetTree+ view="my"+ onMultiSelectModeChange={vi.fn()}+ onCheckedNodesChange={vi.fn()}+ />+ );+ render();++ const row = container.querySelector(+ `[data-item-key="/my/folder1"]`+ ) as HTMLElement | null;+ expect(row).not.toBeNull();++ const prefix = row?.querySelector("[data-testid='tree-node-prefix']");+ act(() => {+ prefix?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ // expandedKeys should now contain /my/folder1+ expect(defaultMocks.expandedKeys.value.has("/my/folder1")).toBe(true);++ unmount();+ });++ test("4. Multi-select mode renders checkboxes; toggle fires onCheckedNodesChange", () => {+ const defaultMocks = setupDefaultMocks();+ const wsNode = makeWorksheetNode("/my/ws2");+ const rootNode = makeFolderNode("/my", [wsNode]);+ defaultMocks.viewContext.sheetTree.value = rootNode;++ const onCheckedNodesChange = vi.fn();++ const { container, render, unmount } = renderIntoContainer(+ <SheetTree+ view="my"+ multiSelectMode={true}+ checkedNodes={[]}+ onMultiSelectModeChange={vi.fn()}+ onCheckedNodesChange={onCheckedNodesChange}+ />+ );+ render();++ // Checkboxes should be present+ const checkboxes = container.querySelectorAll("input[type='checkbox']");+ expect(checkboxes.length).toBeGreaterThan(0);++ // The important assertion is that checkboxes are rendered when in+ // multi-select mode.+ expect(checkboxes.length).toBeGreaterThan(0);++ // Trigger the onChange handler via React's nativeEvent mechanism.+ // React uses the nativeInputValueSetter for value-based inputs but for+ // checkboxes, `click()` fires a click + change sequence.+ act(() => {+ const cb = checkboxes[0] as HTMLInputElement;+ // Use React's reconciler-aware click dispatch+ cb.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ // onCheckedNodesChange should have been called by the checkbox onChange+ expect(onCheckedNodesChange).toHaveBeenCalled();++ unmount();+ });++ test("5. Right-click → opens context menu with items", () => {+ const defaultMocks = setupDefaultMocks();+ const wsNode = makeWorksheetNode("/my/ws2");+ const rootNode = makeFolderNode("/my", [wsNode]);+ defaultMocks.viewContext.sheetTree.value = rootNode;++ const handleContextMenu = vi.fn();+ mocks.useDropdown.mockReturnValue({+ currentNode: wsNode,+ options: [+ { type: "item", key: "rename", label: "Rename" },+ { type: "item", key: "delete", label: "Delete" },+ ],+ worksheetEntity: undefined,+ showSharePanel: false,+ handleContextMenu,+ handleSharePanelShow: vi.fn(),+ handleClickOutside: vi.fn(),+ });++ const { container, render, unmount } = renderIntoContainer(+ <SheetTree+ view="my"+ onMultiSelectModeChange={vi.fn()}+ onCheckedNodesChange={vi.fn()}+ />+ );+ render();++ // One DropdownMenu lives at the SheetTree root with items derived from+ // useDropdown's options. Verify both items render.+ const menuItems = container.querySelectorAll(+ "[data-testid='dropdown-menu-item']"+ );+ expect(menuItems.length).toBe(2);+ expect(menuItems[0].textContent).toBe("Rename");+ expect(menuItems[1].textContent).toBe("Delete");++ // Right-click on a row fires handleContextMenu (via openMenuAtPoint).+ const row = container.querySelector(+ `[data-item-key="/my/ws2"]`+ ) as HTMLElement | null;+ expect(row).not.toBeNull();+ act(() => {+ row?.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true }));+ });++ expect(handleContextMenu).toHaveBeenCalled();++ unmount();+ });++ test("6. Delete confirm → fires worksheetV1Store.deleteWorksheetByName", async () => {+ const defaultMocks = setupDefaultMocks();+ const wsNode = makeWorksheetNode("/my/ws2", "worksheets/ws2");+ const rootNode = makeFolderNode("/my", [wsNode]);+ defaultMocks.viewContext.sheetTree.value = rootNode;++ const deleteWorksheetByName = vi.fn().mockResolvedValue(undefined);+ mocks.useWorkSheetStore.mockReturnValue({+ getWorksheetByName: vi.fn((name: string) => ({+ name,+ title: "My Query",+ folders: [],+ database: "",+ starred: false,+ creator: "users/[email protected]",+ })),+ deleteWorksheetByName,+ patchWorksheet: vi.fn().mockResolvedValue({}),+ upsertWorksheetOrganizer: vi.fn().mockResolvedValue(undefined),+ });++ mocks.useDropdown.mockReturnValue({+ currentNode: wsNode,+ options: [{ type: "item", key: "delete", label: "Delete" }],+ worksheetEntity: { name: "worksheets/ws2" },+ showSharePanel: false,+ handleContextMenu: vi.fn(),+ handleSharePanelShow: vi.fn(),+ handleClickOutside: vi.fn(),+ });++ const { container, render, unmount } = renderIntoContainer(+ <SheetTree+ view="my"+ onMultiSelectModeChange={vi.fn()}+ onCheckedNodesChange={vi.fn()}+ />+ );+ render();++ // Find and click the "Delete" menu item → opens the delete-sheet dialog+ const deleteItem = Array.from(+ container.querySelectorAll("[data-testid='dropdown-menu-item']")+ ).find((el) => el.textContent === "Delete") as HTMLElement | undefined;+ expect(deleteItem).not.toBeUndefined();++ await act(async () => {+ deleteItem?.click();+ });++ // The AlertDialog for delete-sheet should now be open+ const dialogs = document.body.querySelectorAll(+ '[data-testid="alert-dialog"][data-open="true"]'+ );+ expect(dialogs.length).toBeGreaterThan(0);++ // Click the "confirm delete" button+ const buttons = document.body.querySelectorAll(+ "[data-testid='alert-dialog-content'] [data-testid='button']"+ );+ const deleteButton = Array.from(buttons).slice(-1)[0] as+ | HTMLElement+ | undefined;+ expect(deleteButton).not.toBeUndefined();++ await act(async () => {+ deleteButton?.click();+ await new Promise((r) => setTimeout(r, 10));+ });++ expect(deleteWorksheetByName).toHaveBeenCalledWith("worksheets/ws2");++ unmount();+ });+});diff --git a/frontend/src/react/components/sql-editor/SheetTree.tsx b/frontend/src/react/components/sql-editor/SheetTree.tsxnew file mode 100644index 0000000000..2d8988c667--- /dev/null+++ b/frontend/src/react/components/sql-editor/SheetTree.tsx@@ -0,0 +1,1403 @@+/**+ * SheetTree — React port of SheetTree.vue (Stage 12, Phase 3)+ *+ * Full feature parity with the Vue source (850 lines):+ * 1. Tree display+ * 2. Click worksheet → open in editor+ * 3. Click folder → expand/collapse+ * 4. Multi-select mode (checkbox column)+ * 5. Drag-and-drop (wired via react-arborist onMove)+ * 6. In-place rename+ * 7. Context menu (right-click)+ * 8. Star/unstar (via TreeNodeSuffix)+ * 9. Delete with confirm (AlertDialog)+ * 10. Highlighted matching label (HighlightLabelText)+ * 11. Loading spinner (Loader2)+ */++import { Loader2 } from "lucide-react";+import type { Ref } from "react";+import {+ useCallback,+ useEffect,+ useImperativeHandle,+ useMemo,+ useRef,+ useState,+} from "react";+import type { MoveHandler, NodeApi } from "react-arborist";+import { flushSync } from "react-dom";+import { useTranslation } from "react-i18next";+import { HighlightLabelText } from "@/react/components/HighlightLabelText";+import {+ AlertDialog,+ AlertDialogContent,+ AlertDialogDescription,+ AlertDialogFooter,+ AlertDialogTitle,+} from "@/react/components/ui/alert-dialog";+import { Button } from "@/react/components/ui/button";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuSeparator,+ DropdownMenuTrigger,+} from "@/react/components/ui/dropdown-menu";+import { Input } from "@/react/components/ui/input";+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from "@/react/components/ui/popover";+import type { TreeDataNode } from "@/react/components/ui/tree";+import { Tree } from "@/react/components/ui/tree";+import { useVueState } from "@/react/hooks/useVueState";+import { cn } from "@/react/lib/utils";+import {+ pushNotification,+ useSQLEditorStore,+ useSQLEditorTabStore,+ useSQLEditorWorksheetStore,+ useWorkSheetStore,+} from "@/store";+import {+ openWorksheetByName,+ revealNodes,+ revealWorksheets,+ type SheetViewMode,+ useSheetContext,+ useSheetContextByView,+ type WorksheetFolderNode,+} from "@/views/sql-editor/Sheet";+import { filterNode } from "./filterNode";+import { SharePopoverBody } from "./SharePopoverBody";+import { TreeNodePrefix } from "./TreeNodePrefix";+import { TreeNodeSuffix } from "./TreeNodeSuffix";+import { type DropdownOptionType, useDropdown } from "./useDropdown";++// ---------------------------------------------------------------------------+// Types+// ---------------------------------------------------------------------------++export type SheetTreeHandle = {+ handleMultiDelete: (nodes: WorksheetFolderNode[]) => Promise<void>;+};++type Props = {+ readonly view: SheetViewMode;+ readonly multiSelectMode?: boolean;+ readonly checkedNodes?: WorksheetFolderNode[];+ readonly onMultiSelectModeChange: (next: boolean) => void;+ readonly onCheckedNodesChange: (nodes: WorksheetFolderNode[]) => void;+ readonly ref?: Ref<SheetTreeHandle>;+};++// ---------------------------------------------------------------------------+// Dialog types+// ---------------------------------------------------------------------------++type DeleteDialogState =+ | { type: "none" }+ | {+ type: "delete-sheet";+ worksheetName: string;+ }+ | {+ type: "duplicate-sheet";+ worksheetName: string;+ }+ | {+ type: "delete-folders";+ folders: string[];+ worksheets: string[];+ }+ | {+ type: "duplicate-folder-name";+ existingLabel: string;+ resolve: (merge: boolean) => void;+ };++// ---------------------------------------------------------------------------+// Helpers+// ---------------------------------------------------------------------------++/** Build a flat→tree data structure for the Tree primitive. */+function toTreeData(+ node: WorksheetFolderNode+): TreeDataNode<WorksheetFolderNode> {+ return {+ id: node.key,+ data: node,+ children: node.children.map(toTreeData),+ };+}++/**+ * Count rows that react-arborist will render: the node itself, plus all+ * descendants of expanded folders. Matches naive-ui NTree's natural-height+ * behavior so stacked SheetTrees don't reserve react-arborist's 300px default.+ */+function countVisibleRows(+ node: WorksheetFolderNode,+ expandedKeys: Set<string>+): number {+ let count = 1;+ if (expandedKeys.has(node.key)) {+ for (const child of node.children) {+ count += countVisibleRows(child, expandedKeys);+ }+ }+ return count;+}++// Generate unique folder name based on existing children+// Returns "new folder", "new folder2", "new folder3", etc.+function generateNewFolderName(children: WorksheetFolderNode[]): string {+ const baseName = "new folder";+ const regex = /^new folder(\d+)$/;++ let maxNumber = 0;+ for (let i = children.length - 1; i >= 0; i--) {+ const child = children[i];+ if (child.worksheet) {+ continue;+ }+ const match = child.label.match(regex);+ if (match) {+ maxNumber = parseInt(match[1], 10);+ break;+ } else if (child.label === baseName) {+ maxNumber = 1;+ break;+ } else if (child.label < baseName) {+ break;+ }+ }+ return maxNumber === 0 ? baseName : `${baseName}${maxNumber + 1}`;+}++// ---------------------------------------------------------------------------+// Component+// ---------------------------------------------------------------------------++export function SheetTree({+ view,+ multiSelectMode = false,+ checkedNodes = [],+ onMultiSelectModeChange,+ onCheckedNodesChange,+ ref,+}: Props) {+ const { t } = useTranslation();++ // ---- Pinia stores (called at top level, not inside useVueState) ----------+ const worksheetV1Store = useWorkSheetStore();+ const tabStore = useSQLEditorTabStore();+ const editorStore = useSQLEditorStore();+ const editorWorksheetStore = useSQLEditorWorksheetStore();++ // ---- Sheet contexts -------------------------------------------------------+ const sheetContext = useSheetContext();+ const {+ isInitialized,+ isLoading,+ sheetTree: sheetTreeRef,+ fetchSheetList,+ folderContext,+ getFoldersForWorksheet,+ events,+ } = useSheetContextByView(view);++ const {+ filter: worksheetFilterRef,+ selectedKeys: selectedKeysRef,+ expandedKeys: expandedKeysRef,+ editingNode: editingNodeRef,+ batchUpdateWorksheetFolders,+ } = sheetContext;++ // ---- Reactive reads from Vue/Pinia via useVueState -----------------------+ const isLoadingVal = useVueState(() => isLoading.value);+ const isInitializedVal = useVueState(() => isInitialized.value);+ const project = useVueState(() => editorStore.project);+ const sheetTree = useVueState(() => sheetTreeRef.value);+ const worksheetFilter = useVueState(() => worksheetFilterRef.value);+ const selectedKeys = useVueState(() =>+ Array.from(selectedKeysRef.value ?? [])+ );+ const expandedKeysArray = useVueState(() =>+ Array.from(expandedKeysRef.value ?? [])+ );+ const editingNode = useVueState(() => editingNodeRef.value);++ // ---- Dropdown hook -------------------------------------------------------+ const {+ currentNode: contextMenuNode,+ options: dropdownOptions,+ worksheetEntity,+ showSharePanel,+ handleContextMenu,+ handleSharePanelShow,+ handleClickOutside: handleContextMenuClickOutside,+ } = useDropdown(view, worksheetFilter);++ // ---- Menu anchor ----------------------------------------------------------+ // Base UI's popup hover-floating interaction closes the menu on+ // mouseleave UNLESS the open event was a click/mousedown. We therefore+ // open the menu by programmatically `.click()`-ing an invisible 0x0+ // trigger at the target coordinates — Base UI records a real click event+ // and the popup stays open while the cursor moves between rows.+ const [menuAnchorPos, setMenuAnchorPos] = useState({ x: 0, y: 0 });+ const menuTriggerRef = useRef<HTMLButtonElement>(null);++ const openMenuAtPoint = useCallback(+ (clientX: number, clientY: number, node: WorksheetFolderNode) => {+ // flushSync so the trigger is repositioned before the synthetic click+ // fires — otherwise Floating UI anchors against the previous position.+ flushSync(() => {+ setMenuAnchorPos({ x: clientX, y: clientY });+ });+ handleContextMenu(+ {+ preventDefault: () => {},+ stopPropagation: () => {},+ } as React.MouseEvent,+ node+ );+ menuTriggerRef.current?.click();+ },+ [handleContextMenu]+ );++ const openMenuAtElement = useCallback(+ (element: Element, node: WorksheetFolderNode) => {+ const rect = element.getBoundingClientRect();+ flushSync(() => {+ setMenuAnchorPos({ x: rect.right, y: rect.bottom });+ });+ handleContextMenu(+ {+ preventDefault: () => {},+ stopPropagation: () => {},+ } as React.MouseEvent,+ node+ );+ menuTriggerRef.current?.click();+ },+ [handleContextMenu]+ );++ const openSharePanelAtElement = useCallback(+ (e: React.MouseEvent, node: WorksheetFolderNode) => {+ const rect = e.currentTarget.getBoundingClientRect();+ setMenuAnchorPos({ x: rect.right, y: rect.bottom });+ handleSharePanelShow(e, node);+ },+ [handleSharePanelShow]+ );++ // ---- Dialog state --------------------------------------------------------+ const [deleteDialogState, setDeleteDialogState] = useState<DeleteDialogState>(+ { type: "none" }+ );++ // ---- Input ref for in-place rename ---------------------------------------+ const inputRef = useRef<HTMLInputElement>(null);++ // ---- Auto-fetch on mount + project change --------------------------------+ useEffect(() => {+ if (!isInitializedVal && project) {+ void fetchSheetList();+ }+ }, [isInitializedVal, project, fetchSheetList]);++ // When project changes, mark as uninitialized so fetch runs again.+ const prevProjectRef = useRef(project);+ useEffect(() => {+ if (prevProjectRef.current !== project) {+ prevProjectRef.current = project;+ isInitialized.value = false;+ }+ }, [project, isInitialized]);++ // Focus + select-all ONCE when a new node enters editing. `editingNode` is+ // a fresh object on every keystroke (onChange rewrites editingNodeRef.value),+ // so depending on its identity would re-select on every keypress. Key the+ // effect on the node's stable `.key` instead.+ const editingKey = editingNode?.node.key;+ useEffect(() => {+ if (!editingKey) return;+ const input = document.getElementById(+ `sheet-input-${editingKey}`+ ) as HTMLInputElement | null;+ if (input) {+ input.focus();+ input.select();+ }+ }, [editingKey]);++ // If the tree rebuilds while editing (different views, refetch), re-focus+ // the input. Again keyed on the stable `.key`, not the object identity.+ useEffect(() => {+ if (!editingKey) return;+ const unsub = events.on("on-built", ({ viewMode }) => {+ if (viewMode !== view) return;+ const input = document.getElementById(+ `sheet-input-${editingKey}`+ ) as HTMLInputElement | null;+ input?.focus();+ input?.select();+ });+ return () => {+ unsub();+ };+ }, [editingKey, events, view]);++ // ---- Tree data -----------------------------------------------------------+ const treeData = useMemo((): TreeDataNode<WorksheetFolderNode>[] => {+ return [toTreeData(sheetTree)];+ }, [sheetTree]);++ // Row height must match the <Tree rowHeight={...}> prop below.+ const ROW_HEIGHT = 26;++ // Natural-height sizing so stacked SheetTrees don't each reserve the Tree+ // primitive's 300px default viewport.+ const treeHeight = useMemo(+ () => countVisibleRows(sheetTree, new Set(expandedKeysArray)) * ROW_HEIGHT,+ [sheetTree, expandedKeysArray]+ );++ // ---- Expand/collapse toggle -----------------------------------------------+ const handleToggleExpand = useCallback(+ (node: WorksheetFolderNode) => {+ if (expandedKeysRef.value.has(node.key)) {+ expandedKeysRef.value.delete(node.key);+ } else {+ expandedKeysRef.value.add(node.key);+ }+ },+ [expandedKeysRef]+ );++ // ---- Helpers: folder/tree operations ------------------------------------++ const findParentNode = useCallback(+ (+ root: WorksheetFolderNode,+ key: string+ ): WorksheetFolderNode | undefined => {+ if (root.key === key) return undefined;+ for (const child of root.children) {+ if (child.key === key) return root;+ const result = findParentNode(child, key);+ if (result) return result;+ }+ return undefined;+ },+ []+ );++ const replaceExpandedKeys = useCallback(+ ({ oldKey, newKey }: { oldKey: string; newKey?: string }) => {+ const newSet = new Set<string>();+ for (const path of expandedKeysRef.value) {+ if (+ path === oldKey ||+ folderContext.isSubFolder({ parent: oldKey, path, dig: true })+ ) {+ if (newKey) {+ newSet.add(path.replace(oldKey, newKey));+ }+ } else {+ newSet.add(path);+ }+ }+ expandedKeysRef.value = newSet;+ },+ [expandedKeysRef, folderContext]+ );++ const updateWorksheetFolders = useCallback(+ async (+ node: WorksheetFolderNode,+ oldParentKey: string,+ newParentKey: string+ ) => {+ const worksheets = revealWorksheets(node, (n: WorksheetFolderNode) => {+ if (n.worksheet) {+ const newFullPath = n.key.replace(oldParentKey, newParentKey);+ return {+ name: n.worksheet.name,+ folders: getFoldersForWorksheet(newFullPath),+ };+ }+ return undefined;+ });+ await batchUpdateWorksheetFolders(worksheets);+ },+ [batchUpdateWorksheetFolders, getFoldersForWorksheet]+ );++ // ---- Delete helpers -------------------------------------------------------++ const doDeleteWorksheets = useCallback(+ async (worksheets: string[]) => {+ await Promise.all(+ worksheets.map((worksheet) =>+ worksheetV1Store.deleteWorksheetByName(worksheet)+ )+ );+ for (const worksheet of worksheets) {+ const tab = tabStore.getTabByWorksheet(worksheet);+ if (tab) {+ tabStore.closeTab(tab.id);+ }+ }+ },+ [worksheetV1Store, tabStore]+ );++ // ---- handleRenameNode (debounced via ref) ---------------------------------+ // We can't use useDebounceFn from @vueuse/core in React, so we implement+ // a simple debounce with useRef + setTimeout.+ const renameTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);++ const execRenameNode = useCallback(async () => {+ const editing = editingNodeRef.value;+ if (!editing) return;++ const cleanup = () => {+ // Use setTimeout to mimic nextTick+ setTimeout(() => {+ editingNodeRef.value = undefined;+ }, 0);+ };++ const newTitle = editing.node.label.trim();+ if (!newTitle) {+ editing.node.label = editing.rawLabel;+ cleanup();+ return;+ }++ const parts = editing.node.key.split("/");+ const newKey = [...parts.slice(0, -1), newTitle].join("/");+ if (newKey === editing.node.key) {+ cleanup();+ return;+ }++ if (editing.node.worksheet) {+ const worksheet = worksheetV1Store.getWorksheetByName(+ editing.node.worksheet.name+ );+ if (!worksheet) {+ cleanup();+ return;+ }+ await worksheetV1Store.patchWorksheet({ ...worksheet, title: newTitle }, [+ "title",+ ]);+ const tab = tabStore.getTabByWorksheet(worksheet.name);+ if (tab) {+ tabStore.updateTab(tab.id, { title: newTitle });+ }+ cleanup();+ } else {+ // Folder rename — check for duplicate name+ const parentNode = findParentNode(sheetTreeRef.value, editing.node.key);+ const sameNode = parentNode?.children.find(+ (child) => child.key === newKey+ );++ if (sameNode) {+ // Show duplicate folder name dialog+ await new Promise<void>((resolve) => {+ setDeleteDialogState({+ type: "duplicate-folder-name",+ existingLabel: sameNode.label,+ resolve: (merge) => {+ if (merge) {+ void (async () => {+ await updateWorksheetFolders(+ editing.node,+ editing.node.key,+ newKey+ );+ replaceExpandedKeys({ oldKey: editing.node.key, newKey });+ folderContext.moveFolder(editing.node.key, newKey);+ cleanup();+ })();+ } else {+ editing.node.label = editing.rawLabel;+ cleanup();+ }+ setDeleteDialogState({ type: "none" });+ resolve();+ },+ });+ });+ } else {+ await updateWorksheetFolders(editing.node, editing.node.key, newKey);+ replaceExpandedKeys({ oldKey: editing.node.key, newKey });+ folderContext.moveFolder(editing.node.key, newKey);+ cleanup();+ }+ }+ }, [+ editingNodeRef,+ worksheetV1Store,+ tabStore,+ findParentNode,+ sheetTreeRef,+ updateWorksheetFolders,+ replaceExpandedKeys,+ folderContext,+ ]);++ const handleRenameNode = useCallback(() => {+ if (renameTimerRef.current !== null) {+ clearTimeout(renameTimerRef.current);+ }+ renameTimerRef.current = setTimeout(() => {+ void execRenameNode();+ }, 0);+ }, [execRenameNode]);++ // ---- Click handler -------------------------------------------------------+ const handleNodeClick = useCallback(+ (e: React.MouseEvent, node: WorksheetFolderNode) => {+ if (editingNode) return;+ if (node.worksheet) {+ if (node.worksheet.type === "worksheet") {+ void openWorksheetByName({+ worksheet: node.worksheet.name,+ forceNewTab: e.metaKey || e.ctrlKey,+ });+ } else {+ // draft tab+ tabStore.setCurrentTabId(node.worksheet.name);+ }+ } else {+ handleToggleExpand(node);+ }+ },+ [editingNode, tabStore, handleToggleExpand]+ );++ // ---- Duplicate sheet -------------------------------------------------------+ const handleDuplicateSheet = useCallback((worksheetName: string) => {+ setDeleteDialogState({ type: "duplicate-sheet", worksheetName });+ }, []);++ // ---- handleDeleteFolders -------------------------------------------------+ // Returns a promise that resolves true if deletion happened, false if cancelled.+ const handleDeleteFolders = useCallback(+ (folders: string[], worksheets: string[]): Promise<boolean> => {+ return new Promise<boolean>((resolve) => {+ const cleanFolders = () => {+ for (const folder of folders) {+ folderContext.removeFolder(folder);+ }+ };++ if (worksheets.length === 0) {+ cleanFolders();+ resolve(true);+ return;+ }++ // Show dialog — resolved via onConfirm/onCancel callbacks+ setDeleteDialogState({+ type: "delete-folders",+ folders,+ worksheets,+ });++ // The dialog will call resolve via the dialog-specific actions below.+ // We stash resolve in a ref so the dialog buttons can pick it up.+ deleteFoldersResolveRef.current = { resolve, cleanFolders, worksheets };+ });+ },+ [folderContext]+ );++ // Ref to hold the pending promise resolve for delete-folders dialog+ const deleteFoldersResolveRef = useRef<{+ resolve: (v: boolean) => void;+ cleanFolders: () => void;+ worksheets: string[];+ } | null>(null);++ // ---- handleMultiDelete (exposed via ref) ---------------------------------+ const handleMultiDelete = useCallback(+ async (nodes: WorksheetFolderNode[]) => {+ const folders: string[] = [];+ const worksheets: string[] = [];+ for (const node of nodes) {+ if (node.worksheet) {+ worksheets.push(node.worksheet.name);+ continue;+ }+ if (node.key === folderContext.rootPath.value) {+ continue;+ }+ if (+ folders.length > 0 &&+ folderContext.isSubFolder({+ parent: folders[folders.length - 1],+ path: node.key,+ dig: true,+ })+ ) {+ continue;+ }+ folders.push(node.key);+ }+ const removed = await handleDeleteFolders(folders, worksheets);+ if (removed) {+ onMultiSelectModeChange(false);+ }+ },+ [folderContext, handleDeleteFolders, onMultiSelectModeChange]+ );++ // Expose handleMultiDelete via an imperative ref so WorksheetPane can call it+ useImperativeHandle(ref, () => ({ handleMultiDelete }), [handleMultiDelete]);++ // ---- Context menu select handler -----------------------------------------+ const handleContextMenuSelect = useCallback(+ async (key: DropdownOptionType) => {+ if (!contextMenuNode) return;++ switch (key) {+ case "share":+ // Open the share popover anchored at the current menu position.+ handleSharePanelShow(+ {+ preventDefault: () => {},+ stopPropagation: () => {},+ } as React.MouseEvent,+ contextMenuNode+ );+ break;+ case "rename":+ editingNodeRef.value = {+ node: contextMenuNode,+ rawLabel: contextMenuNode.label,+ };+ // Focus happens via useEffect above+ break;+ case "delete":+ if (contextMenuNode.worksheet) {+ setDeleteDialogState({+ type: "delete-sheet",+ worksheetName: contextMenuNode.worksheet.name,+ });+ } else {+ const worksheets = revealWorksheets(+ contextMenuNode,+ (n) => n.worksheet?.name+ );+ void handleDeleteFolders([contextMenuNode.key], worksheets);+ }+ break;+ case "duplicate":+ if (contextMenuNode.worksheet) {+ await handleDuplicateSheet(contextMenuNode.worksheet.name);+ }+ break;+ case "add-folder": {+ expandedKeysRef.value.add(contextMenuNode.key);+ const label = generateNewFolderName(contextMenuNode.children ?? []);+ const newPath = folderContext.addFolder(+ `${contextMenuNode.key}/${label}`+ );+ editingNodeRef.value = {+ node: {+ key: newPath,+ editable: true,+ label,+ children: [],+ },+ rawLabel: label,+ };+ break;+ }+ case "add-worksheet":+ await editorWorksheetStore.createWorksheet({+ folders: getFoldersForWorksheet(contextMenuNode.key),+ });+ break;+ case "multi-select":+ onMultiSelectModeChange(true);+ onCheckedNodesChange(revealNodes(contextMenuNode, (n) => n));+ break;+ default:+ break;+ }++ // NOTE: don't reset useDropdown state (currentNode/showSharePanel) here.+ // The "share" case just set showSharePanel=true; wiping it would close+ // the popover before it opens. Cleanup happens when the follow-up+ // surface (share popover, delete dialog, etc.) closes.+ },+ [+ contextMenuNode,+ editingNodeRef,+ expandedKeysRef,+ folderContext,+ getFoldersForWorksheet,+ editorWorksheetStore,+ handleDeleteFolders,+ handleDuplicateSheet,+ handleSharePanelShow,+ onMultiSelectModeChange,+ onCheckedNodesChange,+ ]+ );++ // ---- handleWorksheetToggleStar (debounced) --------------------------------+ const starTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);+ const handleWorksheetToggleStar = useCallback(+ ({ worksheet, starred }: { worksheet: string; starred: boolean }) => {+ if (starTimerRef.current !== null) {+ clearTimeout(starTimerRef.current);+ }+ starTimerRef.current = setTimeout(() => {+ void worksheetV1Store.upsertWorksheetOrganizer({ worksheet, starred }, [+ "starred",+ ]);+ }, 300);+ },+ [worksheetV1Store]+ );++ // ---- handleDuplicateFolderNameDrop: promise-based duplicate check for DnD --+ // Mirrors Vue's handleDuplicateFolderName: resolves true (merge) or false (cancel).+ const handleDuplicateFolderNameDrop = useCallback(+ (parentNode: WorksheetFolderNode, newKey: string): Promise<boolean> => {+ const sameNode = parentNode.children.find(+ (child) => child.key === newKey+ );+ if (!sameNode) {+ return Promise.resolve(true);+ }+ return new Promise<boolean>((resolve) => {+ setDeleteDialogState({+ type: "duplicate-folder-name",+ existingLabel: sameNode.label,+ resolve,+ });+ });+ },+ []+ );++ // ---- handleMove (DnD via react-arborist) ---------------------------------+ // Mirrors Vue's handleDrop. react-arborist provides the destination parentNode+ // (always a folder — arborist resolves drop-on-leaf to its parent) and an+ // array of dragged nodes. Only single-drag is supported (matches Vue).+ const handleMove: MoveHandler<TreeDataNode<WorksheetFolderNode>> =+ useCallback(+ async ({ dragNodes, parentNode: arboristParent }) => {+ // Resolve the destination folder node+ let parentFolderNode: WorksheetFolderNode | undefined;+ if (arboristParent === null) {+ // Dropped at root level — use the root of sheetTree+ parentFolderNode = sheetTreeRef.value;+ } else {+ const candidate = arboristParent.data.data;+ if (candidate.worksheet) {+ // Should not happen given disableDrop predicate, but guard anyway.+ parentFolderNode = findParentNode(+ sheetTreeRef.value,+ candidate.key+ );+ } else {+ parentFolderNode = candidate;+ }+ }+ if (!parentFolderNode) return;++ // Only handle single drag (matches Vue behaviour)+ const draggedTreeNode = dragNodes[0] as+ | NodeApi<TreeDataNode<WorksheetFolderNode>>+ | undefined;+ if (!draggedTreeNode) return;++ const draggedNode = draggedTreeNode.data.data;+ const oldParentNode = findParentNode(+ sheetTreeRef.value,+ draggedNode.key+ );+ if (!oldParentNode) return;++ // No-op if parent folder didn't change+ if (oldParentNode.key === parentFolderNode.key) return;++ const nodeId = draggedNode.key.split("/").slice(-1)[0];+ const newKey = folderContext.ensureFolderPath(+ `${parentFolderNode.key}/${nodeId}`+ );++ // Check for duplicate folder name (shows dialog if collision)+ const merge = await handleDuplicateFolderNameDrop(+ parentFolderNode,+ newKey+ );+ if (!merge) return;++ const shouldCloseOldParent =+ !draggedNode.worksheet && oldParentNode.children.length === 1;++ await updateWorksheetFolders(+ draggedNode,+ oldParentNode.key,+ parentFolderNode.key+ );+ if (!draggedNode.worksheet) {+ // Folder move — update folderContext too+ folderContext.moveFolder(draggedNode.key, newKey);+ }++ // Update expanded keys (nextTick equivalent: defer to next microtask)+ setTimeout(() => {+ replaceExpandedKeys({ oldKey: draggedNode.key, newKey });+ expandedKeysRef.value.add(parentFolderNode!.key);+ if (shouldCloseOldParent) {+ replaceExpandedKeys({ oldKey: oldParentNode.key });+ }+ }, 0);+ },+ [+ sheetTreeRef,+ findParentNode,+ folderContext,+ handleDuplicateFolderNameDrop,+ updateWorksheetFolders,+ replaceExpandedKeys,+ expandedKeysRef,+ ]+ );++ // ---- Search match for Tree primitive ------------------------------------+ const searchMatch = useCallback(+ (node: TreeDataNode<WorksheetFolderNode>, term: string): boolean => {+ const pred = filterNode(folderContext.rootPath.value);+ return pred(term, node.data);+ },+ [folderContext.rootPath.value]+ );++ // ---- renderNode ----------------------------------------------------------+ const renderNode = useCallback(+ ({+ node,+ style,+ dragHandle,+ }: {+ node: {+ id: string;+ data: TreeDataNode<WorksheetFolderNode>;+ isSelected: boolean;+ isOpen?: boolean;+ };+ style: React.CSSProperties;+ dragHandle?: (el: HTMLDivElement | null) => void;+ }) => {+ const folderNode = node.data.data;+ const isSelected = selectedKeys.includes(node.id);+ const isOpen =+ expandedKeysArray.includes(node.id) || node.isOpen === true;+ const isEditing =+ !!editingNode && editingNode.node.key === folderNode.key;+ const isChecked = checkedNodes.some((n) => n.key === folderNode.key);++ // react-arborist injects `paddingLeft: level * indent` via `style`,+ // which overrides `className`'s `px-2` padding-left. Merge indent with+ // a horizontal gutter so the left edge gets matched padding.+ const ROW_GUTTER_X = 8;+ const indentPadding =+ typeof style.paddingLeft === "number" ? style.paddingLeft : 0;+ const rowStyle = {+ ...style,+ paddingLeft: indentPadding + ROW_GUTTER_X,+ paddingRight: ROW_GUTTER_X,+ };+ return (+ <div+ key={folderNode.key}+ ref={dragHandle}+ style={rowStyle}+ data-item-key={folderNode.key}+ className={cn(+ "flex items-center gap-x-1 w-full py-0.5 text-sm cursor-pointer select-none",+ "hover:bg-control-bg rounded-xs",+ isSelected && "bg-control-bg"+ )}+ onClick={(e) => {+ // Only handle clicks on text/prefix area, not suffix+ const target = e.target as Element;+ const inText = target.closest(".tree-label");+ const inPrefix = target.closest(".tree-prefix");+ if (!inText && !inPrefix) return;+ handleNodeClick(e, folderNode);+ }}+ onContextMenu={(e) => {+ e.preventDefault();+ e.stopPropagation();+ openMenuAtPoint(e.clientX, e.clientY, folderNode);+ }}+ >+ {/* Multi-select checkbox */}+ {multiSelectMode && (+ <input+ type="checkbox"+ className="size-3.5 shrink-0 cursor-pointer"+ checked={isChecked}+ onChange={(e) => {+ e.stopPropagation();+ // Checking a folder recursively includes all descendants so+ // users don't have to tick each child individually.+ const affected = folderNode.worksheet+ ? [folderNode]+ : revealNodes(folderNode, (n) => n);+ if (e.target.checked) {+ const existing = new Set(checkedNodes.map((n) => n.key));+ onCheckedNodesChange([+ ...checkedNodes,+ ...affected.filter((n) => !existing.has(n.key)),+ ]);+ } else {+ const affectedKeys = new Set(affected.map((n) => n.key));+ onCheckedNodesChange(+ checkedNodes.filter((n) => !affectedKeys.has(n.key))+ );+ }+ }}+ onClick={(e) => e.stopPropagation()}+ />+ )}++ {/* Prefix icon */}+ <span className="tree-prefix shrink-0">+ <TreeNodePrefix+ node={folderNode}+ isOpen={isOpen}+ rootPath={folderContext.rootPath.value}+ view={view}+ />+ </span>++ {/* Label / rename input */}+ <span className="tree-label flex-1 min-w-0">+ {isEditing ? (+ <Input+ ref={inputRef}+ id={`sheet-input-${folderNode.key}`}+ size="sm"+ value={editingNode.node.label}+ className="h-5 py-0 text-xs px-1!"+ autoFocus+ onBlur={() => handleRenameNode()}+ onKeyDown={(e) => {+ // react-arborist's container intercepts Space (toggles node)+ // and other keys for tree navigation; stop propagation so+ // typing inside the rename input is unaffected.+ e.stopPropagation();+ if (e.key === "Enter") {+ e.preventDefault();+ handleRenameNode();+ }+ }}+ onChange={(e) => {+ const val = e.target.value;+ if (!editingNode) return;+ if (!editingNode.node.worksheet) {+ // folder names cannot contain "/" or "."+ if (val.includes("/") || val.includes(".")) return;+ }+ editingNode.node.label = val;+ // Force a re-render by triggering a Pinia write+ editingNodeRef.value = { ...editingNode };+ }}+ onClick={(e) => e.stopPropagation()}+ />+ ) : (+ <HighlightLabelText+ text={folderNode.label}+ keyword={worksheetFilter.keyword}+ className="truncate block"+ />+ )}+ </span>++ {/* Suffix (star, visibility badge, more) */}+ {!isEditing && (+ <TreeNodeSuffix+ node={folderNode}+ view={view}+ onSharePanelShow={openSharePanelAtElement}+ onContextMenuShow={(e, n) =>+ openMenuAtElement(e.currentTarget, n)+ }+ onToggleStar={handleWorksheetToggleStar}+ />+ )}+ </div>+ );+ },+ [+ selectedKeys,+ expandedKeysArray,+ editingNode,+ editingNodeRef,+ checkedNodes,+ multiSelectMode,+ worksheetFilter,+ view,+ folderContext,+ handleNodeClick,+ handleRenameNode,+ handleWorksheetToggleStar,+ openMenuAtPoint,+ openMenuAtElement,+ openSharePanelAtElement,+ onCheckedNodesChange,+ ]+ );++ // ---- Loading spinner -----------------------------------------------------+ if (isLoadingVal) {+ return (+ <div className="flex items-center justify-center p-4">+ <Loader2 className="size-4 animate-spin text-control-light" />+ </div>+ );+ }++ // ---- Delete sheet dialog -------------------------------------------------+ const renderDeleteSheetDialog = () => {+ const isOpen = deleteDialogState.type === "delete-sheet";+ return (+ <AlertDialog open={isOpen}>+ <AlertDialogContent>+ <AlertDialogTitle>+ {t("sheet.hint-tips.confirm-to-delete-sheet-title")}+ </AlertDialogTitle>+ <AlertDialogDescription />+ <AlertDialogFooter>+ <Button+ variant="outline"+ size="sm"+ onClick={() => setDeleteDialogState({ type: "none" })}+ >+ {t("common.cancel")}+ </Button>+ <Button+ variant="destructive"+ size="sm"+ onClick={async () => {+ if (deleteDialogState.type !== "delete-sheet") return;+ const { worksheetName } = deleteDialogState;+ setDeleteDialogState({ type: "none" });+ await doDeleteWorksheets([worksheetName]);+ }}+ >+ {t("common.delete")}+ </Button>+ </AlertDialogFooter>+ </AlertDialogContent>+ </AlertDialog>+ );+ };++ // ---- Duplicate sheet dialog -----------------------------------------------+ const renderDuplicateSheetDialog = () => {+ const isOpen = deleteDialogState.type === "duplicate-sheet";+ return (+ <AlertDialog open={isOpen}>+ <AlertDialogContent>+ <AlertDialogTitle>+ {t("sheet.hint-tips.confirm-to-duplicate-sheet")}+ </AlertDialogTitle>+ <AlertDialogDescription />+ <AlertDialogFooter>+ <Button+ variant="outline"+ size="sm"+ onClick={() => setDeleteDialogState({ type: "none" })}+ >+ {t("common.cancel")}+ </Button>+ <Button+ variant="default"+ size="sm"+ onClick={async () => {+ if (deleteDialogState.type !== "duplicate-sheet") return;+ const { worksheetName } = deleteDialogState;+ setDeleteDialogState({ type: "none" });+ const worksheet =+ worksheetV1Store.getWorksheetByName(worksheetName);+ if (!worksheet) return;+ await editorWorksheetStore.createWorksheet({+ title: worksheet.title,+ folders: worksheet.folders,+ database: worksheet.database,+ });+ pushNotification({+ module: "bytebase",+ style: "INFO",+ title: t("sheet.notifications.duplicate-success"),+ });+ }}+ >+ {t("common.confirm")}+ </Button>+ </AlertDialogFooter>+ </AlertDialogContent>+ </AlertDialog>+ );+ };++ // ---- Delete folders dialog -----------------------------------------------+ const renderDeleteFoldersDialog = () => {+ const isOpen = deleteDialogState.type === "delete-folders";+ return (+ <AlertDialog open={isOpen}>+ <AlertDialogContent>+ <AlertDialogTitle>+ {t("sheet.hint-tips.non-empty-folder-title")}+ </AlertDialogTitle>+ <AlertDialogDescription>+ {t("sheet.hint-tips.non-empty-folder-content")}+ </AlertDialogDescription>+ <AlertDialogFooter>+ <Button+ variant="outline"+ size="sm"+ onClick={() => {+ setDeleteDialogState({ type: "none" });+ const pending = deleteFoldersResolveRef.current;+ if (pending) {+ pending.resolve(false);+ deleteFoldersResolveRef.current = null;+ }+ }}+ >+ {t("common.cancel")}+ </Button>+ <Button+ variant="outline"+ size="sm"+ onClick={async () => {+ if (deleteDialogState.type !== "delete-folders") return;+ const { folders, worksheets } = deleteDialogState;+ setDeleteDialogState({ type: "none" });+ const pending = deleteFoldersResolveRef.current;+ if (pending) {+ await batchUpdateWorksheetFolders(+ worksheets.map((ws) => ({ name: ws, folders: [] }))+ );+ pending.cleanFolders();+ pending.resolve(true);+ deleteFoldersResolveRef.current = null;+ } else {+ await batchUpdateWorksheetFolders(+ folders.map(() => ({ name: "", folders: [] }))+ );+ for (const folder of folders) {+ folderContext.removeFolder(folder);+ }+ }+ }}+ >+ {t("sheet.hint-tips.move-to-root-folder")}+ </Button>+ <Button+ variant="destructive"+ size="sm"+ onClick={async () => {+ if (deleteDialogState.type !== "delete-folders") return;+ const { worksheets } = deleteDialogState;+ setDeleteDialogState({ type: "none" });+ const pending = deleteFoldersResolveRef.current;+ if (pending) {+ await doDeleteWorksheets(worksheets);+ pending.cleanFolders();+ pending.resolve(true);+ deleteFoldersResolveRef.current = null;+ } else {+ await doDeleteWorksheets(worksheets);+ for (const folder of folderContext.rootPath.value ? [] : []) {+ folderContext.removeFolder(folder);+ }+ }+ }}+ >+ {t("sheet.hint-tips.delete-all-sheets")}+ </Button>+ </AlertDialogFooter>+ </AlertDialogContent>+ </AlertDialog>+ );+ };++ // ---- Duplicate folder name dialog ----------------------------------------+ const renderDuplicateFolderDialog = () => {+ const isOpen = deleteDialogState.type === "duplicate-folder-name";+ const existingLabel =+ deleteDialogState.type === "duplicate-folder-name"+ ? deleteDialogState.existingLabel+ : "";+ return (+ <AlertDialog open={isOpen}>+ <AlertDialogContent>+ <AlertDialogTitle>+ {t("sheet.hint-tips.duplicate-folder-name-title")}+ </AlertDialogTitle>+ <AlertDialogDescription>+ {t("sheet.hint-tips.duplicate-folder-name-content", {+ folder: existingLabel,+ })}+ </AlertDialogDescription>+ <AlertDialogFooter>+ <Button+ variant="outline"+ size="sm"+ onClick={() => {+ if (deleteDialogState.type !== "duplicate-folder-name") return;+ deleteDialogState.resolve(false);+ setDeleteDialogState({ type: "none" });+ }}+ >+ {t("common.cancel")}+ </Button>+ <Button+ variant="default"+ size="sm"+ onClick={() => {+ if (deleteDialogState.type !== "duplicate-folder-name") return;+ deleteDialogState.resolve(true);+ setDeleteDialogState({ type: "none" });+ }}+ >+ {t("common.confirm")}+ </Button>+ </AlertDialogFooter>+ </AlertDialogContent>+ </AlertDialog>+ );+ };++ // ---- Main render ---------------------------------------------------------+ return (+ <div className="flex flex-col items-stretch gap-y-1 relative worksheet-tree">+ <Tree<WorksheetFolderNode>+ data={treeData}+ renderNode={renderNode}+ selectedIds={selectedKeys}+ expandedIds={expandedKeysArray}+ searchTerm={worksheetFilter.keyword}+ searchMatch={searchMatch}+ height={treeHeight}+ rowHeight={ROW_HEIGHT}+ indent={12}+ className="text-sm"+ onMove={handleMove}+ disableDrag={view === "draft" || !!editingNode || multiSelectMode}+ disableDrop={+ view === "draft" || !!editingNode || multiSelectMode+ ? true+ : ({ parentNode: p }) => !!p?.data.data.worksheet+ }+ />++ {/* Share popover — anchored at the same coordinates as the context+ menu (the row's More button or the cursor). Opens when the user+ selects "Share" from the context menu or clicks the Users badge. */}+ <Popover+ open={showSharePanel && !!worksheetEntity}+ onOpenChange={(next) => {+ if (!next) handleContextMenuClickOutside();+ }}+ >+ <PopoverTrigger+ render={+ <div+ aria-hidden+ style={{+ position: "fixed",+ top: menuAnchorPos.y,+ left: menuAnchorPos.x,+ width: 0,+ height: 0,+ pointerEvents: "none",+ }}+ />+ }+ />+ <PopoverContent align="start" sideOffset={4}>+ {worksheetEntity && (+ <SharePopoverBody+ worksheet={worksheetEntity}+ onUpdated={handleContextMenuClickOutside}+ />+ )}+ </PopoverContent>+ </Popover>++ {/* Shared row context menu. The trigger is an invisible 0x0 div whose+ position we update + .click() programmatically so Base UI records a+ real click-type open event (otherwise its hover-floating interaction+ closes the popup when the cursor leaves). Base UI auto-closes the+ menu on item press or outside press. */}+ <DropdownMenu>+ <DropdownMenuTrigger+ ref={menuTriggerRef}+ aria-hidden+ tabIndex={-1}+ style={{+ position: "fixed",+ top: menuAnchorPos.y,+ left: menuAnchorPos.x,+ width: 0,+ height: 0,+ pointerEvents: "none",+ opacity: 0,+ }}+ />+ <DropdownMenuContent+ align="start"+ sideOffset={4}+ positionMethod="fixed"+ >+ {dropdownOptions.map((item, idx) => {+ if (item.type === "separator") {+ return <DropdownMenuSeparator key={`sep-${idx}`} />;+ }+ return (+ <DropdownMenuItem+ key={item.key}+ onClick={() => {+ void handleContextMenuSelect(item.key);+ }}+ >+ {item.label}+ </DropdownMenuItem>+ );+ })}+ </DropdownMenuContent>+ </DropdownMenu>++ {/* Dialogs */}+ {renderDeleteSheetDialog()}+ {renderDuplicateSheetDialog()}+ {renderDeleteFoldersDialog()}+ {renderDuplicateFolderDialog()}+ </div>+ );+}diff --git a/frontend/src/react/components/sql-editor/TreeNodeSuffix.test.tsx b/frontend/src/react/components/sql-editor/TreeNodeSuffix.test.tsxnew file mode 100644index 0000000000..6fa5000c08--- /dev/null+++ b/frontend/src/react/components/sql-editor/TreeNodeSuffix.test.tsx@@ -0,0 +1,238 @@+import { act } from "react";+import { createRoot } from "react-dom/client";+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";+import type { WorksheetFolderNode } from "@/views/sql-editor/Sheet";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++// Stub ResizeObserver — not provided by jsdom+globalThis.ResizeObserver = class ResizeObserver {+ observe() {}+ unobserve() {}+ disconnect() {}+};++// ---- mocks ------------------------------------------------------------------++const mocks = vi.hoisted(() => ({+ useTranslation: vi.fn(() => ({ t: (key: string) => key })),+ useVueState: vi.fn<(getter: () => unknown) => unknown>(),+ useWorkSheetStore: vi.fn(),+ useSQLEditorTabStore: vi.fn(),+ useUserStore: vi.fn(),+ useSheetContext: vi.fn(),+}));++vi.mock("react-i18next", () => ({+ useTranslation: mocks.useTranslation,+}));++vi.mock("@/react/hooks/useVueState", () => ({+ useVueState: mocks.useVueState,+}));++vi.mock("@/store", () => ({+ useWorkSheetStore: mocks.useWorkSheetStore,+ useSQLEditorTabStore: mocks.useSQLEditorTabStore,+ useUserStore: mocks.useUserStore,+}));++vi.mock("@/views/sql-editor/Sheet", () => ({+ useSheetContext: mocks.useSheetContext,+}));++vi.mock("@/react/components/ui/tooltip", () => ({+ Tooltip: ({+ children,+ content,+ }: {+ children: React.ReactNode;+ content: React.ReactNode;+ }) => (+ <div>+ <div data-testid="tooltip-content">{content}</div>+ {children}+ </div>+ ),+}));++vi.mock("@/types/proto-es/v1/worksheet_service_pb", () => ({+ Worksheet_Visibility: {+ PRIVATE: 0,+ PROJECT_READ: 1,+ PROJECT_WRITE: 2,+ },+}));++// ---- helpers ----------------------------------------------------------------++const makeNode = (+ overrides?: Partial<WorksheetFolderNode>+): WorksheetFolderNode => ({+ key: "/my/folder",+ label: "folder",+ editable: true,+ children: [],+ empty: false,+ ...overrides,+});++const makeWorksheetNode = (+ overrides?: Partial<WorksheetFolderNode>+): WorksheetFolderNode =>+ makeNode({+ key: "/my/folder/ws1",+ label: "My Query",+ worksheet: {+ name: "worksheets/ws1",+ title: "My Query",+ folders: [],+ type: "worksheet",+ },+ ...overrides,+ });++const renderIntoContainer = (element: React.ReactElement) => {+ const container = document.createElement("div");+ const root = createRoot(container);+ document.body.appendChild(container);+ return {+ container,+ render: () => {+ act(() => {+ root.render(element);+ });+ },+ unmount: () => {+ act(() => {+ root.unmount();+ });+ container.remove();+ },+ };+};++let TreeNodeSuffix: typeof import("./TreeNodeSuffix").TreeNodeSuffix;++beforeEach(async () => {+ mocks.useVueState.mockImplementation((getter: () => unknown) => getter());+ mocks.useWorkSheetStore.mockReturnValue({+ getWorksheetByName: (name: string) => ({+ name,+ starred: false,+ visibility: 0, // PRIVATE+ creator: "users/[email protected]",+ }),+ });+ mocks.useSQLEditorTabStore.mockReturnValue({+ closeTab: vi.fn(),+ });+ mocks.useUserStore.mockReturnValue({+ getUserByIdentifier: vi.fn(() => ({ title: "Test User" })),+ });+ mocks.useSheetContext.mockReturnValue({+ isWorksheetCreator: vi.fn(() => true),+ });++ ({ TreeNodeSuffix } = await import("./TreeNodeSuffix"));+});++afterEach(() => {+ document.body.innerHTML = "";+ vi.resetModules();+});++describe("TreeNodeSuffix", () => {+ test("renders star icon for worksheet node; click fires onToggleStar with correct args", () => {+ const node = makeWorksheetNode();+ const onToggleStar = vi.fn();+ const onSharePanelShow = vi.fn();+ const onContextMenuShow = vi.fn();++ const { container, render, unmount } = renderIntoContainer(+ <TreeNodeSuffix+ node={node}+ view="my"+ onToggleStar={onToggleStar}+ onSharePanelShow={onSharePanelShow}+ onContextMenuShow={onContextMenuShow}+ />+ );+ render();++ // Finds the star SVG by its lucide class+ const starSvg = container.querySelector("svg.lucide-star");+ expect(starSvg).not.toBeNull();++ // Click the star+ act(() => {+ starSvg?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ expect(onToggleStar).toHaveBeenCalledWith({+ worksheet: "worksheets/ws1",+ starred: true, // was false, toggled to true+ });++ unmount();+ });++ test("does not render star icon for folder nodes", () => {+ const node = makeNode(); // folder, no worksheet+ const onToggleStar = vi.fn();+ const onSharePanelShow = vi.fn();+ const onContextMenuShow = vi.fn();++ const { container, render, unmount } = renderIntoContainer(+ <TreeNodeSuffix+ node={node}+ view="my"+ onToggleStar={onToggleStar}+ onSharePanelShow={onSharePanelShow}+ onContextMenuShow={onContextMenuShow}+ />+ );+ render();++ const starSvg = container.querySelector("svg.lucide-star");+ expect(starSvg).toBeNull();++ unmount();+ });++ test('"More" button fires onContextMenuShow with the node', () => {+ const node = makeWorksheetNode();+ const onContextMenuShow = vi.fn();+ const onToggleStar = vi.fn();+ const onSharePanelShow = vi.fn();++ const { container, render, unmount } = renderIntoContainer(+ <TreeNodeSuffix+ node={node}+ view="my"+ onToggleStar={onToggleStar}+ onSharePanelShow={onSharePanelShow}+ onContextMenuShow={onContextMenuShow}+ />+ );+ render();++ // lucide-react renders MoreHorizontal as "lucide-ellipsis"+ const moreSvg = container.querySelector("svg.lucide-ellipsis");+ expect(moreSvg).not.toBeNull();++ act(() => {+ moreSvg?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ // React wraps native events in SyntheticBaseEvent (not native MouseEvent)+ expect(onContextMenuShow).toHaveBeenCalledWith(+ expect.objectContaining({ type: "click" }),+ node+ );++ unmount();+ });+});diff --git a/frontend/src/react/components/sql-editor/TreeNodeSuffix.tsx b/frontend/src/react/components/sql-editor/TreeNodeSuffix.tsxnew file mode 100644index 0000000000..53d018a891--- /dev/null+++ b/frontend/src/react/components/sql-editor/TreeNodeSuffix.tsx@@ -0,0 +1,182 @@+import { MoreHorizontal, Star, Users, X } from "lucide-react";+import { useTranslation } from "react-i18next";+import { Tooltip } from "@/react/components/ui/tooltip";+import { useVueState } from "@/react/hooks/useVueState";+import { cn } from "@/react/lib/utils";+import { useSQLEditorTabStore, useUserStore, useWorkSheetStore } from "@/store";+import { Worksheet_Visibility } from "@/types/proto-es/v1/worksheet_service_pb";+import type {+ SheetViewMode,+ WorksheetFolderNode,+} from "@/views/sql-editor/Sheet";+import { useSheetContext } from "@/views/sql-editor/Sheet";++type Props = {+ readonly node: WorksheetFolderNode;+ readonly view: SheetViewMode;+ readonly onSharePanelShow: (+ e: React.MouseEvent,+ node: WorksheetFolderNode+ ) => void;+ readonly onContextMenuShow: (+ e: React.MouseEvent,+ node: WorksheetFolderNode+ ) => void;+ readonly onToggleStar: (args: {+ worksheet: string;+ starred: boolean;+ }) => void;+};++export function TreeNodeSuffix({+ node,+ view,+ onSharePanelShow,+ onContextMenuShow,+ onToggleStar,+}: Props) {+ const { t } = useTranslation();++ const worksheetStore = useWorkSheetStore();+ const tabStore = useSQLEditorTabStore();+ const userStore = useUserStore();+ const { isWorksheetCreator } = useSheetContext();++ const worksheetLite = useVueState(() => {+ if (!node.worksheet) {+ return undefined;+ }+ const sheet = worksheetStore.getWorksheetByName(node.worksheet.name);+ if (!sheet) {+ return undefined;+ }+ return {+ name: sheet.name,+ starred: sheet.starred,+ visibility: sheet.visibility,+ creator: sheet.creator,+ };+ });++ const visibilityDisplayName = (visibility: Worksheet_Visibility) => {+ switch (visibility) {+ case Worksheet_Visibility.PRIVATE:+ return t("sql-editor.private");+ case Worksheet_Visibility.PROJECT_READ:+ return t("sql-editor.project-read");+ case Worksheet_Visibility.PROJECT_WRITE:+ return t("sql-editor.project-write");+ default:+ return "";+ }+ };++ const creatorForSheet = (creator: string) => {+ return userStore.getUserByIdentifier(creator)?.title ?? creator;+ };++ // Draft view: show X button to close the draft tab+ if (view === "draft") {+ if (!node.worksheet) {+ return null;+ }+ return (+ <X+ className="size-4 text-control shrink-0"+ onClick={(e) => {+ e.stopPropagation();+ if (!node.worksheet?.name) return;+ // Draft nodes use tab.id as worksheet.name (drafts have no worksheet field).+ const tab = tabStore.getTabById(node.worksheet.name);+ if (tab && tab.status !== "CLEAN") {+ if (+ !window.confirm(+ t("sql-editor.hint-tips.confirm-to-close-unsaved-sheet.content")+ )+ ) {+ return;+ }+ }+ tabStore.closeTab(node.worksheet.name);+ }}+ />+ );+ }++ // Folder node: only show "More" button+ if (!node.worksheet) {+ return (+ <MoreHorizontal+ className="size-4 text-control shrink-0 cursor-pointer"+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ onContextMenuShow(e, node);+ }}+ />+ );+ }++ // Worksheet node: visibility badge + star + more+ if (!worksheetLite) {+ return null;+ }++ const showVisibilityBadge =+ worksheetLite.visibility === Worksheet_Visibility.PROJECT_READ ||+ worksheetLite.visibility === Worksheet_Visibility.PROJECT_WRITE;++ return (+ <div className="inline-flex gap-x-1 items-center">+ {showVisibilityBadge && (+ <Tooltip+ content={+ <div>+ <div>+ {t("common.visibility")}+ {": "}+ {visibilityDisplayName(worksheetLite.visibility)}+ </div>+ {!isWorksheetCreator(worksheetLite) && (+ <div>+ {t("common.creator")}+ {": "}+ {creatorForSheet(worksheetLite.creator)}+ </div>+ )}+ </div>+ }+ >+ <Users+ className="size-4 text-control-light shrink-0"+ onClick={(e) => {+ e.stopPropagation();+ onSharePanelShow(e, node);+ }}+ />+ </Tooltip>+ )}+ <Star+ className={cn(+ "size-4 shrink-0",+ worksheetLite.starred ? "text-yellow-400" : "text-control-light"+ )}+ onClick={(e) => {+ e.stopPropagation();+ onToggleStar({+ worksheet: worksheetLite.name,+ starred: !worksheetLite.starred,+ });+ }}+ />+ <MoreHorizontal+ className="size-4 text-control shrink-0 cursor-pointer"+ onClick={(e) => {+ e.preventDefault();+ e.stopPropagation();+ onContextMenuShow(e, node);+ }}+ />+ </div>+ );+}diff --git a/frontend/src/react/components/sql-editor/WorksheetPane.test.tsx b/frontend/src/react/components/sql-editor/WorksheetPane.test.tsxnew file mode 100644index 0000000000..d275c91595--- /dev/null+++ b/frontend/src/react/components/sql-editor/WorksheetPane.test.tsx@@ -0,0 +1,482 @@+import type { ReactElement } from "react";+import { act } from "react";+import { createRoot } from "react-dom/client";+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";+import type { WorksheetFolderNode } from "@/views/sql-editor/Sheet";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++// Stub ResizeObserver — not provided by jsdom+globalThis.ResizeObserver = class ResizeObserver {+ observe() {}+ unobserve() {}+ disconnect() {}+};++// ---- hoisted mocks ----------------------------------------------------------++const mocks = vi.hoisted(() => ({+ useTranslation: vi.fn(() => ({ t: (key: string) => key })),+ useVueState: vi.fn<(getter: () => unknown) => unknown>(),+ useSheetContext: vi.fn(),+ useSheetContextByView: vi.fn(),+}));++vi.mock("react-i18next", () => ({+ useTranslation: mocks.useTranslation,+}));++vi.mock("@/react/hooks/useVueState", () => ({+ useVueState: mocks.useVueState,+}));++vi.mock("@/views/sql-editor/Sheet", () => ({+ useSheetContext: mocks.useSheetContext,+ useSheetContextByView: mocks.useSheetContextByView,+}));++// ---- primitive mocks --------------------------------------------------------++vi.mock("@/react/components/ui/button", () => ({+ Button: ({+ children,+ onClick,+ disabled,+ className,+ }: {+ children: React.ReactNode;+ onClick?: () => void;+ disabled?: boolean;+ className?: string;+ }) => (+ <button+ data-testid="button"+ className={className}+ disabled={disabled}+ onClick={onClick}+ >+ {children}+ </button>+ ),+}));++vi.mock("@/react/components/ui/search-input", () => ({+ SearchInput: ({+ value,+ onChange,+ placeholder,+ }: {+ value?: string;+ onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;+ placeholder?: string;+ }) => (+ <input+ data-testid="search-input"+ value={value ?? ""}+ onChange={onChange}+ placeholder={placeholder}+ />+ ),+}));++vi.mock("@/react/components/ui/dropdown-menu", () => ({+ DropdownMenu: ({+ children,+ open,+ }: {+ children: React.ReactNode;+ open?: boolean;+ onOpenChange?: (open: boolean) => void;+ }) => (+ <div data-testid="dropdown-menu" data-open={String(open ?? false)}>+ {children}+ </div>+ ),+ DropdownMenuTrigger: ({+ children,+ className,+ }: {+ children: React.ReactNode;+ className?: string;+ "aria-label"?: string;+ }) => (+ <button data-testid="dropdown-menu-trigger" className={className}>+ {children}+ </button>+ ),+ DropdownMenuContent: ({ children }: { children: React.ReactNode }) => (+ <div data-testid="dropdown-menu-content">{children}</div>+ ),+}));++vi.mock("@/react/components/ui/dialog", () => ({+ Dialog: ({+ children,+ open,+ onOpenChange,+ }: {+ children: React.ReactNode;+ open?: boolean;+ onOpenChange?: (open: boolean) => void;+ }) => (+ <div+ data-testid="dialog"+ data-open={String(open ?? false)}+ data-close-handler={onOpenChange ? "true" : "false"}+ >+ {open ? children : null}+ </div>+ ),+ DialogContent: ({ children }: { children: React.ReactNode }) => (+ <div data-testid="dialog-content">{children}</div>+ ),+ DialogTitle: ({ children }: { children: React.ReactNode }) => (+ <h2 data-testid="dialog-title">{children}</h2>+ ),+}));++vi.mock("./FilterMenuItem", () => ({+ FilterMenuItem: ({+ label,+ value,+ onValueChange,+ }: {+ label: string;+ value: boolean;+ onValueChange: (v: boolean) => void;+ }) => (+ <button+ data-testid="filter-menu-item"+ data-label={label}+ data-value={String(value)}+ onClick={() => onValueChange(!value)}+ >+ {label}+ </button>+ ),+}));++vi.mock("./FolderForm", () => ({+ FolderForm: ({+ folder,+ onFolderChange,+ }: {+ folder: string;+ onFolderChange: (f: string) => void;+ }) => (+ <div data-testid="folder-form" data-folder={folder}>+ <button+ data-testid="folder-form-set-target"+ onClick={() => onFolderChange("/some/folder")}+ >+ set-target+ </button>+ </div>+ ),+}));++// Mock SheetTree — expose buttons to trigger the callbacks that SheetTree+// would fire in the real component (enter multi-select, check a node).+vi.mock("./SheetTree", () => ({+ SheetTree: ({+ view,+ multiSelectMode,+ checkedNodes,+ onMultiSelectModeChange,+ onCheckedNodesChange,+ ref,+ }: {+ view: string;+ multiSelectMode?: boolean;+ checkedNodes?: WorksheetFolderNode[];+ onMultiSelectModeChange: (m: boolean) => void;+ onCheckedNodesChange: (n: WorksheetFolderNode[]) => void;+ ref?: React.Ref<{+ handleMultiDelete: (nodes: WorksheetFolderNode[]) => Promise<void>;+ }>;+ }) => {+ // Expose the imperative handle on the ref so WorksheetPane can call it+ if (ref && typeof ref === "object") {+ (ref as { current: unknown }).current = {+ handleMultiDelete: vi.fn().mockResolvedValue(undefined),+ };+ }+ return (+ <div+ data-testid="sheet-tree"+ data-view={view}+ data-multi-select-mode={String(multiSelectMode ?? false)}+ data-checked-count={String(checkedNodes?.length ?? 0)}+ >+ <button+ data-testid={`sheet-tree-${view}-enter-multi-select`}+ onClick={() => onMultiSelectModeChange(true)}+ >+ enter-multi-select+ </button>+ <button+ data-testid={`sheet-tree-${view}-check-ws`}+ onClick={() =>+ onCheckedNodesChange([+ {+ key: "/my/ws1",+ label: "ws1",+ editable: false,+ children: [],+ empty: true,+ worksheet: {+ name: "worksheets/ws1",+ title: "ws1",+ folders: [],+ type: "worksheet",+ },+ } as WorksheetFolderNode,+ ])+ }+ >+ check-ws+ </button>+ </div>+ );+ },+}));++// ---- helpers ----------------------------------------------------------------++type Filter = {+ keyword: string;+ showMine: boolean;+ showShared: boolean;+ showDraft: boolean;+ onlyShowStarred: boolean;+};++const setupDefaultMocks = (overrides: Partial<Filter> = {}) => {+ mocks.useTranslation.mockReturnValue({ t: (key: string) => key });++ const filter: Filter = {+ keyword: "",+ showMine: true,+ showShared: true,+ showDraft: true,+ onlyShowStarred: false,+ ...overrides,+ };++ const filterRef = { value: filter };+ const filterChanged = { value: false };++ const batchUpdateWorksheetFolders = vi.fn().mockResolvedValue(undefined);+ const getFoldersForWorksheet = vi.fn((path: string): string[] =>+ path ? [path] : []+ );++ mocks.useVueState.mockImplementation((getter) => getter());++ mocks.useSheetContext.mockReturnValue({+ filter: filterRef,+ filterChanged,+ batchUpdateWorksheetFolders,+ });++ mocks.useSheetContextByView.mockReturnValue({+ getFoldersForWorksheet,+ });++ return { filterRef, batchUpdateWorksheetFolders, getFoldersForWorksheet };+};++const renderIntoContainer = (element: ReactElement) => {+ const container = document.createElement("div");+ const root = createRoot(container);+ document.body.appendChild(container);+ return {+ container,+ render: () => {+ act(() => {+ root.render(element);+ });+ },+ update: (next: ReactElement) => {+ act(() => {+ root.render(next);+ });+ },+ unmount: () => {+ act(() => {+ root.unmount();+ });+ container.remove();+ },+ };+};++let WorksheetPane: typeof import("./WorksheetPane").WorksheetPane;++beforeEach(async () => {+ vi.clearAllMocks();+ ({ WorksheetPane } = await import("./WorksheetPane"));+});++afterEach(() => {+ document.body.innerHTML = "";+ vi.resetModules();+});++// ---- tests ------------------------------------------------------------------++describe("WorksheetPane", () => {+ test("1. Renders SheetTree for each enabled view", () => {+ setupDefaultMocks();+ const { container, render, unmount } = renderIntoContainer(+ <WorksheetPane />+ );+ render();++ const trees = container.querySelectorAll("[data-testid='sheet-tree']");+ const views = Array.from(trees).map((t) => t.getAttribute("data-view"));+ expect(views).toEqual(["my", "shared", "draft"]);++ unmount();+ });++ test("2. Hides 'my' SheetTree when showMine is false", () => {+ setupDefaultMocks({ showMine: false });+ const { container, render, unmount } = renderIntoContainer(+ <WorksheetPane />+ );+ render();++ const trees = container.querySelectorAll("[data-testid='sheet-tree']");+ const views = Array.from(trees).map((t) => t.getAttribute("data-view"));+ expect(views).toEqual(["shared", "draft"]);++ unmount();+ });++ test("3. Filter menu item toggle writes back to filter ref", () => {+ const { filterRef } = setupDefaultMocks();+ const { container, render, unmount } = renderIntoContainer(+ <WorksheetPane />+ );+ render();++ // Find the "show-draft" filter menu item (by label)+ const items = Array.from(+ container.querySelectorAll("[data-testid='filter-menu-item']")+ ) as HTMLElement[];+ const showDraftItem = items.find(+ (el) => el.getAttribute("data-label") === "sheet.filter.show-draft"+ );+ expect(showDraftItem).not.toBeUndefined();++ act(() => {+ showDraftItem?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ expect(filterRef.value.showDraft).toBe(false);++ unmount();+ });++ test("4. Multi-select toolbar appears when a SheetTree enters multi-select", () => {+ setupDefaultMocks();+ const { container, render, unmount } = renderIntoContainer(+ <WorksheetPane />+ );+ render();++ // Before: toolbar hidden (no TrashIcon button — only sheet-tree buttons)+ const beforeToolbar = container.querySelector(+ "[data-testid='sheet-tree-my-enter-multi-select']"+ );+ expect(beforeToolbar).not.toBeNull();++ // Enter multi-select via the mocked "my" SheetTree+ act(() => {+ beforeToolbar?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ // Now: the "my" tree should report multi-select on+ const myTree = container.querySelector(+ "[data-testid='sheet-tree'][data-view='my']"+ );+ expect(myTree?.getAttribute("data-multi-select-mode")).toBe("true");++ // Toolbar buttons rendered — filter by button labels+ const toolbarButtons = Array.from(+ container.querySelectorAll("[data-testid='button']")+ ).map((el) => el.textContent?.trim());+ expect(toolbarButtons).toEqual(+ expect.arrayContaining([+ "common.delete",+ "sheet.move-worksheets",+ "common.cancel",+ ])+ );++ unmount();+ });++ test("5. Move modal opens and submit calls batchUpdateWorksheetFolders", async () => {+ const { batchUpdateWorksheetFolders, getFoldersForWorksheet } =+ setupDefaultMocks();+ const { container, render, unmount } = renderIntoContainer(+ <WorksheetPane />+ );+ render();++ // Step 1: enter multi-select and check a worksheet+ act(() => {+ container+ .querySelector("[data-testid='sheet-tree-my-enter-multi-select']")+ ?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });+ act(() => {+ container+ .querySelector("[data-testid='sheet-tree-my-check-ws']")+ ?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ // Step 2: click the "move-worksheets" toolbar button to open the modal+ const moveButton = Array.from(+ container.querySelectorAll("[data-testid='button']")+ ).find((el) => el.textContent?.trim() === "sheet.move-worksheets") as+ | HTMLButtonElement+ | undefined;+ expect(moveButton).not.toBeUndefined();++ act(() => {+ moveButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ // Dialog should be open now — FolderForm is rendered+ const folderForm = container.querySelector("[data-testid='folder-form']");+ expect(folderForm).not.toBeNull();++ // Step 3: change the folder target via the mocked FolderForm's setter+ act(() => {+ container+ .querySelector("[data-testid='folder-form-set-target']")+ ?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ const saveButton = Array.from(+ container.querySelectorAll("[data-testid='button']")+ ).find((el) => el.textContent?.trim() === "common.save");+ expect(saveButton).not.toBeUndefined();++ await act(async () => {+ saveButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ expect(getFoldersForWorksheet).toHaveBeenCalledWith("/some/folder");+ expect(batchUpdateWorksheetFolders).toHaveBeenCalledWith([+ { name: "worksheets/ws1", folders: ["/some/folder"] },+ ]);++ unmount();+ });+});diff --git a/frontend/src/react/components/sql-editor/WorksheetPane.tsx b/frontend/src/react/components/sql-editor/WorksheetPane.tsxnew file mode 100644index 0000000000..3945c37ee0--- /dev/null+++ b/frontend/src/react/components/sql-editor/WorksheetPane.tsx@@ -0,0 +1,249 @@+/**+ * WorksheetPane — React port of WorksheetPane.vue (Stage 12, Phase 4).+ *+ * Hosts the SQL editor's worksheet sidebar: search, filter menu, multi-select+ * toolbar, move-to-folder dialog, and one SheetTree per visible view.+ */++import { FolderInputIcon, FunnelIcon, TrashIcon, XIcon } from "lucide-react";+import { useEffect, useMemo, useRef, useState } from "react";+import { useTranslation } from "react-i18next";+import { Button } from "@/react/components/ui/button";+import {+ Dialog,+ DialogContent,+ DialogTitle,+} from "@/react/components/ui/dialog";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuTrigger,+} from "@/react/components/ui/dropdown-menu";+import { SearchInput } from "@/react/components/ui/search-input";+import { useVueState } from "@/react/hooks/useVueState";+import { cn } from "@/react/lib/utils";+import type {+ SheetViewMode,+ WorksheetFolderNode,+} from "@/views/sql-editor/Sheet";+import {+ useSheetContext,+ useSheetContextByView,+} from "@/views/sql-editor/Sheet";+import { FilterMenuItem } from "./FilterMenuItem";+import { FolderForm } from "./FolderForm";+import { SheetTree, type SheetTreeHandle } from "./SheetTree";++export function WorksheetPane() {+ const { t } = useTranslation();++ const sheetContext = useSheetContext();+ const { filter: filterRef, batchUpdateWorksheetFolders } = sheetContext;+ const filterChanged = useVueState(() => sheetContext.filterChanged.value);+ const filter = useVueState(() => filterRef.value);++ const { getFoldersForWorksheet } = useSheetContextByView("my");++ const mineSheetTreeRef = useRef<SheetTreeHandle>(null);++ const [multiSelectMode, setMultiSelectMode] = useState(false);+ const [checkedNodes, setCheckedNodes] = useState<WorksheetFolderNode[]>([]);+ const [showReorgModal, setShowReorgModal] = useState(false);+ const [pendingMoveFolder, setPendingMoveFolder] = useState("");+ const [loading, setLoading] = useState(false);+ const [showFilterMenu, setShowFilterMenu] = useState(false);++ // Reset selection whenever multi-select mode exits or "my" view is hidden.+ useEffect(() => {+ if (!multiSelectMode || !filter.showMine) {+ setCheckedNodes([]);+ }+ }, [multiSelectMode, filter.showMine]);++ const views = useMemo<SheetViewMode[]>(() => {+ const results: SheetViewMode[] = [];+ if (filter.showShared) results.push("shared");+ if (filter.showDraft) results.push("draft");+ return results;+ }, [filter.showShared, filter.showDraft]);++ const checkedWorksheets = useMemo(+ () =>+ checkedNodes+ .filter((node) => node.worksheet)+ .map((node) => node.worksheet!.name),+ [checkedNodes]+ );++ const updateFilter = (patch: Partial<typeof filter>) => {+ filterRef.value = { ...filterRef.value, ...patch };+ };++ const handleKeywordChange = (keyword: string) => {+ updateFilter({ keyword });+ };++ const handleMultiDelete = async () => {+ setLoading(true);+ try {+ await mineSheetTreeRef.current?.handleMultiDelete(checkedNodes);+ } finally {+ setLoading(false);+ }+ };++ const handleMoveWorksheets = async () => {+ setLoading(true);+ try {+ const folders = getFoldersForWorksheet(pendingMoveFolder);+ await batchUpdateWorksheetFolders(+ checkedWorksheets.map((worksheet) => ({ name: worksheet, folders }))+ );+ setShowReorgModal(false);+ setMultiSelectMode(false);+ setPendingMoveFolder("");+ } finally {+ setLoading(false);+ }+ };++ const closeReorgModal = () => {+ setShowReorgModal(false);+ setPendingMoveFolder("");+ };++ const showMultiSelectToolbar = multiSelectMode && filter.showMine;+ const hasAnyView = filter.showMine || views.length > 0;++ return (+ <div className="h-full flex flex-col gap-1 overflow-hidden py-1 text-sm">+ <div className="flex items-center gap-x-1 px-1">+ <SearchInput+ size="sm"+ value={filter.keyword}+ onChange={(e) => handleKeywordChange(e.target.value)}+ placeholder={t("sheet.search-sheets")}+ wrapperClassName="max-w-full"+ />+ <DropdownMenu open={showFilterMenu} onOpenChange={setShowFilterMenu}>+ <DropdownMenuTrigger+ aria-label={t("sheet.search-sheets")}+ className="inline-flex items-center justify-center size-7 rounded-xs text-control hover:bg-control-bg cursor-pointer outline-hidden focus-visible:ring-2 focus-visible:ring-accent"+ >+ <FunnelIcon+ className={cn("size-4", filterChanged && "text-accent")}+ />+ </DropdownMenuTrigger>+ <DropdownMenuContent align="start" sideOffset={4}>+ <FilterMenuItem+ label={t("sheet.filter.show-mine")}+ value={filter.showMine}+ onValueChange={(val) => updateFilter({ showMine: val })}+ />+ <FilterMenuItem+ label={t("sheet.filter.show-shared")}+ value={filter.showShared}+ onValueChange={(val) => updateFilter({ showShared: val })}+ />+ <FilterMenuItem+ label={t("sheet.filter.show-draft")}+ value={filter.showDraft}+ onValueChange={(val) => updateFilter({ showDraft: val })}+ />+ <FilterMenuItem+ label={t("sheet.filter.only-show-starred")}+ value={filter.onlyShowStarred}+ onValueChange={(val) => updateFilter({ onlyShowStarred: val })}+ />+ </DropdownMenuContent>+ </DropdownMenu>+ </div>++ <div className="relative flex-1 flex flex-col gap-y-2 overflow-y-auto worksheet-scroll">+ {showMultiSelectToolbar && (+ <div className="sticky top-0 z-10 flex flex-wrap items-center justify-start gap-y-1 gap-x-1 bg-accent/10 py-2 px-1">+ <Button+ variant="ghost"+ size="xs"+ className="text-error hover:text-error"+ disabled={checkedNodes.length === 0 || loading}+ onClick={handleMultiDelete}+ >+ <TrashIcon className="size-3.5" />+ {t("common.delete")}+ </Button>+ <Button+ variant="ghost"+ size="xs"+ disabled={checkedWorksheets.length === 0 || loading}+ onClick={() => {+ setPendingMoveFolder("");+ setShowReorgModal(true);+ }}+ >+ <FolderInputIcon className="size-3.5" />+ {t("sheet.move-worksheets")}+ </Button>+ <Button+ variant="ghost"+ size="xs"+ disabled={loading}+ onClick={() => setMultiSelectMode(false)}+ >+ <XIcon className="size-3.5" />+ {t("common.cancel")}+ </Button>+ </div>+ )}++ {filter.showMine && (+ <SheetTree+ key="my"+ ref={mineSheetTreeRef}+ view="my"+ multiSelectMode={multiSelectMode}+ checkedNodes={checkedNodes}+ onMultiSelectModeChange={setMultiSelectMode}+ onCheckedNodesChange={setCheckedNodes}+ />+ )}+ {views.map((view) => (+ <SheetTree+ key={view}+ view={view}+ onMultiSelectModeChange={setMultiSelectMode}+ onCheckedNodesChange={setCheckedNodes}+ />+ ))}+ {!hasAnyView && (+ <div className="mt-10 text-center text-sm text-control-light">+ {t("common.no-data")}+ </div>+ )}+ </div>++ <Dialog+ open={showReorgModal}+ onOpenChange={(open) => !open && closeReorgModal()}+ >+ <DialogContent className="w-lg max-w-[calc(100vw-8rem)] p-6">+ <DialogTitle>{t("sheet.move-worksheets")}</DialogTitle>+ <div className="mt-3 flex flex-col gap-y-3">+ <FolderForm+ folder={pendingMoveFolder}+ onFolderChange={setPendingMoveFolder}+ />+ <div className="flex justify-end gap-x-2 mt-4">+ <Button variant="outline" onClick={closeReorgModal}>+ {t("common.close")}+ </Button>+ <Button onClick={handleMoveWorksheets} disabled={loading}>+ {t("common.save")}+ </Button>+ </div>+ </div>+ </DialogContent>+ </Dialog>+ </div>+ );+}diff --git a/frontend/src/react/components/sql-editor/filterNode.ts b/frontend/src/react/components/sql-editor/filterNode.tsnew file mode 100644index 0000000000..5b7080d5e4--- /dev/null+++ b/frontend/src/react/components/sql-editor/filterNode.ts@@ -0,0 +1,17 @@+import type { WorksheetFolderNode } from "@/views/sql-editor/Sheet";++/**+ * Returns a filter predicate for the worksheet tree.+ *+ * The predicate always shows the root node (matched by `rootPath`) and any+ * node whose label contains the search keyword (case-insensitive).+ */+export const filterNode =+ (rootPath: string) =>+ (pattern: string, option: WorksheetFolderNode): boolean => {+ const keyword = pattern.trim().toLowerCase();+ if (option.key === rootPath || !keyword) {+ return true;+ }+ return option.label?.toLowerCase().includes(keyword) ?? false;+ };diff --git a/frontend/src/react/components/sql-editor/useDropdown.ts b/frontend/src/react/components/sql-editor/useDropdown.tsnew file mode 100644index 0000000000..a4fe340035--- /dev/null+++ b/frontend/src/react/components/sql-editor/useDropdown.ts@@ -0,0 +1,237 @@+/**+ * useDropdown — React port of Vue dropdown.ts+ *+ * Key differences from the Vue source:+ *+ * 1. Positioning: Vue's NDropdown uses manual x/y coordinates. Base UI's+ * ContextMenu handles positioning internally on right-click. Therefore+ * `x`/`y` are dropped and `handleMenuShow` is renamed to+ * `handleContextMenu` to reflect it is the onContextMenu handler.+ *+ * 2. Delete confirm: Vue uses naive-ui `useDialog`. React dependency-inverts+ * this: the hook exposes `confirmDelete` state; the consumer (SheetTree)+ * binds a shadcn AlertDialog to it.+ *+ * 3. Share panel: Vue uses a naive-ui Popover. React side exposes+ * `showSharePanel` + `handleSharePanelShow` so that SheetTree can mount+ * the actual SharePopoverBody component. No dialog logic lives here.+ *+ * 4. Vue refs/reactive → React useState/useMemo.+ * Vue computed → useMemo.+ * t() from @/plugins/i18n → useTranslation from react-i18next.+ */++import { useMemo, useState } from "react";+import { useTranslation } from "react-i18next";+import { useVueState } from "@/react/hooks/useVueState";+import { useCurrentUserV1, useWorkSheetStore } from "@/store";+import { isWorksheetWritableV1 } from "@/utils";+import type {+ SheetViewMode,+ WorksheetFilter,+ WorksheetFolderNode,+} from "@/views/sql-editor/Sheet";++// ---------------------------------------------------------------------------+// Types+// ---------------------------------------------------------------------------++export type DropdownOptionType =+ | "share"+ | "rename"+ | "delete"+ | "add-folder"+ | "add-worksheet"+ | "multi-select"+ | "duplicate";++/** A single menu entry. Mirrors naive-ui's DropdownOption in shape. */+export type MenuItem =+ | { type: "item"; key: DropdownOptionType; label: string; disabled?: boolean }+ | { type: "separator" };++// ---------------------------------------------------------------------------+// Hook+// ---------------------------------------------------------------------------++export function useDropdown(+ viewMode: SheetViewMode,+ worksheetFilter: WorksheetFilter+) {+ const { t } = useTranslation();++ // Call Pinia store factories at hook top level (React Hooks rule).+ const sheetStore = useWorkSheetStore();+ const meRef = useCurrentUserV1();++ // ------------------------------------------------------------------+ // Context state — current right-click target+ // ------------------------------------------------------------------+ const [currentNode, setCurrentNode] = useState<+ WorksheetFolderNode | undefined+ >(undefined);+ const [showSharePanel, setShowSharePanel] = useState(false);++ // ------------------------------------------------------------------+ // Reactive reads from Pinia / Vue stores+ // ------------------------------------------------------------------+ const me = useVueState(() => meRef.value);++ const worksheetEntity = useVueState(() => {+ if (viewMode === "draft" || !currentNode?.worksheet) {+ return undefined;+ }+ return sheetStore.getWorksheetByName(currentNode.worksheet.name);+ });++ // ------------------------------------------------------------------+ // Derived: allowed-to-create-new+ // ------------------------------------------------------------------+ const allowCreateNew =+ !worksheetFilter.keyword && !worksheetFilter.onlyShowStarred;++ // ------------------------------------------------------------------+ // Menu options — computed from current state+ // ------------------------------------------------------------------+ const options = useMemo((): MenuItem[] => {+ if (viewMode === "draft" || !currentNode) {+ return [];+ }++ type ItemDef = {+ key: DropdownOptionType;+ label: string;+ };++ const items: ItemDef[] = [];++ if (currentNode.worksheet) {+ if (!worksheetEntity) {+ return [];+ }+ const isCreator = worksheetEntity.creator === `users/${me?.email ?? ""}`;+ items.push({+ key: "duplicate",+ label: isCreator ? t("common.duplicate") : t("common.fork"),+ });+ if (isCreator) {+ items.push({+ key: "share",+ label: t("common.share"),+ });+ }+ const canWriteSheet = isWorksheetWritableV1(worksheetEntity);+ if (canWriteSheet) {+ items.push(+ {+ key: "rename",+ label: t("sql-editor.tab.context-menu.actions.rename"),+ },+ {+ key: "delete",+ label: t("common.delete"),+ }+ );+ }+ items.push({+ key: "multi-select",+ label: t("sql-editor.tab.context-menu.actions.multi-select"),+ });+ } else {+ if (allowCreateNew) {+ items.push({+ key: "add-folder",+ label: t("sql-editor.tab.context-menu.actions.add-folder"),+ });+ }+ if (viewMode === "my") {+ if (allowCreateNew) {+ items.push({+ key: "add-worksheet",+ label: t("sql-editor.tab.context-menu.actions.add-worksheet"),+ });+ }+ items.push({+ key: "multi-select",+ label: t("sql-editor.tab.context-menu.actions.multi-select"),+ });+ }+ if (currentNode.editable) {+ items.push(+ {+ key: "rename",+ label: t("sql-editor.tab.context-menu.actions.rename"),+ },+ {+ key: "delete",+ label: t("common.delete"),+ }+ );+ }+ }++ return items.map(+ (item): MenuItem => ({ type: "item", key: item.key, label: item.label })+ );+ }, [viewMode, currentNode, worksheetEntity, me, allowCreateNew, t]);++ // ------------------------------------------------------------------+ // Handlers+ // ------------------------------------------------------------------++ /**+ * Called from each tree row's onContextMenu handler.+ * Sets the current node so the ContextMenuContent can render relevant items.+ * Positioning is handled natively by Base UI's ContextMenu trigger.+ */+ const handleContextMenu = (+ e: React.MouseEvent,+ node: WorksheetFolderNode+ ) => {+ e.preventDefault();+ e.stopPropagation();+ setCurrentNode(node);+ setShowSharePanel(false);+ };++ /**+ * Opens the share panel for `node`.+ * Mirrors Vue's handleSharePanelShow (but without x/y positioning).+ */+ const handleSharePanelShow = (+ e: React.MouseEvent,+ node: WorksheetFolderNode+ ) => {+ e.preventDefault();+ e.stopPropagation();+ setCurrentNode(node);+ setShowSharePanel(true);+ };++ /** Resets context when the menu is dismissed (click-outside, ESC, etc.). */+ const handleClickOutside = () => {+ setCurrentNode(undefined);+ setShowSharePanel(false);+ };++ // ------------------------------------------------------------------+ // Return+ // ------------------------------------------------------------------++ return {+ /** Current right-click target node. */+ currentNode,+ /** Computed menu options for the ContextMenu. */+ options,+ /** Worksheet entity resolved from the store (for SharePopoverBody). */+ worksheetEntity,+ /** Whether the share panel should be shown. */+ showSharePanel,+ /** Call from each row's onContextMenu to open the context menu. */+ handleContextMenu,+ /** Opens the share panel for a node. */+ handleSharePanelShow,+ /** Dismiss the menu/panel and clear the current node. */+ handleClickOutside,+ };+}diff --git a/frontend/src/react/components/ui/context-menu.test.tsx b/frontend/src/react/components/ui/context-menu.test.tsxnew file mode 100644index 0000000000..542914c076--- /dev/null+++ b/frontend/src/react/components/ui/context-menu.test.tsx@@ -0,0 +1,267 @@+import { act } from "react";+import { createRoot } from "react-dom/client";+import { afterEach, describe, expect, test, vi } from "vitest";+import {+ ContextMenu,+ ContextMenuContent,+ ContextMenuItem,+ ContextMenuLabel,+ ContextMenuSeparator,+ ContextMenuTrigger,+} from "./context-menu";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++// Base UI's ContextMenu uses ResizeObserver internally.+globalThis.ResizeObserver ??= class ResizeObserver {+ observe() {}+ unobserve() {}+ disconnect() {}+};++describe("ContextMenu", () => {+ afterEach(() => {+ document.body.innerHTML = "";+ });++ test("right-clicking the trigger opens the content", async () => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);++ await act(async () => {+ root.render(+ <ContextMenu>+ <ContextMenuTrigger>+ <div data-testid="trigger">Right-click me</div>+ </ContextMenuTrigger>+ <ContextMenuContent>+ <ContextMenuItem>Action</ContextMenuItem>+ </ContextMenuContent>+ </ContextMenu>+ );+ });++ const trigger = container.querySelector("[data-testid='trigger']");+ expect(trigger).toBeInstanceOf(HTMLDivElement);++ await act(async () => {+ const event = new MouseEvent("contextmenu", {+ bubbles: true,+ cancelable: true,+ clientX: 50,+ clientY: 50,+ });+ trigger?.dispatchEvent(event);+ });++ await vi.waitFor(() => {+ expect(document.body.textContent).toContain("Action");+ });++ await act(async () => {+ root.unmount();+ });+ });++ test("clicking an item fires its onClick", async () => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);+ const onClick = vi.fn();++ await act(async () => {+ root.render(+ <ContextMenu>+ <ContextMenuTrigger>+ <div data-testid="trigger">Right-click me</div>+ </ContextMenuTrigger>+ <ContextMenuContent>+ <ContextMenuItem onClick={onClick}>Clickable</ContextMenuItem>+ </ContextMenuContent>+ </ContextMenu>+ );+ });++ const trigger = container.querySelector("[data-testid='trigger']");++ // Open the menu first+ await act(async () => {+ const event = new MouseEvent("contextmenu", {+ bubbles: true,+ cancelable: true,+ clientX: 50,+ clientY: 50,+ });+ trigger?.dispatchEvent(event);+ });++ await vi.waitFor(() => {+ expect(document.body.textContent).toContain("Clickable");+ });++ // Click the item+ await act(async () => {+ const item = Array.from(+ document.querySelectorAll("[role='menuitem']")+ ).find((el) => el.textContent === "Clickable");+ item?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ expect(onClick).toHaveBeenCalledTimes(1);++ await act(async () => {+ root.unmount();+ });+ });++ test("ESC key closes the menu", async () => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);++ await act(async () => {+ root.render(+ <ContextMenu>+ <ContextMenuTrigger>+ <div data-testid="trigger">Right-click me</div>+ </ContextMenuTrigger>+ <ContextMenuContent>+ <ContextMenuItem>Action</ContextMenuItem>+ </ContextMenuContent>+ </ContextMenu>+ );+ });++ const trigger = container.querySelector("[data-testid='trigger']");++ // Open the menu+ await act(async () => {+ const event = new MouseEvent("contextmenu", {+ bubbles: true,+ cancelable: true,+ clientX: 50,+ clientY: 50,+ });+ trigger?.dispatchEvent(event);+ });++ await vi.waitFor(() => {+ expect(document.body.textContent).toContain("Action");+ });++ // Press ESC+ await act(async () => {+ document.dispatchEvent(+ new KeyboardEvent("keydown", { key: "Escape", bubbles: true })+ );+ });++ await vi.waitFor(() => {+ expect(document.body.textContent).not.toContain("Action");+ });++ await act(async () => {+ root.unmount();+ });+ });++ test("disabled items do not fire onClick when clicked", async () => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);+ const onClick = vi.fn();++ await act(async () => {+ root.render(+ <ContextMenu>+ <ContextMenuTrigger>+ <div data-testid="trigger">Right-click me</div>+ </ContextMenuTrigger>+ <ContextMenuContent>+ <ContextMenuItem disabled onClick={onClick}>+ Disabled action+ </ContextMenuItem>+ </ContextMenuContent>+ </ContextMenu>+ );+ });++ const trigger = container.querySelector("[data-testid='trigger']");++ // Open the menu+ await act(async () => {+ const event = new MouseEvent("contextmenu", {+ bubbles: true,+ cancelable: true,+ clientX: 50,+ clientY: 50,+ });+ trigger?.dispatchEvent(event);+ });++ await vi.waitFor(() => {+ expect(document.body.textContent).toContain("Disabled action");+ });++ // Attempt to click the disabled item+ await act(async () => {+ const item = Array.from(+ document.querySelectorAll("[role='menuitem']")+ ).find((el) => el.textContent === "Disabled action");+ item?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ expect(onClick).not.toHaveBeenCalled();++ await act(async () => {+ root.unmount();+ });+ });++ test("renders separator and label without errors", async () => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);++ await act(async () => {+ root.render(+ <ContextMenu>+ <ContextMenuTrigger>+ <div data-testid="trigger">Right-click me</div>+ </ContextMenuTrigger>+ <ContextMenuContent>+ <ContextMenuLabel>Section</ContextMenuLabel>+ <ContextMenuItem>Item one</ContextMenuItem>+ <ContextMenuSeparator />+ <ContextMenuItem>Item two</ContextMenuItem>+ </ContextMenuContent>+ </ContextMenu>+ );+ });++ const trigger = container.querySelector("[data-testid='trigger']");++ await act(async () => {+ const event = new MouseEvent("contextmenu", {+ bubbles: true,+ cancelable: true,+ clientX: 50,+ clientY: 50,+ });+ trigger?.dispatchEvent(event);+ });++ await vi.waitFor(() => {+ expect(document.body.textContent).toContain("Section");+ expect(document.body.textContent).toContain("Item one");+ expect(document.body.textContent).toContain("Item two");+ });++ await act(async () => {+ root.unmount();+ });+ });+});diff --git a/frontend/src/react/components/ui/context-menu.tsx b/frontend/src/react/components/ui/context-menu.tsxnew file mode 100644index 0000000000..ff03f28628--- /dev/null+++ b/frontend/src/react/components/ui/context-menu.tsx@@ -0,0 +1,111 @@+import { ContextMenu as BaseContextMenu } from "@base-ui/react/context-menu";+import type { ComponentProps } from "react";+import { cn } from "@/react/lib/utils";+import {+ getLayerRoot,+ LAYER_SURFACE_CLASS,+ usePreserveHigherLayerAccess,+} from "./layer";++// ---- Root ----+// Wraps BaseContextMenu.Root. ContextMenu has no `modal` prop (it is omitted+// by Base UI); right-click menus are inherently non-modal.+const ContextMenu = BaseContextMenu.Root;++// ---- Trigger ----+// Renders a <div> by default. Wrap the target element to enable right-click.+const ContextMenuTrigger = BaseContextMenu.Trigger;++// ---- Portal + Positioner + Popup ----+function ContextMenuContent({+ className,+ children,+ ref,+ ...props+}: ComponentProps<typeof BaseContextMenu.Popup>) {+ usePreserveHigherLayerAccess("overlay");++ return (+ <BaseContextMenu.Portal container={getLayerRoot("overlay")}>+ <BaseContextMenu.Positioner className={LAYER_SURFACE_CLASS}>+ <BaseContextMenu.Popup+ ref={ref}+ className={cn(+ "min-w-[10rem] overflow-hidden rounded-sm border border-control-border bg-background py-1 shadow-md",+ "focus:outline-hidden",+ className+ )}+ {...props}+ >+ {children}+ </BaseContextMenu.Popup>+ </BaseContextMenu.Positioner>+ </BaseContextMenu.Portal>+ );+}++// ---- Item ----+function ContextMenuItem({+ className,+ children,+ ref,+ ...props+}: ComponentProps<typeof BaseContextMenu.Item>) {+ return (+ <BaseContextMenu.Item+ ref={ref}+ className={cn(+ "relative flex items-center gap-x-2 px-2 py-1.5 text-sm cursor-pointer select-none",+ "hover:bg-control-bg focus:bg-control-bg outline-hidden",+ "data-highlighted:bg-control-bg",+ "data-disabled:pointer-events-none data-disabled:opacity-50",+ className+ )}+ {...props}+ >+ {children}+ </BaseContextMenu.Item>+ );+}++// ---- Separator ----+function ContextMenuSeparator({+ className,+ ref,+ ...props+}: ComponentProps<typeof BaseContextMenu.Separator>) {+ return (+ <BaseContextMenu.Separator+ ref={ref}+ className={cn("my-1 border-t border-control-border", className)}+ {...props}+ />+ );+}++// ---- Label ----+// Non-interactive section header. Not a Base UI component — rendered as a+// plain <div> since Base UI's ContextMenu has no GroupLabel styled element.+function ContextMenuLabel({+ className,+ ...props+}: React.HTMLAttributes<HTMLDivElement>) {+ return (+ <div+ className={cn(+ "px-2 py-1.5 text-xs font-semibold text-control-light",+ className+ )}+ {...props}+ />+ );+}++export {+ ContextMenu,+ ContextMenuTrigger,+ ContextMenuContent,+ ContextMenuItem,+ ContextMenuSeparator,+ ContextMenuLabel,+};diff --git a/frontend/src/react/components/ui/dropdown-menu.tsx b/frontend/src/react/components/ui/dropdown-menu.tsxindex 3d09f91bb5..30591250a0 100644--- a/frontend/src/react/components/ui/dropdown-menu.tsx+++ b/frontend/src/react/components/ui/dropdown-menu.tsx@@ -26,17 +26,23 @@ function DropdownMenuContent({children,sideOffset = 4,align = "end",+ anchor,+ positionMethod,ref,...props}: ComponentProps<typeof BaseMenu.Popup> & {sideOffset?: ComponentProps<typeof BaseMenu.Positioner>["sideOffset"];align?: ComponentProps<typeof BaseMenu.Positioner>["align"];+ anchor?: ComponentProps<typeof BaseMenu.Positioner>["anchor"];+ positionMethod?: ComponentProps<typeof BaseMenu.Positioner>["positionMethod"];}) {return (<BaseMenu.Portal container={getLayerRoot("overlay")}><BaseMenu.PositionersideOffset={sideOffset}align={align}+ anchor={anchor}+ positionMethod={positionMethod}className={LAYER_SURFACE_CLASS}><BaseMenu.Popupdiff --git a/frontend/src/react/components/ui/tree.tsx b/frontend/src/react/components/ui/tree.tsxindex 62416b1b9e..978e10d1b8 100644--- a/frontend/src/react/components/ui/tree.tsx+++ b/frontend/src/react/components/ui/tree.tsx@@ -1,6 +1,6 @@import type { CSSProperties, ReactNode } from "react";import { useEffect, useRef } from "react";-import type { NodeApi, TreeApi } from "react-arborist";+import type { MoveHandler, NodeApi, TreeApi } from "react-arborist";import { Tree as ArboristTree } from "react-arborist";import { cn } from "@/react/lib/utils";@@ -15,6 +15,7 @@ export interface TreeProps<T> {readonly renderNode: (args: {node: NodeApi<TreeDataNode<T>>;style: CSSProperties;+ dragHandle?: (el: HTMLDivElement | null) => void;}) => ReactNode;readonly selectedIds?: readonly string[];@@ -29,6 +30,18 @@ export interface TreeProps<T> {readonly rowHeight?: number;readonly indent?: number;+ // Drag-and-drop. Defaults are disabled — opt in by passing `onMove` AND+ // setting `disableDrag` / `disableDrop` to false (or a per-node predicate).+ readonly onMove?: MoveHandler<TreeDataNode<T>>;+ readonly disableDrag?: boolean | ((data: TreeDataNode<T>) => boolean);+ readonly disableDrop?:+ | boolean+ | ((args: {+ parentNode: NodeApi<TreeDataNode<T>>;+ dragNodes: NodeApi<TreeDataNode<T>>[];+ index: number;+ }) => boolean);+readonly className?: string;}@@ -44,6 +57,9 @@ export function Tree<T>({height = 300,rowHeight = 28,indent = 16,+ onMove,+ disableDrag = true,+ disableDrop = true,className,}: TreeProps<T>) {const treeRef = useRef<TreeApi<TreeDataNode<T>> | null>(null);@@ -104,18 +120,21 @@ export function Tree<T>({selection={selectedIds?.[0]}onSelect={handleSelect}onToggle={onToggle}+ onMove={onMove}searchTerm={searchTerm}searchMatch={resolvedSearchMatch}openByDefault={false}- disableDrag- disableDrop+ disableDrag={disableDrag}+ disableDrop={disableDrop}disableEditheight={height}rowHeight={rowHeight}indent={indent}width="100%">- {({ node, style }) => renderNode({ node, style })}+ {({ node, style, dragHandle }) =>+ renderNode({ node, style, dragHandle })+ }</ArboristTree></div>);diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.jsonindex 2dd1b26752..cfeb4dcadb 100644--- a/frontend/src/react/locales/en-US.json+++ b/frontend/src/react/locales/en-US.json@@ -262,6 +262,7 @@"done": "Done","download": "Download","draft": "Draft",+ "duplicate": "Duplicate","duration": "Duration","edit": "Edit","email": "Email",@@ -282,6 +283,7 @@},"filter": "Filter","filter-by-name": "Filter by name",+ "fork": "Fork","from": "From","general": "General","go-back": "Go back",@@ -411,6 +413,7 @@"version": "Version","view": "View","view-details": "View Details",+ "visibility": "Visibility","want-help": "Want help","warning": "Warning","webhooks": "Webhooks",@@ -2450,6 +2453,29 @@"team": "Work with teammates, need CI/CD pipeline"}},+ "sheet": {+ "filter": {+ "only-show-starred": "Only show starred",+ "show-draft": "Show draft",+ "show-mine": "Show mine",+ "show-shared": "Show shared"+ },+ "hint-tips": {+ "confirm-to-delete-sheet-title": "Confirm to delete this worksheet?",+ "confirm-to-duplicate-sheet": "Confirm to duplicate this worksheet?",+ "delete-all-sheets": "Delete all files",+ "duplicate-folder-name-content": "Do you want to merge all subfolders and files into the existing folder \"{{folder}}\"?",+ "duplicate-folder-name-title": "Duplicate folder name",+ "move-to-root-folder": "Move to root folder",+ "non-empty-folder-content": "Do you want to move all worksheets into the root folder or just delete them?",+ "non-empty-folder-title": "Non-empty folder"+ },+ "move-worksheets": "Move worksheets",+ "notifications": {+ "duplicate-success": "Successfully duplicate the worksheet"+ },+ "search-sheets": "Search Sheets"+ },"sql-editor": {"access-grants": "Access Grants","access-search": {@@ -2484,6 +2510,11 @@"expired": "Expired","format-sql": "Format SQL","grant-type-unmask": "Unmask",+ "hint-tips": {+ "confirm-to-close-unsaved-sheet": {+ "content": "Close the sheet and lose any unsaved data?"+ }+ },"jit": "Just-In-Time Access","link-access": "Link access","no-access-requests": "No access requests",@@ -2519,6 +2550,16 @@"search-history-by-statement": "Search by statement","select-a-database-to-start": "Select a database to start","self": "SQL Editor",+ "tab": {+ "context-menu": {+ "actions": {+ "add-folder": "Add folder",+ "add-worksheet": "Add worksheet",+ "multi-select": "Multi-select",+ "rename": "Rename"+ }+ }+ },"unmask-warning": "The query result may include unmasked sensitive data.","url-copied-to-clipboard": "The URL is copied to your clipboard","view-issue": "View Issue",diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.jsonindex 5a485f12f8..f227058074 100644--- a/frontend/src/react/locales/es-ES.json+++ b/frontend/src/react/locales/es-ES.json@@ -259,6 +259,7 @@"done": "Hecho","download": "Descargar","draft": "Borrador",+ "duplicate": "Duplicar","duration": "Duration","edit": "Editar","email": "Correo electrónico",@@ -279,6 +280,7 @@},"filter": "Filter","filter-by-name": "Filtrar por nombre",+ "fork": "Bifurcación","from": "Desde","general": "General","go-back": "Volver",@@ -405,6 +407,7 @@"version": "Versión","view": "Ver","view-details": "Ver Detalles",+ "visibility": "Visibilidad","warning": "Advertencia","webhooks": "Webhooks","write-only": "solo escritura",@@ -2436,6 +2439,29 @@"team": "Trabajar con compañeros de equipo, necesita una canalización de CI/CD"}},+ "sheet": {+ "filter": {+ "only-show-starred": "Solo programa protagonizado",+ "show-draft": "Mostrar borrador",+ "show-mine": "Muéstrame el mío",+ "show-shared": "Mostrar compartido"+ },+ "hint-tips": {+ "confirm-to-delete-sheet-title": "¿Confirmar la eliminación de esta hoja de cálculo?",+ "confirm-to-duplicate-sheet": "¿Confirmar para duplicar esta hoja?",+ "delete-all-sheets": "Eliminar todos los archivos",+ "duplicate-folder-name-content": "¿Desea fusionar todas las subcarpetas y archivos en la carpeta existente \"{{folder}}\"?",+ "duplicate-folder-name-title": "Nombre de carpeta duplicado",+ "move-to-root-folder": "Mover a la carpeta raíz",+ "non-empty-folder-content": "¿Desea mover todas las hojas de cálculo a la carpeta raíz o simplemente eliminarlas?",+ "non-empty-folder-title": "carpeta no vacía"+ },+ "move-worksheets": "Hojas de trabajo de movimiento",+ "notifications": {+ "duplicate-success": "Duplicado con éxito en \"Mis hojas\""+ },+ "search-sheets": "Hojas de búsqueda"+ },"sql-editor": {"access-grants": "Access Grants","access-search": {@@ -2470,6 +2496,11 @@"expired": "Expired","format-sql": "Format SQL","grant-type-unmask": "Unmask",+ "hint-tips": {+ "confirm-to-close-unsaved-sheet": {+ "content": "¿Cerrar la hoja y perder cualquier dato no guardado?"+ }+ },"jit": "Just-In-Time Access","link-access": "Acceso al enlace","no-access-requests": "No access requests",@@ -2505,6 +2536,16 @@"search-history-by-statement": "Búsqueda por enunciado","select-a-database-to-start": "Seleccione una base de datos para comenzar","self": "Editor de SQL",+ "tab": {+ "context-menu": {+ "actions": {+ "add-folder": "Agregar carpeta",+ "add-worksheet": "Agregar hoja de trabajo",+ "multi-select": "Selección múltiple",+ "rename": "Renombrar"+ }+ }+ },"unmask-warning": "The query result may include unmasked sensitive data.","url-copied-to-clipboard": "La URL se copia al portapapeles.","view-issue": "View Issue",diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.jsonindex 2cea857b4b..db7d5354f5 100644--- a/frontend/src/react/locales/ja-JP.json+++ b/frontend/src/react/locales/ja-JP.json@@ -259,6 +259,7 @@"done": "完了","download": "ダウンロード","draft": "下書き",+ "duplicate": "コピー","duration": "Duration","edit": "編集","email": "メールアドレス",@@ -279,6 +280,7 @@},"filter": "Filter","filter-by-name": "名前でフィルタリングする",+ "fork": "フォーク","from": "開始","general": "全般","go-back": "戻る",@@ -405,6 +407,7 @@"version": "バージョン","view": "表示","view-details": "詳細を表示",+ "visibility": "可視性","warning": "警告する","webhooks": "Webhook","write-only": "書き込み専用",@@ -2436,6 +2439,29 @@"team": "チームメイトと協力し、CI/CD パイプラインが必要"}},+ "sheet": {+ "filter": {+ "only-show-starred": "スター付きのみ表示",+ "show-draft": "下書きを表示",+ "show-mine": "私のものを表示",+ "show-shared": "共有を表示"+ },+ "hint-tips": {+ "confirm-to-delete-sheet-title": "このワークシートを削除しますか?",+ "confirm-to-duplicate-sheet": "このワークシートをコピーしてもよろしいですか?",+ "delete-all-sheets": "すべてのファイルを削除する",+ "duplicate-folder-name-content": "すべてのサブフォルダーとファイルを既存のフォルダー \"{{folder}}\" にマージしますか?",+ "duplicate-folder-name-title": "重複したフォルダ名",+ "move-to-root-folder": "ルートフォルダに移動する",+ "non-empty-folder-content": "すべてのワークシートをルート フォルダーに移動しますか、それとも削除するだけですか?",+ "non-empty-folder-title": "空でないフォルダ"+ },+ "move-worksheets": "ワークシートを移動する",+ "notifications": {+ "duplicate-success": "「マイワークシート」にコピーされました"+ },+ "search-sheets": "ワークシートの検索"+ },"sql-editor": {"access-grants": "Access Grants","access-search": {@@ -2470,6 +2496,11 @@"expired": "Expired","format-sql": "Format SQL","grant-type-unmask": "Unmask",+ "hint-tips": {+ "confirm-to-close-unsaved-sheet": {+ "content": "現在のワークシートを閉じると、保存されていないデータはすべて失われますか?"+ }+ },"jit": "Just-In-Time Access","link-access": "リンクアクセス","no-access-requests": "No access requests",@@ -2505,6 +2536,16 @@"search-history-by-statement": "ステートメントで検索","select-a-database-to-start": "開始するにはデータベースを選択してください","self": "SQLエディタ",+ "tab": {+ "context-menu": {+ "actions": {+ "add-folder": "フォルダを追加",+ "add-worksheet": "ワークシートを追加",+ "multi-select": "複数選択",+ "rename": "名前の変更"+ }+ }+ },"unmask-warning": "The query result may include unmasked sensitive data.","url-copied-to-clipboard": "URLがクリップボードにコピーされました","view-issue": "View Issue",diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.jsonindex 2c55a4d753..2b760ea697 100644--- a/frontend/src/react/locales/vi-VN.json+++ b/frontend/src/react/locales/vi-VN.json@@ -259,6 +259,7 @@"done": "Hoàn tất","download": "Tải xuống","draft": "Bản nháp",+ "duplicate": "Nhân bản","duration": "Duration","edit": "Chỉnh sửa","email": "Email",@@ -279,6 +280,7 @@},"filter": "Filter","filter-by-name": "Lọc theo tên",+ "fork": "Bản sao","from": "Từ","general": "Chung","go-back": "Quay lại",@@ -405,6 +407,7 @@"version": "Phiên bản","view": "Xem","view-details": "Xem Chi tiết",+ "visibility": "Hiển thị","warning": "Cảnh báo","webhooks": "Webhooks","write-only": "chỉ ghi",@@ -2436,6 +2439,29 @@"team": "Làm việc với đồng đội, cần có đường ống CI/CD"}},+ "sheet": {+ "filter": {+ "only-show-starred": "Chỉ hiển thị có dấu sao",+ "show-draft": "Hiển thị bản nháp",+ "show-mine": "Hiển thị của tôi",+ "show-shared": "Hiển thị chia sẻ"+ },+ "hint-tips": {+ "confirm-to-delete-sheet-title": "Xác nhận xóa bảng tính này?",+ "confirm-to-duplicate-sheet": "Xác nhận nhân bản trang tính này?",+ "delete-all-sheets": "Xóa tất cả các tập tin",+ "duplicate-folder-name-content": "Bạn có muốn hợp nhất tất cả các thư mục con và tệp vào thư mục hiện có \"{{folder}}\" không?",+ "duplicate-folder-name-title": "Tên thư mục trùng lặp",+ "move-to-root-folder": "Di chuyển đến thư mục gốc",+ "non-empty-folder-content": "Bạn muốn di chuyển tất cả các trang tính vào thư mục gốc hay chỉ xóa chúng?",+ "non-empty-folder-title": "Thư mục không trống"+ },+ "move-worksheets": "Di chuyển các trang tính",+ "notifications": {+ "duplicate-success": "Đã nhân bản thành công vào \"Trang tính của tôi\""+ },+ "search-sheets": "Tìm kiếm Trang tính"+ },"sql-editor": {"access-grants": "Access Grants","access-search": {@@ -2470,6 +2496,11 @@"expired": "Expired","format-sql": "Format SQL","grant-type-unmask": "Unmask",+ "hint-tips": {+ "confirm-to-close-unsaved-sheet": {+ "content": "Đóng trang tính và mất bất kỳ dữ liệu chưa lưu nào?"+ }+ },"jit": "Just-In-Time Access","link-access": "Truy cập liên kết","no-access-requests": "No access requests",@@ -2505,6 +2536,16 @@"search-history-by-statement": "Tìm kiếm theo câu lệnh","select-a-database-to-start": "Chọn một cơ sở dữ liệu để bắt đầu","self": "Trình soạn thảo SQL",+ "tab": {+ "context-menu": {+ "actions": {+ "add-folder": "Thêm thư mục",+ "add-worksheet": "Thêm bảng tính",+ "multi-select": "Chọn nhiều",+ "rename": "Đổi tên"+ }+ }+ },"unmask-warning": "The query result may include unmasked sensitive data.","url-copied-to-clipboard": "URL đã được sao chép vào bảng nhớ tạm của bạn","view-issue": "View Issue",diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.jsonindex 648006e846..51e1d0a292 100644--- a/frontend/src/react/locales/zh-CN.json+++ b/frontend/src/react/locales/zh-CN.json@@ -259,6 +259,7 @@"done": "完成","download": "下载","draft": "草稿",+ "duplicate": "拷贝","duration": "Duration","edit": "编辑","email": "邮箱",@@ -279,6 +280,7 @@},"filter": "Filter","filter-by-name": "按名称过滤",+ "fork": "复刻","from": "从","general": "通用","go-back": "返回",@@ -405,6 +407,7 @@"version": "版本","view": "查看","view-details": "查看详情",+ "visibility": "可见性","warning": "警告","webhooks": "Webhook","write-only": "仅写入",@@ -2436,6 +2439,29 @@"team": "与队友合作,需要 CI/CD 工作流"}},+ "sheet": {+ "filter": {+ "only-show-starred": "仅显示收藏",+ "show-draft": "显示草稿",+ "show-mine": "显示我的",+ "show-shared": "显示共享"+ },+ "hint-tips": {+ "confirm-to-delete-sheet-title": "确认删除此工作表?",+ "confirm-to-duplicate-sheet": "确定要复制这条工作表?",+ "delete-all-sheets": "删除所有文件",+ "duplicate-folder-name-content": "是否要将所有子文件夹和文件合并到现有文件夹“{{folder}}”中?",+ "duplicate-folder-name-title": "重复的文件夹名称",+ "move-to-root-folder": "移动到根文件夹",+ "non-empty-folder-content": "您是想将所有工作表移动到根文件夹,还是直接删除它们?",+ "non-empty-folder-title": "非空文件夹"+ },+ "move-worksheets": "移动工作表",+ "notifications": {+ "duplicate-success": "已成功拷贝至“我的工作表”"+ },+ "search-sheets": "搜索工作表"+ },"sql-editor": {"access-grants": "访问授权","access-search": {@@ -2470,6 +2496,11 @@"expired": "已过期","format-sql": "格式化 SQL","grant-type-unmask": "脱敏豁免",+ "hint-tips": {+ "confirm-to-close-unsaved-sheet": {+ "content": "关闭当前工作表会丢失所有未保存的数据?"+ }+ },"jit": "即时访问","link-access": "链接访问权限","no-access-requests": "暂无访问请求",@@ -2505,6 +2536,16 @@"search-history-by-statement": "搜索 SQL 语句","select-a-database-to-start": "选择数据库以开始","self": "SQL 编辑器",+ "tab": {+ "context-menu": {+ "actions": {+ "add-folder": "添加文件夹",+ "add-worksheet": "添加工作表",+ "multi-select": "多选",+ "rename": "重命名"+ }+ }+ },"unmask-warning": "The query result may include unmasked sensitive data.","url-copied-to-clipboard": "URL 已复制到剪贴板","view-issue": "查看工单",diff --git a/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue b/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vueindex b67818ea49..9fe6d4e099 100644--- a/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue+++ b/frontend/src/views/sql-editor/AsidePanel/AsidePanel.vue@@ -52,7 +52,10 @@<div class="flex-1 flex flex-row overflow-hidden"><div class="h-full flex-1 flex flex-col pt-1 overflow-hidden">- <WorksheetPane v-if="asidePanelTab === 'WORKSHEET'" />+ <ReactPageMount+ v-if="asidePanelTab === 'WORKSHEET'"+ page="WorksheetPane"+ /><SchemaPane v-if="asidePanelTab === 'SCHEMA'" /><ReactPageMountv-if="asidePanelTab === 'HISTORY'"@@ -85,7 +88,6 @@ import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";import { useSQLEditorContext } from "../context";import ActionBar from "./ActionBar";import SchemaPane from "./SchemaPane";-import WorksheetPane from "./WorksheetPane";const editorStore = useSQLEditorStore();const actuatorStore = useActuatorV1Store();diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/FilterMenuItem.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/FilterMenuItem.vuedeleted file mode 100644index 7fe369a9ad..0000000000--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/FilterMenuItem.vue+++ /dev/null@@ -1,25 +0,0 @@-<template>- <div class="menu-item">- <div class="flex flex-row items-center gap-x-4 justify-between">- <span>{{ label }}</span>- <NSwitch size="small" :value="value" @update:value="handleUpdate" />- </div>- </div>-</template>--<script setup lang="ts">-import { NSwitch } from "naive-ui";--defineProps<{- label: string;- value: boolean;-}>();--const emit = defineEmits<{- "update:value": [value: boolean];-}>();--const handleUpdate = (val: boolean) => {- emit("update:value", val);-};-</script>diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vuedeleted file mode 100644index d0b43b262e..0000000000--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue+++ /dev/null@@ -1,850 +0,0 @@-<template>- <div class="flex flex-col items-stretch gap-y-1 relative worksheet-tree">- <div v-if="isLoading" class="p-2 pl-7">- <BBSpin :size="16" />- </div>-- <template v-else>- <NTree- block-line- block-node- :keyboard="false"- :draggable="props.view !== 'draft' && !editingNode && !multiSelectMode"- :data="treeData"- :multiple="false"- cascade- :selectable="true"- :checkable="multiSelectMode"- :show-irrelevant-nodes="false"- :filter="filterNode(folderContext.rootPath.value)"- :pattern="worksheetFilter.keyword"- :render-suffix="renderSuffix"- :render-prefix="renderPrefix"- :render-label="renderLabel"- :node-props="nodeProps"- :expanded-keys="expandedKeysArray"- :selected-keys="selectedKeys"- :checked-keys="checkedKeys"- @drop="handleDrop"- @update:expanded-keys="onExpandedKeysUpdate"- @update:checked-keys="onCheckedKeysUpdate"- />- </template>-- <NDropdown- class="worksheet-menu"- trigger="manual"- placement="bottom-start"- :show="contextMenuContext.showDropdown"- :options="contextMenuOptions"- :x="contextMenuContext.position.x"- :y="contextMenuContext.position.y"- @select="handleContextMenuSelect"- @clickoutside="handleContextMenuClickOutside"- />-- <NPopover- trigger="manual"- placement="bottom-start"- :show-arrow="true"- :disabled="false"- :show="contextMenuContext.showSharePanel"- :x="contextMenuContext.position.x"- :y="contextMenuContext.position.y"- @clickoutside="handleContextMenuClickOutside"- >- <ReactPageMount page="SharePopoverBody"- :worksheet="worksheetEntity"- :onUpdated="handleContextMenuClickOutside" />- </NPopover>- </div>-</template>--<script setup lang="tsx">-import { useDebounceFn } from "@vueuse/core";-import {- NDropdown,- NInput,- NPopover,- NTree,- type TreeDropInfo,- type TreeOption,- useDialog,-} from "naive-ui";-import { storeToRefs } from "pinia";-import { computed, nextTick, watch } from "vue";-import { BBSpin } from "@/bbkit";-import { HighlightLabelText } from "@/components/v2";-import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";-import { t } from "@/plugins/i18n";-import ReactPageMount from "@/react/ReactPageMount.vue";-import {- pushNotification,- useSQLEditorStore,- useSQLEditorTabStore,- useWorkSheetStore,-} from "@/store";-import { DEBOUNCE_SEARCH_DELAY } from "@/types";-import { defer, isDescendantOf } from "@/utils";-import { useSQLEditorContext } from "@/views/sql-editor/context";-import {- openWorksheetByName,- revealNodes,- revealWorksheets,- type SheetViewMode,- useSheetContext,- useSheetContextByView,- type WorksheetFolderNode,-} from "@/views/sql-editor/Sheet";-import { filterNode } from "./common";-import { type DropdownOptionType, useDropdown } from "./dropdown";-import TreeNodePrefix from "./TreeNodePrefix.vue";-import TreeNodeSuffix from "./TreeNodeSuffix.vue";--const props = withDefaults(- defineProps<{- view: SheetViewMode;- multiSelectMode?: boolean;- checkedNodes?: WorksheetFolderNode[];- }>(),- {- multiSelect: false,- checkedNodes: () => [],- }-);--const emit = defineEmits<{- (event: "update:multiSelectMode", multiSelect: boolean): void;- (event: "update:checkedNodes", nodes: WorksheetFolderNode[]): void;-}>();--const worksheetV1Store = useWorkSheetStore();-const { project } = storeToRefs(useSQLEditorStore());-const editorContext = useSQLEditorContext();-const {- filter: worksheetFilter,- selectedKeys,- expandedKeys,- editingNode,- batchUpdateWorksheetFolders,-} = useSheetContext();-const {- events,- isInitialized,- isLoading,- sheetTree,- fetchSheetList,- folderContext,- getFoldersForWorksheet,-} = useSheetContextByView(props.view);-const $dialog = useDialog();-const tabStore = useSQLEditorTabStore();--const {- context: contextMenuContext,- options: contextMenuOptions,- worksheetEntity,- handleSharePanelShow,- handleMenuShow,- handleClickOutside: handleContextMenuClickOutside,-} = useDropdown(- props.view,- computed(() => worksheetFilter.value)-);--const expandedKeysArray = computed(() => Array.from(expandedKeys.value));-const treeData = computed(() => [sheetTree.value]);-const checkedKeys = computed(() => props.checkedNodes.map((node) => node.key));--const onCheckedKeysUpdate = (- _: Array<string | number>,- options: Array<TreeOption | null>-) => {- emit(- "update:checkedNodes",- options.filter((node) => node) as WorksheetFolderNode[]- );-};--const onExpandedKeysUpdate = (keys: string[]) => {- if (expandedKeys.value.size > 1 && keys.length === 0) {- // do not clear the expanded keys- return;- }- expandedKeys.value = new Set(keys);-};--watch(- isInitialized,- async () => {- if (!isInitialized.value && project.value) {- await fetchSheetList();- }- },- { immediate: true }-);--watch(- () => project.value,- () => {- isInitialized.value = false;- }-);--const handleWorksheetToggleStar = useDebounceFn(- async ({ worksheet, starred }: { worksheet: string; starred: boolean }) => {- await worksheetV1Store.upsertWorksheetOrganizer(- {- worksheet: worksheet,- starred,- },- ["starred"]- );- },- DEBOUNCE_SEARCH_DELAY-);--const renderPrefix = ({ option }: { option: TreeOption }) => {- const node = option as WorksheetFolderNode;- return (- <TreeNodePrefix- node={node}- expandedKeys={expandedKeys.value}- rootPath={folderContext.rootPath.value}- view={props.view}- />- );-};--const renderSuffix = ({ option }: { option: TreeOption }) => {- const node = option as WorksheetFolderNode;- return (- <TreeNodeSuffix- node={node}- view={props.view}- onSharePanelShow={handleSharePanelShow}- onContextMenuShow={handleMenuShow}- onToggleStar={handleWorksheetToggleStar}- />- );-};--const handleRenameNode = useDebounceFn(async () => {- if (!editingNode.value) {- return;- }-- const cleanup = () => {- nextTick(() => (editingNode.value = undefined));- };-- const newTitle = editingNode.value.node.label.trim();- if (!newTitle) {- editingNode.value.node.label = editingNode.value.rawLabel;- return cleanup();- }-- const newKey = [- ...editingNode.value.node.key.split("/").slice(0, -1),- newTitle,- ].join("/");- if (newKey === editingNode.value.node.key) {- return cleanup();- }-- if (editingNode.value.node.worksheet) {- const worksheet = worksheetV1Store.getWorksheetByName(- editingNode.value.node.worksheet.name- );- if (!worksheet) {- return cleanup();- }- await worksheetV1Store.patchWorksheet(- {- ...worksheet,- title: newTitle,- },- ["title"]- );-- // update tab title- const tab = tabStore.getTabByWorksheet(worksheet.name);- if (tab) {- tabStore.updateTab(tab.id, {- title: newTitle,- });- }-- cleanup();- } else {- const editing = editingNode.value;- const moveFolder = async () => {- await updateWorksheetFolders(editing.node, editing.node.key, newKey);- replaceExpandedKeys({ oldKey: editing.node.key, newKey });- folderContext.moveFolder(editing.node.key, newKey);- cleanup();- };-- const parentNode = findParentNode(- sheetTree.value,- editingNode.value.node.key- );- const merge = await handleDuplicateFolderName(parentNode, newKey);- if (merge) {- await moveFolder();- } else {- editing.node.label = editing.rawLabel;- cleanup();- }- }-}, DEBOUNCE_SEARCH_DELAY);--const renderLabel = ({ option }: { option: TreeOption }) => {- const node = option as WorksheetFolderNode;-- if (editingNode.value && editingNode.value.node.key === node.key) {- return (- <NInput- value={editingNode.value.node.label}- size="small"- inputProps={{- // the autofocus not always work,- // so we need to set the id for input and use the document.getElementById API- id: `input-${editingNode.value.node.key}`,- }}- autofocus={true}- onBlur={async () => {- await handleRenameNode();- }}- onKeyup={async (e: KeyboardEvent) => {- if (e.key === "Enter") {- await handleRenameNode();- }- }}- onInput={(val: string) => {- if (!editingNode.value) {- return;- }- if (!editingNode.value.node.worksheet) {- {- /* the folder name cannot contains "/" or "." */- }- if (val.includes("/") || val.includes(".")) {- return;- }- }- editingNode.value.node.label = val;- }}- />- );- }-- return (- <HighlightLabelText- text={node.label}- keyword={worksheetFilter.value.keyword}- />- );-};--const nodeProps = ({ option }: { option: TreeOption }) => {- const node = option as WorksheetFolderNode;-- return {- "data-item-key": node.key,- onClick(e: MouseEvent) {- if (- !isDescendantOf(e.target as Element, ".n-tree-node-content__text") &&- !isDescendantOf(e.target as Element, ".n-tree-node-content__prefix")- ) {- return;- }- if (editingNode.value) {- return;- }- if (node.worksheet) {- if (node.worksheet.type === "worksheet") {- openWorksheetByName({- worksheet: node.worksheet.name,- forceNewTab: e.metaKey || e.ctrlKey,- });- } else {- tabStore.setCurrentTabId(node.worksheet.name);- }- } else {- if (expandedKeys.value.has(node.key)) {- expandedKeys.value.delete(node.key);- } else {- expandedKeys.value.add(node.key);- }- }- },- };-};--const deleteWorksheets = async (worksheets: string[]) => {- await Promise.all(- worksheets.map((worksheet) =>- worksheetV1Store.deleteWorksheetByName(worksheet)- )- );- for (const worksheet of worksheets) {- const tab = tabStore.getTabByWorksheet(worksheet);- if (tab) {- tabStore.closeTab(tab.id);- }- }-};--const handleMultiDelete = async (nodes: WorksheetFolderNode[]) => {- const folders: string[] = [];- const worksheets: string[] = [];- for (const node of nodes) {- if (node.worksheet) {- worksheets.push(node.worksheet.name);- continue;- }- if (node.key === folderContext.rootPath.value) {- continue;- }- if (- folders.length > 0 &&- folderContext.isSubFolder({- parent: folders.slice(-1)[0],- path: node.key,- dig: true,- })- ) {- continue;- }- folders.push(node.key);- }- const removed = await handleDeleteFolders(folders, worksheets);- if (removed) {- emit("update:multiSelectMode", false);- }-};--const handleDeleteFolders = (folders: string[], worksheets: string[]) => {- const _defer = defer<boolean>();- const cleanFolders = () => {- for (const folder of folders) {- folderContext.removeFolder(folder);- }- };-- if (worksheets.length === 0) {- cleanFolders();- _defer.resolve(true);- } else {- const dialogInstance = $dialog.create({- title: t("sheet.hint-tips.non-empty-folder-title"),- content: t("sheet.hint-tips.non-empty-folder-content"),- type: "warning",- autoFocus: false,- closable: true,- maskClosable: true,- closeOnEsc: true,- negativeText: t("sheet.hint-tips.delete-all-sheets"),- negativeButtonProps: {- type: "error",- },- onNegativeClick: async () => {- dialogInstance.loading = true;- await deleteWorksheets(worksheets);- cleanFolders();- dialogInstance.destroy();- _defer.resolve(true);- },- positiveText: t("sheet.hint-tips.move-to-root-folder"),- onPositiveClick: async () => {- dialogInstance.loading = true;- await batchUpdateWorksheetFolders(- worksheets.map((worksheet) => ({- name: worksheet,- folders: [],- }))- );- cleanFolders();- dialogInstance.destroy();- _defer.resolve(true);- },- showIcon: false,- onClose() {- dialogInstance.destroy();- _defer.resolve(false);- },- });- }- return _defer.promise;-};--const handleDeleteSheet = (worksheetName: string) => {- const dialogInstance = $dialog.create({- title: t("sheet.hint-tips.confirm-to-delete-sheet-title"),- type: "error",- autoFocus: false,- closable: true,- maskClosable: true,- closeOnEsc: true,- async onPositiveClick() {- dialogInstance.loading = true;- await deleteWorksheets([worksheetName]);- dialogInstance.destroy();- },- onNegativeClick() {- dialogInstance.destroy();- },- onClose() {- dialogInstance.destroy();- },- negativeText: t("common.cancel"),- positiveText: t("common.delete"),- showIcon: false,- });-};--const handleDuplicateSheet = async (worksheetName: string) => {- const worksheet = worksheetV1Store.getWorksheetByName(worksheetName);- if (!worksheet) {- return;- }- const dialogInstance = $dialog.create({- title: t("sheet.hint-tips.confirm-to-duplicate-sheet"),- type: "info",- autoFocus: false,- closable: true,- maskClosable: true,- closeOnEsc: true,- async onPositiveClick() {- dialogInstance.loading = true;- await editorContext.createWorksheet({- title: worksheet.title,- folders: worksheet.folders,- database: worksheet.database,- });- pushNotification({- module: "bytebase",- style: "INFO",- title: t("sheet.notifications.duplicate-success"),- });- dialogInstance.destroy();- },- onNegativeClick() {- dialogInstance.destroy();- },- negativeText: t("common.cancel"),- positiveText: t("common.confirm"),- onClose() {- dialogInstance.destroy();- },- showIcon: false,- });-};--const handleFocusInput = () => {- nextTick(() => {- const input = document.getElementById(- `input-${editingNode.value?.node.key}`- ) as HTMLInputElement;- input?.focus();- input?.select();- });-};--useEmitteryEventListener(events, "on-built", ({ viewMode }) => {- if (viewMode !== props.view) {- return;- }- if (!editingNode.value) {- return;- }- handleFocusInput();-});--// Generate unique folder name based on existing children-// Returns "new folder", "new folder2", "new folder3", etc.-// Optimized: children are already sorted, so iterate in reverse to find max quickly-const generateNewFolderName = (children: WorksheetFolderNode[]): string => {- const baseName = "new folder";- const regex = /^new folder(\d+)$/;-- // Since children are sorted alphabetically, iterate in reverse- // to find the highest numbered "new folder" variant quickly- let maxNumber = 0;- for (let i = children.length - 1; i >= 0; i--) {- const child = children[i];-- // Skip worksheets, only check folders- if (child.worksheet) {- continue;- }-- const match = child.label.match(regex);- if (match) {- // Found highest numbered folder, can exit early- maxNumber = parseInt(match[1], 10);- break;- } else if (child.label === baseName) {- maxNumber = 1;- break;- } else if (child.label < baseName) {- // Since sorted, if we're past "new folder" alphabetically, we can stop- break;- }- }-- return maxNumber === 0 ? baseName : `${baseName}${maxNumber + 1}`;-};--const handleContextMenuSelect = async (key: DropdownOptionType) => {- if (!contextMenuContext.node) {- return;- }-- switch (key) {- case "share":- contextMenuContext.showSharePanel = true;- return;- case "rename":- editingNode.value = {- node: contextMenuContext.node,- rawLabel: contextMenuContext.node.label,- };- handleFocusInput();- break;- case "delete":- if (contextMenuContext.node.worksheet) {- handleDeleteSheet(contextMenuContext.node.worksheet.name);- } else {- const worksheets = revealWorksheets(- contextMenuContext.node,- (node) => node.worksheet?.name- );- handleDeleteFolders([contextMenuContext.node.key], worksheets);- }- break;- case "duplicate":- if (contextMenuContext.node.worksheet) {- handleDuplicateSheet(contextMenuContext.node.worksheet.name);- }- break;- case "add-folder":- expandedKeys.value.add(contextMenuContext.node.key);- const label = generateNewFolderName(contextMenuContext.node.children);- const newPath = folderContext.addFolder(- `${contextMenuContext.node.key}/${label}`- );- editingNode.value = {- node: {- key: newPath,- editable: true,- label,- children: [],- },- rawLabel: label,- };- break;- case "add-worksheet":- await editorContext.createWorksheet({- folders: getFoldersForWorksheet(contextMenuContext.node.key),- });- break;- case "multi-select":- emit("update:multiSelectMode", true);- emit(- "update:checkedNodes",- revealNodes(contextMenuContext.node, (n) => n)- );- break;- default:- break;- }- handleContextMenuClickOutside();-};--const findParentNode = (- node: WorksheetFolderNode,- key: string-): WorksheetFolderNode | undefined => {- if (node.key === key) {- return;- }- for (const child of node.children) {- if (child.key === key) {- return node;- }- const result = findParentNode(child, key);- if (result) {- return result;- }- }- return;-};--const updateWorksheetFolders = async (- node: WorksheetFolderNode,- oldParentKey: string,- newParentKey: string-) => {- const worksheets = revealWorksheets(node, (node: WorksheetFolderNode) => {- if (node.worksheet) {- const newFullPath = node.key.replace(oldParentKey, newParentKey);- return {- name: node.worksheet.name,- folders: getFoldersForWorksheet(newFullPath),- };- }- });- await batchUpdateWorksheetFolders(worksheets);-};--const replaceExpandedKeys = ({- oldKey,- newKey,-}: {- oldKey: string;- newKey?: string;-}) => {- const newSet = new Set<string>();-- for (const path of expandedKeys.value) {- if (- path === oldKey ||- folderContext.isSubFolder({ parent: oldKey, path, dig: true })- ) {- if (newKey) {- newSet.add(path.replace(oldKey, newKey));- }- } else {- newSet.add(path);- }- }-- expandedKeys.value = newSet;-};--const handleDuplicateFolderName = (- parentNode: WorksheetFolderNode | undefined,- key: string-) => {- const sameNode = parentNode?.children.find((child) => child.key === key);- const _defer = defer<boolean>();-- if (sameNode) {- const dialogInstance = $dialog.create({- title: t("sheet.hint-tips.duplicate-folder-name-title"),- content: t("sheet.hint-tips.duplicate-folder-name-content", {- folder: sameNode.label,- }),- type: "warning",- autoFocus: false,- closable: true,- maskClosable: true,- closeOnEsc: true,- onPositiveClick() {- dialogInstance.destroy();- _defer.resolve(true);- },- onNegativeClick() {- dialogInstance.destroy();- _defer.resolve(false);- },- onClose() {- dialogInstance.destroy();- _defer.resolve(false);- },- negativeText: t("common.cancel"),- positiveText: t("common.confirm"),- showIcon: false,- });- } else {- _defer.resolve(true);- }-- return _defer.promise;-};--const handleDrop = async ({ node, dragNode }: TreeDropInfo) => {- let parentNode = node as WorksheetFolderNode | undefined;- if (parentNode && parentNode.worksheet) {- // CANNOT drop a node into the worksheet node.- parentNode = findParentNode(sheetTree.value, parentNode.key);- }- if (!parentNode) {- return;- }-- const draggedNode = dragNode as WorksheetFolderNode;- const oldParentNode = findParentNode(sheetTree.value, draggedNode.key);- if (!oldParentNode) {- return;- }- if (oldParentNode.key === parentNode.key) {- // parent folder not change- return;- }-- const nodeId = draggedNode.key.split("/").slice(-1)[0];- const newKey = folderContext.ensureFolderPath(`${parentNode.key}/${nodeId}`);-- const merge = await handleDuplicateFolderName(parentNode, newKey);- if (!merge) {- return;- }-- const shouldCloseOldParent =- !draggedNode.worksheet && oldParentNode.children.length === 1;-- await updateWorksheetFolders(draggedNode, oldParentNode.key, parentNode.key);- if (!draggedNode.worksheet) {- // if the dragged node is a folder, we also need to move it in the folder context.- folderContext.moveFolder(draggedNode.key, newKey);- }-- nextTick(() => {- // Update expanded keys for the moved folder and all its subfolders- replaceExpandedKeys({ oldKey: draggedNode.key, newKey });- // Ensure new parent folder is expanded to show the moved item- expandedKeys.value.add(parentNode.key);- // Close old parent folder if it's now empty- if (shouldCloseOldParent) {- replaceExpandedKeys({ oldKey: oldParentNode.key });- }- });-};--defineExpose({- handleMultiDelete,-});-</script>--<style lang="postcss" scoped>-.worksheet-tree :deep(.n-tree .v-vl) {- --n-node-content-height: 21px !important;-}-.worksheet-tree :deep(.n-tree-node-content) {- padding-left: 0 !important;- padding-right: 1rem !important;- font-size: 0.875rem;- line-height: 1.25rem;- flex: 1;-}-.worksheet-tree :deep(.n-tree-node-wrapper) {- padding: 0;-}-.worksheet-tree :deep(.n-tree-node-switcher--hide) {- width: 0.5rem !important;-}-.worksheet-tree :deep(.n-tree-node-content__prefix) {- flex-shrink: 0;-}-.worksheet-tree :deep(.n-tree-node-content__suffix) {- flex-shrink: 0;-}-.worksheet-tree :deep(.n-tree-node-content__text) {- overflow: hidden;- text-overflow: ellipsis;- white-space: nowrap;-}-</style>diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodePrefix.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodePrefix.vuedeleted file mode 100644index 8dee947c13..0000000000--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodePrefix.vue+++ /dev/null@@ -1,54 +0,0 @@-<template>- <FileCodeIcon- v-if="node.worksheet"- class="w-4 h-auto text-gray-600"- />- <FolderOpenIcon- v-else-if="expandedKeys.has(node.key)"- class="w-4 h-auto text-gray-600"- />- <template v-else-if="node.key === rootPath">- <FolderPenIcon- v-if="view === 'draft'"- class="w-4 h-auto text-gray-600"- />- <FolderSyncIcon- v-else-if="view === 'shared'"- class="w-4 h-auto text-gray-600"- />- <FolderCodeIcon- v-else- class="w-4 h-auto text-gray-600"- />- </template>- <FolderMinusIcon- v-else-if="node.empty"- class="w-4 h-auto text-gray-600"- />- <FolderCodeIcon- v-else- class="w-4 h-auto text-gray-600"- />-</template>--<script setup lang="ts">-import {- FileCodeIcon,- FolderCodeIcon,- FolderMinusIcon,- FolderOpenIcon,- FolderPenIcon,- FolderSyncIcon,-} from "lucide-vue-next";-import type {- SheetViewMode,- WorksheetFolderNode,-} from "@/views/sql-editor/Sheet";--defineProps<{- node: WorksheetFolderNode;- expandedKeys: Set<string>;- rootPath: string;- view: SheetViewMode;-}>();-</script>diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeSuffix.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeSuffix.vuedeleted file mode 100644index 6c0a4c75ca..0000000000--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/TreeNodeSuffix.vue+++ /dev/null@@ -1,147 +0,0 @@--<template>- <template v-if="view === 'draft'">- <XIcon- v-if="node.worksheet"- class="w-4 h-auto text-gray-600"- @click="handleDeleteDraft"- />- </template>- <MoreHorizontalIcon- v-else-if="!node.worksheet"- class="w-4 h-auto text-gray-600"- @click="handleContextMenuShow"- />- <div- v-else-if="worksheetLite"- class="inline-flex gap-1"- >- <NTooltip- v-if="- worksheetLite.visibility === Worksheet_Visibility.PROJECT_READ ||- worksheetLite.visibility === Worksheet_Visibility.PROJECT_WRITE- "- >- <template #trigger>- <UsersIcon- class="w-4 text-gray-400"- @click="handleSharePanelShow"- />- </template>- <div>- <div>- {{ t("common.visibility") }}{{ ": " }}{{ visibilityDisplayName(worksheetLite.visibility) }}- </div>- <div- v-if="!isWorksheetCreator(worksheetLite)"- >- {{ t("common.creator") }}{{ ": " }}{{ creatorForSheet(worksheetLite.creator) }}- </div>- </div>- </NTooltip>- <StarIcon- :class="`w-4 h-auto text-gray-400 ${worksheetLite.starred ? 'text-yellow-400' : ''}`"- @click="handleToggleStar"- />- <MoreHorizontalIcon- class="w-4 h-auto text-gray-600"- @click="handleContextMenuShow"- />- </div>-</template>--<script setup lang="ts">-import {- MoreHorizontalIcon,- StarIcon,- UsersIcon,- XIcon,-} from "lucide-vue-next";-import { NTooltip } from "naive-ui";-import { computed } from "vue";-import { t } from "@/plugins/i18n";-import { useSQLEditorTabStore, useUserStore, useWorkSheetStore } from "@/store";-import { Worksheet_Visibility } from "@/types/proto-es/v1/worksheet_service_pb";-import type {- SheetViewMode,- WorksheetFolderNode,-} from "@/views/sql-editor/Sheet";-import { useSheetContext } from "@/views/sql-editor/Sheet";-import { useTabListContext } from "@/views/sql-editor/TabList/context";--const props = defineProps<{- node: WorksheetFolderNode;- view: SheetViewMode;-}>();--const emit = defineEmits<{- (e: "contextMenuShow", event: MouseEvent, node: WorksheetFolderNode): void;- (e: "sharePanelShow", event: MouseEvent, node: WorksheetFolderNode): void;- (e: "toggleStar", item: { worksheet: string; starred: boolean }): void;-}>();--const userStore = useUserStore();-const worksheetStore = useWorkSheetStore();-const tabStore = useSQLEditorTabStore();-const { isWorksheetCreator } = useSheetContext();-const { events } = useTabListContext();--const worksheetLite = computed(() => {- if (!props.node.worksheet) {- return undefined;- }- const sheet = worksheetStore.getWorksheetByName(props.node.worksheet.name);- if (!sheet) {- return undefined;- }- return {- name: sheet.name,- starred: sheet.starred,- visibility: sheet.visibility,- creator: sheet.creator,- };-});--const visibilityDisplayName = (visibility: Worksheet_Visibility) => {- switch (visibility) {- case Worksheet_Visibility.PRIVATE:- return t("sql-editor.private");- case Worksheet_Visibility.PROJECT_READ:- return t("sql-editor.project-read");- case Worksheet_Visibility.PROJECT_WRITE:- return t("sql-editor.project-write");- default:- return "";- }-};--const creatorForSheet = (creator: string) => {- return userStore.getUserByIdentifier(creator)?.title ?? creator;-};--const handleDeleteDraft = () => {- if (props.node.worksheet?.name) {- const tab = tabStore.getTabById(props.node.worksheet?.name);- if (tab) {- events.emit("close-tab", { tab, index: 0, action: "CLOSE" });- }- }-};--const handleContextMenuShow = (e: MouseEvent) => {- emit("contextMenuShow", e, props.node);-};--const handleSharePanelShow = (e: MouseEvent) => {- emit("sharePanelShow", e, props.node);-};--const handleToggleStar = () => {- if (worksheetLite.value) {- emit("toggleStar", {- worksheet: worksheetLite.value.name,- starred: !worksheetLite.value.starred,- });- }-};-</script>diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/common.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/common.tsdeleted file mode 100644index 2d78975a60..0000000000--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/common.ts+++ /dev/null@@ -1,25 +0,0 @@-import type { TreeOption } from "naive-ui";-import { getHighlightHTMLByRegExp } from "@/utils";--export const titleHTML = (title: string, keyword: string) => {- return getHighlightHTMLByRegExp(- title,- keyword.toLowerCase().trim(),- false /* !caseSensitive */- );-};--// TODO(ed):-// Find a better UX for filter.-// 1. We do need to expand all nodes for filter results?-// 2. We do still need a tree for filter results? How about just plain list?-// 3. If we don't show empty folder in filter results, how to support "create/rename folder", "move/rename worksheet" actions?-export const filterNode =- (rootPath: string) => (pattern: string, option: TreeOption) => {- const keyword = pattern.trim().toLowerCase();- if (option.key === rootPath || !keyword) {- // always show the root node- return true;- }- return option.label?.toLowerCase().includes(keyword) ?? false;- };diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.tsdeleted file mode 100644index 0004358669..0000000000--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/dropdown.ts+++ /dev/null@@ -1,230 +0,0 @@-import {- FileCodeIcon,- FilesIcon,- FolderIcon,- ListCheckIcon,- type LucideProps,- PencilLineIcon,- Share2Icon,- TrashIcon,-} from "lucide-vue-next";-import { type DropdownOption } from "naive-ui";-import {- type ComputedRef,- computed,- type FunctionalComponent,- h,- reactive,- watch,-} from "vue";-import { t } from "@/plugins/i18n";-import { useCurrentUserV1, useWorkSheetStore } from "@/store";-import { type Position } from "@/types";-import { isWorksheetWritableV1 } from "@/utils";-import type {- SheetViewMode,- WorksheetFilter,- WorksheetFolderNode,-} from "@/views/sql-editor/Sheet";--export type DropdownOptionType =- | "share"- | "rename"- | "delete"- | "add-folder"- | "add-worksheet"- | "multi-select"- | "duplicate";--type WorksheetDropdown = DropdownOption & {- key: DropdownOptionType;-};--interface DropdownContext {- position: Position;- showDropdown: boolean;- showSharePanel: boolean;- node?: WorksheetFolderNode;-}--export const useDropdown = (- viewMode: SheetViewMode,- filter: ComputedRef<WorksheetFilter>-) => {- const me = useCurrentUserV1();- const sheetStore = useWorkSheetStore();-- const context = reactive<DropdownContext>({- position: {- x: 0,- y: 0,- },- showDropdown: false,- showSharePanel: false,- });-- watch(- () => context.node,- (node) => {- if (!node) {- context.showDropdown = false;- context.showSharePanel = false;- }- }- );-- watch(- () => context.showSharePanel,- (show) => {- if (show) {- context.showDropdown = false;- }- }- );-- watch(- () => context.showDropdown,- (show) => {- if (show) {- context.showSharePanel = false;- }- }- );-- const worksheetEntity = computed(() => {- if (viewMode === "draft" || !context.node?.worksheet) {- return undefined;- }- return sheetStore.getWorksheetByName(context.node.worksheet.name);- });-- const allowCreateNew = computed(- () => !filter.value.keyword && !filter.value.onlyShowStarred- );-- const options = computed((): WorksheetDropdown[] => {- if (viewMode === "draft" || !context.node) {- return [];- }-- const items: {- icon: FunctionalComponent<LucideProps>;- key: DropdownOptionType;- label: string;- }[] = [];- if (context.node.worksheet) {- if (!worksheetEntity.value) {- return [];- }- const isCreator =- worksheetEntity.value.creator === `users/${me.value.email}`;- items.push({- icon: FilesIcon,- key: "duplicate",- label: isCreator ? t("common.duplicate") : t("common.fork"),- });- if (isCreator) {- items.push({- icon: Share2Icon,- key: "share",- label: t("common.share"),- });- }- const canWriteSheet = isWorksheetWritableV1(worksheetEntity.value);- if (canWriteSheet) {- items.push(- {- icon: PencilLineIcon,- key: "rename",- label: t("sql-editor.tab.context-menu.actions.rename"),- },- {- icon: TrashIcon,- key: "delete",- label: t("common.delete"),- }- );- }- items.push({- icon: ListCheckIcon,- key: "multi-select",- label: t("sql-editor.tab.context-menu.actions.multi-select"),- });- } else {- if (allowCreateNew.value) {- items.push({- icon: FolderIcon,- key: "add-folder",- label: t("sql-editor.tab.context-menu.actions.add-folder"),- });- }- if (viewMode === "my") {- if (allowCreateNew.value) {- items.push({- icon: FileCodeIcon,- key: "add-worksheet",- label: t("sql-editor.tab.context-menu.actions.add-worksheet"),- });- }- items.push({- icon: ListCheckIcon,- key: "multi-select",- label: t("sql-editor.tab.context-menu.actions.multi-select"),- });- }- if (context.node.editable) {- items.push(- {- icon: PencilLineIcon,- key: "rename",- label: t("sql-editor.tab.context-menu.actions.rename"),- },- {- icon: TrashIcon,- key: "delete",- label: t("common.delete"),- }- );- }- }-- return items.map((item) => ({- icon: () => h(item.icon, { class: "w-4 text-gray-600" }),- key: item.key,- label: item.label,- }));- });-- const resetData = (e: MouseEvent, node: WorksheetFolderNode) => {- e.preventDefault();- e.stopPropagation();- context.node = node;- context.position = {- x: e.clientX,- y: e.clientY,- };- };-- const handleMenuShow = (e: MouseEvent, node: WorksheetFolderNode) => {- resetData(e, node);- context.showDropdown = true;- };-- const handleSharePanelShow = (e: MouseEvent, node: WorksheetFolderNode) => {- resetData(e, node);- context.showSharePanel = true;- };-- const handleClickOutside = () => {- context.node = undefined;- };-- return {- context,- options,- worksheetEntity,- handleMenuShow,- handleSharePanelShow,- handleClickOutside,- };-};diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/index.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/index.tsdeleted file mode 100644index e0d14d77ab..0000000000--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/index.ts+++ /dev/null@@ -1,3 +0,0 @@-import SheetTree from "./SheetTree.vue";--export { SheetTree };diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vuedeleted file mode 100644index 4469b9f5b3..0000000000--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/WorksheetPane.vue+++ /dev/null@@ -1,262 +0,0 @@-<template>- <div class="h-full flex flex-col gap-1 overflow-hidden pb-1 text-sm">- <div class="flex items-center gap-x-1 px-1">- <SearchBox- v-model:value="filter.keyword"- size="small"- :placeholder="$t('sheet.search-sheets')"- :clearable="true"- style="max-width: 100%"- />- <NDropdown- :show="showDropdown"- :options="options"- placement="bottom-start"- @clickoutside="showDropdown = false"- >- <NButton- quaternary- style="--n-padding: 0 5px; --n-height: 28px"- @click="showDropdown = true"- >- <template #icon>- <FunnelIcon :class="['w-4', filterChanged ? 'text-accent' : '']" />- </template>- </NButton>- </NDropdown>- </div>- <div class="relative flex-1 flex flex-col gap-y-2 overflow-y-auto worksheet-scroll">- <div v-if="multiSelectMode && filter.showMine" class="sticky top-0 z-10 px-1 flex items-center justify-start flex-wrap gap-y-1 gap-x-1 bg-blue-100 py-2">- <NButton- quaternary- size="tiny"- type="error"- :disabled="checkedNodes.length === 0 || loading"- @click="handleMultiDelete"- >- <template #icon>- <TrashIcon />- </template>- {{ t("common.delete") }}- </NButton>- <NButton- quaternary- size="tiny"- :disabled="checkedWorksheets.length === 0 || loading"- @click="() => { pendingMoveFolder = ''; showReorgModal = true; }"- >- <template #icon>- <FolderInputIcon />- </template>- {{ $t('sheet.move-worksheets') }}- </NButton>- <NButton- quaternary- size="tiny"- :disabled="loading"- @click="multiSelectMode = false"- >- <template #icon>- <XIcon />- </template>- {{$t("common.cancel")}}- </NButton>- </div>- <SheetTree- v-if="filter.showMine"- ref="mineSheetTreeRef"- key="my"- :view="'my'"- v-model:multi-select-mode="multiSelectMode"- v-model:checked-nodes="checkedNodes"- />- <SheetTree v-for="view in views" :key="view" :view="view" />- <NEmpty v-if="views.length === 0" class="mt-10" />- </div>- </div>-- <BBModal- :show="showReorgModal"- :title="$t('sheet.move-worksheets')"- @close="() => { showReorgModal = false; pendingMoveFolder = ''; }"- >- <div class="flex flex-col gap-y-3 w-lg max-w-[calc(100vw-8rem)]">- <ReactPageMount- page="FolderForm"- :folder="pendingMoveFolder"- :onFolderChange="(val: string) => (pendingMoveFolder = val)"- />- <div class="flex justify-end gap-x-2 mt-4">- <NButton @click="showReorgModal = false">{{ $t("common.close") }}</NButton>- <NButton- type="primary"- @click="handleMoveWorksheets"- >- {{ $t("common.save") }}- </NButton>- </div>- </div>- </BBModal>-</template>--<script setup lang="tsx">-import { FolderInputIcon, FunnelIcon, TrashIcon, XIcon } from "lucide-vue-next";-import { type DropdownOption, NButton, NDropdown, NEmpty } from "naive-ui";-import { computed, ref, watch } from "vue";-import { BBModal } from "@/bbkit";-import { SearchBox } from "@/components/v2";-import { t } from "@/plugins/i18n";-import ReactPageMount from "@/react/ReactPageMount.vue";-import type {- SheetViewMode,- WorksheetFolderNode,-} from "@/views/sql-editor/Sheet";-import { useSheetContext, useSheetContextByView } from "../../Sheet";-import FilterMenuItem from "./FilterMenuItem.vue";-import { SheetTree } from "./SheetList";--const { filter, filterChanged, batchUpdateWorksheetFolders } =- useSheetContext();-const { getFoldersForWorksheet } = useSheetContextByView("my");-const showDropdown = ref<boolean>(false);-const mineSheetTreeRef = ref<InstanceType<typeof SheetTree>>();--// multi-select operations-const checkedNodes = ref<WorksheetFolderNode[]>([]);-const multiSelectMode = ref(false);-const showReorgModal = ref(false);-const loading = ref(false);-const pendingMoveFolder = ref<string>("");-const checkedWorksheets = computed(() => {- const worksheets: string[] = [];- for (const node of checkedNodes.value) {- if (node.worksheet) {- worksheets.push(node.worksheet.name);- }- }- return worksheets;-});--watch(- [() => multiSelectMode.value, () => filter.value.showMine],- ([multiSelectMode, showMine]) => {- if (!multiSelectMode || !showMine) {- checkedNodes.value = [];- }- }-);--const options = computed((): DropdownOption[] => {- return [- {- key: "show-mine",- type: "render",- render: () => (- <FilterMenuItem- label={t("sheet.filter.show-mine")}- value={filter.value.showMine}- onUpdate:value={(val: boolean) => (filter.value.showMine = val)}- />- ),- },- {- key: "show-shared",- type: "render",- render: () => (- <FilterMenuItem- label={t("sheet.filter.show-shared")}- value={filter.value.showShared}- onUpdate:value={(val: boolean) => (filter.value.showShared = val)}- />- ),- },- {- key: "show-draft",- type: "render",- render: () => (- <FilterMenuItem- label={t("sheet.filter.show-draft")}- value={filter.value.showDraft}- onUpdate:value={(val: boolean) => (filter.value.showDraft = val)}- />- ),- },- {- key: "only-show-starred",- type: "render",- render: () => (- <FilterMenuItem- label={t("sheet.filter.only-show-starred")}- value={filter.value.onlyShowStarred}- onUpdate:value={(val: boolean) =>- (filter.value.onlyShowStarred = val)- }- />- ),- },- ];-});--const views = computed((): SheetViewMode[] => {- // do not push the "my" view- const results: SheetViewMode[] = [];- if (filter.value.showShared) {- results.push("shared");- }- if (filter.value.showDraft) {- results.push("draft");- }- return results;-});--const handleMoveWorksheets = async () => {- loading.value = true;- try {- const folders = getFoldersForWorksheet(pendingMoveFolder.value);- await batchUpdateWorksheetFolders(- checkedWorksheets.value.map((worksheet) => ({- name: worksheet,- folders,- }))- );- showReorgModal.value = false;- multiSelectMode.value = false;- pendingMoveFolder.value = "";- } finally {- loading.value = false;- }-};--const handleMultiDelete = async () => {- loading.value = true;- try {- await mineSheetTreeRef.value?.handleMultiDelete(checkedNodes.value);- } finally {- loading.value = false;- }-};-</script>--<style lang="postcss" scoped>-.worksheet-scroll {- scrollbar-width: thin;- scrollbar-color: rgba(0, 0, 0, 0.2) transparent;-}--.worksheet-scroll::-webkit-scrollbar {- width: 6px;-}--.worksheet-scroll::-webkit-scrollbar-track {- background: transparent;-}--.worksheet-scroll::-webkit-scrollbar-thumb {- background-color: rgba(0, 0, 0, 0.2);- border-radius: 3px;-}--.worksheet-scroll::-webkit-scrollbar-thumb:hover {- background-color: rgba(0, 0, 0, 0.3);-}-</style>diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/index.ts b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/index.tsdeleted file mode 100644index 15419c1525..0000000000--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/index.ts+++ /dev/null@@ -1,3 +0,0 @@-import WorksheetPane from "./WorksheetPane.vue";--export default WorksheetPane;diff --git a/frontend/src/views/sql-editor/EditorPanel/StandardPanel/EditorMain.vue b/frontend/src/views/sql-editor/EditorPanel/StandardPanel/EditorMain.vuenew file mode 100644index 0000000000..758b6050ce--- /dev/null+++ b/frontend/src/views/sql-editor/EditorPanel/StandardPanel/EditorMain.vue@@ -0,0 +1,165 @@+<template>+ <div class="h-full flex flex-col overflow-hidden justify-start items-stretch">+ <template v-if="isDisconnected || allowReadonlyMode">+ <EditorAction @execute="handleExecuteFromActionBar" />++ <NSplit+ v-if="tab"+ :disabled="!showAIPanel"+ :size="editorPanelSize.size"+ :min="editorPanelSize.min"+ :max="editorPanelSize.max"+ :resize-trigger-size="3"+ @update:size="handleEditorPanelResize"+ >+ <template #1>+ <Suspense>+ <SQLEditor ref="sqlEditorRef" @execute="handleExecute" />+ <template #fallback>+ <div+ class="w-full h-full grow flex flex-col items-center justify-center"+ >+ <BBSpin />+ </div>+ </template>+ </Suspense>+ </template>+ <template #2>+ <div+ v-if="showAIPanel"+ class="h-full overflow-hidden flex flex-col"+ >+ <Suspense>+ <AIChatToSQL key="ai-chat-to-sql" />+ <template #fallback>+ <div+ class="w-full h-full grow flex flex-col items-center justify-center"+ >+ <BBSpin />+ </div>+ </template>+ </Suspense>+ </div>+ </template>+ </NSplit>+ <div v-else class="flex-1 flex flex-col min-h-0">+ <ReactPageMount+ page="Welcome"+ :onChangeConnection="changeConnection"+ />+ </div>++ <ExecutingHintModal />++ <!-- SaveSheetModal renders a React Dialog via portal; the inline mount+ must not occupy flex space or it steals height from the Welcome+ pane above (ReactPageMount's container is `class="h-full"`). -->+ <div class="hidden">+ <ReactPageMount page="SaveSheetModal" />+ </div>+ </template>++ <ReadonlyModeNotSupported v-else />+ </div>+</template>++<script lang="ts" setup>+import { NSplit } from "naive-ui";+import { storeToRefs } from "pinia";+import { computed, defineAsyncComponent, nextTick, ref } from "vue";+import { BBSpin } from "@/bbkit";+import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";+import { useExecuteSQL } from "@/composables/useExecuteSQL";+import { AIChatToSQL } from "@/plugins/ai";+import ReactPageMount from "@/react/ReactPageMount.vue";+import {+ useConnectionOfCurrentSQLEditorTab,+ useDatabaseV1Store,+ useSQLEditorTabStore,+} from "@/store";+import type { SQLEditorQueryParams } from "@/types";+import { getInstanceResource, instanceV1HasReadonlyMode } from "@/utils";+import { useSQLEditorContext } from "../../context";+import { EditorAction, ExecutingHintModal } from "../../EditorCommon";+import { sqlEditorEvents } from "../../events";+import ReadonlyModeNotSupported from "../ReadonlyModeNotSupported.vue";++const SQLEditor = defineAsyncComponent(() => import("./SQLEditor.vue"));++const tabStore = useSQLEditorTabStore();+const { currentTab: tab, isDisconnected } = storeToRefs(tabStore);+const { instance } = useConnectionOfCurrentSQLEditorTab();+const {+ showAIPanel,+ editorPanelSize,+ handleEditorPanelResize,+ showConnectionPanel,+ asidePanelTab,+} = useSQLEditorContext();++const changeConnection = () => {+ asidePanelTab.value = "SCHEMA";+ showConnectionPanel.value = true;+};+const sqlEditorRef = ref<InstanceType<typeof SQLEditor>>();++const allowReadonlyMode = computed(() => {+ if (isDisconnected.value) return false;++ return instanceV1HasReadonlyMode(instance.value);+});++const { execute } = useExecuteSQL();++useEmitteryEventListener(+ sqlEditorEvents,+ "execute-sql",+ async ({ connection, statement, batchQueryContext }) => {+ const database = await useDatabaseV1Store().getOrFetchDatabaseByName(+ connection.database+ );+ const newTab = tabStore.addTab(+ { connection, statement, batchQueryContext },+ /* beside */ true+ );+ nextTick(() => {+ execute({+ connection: { ...newTab.connection },+ statement,+ engine: getInstanceResource(database).engine,+ explain: false,+ selection: null,+ });+ });+ }+);++const handleExecuteFromActionBar = (params: SQLEditorQueryParams) => {+ if (!tab.value || !sqlEditorRef.value) {+ return;+ }+ const statement = sqlEditorRef.value.getActiveStatement();+ handleExecute({+ params: { ...params, statement },+ newTab: false,+ });+};++const handleExecute = ({+ params,+ newTab,+}: {+ params: SQLEditorQueryParams;+ newTab: boolean;+}) => {+ if (newTab) {+ tabStore.cloneTab(tabStore.currentTabId, {+ statement: params.statement,+ });+ }++ nextTick(() => {+ execute(params);+ });+};+</script>diff --git a/frontend/src/views/sql-editor/EditorPanel/StandardPanel/StandardPanel.vue b/frontend/src/views/sql-editor/EditorPanel/StandardPanel/StandardPanel.vueindex 23731d78bd..77a716f8c2 100644--- a/frontend/src/views/sql-editor/EditorPanel/StandardPanel/StandardPanel.vue+++ b/frontend/src/views/sql-editor/EditorPanel/StandardPanel/StandardPanel.vue@@ -1,182 +1,44 @@<template>- <NSplit- v-if="!tab || tab.mode === 'WORKSHEET'"- direction="vertical"- :max="0.8"- :resize-trigger-size="3"- >- <template #1>- <div class="h-full flex flex-col overflow-hidden justify-start items-stretch">- <template v-if="isDisconnected || allowReadonlyMode">- <EditorAction @execute="handleExecuteFromActionBar" />-- <NSplit- v-if="tab"- :disabled="!showAIPanel"- :size="editorPanelSize.size"- :min="editorPanelSize.min"- :max="editorPanelSize.max"- :resize-trigger-size="3"- @update:size="handleEditorPanelResize"- >- <template #1>- <Suspense>- <SQLEditor- ref="sqlEditorRef"- @execute="handleExecute"- />- <template #fallback>- <div- class="w-full h-full grow flex flex-col items-center justify-center"- >- <BBSpin />- </div>- </template>- </Suspense>- </template>- <template #2>- <div- v-if="showAIPanel"- class="h-full overflow-hidden flex flex-col"- >- <Suspense>- <AIChatToSQL key="ai-chat-to-sql" />- <template #fallback>- <div- class="w-full h-full grow flex flex-col items-center justify-center"- >- <BBSpin />- </div>- </template>- </Suspense>- </div>- </template>- </NSplit>- <div v-else class="flex-1 flex flex-col min-h-0">- <ReactPageMount- page="Welcome"- :onChangeConnection="changeConnection"- />- </div>-- <ExecutingHintModal />-- <ReactPageMount page="SaveSheetModal" />- </template>-- <ReadonlyModeNotSupported v-else />- </div>- </template>-- <template #2>- <div- v-if="!isDisconnected && allowReadonlyMode"- class="relative h-full"- >- <ResultPanel />- </div>- </template>- </NSplit>+ <template v-if="!tab || tab.mode === 'WORKSHEET'">+ <NSplit+ v-if="showResultPanel"+ direction="vertical"+ :max="0.8"+ :resize-trigger-size="3"+ >+ <template #1>+ <EditorMain />+ </template>+ <template #2>+ <div class="relative h-full">+ <ResultPanel />+ </div>+ </template>+ </NSplit>+ <EditorMain v-else class="h-full" />+ </template></template><script lang="ts" setup>import { NSplit } from "naive-ui";import { storeToRefs } from "pinia";-import { computed, defineAsyncComponent, nextTick, ref } from "vue";-import { BBSpin } from "@/bbkit";-import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";-import { useExecuteSQL } from "@/composables/useExecuteSQL";-import { AIChatToSQL } from "@/plugins/ai";-import ReactPageMount from "@/react/ReactPageMount.vue";+import { computed } from "vue";import {useConnectionOfCurrentSQLEditorTab,- useDatabaseV1Store,useSQLEditorTabStore,} from "@/store";-import type { SQLEditorQueryParams } from "@/types";-import { getInstanceResource, instanceV1HasReadonlyMode } from "@/utils";-import { useSQLEditorContext } from "../../context";-import { EditorAction, ExecutingHintModal } from "../../EditorCommon";-import { sqlEditorEvents } from "../../events";-import ReadonlyModeNotSupported from "../ReadonlyModeNotSupported.vue";+import { instanceV1HasReadonlyMode } from "@/utils";import ResultPanel from "../ResultPanel";+import EditorMain from "./EditorMain.vue";-const SQLEditor = defineAsyncComponent(() => import("./SQLEditor.vue"));--const tabStore = useSQLEditorTabStore();-const { currentTab: tab, isDisconnected } = storeToRefs(tabStore);+const { currentTab: tab, isDisconnected } = storeToRefs(useSQLEditorTabStore());const { instance } = useConnectionOfCurrentSQLEditorTab();-const {- showAIPanel,- editorPanelSize,- handleEditorPanelResize,- showConnectionPanel,- asidePanelTab,-} = useSQLEditorContext();--const changeConnection = () => {- asidePanelTab.value = "SCHEMA";- showConnectionPanel.value = true;-};-const sqlEditorRef = ref<InstanceType<typeof SQLEditor>>();-const allowReadonlyMode = computed(() => {- if (isDisconnected.value) return false;-- return instanceV1HasReadonlyMode(instance.value);-});--const { execute } = useExecuteSQL();--useEmitteryEventListener(- sqlEditorEvents,- "execute-sql",- async ({ connection, statement, batchQueryContext }) => {- const database = await useDatabaseV1Store().getOrFetchDatabaseByName(- connection.database- );- const newTab = tabStore.addTab(- { connection, statement, batchQueryContext },- /* beside */ true- );- nextTick(() => {- execute({- connection: { ...newTab.connection },- statement,- engine: getInstanceResource(database).engine,- explain: false,- selection: null,- });- });- }+// ResultPanel only renders when connected to a read-only-capable instance;+// when it won't render we skip the outer NSplit so the editor body (incl.+// the Welcome screen) can occupy the full height instead of being squeezed+// into an arbitrary top pane.+const showResultPanel = computed(+ () => !isDisconnected.value && instanceV1HasReadonlyMode(instance.value));--const handleExecuteFromActionBar = (params: SQLEditorQueryParams) => {- if (!tab.value || !sqlEditorRef.value) {- return;- }- const statement = sqlEditorRef.value.getActiveStatement();- handleExecute({- params: { ...params, statement },- newTab: false,- });-};--const handleExecute = ({- params,- newTab,-}: {- params: SQLEditorQueryParams;- newTab: boolean;-}) => {- if (newTab) {- tabStore.cloneTab(tabStore.currentTabId, {- statement: params.statement,- });- }-- nextTick(() => {- execute(params);- });-};</script>