Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

chore: optimize worksheet ux (#21085)

ecmadao87395188794e
diff --git a/backend/store/worksheet.go b/backend/store/worksheet.go
index 39dce9a1d1..8eb4f3e9f4 100644
--- a/backend/store/worksheet.go
+++ b/backend/store/worksheet.go
@@ -686,9 +686,12 @@ func GetListSheetFilter(ctx context.Context, s *Store, caller string, filter str
variable, value := getVariableAndValueFromExpr(expr)
return parseToSQL(variable, value)
case celoverloads.Contains:
+ if expr.AsCall().Target().Kind() != celast.IdentKind {
+ return nil, errors.Errorf(`invalid args for %q`, celoverloads.Contains)
+ }
variable := expr.AsCall().Target().AsIdent()
args := expr.AsCall().Args()
- if len(args) != 1 {
+ if len(args) != 1 || args[0].Kind() != celast.LiteralKind {
return nil, errors.Errorf(`invalid args for %q`, variable)
}
value := args[0].AsLiteral().Value()
diff --git a/backend/tests/worksheet_test.go b/backend/tests/worksheet_test.go
index 24921153e1..fa2e255f5d 100644
--- a/backend/tests/worksheet_test.go
+++ b/backend/tests/worksheet_test.go
@@ -292,6 +292,18 @@ func TestSearchWorksheetsFilterByTitle(t *testing.T) {
Filter: `content.contains("SELECT")`,
}))
a.Error(err)
+
+ _, err = ctl.worksheetServiceClient.SearchWorksheets(ctx, connect.NewRequest(&v1pb.SearchWorksheetsRequest{
+ Parent: ctl.project.Name,
+ Filter: `"literal".contains("x")`,
+ }))
+ a.Error(err)
+
+ _, err = ctl.worksheetServiceClient.SearchWorksheets(ctx, connect.NewRequest(&v1pb.SearchWorksheetsRequest{
+ Parent: ctl.project.Name,
+ Filter: `title.contains(name)`,
+ }))
+ a.Error(err)
}
func TestBatchUpdateWorksheetOrganizerFilterByFolder(t *testing.T) {
diff --git a/frontend/src/components/SelectionActionBar.test.tsx b/frontend/src/components/SelectionActionBar.test.tsx
index e80cb06798..5f64c9cb6e 100644
--- a/frontend/src/components/SelectionActionBar.test.tsx
+++ b/frontend/src/components/SelectionActionBar.test.tsx
@@ -60,6 +60,29 @@ describe("SelectionActionBar", () => {
expect(container.querySelector("[role='toolbar']")).toBeNull();
});
+ test("can render at 0 selected when forced visible", async () => {
+ await act(async () => {
+ root.render(
+ <SelectionActionBar
+ count={0}
+ label="0 selected"
+ allSelected={false}
+ onToggleSelectAll={() => {}}
+ forceVisible
+ actions={[{ key: "cancel", label: "Cancel", onClick: () => {} }]}
+ />
+ );
+ });
+ expect(container.textContent).toContain("0 selected");
+ expect(container.textContent).toContain("Cancel");
+ const checkbox = container.querySelector<HTMLButtonElement>(
+ '[role="checkbox"]'
+ );
+ expect(checkbox).not.toBeNull();
+ expect(checkbox?.hasAttribute("data-checked")).toBe(false);
+ expect(checkbox?.hasAttribute("data-indeterminate")).toBe(false);
+ });
+
test("renders label and visible actions when count > 0", async () => {
await act(async () => {
root.render(
@@ -108,6 +131,51 @@ describe("SelectionActionBar", () => {
expect(bar).toHaveClass("fixed", "bottom-6", "-translate-x-1/2");
});
+ test("can anchor inside a container", async () => {
+ await act(async () => {
+ root.render(
+ <SelectionActionBar
+ count={1}
+ label="1 selected"
+ allSelected={true}
+ onToggleSelectAll={() => {}}
+ placement="container"
+ actions={[]}
+ />
+ );
+ });
+
+ const bar = container.firstElementChild;
+ expect(bar).toHaveClass("absolute", "right-2", "bottom-3", "left-2");
+ expect(bar).not.toHaveClass("fixed");
+ });
+
+ test("can hide the label and use compact wrapping for narrow containers", async () => {
+ await act(async () => {
+ root.render(
+ <SelectionActionBar
+ count={1}
+ label="1 selected"
+ allSelected={true}
+ onToggleSelectAll={() => {}}
+ placement="container"
+ hideLabel
+ density="compact"
+ actions={[{ key: "delete", label: "Delete", onClick: () => {} }]}
+ />
+ );
+ });
+
+ const bar = container.firstElementChild;
+ const checkbox = container.querySelector<HTMLButtonElement>(
+ '[role="checkbox"]'
+ );
+ expect(container.textContent).not.toContain("1 selected");
+ expect(container.textContent).toContain("Delete");
+ expect(checkbox?.getAttribute("aria-label")).toBe("1 selected");
+ expect(bar).toHaveClass("flex-wrap", "px-2", "py-1.5");
+ });
+
test("omits hidden actions and disables disabled actions", async () => {
await act(async () => {
root.render(
diff --git a/frontend/src/components/SelectionActionBar.tsx b/frontend/src/components/SelectionActionBar.tsx
index c9a66c5029..08c90c95b2 100644
--- a/frontend/src/components/SelectionActionBar.tsx
+++ b/frontend/src/components/SelectionActionBar.tsx
@@ -66,6 +66,14 @@ export interface SelectionActionBarProps {
* More menu — set this to a high number like 99.
*/
maxVisibleActions?: number;
+ /** Renders the bar even when `count` is 0. */
+ forceVisible?: boolean;
+ /** `viewport` centers over the main content; `container` anchors to parent. */
+ placement?: "viewport" | "container";
+ /** Hide the selected-count label for narrow containers. */
+ hideLabel?: boolean;
+ /** Compact spacing for constrained surfaces. */
+ density?: "default" | "compact";
}
const MQ_SM = "(min-width: 640px)";
@@ -147,57 +155,92 @@ export function SelectionActionBar({
onToggleSelectAll,
actions,
maxVisibleActions,
+ forceVisible = false,
+ placement = "viewport",
+ hideLabel = false,
+ density = "default",
}: SelectionActionBarProps) {
const { t } = useTranslation();
const defaultMaxVisible = useSelectionMaxVisible();
const maxVisible = maxVisibleActions ?? defaultMaxVisible;
- const fixedStyle = useFixedPositionStyle(count > 0);
+ const visible = count > 0 || forceVisible;
+ const fixedStyle = useFixedPositionStyle(visible && placement === "viewport");
- if (count <= 0) return null;
+ if (!visible) return null;
const visibleActions = (actions ?? []).filter((a) => !a.hidden);
const inlineActions = visibleActions.slice(0, maxVisible);
const overflowActions = visibleActions.slice(maxVisible);
+ const compact = density === "compact";
+ let checkboxState: boolean | "indeterminate" = false;
+ if (count > 0) {
+ checkboxState = allSelected ? true : "indeterminate";
+ }
+ const showLabel = !hideLabel;
+ const showSeparator =
+ showLabel && (inlineActions.length > 0 || overflowActions.length > 0);
+ const checkbox = (
+ <Checkbox
+ aria-label={hideLabel ? label : undefined}
+ checked={checkboxState}
+ onCheckedChange={() => onToggleSelectAll()}
+ />
+ );
return (
<div
className={cn(
- "fixed bottom-6 w-fit max-w-full -translate-x-1/2",
- "flex items-center gap-x-3 rounded-full bg-background border border-control-border shadow-lg",
- "px-4 py-2",
+ placement === "viewport"
+ ? "fixed bottom-6 w-fit max-w-full -translate-x-1/2"
+ : "absolute right-2 bottom-3 left-2 max-w-none",
+ "flex items-center justify-center rounded-full bg-background border border-control-border shadow-lg",
+ placement === "container" ? "flex-wrap" : "flex-nowrap",
+ compact ? "gap-x-1.5 gap-y-1 px-2 py-1.5" : "gap-x-3 px-4 py-2",
LAYER_SURFACE_CLASS
)}
style={fixedStyle}
>
{/* Leading cluster — never shrinks; stays visible on narrow viewports
even when the actions group has to scroll horizontally. */}
- <Checkbox
- checked={allSelected ? true : "indeterminate"}
- onCheckedChange={() => onToggleSelectAll()}
- />
- <span className="shrink-0 text-sm font-medium text-control whitespace-nowrap">
- {label}
- </span>
- {(inlineActions.length > 0 || overflowActions.length > 0) && (
+ {hideLabel ? <Tooltip content={label}>{checkbox}</Tooltip> : checkbox}
+ {showLabel && (
+ <span className="shrink-0 text-sm font-medium text-control whitespace-nowrap">
+ {label}
+ </span>
+ )}
+ {showSeparator && (
<Separator orientation="vertical" className="h-5 shrink-0" />
)}
{/* Actions cluster — inline buttons + optional trailing More dropdown. */}
- <div className="flex items-center gap-x-3 shrink-0">
+ <div
+ className={cn(
+ "flex min-w-0 items-center",
+ placement === "container"
+ ? "max-w-full flex-wrap justify-center"
+ : "shrink-0",
+ compact ? "gap-x-1.5 gap-y-1" : "gap-x-3"
+ )}
+ >
{inlineActions.map((action) => {
const Icon = action.icon;
const button = (
<Button
appearance="outline"
- size="sm"
+ size={compact ? "xs" : "sm"}
disabled={action.disabled}
onClick={action.onClick}
className={cn(
- "rounded-full",
+ "min-w-0 max-w-full rounded-full",
action.tone === "destructive" && DESTRUCTIVE_TONE_CLASS
)}
>
- {Icon && <Icon className="size-4" aria-hidden />}
- {action.label}
+ {Icon && (
+ <Icon
+ className={cn(compact ? "size-3.5" : "size-4")}
+ aria-hidden
+ />
+ )}
+ <span className="truncate">{action.label}</span>
</Button>
);
if (action.disabled && action.disabledReason) {
@@ -207,7 +250,11 @@ export function SelectionActionBar({
</Tooltip>
);
}
- return <div key={action.key}>{button}</div>;
+ return (
+ <div key={action.key} className="min-w-0 max-w-full">
+ {button}
+ </div>
+ );
})}
{overflowActions.length > 0 && (
<DropdownMenu>
@@ -215,11 +262,14 @@ export function SelectionActionBar({
render={
<Button
appearance="outline"
- size="sm"
+ size={compact ? "xs" : "sm"}
className="rounded-full"
aria-label={t("common.more")}
>
- <MoreHorizontal className="size-4" aria-hidden />
+ <MoreHorizontal
+ className={cn(compact ? "size-3.5" : "size-4")}
+ aria-hidden
+ />
</Button>
}
/>
diff --git a/frontend/src/components/ui/checkbox.test.tsx b/frontend/src/components/ui/checkbox.test.tsx
index 0eaf7631d6..12a1f22760 100644
--- a/frontend/src/components/ui/checkbox.test.tsx
+++ b/frontend/src/components/ui/checkbox.test.tsx
@@ -157,6 +157,14 @@ describe("Checkbox", () => {
unmount();
});
+ test("enabled checkbox uses pointer cursor", () => {
+ const { container, unmount } = renderIntoContainer(
+ createElement(Checkbox, { checked: false, "aria-label": "cb" })
+ );
+ expect(getCheckbox(container).className).toContain("cursor-pointer");
+ unmount();
+ });
+
test("onClick prop is forwarded", () => {
const onClick = vi.fn();
const { container, unmount } = renderIntoContainer(
diff --git a/frontend/src/components/ui/checkbox.tsx b/frontend/src/components/ui/checkbox.tsx
index 400927d67b..17fc9c0181 100644
--- a/frontend/src/components/ui/checkbox.tsx
+++ b/frontend/src/components/ui/checkbox.tsx
@@ -44,7 +44,7 @@ function Checkbox({
indeterminate={indeterminate}
onCheckedChange={(value) => onCheckedChange?.(value)}
className={cn(
- "inline-flex shrink-0 items-center justify-center align-middle rounded-sm border-2 bg-background transition-colors",
+ "inline-flex shrink-0 cursor-pointer items-center justify-center align-middle rounded-sm border-2 bg-background transition-colors",
ROOT_SIZE[size],
"border-control-border hover:border-accent/60",
"data-[checked]:bg-accent data-[checked]:border-accent",
diff --git a/frontend/src/components/ui/tree.tsx b/frontend/src/components/ui/tree.tsx
index fb72a109d3..c3c23fc4e9 100644
--- a/frontend/src/components/ui/tree.tsx
+++ b/frontend/src/components/ui/tree.tsx
@@ -1,6 +1,11 @@
-import type { CSSProperties, ReactNode } from "react";
+import type { CSSProperties, ElementType, ReactNode } from "react";
import { useLayoutEffect, useRef } from "react";
-import type { MoveHandler, NodeApi, TreeApi } from "react-arborist";
+import type {
+ CursorProps,
+ MoveHandler,
+ NodeApi,
+ TreeApi,
+} from "react-arborist";
import { Tree as ArboristTree } from "react-arborist";
import { useTranslation } from "react-i18next";
import { ErrorBoundary } from "@/components/ui/error-boundary";
@@ -32,6 +37,7 @@ export interface TreeProps<T> {
readonly height?: number;
readonly rowHeight?: number;
readonly indent?: number;
+ readonly renderCursor?: ElementType<CursorProps>;
// Drag-and-drop. Defaults are disabled — opt in by passing `onMove` AND
// setting `disableDrag` / `disableDrop` to false (or a per-node predicate).
@@ -61,6 +67,7 @@ export function Tree<T>({
height = 300,
rowHeight = 28,
indent = 16,
+ renderCursor,
onMove,
disableDrag = true,
disableDrop = true,
@@ -205,6 +212,7 @@ export function Tree<T>({
rowHeight={rowHeight}
indent={indent}
width="100%"
+ renderCursor={renderCursor}
>
{({ node, style, dragHandle }) =>
renderNode({ node, style, dragHandle })
diff --git a/frontend/src/modules/sql-editor/components/FolderForm.test.tsx b/frontend/src/modules/sql-editor/components/FolderForm.test.tsx
index 4c13dd850e..cc1a85af74 100644
--- a/frontend/src/modules/sql-editor/components/FolderForm.test.tsx
+++ b/frontend/src/modules/sql-editor/components/FolderForm.test.tsx
@@ -22,6 +22,7 @@ const mocks = vi.hoisted(() => ({
useSheetContextByView: vi.fn(),
useClickOutside: vi.fn(),
onSelectCallback: vi.fn(),
+ treeProps: undefined as { expandedIds?: string[] } | undefined,
}));
vi.mock("react-i18next", () => ({
@@ -47,8 +48,10 @@ vi.mock("@/components/ui/tree", () => ({
Tree: ({
data,
renderNode,
+ expandedIds,
}: {
data: TreeDataNodeLike[];
+ expandedIds?: string[];
renderNode: (args: {
node: {
id: string;
@@ -58,20 +61,23 @@ vi.mock("@/components/ui/tree", () => ({
style: React.CSSProperties;
}) => React.ReactNode;
onSelect?: (ids: string[]) => void;
- }) => (
- <div data-testid="tree">
- {data.map((item) =>
- renderNode({
- node: {
- id: item.id,
- data: item,
- isSelected: false,
- },
- style: {},
- })
- )}
- </div>
- ),
+ }) => {
+ mocks.treeProps = { expandedIds };
+ return (
+ <div data-testid="tree">
+ {data.map((item) =>
+ renderNode({
+ node: {
+ id: item.id,
+ data: item,
+ isSelected: false,
+ },
+ style: {},
+ })
+ )}
+ </div>
+ );
+ },
}));
// Mock Popover — render children inline, track open state
@@ -313,6 +319,37 @@ describe("FolderForm", () => {
unmount();
});
+ test("can include the root folder in the picker", async () => {
+ const onFolderChange = vi.fn();
+ const { container, render, unmount } = renderIntoContainer(
+ <FolderForm folder="/my/foo" onFolderChange={onFolderChange} includeRoot />
+ );
+ render();
+
+ const input = container.querySelector(
+ "[data-testid='folder-input']"
+ ) as HTMLInputElement;
+ act(() => {
+ input.dispatchEvent(new FocusEvent("focusin", { bubbles: true }));
+ });
+
+ const treeNodes = document.body.querySelectorAll(
+ "[data-testid='tree'] > div"
+ );
+ expect(treeNodes.length).toBeGreaterThan(0);
+ expect(document.body.textContent).toContain("my");
+ expect(mocks.treeProps?.expandedIds).toEqual(["/my"]);
+
+ await act(async () => {
+ (treeNodes[0] as HTMLElement).click();
+ await new Promise((r) => setTimeout(r, 0));
+ });
+
+ expect(onFolderChange).toHaveBeenCalledWith("/my");
+
+ unmount();
+ });
+
test("typing in input normalizes path and calls onFolderChange", () => {
const onFolderChange = vi.fn();
const { container, render, unmount } = renderIntoContainer(
diff --git a/frontend/src/modules/sql-editor/components/FolderForm.tsx b/frontend/src/modules/sql-editor/components/FolderForm.tsx
index 863ebe0ec1..ce2e382a1f 100644
--- a/frontend/src/modules/sql-editor/components/FolderForm.tsx
+++ b/frontend/src/modules/sql-editor/components/FolderForm.tsx
@@ -16,6 +16,7 @@ import { TreeNodePrefix } from "./TreeNodePrefix";
type Props = {
readonly folder: string;
readonly onFolderChange: (folder: string) => void;
+ readonly includeRoot?: boolean;
};
function toTreeData(
@@ -28,7 +29,11 @@ function toTreeData(
};
}
-export function FolderForm({ folder, onFolderChange }: Props) {
+export function FolderForm({
+ folder,
+ onFolderChange,
+ includeRoot = false,
+}: Props) {
const { t } = useTranslation();
const { folderTree, folderContext } = useSheetContextByView("my");
@@ -97,9 +102,9 @@ export function FolderForm({ folder, onFolderChange }: Props) {
queueMicrotask(() => setShowPopover(false));
};
- const treeData = folderTree.children
- .filter((child) => !child.loadMore)
- .map(toTreeData);
+ const treeData = includeRoot
+ ? [toTreeData(folderTree)]
+ : folderTree.children.filter((child) => !child.loadMore).map(toTreeData);
const searchMatch = (node: TreeDataNode<WorksheetFolderNode>) => {
if (!folderPath) return true;
@@ -138,6 +143,7 @@ export function FolderForm({ folder, onFolderChange }: Props) {
<Tree<WorksheetFolderNode>
data={treeData}
selectedIds={folderPath ? [folderPath] : []}
+ expandedIds={includeRoot ? [rootPath] : undefined}
searchTerm={folderPath || undefined}
searchMatch={searchMatch}
height={240}
diff --git a/frontend/src/modules/sql-editor/components/SheetTree.test.tsx b/frontend/src/modules/sql-editor/components/SheetTree.test.tsx
index 603ca7bcea..0bb6d24713 100644
--- a/frontend/src/modules/sql-editor/components/SheetTree.test.tsx
+++ b/frontend/src/modules/sql-editor/components/SheetTree.test.tsx
@@ -43,6 +43,7 @@ const mocks = vi.hoisted(() => ({
disableDrag?: unknown;
disableDrop?: unknown;
onMove?: unknown;
+ renderCursor?: unknown;
},
}));
@@ -127,6 +128,7 @@ type MockRenderArgs = {
data: MockTreeItem;
isSelected: boolean;
isOpen?: boolean;
+ willReceiveDrop?: boolean;
};
style: React.CSSProperties;
};
@@ -139,6 +141,7 @@ vi.mock("@/components/ui/tree", () => ({
disableDrag,
disableDrop,
onMove,
+ renderCursor,
}: {
data: MockTreeItem[];
renderNode: (args: MockRenderArgs) => React.ReactNode;
@@ -146,8 +149,9 @@ vi.mock("@/components/ui/tree", () => ({
disableDrag?: unknown;
disableDrop?: unknown;
onMove?: unknown;
+ renderCursor?: unknown;
}) => {
- mocks.treeProps = { disableDrag, disableDrop, onMove };
+ mocks.treeProps = { disableDrag, disableDrop, onMove, renderCursor };
const renderAll = (items: MockTreeItem[]): React.ReactNode[] =>
items.flatMap((item) => [
renderNode({
@@ -582,6 +586,8 @@ describe("SheetTree", () => {
const tree = document.body.querySelector("[data-testid='tree']");
expect(tree).not.toBeNull();
expect(tree?.className).toContain("[&_[role=treeitem]]:!min-w-0");
+ expect(tree?.className).toContain("!overflow-y-visible");
+ expect(typeof mocks.treeProps.renderCursor).toBe("function");
// HighlightLabelText nodes are rendered (root node + children)
const labels = container.querySelectorAll(
@@ -777,7 +783,9 @@ describe("SheetTree", () => {
test("4b. Multi-select folder selection skips load-more nodes", () => {
const defaultMocks = setupDefaultMocks();
const wsNode = makeWorksheetNode("/my/folder1/ws1");
- const loadMoreNode = makeLoadMoreNode("/my/folder1/__load-more");
+ const loadMoreNode = makeLoadMoreNode(
+ "__worksheet_load_more__:/my/folder1"
+ );
const folderNode = makeFolderNode(
"/my/folder1",
[wsNode, loadMoreNode],
@@ -931,15 +939,156 @@ describe("SheetTree", () => {
unmount();
});
+ test("6b. Delete folder moves all folder paths to root via batch folder update", async () => {
+ const defaultMocks = setupDefaultMocks();
+ const loadedWorksheet = makeWorksheetNode(
+ "/my/old/loaded",
+ "worksheets/loaded"
+ );
+ const oldFolder = makeFolderNode("/my/old", [loadedWorksheet]);
+ const rootNode = makeFolderNode("/my", [oldFolder]);
+ defaultMocks.viewContext._sheetTree.value = rootNode;
+ defaultMocks.viewContext.getFoldersForWorksheet.mockImplementation(
+ (path: string) =>
+ path
+ .replace("/my", "")
+ .split("/")
+ .map((part) => part.trim())
+ .filter(Boolean)
+ );
+ defaultMocks.folderContext.listSubFolders.mockImplementation(
+ (parent: string) =>
+ parent === "/my/old" ? ["/my/old/child", "/my/old/child/grand"] : []
+ );
+
+ mocks.useDropdown.mockReturnValue({
+ currentNode: oldFolder,
+ options: [{ type: "item", key: "delete", label: "Delete" }],
+ 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();
+
+ 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();
+ });
+
+ const moveToRootButton = Array.from(
+ document.body.querySelectorAll(
+ "[data-testid='alert-dialog-content'] [data-testid='button']"
+ )
+ ).find(
+ (button) => button.textContent === "sheet.hint-tips.move-to-root-folder"
+ ) as HTMLElement | undefined;
+ expect(moveToRootButton).not.toBeUndefined();
+
+ await act(async () => {
+ moveToRootButton?.click();
+ await new Promise((r) => setTimeout(r, 10));
+ });
+
+ expect(
+ defaultMocks.sheetContext.batchUpdateWorksheetFolderPaths
+ ).toHaveBeenCalledWith("my", [
+ { sourceFolder: ["old"], targetFolder: [] },
+ { sourceFolder: ["old", "child"], targetFolder: [] },
+ { sourceFolder: ["old", "child", "grand"], targetFolder: [] },
+ ]);
+ expect(
+ defaultMocks.sheetContext.batchUpdateWorksheetFolders
+ ).not.toHaveBeenCalled();
+ expect(defaultMocks.folderContext.removeFolder).toHaveBeenCalledWith(
+ "/my/old"
+ );
+
+ unmount();
+ });
+
+ test("6c. Delete locally empty folder still moves backend-known folders to root", async () => {
+ const defaultMocks = setupDefaultMocks();
+ const oldFolder = makeFolderNode("/my/old");
+ const rootNode = makeFolderNode("/my", [oldFolder]);
+ defaultMocks.viewContext._sheetTree.value = rootNode;
+ defaultMocks.viewContext.getFoldersForWorksheet.mockImplementation(
+ (path: string) =>
+ path
+ .replace("/my", "")
+ .split("/")
+ .map((part) => part.trim())
+ .filter(Boolean)
+ );
+ defaultMocks.folderContext.listSubFolders.mockImplementation(
+ (parent: string) => (parent === "/my/old" ? ["/my/old/child"] : [])
+ );
+
+ mocks.useDropdown.mockReturnValue({
+ currentNode: oldFolder,
+ options: [{ type: "item", key: "delete", label: "Delete" }],
+ 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();
+
+ 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();
+ await new Promise((r) => setTimeout(r, 10));
+ });
+
+ expect(
+ defaultMocks.sheetContext.batchUpdateWorksheetFolderPaths
+ ).toHaveBeenCalledWith("my", [
+ { sourceFolder: ["old"], targetFolder: [] },
+ { sourceFolder: ["old", "child"], targetFolder: [] },
+ ]);
+ expect(defaultMocks.folderContext.removeFolder).toHaveBeenCalledWith(
+ "/my/old"
+ );
+
+ unmount();
+ });
+
test("7. Load more button fetches the next page", async () => {
const defaultMocks = setupDefaultMocks();
defaultMocks.viewContext._sheetTree.value = makeFolderNode("/my", [
{
- key: "/my/__load-more",
+ key: "__worksheet_load_more__:/my",
label: "common.load-more",
editable: false,
isLeaf: true,
loadMore: true,
+ loadMoreFolderKey: "/my",
children: [],
},
]);
@@ -954,7 +1103,7 @@ describe("SheetTree", () => {
render();
const loadMoreRow = container.querySelector(
- `[data-item-key="/my/__load-more"]`
+ `[data-item-key="__worksheet_load_more__:/my"]`
) as HTMLElement | null;
expect(loadMoreRow).not.toBeNull();
const loadMoreWrapper = loadMoreRow?.querySelector(
@@ -984,9 +1133,7 @@ describe("SheetTree", () => {
loadMoreButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
});
- expect(defaultMocks.viewContext.fetchNextPage).toHaveBeenCalledWith(
- undefined
- );
+ expect(defaultMocks.viewContext.fetchNextPage).toHaveBeenCalledWith("/my");
unmount();
});
@@ -996,7 +1143,7 @@ describe("SheetTree", () => {
const folder = makeFolderNode("/my/alpha", [
makeWorksheetNode("/my/alpha/ws1"),
{
- key: "/my/alpha/__load-more",
+ key: "__worksheet_load_more__:/my/alpha",
label: "common.load-more",
editable: false,
isLeaf: true,
@@ -1018,7 +1165,7 @@ describe("SheetTree", () => {
render();
const loadMoreRow = container.querySelector(
- `[data-item-key="/my/alpha/__load-more"]`
+ `[data-item-key="__worksheet_load_more__:/my/alpha"]`
) as HTMLElement | null;
expect(loadMoreRow).not.toBeNull();
const loadMoreWrapper = loadMoreRow?.querySelector(
@@ -1057,7 +1204,7 @@ describe("SheetTree", () => {
test("7c. Load more rows are inert for tree actions", () => {
const defaultMocks = setupDefaultMocks();
- const loadMoreNode = makeLoadMoreNode("/my/__load-more");
+ const loadMoreNode = makeLoadMoreNode("__worksheet_load_more__:/my");
const folderNode = makeFolderNode("/my/folder", [], true);
defaultMocks.viewContext._sheetTree.value = makeFolderNode("/my", [
folderNode,
@@ -1085,7 +1232,7 @@ describe("SheetTree", () => {
render();
const loadMoreRow = container.querySelector(
- `[data-item-key="/my/__load-more"]`
+ `[data-item-key="__worksheet_load_more__:/my"]`
) as HTMLElement | null;
expect(loadMoreRow).not.toBeNull();
@@ -1127,7 +1274,7 @@ describe("SheetTree", () => {
test("7d. Add folder ignores load-more nodes when generating a name", async () => {
const defaultMocks = setupDefaultMocks();
const existingFolder = makeFolderNode("/my/new folder", [], true);
- const loadMoreNode = makeLoadMoreNode("/my/__load-more");
+ const loadMoreNode = makeLoadMoreNode("__worksheet_load_more__:/my");
const rootNode = makeFolderNode(
"/my",
[existingFolder, loadMoreNode],
diff --git a/frontend/src/modules/sql-editor/components/SheetTree.tsx b/frontend/src/modules/sql-editor/components/SheetTree.tsx
index d3731d746f..60bd8e7d17 100644
--- a/frontend/src/modules/sql-editor/components/SheetTree.tsx
+++ b/frontend/src/modules/sql-editor/components/SheetTree.tsx
@@ -204,6 +204,10 @@ function WorksheetTreeLoadMoreButton({
);
}
+function HiddenDropCursor() {
+ return null;
+}
+
// ---------------------------------------------------------------------------
// Component
// ---------------------------------------------------------------------------
@@ -545,6 +549,29 @@ export function SheetTree({
]
);
+ const moveFoldersToRoot = useCallback(
+ async (folders: string[]) => {
+ const folderKeys = new Set<string>();
+ for (const folder of folders) {
+ for (const key of collectFolderKeys(folder)) {
+ folderKeys.add(key);
+ }
+ }
+ const updates = [...folderKeys].map<WorksheetFolderPathUpdate>((key) => ({
+ sourceFolder: getFoldersForWorksheet(key),
+ targetFolder: [],
+ }));
+ if (updates.length === 0) return;
+ await batchUpdateWorksheetFolderPaths(view, updates);
+ },
+ [
+ batchUpdateWorksheetFolderPaths,
+ collectFolderKeys,
+ getFoldersForWorksheet,
+ view,
+ ]
+ );
+
// ---- Delete helpers -------------------------------------------------------
const doDeleteWorksheets = useCallback(async (worksheets: string[]) => {
@@ -737,8 +764,11 @@ export function SheetTree({
};
if (worksheets.length === 0) {
- cleanFolders();
- resolve(true);
+ void (async () => {
+ await moveFoldersToRoot(folders);
+ cleanFolders();
+ resolve(true);
+ })();
return;
}
@@ -754,7 +784,7 @@ export function SheetTree({
deleteFoldersResolveRef.current = { resolve, cleanFolders, worksheets };
});
},
- [folderContext]
+ [folderContext, moveFoldersToRoot]
);
// Ref to hold the pending promise resolve for delete-folders dialog
@@ -1061,6 +1091,7 @@ export function SheetTree({
data: TreeDataNode<WorksheetFolderNode>;
isSelected: boolean;
isOpen?: boolean;
+ willReceiveDrop?: boolean;
};
style: React.CSSProperties;
dragHandle?: (el: HTMLDivElement | null) => void;
@@ -1072,6 +1103,8 @@ export function SheetTree({
const isEditing =
!!editingNode && editingNode.node.key === folderNode.key;
const isChecked = checkedNodes.some((n) => n.key === folderNode.key);
+ const isDropTargetFolder =
+ !folderNode.worksheet && !folderNode.loadMore && !!node.willReceiveDrop;
// react-arborist injects `paddingLeft: level * indent` via `style`,
// which overrides `className`'s `px-2` padding-left. Merge indent with
@@ -1099,7 +1132,8 @@ export function SheetTree({
// Align with the connection-panel database tree: subtle neutral
// hover, accent-tinted selection (was a too-light gray fill).
"hover:bg-control-bg/70 rounded-xs",
- isSelected && "bg-accent/10"
+ isSelected && "bg-accent/10",
+ isDropTargetFolder && "bg-accent/15 ring-1 ring-accent/40"
)}
onClick={(e) => {
// Only handle clicks on text/prefix area, not suffix
@@ -1387,20 +1421,16 @@ export function SheetTree({
size="sm"
onClick={async () => {
if (deleteDialogState.type !== "delete-folders") return;
- const { folders, worksheets } = deleteDialogState;
+ const { folders } = deleteDialogState;
setDeleteDialogState({ type: "none" });
const pending = deleteFoldersResolveRef.current;
if (pending) {
- await batchUpdateWorksheetFolders(
- worksheets.map((ws) => ({ name: ws, folders: [] }))
- );
+ await moveFoldersToRoot(folders);
pending.cleanFolders();
pending.resolve(true);
deleteFoldersResolveRef.current = null;
} else {
- await batchUpdateWorksheetFolders(
- folders.map(() => ({ name: "", folders: [] }))
- );
+ await moveFoldersToRoot(folders);
for (const folder of folders) {
folderContext.removeFolder(folder);
}
@@ -1418,6 +1448,9 @@ export function SheetTree({
setDeleteDialogState({ type: "none" });
const pending = deleteFoldersResolveRef.current;
if (pending) {
+ // TODO: This only deletes files already loaded into the tree.
+ // Add a batch delete-by-folder API before treating this as
+ // "delete all files" for paginated folders.
await doDeleteWorksheets(worksheets);
pending.cleanFolders();
pending.resolve(true);
@@ -1536,7 +1569,7 @@ export function SheetTree({
// ---- Main render ---------------------------------------------------------
return (
- <div className="relative flex min-w-0 max-w-full flex-col items-stretch gap-y-1 overflow-x-hidden worksheet-tree">
+ <div className="relative flex min-w-0 max-w-full flex-col items-stretch gap-y-1 overflow-x-clip worksheet-tree">
<Tree<WorksheetFolderNode>
data={treeData}
renderNode={renderNode}
@@ -1547,8 +1580,9 @@ export function SheetTree({
height={treeHeight}
rowHeight={ROW_HEIGHT}
indent={12}
+ renderCursor={HiddenDropCursor}
className={cn(
- "min-w-0 max-w-full overflow-x-hidden text-sm [&_[role=treeitem]]:!min-w-0 [&_[role=treeitem]]:!max-w-full",
+ "min-w-0 max-w-full !overflow-x-clip !overflow-y-visible text-sm [&_[role=treeitem]]:!min-w-0 [&_[role=treeitem]]:!max-w-full",
editingNode
? "[&_[role=treeitem]]:overflow-visible"
: "[&_[role=treeitem]]:overflow-hidden"
diff --git a/frontend/src/modules/sql-editor/components/WorksheetPane.test.tsx b/frontend/src/modules/sql-editor/components/WorksheetPane.test.tsx
index f05f380d61..86c6f07363 100644
--- a/frontend/src/modules/sql-editor/components/WorksheetPane.test.tsx
+++ b/frontend/src/modules/sql-editor/components/WorksheetPane.test.tsx
@@ -14,6 +14,16 @@ globalThis.ResizeObserver = class ResizeObserver {
unobserve() {}
disconnect() {}
};
+window.matchMedia = ((query: string) => ({
+ matches: true,
+ media: query,
+ onchange: null,
+ addEventListener: () => {},
+ removeEventListener: () => {},
+ addListener: () => {},
+ removeListener: () => {},
+ dispatchEvent: () => true,
+})) as unknown as typeof window.matchMedia;
// ---- hoisted mocks ----------------------------------------------------------
@@ -92,18 +102,37 @@ vi.mock("@/components/ui/dropdown-menu", () => ({
DropdownMenuTrigger: ({
children,
className,
+ render,
}: {
- children: React.ReactNode;
+ children?: React.ReactNode;
className?: string;
+ render?: React.ReactNode;
"aria-label"?: string;
}) => (
<button data-testid="dropdown-menu-trigger" className={className}>
- {children}
+ {render ?? children}
</button>
),
DropdownMenuContent: ({ children }: { children: React.ReactNode }) => (
<div data-testid="dropdown-menu-content">{children}</div>
),
+ DropdownMenuItem: ({
+ children,
+ onClick,
+ disabled,
+ }: {
+ children: React.ReactNode;
+ onClick?: () => void;
+ disabled?: boolean;
+ }) => (
+ <button
+ data-testid="dropdown-menu-item"
+ disabled={disabled}
+ onClick={onClick}
+ >
+ {children}
+ </button>
+ ),
}));
vi.mock("@/components/ui/dialog", () => ({
@@ -157,11 +186,25 @@ vi.mock("./FolderForm", () => ({
FolderForm: ({
folder,
onFolderChange,
+ includeRoot,
}: {
folder: string;
onFolderChange: (f: string) => void;
+ includeRoot?: boolean;
}) => (
- <div data-testid="folder-form" data-folder={folder}>
+ <div
+ data-testid="folder-form"
+ data-folder={folder}
+ data-include-root={String(!!includeRoot)}
+ >
+ {includeRoot && (
+ <button
+ data-testid="folder-form-set-root"
+ onClick={() => onFolderChange("/my")}
+ >
+ set-root
+ </button>
+ )}
<button
data-testid="folder-form-set-target"
onClick={() => onFolderChange("/some/folder")}
@@ -269,8 +312,28 @@ const setupDefaultMocks = (overrides: Partial<Filter> = {}) => {
const batchUpdateWorksheetFolders = vi.fn().mockResolvedValue(undefined);
const getFoldersForWorksheet = vi.fn((path: string): string[] =>
- path ? [path] : []
+ !path || path === "/my" ? [] : [path]
);
+ const sheetTree = {
+ key: "/my",
+ label: "Mine",
+ editable: false,
+ children: [
+ {
+ key: "/my/ws1",
+ label: "ws1",
+ editable: false,
+ children: [],
+ empty: true,
+ worksheet: {
+ name: "worksheets/ws1",
+ title: "ws1",
+ folders: [],
+ type: "worksheet",
+ },
+ } as WorksheetFolderNode,
+ ],
+ } as WorksheetFolderNode;
mocks.useSheetContext.mockReturnValue({
get filter() {
@@ -286,6 +349,7 @@ const setupDefaultMocks = (overrides: Partial<Filter> = {}) => {
mocks.useSheetContextByView.mockReturnValue({
getFoldersForWorksheet,
+ sheetTree,
});
return { filterRef, batchUpdateWorksheetFolders, getFoldersForWorksheet };
@@ -408,17 +472,20 @@ describe("WorksheetPane", () => {
);
expect(myTree?.getAttribute("data-multi-select-mode")).toBe("true");
- // Toolbar buttons rendered — filter by button labels
+ // Toolbar buttons rendered — Move + Cancel stay inline; destructive
+ // Delete is tucked into the More menu for the narrow worksheet pane.
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",
- ])
+ expect.arrayContaining(["sheet.move-worksheets", "common.cancel"])
);
+ expect(toolbarButtons).not.toContain("common.delete");
+ const menuItems = Array.from(
+ container.querySelectorAll("[data-testid='dropdown-menu-item']")
+ ).map((el) => el.textContent?.trim());
+ expect(menuItems).toContain("common.delete");
+ expect(toolbarButtons).not.toContain("common.n-selected");
unmount();
});
@@ -482,4 +549,61 @@ describe("WorksheetPane", () => {
unmount();
});
+
+ test("5b. Move modal can move worksheets to the root folder", async () => {
+ const { batchUpdateWorksheetFolders, getFoldersForWorksheet } =
+ setupDefaultMocks();
+ const { container, render, unmount } = renderIntoContainer(
+ <WorksheetPane />
+ );
+ render();
+
+ 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 }));
+ });
+
+ const moveButton = Array.from(
+ container.querySelectorAll("[data-testid='button']")
+ ).find((el) => el.textContent?.trim() === "sheet.move-worksheets");
+ act(() => {
+ moveButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+ });
+
+ act(() => {
+ container
+ .querySelector("[data-testid='folder-form-set-target']")
+ ?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+ });
+
+ const folderForm = container.querySelector("[data-testid='folder-form']");
+ expect(folderForm?.getAttribute("data-include-root")).toBe("true");
+
+ act(() => {
+ container
+ .querySelector("[data-testid='folder-form-set-root']")
+ ?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+ });
+
+ const saveButton = Array.from(
+ container.querySelectorAll("[data-testid='button']")
+ ).find((el) => el.textContent?.trim() === "common.save");
+
+ await act(async () => {
+ saveButton?.dispatchEvent(new MouseEvent("click", { bubbles: true }));
+ });
+
+ expect(getFoldersForWorksheet).toHaveBeenCalledWith("/my");
+ expect(batchUpdateWorksheetFolders).toHaveBeenCalledWith([
+ { name: "worksheets/ws1", folders: [] },
+ ]);
+
+ unmount();
+ });
});
diff --git a/frontend/src/modules/sql-editor/components/WorksheetPane.tsx b/frontend/src/modules/sql-editor/components/WorksheetPane.tsx
index 538d485757..8e61f2d109 100644
--- a/frontend/src/modules/sql-editor/components/WorksheetPane.tsx
+++ b/frontend/src/modules/sql-editor/components/WorksheetPane.tsx
@@ -8,6 +8,10 @@
import { FolderInputIcon, FunnelIcon, TrashIcon, XIcon } from "lucide-react";
import { useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
+import {
+ type SelectionAction,
+ SelectionActionBar,
+} from "@/components/SelectionActionBar";
import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
import {
@@ -29,6 +33,16 @@ import { FilterMenuItem } from "./FilterMenuItem";
import { FolderForm } from "./FolderForm";
import { SheetTree, type SheetTreeHandle } from "./SheetTree";
+function collectSelectableNodes(
+ node: WorksheetFolderNode | undefined
+): WorksheetFolderNode[] {
+ if (!node || node.loadMore) return [];
+ return [
+ node,
+ ...node.children.flatMap((child) => collectSelectableNodes(child)),
+ ];
+}
+
export function WorksheetPane() {
const { t } = useTranslation();
@@ -36,7 +50,8 @@ export function WorksheetPane() {
const { filter, filterChanged, batchUpdateWorksheetFolders, setFilter } =
sheetContext;
- const { getFoldersForWorksheet } = useSheetContextByView("my");
+ const myViewContext = useSheetContextByView("my");
+ const { getFoldersForWorksheet } = myViewContext;
const mineSheetTreeRef = useRef<SheetTreeHandle>(null);
@@ -68,6 +83,17 @@ export function WorksheetPane() {
.map((node) => node.worksheet!.name),
[checkedNodes]
);
+ const selectableNodes = useMemo(
+ () => collectSelectableNodes(myViewContext.sheetTree),
+ [myViewContext.sheetTree]
+ );
+ const checkedKeySet = useMemo(
+ () => new Set(checkedNodes.map((node) => node.key)),
+ [checkedNodes]
+ );
+ const allSelected =
+ selectableNodes.length > 0 &&
+ selectableNodes.every((node) => checkedKeySet.has(node.key));
const updateFilter = (patch: Partial<typeof filter>) => {
setFilter((prev) => ({ ...prev, ...patch }));
@@ -106,11 +132,39 @@ export function WorksheetPane() {
setPendingMoveFolder("");
};
+ const batchActions: SelectionAction[] = [
+ {
+ key: "move",
+ label: t("sheet.move-worksheets"),
+ icon: FolderInputIcon,
+ onClick: () => {
+ setPendingMoveFolder("");
+ setShowReorgModal(true);
+ },
+ disabled: checkedWorksheets.length === 0 || loading,
+ },
+ {
+ key: "cancel",
+ label: t("common.cancel"),
+ icon: XIcon,
+ onClick: () => setMultiSelectMode(false),
+ disabled: loading,
+ },
+ {
+ key: "delete",
+ label: t("common.delete"),
+ icon: TrashIcon,
+ onClick: handleMultiDelete,
+ disabled: checkedNodes.length === 0 || loading,
+ tone: "destructive",
+ },
+ ];
+
const showMultiSelectToolbar = multiSelectMode && filter.showMine;
const hasAnyView = filter.showMine || views.length > 0;
return (
- <div className="flex h-full min-w-0 max-w-full flex-col gap-1 overflow-hidden py-1 text-sm">
+ <div className="relative flex h-full min-w-0 max-w-full flex-col gap-1 overflow-hidden py-1 text-sm">
<div className="flex min-w-0 items-center gap-x-1 px-1">
<SearchInput
size="sm"
@@ -153,43 +207,12 @@ export function WorksheetPane() {
</DropdownMenu>
</div>
- <div className="relative flex min-w-0 max-w-full flex-1 flex-col gap-y-2 overflow-y-auto overflow-x-hidden worksheet-scroll">
- {showMultiSelectToolbar && (
- <div className="sticky top-0 z-10 flex flex-wrap items-center justify-start gap-y-1 gap-x-1 bg-control-bg py-2 px-1">
- <Button
- appearance="secondary"
- 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
- appearance="secondary"
- size="xs"
- disabled={checkedWorksheets.length === 0 || loading}
- onClick={() => {
- setPendingMoveFolder("");
- setShowReorgModal(true);
- }}
- >
- <FolderInputIcon className="size-3.5" />
- {t("sheet.move-worksheets")}
- </Button>
- <Button
- appearance="secondary"
- size="xs"
- disabled={loading}
- onClick={() => setMultiSelectMode(false)}
- >
- <XIcon className="size-3.5" />
- {t("common.cancel")}
- </Button>
- </div>
+ <div
+ className={cn(
+ "relative flex min-w-0 max-w-full flex-1 flex-col gap-y-2 overflow-y-auto overflow-x-hidden worksheet-scroll",
+ showMultiSelectToolbar && "pb-16"
)}
-
+ >
{filter.showMine && (
<SheetTree
key="my"
@@ -215,6 +238,23 @@ export function WorksheetPane() {
)}
</div>
+ {showMultiSelectToolbar && (
+ <SelectionActionBar
+ count={checkedNodes.length}
+ label={t("common.n-selected", { n: checkedNodes.length })}
+ allSelected={allSelected}
+ onToggleSelectAll={() => {
+ setCheckedNodes(allSelected ? [] : selectableNodes);
+ }}
+ actions={batchActions}
+ maxVisibleActions={2}
+ forceVisible
+ placement="container"
+ hideLabel
+ density="compact"
+ />
+ )}
+
<Dialog
open={showReorgModal}
onOpenChange={(open) => !open && closeReorgModal()}
@@ -225,6 +265,7 @@ export function WorksheetPane() {
<FolderForm
folder={pendingMoveFolder}
onFolderChange={setPendingMoveFolder}
+ includeRoot
/>
<div className="flex justify-end gap-x-2 mt-4">
<Button appearance="outline" onClick={closeReorgModal}>
diff --git a/frontend/src/modules/sql-editor/components/filterNode.test.ts b/frontend/src/modules/sql-editor/components/filterNode.test.ts
new file mode 100644
index 0000000000..1249a49f5b
--- /dev/null
+++ b/frontend/src/modules/sql-editor/components/filterNode.test.ts
@@ -0,0 +1,32 @@
+import { describe, expect, test } from "vitest";
+
+import type { WorksheetFolderNode } from "@/modules/sql-editor/model/Sheet";
+
+import { filterNode } from "./filterNode";
+
+const makeNode = (
+ partial: Partial<WorksheetFolderNode>
+): WorksheetFolderNode => ({
+ ...partial,
+ key: "/my/node",
+ label: "node",
+ editable: false,
+ children: [],
+});
+
+describe("filterNode", () => {
+ test("keeps load-more nodes visible during keyword search", () => {
+ const pred = filterNode("/my");
+
+ expect(
+ pred(
+ "payroll",
+ makeNode({
+ key: "__worksheet_load_more__:/my",
+ label: "common.load-more",
+ loadMore: true,
+ })
+ )
+ ).toBe(true);
+ });
+});
diff --git a/frontend/src/modules/sql-editor/components/filterNode.ts b/frontend/src/modules/sql-editor/components/filterNode.ts
index f3219b4fb8..75dc336e7b 100644
--- a/frontend/src/modules/sql-editor/components/filterNode.ts
+++ b/frontend/src/modules/sql-editor/components/filterNode.ts
@@ -3,14 +3,14 @@ import type { WorksheetFolderNode } from "@/modules/sql-editor/model/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).
+ * The predicate always shows the root node (matched by `rootPath`), load-more
+ * rows, 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) {
+ if (option.key === rootPath || option.loadMore || !keyword) {
return true;
}
return option.label?.toLowerCase().includes(keyword) ?? false;
diff --git a/frontend/src/modules/sql-editor/components/useDropdown.test.ts b/frontend/src/modules/sql-editor/components/useDropdown.test.ts
new file mode 100644
index 0000000000..205dad17fc
--- /dev/null
+++ b/frontend/src/modules/sql-editor/components/useDropdown.test.ts
@@ -0,0 +1,102 @@
+import { act, renderHook } from "@testing-library/react";
+import { afterEach, describe, expect, test, vi } from "vitest";
+import type {
+ WorksheetFilter,
+ WorksheetFolderNode,
+} from "@/modules/sql-editor/model/Sheet";
+import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
+import { useDropdown } from "./useDropdown";
+
+const mocks = vi.hoisted(() => ({
+ currentUser: { email: "[email protected]" },
+ worksheet: undefined as Worksheet | undefined,
+ isWorksheetWritableV1: vi.fn(() => true),
+}));
+
+vi.mock("react-i18next", () => ({
+ useTranslation: () => ({ t: (key: string) => key }),
+}));
+
+vi.mock("@/hooks/useAppState", () => ({
+ useCurrentUser: () => mocks.currentUser,
+}));
+
+vi.mock("@/stores/app", () => ({
+ useAppStore: (selector: (state: unknown) => unknown) =>
+ selector({
+ getWorksheetByName: () => mocks.worksheet,
+ }),
+}));
+
+vi.mock("@/utils", () => ({
+ isWorksheetWritableV1: mocks.isWorksheetWritableV1,
+}));
+
+const baseFilter: WorksheetFilter = {
+ keyword: "",
+ onlyShowStarred: false,
+ showMine: true,
+ showShared: true,
+ showDraft: true,
+};
+
+const worksheetNode: WorksheetFolderNode = {
+ key: "/my/sheet",
+ label: "sheet",
+ editable: true,
+ children: [],
+ worksheet: {
+ name: "projects/proj/worksheets/sheet",
+ title: "sheet",
+ folders: [],
+ type: "worksheet",
+ },
+};
+
+const event = {
+ preventDefault: vi.fn(),
+ stopPropagation: vi.fn(),
+} as unknown as React.MouseEvent;
+
+describe("useDropdown", () => {
+ afterEach(() => {
+ vi.clearAllMocks();
+ mocks.worksheet = undefined;
+ });
+
+ test("hides delete for writable shared worksheets", () => {
+ mocks.worksheet = {
+ name: "projects/proj/worksheets/sheet",
+ creator: "users/[email protected]",
+ } as Worksheet;
+
+ const { result } = renderHook(() =>
+ useDropdown("shared", baseFilter, false)
+ );
+
+ act(() => {
+ result.current.handleContextMenu(event, worksheetNode);
+ });
+
+ expect(
+ result.current.options.map((item) => item.type === "item" && item.key)
+ ).toEqual(["duplicate", "rename"]);
+ });
+
+ test("keeps delete for writable my worksheets", () => {
+ mocks.worksheet = {
+ name: "projects/proj/worksheets/sheet",
+ creator: "users/[email protected]",
+ } as Worksheet;
+
+ const { result } = renderHook(() => useDropdown("my", baseFilter, false));
+
+ act(() => {
+ result.current.handleContextMenu(event, worksheetNode);
+ });
+
+ expect(
+ result.current.options.map((item) => item.type === "item" && item.key)
+ ).toEqual(["duplicate", "share", "rename", "delete"]);
+ });
+});
diff --git a/frontend/src/modules/sql-editor/components/useDropdown.ts b/frontend/src/modules/sql-editor/components/useDropdown.ts
index f1199fad13..36734c6afc 100644
--- a/frontend/src/modules/sql-editor/components/useDropdown.ts
+++ b/frontend/src/modules/sql-editor/components/useDropdown.ts
@@ -108,16 +108,16 @@ export function useDropdown(
}
const canWriteSheet = isWorksheetWritableV1(worksheetEntity);
if (canWriteSheet) {
- items.push(
- {
- key: "rename",
- label: t("sql-editor.tab.context-menu.actions.rename"),
- },
- {
+ items.push({
+ key: "rename",
+ label: t("sql-editor.tab.context-menu.actions.rename"),
+ });
+ if (viewMode === "my") {
+ items.push({
key: "delete",
label: t("common.delete"),
- }
- );
+ });
+ }
}
if (canMultiSelect) {
items.push({
diff --git a/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx b/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
index 5827d3431d..fc19b00f52 100644
--- a/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
+++ b/frontend/src/modules/sql-editor/model/Sheet/context.test.tsx
@@ -7,7 +7,10 @@ import {
Worksheet_Visibility,
type Worksheet,
} from "@/types/proto-es/v1/worksheet_service_pb";
-import { storageKeySqlEditorWorksheetFolder } from "@/utils";
+import {
+ storageKeySqlEditorWorksheetFilter,
+ storageKeySqlEditorWorksheetFolder,
+} from "@/utils";
type AppState = {
currentUser: { email: string; workspace: string };
@@ -182,6 +185,109 @@ describe("sheet context", () => {
expect(container.textContent).toContain("Created worksheet");
});
+ test("does not restore worksheet search keyword from localStorage", async () => {
+ window.localStorage.setItem(
+ storageKeySqlEditorWorksheetFilter(
+ "",
+ "projects/proj1",
+ ),
+ JSON.stringify({
+ keyword: "payroll",
+ showMine: true,
+ showShared: false,
+ showDraft: true,
+ onlyShowStarred: true,
+ })
+ );
+
+ const { provideSheetContext, useSheetContext } = await import("./context");
+ let sheetContext: ReturnType<typeof useSheetContext> | undefined;
+
+ const Probe = () => {
+ provideSheetContext();
+ sheetContext = useSheetContext();
+ return null;
+ };
+
+ root = createRoot(container);
+ await act(async () => {
+ root.render(<Probe />);
+ });
+
+ expect(sheetContext!.filter.keyword).toBe("");
+ expect(sheetContext!.filter.onlyShowStarred).toBe(true);
+ expect(sheetContext!.filter.showShared).toBe(false);
+ });
+
+ test("persists worksheet filter without deprecated keyword", async () => {
+ const key = storageKeySqlEditorWorksheetFilter(
+ "",
+ "projects/proj1",
+ );
+
+ const { provideSheetContext, useSheetContext } = await import("./context");
+ let sheetContext: ReturnType<typeof useSheetContext> | undefined;
+
+ const Probe = () => {
+ provideSheetContext();
+ sheetContext = useSheetContext();
+ return null;
+ };
+
+ root = createRoot(container);
+ await act(async () => {
+ root.render(<Probe />);
+ });
+
+ act(() => {
+ sheetContext!.setFilter({
+ ...sheetContext!.filter,
+ keyword: "payroll",
+ onlyShowStarred: true,
+ });
+ });
+
+ const stored = JSON.parse(window.localStorage.getItem(key)!);
+ expect(stored).toEqual({
+ showMine: true,
+ showShared: true,
+ showDraft: true,
+ onlyShowStarred: true,
+ });
+ });
+
+ test("uses a collision-free key for load-more rows", async () => {
+ mocks.getAppState().listWorksheetFolders.mockResolvedValueOnce([
+ { folders: ["__load-more"], category: "my" },
+ ]);
+
+ const { provideSheetContext, useSheetContextByView } = await import(
+ "./context"
+ );
+ let viewContext: ReturnType<typeof useSheetContextByView> | undefined;
+
+ const Probe = () => {
+ provideSheetContext();
+ viewContext = useSheetContextByView("my");
+ return null;
+ };
+
+ root = createRoot(container);
+ await act(async () => {
+ root.render(<Probe />);
+ });
+
+ await act(async () => {
+ await viewContext!.fetchSheetList();
+ });
+
+ const keys = viewContext!.sheetTree.children.map((child) => child.key);
+ expect(keys).toContain("/my/__load-more");
+ expect(keys).toContain("__worksheet_load_more__:/my");
+ });
+
test("loads caller worksheet folders before the root worksheet page", async () => {
mocks
.getAppState()
@@ -345,9 +451,74 @@ describe("sheet context", () => {
expect(mocks.getAppState().fetchWorksheetList).toHaveBeenLastCalledWith(
"projects/proj1",
- 'creator == "users/[email protected]" && title.contains("payroll") && starred == true',
+ 'creator == "users/[email protected]" && folder == "" && title.contains("payroll") && starred == true',
+ expect.objectContaining({ pageToken: "" })
+ );
+
+ mocks.getAppState().fetchWorksheetList.mockClear();
+ await act(async () => {
+ await viewContext!.fetchNextPage();
+ });
+
+ expect(mocks.getAppState().fetchWorksheetList).toHaveBeenLastCalledWith(
+ "projects/proj1",
+ 'creator == "users/[email protected]" && folder == "" && title.contains("payroll") && starred == true',
+ expect.objectContaining({ pageToken: "next-page" })
+ );
+ });
+
+ test("keeps backend-known folders visible when starred filter is active", async () => {
+ mocks
+ .getAppState()
+ .listWorksheetFolders.mockResolvedValue([
+ { folders: ["alpha"], category: "my" },
+ ]);
+ mocks.getAppState().fetchWorksheetList.mockResolvedValue({
+ worksheets: [],
+ nextPageToken: "",
+ });
+
+ const { provideSheetContext, useSheetContext, useSheetContextByView } =
+ await import("./context");
+ let sheetContext: ReturnType<typeof useSheetContext> | undefined;
+ let viewContext: ReturnType<typeof useSheetContextByView> | undefined;
+
+ const Probe = () => {
+ provideSheetContext();
+ sheetContext = useSheetContext();
+ viewContext = useSheetContextByView("my");
+ return (
+ <div>
+ {viewContext.sheetTree.children.map((child) => child.label).join(",")}
+ </div>
+ );
+ };
+
+ root = createRoot(container);
+ await act(async () => {
+ root.render(<Probe />);
+ });
+ await act(async () => {
+ await viewContext!.fetchSheetList();
+ });
+ mocks.getAppState().fetchWorksheetList.mockClear();
+
+ act(() => {
+ sheetContext!.setFilter({
+ ...sheetContext!.filter,
+ onlyShowStarred: true,
+ });
+ });
+ await act(async () => {
+ await vi.runAllTimersAsync();
+ });
+
+ expect(mocks.getAppState().fetchWorksheetList).toHaveBeenLastCalledWith(
+ "projects/proj1",
+ 'creator == "users/[email protected]" && folder == "" && starred == true',
expect.objectContaining({ pageToken: "" })
);
+ expect(container.textContent).toContain("alpha");
});
test("fetches worksheet descendants for a folder without replacing the paged view", async () => {
diff --git a/frontend/src/modules/sql-editor/model/Sheet/context.ts b/frontend/src/modules/sql-editor/model/Sheet/context.ts
index 99a1fe4d7d..be36771f87 100644
--- a/frontend/src/modules/sql-editor/model/Sheet/context.ts
+++ b/frontend/src/modules/sql-editor/model/Sheet/context.ts
@@ -71,6 +71,10 @@ export interface WorksheetFilter {
showDraft: boolean;
}
+type PersistedWorksheetFilter = Omit<WorksheetFilter, "keyword"> & {
+ keyword?: string;
+};
+
export interface FolderContext {
rootPath: string;
folders: string[];
@@ -442,14 +446,15 @@ const currentScope = (): {
}
};
-const isWorksheetFilter = (v: unknown): v is WorksheetFilter =>
+const isPersistedWorksheetFilter = (
+ v: unknown
+): v is PersistedWorksheetFilter =>
typeof v === "object" &&
v !== null &&
- "keyword" in v &&
- "onlyShowStarred" in v &&
- "showMine" in v &&
- "showShared" in v &&
- "showDraft" in v;
+ typeof (v as PersistedWorksheetFilter).onlyShowStarred === "boolean" &&
+ typeof (v as PersistedWorksheetFilter).showMine === "boolean" &&
+ typeof (v as PersistedWorksheetFilter).showShared === "boolean" &&
+ typeof (v as PersistedWorksheetFilter).showDraft === "boolean";
const reloadFromStorage = () => {
const scope = currentScope();
@@ -461,8 +466,11 @@ const reloadFromStorage = () => {
scope.project,
scope.email
),
- (v) => (isWorksheetFilter(v) ? v : undefined)
- ) ?? { ...INITIAL_FILTER };
+ (v) => (isPersistedWorksheetFilter(v) ? v : undefined)
+ );
+ const hydratedFilter = filter
+ ? { ...INITIAL_FILTER, ...filter, keyword: INITIAL_FILTER.keyword }
+ : { ...INITIAL_FILTER };
const expandedArray = safeReadJSON<string[]>(
storageKeySqlEditorWorksheetTree(scope.wsScope, scope.project, scope.email),
@@ -495,7 +503,7 @@ const reloadFromStorage = () => {
}
useSheetContextStore.getState().hydrate({
- filter,
+ filter: hydratedFilter,
expandedKeys,
selectedKeys: [],
editingNode: undefined,
@@ -512,7 +520,12 @@ const persistFilter = (filter: WorksheetFilter) => {
scope.project,
scope.email
),
- filter
+ {
+ onlyShowStarred: filter.onlyShowStarred,
+ showMine: filter.showMine,
+ showShared: filter.showShared,
+ showDraft: filter.showDraft,
+ }
);
};
@@ -627,6 +640,9 @@ const rootTreeNodeFor = (view: SheetViewMode): WorksheetFolderNode => ({
editable: false,
});
+const getLoadMoreNodeKey = (folderKey: string) =>
+ `__worksheet_load_more__:${folderKey}`;
+
const ensureFolderPath = (view: SheetViewMode, path: string): string => {
const root = rootPathFor(view);
let p = path
@@ -844,16 +860,14 @@ const buildTree = (
: viewState.folderNextPageTokens.has(parent.key);
if (includeLoadMore && hasMore) {
const loadMoreNode: WorksheetFolderNode = {
- key: `${parent.key}/__load-more`,
+ key: getLoadMoreNodeKey(parent.key),
label: i18n.t("common.load-more"),
editable: false,
isLeaf: true,
loadMore: true,
+ loadMoreFolderKey: parent.key,
children: [],
};
- if (!isRoot) {
- loadMoreNode.loadMoreFolderKey = parent.key;
- }
parent.children.push(loadMoreNode);
}
parent.empty = sheets.length === 0 && empty;
@@ -909,7 +923,6 @@ const sheetLikeItemsForView = (view: SheetViewMode): WorksheetLikeItem[] => {
};
const rebuildTreeImpl = (view: SheetViewMode) => {
- const filter = useSheetContextStore.getState().filter;
const folderContext = getFolderContext(view);
const folderPaths = new Set<string>();
@@ -931,12 +944,7 @@ const rebuildTreeImpl = (view: SheetViewMode) => {
label: rootLabelFor(view),
key: folderContext.rootPath,
};
- const tree = buildTree(
- view,
- root,
- worksheetsByFolder,
- filter.onlyShowStarred
- );
+ const tree = buildTree(view, root, worksheetsByFolder, false);
useSheetContextStore.getState().setViewSheetTree(view, tree);
getEvents(view).emit("on-built", { viewMode: view });
};
@@ -959,12 +967,9 @@ const fetchSheetListFor = async (view: SheetViewMode) => {
try {
state.resetViewFolderPageState(view);
await fetchWorksheetFoldersForView(view);
- const rootFilters = hasWorksheetServerFilter() ? [] : [`folder == ""`];
- const { worksheets, nextPageToken } = await fetchWorksheetsPage(
- view,
- "",
- rootFilters
- );
+ const { worksheets, nextPageToken } = await fetchWorksheetsPage(view, "", [
+ `folder == ""`,
+ ]);
state.setViewWorksheetNames(
view,
worksheets.map((worksheet) => worksheet.name)
@@ -1016,9 +1021,7 @@ const fetchNextSheetPageFor = async (
const { worksheets, nextPageToken } = await fetchWorksheetsPage(
view,
pageToken,
- key === folderContext.rootPath && hasWorksheetServerFilter()
- ? []
- : [folderFilterForKey(view, key)]
+ [folderFilterForKey(view, key)]
);
const names = new Set(
useSheetContextStore.getState().viewStates[view].worksheetNames
@@ -1061,9 +1064,6 @@ const worksheetSearchFilters = (): string[] => {
return filters;
};
-const hasWorksheetServerFilter = (): boolean =>
- worksheetSearchFilters().length > 0;
-
const sheetFilterForView = (
view: SheetViewMode,
extraFilters: string[] = [],