Skip to content

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

refactor: worksheet slice (#20433)

ecmadaoecfc251b062f
diff --git a/frontend/src/react/components/Quickstart.tsx b/frontend/src/react/components/Quickstart.tsx
index d7028c890e..79b35ad759 100644
--- a/frontend/src/react/components/Quickstart.tsx
+++ b/frontend/src/react/components/Quickstart.tsx
@@ -5,6 +5,7 @@ import type { RouteLocationRaw } from "vue-router";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
import { useNavigate } from "@/react/router";
+import { useAppStore } from "@/react/stores/app";
import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";
import {
DATABASE_ROUTE_DASHBOARD,
@@ -21,7 +22,6 @@ import {
useProjectIamPolicyStore,
useProjectV1Store,
useUIStateStore,
- useWorkSheetStore,
} from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import type { Permission } from "@/types";
@@ -73,7 +73,6 @@ export function Quickstart() {
const uiStateStore = useUIStateStore();
const actuatorStore = useActuatorV1Store();
const issueStore = useIssueV1Store();
- const worksheetStore = useWorkSheetStore();
const projectIamPolicyStore = useProjectIamPolicyStore();
const quickStartEnabled = useVueState(() => actuatorStore.quickStartEnabled);
@@ -149,16 +148,18 @@ export function Quickstart() {
if (!cancelled) setSampleIssueExists(!!issue);
})();
void (async () => {
- const sheet = await worksheetStore.getOrFetchWorksheetByName(
- `${sampleProject.name}/sheets/${SAMPLE_SHEET_ID}`,
- true /* silent */
- );
+ const sheet = await useAppStore
+ .getState()
+ .getOrFetchWorksheetByName(
+ `${sampleProject.name}/sheets/${SAMPLE_SHEET_ID}`,
+ true /* silent */
+ );
if (!cancelled) setSampleSheetExists(!!sheet);
})();
return () => {
cancelled = true;
};
- }, [sampleProject, issueStore, worksheetStore]);
+ }, [sampleProject, issueStore]);
// ---- intro list (memoized + permission-filtered) ----------------------
diff --git a/frontend/src/react/components/sql-editor/ConnectionPane/actions.test.tsx b/frontend/src/react/components/sql-editor/ConnectionPane/actions.test.tsx
index 21a3f6a8f9..1c0cc43669 100644
--- a/frontend/src/react/components/sql-editor/ConnectionPane/actions.test.tsx
+++ b/frontend/src/react/components/sql-editor/ConnectionPane/actions.test.tsx
@@ -83,6 +83,17 @@ vi.mock("@/types", async () => {
};
});
+// The SQL-editor tab/worksheet stores now transitively load the Zustand
+// app store (eagerly created). Stub it so the real `createAppStore()`
+// (which reads `@/types` exports this test doesn't mock) never runs.
+vi.mock("@/react/stores/app", () => {
+ const useAppStore = Object.assign(
+ (selector?: (state: unknown) => unknown) => (selector ? selector({}) : {}),
+ { getState: () => ({}), subscribe: () => () => {} }
+ );
+ return { useAppStore };
+});
+
let useConnectionMenu: typeof import("./actions").useConnectionMenu;
const renderHook = <T,>(hookFn: () => T) => {
diff --git a/frontend/src/react/components/sql-editor/EditorAction.test.tsx b/frontend/src/react/components/sql-editor/EditorAction.test.tsx
index f5089c41e6..c20d0cf557 100644
--- a/frontend/src/react/components/sql-editor/EditorAction.test.tsx
+++ b/frontend/src/react/components/sql-editor/EditorAction.test.tsx
@@ -22,7 +22,7 @@ const mocks = vi.hoisted(() => ({
resultRowsLimit: 500,
updateCurrentTab: vi.fn(),
useUIStateStore: vi.fn(),
- useWorkSheetStore: vi.fn(),
+ getWorksheetByName: vi.fn<(name: string) => unknown>(),
useWorksheetAndTab: vi.fn(),
useConnectionOfCurrentSQLEditorTab: vi.fn(),
isWorksheetWritableV1: vi.fn(() => true),
@@ -36,7 +36,12 @@ vi.mock("react-i18next", () => ({
vi.mock("@/store", () => ({
useUIStateStore: mocks.useUIStateStore,
- useWorkSheetStore: mocks.useWorkSheetStore,
+}));
+
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: {
+ getState: () => ({ getWorksheetByName: mocks.getWorksheetByName }),
+ },
}));
vi.mock("@/react/hooks/useWorksheetAndTab", () => ({
@@ -198,12 +203,10 @@ const setup = (options: SetupOptions = {}) => {
const updateCurrentTab = mocks.updateCurrentTab;
mocks.useUIStateStore.mockReturnValue({ saveIntroStateByKey });
- mocks.useWorkSheetStore.mockReturnValue({
- getWorksheetByName: vi.fn(() => ({
- name: worksheet ?? "",
- database: "databases/db1",
- })),
- });
+ mocks.getWorksheetByName.mockImplementation(() => ({
+ name: worksheet ?? "",
+ database: "databases/db1",
+ }));
mocks.useWorksheetAndTab.mockReturnValue({
currentSheet: worksheet ? { name: worksheet, title: "sheet" } : undefined,
isCreator: false,
diff --git a/frontend/src/react/components/sql-editor/EditorAction.tsx b/frontend/src/react/components/sql-editor/EditorAction.tsx
index 84f3cebadf..bf436384cb 100644
--- a/frontend/src/react/components/sql-editor/EditorAction.tsx
+++ b/frontend/src/react/components/sql-editor/EditorAction.tsx
@@ -11,6 +11,7 @@ import { Tooltip } from "@/react/components/ui/tooltip";
import { useConnectionOfCurrentSQLEditorTab } from "@/react/hooks/useSQLEditorBridge";
import { useWorksheetAndTab } from "@/react/hooks/useWorksheetAndTab";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import { useSQLEditorEditorState } from "@/react/stores/sqlEditor/editor";
import {
getSQLEditorTabsState,
@@ -18,7 +19,7 @@ import {
useIsDisconnected,
useSQLEditorTabState,
} from "@/react/stores/sqlEditor/tab";
-import { useUIStateStore, useWorkSheetStore } from "@/store";
+import { useUIStateStore } from "@/store";
import type { SQLEditorQueryParams } from "@/types";
import { Engine } from "@/types/proto-es/v1/common_pb";
import { isWorksheetWritableV1, keyboardShortcutStr } from "@/utils";
@@ -44,7 +45,6 @@ type Props = {
export function EditorAction({ onExecute }: Props) {
const { t } = useTranslation();
const uiStateStore = useUIStateStore();
- const worksheetStore = useWorkSheetStore();
const { currentSheet: currentWorksheet } = useWorksheetAndTab();
const { instance } = useConnectionOfCurrentSQLEditorTab();
@@ -93,7 +93,7 @@ export function EditorAction({ onExecute }: Props) {
const canWriteSheet = (() => {
if (!tabWorksheet) return false;
- const sheet = worksheetStore.getWorksheetByName(tabWorksheet);
+ const sheet = useAppStore.getState().getWorksheetByName(tabWorksheet);
return sheet ? isWorksheetWritableV1(sheet) : false;
})();
@@ -101,7 +101,7 @@ export function EditorAction({ onExecute }: Props) {
if (!showSheetsFeature || !currentTab) return false;
if (tabWorksheet) {
if (!canWriteSheet) return false;
- const sheet = worksheetStore.getWorksheetByName(tabWorksheet);
+ const sheet = useAppStore.getState().getWorksheetByName(tabWorksheet);
if (sheet && sheet.database !== currentTab.connection.database) {
return true;
}
diff --git a/frontend/src/react/components/sql-editor/MaskingReasonPopover.tsx b/frontend/src/react/components/sql-editor/MaskingReasonPopover.tsx
index a2b89fa31f..fdfd7d69db 100644
--- a/frontend/src/react/components/sql-editor/MaskingReasonPopover.tsx
+++ b/frontend/src/react/components/sql-editor/MaskingReasonPopover.tsx
@@ -65,6 +65,9 @@ export function MaskingReasonPopover({
<PopoverTrigger
openOnHover
delay={100}
+ // The trigger renders a <div>, not a native <button>; tell Base
+ // UI so it doesn't warn about missing native button semantics.
+ nativeButton={false}
render={
<div className="inline-flex items-center gap-0.5 cursor-pointer">
{reason.semanticTypeIcon && (
diff --git a/frontend/src/react/components/sql-editor/SQLEditorRouteShell.tsx b/frontend/src/react/components/sql-editor/SQLEditorRouteShell.tsx
index f2165e49cf..de61755fa7 100644
--- a/frontend/src/react/components/sql-editor/SQLEditorRouteShell.tsx
+++ b/frontend/src/react/components/sql-editor/SQLEditorRouteShell.tsx
@@ -9,6 +9,7 @@ import {
import { usePiniaBridge } from "@/react/hooks/usePiniaBridge";
import { useClampResultRowsLimitToPolicy } from "@/react/hooks/useSQLEditorBridge";
import { useCurrentRoute, useNavigate } from "@/react/router";
+import { useAppStore } from "@/react/stores/app";
import type { AsidePanelTab } from "@/react/stores/sqlEditor";
import { useSQLEditorStore } from "@/react/stores/sqlEditor";
import {
@@ -32,7 +33,6 @@ import {
useActuatorV1Store,
useDatabaseV1Store,
useProjectV1Store,
- useWorkSheetStore,
} from "@/store";
import { migrateLegacyCache } from "@/store/modules/sqlEditor/legacy/migration";
import {
@@ -111,7 +111,6 @@ export function SQLEditorRouteShell() {
const databaseStore = useDatabaseV1Store();
const setAsidePanelTab = useSQLEditorStore((s) => s.setAsidePanelTab);
const maybeSwitchProject = useSQLEditorStore((s) => s.maybeSwitchProject);
- const worksheetStore = useWorkSheetStore();
const projectContextReady = useSQLEditorEditorState(
(s) => s.projectContextReady
@@ -193,7 +192,9 @@ export function SQLEditorRouteShell() {
const openedSheetTab = Array.from(tabsState.tabsById.values()).find(
(t) => t.worksheet === sheetName
);
- const sheet = await worksheetStore.getOrFetchWorksheetByName(sheetName);
+ const sheet = await useAppStore
+ .getState()
+ .getOrFetchWorksheetByName(sheetName);
if (!sheet) {
if (openedSheetTab) {
tabsState.updateTab(openedSheetTab.id, {
@@ -325,7 +326,7 @@ export function SQLEditorRouteShell() {
);
if (vals.sheetName) {
- const sheet = worksheetStore.getWorksheetByName(vals.sheetName);
+ const sheet = useAppStore.getState().getWorksheetByName(vals.sheetName);
if (sheet) {
await navigate.replace({
name: SQL_EDITOR_WORKSHEET_MODULE,
diff --git a/frontend/src/react/components/sql-editor/SaveSheetModal.test.tsx b/frontend/src/react/components/sql-editor/SaveSheetModal.test.tsx
index 20696bf8de..998d7b3a2b 100644
--- a/frontend/src/react/components/sql-editor/SaveSheetModal.test.tsx
+++ b/frontend/src/react/components/sql-editor/SaveSheetModal.test.tsx
@@ -13,7 +13,7 @@ const eventHandlers: Record<string, (payload: unknown) => void> = {};
const mocks = vi.hoisted(() => ({
useTranslation: vi.fn(() => ({ t: (key: string) => key })),
- worksheetStore: {
+ appStore: {
getWorksheetByName: vi.fn(),
},
editorWorksheetStore: {
@@ -39,8 +39,8 @@ vi.mock("@/react/hooks/useSQLEditorEvent", () => ({
),
}));
-vi.mock("@/store", () => ({
- useWorkSheetStore: vi.fn(() => mocks.worksheetStore),
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: { getState: () => mocks.appStore },
}));
vi.mock("@/react/stores/sqlEditor", () => ({
@@ -202,7 +202,7 @@ beforeEach(async () => {
mocks.editorWorksheetStore.createWorksheet.mockResolvedValue(undefined);
mocks.sheetContext.getPwdForWorksheet.mockReturnValue("");
mocks.sheetContext.getFoldersForWorksheet.mockReturnValue([]);
- mocks.worksheetStore.getWorksheetByName.mockReturnValue(undefined);
+ mocks.appStore.getWorksheetByName.mockReturnValue(undefined);
({ SaveSheetModal } = await import("./SaveSheetModal"));
});
diff --git a/frontend/src/react/components/sql-editor/SaveSheetModal.tsx b/frontend/src/react/components/sql-editor/SaveSheetModal.tsx
index 02aa77ba91..14ded7e241 100644
--- a/frontend/src/react/components/sql-editor/SaveSheetModal.tsx
+++ b/frontend/src/react/components/sql-editor/SaveSheetModal.tsx
@@ -8,8 +8,8 @@ import {
} from "@/react/components/ui/dialog";
import { Input } from "@/react/components/ui/input";
import { useSQLEditorEvent } from "@/react/hooks/useSQLEditorEvent";
+import { useAppStore } from "@/react/stores/app";
import { useSQLEditorStore } from "@/react/stores/sqlEditor";
-import { useWorkSheetStore } from "@/store";
import type { SQLEditorTab } from "@/types";
import { UNKNOWN_ID } from "@/types";
import { extractWorksheetID } from "@/utils";
@@ -18,7 +18,6 @@ import { FolderForm } from "./FolderForm";
export function SaveSheetModal() {
const { t } = useTranslation();
- const worksheetStore = useWorkSheetStore();
const abortAutoSave = useSQLEditorStore((s) => s.abortAutoSave);
const maybeUpdateWorksheet = useSQLEditorStore((s) => s.maybeUpdateWorksheet);
const createWorksheet = useSQLEditorStore((s) => s.createWorksheet);
@@ -85,7 +84,9 @@ export function SaveSheetModal() {
// (for the silent path) — bypassing React's async setState batching.
let nextFolder = "";
if (tab.worksheet) {
- const worksheet = worksheetStore.getWorksheetByName(tab.worksheet);
+ const worksheet = useAppStore
+ .getState()
+ .getWorksheetByName(tab.worksheet);
if (worksheet) {
nextFolder = sheetContext.getPwdForWorksheet(worksheet);
}
diff --git a/frontend/src/react/components/sql-editor/SharePopoverBody.test.tsx b/frontend/src/react/components/sql-editor/SharePopoverBody.test.tsx
index 1f40c277cb..5938b10d64 100644
--- a/frontend/src/react/components/sql-editor/SharePopoverBody.test.tsx
+++ b/frontend/src/react/components/sql-editor/SharePopoverBody.test.tsx
@@ -12,7 +12,7 @@ const mocks = vi.hoisted(() => ({
usePiniaBridge: vi.fn<(getter: () => unknown) => unknown>(),
useActuatorV1Store: vi.fn(),
useCurrentUserV1: vi.fn(),
- useWorkSheetStore: vi.fn(),
+ patchWorksheet: vi.fn().mockResolvedValue({}),
// `useSQLEditorTabState(selector)` runs `selector` against this stub
// state; the component selects `tabsById.get(currentTabId)?.status`.
tabStatus: "CLEAN" as string,
@@ -35,10 +35,15 @@ vi.mock("@/react/hooks/usePiniaBridge", () => ({
vi.mock("@/store", () => ({
useActuatorV1Store: mocks.useActuatorV1Store,
useCurrentUserV1: mocks.useCurrentUserV1,
- useWorkSheetStore: mocks.useWorkSheetStore,
pushNotification: mocks.pushNotification,
}));
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: {
+ getState: () => ({ patchWorksheet: mocks.patchWorksheet }),
+ },
+}));
+
vi.mock("@/react/stores/sqlEditor/tab", () => ({
useSQLEditorTabState: (
selector: (s: {
@@ -133,9 +138,7 @@ beforeEach(async () => {
mocks.useCurrentUserV1.mockReturnValue({
value: { email: "[email protected]", name: "users/[email protected]" },
});
- mocks.useWorkSheetStore.mockReturnValue({
- patchWorksheet: vi.fn().mockResolvedValue({}),
- });
+ mocks.patchWorksheet.mockResolvedValue({});
mocks.tabStatus = "CLEAN";
mocks.usePiniaBridge.mockImplementation((getter: () => unknown) => getter());
@@ -202,8 +205,7 @@ describe("SharePopoverBody", () => {
});
test("handleChangeAccess calls patchWorksheet and pushNotification but does NOT close the outer popover", async () => {
- const patchWorksheet = vi.fn().mockResolvedValue({});
- mocks.useWorkSheetStore.mockReturnValue({ patchWorksheet });
+ const patchWorksheet = mocks.patchWorksheet;
const { container, render, unmount } = renderIntoContainer(
<SharePopoverBody worksheet={mockWorksheet as never} />
diff --git a/frontend/src/react/components/sql-editor/SharePopoverBody.tsx b/frontend/src/react/components/sql-editor/SharePopoverBody.tsx
index d5b806e137..57e55c4c8a 100644
--- a/frontend/src/react/components/sql-editor/SharePopoverBody.tsx
+++ b/frontend/src/react/components/sql-editor/SharePopoverBody.tsx
@@ -15,6 +15,7 @@ import {
} from "@/react/components/ui/popover";
import { usePiniaBridge } from "@/react/hooks/usePiniaBridge";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import { useSQLEditorTabState } from "@/react/stores/sqlEditor/tab";
import { router } from "@/router";
import { SQL_EDITOR_WORKSHEET_MODULE } from "@/router/sqlEditor";
@@ -22,7 +23,6 @@ import {
pushNotification,
useActuatorV1Store,
useCurrentUserV1,
- useWorkSheetStore,
} from "@/store";
import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
import { Worksheet_Visibility } from "@/types/proto-es/v1/worksheet_service_pb";
@@ -47,7 +47,6 @@ export function SharePopoverBody({ worksheet }: Props) {
const { t } = useTranslation();
const actuatorStore = useActuatorV1Store();
const currentUserStore = useCurrentUserV1();
- const worksheetStore = useWorkSheetStore();
const workspaceExternalURL = usePiniaBridge(
() => actuatorStore.serverInfo?.externalUrl
@@ -120,10 +119,11 @@ export function SharePopoverBody({ worksheet }: Props) {
return;
}
setCurrentAccess(option);
- await worksheetStore.patchWorksheet(
- { ...worksheet, visibility: option.value },
- ["visibility"]
- );
+ await useAppStore
+ .getState()
+ .patchWorksheet({ ...worksheet, visibility: option.value }, [
+ "visibility",
+ ]);
try {
await navigator.clipboard.writeText(sharedTabLink);
@@ -168,6 +168,9 @@ export function SharePopoverBody({ worksheet }: Props) {
</div>
<Popover open={selectorOpen} onOpenChange={setSelectorOpen}>
<PopoverTrigger
+ // The trigger renders a <div>, not a native <button>; tell Base
+ // UI so it doesn't warn about missing native button semantics.
+ nativeButton={false}
render={
<div
data-access-trigger
diff --git a/frontend/src/react/components/sql-editor/SheetTree.test.tsx b/frontend/src/react/components/sql-editor/SheetTree.test.tsx
index 5bc8e8279b..46815940c7 100644
--- a/frontend/src/react/components/sql-editor/SheetTree.test.tsx
+++ b/frontend/src/react/components/sql-editor/SheetTree.test.tsx
@@ -19,7 +19,17 @@ globalThis.ResizeObserver = class ResizeObserver {
const mocks = vi.hoisted(() => ({
useTranslation: vi.fn(() => ({ t: (key: string) => key })),
- useWorkSheetStore: vi.fn(),
+ appStore: {
+ getWorksheetByName: vi.fn(),
+ deleteWorksheetByName: vi.fn(),
+ patchWorksheet: vi.fn(),
+ upsertWorksheetOrganizer: vi.fn(),
+ } as {
+ getWorksheetByName: ReturnType<typeof vi.fn>;
+ deleteWorksheetByName: ReturnType<typeof vi.fn>;
+ patchWorksheet: ReturnType<typeof vi.fn>;
+ upsertWorksheetOrganizer: ReturnType<typeof vi.fn>;
+ },
getSQLEditorTabsState: vi.fn(),
project: "projects/proj1",
// The new zustand store mock — only `createWorksheet` is used by SheetTree.
@@ -36,10 +46,13 @@ vi.mock("react-i18next", () => ({
}));
vi.mock("@/store", () => ({
- useWorkSheetStore: mocks.useWorkSheetStore,
pushNotification: mocks.pushNotification,
}));
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: { getState: () => mocks.appStore },
+}));
+
vi.mock("@/react/stores/sqlEditor/tab", () => ({
getSQLEditorTabsState: mocks.getSQLEditorTabsState,
}));
@@ -416,19 +429,17 @@ const setupDefaultMocks = () => {
mocks.useSheetContext.mockReturnValue(sheetContext);
mocks.useSheetContextByView.mockReturnValue(viewContext);
- 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.appStore.getWorksheetByName.mockImplementation((name: string) => ({
+ name,
+ title: "My Query",
+ folders: [],
+ database: "",
+ starred: false,
+ creator: "users/[email protected]",
+ }));
+ mocks.appStore.deleteWorksheetByName.mockResolvedValue(undefined);
+ mocks.appStore.patchWorksheet.mockResolvedValue({});
+ mocks.appStore.upsertWorksheetOrganizer.mockResolvedValue(undefined);
mocks.getSQLEditorTabsState.mockReturnValue({
tabsById: new Map(),
closeTab: vi.fn(),
@@ -705,19 +716,7 @@ describe("SheetTree", () => {
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.appStore.deleteWorksheetByName = deleteWorksheetByName;
mocks.useDropdown.mockReturnValue({
currentNode: wsNode,
diff --git a/frontend/src/react/components/sql-editor/SheetTree.tsx b/frontend/src/react/components/sql-editor/SheetTree.tsx
index 74e837b623..75016826d5 100644
--- a/frontend/src/react/components/sql-editor/SheetTree.tsx
+++ b/frontend/src/react/components/sql-editor/SheetTree.tsx
@@ -55,10 +55,11 @@ import type { TreeDataNode } from "@/react/components/ui/tree";
import { Tree } from "@/react/components/ui/tree";
import { countVisibleRows } from "@/react/components/ui/tree-utils";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import { useSQLEditorStore as useSQLEditorReactStore } from "@/react/stores/sqlEditor";
import { useSQLEditorEditorState } from "@/react/stores/sqlEditor/editor";
import { getSQLEditorTabsState } from "@/react/stores/sqlEditor/tab";
-import { pushNotification, useWorkSheetStore } from "@/store";
+import { pushNotification } from "@/store";
import {
openWorksheetByName,
revealNodes,
@@ -176,7 +177,6 @@ export function SheetTree({
const { t } = useTranslation();
// ---- Pinia stores (called at top level, not inside the Vue-bridge call) ----------
- const worksheetV1Store = useWorkSheetStore();
const createWorksheet = useSQLEditorReactStore((s) => s.createWorksheet);
// ---- Sheet contexts -------------------------------------------------------
@@ -431,25 +431,22 @@ export function SheetTree({
// ---- Delete helpers -------------------------------------------------------
- const doDeleteWorksheets = useCallback(
- async (worksheets: string[]) => {
- await Promise.all(
- worksheets.map((worksheet) =>
- worksheetV1Store.deleteWorksheetByName(worksheet)
- )
+ const doDeleteWorksheets = useCallback(async (worksheets: string[]) => {
+ await Promise.all(
+ worksheets.map((worksheet) =>
+ useAppStore.getState().deleteWorksheetByName(worksheet)
+ )
+ );
+ const tabsState = getSQLEditorTabsState();
+ for (const worksheet of worksheets) {
+ const tab = Array.from(tabsState.tabsById.values()).find(
+ (t) => t.worksheet === worksheet
);
- const tabsState = getSQLEditorTabsState();
- for (const worksheet of worksheets) {
- const tab = Array.from(tabsState.tabsById.values()).find(
- (t) => t.worksheet === worksheet
- );
- if (tab) {
- tabsState.closeTab(tab.id);
- }
+ if (tab) {
+ tabsState.closeTab(tab.id);
}
- },
- [worksheetV1Store]
- );
+ }
+ }, []);
// ---- handleRenameNode (debounced via ref) ---------------------------------
// We can't use useDebounceFn from @vueuse/core in React, so we implement
@@ -487,16 +484,16 @@ export function SheetTree({
}
if (editing.node.worksheet) {
- const worksheet = worksheetV1Store.getWorksheetByName(
- editing.node.worksheet.name
- );
+ const worksheet = useAppStore
+ .getState()
+ .getWorksheetByName(editing.node.worksheet.name);
if (!worksheet) {
cleanup();
return;
}
- await worksheetV1Store.patchWorksheet({ ...worksheet, title: newTitle }, [
- "title",
- ]);
+ await useAppStore
+ .getState()
+ .patchWorksheet({ ...worksheet, title: newTitle }, ["title"]);
const tabsState = getSQLEditorTabsState();
const tab = Array.from(tabsState.tabsById.values()).find(
(t) => t.worksheet === worksheet.name
@@ -549,7 +546,6 @@ export function SheetTree({
}, [
editingNode,
setEditingNode,
- worksheetV1Store,
findParentNode,
sheetTree,
updateWorksheetFolders,
@@ -773,12 +769,12 @@ export function SheetTree({
clearTimeout(starTimerRef.current);
}
starTimerRef.current = setTimeout(() => {
- void worksheetV1Store.upsertWorksheetOrganizer({ worksheet, starred }, [
- "starred",
- ]);
+ void useAppStore
+ .getState()
+ .upsertWorksheetOrganizer({ worksheet, starred }, ["starred"]);
}, 300);
},
- [worksheetV1Store]
+ []
);
// ---- handleDuplicateFolderNameDrop: promise-based duplicate check for DnD --
@@ -1152,8 +1148,9 @@ export function SheetTree({
if (deleteDialogState.type !== "duplicate-sheet") return;
const { worksheetName } = deleteDialogState;
setDeleteDialogState({ type: "none" });
- const worksheet =
- worksheetV1Store.getWorksheetByName(worksheetName);
+ const worksheet = useAppStore
+ .getState()
+ .getWorksheetByName(worksheetName);
if (!worksheet) return;
await createWorksheet({
title: worksheet.title,
diff --git a/frontend/src/react/components/sql-editor/TabItem/Label.test.tsx b/frontend/src/react/components/sql-editor/TabItem/Label.test.tsx
index 006494fcdb..5d6eea2314 100644
--- a/frontend/src/react/components/sql-editor/TabItem/Label.test.tsx
+++ b/frontend/src/react/components/sql-editor/TabItem/Label.test.tsx
@@ -13,14 +13,15 @@ const mocks = vi.hoisted(() => ({
setCurrentTabId: vi.fn(),
patchWorksheet: vi.fn().mockResolvedValue(undefined),
getSQLEditorTabsState: vi.fn(),
- useWorkSheetStore: vi.fn(),
tabListEvents: {
on: vi.fn<(event: string, h: (p: unknown) => void) => () => void>(),
},
}));
-vi.mock("@/store", () => ({
- useWorkSheetStore: mocks.useWorkSheetStore,
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: {
+ getState: () => ({ patchWorksheet: mocks.patchWorksheet }),
+ },
}));
vi.mock("@/react/stores/sqlEditor/tab", () => ({
@@ -90,9 +91,6 @@ beforeEach(async () => {
updateTab: mocks.updateTab,
setCurrentTabId: mocks.setCurrentTabId,
});
- mocks.useWorkSheetStore.mockReturnValue({
- patchWorksheet: mocks.patchWorksheet,
- });
mocks.tabListEvents.on.mockReturnValue(() => {});
({ Label } = await import("./Label"));
});
diff --git a/frontend/src/react/components/sql-editor/TabItem/Label.tsx b/frontend/src/react/components/sql-editor/TabItem/Label.tsx
index be0d072716..fad0199caa 100644
--- a/frontend/src/react/components/sql-editor/TabItem/Label.tsx
+++ b/frontend/src/react/components/sql-editor/TabItem/Label.tsx
@@ -3,8 +3,8 @@ import { useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { EllipsisText } from "@/react/components/ui/ellipsis-text";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import { getSQLEditorTabsState } from "@/react/stores/sqlEditor/tab";
-import { useWorkSheetStore } from "@/store";
import { WorksheetSchema } from "@/types/proto-es/v1/worksheet_service_pb";
import type { SQLEditorTab } from "@/types/sqlEditor/tab";
import { tabListEvents } from "@/views/sql-editor/TabList/events";
@@ -23,7 +23,6 @@ type Props = {
*/
export function Label({ tab }: Props) {
const { t } = useTranslation();
- const worksheetStore = useWorkSheetStore();
const [editing, setEditing] = useState(false);
const [draft, setDraft] = useState(tab.title);
@@ -55,7 +54,7 @@ export function Label({ tab }: Props) {
const title = draft.trim();
getSQLEditorTabsState().updateTab(tab.id, { title });
if (tab.worksheet) {
- void worksheetStore.patchWorksheet(
+ void useAppStore.getState().patchWorksheet(
create(WorksheetSchema, {
name: tab.worksheet,
title,
diff --git a/frontend/src/react/components/sql-editor/TabItem/Prefix.tsx b/frontend/src/react/components/sql-editor/TabItem/Prefix.tsx
index 89ef94a087..4ec8a518e7 100644
--- a/frontend/src/react/components/sql-editor/TabItem/Prefix.tsx
+++ b/frontend/src/react/components/sql-editor/TabItem/Prefix.tsx
@@ -1,6 +1,5 @@
import { PencilLine, Users, Wrench } from "lucide-react";
-import { usePiniaBridge } from "@/react/hooks/usePiniaBridge";
-import { useWorkSheetStore } from "@/store";
+import { useAppStore } from "@/react/stores/app";
import type { SQLEditorTab } from "@/types/sqlEditor/tab";
import { useSheetContext } from "@/views/sql-editor/Sheet";
import { SheetConnectionIcon } from "../SheetConnectionIcon";
@@ -18,13 +17,12 @@ type Props = {
* - Engine icon / unlink glyph via SheetConnectionIcon.
*/
export function Prefix({ tab }: Props) {
- const sheetStore = useWorkSheetStore();
const { isWorksheetCreator } = useSheetContext();
const isDraft = !tab.worksheet && tab.viewState.view === "CODE";
- const sheet = usePiniaBridge(() =>
- tab.worksheet ? sheetStore.getWorksheetByName(tab.worksheet) : null
+ const sheet = useAppStore((s) =>
+ tab.worksheet ? s.getWorksheetByName(tab.worksheet) : null
);
return (
diff --git a/frontend/src/react/components/sql-editor/TreeNodeSuffix.test.tsx b/frontend/src/react/components/sql-editor/TreeNodeSuffix.test.tsx
index 3143301e30..70736353ff 100644
--- a/frontend/src/react/components/sql-editor/TreeNodeSuffix.test.tsx
+++ b/frontend/src/react/components/sql-editor/TreeNodeSuffix.test.tsx
@@ -19,8 +19,8 @@ globalThis.ResizeObserver = class ResizeObserver {
const mocks = vi.hoisted(() => ({
useTranslation: vi.fn(() => ({ t: (key: string) => key })),
usePiniaBridge: vi.fn<(getter: () => unknown) => unknown>(),
- useWorkSheetStore: vi.fn(),
getSQLEditorTabsState: vi.fn(),
+ getWorksheetByName: vi.fn<(name: string) => unknown>(),
getUserByIdentifier: vi.fn<() => { title: string } | undefined>(() => ({
title: "Test User",
})),
@@ -36,13 +36,10 @@ vi.mock("@/react/hooks/usePiniaBridge", () => ({
usePiniaBridge: mocks.usePiniaBridge,
}));
-vi.mock("@/store", () => ({
- useWorkSheetStore: mocks.useWorkSheetStore,
-}));
-
vi.mock("@/react/stores/app", () => ({
useAppStore: (selector: (state: unknown) => unknown) =>
selector({
+ getWorksheetByName: mocks.getWorksheetByName,
getUserByIdentifier: mocks.getUserByIdentifier,
getOrFetchUserByIdentifier: mocks.getOrFetchUserByIdentifier,
}),
@@ -131,14 +128,12 @@ let TreeNodeSuffix: typeof import("./TreeNodeSuffix").TreeNodeSuffix;
beforeEach(async () => {
mocks.usePiniaBridge.mockImplementation((getter: () => unknown) => getter());
- mocks.useWorkSheetStore.mockReturnValue({
- getWorksheetByName: (name: string) => ({
- name,
- starred: false,
- visibility: 0, // PRIVATE
- creator: "users/[email protected]",
- }),
- });
+ mocks.getWorksheetByName.mockImplementation((name: string) => ({
+ name,
+ starred: false,
+ visibility: 0, // PRIVATE
+ creator: "users/[email protected]",
+ }));
mocks.getSQLEditorTabsState.mockReturnValue({
tabsById: new Map(),
closeTab: vi.fn(),
diff --git a/frontend/src/react/components/sql-editor/TreeNodeSuffix.tsx b/frontend/src/react/components/sql-editor/TreeNodeSuffix.tsx
index a01022bc53..dbadb82284 100644
--- a/frontend/src/react/components/sql-editor/TreeNodeSuffix.tsx
+++ b/frontend/src/react/components/sql-editor/TreeNodeSuffix.tsx
@@ -1,12 +1,11 @@
import { MoreHorizontal, Star, Users, X } from "lucide-react";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
+import { useShallow } from "zustand/react/shallow";
import { Tooltip } from "@/react/components/ui/tooltip";
-import { usePiniaBridge } from "@/react/hooks/usePiniaBridge";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
import { getSQLEditorTabsState } from "@/react/stores/sqlEditor/tab";
-import { useWorkSheetStore } from "@/store";
import { Worksheet_Visibility } from "@/types/proto-es/v1/worksheet_service_pb";
import {
type SheetViewMode,
@@ -40,24 +39,29 @@ export function TreeNodeSuffix({
}: Props) {
const { t } = useTranslation();
- const worksheetStore = useWorkSheetStore();
const { isWorksheetCreator } = useSheetContext();
- const worksheetLite = usePiniaBridge(() => {
- 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,
- };
- });
+ // `useShallow` is required: this selector builds a fresh object each
+ // call, which would fail `useSyncExternalStore`'s `Object.is` snapshot
+ // check and spin an infinite render loop. Shallow-comparing the fields
+ // keeps the snapshot stable when the worksheet's values are unchanged.
+ const worksheetLite = useAppStore(
+ useShallow((state) => {
+ if (!node.worksheet) {
+ return undefined;
+ }
+ const sheet = state.getWorksheetByName(node.worksheet.name);
+ if (!sheet) {
+ return undefined;
+ }
+ return {
+ name: sheet.name,
+ starred: sheet.starred,
+ visibility: sheet.visibility,
+ creator: sheet.creator,
+ };
+ })
+ );
const worksheetCreatorTitle = useAppStore((state) =>
worksheetLite?.creator
? state.getUserByIdentifier(worksheetLite.creator)?.title
diff --git a/frontend/src/react/components/sql-editor/useDropdown.ts b/frontend/src/react/components/sql-editor/useDropdown.ts
index 852ad71dd6..17c2a65b36 100644
--- a/frontend/src/react/components/sql-editor/useDropdown.ts
+++ b/frontend/src/react/components/sql-editor/useDropdown.ts
@@ -10,7 +10,8 @@
import { useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { usePiniaBridge } from "@/react/hooks/usePiniaBridge";
-import { useCurrentUserV1, useWorkSheetStore } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { useCurrentUserV1 } from "@/store";
import { isWorksheetWritableV1 } from "@/utils";
import type {
SheetViewMode,
@@ -52,7 +53,6 @@ export function useDropdown(
const { t } = useTranslation();
// Call Pinia store factories at hook top level (React Hooks rule).
- const sheetStore = useWorkSheetStore();
const meRef = useCurrentUserV1();
// ------------------------------------------------------------------
@@ -68,12 +68,11 @@ export function useDropdown(
// ------------------------------------------------------------------
const me = usePiniaBridge(() => meRef.value);
- const worksheetEntity = usePiniaBridge(() => {
- if (viewMode === "draft" || !currentNode?.worksheet) {
- return undefined;
- }
- return sheetStore.getWorksheetByName(currentNode.worksheet.name);
- });
+ const worksheetEntity = useAppStore((s) =>
+ viewMode === "draft" || !currentNode?.worksheet
+ ? undefined
+ : s.getWorksheetByName(currentNode.worksheet.name)
+ );
// ------------------------------------------------------------------
// Derived: allowed-to-create-new
diff --git a/frontend/src/react/components/sql-editor/useSQLEditorAutoSave.ts b/frontend/src/react/components/sql-editor/useSQLEditorAutoSave.ts
index d75f76a8ec..6875935368 100644
--- a/frontend/src/react/components/sql-editor/useSQLEditorAutoSave.ts
+++ b/frontend/src/react/components/sql-editor/useSQLEditorAutoSave.ts
@@ -1,10 +1,11 @@
import { useEffect, useRef } from "react";
+import { useAppStore } from "@/react/stores/app";
import { useSQLEditorStore } from "@/react/stores/sqlEditor";
import {
getSQLEditorTabsState,
useSQLEditorTabState,
} from "@/react/stores/sqlEditor/tab";
-import { pushNotification, useWorkSheetStore } from "@/store";
+import { pushNotification } from "@/store";
import { isWorksheetWritableV1 } from "@/utils";
const AUTO_SAVE_DEBOUNCE_MS = 2000;
@@ -23,7 +24,6 @@ const AUTO_SAVE_DEBOUNCE_MS = 2000;
* component but should only be active while the SQL Editor route is.
*/
export function useSQLEditorAutoSave() {
- const worksheetStore = useWorkSheetStore();
const abortAutoSave = useSQLEditorStore((s) => s.abortAutoSave);
const setAutoSaveController = useSQLEditorStore(
(s) => s.setAutoSaveController
@@ -58,7 +58,7 @@ export function useSQLEditorAutoSave() {
const tab = tabsState.tabsById.get(tabsState.currentTabId);
if (!tab || !tab.worksheet || tab.status === "CLEAN") return;
- const worksheet = worksheetStore.getWorksheetByName(tab.worksheet);
+ const worksheet = useAppStore.getState().getWorksheetByName(tab.worksheet);
if (!worksheet || !isWorksheetWritableV1(worksheet)) return;
abortAutoSave();
diff --git a/frontend/src/react/hooks/useWorksheetAndTab.ts b/frontend/src/react/hooks/useWorksheetAndTab.ts
index e85ce77328..a038badb7c 100644
--- a/frontend/src/react/hooks/useWorksheetAndTab.ts
+++ b/frontend/src/react/hooks/useWorksheetAndTab.ts
@@ -1,6 +1,6 @@
-import { useVueState } from "@/react/hooks/useVueState";
+import { useAppStore } from "@/react/stores/app";
import { useCurrentSQLEditorTab } from "@/react/stores/sqlEditor/tab";
-import { useCurrentUserV1, useWorkSheetStore } from "@/store";
+import { useCurrentUserV1 } from "@/store";
import { extractUserEmail } from "@/store/modules/v1/common";
import type { Worksheet } from "@/types/proto-es/v1/worksheet_service_pb";
import {
@@ -19,21 +19,16 @@ export interface WorksheetAndTab {
* React replacement for the Pinia `useWorkSheetAndTabStore`. Derives the
* worksheet bound to the current SQL editor tab plus creator / read-only
* flags. The tab comes from the Zustand tab store; the worksheet is read
- * from the Pinia worksheet cache via `useVueState` (re-subscribed per
- * worksheet name) so cache hydration and in-place edits re-render.
+ * from the Zustand worksheet slice via `useAppStore` so cache hydration
+ * and in-place edits re-render.
*/
export const useWorksheetAndTab = (): WorksheetAndTab => {
const currentTab = useCurrentSQLEditorTab();
const worksheetName = currentTab?.worksheet;
- const worksheetStore = useWorkSheetStore();
const me = useCurrentUserV1();
- const currentSheet = useVueState<Worksheet | undefined>(
- () =>
- worksheetName
- ? worksheetStore.getWorksheetByName(worksheetName)
- : undefined,
- { deps: [worksheetName] }
+ const currentSheet = useAppStore((s) =>
+ worksheetName ? s.getWorksheetByName(worksheetName) : undefined
);
const isCreator = currentSheet
diff --git a/frontend/src/react/stores/app/index.ts b/frontend/src/react/stores/app/index.ts
index 3e1a95a7d9..d68098be52 100644
--- a/frontend/src/react/stores/app/index.ts
+++ b/frontend/src/react/stores/app/index.ts
@@ -19,6 +19,7 @@ import { createRoleSlice } from "./role";
import { createServiceAccountSlice } from "./serviceAccount";
import { createSheetSlice } from "./sheet";
import { createUserSlice } from "./user";
+import { createWorksheetSlice } from "./worksheet";
import { createWorkspaceSlice } from "./workspace";
import { createWorkloadIdentitySlice } from "./workloadIdentity";
@@ -41,6 +42,7 @@ export const createAppStore = () =>
...createDatabaseSlice(...args),
...createDBGroupSlice(...args),
...createSheetSlice(...args),
+ ...createWorksheetSlice(...args),
...createInstanceRoleSlice(...args),
...createGroupSlice(...args),
...createServiceAccountSlice(...args),
diff --git a/frontend/src/react/stores/app/types.ts b/frontend/src/react/stores/app/types.ts
index b173f488ed..102ad87547 100644
--- a/frontend/src/react/stores/app/types.ts
+++ b/frontend/src/react/stores/app/types.ts
@@ -38,6 +38,10 @@ import type {
User,
} from "@/types/proto-es/v1/user_service_pb";
import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";
+import type {
+ Worksheet,
+ WorksheetOrganizer,
+} from "@/types/proto-es/v1/worksheet_service_pb";
import type { Workspace } from "@/types/proto-es/v1/workspace_service_pb";
import type { Environment } from "@/types/v1/environment";
import type { AccessGrantFilterStatus } from "@/utils";
@@ -242,6 +246,40 @@ export type SheetSlice = {
createSheet: (parent: string, sheet: Sheet) => Promise<Sheet>;
};
+export type WorksheetView = "FULL" | "BASIC";
+
+export type WorksheetSlice = {
+ // Keyed by `${uid}:${view}` (mirrors the legacy Pinia cache, which kept
+ // FULL and BASIC views separately — BASIC list entries omit the
+ // statement, FULL entries carry it).
+ worksheetsByKey: Record<string, Worksheet>;
+ worksheetRequests: Record<string, Promise<Worksheet | undefined>>;
+ getWorksheetByName: (
+ name: string,
+ view?: WorksheetView
+ ) => Worksheet | undefined;
+ getOrFetchWorksheetByName: (
+ name: string,
+ silent?: boolean
+ ) => Promise<Worksheet | undefined>;
+ fetchWorksheetList: (parent: string, filter: string) => Promise<Worksheet[]>;
+ createWorksheet: (worksheet: Worksheet) => Promise<Worksheet>;
+ patchWorksheet: (
+ worksheet: Worksheet,
+ updateMask: string[],
+ signal?: AbortSignal
+ ) => Promise<Worksheet | undefined>;
+ deleteWorksheetByName: (name: string) => Promise<void>;
+ upsertWorksheetOrganizer: (
+ organizer: Partial<WorksheetOrganizer>,
+ updateMask: string[]
+ ) => Promise<void>;
+ batchUpsertWorksheetOrganizers: (
+ requests: { organizer: Partial<WorksheetOrganizer>; updateMask: string[] }[]
+ ) => Promise<void>;
+ worksheetList: () => Worksheet[];
+};
+
export type InstanceRoleSlice = {
rolesByInstance: Record<string, InstanceRole[]>;
roleRequests: Record<string, Promise<InstanceRole[]>>;
@@ -490,6 +528,7 @@ export type AppStoreState = AuthSlice &
DatabaseSlice &
DBGroupSlice &
SheetSlice &
+ WorksheetSlice &
InstanceRoleSlice &
GroupSlice &
ServiceAccountSlice &
diff --git a/frontend/src/react/stores/app/worksheet.ts b/frontend/src/react/stores/app/worksheet.ts
new file mode 100644
index 0000000000..dd62a65083
--- /dev/null
+++ b/frontend/src/react/stores/app/worksheet.ts
@@ -0,0 +1,229 @@
+import { clone, create as createProto } from "@bufbuild/protobuf";
+import { createContextValues } from "@connectrpc/connect";
+import { uniq, uniqBy } from "lodash-es";
+import { worksheetServiceClientConnect } from "@/connect";
+import { silentContextKey } from "@/connect/context-key";
+import { UNKNOWN_ID } from "@/types";
+import type {
+ Worksheet,
+ WorksheetOrganizer,
+} from "@/types/proto-es/v1/worksheet_service_pb";
+import {
+ BatchUpdateWorksheetOrganizerRequestSchema,
+ CreateWorksheetRequestSchema,
+ DeleteWorksheetRequestSchema,
+ GetWorksheetRequestSchema,
+ SearchWorksheetsRequestSchema,
+ UpdateWorksheetOrganizerRequestSchema,
+ UpdateWorksheetRequestSchema,
+ WorksheetOrganizerSchema,
+ WorksheetSchema,
+} from "@/types/proto-es/v1/worksheet_service_pb";
+import { isValidDatabaseName } from "@/types/v1/database";
+import { extractWorksheetID } from "@/utils";
+import type { AppSliceCreator, WorksheetSlice, WorksheetView } from "./types";
+
+const cacheKey = (uid: string, view: WorksheetView) => `${uid}:${view}`;
+
+/**
+ * Zustand port of the legacy Pinia `useWorkSheetStore`. Worksheets are
+ * keyed by `${uid}:${view}` so FULL (with statement) and BASIC (list)
+ * views coexist, matching the old cache. Related resources (project,
+ * database, creator) are hydrated through the sibling app slices rather
+ * than the old Pinia stores.
+ */
+export const createWorksheetSlice: AppSliceCreator<WorksheetSlice> = (
+ set,
+ get
+) => {
+ const setCacheEntry = (worksheet: Worksheet, view: WorksheetView) => {
+ const uid = extractWorksheetID(worksheet.name);
+ if (uid === String(UNKNOWN_ID)) return;
+ set((s) => {
+ const worksheetsByKey = { ...s.worksheetsByKey };
+ // A FULL entry supersedes any stale BASIC entry for the same uid.
+ if (view === "FULL") {
+ delete worksheetsByKey[cacheKey(uid, "BASIC")];
+ }
+ worksheetsByKey[cacheKey(uid, view)] = worksheet;
+ return { worksheetsByKey };
+ });
+ };
+
+ const hydrateRelatedResources = async (worksheets: Worksheet[]) => {
+ // A worksheet without a connection has `database: ""`. The batch
+ // endpoint rejects the whole request on an invalid name, which would
+ // drop hydration for every valid database in the same batch, so filter
+ // those out first. Dedupe all three to keep the batch payloads minimal.
+ const databases = uniq(
+ worksheets.map((w) => w.database).filter(isValidDatabaseName)
+ );
+ try {
+ await Promise.all([
+ get().batchFetchProjects(uniq(worksheets.map((w) => w.project))),
+ get().batchFetchDatabases(databases),
+ get().batchGetOrFetchUsers(uniq(worksheets.map((w) => w.creator))),
+ ]);
+ } catch {
+ // Best-effort hydration; the worksheet entry is still cached below.
+ }
+ };
+
+ const updateCacheWithOrganizer = (organizer: WorksheetOrganizer) => {
+ for (const view of ["FULL", "BASIC"] as const) {
+ const existing = get().getWorksheetByName(organizer.worksheet, view);
+ if (!existing) continue;
+ const updated = clone(WorksheetSchema, existing);
+ updated.starred = organizer.starred;
+ updated.folders = organizer.folders;
+ setCacheEntry(updated, view);
+ }
+ };
+
+ return {
+ worksheetsByKey: {},
+ worksheetRequests: {},
+
+ getWorksheetByName: (name, view) => {
+ const uid = extractWorksheetID(name);
+ if (!uid || uid === String(UNKNOWN_ID)) return undefined;
+ const byKey = get().worksheetsByKey;
+ if (view === undefined) {
+ return byKey[cacheKey(uid, "FULL")] ?? byKey[cacheKey(uid, "BASIC")];
+ }
+ return byKey[cacheKey(uid, view)];
+ },
+
+ getOrFetchWorksheetByName: async (name, silent = false) => {
+ const uid = extractWorksheetID(name);
+ if (uid.startsWith("-") || !uid) return undefined;
+
+ const cached = get().worksheetsByKey[cacheKey(uid, "FULL")];
+ if (cached) return cached;
+
+ const pending = get().worksheetRequests[uid];
+ if (pending) return pending;
+
+ const promise = (async () => {
+ try {
+ const response = await worksheetServiceClientConnect.getWorksheet(
+ createProto(GetWorksheetRequestSchema, { name }),
+ {
+ contextValues: createContextValues().set(
+ silentContextKey,
+ silent
+ ),
+ }
+ );
+ await hydrateRelatedResources([response]);
+ setCacheEntry(response, "FULL");
+ return response;
+ } catch {
+ return undefined;
+ } finally {
+ set((s) => {
+ const { [uid]: _removed, ...worksheetRequests } =
+ s.worksheetRequests;
+ return { worksheetRequests };
+ });
+ }
+ })();
+
+ set((s) => ({
+ worksheetRequests: { ...s.worksheetRequests, [uid]: promise },
+ }));
+ return promise;
+ },
+
+ fetchWorksheetList: async (parent, filter) => {
+ const response = await worksheetServiceClientConnect.searchWorksheets(
+ createProto(SearchWorksheetsRequestSchema, { parent, filter })
+ );
+ await hydrateRelatedResources(response.worksheets);
+ for (const worksheet of response.worksheets) {
+ setCacheEntry(worksheet, "BASIC");
+ }
+ return response.worksheets;
+ },
+
+ createWorksheet: async (worksheet) => {
+ const fullWorksheet = worksheet.name
+ ? worksheet
+ : clone(WorksheetSchema, worksheet);
+ const response = await worksheetServiceClientConnect.createWorksheet(
+ createProto(CreateWorksheetRequestSchema, {
+ parent: fullWorksheet.project,
+ worksheet: fullWorksheet,
+ })
+ );
+ setCacheEntry(response, "FULL");
+ return response;
+ },
+
+ patchWorksheet: async (worksheet, updateMask, signal) => {
+ if (!worksheet.name) return undefined;
+ const response = await worksheetServiceClientConnect.updateWorksheet(
+ createProto(UpdateWorksheetRequestSchema, {
+ worksheet,
+ updateMask: { paths: updateMask },
+ }),
+ { signal }
+ );
+ setCacheEntry(response, "FULL");
+ return response;
+ },
+
+ deleteWorksheetByName: async (name) => {
+ await worksheetServiceClientConnect.deleteWorksheet(
+ createProto(DeleteWorksheetRequestSchema, { name })
+ );
+ const uid = extractWorksheetID(name);
+ set((s) => {
+ const {
+ [cacheKey(uid, "FULL")]: _f,
+ [cacheKey(uid, "BASIC")]: _b,
+ ...worksheetsByKey
+ } = s.worksheetsByKey;
+ return { worksheetsByKey };
+ });
+ },
+
+ upsertWorksheetOrganizer: async (organizer, updateMask) => {
+ const response =
+ await worksheetServiceClientConnect.updateWorksheetOrganizer(
+ createProto(UpdateWorksheetOrganizerRequestSchema, {
+ organizer: createProto(WorksheetOrganizerSchema, {
+ ...organizer,
+ } as WorksheetOrganizer),
+ updateMask: { paths: updateMask },
+ })
+ );
+ updateCacheWithOrganizer(response);
+ },
+
+ batchUpsertWorksheetOrganizers: async (requests) => {
+ const response =
+ await worksheetServiceClientConnect.batchUpdateWorksheetOrganizer(
+ createProto(BatchUpdateWorksheetOrganizerRequestSchema, {
+ requests: requests.map((request) =>
+ createProto(UpdateWorksheetOrganizerRequestSchema, {
+ organizer: createProto(WorksheetOrganizerSchema, {
+ ...request.organizer,
+ } as WorksheetOrganizer),
+ updateMask: { paths: request.updateMask },
+ })
+ ),
+ })
+ );
+ response.worksheetOrganizers.map(updateCacheWithOrganizer);
+ },
+
+ // The deduped full list. Callers split into "my" / "shared" using
+ // their own current-user source — the SQL editor uses the Pinia
+ // current user (reliably loaded before worksheets are fetched),
+ // whereas the app store's `currentUser` can lag on routes that don't
+ // load it eagerly.
+ worksheetList: () =>
+ uniqBy(Object.values(get().worksheetsByKey), (w) => w.name),
+ };
+};
diff --git a/frontend/src/react/stores/sqlEditor/tab.ts b/frontend/src/react/stores/sqlEditor/tab.ts
index f9ff96d1c6..8f3b3e2eeb 100644
--- a/frontend/src/react/stores/sqlEditor/tab.ts
+++ b/frontend/src/react/stores/sqlEditor/tab.ts
@@ -3,7 +3,8 @@ import { cloneDeep, head, isUndefined, omitBy, pick } from "lodash-es";
import { create, type StoreApi, type UseBoundStore } from "zustand";
import { immer } from "zustand/middleware/immer";
import { useShallow } from "zustand/react/shallow";
-import { hasFeature, useCurrentUserV1, useWorkSheetStore } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { hasFeature, useCurrentUserV1 } from "@/store";
import {
migrateDraftsFromCache,
migrateTabViewState,
@@ -401,7 +402,6 @@ const hydrateProjectTabs = async (project: string): Promise<void> => {
}
const storedTabs = readOpenTabs(project, email);
- const worksheetStore = useWorkSheetStore();
const hydratedTabs: SQLEditorTab[] = [];
const validPersistent: PersistentTab[] = [];
@@ -411,10 +411,9 @@ const hydrateProjectTabs = async (project: string): Promise<void> => {
if (seen.has(persisted.id)) continue;
if (!persisted.worksheet) continue;
- const worksheet = await worksheetStore.getOrFetchWorksheetByName(
- persisted.worksheet,
- true
- );
+ const worksheet = await useAppStore
+ .getState()
+ .getOrFetchWorksheetByName(persisted.worksheet, true);
if (!worksheet) continue;
const statement = getSheetStatement(worksheet);
diff --git a/frontend/src/react/stores/sqlEditor/worksheet.test.ts b/frontend/src/react/stores/sqlEditor/worksheet.test.ts
index 9d487d1643..43bbb9049d 100644
--- a/frontend/src/react/stores/sqlEditor/worksheet.test.ts
+++ b/frontend/src/react/stores/sqlEditor/worksheet.test.ts
@@ -79,7 +79,10 @@ const piniaMocks = vi.hoisted(() => ({
vi.mock("@/store", () => ({
useProjectV1Store: () => piniaMocks.projectStore,
- useWorkSheetStore: () => piniaMocks.worksheetStore,
+}));
+
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: { getState: () => piniaMocks.worksheetStore },
}));
vi.mock("@/react/stores/sqlEditor/tab-vue-state", () => ({
diff --git a/frontend/src/react/stores/sqlEditor/worksheet.ts b/frontend/src/react/stores/sqlEditor/worksheet.ts
index 4b9facb77b..67b9fa947d 100644
--- a/frontend/src/react/stores/sqlEditor/worksheet.ts
+++ b/frontend/src/react/stores/sqlEditor/worksheet.ts
@@ -1,5 +1,6 @@
import { create } from "@bufbuild/protobuf";
import { isUndefined } from "lodash-es";
+import { useAppStore } from "@/react/stores/app";
import { isValidProjectName } from "@/types";
import {
type Worksheet,
@@ -73,9 +74,8 @@ export const createWorksheetSaveSlice: SQLEditorSliceCreator<
folders,
signal,
}) => {
- const { useWorkSheetStore } = await importStores();
const tabStore = getSQLEditorTabsState();
- const worksheetStore = useWorkSheetStore();
+ const worksheetStore = useAppStore.getState();
const connection = await extractWorksheetConnection({ database });
@@ -131,10 +131,9 @@ export const createWorksheetSaveSlice: SQLEditorSliceCreator<
folders = [],
database = "",
}) => {
- const { useWorkSheetStore } = await importStores();
const editorStore = getSQLEditorEditorState();
const tabStore = getSQLEditorTabsState();
- const worksheetStore = useWorkSheetStore();
+ const worksheetStore = useAppStore.getState();
const worksheetTitle = title ?? "";
const connection = await extractWorksheetConnection({ database });
diff --git a/frontend/src/store/modules/sqlEditor/legacy/migration.ts b/frontend/src/store/modules/sqlEditor/legacy/migration.ts
index 830ed42961..663c3d1821 100644
--- a/frontend/src/store/modules/sqlEditor/legacy/migration.ts
+++ b/frontend/src/store/modules/sqlEditor/legacy/migration.ts
@@ -1,6 +1,7 @@
import { create } from "@bufbuild/protobuf";
import { isUndefined, omit, omitBy } from "lodash-es";
import { computed, reactive } from "vue";
+import { useAppStore } from "@/react/stores/app";
import type { EditorPanelViewState, SQLEditorTab } from "@/types";
import { DEFAULT_SQL_EDITOR_TAB_MODE } from "@/types";
import {
@@ -13,7 +14,7 @@ import {
useDynamicLocalStorage,
WebStorageHelper,
} from "@/utils";
-import { extractUserEmail, useWorkSheetStore } from "../../v1";
+import { extractUserEmail } from "../../v1";
import { useCurrentUserV1 } from "../../v1/auth";
import { EXTENDED_TAB_FIELDS, useExtendedTabStore } from "./extendedTab";
@@ -114,7 +115,6 @@ export const migrateLegacyCache = async () => {
export const migrateDraftsFromCache = async (project: string) => {
const me = useCurrentUserV1();
const userUID = computed(() => extractUserEmail(me.value.name));
- const worksheetStore = useWorkSheetStore();
const viewStateByTab = useDynamicLocalStorage<
Map</* tab.id */ string, EditorPanelViewState>
@@ -149,7 +149,7 @@ export const migrateDraftsFromCache = async (project: string) => {
const connection = await extractWorksheetConnection({
database: tab.connection.database,
});
- await worksheetStore.createWorksheet(
+ await useAppStore.getState().createWorksheet(
create(WorksheetSchema, {
title: tab.title,
database: connection.database,
diff --git a/frontend/src/store/modules/v1/index.ts b/frontend/src/store/modules/v1/index.ts
index 75f1c10ea5..55b533b3d6 100644
--- a/frontend/src/store/modules/v1/index.ts
+++ b/frontend/src/store/modules/v1/index.ts
@@ -24,6 +24,5 @@ export * from "./sheet";
export * from "./sql";
export * from "./storage";
export * from "./subscription";
-export * from "./worksheet";
export * from "./workspace";
export * from "./plan";
diff --git a/frontend/src/store/modules/v1/worksheet.ts b/frontend/src/store/modules/v1/worksheet.ts
deleted file mode 100644
index 5c683abd7e..0000000000
--- a/frontend/src/store/modules/v1/worksheet.ts
+++ /dev/null
@@ -1,294 +0,0 @@
-import { clone, create } from "@bufbuild/protobuf";
-import { createContextValues } from "@connectrpc/connect";
-import { uniqBy } from "lodash-es";
-import { defineStore } from "pinia";
-import { computed } from "vue";
-import { worksheetServiceClientConnect } from "@/connect";
-import { silentContextKey } from "@/connect/context-key";
-import { useCache } from "@/store/cache";
-import { UNKNOWN_ID } from "@/types";
-import type {
- Worksheet,
- WorksheetOrganizer,
-} from "@/types/proto-es/v1/worksheet_service_pb";
-import {
- BatchUpdateWorksheetOrganizerRequestSchema,
- CreateWorksheetRequestSchema,
- DeleteWorksheetRequestSchema,
- GetWorksheetRequestSchema,
- SearchWorksheetsRequestSchema,
- UpdateWorksheetOrganizerRequestSchema,
- UpdateWorksheetRequestSchema,
- WorksheetOrganizerSchema,
- WorksheetSchema,
-} from "@/types/proto-es/v1/worksheet_service_pb";
-import { extractWorksheetID } from "@/utils";
-import { useUserStore } from "../user";
-import { useCurrentUserV1 } from "./auth";
-import { useDatabaseV1Store } from "./database";
-import { useProjectV1Store } from "./project";
-
-type WorksheetView = "FULL" | "BASIC";
-type WorksheetCacheKey = [string /* uid */, WorksheetView];
-
-export const useWorkSheetStore = defineStore("worksheet_v1", () => {
- const cacheByUID = useCache<WorksheetCacheKey, Worksheet | undefined>(
- "bb.worksheet.by-uid"
- );
- const projectStore = useProjectV1Store();
- const databaseStore = useDatabaseV1Store();
- const userStore = useUserStore();
-
- // Getters
- const worksheetList = computed(() => {
- const sheetList = Array.from(cacheByUID.entityCacheMap.values())
- .map((entry) => entry.entity)
- .filter((sheet): sheet is Worksheet => sheet !== undefined);
- return uniqBy(sheetList, (sheet) => sheet.name);
- });
- const myWorksheetList = computed(() => {
- const me = useCurrentUserV1();
- return worksheetList.value.filter((worksheet) => {
- return worksheet.creator === `users/${me.value.email}`;
- });
- });
- const sharedWorksheetList = computed(() => {
- const me = useCurrentUserV1();
- return worksheetList.value.filter((worksheet) => {
- return worksheet.creator !== `users/${me.value.email}`;
- });
- });
-
- // Utilities
- const setCacheEntry = (worksheet: Worksheet, view: WorksheetView) => {
- const uid = extractWorksheetID(worksheet.name);
- if (uid === String(UNKNOWN_ID)) return;
- if (view === "FULL") {
- cacheByUID.invalidateEntity([uid, "BASIC"]);
- }
- cacheByUID.setEntity([uid, view], worksheet);
- };
-
- const setCache = async (worksheet: Worksheet, view: WorksheetView) => {
- try {
- await Promise.all([
- projectStore.getOrFetchProjectByName(worksheet.project),
- databaseStore.getOrFetchDatabaseByName(worksheet.database),
- userStore.getOrFetchUserByIdentifier({ identifier: worksheet.creator }),
- ]);
- } catch {
- // ignore error
- }
- setCacheEntry(worksheet, view);
- };
-
- const setListCache = async (worksheets: Worksheet[]) => {
- await Promise.all([
- projectStore.batchGetOrFetchProjects(
- worksheets.map((worksheet) => worksheet.project)
- ),
- databaseStore.batchGetOrFetchDatabases(
- worksheets.map((worksheet) => worksheet.database)
- ),
- userStore.batchGetOrFetchUsers(
- worksheets.map((worksheet) => worksheet.creator)
- ),
- ]);
- for (const worksheet of worksheets) {
- setCacheEntry(worksheet, "BASIC");
- }
- };
-
- // CRUD
- const createWorksheet = async (worksheet: Worksheet) => {
- const fullWorksheet = worksheet.name
- ? worksheet
- : clone(WorksheetSchema, worksheet);
- const request = create(CreateWorksheetRequestSchema, {
- parent: fullWorksheet.project,
- worksheet: fullWorksheet,
- });
- const response =
- await worksheetServiceClientConnect.createWorksheet(request);
- setCacheEntry(response, "FULL");
- return response;
- };
-
- /**
- *
- * @param name
- * @param view undefined to any (FULL -> BASIC)
- * @returns
- */
- const getWorksheetByName = (
- name: string,
- view: WorksheetView | undefined = undefined
- ) => {
- const uid = extractWorksheetID(name);
- if (!uid || uid === String(UNKNOWN_ID)) {
- return undefined;
- }
- if (view === undefined) {
- return (
- cacheByUID.getEntity([uid, "FULL"]) ??
- cacheByUID.getEntity([uid, "BASIC"])
- );
- }
- return cacheByUID.getEntity([uid, view]);
- };
- const fetchWorksheetByName = async (
- name: string,
- silent: boolean = false
- ) => {
- const uid = extractWorksheetID(name);
- if (uid.startsWith("-") || !uid) {
- return undefined;
- }
- try {
- const request = create(GetWorksheetRequestSchema, {
- name,
- });
- const response = await worksheetServiceClientConnect.getWorksheet(
- request,
- {
- contextValues: createContextValues().set(silentContextKey, silent),
- }
- );
- return response;
- } catch {
- return undefined;
- }
- };
- const getOrFetchWorksheetByName = async (
- name: string,
- silent: boolean = false
- ) => {
- const uid = extractWorksheetID(name);
- if (uid.startsWith("-") || !uid) {
- return undefined;
- }
- const entity = cacheByUID.getEntity([uid, "FULL"]);
- if (entity) {
- return entity;
- }
- const request = cacheByUID.getRequest([uid, "FULL"]);
- if (request) {
- return request;
- }
-
- const promise = fetchWorksheetByName(name, silent);
- cacheByUID.setRequest([uid, "FULL"], promise);
- promise.then((worksheet) => {
- if (!worksheet) {
- // If the request failed
- // remove the request cache entry so we can retry when needed.
- cacheByUID.invalidateRequest([uid, "FULL"]);
- } else {
- return setCache(worksheet, "FULL");
- }
- });
- return promise;
- };
-
- const fetchWorksheetList = async (parent: string, filter: string) => {
- const request = create(SearchWorksheetsRequestSchema, {
- parent,
- filter,
- });
- const response =
- await worksheetServiceClientConnect.searchWorksheets(request);
- await setListCache(response.worksheets);
- return response.worksheets;
- };
-
- const patchWorksheet = async (
- worksheet: Worksheet,
- updateMask: string[],
- signal?: AbortSignal
- ) => {
- if (!worksheet.name) return;
- const request = create(UpdateWorksheetRequestSchema, {
- worksheet: worksheet,
- updateMask: { paths: updateMask },
- });
- const response = await worksheetServiceClientConnect.updateWorksheet(
- request,
- { signal }
- );
- setCacheEntry(response, "FULL");
- return response;
- };
-
- const deleteWorksheetByName = async (name: string) => {
- const request = create(DeleteWorksheetRequestSchema, { name });
- await worksheetServiceClientConnect.deleteWorksheet(request);
- const uid = extractWorksheetID(name);
- cacheByUID.invalidateEntity([uid, "FULL"]);
- cacheByUID.invalidateEntity([uid, "BASIC"]);
- };
-
- const updateWorksheetCacheWithOrganizer = (organizer: WorksheetOrganizer) => {
- // Update local sheet values
- const views: WorksheetView[] = ["FULL", "BASIC"];
- for (const view of views) {
- const worksheet = getWorksheetByName(organizer.worksheet, view);
- if (worksheet) {
- worksheet.starred = organizer.starred;
- worksheet.folders = organizer.folders;
- setCacheEntry(worksheet, view);
- }
- }
- };
-
- const batchUpsertWorksheetOrganizers = async (
- requests: {
- organizer: Partial<WorksheetOrganizer>;
- updateMask: string[];
- }[]
- ) => {
- const request = create(BatchUpdateWorksheetOrganizerRequestSchema, {
- requests: requests.map((request) =>
- create(UpdateWorksheetOrganizerRequestSchema, {
- organizer: create(WorksheetOrganizerSchema, {
- ...request.organizer,
- } as WorksheetOrganizer),
- updateMask: { paths: request.updateMask },
- })
- ),
- });
- const response =
- await worksheetServiceClientConnect.batchUpdateWorksheetOrganizer(
- request
- );
-
- response.worksheetOrganizers.map(updateWorksheetCacheWithOrganizer);
- };
-
- const upsertWorksheetOrganizer = async (
- organizer: Partial<WorksheetOrganizer>,
- updateMask: string[]
- ) => {
- const request = create(UpdateWorksheetOrganizerRequestSchema, {
- organizer: create(WorksheetOrganizerSchema, {
- ...organizer,
- } as WorksheetOrganizer),
- updateMask: { paths: updateMask },
- });
- const response =
- await worksheetServiceClientConnect.updateWorksheetOrganizer(request);
- updateWorksheetCacheWithOrganizer(response);
- };
-
- return {
- myWorksheetList,
- sharedWorksheetList,
- createWorksheet,
- getWorksheetByName,
- getOrFetchWorksheetByName,
- fetchWorksheetList,
- patchWorksheet,
- deleteWorksheetByName,
- upsertWorksheetOrganizer,
- batchUpsertWorksheetOrganizers,
- };
-});
diff --git a/frontend/src/views/sql-editor/Sheet/context.ts b/frontend/src/views/sql-editor/Sheet/context.ts
index 1b01da55d2..a00eaeaf63 100644
--- a/frontend/src/views/sql-editor/Sheet/context.ts
+++ b/frontend/src/views/sql-editor/Sheet/context.ts
@@ -6,6 +6,7 @@ import { create, type StoreApi, type UseBoundStore } from "zustand";
import { immer } from "zustand/middleware/immer";
import { useShallow } from "zustand/react/shallow";
import { t } from "@/plugins/i18n";
+import { useAppStore } from "@/react/stores/app";
import {
getSQLEditorEditorState,
subscribeSQLEditorEditorState,
@@ -16,8 +17,7 @@ import {
subscribeSQLEditorTabsState,
useSQLEditorTabsStore,
} from "@/react/stores/sqlEditor/tab";
-import { pushNotification, useCurrentUserV1, useWorkSheetStore } from "@/store";
-import { useCache } from "@/store/cache";
+import { pushNotification, useCurrentUserV1 } from "@/store";
import type { SQLEditorTab, SQLEditorTabMode } from "@/types";
import { DEBOUNCE_SEARCH_DELAY } from "@/types";
import {
@@ -236,14 +236,6 @@ const useSheetContextStore: UseBoundStore<StoreApi<SheetContextState>> =
}))
);
-// Handle to the worksheet store's cache namespace. `useCache` keys its
-// listener registry + entity maps by namespace string, so this resolves
-// to the SAME cache the Pinia worksheet store writes to — letting us
-// subscribe to worksheet mutations (fetch / patch / delete) without
-// importing the store's internal closure. Namespace must match
-// `store/modules/v1/worksheet.ts`.
-const worksheetCache = useCache("bb.worksheet.by-uid");
-
// ---- localStorage persistence ----------------------------------------------
const safeReadJSON = <T>(
@@ -612,23 +604,30 @@ const buildTree = (
};
const worksheetsForView = (view: SheetViewMode): Worksheet[] => {
- const sheetStore = useWorkSheetStore();
+ if (view !== "my" && view !== "shared") return [];
const filter = useSheetContextStore.getState().filter;
const project = getSQLEditorEditorState().project;
- let list: Worksheet[] = [];
- switch (view) {
- case "my":
- list = sheetStore.myWorksheetList;
- break;
- case "shared":
- list = sheetStore.sharedWorksheetList;
- break;
- default:
- break;
+ // Use the Pinia current user — the same source the worksheet FETCH
+ // filter uses (`fetchSheetListFor`), so it's reliably populated by the
+ // time worksheets land. The app store's `currentUser` can still be
+ // empty here, which would misclassify every worksheet as "shared".
+ let email = "";
+ try {
+ email = useCurrentUserV1()?.value?.email ?? "";
+ } catch {
+ email = "";
}
- list = list.filter((sheet) => sheet.project === project);
+ const creator = `users/${email}`;
+ let list = useAppStore
+ .getState()
+ .worksheetList()
+ .filter((sheet) => {
+ if (sheet.project !== project) return false;
+ const mine = sheet.creator === creator;
+ return view === "my" ? mine : !mine;
+ });
if (filter.onlyShowStarred) {
- return list.filter((sheet) => sheet.starred);
+ list = list.filter((sheet) => sheet.starred);
}
return list;
};
@@ -698,7 +697,7 @@ const fetchSheetListFor = async (view: SheetViewMode) => {
const state = useSheetContextStore.getState();
state.setViewIsLoading(view, true);
try {
- const sheetStore = useWorkSheetStore();
+ const sheetStore = useAppStore.getState();
const me = useCurrentUserV1();
const project = getSQLEditorEditorState().project;
switch (view) {
@@ -781,7 +780,7 @@ const batchUpdateWorksheetFolders = async (
worksheets: { name: string; folders: string[] }[]
): Promise<void> => {
if (worksheets.length === 0) return;
- await useWorkSheetStore().batchUpsertWorksheetOrganizers(
+ await useAppStore.getState().batchUpsertWorksheetOrganizers(
worksheets.map((worksheet) => ({
organizer: {
worksheet: worksheet.name,
@@ -888,7 +887,8 @@ const bindWatchers = () => {
// worksheet list. The "draft" view is tab-derived, not worksheet-
// derived, so it doesn't need this. Debounced rebuilds coalesce the
// burst of cache writes a single fetch produces.
- worksheetCache.subscribe(() => {
+ useAppStore.subscribe((state, prev) => {
+ if (state.worksheetsByKey === prev.worksheetsByKey) return;
getRebuildTreeFn("my")();
getRebuildTreeFn("shared")();
});
@@ -917,7 +917,7 @@ const onCurrentTabChanged = (tab: SQLEditorTab | undefined) => {
const worksheetName = tab.worksheet;
if (worksheetName) {
- const worksheet = useWorkSheetStore().getWorksheetByName(worksheetName);
+ const worksheet = useAppStore.getState().getWorksheetByName(worksheetName);
if (!worksheet) return;
worksheetLikeItem = {
name: worksheet.name,
@@ -1109,7 +1109,9 @@ export const openWorksheetByName = async ({
forceNewTab: boolean;
mode?: SQLEditorTabMode;
}) => {
- const sheet = await useWorkSheetStore().getOrFetchWorksheetByName(worksheet);
+ const sheet = await useAppStore
+ .getState()
+ .getOrFetchWorksheetByName(worksheet);
if (!sheet) return undefined;
if (!isWorksheetReadableV1(sheet)) {