Skip to content

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

refactor(react): decouple 9 stores from the Pinia layer (sql, storage, workspaceApprovalSetting, uistate, sqlReview, projectIamPolicy, databaseCatalog, sheet, policy) (#20465)

boojack368e974b61f4
diff --git a/frontend/src/react/components/CustomApproval/RulesSection.tsx b/frontend/src/react/components/CustomApproval/RulesSection.tsx
index 8bbcffe503..7e8f0f802c 100644
--- a/frontend/src/react/components/CustomApproval/RulesSection.tsx
+++ b/frontend/src/react/components/CustomApproval/RulesSection.tsx
@@ -26,7 +26,8 @@ import {
import { Button } from "@/react/components/ui/button";
import { ColumnResizeHandle } from "@/react/components/ui/column-resize-handle";
import { useColumnWidths } from "@/react/hooks/useColumnWidths";
-import { pushNotification, useWorkspaceApprovalSettingStore } from "@/store";
+import { useWorkspaceApprovalSettingStore } from "@/react/stores/workspaceApprovalSetting";
+import { pushNotification } from "@/store";
import type { LocalApprovalRule } from "@/types";
import type { WorkspaceApprovalSetting_Rule_Source } from "@/types/proto-es/v1/setting_service_pb";
import { WorkspaceApprovalSetting_Rule_Source as RuleSource } from "@/types/proto-es/v1/setting_service_pb";
diff --git a/frontend/src/react/components/Quickstart.tsx b/frontend/src/react/components/Quickstart.tsx
index 59c8c3c482..baf818e189 100644
--- a/frontend/src/react/components/Quickstart.tsx
+++ b/frontend/src/react/components/Quickstart.tsx
@@ -19,7 +19,6 @@ import {
pushNotification,
useActuatorV1Store,
useProjectV1Store,
- useUIStateStore,
} from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import type { Permission } from "@/types";
@@ -68,37 +67,32 @@ export function Quickstart() {
const { t } = useTranslation();
const navigate = useNavigate();
const projectStore = useProjectV1Store();
- const uiStateStore = useUIStateStore();
const actuatorStore = useActuatorV1Store();
const loadProjectIamPolicy = useAppStore(
(state) => state.loadProjectIamPolicy
);
const quickStartEnabled = useVueState(() => actuatorStore.quickStartEnabled);
- const hidden = useVueState(() => uiStateStore.getIntroStateByKey("hidden"));
+ const hidden = useAppStore((s) => s.getIntroStateByKey("hidden"));
// Subscribe to each task's done flag so the line-through + progress
// bar update live.
- const issueVisited = useVueState(() =>
- uiStateStore.getIntroStateByKey("issue.visit")
+ const issueVisited = useAppStore((s) => s.getIntroStateByKey("issue.visit"));
+ const dataQueried = useAppStore((s) => s.getIntroStateByKey("data.query"));
+ const projectVisited = useAppStore((s) =>
+ s.getIntroStateByKey("project.visit")
);
- const dataQueried = useVueState(() =>
- uiStateStore.getIntroStateByKey("data.query")
+ const environmentVisited = useAppStore((s) =>
+ s.getIntroStateByKey("environment.visit")
);
- const projectVisited = useVueState(() =>
- uiStateStore.getIntroStateByKey("project.visit")
+ const instanceVisited = useAppStore((s) =>
+ s.getIntroStateByKey("instance.visit")
);
- const environmentVisited = useVueState(() =>
- uiStateStore.getIntroStateByKey("environment.visit")
+ const databaseVisited = useAppStore((s) =>
+ s.getIntroStateByKey("database.visit")
);
- const instanceVisited = useVueState(() =>
- uiStateStore.getIntroStateByKey("instance.visit")
- );
- const databaseVisited = useVueState(() =>
- uiStateStore.getIntroStateByKey("database.visit")
- );
- const memberVisited = useVueState(() =>
- uiStateStore.getIntroStateByKey("member.visit")
+ const memberVisited = useAppStore((s) =>
+ s.getIntroStateByKey("member.visit")
);
// ---- async sample fetches --------------------------------------------
@@ -277,19 +271,18 @@ export function Quickstart() {
}, [currentStep, introList.length]);
const handleHide = (silent = false) => {
- void uiStateStore
- .saveIntroStateByKey({ key: "hidden", newState: true })
- .then(() => {
- if (!silent) {
- pushNotification({
- module: "bytebase",
- style: "INFO",
- title: t("quick-start.notice.title"),
- description: t("quick-start.notice.desc"),
- manualHide: true,
- });
- }
+ useAppStore
+ .getState()
+ .saveIntroStateByKey({ key: "hidden", newState: true });
+ if (!silent) {
+ pushNotification({
+ module: "bytebase",
+ style: "INFO",
+ title: t("quick-start.notice.title"),
+ description: t("quick-start.notice.desc"),
+ manualHide: true,
});
+ }
};
if (!showQuickstart || introList.length === 0) {
diff --git a/frontend/src/react/components/sql-review/Panels.tsx b/frontend/src/react/components/sql-review/Panels.tsx
index 639303bae8..118ebf707e 100644
--- a/frontend/src/react/components/sql-review/Panels.tsx
+++ b/frontend/src/react/components/sql-review/Panels.tsx
@@ -14,11 +14,11 @@ import {
import { useEscapeKey } from "@/react/hooks/useEscapeKey";
import { useVueState } from "@/react/hooks/useVueState";
import { getRuleKey } from "@/react/lib/sql-review/utils";
+import { useSQLReviewStore } from "@/react/stores/sqlReview";
import {
pushNotification,
useEnvironmentV1Store,
useProjectV1Store,
- useSQLReviewStore,
} from "@/store";
import {
environmentNamePrefix,
diff --git a/frontend/src/react/components/sql-review/ReviewCreation.tsx b/frontend/src/react/components/sql-review/ReviewCreation.tsx
index ea035f4bba..136bca8a50 100644
--- a/frontend/src/react/components/sql-review/ReviewCreation.tsx
+++ b/frontend/src/react/components/sql-review/ReviewCreation.tsx
@@ -7,12 +7,13 @@ import { ResourceIdField } from "@/react/components/ResourceIdField";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
import { getTemplateId } from "@/react/lib/sql-review/utils";
+import { useSQLReviewStore } from "@/react/stores/sqlReview";
import { router } from "@/router";
import {
WORKSPACE_ROUTE_SQL_REVIEW,
WORKSPACE_ROUTE_SQL_REVIEW_DETAIL,
} from "@/router/dashboard/workspaceRoutes";
-import { pushNotification, useSQLReviewStore } from "@/store";
+import { pushNotification } from "@/store";
import {
getReviewConfigId,
reviewConfigNamePrefix,
diff --git a/frontend/src/react/components/sql-review/TemplateSelector.test.tsx b/frontend/src/react/components/sql-review/TemplateSelector.test.tsx
index 40c66302fc..e0b1d2cc0c 100644
--- a/frontend/src/react/components/sql-review/TemplateSelector.test.tsx
+++ b/frontend/src/react/components/sql-review/TemplateSelector.test.tsx
@@ -60,6 +60,9 @@ vi.mock("@/types", () => ({
vi.mock("@/store", () => ({
useProjectV1Store: mocks.useProjectV1Store,
+}));
+
+vi.mock("@/react/stores/sqlReview", () => ({
useSQLReviewStore: mocks.useSQLReviewStore,
}));
diff --git a/frontend/src/react/components/sql-review/TemplateSelector.tsx b/frontend/src/react/components/sql-review/TemplateSelector.tsx
index d35c8f3c6e..1b9809ffef 100644
--- a/frontend/src/react/components/sql-review/TemplateSelector.tsx
+++ b/frontend/src/react/components/sql-review/TemplateSelector.tsx
@@ -7,7 +7,8 @@ import { Separator } from "@/react/components/ui/separator";
import { useVueState } from "@/react/hooks/useVueState";
import { rulesToTemplate } from "@/react/lib/sql-review/utils";
import { cn } from "@/react/lib/utils";
-import { useProjectV1Store, useSQLReviewStore } from "@/store";
+import { useSQLReviewStore } from "@/react/stores/sqlReview";
+import { useProjectV1Store } from "@/store";
import {
environmentNamePrefix,
projectNamePrefix,
diff --git a/frontend/src/react/hooks/useDatabaseCatalog.ts b/frontend/src/react/hooks/useDatabaseCatalog.ts
new file mode 100644
index 0000000000..f31c63009d
--- /dev/null
+++ b/frontend/src/react/hooks/useDatabaseCatalog.ts
@@ -0,0 +1,52 @@
+import { useEffect, useMemo } from "react";
+import { useAppStore } from "@/react/stores/app";
+import {
+ catalogResourceName,
+ emptyDatabaseCatalog,
+} from "@/react/stores/app/databaseCatalog";
+import { UNKNOWN_ID } from "@/types";
+import type { DatabaseCatalog } from "@/types/proto-es/v1/database_catalog_service_pb";
+import {
+ extractDatabaseResourceName,
+ getDatabaseProject,
+ hasProjectPermissionV2,
+} from "@/utils";
+
+// React port of the legacy Pinia `useDatabaseCatalog` composable: fetches the
+// catalog (gated by permission) and reactively returns the cached entry,
+// falling back to a stable empty catalog so the selector never loops.
+export function useDatabaseCatalog(
+ database: string,
+ skipCache: boolean
+): DatabaseCatalog {
+ useEffect(() => {
+ if (
+ extractDatabaseResourceName(database).databaseName === String(UNKNOWN_ID)
+ ) {
+ return;
+ }
+ void (async () => {
+ const db = await useAppStore
+ .getState()
+ .getOrFetchDatabaseByName(database);
+ if (
+ hasProjectPermissionV2(
+ getDatabaseProject(db),
+ "bb.databaseCatalogs.get"
+ )
+ ) {
+ await useAppStore
+ .getState()
+ .getOrFetchDatabaseCatalog({ database, skipCache });
+ }
+ })();
+ }, [database, skipCache]);
+
+ const cached = useAppStore(
+ (state) => state.catalogsByName[catalogResourceName(database)]
+ );
+ return useMemo(
+ () => cached ?? emptyDatabaseCatalog(database),
+ [cached, database]
+ );
+}
diff --git a/frontend/src/react/lib/column-data-table/utils.ts b/frontend/src/react/lib/column-data-table/utils.ts
index 28746a84af..c80c76cbd0 100644
--- a/frontend/src/react/lib/column-data-table/utils.ts
+++ b/frontend/src/react/lib/column-data-table/utils.ts
@@ -1,7 +1,8 @@
import { create } from "@bufbuild/protobuf";
import { cloneDeep } from "lodash-es";
import { t } from "@/plugins/i18n";
-import { pushNotification, useDatabaseCatalogV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { pushNotification } from "@/store";
import type {
ColumnCatalog,
TableCatalog,
@@ -28,7 +29,7 @@ export const updateColumnCatalog = async ({
columnCatalog: Partial<ColumnCatalog>;
notification: string;
}) => {
- const dbCatalogStore = useDatabaseCatalogV1Store();
+ const dbCatalogStore = useAppStore.getState();
const catalog = await dbCatalogStore.getOrFetchDatabaseCatalog({ database });
const pendingUpdateCatalog = cloneDeep(catalog);
@@ -98,7 +99,7 @@ export const updateTableCatalog = async ({
tableCatalog: Partial<TableCatalog>;
notification?: string;
}) => {
- const dbCatalogStore = useDatabaseCatalogV1Store();
+ const dbCatalogStore = useAppStore.getState();
const catalog = await dbCatalogStore.getOrFetchDatabaseCatalog({ database });
const pendingUpdateCatalog = cloneDeep(catalog);
diff --git a/frontend/src/react/lib/keyValueStorage.ts b/frontend/src/react/lib/keyValueStorage.ts
new file mode 100644
index 0000000000..0c7cfda977
--- /dev/null
+++ b/frontend/src/react/lib/keyValueStorage.ts
@@ -0,0 +1,36 @@
+import PouchDB from "pouchdb";
+import PouchDBFind from "pouchdb-find";
+
+PouchDB.plugin(PouchDBFind);
+
+// Simple key-value storage over PouchDB, relocated from the legacy Pinia
+// `useStorageStore`. Stateless module-level singleton — no reactive state, so
+// it doesn't belong on the app store (and its get/put would shadow Zustand's
+// own `get`).
+const db = new PouchDB<{ _id: string; value: unknown }>("bb.storage", {
+ // Remove unused and old data automatically.
+ auto_compaction: true,
+ // Do not save and track old revisions, this is for saving storage usage.
+ revs_limit: 1,
+});
+
+export const keyValueStorage = {
+ async put<T = unknown>(key: string, value: T): Promise<void> {
+ await db.put({ _id: key, value }, { force: true });
+ },
+ async get<T = unknown>(key: string): Promise<T | undefined> {
+ try {
+ const doc = await db.get(key);
+ return doc.value as T;
+ } catch {
+ // Data not found or error occurred.
+ return undefined;
+ }
+ },
+ async remove(key: string): Promise<void> {
+ const doc = await db.get(key);
+ if (doc) {
+ await db.remove(doc);
+ }
+ },
+};
diff --git a/frontend/src/react/pages/project/ProjectIssueDashboardPage.tsx b/frontend/src/react/pages/project/ProjectIssueDashboardPage.tsx
index 1f8d0e6eac..2ea50a1e4a 100644
--- a/frontend/src/react/pages/project/ProjectIssueDashboardPage.tsx
+++ b/frontend/src/react/pages/project/ProjectIssueDashboardPage.tsx
@@ -13,11 +13,9 @@ import {
import { Alert } from "@/react/components/ui/alert";
import { useCurrentUser } from "@/react/hooks/useAppState";
import { PagedTableFooter, usePagedData } from "@/react/hooks/usePagedData";
-import { useVueState } from "@/react/hooks/useVueState";
import { refreshIssueList } from "@/react/lib/issue/issueListRefresh";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
-import { useUIStateStore } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { ApprovalStatus } from "@/types/proto-es/v1/common_pb";
import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
@@ -37,7 +35,6 @@ export function ProjectIssueDashboardPage({
projectId: string;
}) {
const { t } = useTranslation();
- const uiStateStore = useUIStateStore();
const batchGetOrFetchUsers = useAppStore(
(state) => state.batchGetOrFetchUsers
);
@@ -47,10 +44,12 @@ export function ProjectIssueDashboardPage({
// Hint
const HINT_KEY = "issue.hint-dismissed";
- const hideHint = useVueState(() => uiStateStore.getIntroStateByKey(HINT_KEY));
+ const hideHint = useAppStore((s) => s.getIntroStateByKey(HINT_KEY));
const dismissHint = useCallback(() => {
- uiStateStore.saveIntroStateByKey({ key: HINT_KEY, newState: true });
- }, [uiStateStore]);
+ useAppStore
+ .getState()
+ .saveIntroStateByKey({ key: HINT_KEY, newState: true });
+ }, []);
// Read-only scopes
const readonlyScopes: VueSearchScope[] = useMemo(
diff --git a/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx b/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx
index b3ebeabc3f..9b19863f27 100644
--- a/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx
+++ b/frontend/src/react/pages/project/ProjectMaskingExemptionCreatePage.tsx
@@ -24,11 +24,11 @@ import { useVueState } from "@/react/hooks/useVueState";
import { getClassificationLevelOptions } from "@/react/lib/sensitive-data/components-utils";
import { rewriteResourceDatabase } from "@/react/lib/sensitive-data/exemptionDataUtils";
import { getExpressionsForDatabaseResource } from "@/react/lib/sensitive-data/utils";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import {
hasFeature,
pushNotification,
- usePolicyV1Store,
useProjectV1Store,
useSettingV1Store,
} from "@/store";
@@ -65,7 +65,6 @@ export function ProjectMaskingExemptionCreatePage({
}) {
const { t } = useTranslation();
const projectStore = useProjectV1Store();
- const policyStore = usePolicyV1Store();
const settingStore = useSettingV1Store();
const projectName = `${projectNamePrefix}${projectId}`;
@@ -234,17 +233,19 @@ export function ProjectMaskingExemptionCreatePage({
);
}
- const policy = await policyStore.getOrFetchPolicyByParentAndType({
- parentPath: projectName,
- policyType: PolicyType.MASKING_EXEMPTION,
- refresh: true,
- });
+ const policy = await useAppStore
+ .getState()
+ .getOrFetchPolicyByParentAndType({
+ parentPath: projectName,
+ policyType: PolicyType.MASKING_EXEMPTION,
+ refresh: true,
+ });
const existed =
policy?.policy?.case === "maskingExemptionPolicy"
? policy.policy.value.exemptions
: [];
- await policyStore.upsertPolicy({
+ await useAppStore.getState().upsertPolicy({
parentPath: projectName,
policy: {
name: policy?.name,
@@ -283,7 +284,6 @@ export function ProjectMaskingExemptionCreatePage({
memberList,
description,
projectName,
- policyStore,
t,
onDismiss,
]);
diff --git a/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx b/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx
index 7429d12985..aca09e9b07 100644
--- a/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx
+++ b/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx
@@ -53,7 +53,6 @@ import {
hasFeature,
pushNotification,
useDatabaseV1Store,
- usePolicyV1Store,
useProjectV1Store,
useSettingV1Store,
} from "@/store";
@@ -594,7 +593,6 @@ function rebuildExemptions(accessList: AccessUser[]) {
function useExemptionDataReact(projectName: string) {
const { t } = useTranslation();
- const policyStore = usePolicyV1Store();
const settingStore = useSettingV1Store();
const batchGetOrFetchGroups = useAppStore(
(state) => state.batchGetOrFetchGroups
@@ -622,7 +620,7 @@ function useExemptionDataReact(projectName: string) {
const generation = ++fetchGenRef.current;
try {
- const pol = await policyStore.getOrFetchPolicyByParentAndType({
+ const pol = await useAppStore.getState().getOrFetchPolicyByParentAndType({
parentPath: projectName,
policyType: PolicyType.MASKING_EXEMPTION,
refresh: true,
@@ -670,7 +668,7 @@ function useExemptionDataReact(projectName: string) {
setLoading(false);
}
}
- }, [projectName, policyStore, batchGetOrFetchGroups]);
+ }, [projectName, batchGetOrFetchGroups]);
useEffect(() => {
fetchData();
@@ -679,8 +677,8 @@ function useExemptionDataReact(projectName: string) {
// Subscribe to policy changes in the store to re-fetch.
// Track the number of exemptions so we detect content changes,
// not just the policy case discriminator which is always the same.
- const policyExemptionCount = useVueState(() => {
- const pol = policyStore.getPolicyByParentAndType({
+ const policyExemptionCount = useAppStore((s) => {
+ const pol = s.getPolicyByParentAndType({
parentPath: projectName,
policyType: PolicyType.MASKING_EXEMPTION,
});
@@ -729,10 +727,12 @@ function useExemptionDataReact(projectName: string) {
try {
// Rebuild and save policy first; only update UI state on success.
- const pol = await policyStore.getOrFetchPolicyByParentAndType({
- parentPath: projectName,
- policyType: PolicyType.MASKING_EXEMPTION,
- });
+ const pol = await useAppStore
+ .getState()
+ .getOrFetchPolicyByParentAndType({
+ parentPath: projectName,
+ policyType: PolicyType.MASKING_EXEMPTION,
+ });
if (pol) {
pol.policy = {
case: "maskingExemptionPolicy",
@@ -740,7 +740,7 @@ function useExemptionDataReact(projectName: string) {
exemptions: rebuildExemptions(currentList),
}),
};
- await policyStore.upsertPolicy({
+ await useAppStore.getState().upsertPolicy({
parentPath: projectName,
policy: pol,
});
@@ -761,7 +761,7 @@ function useExemptionDataReact(projectName: string) {
processingRef.current = false;
}
},
- [projectName, policyStore, t]
+ [projectName, t]
);
return { members, loading, revokeGrant };
diff --git a/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx b/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx
index 3ed0b2f47f..9ea43f760d 100644
--- a/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx
+++ b/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx
@@ -64,7 +64,6 @@ import {
useDatabaseV1Store,
useEnvironmentV1Store,
useProjectV1Store,
- useUIStateStore,
} from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
@@ -123,8 +122,6 @@ export function ProjectPlanDashboardPage({ projectId }: { projectId: string }) {
const batchGetOrFetchUsers = useAppStore(
(state) => state.batchGetOrFetchUsers
);
- const uiStateStore = useUIStateStore();
-
const projectName = `${projectNamePrefix}${projectId}`;
const project = useVueState(() => projectStore.getProjectByName(projectName));
const me = useCurrentUser();
@@ -133,10 +130,12 @@ export function ProjectPlanDashboardPage({ projectId }: { projectId: string }) {
// Hint dismissal
const HINT_KEY = "plan.hint-dismissed";
- const hideHint = useVueState(() => uiStateStore.getIntroStateByKey(HINT_KEY));
+ const hideHint = useAppStore((s) => s.getIntroStateByKey(HINT_KEY));
const dismissHint = useCallback(() => {
- uiStateStore.saveIntroStateByKey({ key: HINT_KEY, newState: true });
- }, [uiStateStore]);
+ useAppStore
+ .getState()
+ .saveIntroStateByKey({ key: HINT_KEY, newState: true });
+ }, []);
// Search
const defaultSearchParams = useCallback(
diff --git a/frontend/src/react/pages/project/ProjectSettingsPage.tsx b/frontend/src/react/pages/project/ProjectSettingsPage.tsx
index ed4e53dfd3..19b3356548 100644
--- a/frontend/src/react/pages/project/ProjectSettingsPage.tsx
+++ b/frontend/src/react/pages/project/ProjectSettingsPage.tsx
@@ -17,6 +17,9 @@ import { NumberInput } from "@/react/components/ui/number-input";
import { Switch } from "@/react/components/ui/switch";
import { Tooltip } from "@/react/components/ui/tooltip";
import { useVueState } from "@/react/hooks/useVueState";
+import { useAppStore } from "@/react/stores/app";
+import { useSQLReviewStore } from "@/react/stores/sqlReview";
+import { useWorkspaceApprovalSettingStore } from "@/react/stores/workspaceApprovalSetting";
import { router } from "@/router";
import {
PROJECT_V1_ROUTE_DASHBOARD,
@@ -26,11 +29,8 @@ import {
} from "@/router/dashboard/workspaceRoutes";
import {
pushNotification,
- usePolicyV1Store,
useProjectV1Store,
- useSQLReviewStore,
useSubscriptionV1Store,
- useWorkspaceApprovalSettingStore,
} from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import type { Permission, SQLReviewPolicy } from "@/types";
@@ -66,25 +66,28 @@ function ApprovalFlowIndicator({
source: WorkspaceApprovalSetting_Rule_Source;
}) {
const { t } = useTranslation();
- const approvalStore = useWorkspaceApprovalSettingStore();
const [ready, setReady] = useState(false);
useEffect(() => {
if (!hasWorkspacePermissionV2("bb.settings.get")) return;
- approvalStore.fetchConfig().then(() => setReady(true));
- }, [approvalStore]);
+ useWorkspaceApprovalSettingStore
+ .getState()
+ .fetchConfig()
+ .then(() => setReady(true));
+ }, []);
const status = useMemo((): "source" | "fallback" | "none" => {
if (!ready) return "none";
- if (approvalStore.getRulesBySource(source).length > 0) return "source";
+ const store = useWorkspaceApprovalSettingStore.getState();
+ if (store.getRulesBySource(source).length > 0) return "source";
if (
- approvalStore.getRulesBySource(
+ store.getRulesBySource(
WorkspaceApprovalSetting_Rule_Source.SOURCE_UNSPECIFIED
).length > 0
)
return "fallback";
return "none";
- }, [ready, approvalStore, source]);
+ }, [ready, source]);
if (!ready) return null;
@@ -128,7 +131,6 @@ function ApprovalFlowIndicator({
export function ProjectSettingsPage() {
const { t } = useTranslation();
const projectStore = useProjectV1Store();
- const policyStore = usePolicyV1Store();
const reviewStore = useSQLReviewStore();
const subscriptionStore = useSubscriptionV1Store();
@@ -180,8 +182,8 @@ export function ProjectSettingsPage() {
const [enforceReview, setEnforceReview] = useState(false);
const [showReviewDialog, setShowReviewDialog] = useState(false);
- const queryDataPolicy = useVueState(() =>
- policyStore.getQueryDataPolicyByParent(projectName)
+ const queryDataPolicy = useAppStore((s) =>
+ s.getQueryDataPolicyByParent(projectName)
);
const getInitialMaxRows = useCallback(() => {
const rows = Number(queryDataPolicy?.maximumResultRows ?? 0);
@@ -259,12 +261,12 @@ export function ProjectSettingsPage() {
useEffect(() => {
if (lastFetchedProject.current === projectName) return;
lastFetchedProject.current = projectName;
- reviewStore.fetchReviewPolicyList();
- policyStore.getOrFetchPolicyByParentAndType({
+ useSQLReviewStore.getState().fetchReviewPolicyList();
+ useAppStore.getState().getOrFetchPolicyByParentAndType({
parentPath: projectName,
policyType: PolicyType.DATA_QUERY,
});
- }, [reviewStore, policyStore, projectName]);
+ }, [projectName]);
// Sync review policy state when it loads or changes externally
useEffect(() => {
@@ -430,7 +432,7 @@ export function ProjectSettingsPage() {
// 2. Max rows policy (separate API)
const maxRowsValue = maxRows ?? 0;
if (maxRowsValue !== getInitialMaxRows()) {
- await policyStore.upsertPolicy({
+ await useAppStore.getState().upsertPolicy({
parentPath: projectName,
policy: {
type: PolicyType.DATA_QUERY,
@@ -542,7 +544,6 @@ export function ProjectSettingsPage() {
project,
projectStore,
reviewStore,
- policyStore,
projectName,
title,
labelKVList,
diff --git a/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx b/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx
index 4b5b5547f0..bf09932d9f 100644
--- a/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx
+++ b/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx
@@ -45,6 +45,7 @@ import {
import { useClickOutside } from "@/react/hooks/useClickOutside";
import { useEscapeKey } from "@/react/hooks/useEscapeKey";
import { useVueState } from "@/react/hooks/useVueState";
+import { keyValueStorage } from "@/react/lib/keyValueStorage";
import { applyPlanTitleToQuery } from "@/react/lib/plan/title";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
@@ -55,7 +56,6 @@ import {
useDatabaseV1Store,
useEnvironmentV1Store,
useProjectV1Store,
- useStorageStore,
} from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
@@ -412,7 +412,7 @@ export function ProjectSyncSchemaPage({ projectId }: { projectId: string }) {
});
query.databaseList = Object.keys(sqlMap).join(",");
const sqlMapStorageKey = `bb.issues.sql-map.${uuidv4()}`;
- useStorageStore().put(sqlMapStorageKey, sqlMap);
+ void keyValueStorage.put(sqlMapStorageKey, sqlMap);
query.sqlMapStorageKey = sqlMapStorageKey;
if (!project) return; // defensive: should not happen if the page rendered
applyPlanTitleToQuery(query, project, () =>
diff --git a/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.test.tsx b/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.test.tsx
index 305d61831d..c92fb067f1 100644
--- a/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.test.tsx
+++ b/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.test.tsx
@@ -32,10 +32,8 @@ const mocks = vi.hoisted(() => {
stringifyConditionExpression: vi.fn(() => "serialized-selection"),
featureToRef: vi.fn(() => ({ value: true })),
useVueState: vi.fn((getter: () => unknown) => getter()),
- usePolicyV1Store: vi.fn(() => ({
- getOrFetchPolicyByParentAndType: vi.fn(),
- upsertPolicy: vi.fn(),
- })),
+ getOrFetchPolicyByParentAndType: vi.fn(),
+ upsertPolicy: vi.fn(),
};
});
@@ -196,7 +194,15 @@ vi.mock("@/react/hooks/useVueState", () => ({
vi.mock("@/store", () => ({
featureToRef: mocks.featureToRef,
pushNotification: vi.fn(),
- usePolicyV1Store: mocks.usePolicyV1Store,
+}));
+
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: {
+ getState: () => ({
+ getOrFetchPolicyByParentAndType: mocks.getOrFetchPolicyByParentAndType,
+ upsertPolicy: mocks.upsertPolicy,
+ }),
+ },
}));
vi.mock("@/utils", () => ({
diff --git a/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsx b/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsx
index bd5c021185..bcc72192f5 100644
--- a/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsx
+++ b/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsx
@@ -35,7 +35,8 @@ import {
convertSensitiveColumnToDatabaseResource,
getExpressionsForDatabaseResource as getResourceExpressions,
} from "@/react/lib/sensitive-data/utils";
-import { featureToRef, pushNotification, usePolicyV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { featureToRef, pushNotification } from "@/store";
import type { DatabaseResource } from "@/types";
import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";
import type {
@@ -89,7 +90,6 @@ export function GrantAccessDialog({
onDismiss,
}: GrantAccessDialogProps) {
const { t } = useTranslation();
- const policyStore = usePolicyV1Store();
const hasRequiredFeature = useVueState(
() => featureToRef(PlanFeature.FEATURE_DATA_MASKING, instance).value
@@ -436,16 +436,18 @@ export function GrantAccessDialog({
);
}
- const policy = await policyStore.getOrFetchPolicyByParentAndType({
- parentPath: projectName,
- policyType: PolicyType.MASKING_EXEMPTION,
- });
+ const policy = await useAppStore
+ .getState()
+ .getOrFetchPolicyByParentAndType({
+ parentPath: projectName,
+ policyType: PolicyType.MASKING_EXEMPTION,
+ });
const existed =
policy?.policy?.case === "maskingExemptionPolicy"
? policy.policy.value.exemptions
: [];
- await policyStore.upsertPolicy({
+ await useAppStore.getState().upsertPolicy({
parentPath: projectName,
policy: {
name: policy?.name,
@@ -484,7 +486,6 @@ export function GrantAccessDialog({
memberList,
description,
projectName,
- policyStore,
t,
onDismissInternal,
]);
diff --git a/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.test.tsx b/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.test.tsx
index fd93a82ac1..def49e2869 100644
--- a/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.test.tsx
+++ b/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.test.tsx
@@ -83,13 +83,19 @@ vi.mock("@/react/hooks/useAppDatabaseMetadata", () => ({
}));
vi.mock("@/store", () => ({
- useDatabaseCatalog: mocks.useDatabaseCatalog,
- getColumnCatalog: mocks.getColumnCatalog,
- getTableCatalog: mocks.getTableCatalog,
featureToRef: mocks.featureToRef,
useSettingV1Store: mocks.useSettingV1Store,
}));
+vi.mock("@/react/hooks/useDatabaseCatalog", () => ({
+ useDatabaseCatalog: () => mocks.useDatabaseCatalog(),
+}));
+
+vi.mock("@/react/stores/app/databaseCatalog", () => ({
+ getColumnCatalog: mocks.getColumnCatalog,
+ getTableCatalog: mocks.getTableCatalog,
+}));
+
vi.mock("@/utils", () => ({
bytesToString: mocks.bytesToString,
getDatabaseEngine: mocks.getDatabaseEngine,
@@ -230,9 +236,7 @@ beforeEach(async () => {
});
mocks.useDatabaseCatalog.mockReset();
mocks.useDatabaseCatalog.mockReturnValue({
- value: {
- schemas: [],
- },
+ schemas: [],
});
mocks.getColumnCatalog.mockReset();
mocks.getColumnCatalog.mockReturnValue({
diff --git a/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.tsx b/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.tsx
index c9b7a21b70..df66b10dab 100644
--- a/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.tsx
+++ b/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.tsx
@@ -10,16 +10,15 @@ import {
SelectValue,
} from "@/react/components/ui/select";
import { useAppDatabaseMetadata } from "@/react/hooks/useAppDatabaseMetadata";
+import { useDatabaseCatalog } from "@/react/hooks/useDatabaseCatalog";
import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
-import { router } from "@/router";
import {
- featureToRef,
getColumnCatalog,
getTableCatalog,
- useDatabaseCatalog,
- useSettingV1Store,
-} from "@/store";
+} from "@/react/stores/app/databaseCatalog";
+import { router } from "@/router";
+import { featureToRef, useSettingV1Store } from "@/store";
import { Engine } from "@/types/proto-es/v1/common_pb";
import type {
Database,
@@ -117,8 +116,7 @@ export function DatabaseObjectExplorer({
const hasSensitiveDataFeature = useVueState(
() => featureToRef(PlanFeature.FEATURE_DATA_MASKING).value
);
- const databaseCatalog = useDatabaseCatalog(database.name, false);
- const catalog = useVueState(() => databaseCatalog.value);
+ const catalog = useDatabaseCatalog(database.name, false);
const project = getDatabaseProject(database);
const classificationConfig = useVueState(() =>
settingStore.getProjectClassification(
diff --git a/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.test.tsx b/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.test.tsx
index 0c3a251f43..88efa6bcc5 100644
--- a/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.test.tsx
+++ b/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.test.tsx
@@ -27,7 +27,7 @@ const mocks = vi.hoisted(() => ({
useSettingV1Store: vi.fn(),
useSubscriptionV1Store: vi.fn(),
useDatabaseCatalog: vi.fn(),
- useDatabaseCatalogV1Store: vi.fn(),
+ updateDatabaseCatalog: vi.fn(),
getTableCatalog: vi.fn(),
pushNotification: vi.fn(),
getOrFetchSettingByName: vi.fn(),
@@ -125,14 +125,27 @@ vi.mock("@/react/components/FeatureAttention", () => ({
}));
vi.mock("@/store", () => ({
- getTableCatalog: mocks.getTableCatalog,
pushNotification: mocks.pushNotification,
- useDatabaseCatalog: mocks.useDatabaseCatalog,
- useDatabaseCatalogV1Store: mocks.useDatabaseCatalogV1Store,
useSettingV1Store: mocks.useSettingV1Store,
useSubscriptionV1Store: mocks.useSubscriptionV1Store,
}));
+vi.mock("@/react/hooks/useDatabaseCatalog", () => ({
+ useDatabaseCatalog: () => mocks.useDatabaseCatalog(),
+}));
+
+vi.mock("@/react/stores/app/databaseCatalog", () => ({
+ getTableCatalog: mocks.getTableCatalog,
+}));
+
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: {
+ getState: () => ({
+ updateDatabaseCatalog: mocks.updateDatabaseCatalog,
+ }),
+ },
+}));
+
vi.mock("@/utils", () => ({
getDatabaseProject: mocks.getDatabaseProject,
getInstanceResource: mocks.getInstanceResource,
@@ -275,15 +288,11 @@ beforeEach(async () => {
});
mocks.useDatabaseCatalog.mockReset();
mocks.useDatabaseCatalog.mockReturnValue({
- value: {
- name: "instances/inst1/databases/db/catalog",
- schemas: [],
- },
- });
- mocks.useDatabaseCatalogV1Store.mockReset();
- mocks.useDatabaseCatalogV1Store.mockReturnValue({
- updateDatabaseCatalog: vi.fn().mockResolvedValue(undefined),
+ name: "instances/inst1/databases/db/catalog",
+ schemas: [],
});
+ mocks.updateDatabaseCatalog.mockReset();
+ mocks.updateDatabaseCatalog.mockResolvedValue(undefined);
mocks.getTableCatalog.mockReset();
mocks.getTableCatalog.mockImplementation(
(
@@ -708,25 +717,20 @@ describe("TableDetailDialog", () => {
});
test("restores the legacy NoSQL catalog editor and upload flow", async () => {
- const updateDatabaseCatalog = vi.fn().mockResolvedValue(undefined);
+ const updateDatabaseCatalog = mocks.updateDatabaseCatalog;
mocks.useDatabaseCatalog.mockReturnValue({
- value: {
- name: "instances/inst1/databases/db/catalog",
- schemas: [
- {
- name: "",
- tables: [
- create(TableCatalogSchema, {
- name: "orders",
- classification: "PII",
- }),
- ],
- },
- ],
- },
- });
- mocks.useDatabaseCatalogV1Store.mockReturnValue({
- updateDatabaseCatalog,
+ name: "instances/inst1/databases/db/catalog",
+ schemas: [
+ {
+ name: "",
+ tables: [
+ create(TableCatalogSchema, {
+ name: "orders",
+ classification: "PII",
+ }),
+ ],
+ },
+ ],
});
const { container, render, unmount } = renderIntoContainer(
diff --git a/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.tsx b/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.tsx
index beec5f54d4..46a7c243f2 100644
--- a/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.tsx
+++ b/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.tsx
@@ -23,16 +23,16 @@ import {
TableRow,
} from "@/react/components/ui/table";
import { Textarea } from "@/react/components/ui/textarea";
+import { useDatabaseCatalog } from "@/react/hooks/useDatabaseCatalog";
import { useVueState } from "@/react/hooks/useVueState";
import {
updateColumnCatalog,
updateTableCatalog,
} from "@/react/lib/column-data-table/utils";
+import { useAppStore } from "@/react/stores/app";
+import { getTableCatalog } from "@/react/stores/app/databaseCatalog";
import {
- getTableCatalog,
pushNotification,
- useDatabaseCatalog,
- useDatabaseCatalogV1Store,
useSettingV1Store,
useSubscriptionV1Store,
} from "@/store";
@@ -385,9 +385,7 @@ function NoSQLCatalogEditor({
tableName: string;
}) {
const { t } = useTranslation();
- const databaseCatalogStore = useDatabaseCatalogV1Store();
- const databaseCatalog = useDatabaseCatalog(database.name, false);
- const catalog = useVueState(() => databaseCatalog.value);
+ const catalog = useDatabaseCatalog(database.name, false);
const [catalogText, setCatalogText] = useState("{}");
const [isUploading, setIsUploading] = useState(false);
@@ -446,7 +444,7 @@ function NoSQLCatalogEditor({
);
}
- await databaseCatalogStore.updateDatabaseCatalog(pendingCatalog);
+ await useAppStore.getState().updateDatabaseCatalog(pendingCatalog);
pushNotification({
module: "bytebase",
style: "SUCCESS",
diff --git a/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.test.tsx b/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.test.tsx
index 746485c792..e1e71d1f58 100644
--- a/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.test.tsx
+++ b/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.test.tsx
@@ -55,12 +55,21 @@ vi.mock("@/react/hooks/useVueState", () => ({
}));
vi.mock("@/store", () => ({
- useDatabaseCatalog: mocks.useDatabaseCatalog,
- getTableCatalog: mocks.getTableCatalog,
featureToRef: mocks.featureToRef,
useSettingV1Store: mocks.useSettingV1Store,
}));
+vi.mock("@/react/hooks/useDatabaseCatalog", () => ({
+ useDatabaseCatalog: () => mocks.useDatabaseCatalog(),
+}));
+
+vi.mock("@/react/stores/app/databaseCatalog", async (importOriginal) => ({
+ ...(await importOriginal<
+ typeof import("@/react/stores/app/databaseCatalog")
+ >()),
+ getTableCatalog: mocks.getTableCatalog,
+}));
+
vi.mock("@/utils", () => ({
bytesToString: mocks.bytesToString,
getDatabaseEngine: mocks.getDatabaseEngine,
@@ -226,9 +235,7 @@ beforeEach(async () => {
mocks.useVueState.mockReset();
mocks.useVueState.mockImplementation((getter: () => unknown) => getter());
mocks.useDatabaseCatalog.mockReset();
- mocks.useDatabaseCatalog.mockReturnValue({
- value: { schemas: [] },
- });
+ mocks.useDatabaseCatalog.mockReturnValue({ schemas: [] });
mocks.getTableCatalog.mockReset();
mocks.getTableCatalog.mockReturnValue({
classification: "PII",
diff --git a/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.tsx b/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.tsx
index 8547df9a52..735778c5d3 100644
--- a/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.tsx
+++ b/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.tsx
@@ -8,14 +8,11 @@ import {
TableHeader,
TableRow,
} from "@/react/components/ui/table";
+import { useDatabaseCatalog } from "@/react/hooks/useDatabaseCatalog";
import { useVueState } from "@/react/hooks/useVueState";
import { updateTableCatalog } from "@/react/lib/column-data-table/utils";
-import {
- featureToRef,
- getTableCatalog,
- useDatabaseCatalog,
- useSettingV1Store,
-} from "@/store";
+import { getTableCatalog } from "@/react/stores/app/databaseCatalog";
+import { featureToRef, useSettingV1Store } from "@/store";
import { Engine } from "@/types/proto-es/v1/common_pb";
import type {
Database,
@@ -52,8 +49,7 @@ export function TableMetadataTable({
const showClassificationColumn = useVueState(
() => featureToRef(PlanFeature.FEATURE_DATA_MASKING).value
);
- const databaseCatalog = useDatabaseCatalog(database.name, false);
- const catalog = useVueState(() => databaseCatalog.value);
+ const catalog = useDatabaseCatalog(database.name, false);
const project = getDatabaseProject(database);
const classificationConfig = useVueState(() =>
settingStore.getProjectClassification(
diff --git a/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.test.tsx b/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.test.tsx
index 9ba5212b0c..5ad3e73585 100644
--- a/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.test.tsx
+++ b/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.test.tsx
@@ -177,16 +177,10 @@ const mocks = vi.hoisted(() => {
localStorage,
featureToRef: vi.fn(() => ({ value: true })),
useVueState: vi.fn((getter: () => unknown) => getter()),
- useDatabaseCatalog: vi.fn(() => ({
- value: makeDatabaseCatalog(),
- })),
- usePolicyV1Store: vi.fn(() => ({
- getOrFetchPolicyByParentAndType: vi.fn(),
- upsertPolicy: vi.fn(),
- })),
- useDatabaseCatalogV1Store: vi.fn(() => ({
- updateDatabaseCatalog: vi.fn(),
- })),
+ useDatabaseCatalog: vi.fn(() => makeDatabaseCatalog()),
+ getOrFetchPolicyByParentAndType: vi.fn(),
+ upsertPolicy: vi.fn(),
+ updateDatabaseCatalog: vi.fn(),
useSettingV1Store: vi.fn(() => ({
getOrFetchSettingByName: vi.fn(),
getProjectClassification: vi.fn(() => ({
@@ -376,12 +370,23 @@ vi.mock("@/react/hooks/useVueState", () => ({
vi.mock("@/store", () => ({
featureToRef: mocks.featureToRef,
pushNotification: mocks.pushNotification,
- useDatabaseCatalog: mocks.useDatabaseCatalog,
- useDatabaseCatalogV1Store: mocks.useDatabaseCatalogV1Store,
- usePolicyV1Store: mocks.usePolicyV1Store,
useSettingV1Store: mocks.useSettingV1Store,
}));
+vi.mock("@/react/hooks/useDatabaseCatalog", () => ({
+ useDatabaseCatalog: () => mocks.useDatabaseCatalog(),
+}));
+
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: {
+ getState: () => ({
+ updateDatabaseCatalog: mocks.updateDatabaseCatalog,
+ getOrFetchPolicyByParentAndType: mocks.getOrFetchPolicyByParentAndType,
+ upsertPolicy: mocks.upsertPolicy,
+ }),
+ },
+}));
+
vi.mock("@/utils", () => ({
autoDatabaseRoute: mocks.autoDatabaseRoute,
getDatabaseProject: mocks.getDatabaseProject,
@@ -466,18 +471,11 @@ beforeEach(async () => {
mocks.useVueState.mockReset();
mocks.useVueState.mockImplementation((getter: () => unknown) => getter());
mocks.useDatabaseCatalog.mockReset();
- mocks.useDatabaseCatalog.mockReturnValue({
- value: makeDatabaseCatalog(),
- });
- mocks.usePolicyV1Store.mockReset();
- mocks.usePolicyV1Store.mockReturnValue({
- getOrFetchPolicyByParentAndType: vi.fn(),
- upsertPolicy: vi.fn(),
- });
- mocks.useDatabaseCatalogV1Store.mockReset();
- mocks.useDatabaseCatalogV1Store.mockReturnValue({
- updateDatabaseCatalog: vi.fn(),
- });
+ mocks.useDatabaseCatalog.mockReturnValue(makeDatabaseCatalog());
+ mocks.getOrFetchPolicyByParentAndType.mockReset();
+ mocks.upsertPolicy.mockReset();
+ mocks.updateDatabaseCatalog.mockReset();
+ mocks.updateDatabaseCatalog.mockResolvedValue(undefined);
mocks.useSettingV1Store.mockReset();
mocks.useSettingV1Store.mockReturnValue({
getOrFetchSettingByName: vi.fn(),
@@ -668,10 +666,7 @@ describe("DatabaseCatalogPanel", () => {
});
test("clears a selected row from checked selection when deleted", async () => {
- const updateDatabaseCatalog = vi.fn().mockResolvedValue(undefined);
- mocks.useDatabaseCatalogV1Store.mockReturnValue({
- updateDatabaseCatalog,
- });
+ const updateDatabaseCatalog = mocks.updateDatabaseCatalog;
const { container, render, unmount } = renderIntoContainer(
createElement(DatabaseCatalogPanel, {
@@ -718,11 +713,8 @@ describe("DatabaseCatalogPanel", () => {
});
test("updates semantic type and classification independently", async () => {
- const updateDatabaseCatalog = vi.fn().mockResolvedValue(undefined);
+ const updateDatabaseCatalog = mocks.updateDatabaseCatalog;
const getOrFetchSettingByName = vi.fn();
- mocks.useDatabaseCatalogV1Store.mockReturnValue({
- updateDatabaseCatalog,
- });
mocks.useSettingV1Store.mockReturnValue({
getOrFetchSettingByName,
getProjectClassification: vi.fn(() => ({
@@ -759,9 +751,7 @@ describe("DatabaseCatalogPanel", () => {
})),
});
const catalog = makeSimpleCatalog();
- mocks.useDatabaseCatalog.mockReturnValue({
- value: catalog,
- });
+ mocks.useDatabaseCatalog.mockReturnValue(catalog);
const { container, render, unmount } = renderIntoContainer(
createElement(DatabaseCatalogPanel, {
@@ -809,9 +799,9 @@ describe("DatabaseCatalogPanel", () => {
});
test("renders an empty state when catalog data is not loaded", async () => {
- mocks.useDatabaseCatalog.mockReturnValue({
- value: undefined as unknown as DatabaseCatalog,
- });
+ mocks.useDatabaseCatalog.mockReturnValue(
+ undefined as unknown as DatabaseCatalog
+ );
const { container, render, unmount } = renderIntoContainer(
createElement(DatabaseCatalogPanel, {
diff --git a/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.tsx b/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.tsx
index 640864596b..99e57278f4 100644
--- a/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.tsx
+++ b/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.tsx
@@ -19,6 +19,7 @@ import {
DialogTitle,
} from "@/react/components/ui/dialog";
import { Input } from "@/react/components/ui/input";
+import { useDatabaseCatalog } from "@/react/hooks/useDatabaseCatalog";
import { useVueState } from "@/react/hooks/useVueState";
import type {
MaskData,
@@ -28,14 +29,8 @@ import {
getMaskDataIdentifier,
isCurrentColumnException,
} from "@/react/lib/sensitive-data/utils";
-import {
- featureToRef,
- pushNotification,
- useDatabaseCatalog,
- useDatabaseCatalogV1Store,
- usePolicyV1Store,
- useSettingV1Store,
-} from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { featureToRef, pushNotification, useSettingV1Store } from "@/store";
import type { Permission } from "@/types";
import type {
ColumnCatalog,
@@ -190,12 +185,9 @@ const itemKey = (item: MaskData) => {
export function DatabaseCatalogPanel({ database }: { database: Database }) {
const { t } = useTranslation();
- const policyStore = usePolicyV1Store();
- const databaseCatalogStore = useDatabaseCatalogV1Store();
const settingStore = useSettingV1Store();
- const databaseCatalog = useDatabaseCatalog(database.name, false);
- const catalog = useVueState(() => databaseCatalog.value);
+ const catalog = useDatabaseCatalog(database.name, false);
const project = getDatabaseProject(database);
const instance = getInstanceResource(database);
const isMaskingForNoSQL = instanceV1MaskingForNoSQL(instance);
@@ -299,10 +291,12 @@ export function DatabaseCatalogPanel({ database }: { database: Database }) {
showGrantAccessDialog && checkedColumnList.length > 0;
const removeMaskingExceptions = async (sensitiveColumn: MaskData) => {
- const policy = await policyStore.getOrFetchPolicyByParentAndType({
- parentPath: database.project,
- policyType: PolicyType.MASKING_EXEMPTION,
- });
+ const policy = await useAppStore
+ .getState()
+ .getOrFetchPolicyByParentAndType({
+ parentPath: database.project,
+ policyType: PolicyType.MASKING_EXEMPTION,
+ });
if (!policy) {
return;
}
@@ -326,7 +320,7 @@ export function DatabaseCatalogPanel({ database }: { database: Database }) {
}),
};
- await policyStore.upsertPolicy({
+ await useAppStore.getState().upsertPolicy({
parentPath: database.project,
policy,
});
@@ -346,7 +340,7 @@ export function DatabaseCatalogPanel({ database }: { database: Database }) {
item.target.classification = "";
item.classificationId = "";
}
- await databaseCatalogStore.updateDatabaseCatalog(catalog);
+ await useAppStore.getState().updateDatabaseCatalog(catalog);
pushNotification({
module: "bytebase",
style: "SUCCESS",
@@ -364,7 +358,7 @@ export function DatabaseCatalogPanel({ database }: { database: Database }) {
}
item.target.semanticType = semanticTypeId;
item.semanticTypeId = semanticTypeId;
- await databaseCatalogStore.updateDatabaseCatalog(catalog);
+ await useAppStore.getState().updateDatabaseCatalog(catalog);
pushNotification({
module: "bytebase",
style: "SUCCESS",
@@ -381,7 +375,7 @@ export function DatabaseCatalogPanel({ database }: { database: Database }) {
}
item.target.classification = classificationId;
item.classificationId = classificationId;
- await databaseCatalogStore.updateDatabaseCatalog(catalog);
+ await useAppStore.getState().updateDatabaseCatalog(catalog);
pushNotification({
module: "bytebase",
style: "SUCCESS",
diff --git a/frontend/src/react/pages/project/database-detail/panels/DatabaseOverviewPanel.test.tsx b/frontend/src/react/pages/project/database-detail/panels/DatabaseOverviewPanel.test.tsx
index a864780f11..4b3d646241 100644
--- a/frontend/src/react/pages/project/database-detail/panels/DatabaseOverviewPanel.test.tsx
+++ b/frontend/src/react/pages/project/database-detail/panels/DatabaseOverviewPanel.test.tsx
@@ -34,6 +34,7 @@ const mocks = vi.hoisted(() => {
useVueState: vi.fn(),
useDBSchemaV1Store: vi.fn(),
useDatabaseCatalog: vi.fn(),
+ updateDatabaseCatalog: vi.fn(),
useSubscriptionV1Store: vi.fn(),
getColumnCatalog: vi.fn(() => ({
semanticType: "",
@@ -92,10 +93,14 @@ vi.mock("@/router", () => ({
// getters via the app store. Route the existing `mocks.useDBSchemaV1Store`
// shape through `useAppStore` so the per-scenario `.mockReturnValue({...})`
// calls in test bodies keep working without further changes.
-vi.mock("@/react/stores/app", () => ({
- useAppStore: (selector: (s: unknown) => unknown) =>
- selector(mocks.useDBSchemaV1Store()),
-}));
+vi.mock("@/react/stores/app", () => {
+ const useAppStore = (selector: (s: unknown) => unknown) =>
+ selector(mocks.useDBSchemaV1Store());
+ useAppStore.getState = () => ({
+ updateDatabaseCatalog: mocks.updateDatabaseCatalog,
+ });
+ return { useAppStore };
+});
vi.mock("@/react/hooks/useAppDatabaseMetadata", () => ({
useAppDatabaseMetadata: (name: string) =>
@@ -103,14 +108,20 @@ vi.mock("@/react/hooks/useAppDatabaseMetadata", () => ({
}));
vi.mock("@/store", () => ({
- useDatabaseCatalog: mocks.useDatabaseCatalog,
useSubscriptionV1Store: mocks.useSubscriptionV1Store,
- getColumnCatalog: mocks.getColumnCatalog,
- getTableCatalog: mocks.getTableCatalog,
useSettingV1Store: mocks.useSettingV1Store,
featureToRef: mocks.featureToRef,
}));
+vi.mock("@/react/hooks/useDatabaseCatalog", () => ({
+ useDatabaseCatalog: () => mocks.useDatabaseCatalog(),
+}));
+
+vi.mock("@/react/stores/app/databaseCatalog", () => ({
+ getColumnCatalog: mocks.getColumnCatalog,
+ getTableCatalog: mocks.getTableCatalog,
+}));
+
vi.mock("@/utils", () => ({
bytesToString: mocks.bytesToString,
getDatabaseEngine: mocks.getDatabaseEngine,
@@ -339,10 +350,10 @@ beforeEach(async () => {
});
mocks.useDatabaseCatalog.mockReset();
mocks.useDatabaseCatalog.mockReturnValue({
- value: {
- schemas: [],
- },
+ schemas: [],
});
+ mocks.updateDatabaseCatalog.mockReset();
+ mocks.updateDatabaseCatalog.mockResolvedValue(undefined);
mocks.getColumnCatalog.mockReset();
mocks.getColumnCatalog.mockReturnValue({
semanticType: "",
diff --git a/frontend/src/react/pages/project/database-detail/revision/ImportRevisionSheet.tsx b/frontend/src/react/pages/project/database-detail/revision/ImportRevisionSheet.tsx
index 7a6afa4190..d1970078f9 100644
--- a/frontend/src/react/pages/project/database-detail/revision/ImportRevisionSheet.tsx
+++ b/frontend/src/react/pages/project/database-detail/revision/ImportRevisionSheet.tsx
@@ -24,7 +24,7 @@ import {
} from "@/react/components/ui/sheet";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
-import { pushNotification, useSheetV1Store } from "@/store";
+import { pushNotification } from "@/store";
import type {
Release,
Release_File,
@@ -39,6 +39,7 @@ import {
CreateRevisionRequestSchema,
Revision_Type,
} from "@/types/proto-es/v1/revision_service_pb";
+import { SheetSchema } from "@/types/proto-es/v1/sheet_service_pb";
enum Step {
SELECT_SOURCE = 1,
@@ -75,7 +76,6 @@ export function ImportRevisionSheet({
const listAllRevisionsByDatabase = useAppStore(
(state) => state.listAllRevisionsByDatabase
);
- const sheetStore = useSheetV1Store();
const fileInputRef = useRef<HTMLInputElement>(null);
const [selectedSource, setSelectedSource] = useState<"release" | "local">(
@@ -290,9 +290,12 @@ export function ImportRevisionSheet({
let requests: CreateRevisionRequest[] = [];
if (selectedSource === "local") {
for (const file of localFiles) {
- const sheet = await sheetStore.createSheet(projectName, {
- content: new TextEncoder().encode(file.content),
- });
+ const sheet = await useAppStore.getState().createSheet(
+ projectName,
+ create(SheetSchema, {
+ content: new TextEncoder().encode(file.content),
+ })
+ );
requests.push(
create(CreateRevisionRequestSchema, {
parent: databaseName,
@@ -355,7 +358,6 @@ export function ImportRevisionSheet({
selectedFiles,
selectedRelease,
selectedSource,
- sheetStore,
t,
]);
diff --git a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.test.tsx b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.test.tsx
index c9de670d12..76167c5d6c 100644
--- a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.test.tsx
+++ b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.test.tsx
@@ -210,9 +210,6 @@ const stableDBGroupStore = {
get fetchDBGroupListByProjectName() {
return mocks.fetchDBGroupListByProjectName;
},
-};
-
-const stableSheetStore = {
get createSheet() {
return mocks.createSheet;
},
@@ -226,7 +223,6 @@ vi.mock("@/store", () => ({
DEFAULT_MAX_RESULT_SIZE_IN_MB: 100,
useProjectV1Store: () => stableProjectStore,
useDatabaseV1Store: () => stableDatabaseStore,
- useSheetV1Store: () => stableSheetStore,
useSettingV1Store: () => stableSettingStore,
pushNotification: mocks.pushNotification,
}));
diff --git a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
index 3ef1daa173..e6bacf3a77 100644
--- a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
+++ b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
@@ -33,7 +33,6 @@ import {
useDatabaseV1Store,
useProjectV1Store,
useSettingV1Store,
- useSheetV1Store,
} from "@/store";
import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";
import { ExportFormat } from "@/types/proto-es/v1/common_pb";
@@ -94,7 +93,6 @@ export function DataExportPrepSheet({
}: DataExportPrepSheetProps) {
const { t } = useTranslation();
const currentUser = useCurrentUser();
- const sheetStore = useSheetV1Store();
const dbStore = useDatabaseV1Store();
const projectStore = useProjectV1Store();
const settingStore = useSettingV1Store();
@@ -238,7 +236,9 @@ export function DataExportPrepSheet({
try {
const sheet = create(SheetSchema, {});
setSheetStatement(sheet, statement);
- const createdSheet = await sheetStore.createSheet(project.name, sheet);
+ const createdSheet = await useAppStore
+ .getState()
+ .createSheet(project.name, sheet);
const spec = create(Plan_SpecSchema, {
id: uuidv4(),
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx
index 67533c50b8..131d7041ea 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailActionBar.tsx
@@ -54,7 +54,7 @@ import {
buildPlanDeployRouteFromPlanName,
buildPlanDeployRouteFromRolloutName,
} from "@/router/dashboard/projectV1RouteHelpers";
-import { pushNotification, useProjectV1Store, useSQLStore } from "@/store";
+import { pushNotification, useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
ApproveIssueRequestSchema,
@@ -96,7 +96,6 @@ export function IssueDetailActionBar() {
const { t } = useTranslation();
const page = useIssueDetailContext();
const projectStore = useProjectV1Store();
- const sqlStore = useSQLStore();
const currentUser = useCurrentUser();
const [pendingConfirmAction, setPendingConfirmAction] =
useState<ActionDefinition>();
@@ -254,7 +253,7 @@ export function IssueDetailActionBar() {
}
try {
setIsSubmitting(true);
- const content = await sqlStore.exportData(
+ const content = await useAppStore.getState().exportData(
create(ExportRequestSchema, {
name: `${page.rollout.name}/stages/-`,
})
@@ -285,7 +284,7 @@ export function IssueDetailActionBar() {
} finally {
setIsSubmitting(false);
}
- }, [handleRefreshIssueDetailState, page.rollout, sqlStore, t]);
+ }, [handleRefreshIssueDetailState, page.rollout, t]);
const handleCreateRollout = useCallback(
async (options?: { runAllTasks?: boolean }) => {
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailCommentList.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailCommentList.tsx
index 50858efd05..def6ea92f4 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailCommentList.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailCommentList.tsx
@@ -38,12 +38,7 @@ import {
} from "@/react/stores/app/issueComment";
import { router } from "@/router";
import { buildPlanDeployRouteFromPlanName } from "@/router/dashboard/projectV1RouteHelpers";
-import {
- extractUserEmail,
- pushNotification,
- useProjectV1Store,
- useSheetV1Store,
-} from "@/store";
+import { extractUserEmail, pushNotification, useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { getTimeForPbTimestampProtoEs, unknownUser } from "@/types";
import { ApprovalStatus } from "@/types/proto-es/v1/common_pb";
@@ -1143,7 +1138,6 @@ function IssueDetailStatementUpdateButton({
oldSheet: string;
}) {
const { t } = useTranslation();
- const sheetStore = useSheetV1Store();
const [open, setOpen] = useState(false);
const [oldStatement, setOldStatement] = useState("");
const [newStatement, setNewStatement] = useState("");
@@ -1162,7 +1156,9 @@ function IssueDetailStatementUpdateButton({
// rather than fetching by an empty resource name.
const fetchStatement = async (sheetName: string) => {
if (!sheetName) return "";
- const sheet = await sheetStore.getOrFetchSheetByName(sheetName);
+ const sheet = await useAppStore
+ .getState()
+ .getOrFetchSheetByName(sheetName);
return sheet ? getSheetStatement(sheet) : "";
};
const [oldValue, newValue] = await Promise.all([
@@ -1183,7 +1179,7 @@ function IssueDetailStatementUpdateButton({
return () => {
canceled = true;
};
- }, [newSheet, oldSheet, open, sheetStore]);
+ }, [newSheet, oldSheet, open]);
return (
<>
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.test.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.test.tsx
index 776416621f..76f8d18c24 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.test.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.test.tsx
@@ -232,9 +232,6 @@ vi.mock("@/store", () => ({
useEnvironmentV1Store: () => ({
getEnvironmentByName: mocks.getEnvironmentByName,
}),
- useSheetV1Store: () => ({
- getOrFetchSheetByName: mocks.getOrFetchSheetByName,
- }),
}));
vi.mock("@/types", () => ({
@@ -259,6 +256,7 @@ vi.mock("@/react/stores/app", () => {
getState: () => ({
getDBGroupByName: mocks.getDBGroupByName,
getOrFetchDBGroupByName: mocks.getOrFetchDBGroupByName,
+ getOrFetchSheetByName: mocks.getOrFetchSheetByName,
}),
}
);
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
index 9cad9257c8..6723ad8395 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
@@ -34,7 +34,6 @@ import {
getProjectNameAndDatabaseGroupName,
useDatabaseV1Store,
useEnvironmentV1Store,
- useSheetV1Store,
} from "@/store";
import {
isValidDatabaseGroupName,
@@ -179,7 +178,6 @@ function IssueDetailDatabaseChangeOptions({
}) {
const { t } = useTranslation();
const databaseStore = useDatabaseV1Store();
- const sheetStore = useSheetV1Store();
const [sheetStatement, setSheetStatement] = useState("");
const [isSheetOversize, setIsSheetOversize] = useState(false);
const [instanceRoles, setInstanceRoles] = useState<string[]>([]);
@@ -322,7 +320,7 @@ function IssueDetailDatabaseChangeOptions({
const uid = extractSheetUID(sheetName);
const sheet = uid.startsWith("-")
? getLocalSheetByName(sheetName)
- : await sheetStore.getOrFetchSheetByName(sheetName);
+ : await useAppStore.getState().getOrFetchSheetByName(sheetName);
if (!sheet || canceled) {
return;
}
@@ -336,7 +334,7 @@ function IssueDetailDatabaseChangeOptions({
return () => {
canceled = true;
};
- }, [selectedSpec, sheetStore]);
+ }, [selectedSpec]);
useEffect(() => {
let canceled = false;
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx
index c5668f2033..47b20f36aa 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx
@@ -5,13 +5,13 @@ import { EngineIcon } from "@/react/components/EngineIcon";
import { Tooltip } from "@/react/components/ui/tooltip";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { INSTANCE_ROUTE_DETAIL } from "@/router/dashboard/instance";
import {
useEnvironmentV1Store,
useInstanceV1Store,
useProjectV1Store,
- useSheetV1Store,
} from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
@@ -39,7 +39,6 @@ export function IssueDetailDatabaseCreateView() {
const projectStore = useProjectV1Store();
const environmentStore = useEnvironmentV1Store();
const instanceStore = useInstanceV1Store();
- const sheetStore = useSheetV1Store();
const projectName = `${projectNamePrefix}${page.projectId}`;
const project = useVueState(() => projectStore.getProjectByName(projectName));
@@ -94,9 +93,9 @@ export function IssueDetailDatabaseCreateView() {
useEffect(() => {
if (sheetName) {
- void sheetStore.getOrFetchSheetByName(sheetName);
+ void useAppStore.getState().getOrFetchSheetByName(sheetName);
}
- }, [sheetName, sheetStore]);
+ }, [sheetName]);
useEffect(() => {
if (targetInstanceName) {
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailStatementSection.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailStatementSection.tsx
index d3502e7bb7..f67db5d99b 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailStatementSection.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailStatementSection.tsx
@@ -16,7 +16,6 @@ import {
pushNotification,
useDatabaseV1Store,
useProjectV1Store,
- useSheetV1Store,
} from "@/store";
import { extractUserEmail } from "@/store/modules/v1/common";
import {
@@ -60,7 +59,6 @@ export function IssueDetailStatementSection({
const { t } = useTranslation();
const page = useIssueDetailContext();
const { setEditing } = page;
- const sheetStore = useSheetV1Store();
const fetchRelease = useAppStore((state) => state.fetchRelease);
const projectStore = useProjectV1Store();
const databaseStore = useDatabaseV1Store();
@@ -166,7 +164,7 @@ export function IssueDetailStatementSection({
const uid = extractSheetUID(sheetName);
const sheet = uid.startsWith("-")
? getLocalSheetByName(sheetName)
- : await sheetStore.getOrFetchSheetByName(sheetName);
+ : await useAppStore.getState().getOrFetchSheetByName(sheetName);
if (!sheet || canceled) {
return;
}
@@ -185,7 +183,7 @@ export function IssueDetailStatementSection({
return () => {
canceled = true;
};
- }, [fetchRelease, releaseName, sheetName, sheetStore]);
+ }, [fetchRelease, releaseName, sheetName]);
if (isValidReleaseName(releaseName)) {
return (
@@ -333,7 +331,9 @@ export function IssueDetailStatementSection({
const sheet = createEmptyLocalSheet();
setSheetStatement(sheet, draftStatement);
const previousSheetName = sheetName;
- const createdSheet = await sheetStore.createSheet(project.name, sheet);
+ const createdSheet = await useAppStore
+ .getState()
+ .createSheet(project.name, sheet);
const nextPlan = patchPlanStatement(page.plan, spec, createdSheet.name);
if (!nextPlan) {
return;
diff --git a/frontend/src/react/pages/project/issue-detail/hooks/useIssueDetailSpecValidation.ts b/frontend/src/react/pages/project/issue-detail/hooks/useIssueDetailSpecValidation.ts
index 6ca7a6999a..fb6fc57044 100644
--- a/frontend/src/react/pages/project/issue-detail/hooks/useIssueDetailSpecValidation.ts
+++ b/frontend/src/react/pages/project/issue-detail/hooks/useIssueDetailSpecValidation.ts
@@ -1,14 +1,11 @@
import { useEffect, useState } from "react";
-import { useSheetV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
import type { Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";
import { sheetNameOfSpec } from "@/utils/v1/issue/plan";
import { extractSheetUID, getSheetStatement } from "@/utils/v1/sheet";
import { getLocalSheetByName } from "../utils/localSheet";
-const checkSpecStatement = async (
- spec: Plan_Spec,
- sheetStore: ReturnType<typeof useSheetV1Store>
-): Promise<boolean> => {
+const checkSpecStatement = async (spec: Plan_Spec): Promise<boolean> => {
if (
spec.config?.case !== "changeDatabaseConfig" &&
spec.config?.case !== "exportDataConfig"
@@ -32,7 +29,7 @@ const checkSpecStatement = async (
const uid = extractSheetUID(sheetName);
const sheet = uid.startsWith("-")
? getLocalSheetByName(sheetName)
- : await sheetStore.getOrFetchSheetByName(sheetName);
+ : await useAppStore.getState().getOrFetchSheetByName(sheetName);
if (!sheet) {
return true;
}
@@ -55,7 +52,6 @@ const isSameSet = (prev: Set<string>, next: Set<string>) => {
};
export function useIssueDetailSpecValidation(specs: Plan_Spec[]) {
- const sheetStore = useSheetV1Store();
const [emptySpecIdSet, setEmptySpecIdSet] = useState<Set<string>>(
() => new Set()
);
@@ -67,7 +63,7 @@ export function useIssueDetailSpecValidation(specs: Plan_Spec[]) {
const next = new Set<string>();
await Promise.all(
specs.map(async (spec) => {
- if (await checkSpecStatement(spec, sheetStore)) {
+ if (await checkSpecStatement(spec)) {
next.add(spec.id);
}
})
@@ -82,7 +78,7 @@ export function useIssueDetailSpecValidation(specs: Plan_Spec[]) {
return () => {
canceled = true;
};
- }, [sheetStore, specs]);
+ }, [specs]);
return {
emptySpecIdSet,
diff --git a/frontend/src/react/pages/project/issue-detail/utils/approvalCandidates.ts b/frontend/src/react/pages/project/issue-detail/utils/approvalCandidates.ts
index d1726f3411..37ae732c06 100644
--- a/frontend/src/react/pages/project/issue-detail/utils/approvalCandidates.ts
+++ b/frontend/src/react/pages/project/issue-detail/utils/approvalCandidates.ts
@@ -1,5 +1,6 @@
import { uniq } from "lodash-es";
-import { useProjectIamPolicyStore, useProjectV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { useProjectV1Store } from "@/store";
import { projectNamePrefix, userNamePrefix } from "@/store/modules/v1/common";
import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import {
@@ -9,15 +10,14 @@ import {
// candidatesOfApprovalStepV1 returns a user name list in users/{email} format.
// The list could include users/ALL_USERS_USER_EMAIL.
-// Relocated from the legacy Pinia `issue` module; still reads the project and
-// project-IAM Pinia stores, which remain until those stores are migrated.
+// Reads the project-IAM policy from the app store's iam slice; still reads the
+// project Pinia store, which remains until that store is migrated.
export const candidatesOfApprovalStepV1 = (issue: Issue, role: string) => {
const project = useProjectV1Store().getProjectByName(
`${projectNamePrefix}${extractProjectResourceName(issue.name)}`
);
const candidatesForRoles = (role: string) => {
- const projectIamPolicyStore = useProjectIamPolicyStore();
- const iamPolicy = projectIamPolicyStore.getProjectIamPolicy(project.name);
+ const iamPolicy = useAppStore.getState().getProjectIamPolicy(project.name);
const memberMap = memberMapToRolesInProjectIAM(iamPolicy, role);
return [...memberMap.keys()].filter((name) =>
name.startsWith(userNamePrefix)
diff --git a/frontend/src/react/pages/project/issue-detail/utils/rollout.ts b/frontend/src/react/pages/project/issue-detail/utils/rollout.ts
index 3c996e0142..58b5adc226 100644
--- a/frontend/src/react/pages/project/issue-detail/utils/rollout.ts
+++ b/frontend/src/react/pages/project/issue-detail/utils/rollout.ts
@@ -1,5 +1,4 @@
import { useAppStore } from "@/react/stores/app";
-import { usePolicyV1Store } from "@/store";
import { roleNamePrefix } from "@/store/modules/v1/common";
import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";
@@ -60,7 +59,6 @@ export const canRolloutTasks = ({
return true;
}
- const policyStore = usePolicyV1Store();
const projectIamPolicy = useAppStore
.getState()
.getProjectIamPolicy(project.name);
@@ -72,7 +70,7 @@ export const canRolloutTasks = ({
return false;
}
- const rolloutPolicy = policyStore.getPolicyByParentAndType({
+ const rolloutPolicy = useAppStore.getState().getPolicyByParentAndType({
parentPath: environment,
policyType: PolicyType.ROLLOUT_POLICY,
});
@@ -116,14 +114,12 @@ export const preloadRolloutPermissionContext = async ({
return;
}
- const policyStore = usePolicyV1Store();
-
await Promise.allSettled([
useAppStore.getState().loadProjectIamPolicy(projectName),
]);
const policyResults = await Promise.allSettled([
- policyStore.getOrFetchPolicyByParentAndType({
+ useAppStore.getState().getOrFetchPolicyByParentAndType({
parentPath: environment,
policyType: PolicyType.ROLLOUT_POLICY,
}),
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.test.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.test.tsx
index eefe29d18b..efd46ca332 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.test.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.test.tsx
@@ -51,6 +51,8 @@ const mocks = vi.hoisted(() => ({
name: "projects/foo/databaseGroups/group-a",
matchedDatabases: [] as Array<{ name: string }>,
})),
+ createSheet: vi.fn(async (_projectName, sheet) => sheet),
+ getOrFetchSheetByName: vi.fn(async () => undefined),
},
environmentStore: {
getEnvironmentByName: vi.fn(),
@@ -58,10 +60,6 @@ const mocks = vi.hoisted(() => ({
projectStore: {
getProjectByName: vi.fn(),
},
- sheetStore: {
- createSheet: vi.fn(async (_projectName, sheet) => sheet),
- getOrFetchSheetByName: vi.fn(async () => undefined),
- },
}));
vi.mock("react-i18next", () => ({
@@ -270,7 +268,6 @@ vi.mock("@/store", () => ({
useDatabaseV1Store: () => mocks.databaseStore,
useEnvironmentV1Store: () => mocks.environmentStore,
useProjectV1Store: () => mocks.projectStore,
- useSheetV1Store: () => mocks.sheetStore,
}));
// The migrated component reads dbGroup state via imperative
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.tsx
index a953611fde..8acefe730e 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.tsx
@@ -72,7 +72,6 @@ import {
pushNotification,
useDatabaseV1Store,
useProjectV1Store,
- useSheetV1Store,
} from "@/store";
import {
isValidDatabaseGroupName,
@@ -719,7 +718,6 @@ function OptionsSection({
projectStore.getProjectByName(`projects/${page.projectId}`)
);
const databaseStore = useDatabaseV1Store();
- const sheetStore = useSheetV1Store();
const [sheetStatement, setSheetStatementValue] = useState("");
const [isSheetOversize, setIsSheetOversize] = useState(false);
const [instanceRoles, setInstanceRoles] = useState<string[]>([]);
@@ -836,7 +834,7 @@ function OptionsSection({
const uid = extractSheetUID(sheetName);
const sheet = uid.startsWith("-")
? getLocalSheetByName(sheetName)
- : await sheetStore.getOrFetchSheetByName(sheetName);
+ : await useAppStore.getState().getOrFetchSheetByName(sheetName);
if (!sheet || canceled) return;
const statement = getSheetStatement(sheet);
setSheetStatementValue(statement);
@@ -846,7 +844,7 @@ function OptionsSection({
return () => {
canceled = true;
};
- }, [selectedSpec, sheetStore]);
+ }, [selectedSpec]);
useEffect(() => {
let canceled = false;
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailHeader.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailHeader.tsx
index 264234468f..c684e55b62 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailHeader.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailHeader.tsx
@@ -17,12 +17,13 @@ import {
} from "@/react/components/ui/popover";
import { Tooltip } from "@/react/components/ui/tooltip";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import {
PROJECT_V1_ROUTE_ISSUE_DETAIL,
PROJECT_V1_ROUTE_PLAN_DETAIL,
} from "@/router/dashboard/projectV1";
-import { pushNotification, useSheetV1Store } from "@/store";
+import { pushNotification } from "@/store";
import { State } from "@/types/proto-es/v1/common_pb";
import {
CreateIssueRequestSchema,
@@ -59,7 +60,6 @@ export function PlanDetailHeader() {
const { t } = useTranslation();
const page = usePlanDetailContext();
const { patchState, setEditing } = page;
- const sheetStore = useSheetV1Store();
const currentUser = page.currentUser;
const project = page.project;
const [title, setTitle] = useState(page.plan.title);
@@ -313,7 +313,9 @@ export function PlanDetailHeader() {
const uid = extractSheetUID(config.sheet);
if (uid.startsWith("-")) {
const local = getLocalSheetByName(config.sheet);
- const createdSheet = await sheetStore.createSheet(project.name, local);
+ const createdSheet = await useAppStore
+ .getState()
+ .createSheet(project.name, local);
removeLocalSheet(config.sheet);
config.sheet = createdSheet.name;
}
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailRollbackSheet.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailRollbackSheet.tsx
index fa504be94a..dc55f96881 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailRollbackSheet.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailRollbackSheet.tsx
@@ -23,9 +23,10 @@ import {
SheetTitle,
} from "@/react/components/ui/sheet";
import { useVueState } from "@/react/hooks/useVueState";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_PLAN_DETAIL } from "@/router/dashboard/projectV1";
-import { pushNotification, useProjectV1Store, useSheetV1Store } from "@/store";
+import { pushNotification, useProjectV1Store } from "@/store";
import {
CreatePlanRequestSchema,
Plan_ChangeDatabaseConfigSchema,
@@ -63,7 +64,6 @@ export function PlanDetailRollbackSheet({
}>;
}) {
const { t } = useTranslation();
- const sheetStore = useSheetV1Store();
const projectStore = useProjectV1Store();
const normalizedProjectName = projectName.startsWith("projects/")
? projectName
@@ -324,7 +324,7 @@ export function PlanDetailRollbackSheet({
const specs = [];
for (const preview of previews) {
if (!preview.statement) continue;
- const sheet = await sheetStore.createSheet(
+ const sheet = await useAppStore.getState().createSheet(
projectName,
create(SheetSchema, {
name: `${projectName}/sheets/${uuidv4()}`,
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailStatementSection.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailStatementSection.tsx
index e8a9333411..80b326284a 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailStatementSection.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailStatementSection.tsx
@@ -13,7 +13,8 @@ import { Alert } from "@/react/components/ui/alert";
import { Button } from "@/react/components/ui/button";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
-import { pushNotification, useDatabaseV1Store, useSheetV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { pushNotification, useDatabaseV1Store } from "@/store";
import {
isValidDatabaseName,
isValidReleaseName,
@@ -64,7 +65,6 @@ export function PlanDetailStatementSection({
const { t } = useTranslation();
const page = usePlanDetailContext();
const { patchState, setEditing } = page;
- const sheetStore = useSheetV1Store();
const databaseStore = useDatabaseV1Store();
const currentUser = page.currentUser;
const project = page.project;
@@ -200,7 +200,7 @@ export function PlanDetailStatementSection({
const uid = extractSheetUID(sheetName);
const sheet = uid.startsWith("-")
? getLocalSheetByName(sheetName)
- : await sheetStore.getOrFetchSheetByName(sheetName);
+ : await useAppStore.getState().getOrFetchSheetByName(sheetName);
if (!sheet || canceled) return;
const nextStatement = getSheetStatement(sheet);
setStatement(nextStatement);
@@ -215,7 +215,7 @@ export function PlanDetailStatementSection({
return () => {
canceled = true;
};
- }, [releaseName, sheetName, sheetStore, statementVersion]);
+ }, [releaseName, sheetName, statementVersion]);
if (isValidReleaseName(releaseName)) {
return (
@@ -347,7 +347,9 @@ export function PlanDetailStatementSection({
const sheet = createEmptyLocalSheet();
setSheetStatement(sheet, draftStatement);
const previousSheetName = sheetName;
- const createdSheet = await sheetStore.createSheet(project.name, sheet);
+ const createdSheet = await useAppStore
+ .getState()
+ .createSheet(project.name, sheet);
const nextPlan = patchPlanStatement(createdSheet.name);
if (!nextPlan) return;
const request = create(UpdatePlanRequestSchema, {
diff --git a/frontend/src/react/pages/project/plan-detail/components/deploy/useDeployTaskStatement.tsx b/frontend/src/react/pages/project/plan-detail/components/deploy/useDeployTaskStatement.tsx
index 785ab20d6f..f2702f9cb9 100644
--- a/frontend/src/react/pages/project/plan-detail/components/deploy/useDeployTaskStatement.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/deploy/useDeployTaskStatement.tsx
@@ -1,5 +1,5 @@
import { useEffect, useMemo, useState } from "react";
-import { useSheetV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
import type { Task } from "@/types/proto-es/v1/rollout_service_pb";
import { getStatementSize } from "@/utils/sheet";
import { sheetNameOfTaskV1 } from "@/utils/v1/issue/rollout";
@@ -12,7 +12,6 @@ export const useDeployTaskStatement = ({
enabled: boolean;
task: Task;
}) => {
- const sheetStore = useSheetV1Store();
const sheetName = useMemo(() => sheetNameOfTaskV1(task), [task]);
const [statement, setStatement] = useState("");
const [isLoading, setIsLoading] = useState(false);
@@ -30,9 +29,9 @@ export const useDeployTaskStatement = ({
const load = async () => {
setIsLoading(true);
try {
- let sheet = sheetStore.getSheetByName(sheetName);
+ let sheet = useAppStore.getState().getSheetByName(sheetName);
if (!sheet) {
- sheet = await sheetStore.getOrFetchSheetByName(sheetName);
+ sheet = await useAppStore.getState().getOrFetchSheetByName(sheetName);
}
if (!sheet) {
return;
@@ -51,7 +50,7 @@ export const useDeployTaskStatement = ({
return () => {
canceled = true;
};
- }, [enabled, sheetName, sheetStore]);
+ }, [enabled, sheetName]);
return { isLoading, isTruncated, statement };
};
diff --git a/frontend/src/react/pages/project/plan-detail/hooks/usePlanDetailSpecValidation.ts b/frontend/src/react/pages/project/plan-detail/hooks/usePlanDetailSpecValidation.ts
index b70345830f..d78e98a0a0 100644
--- a/frontend/src/react/pages/project/plan-detail/hooks/usePlanDetailSpecValidation.ts
+++ b/frontend/src/react/pages/project/plan-detail/hooks/usePlanDetailSpecValidation.ts
@@ -1,14 +1,11 @@
import { useEffect, useState } from "react";
-import { useSheetV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
import type { Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";
import { sheetNameOfSpec } from "@/utils/v1/issue/plan";
import { extractSheetUID, getSheetStatement } from "@/utils/v1/sheet";
import { getLocalSheetByName } from "../utils/localSheet";
-const checkSpecStatement = async (
- spec: Plan_Spec,
- sheetStore: ReturnType<typeof useSheetV1Store>
-): Promise<boolean> => {
+const checkSpecStatement = async (spec: Plan_Spec): Promise<boolean> => {
if (
spec.config?.case !== "changeDatabaseConfig" &&
spec.config?.case !== "exportDataConfig"
@@ -32,7 +29,7 @@ const checkSpecStatement = async (
const uid = extractSheetUID(sheetName);
const sheet = uid.startsWith("-")
? getLocalSheetByName(sheetName)
- : await sheetStore.getOrFetchSheetByName(sheetName);
+ : await useAppStore.getState().getOrFetchSheetByName(sheetName);
if (!sheet) {
return true;
}
@@ -43,7 +40,6 @@ const checkSpecStatement = async (
};
export function usePlanDetailSpecValidation(specs: Plan_Spec[]) {
- const sheetStore = useSheetV1Store();
const [emptySpecIdSet, setEmptySpecIdSet] = useState<Set<string>>(
() => new Set()
);
@@ -55,7 +51,7 @@ export function usePlanDetailSpecValidation(specs: Plan_Spec[]) {
const next = new Set<string>();
await Promise.all(
specs.map(async (spec) => {
- if (await checkSpecStatement(spec, sheetStore)) {
+ if (await checkSpecStatement(spec)) {
next.add(spec.id);
}
})
@@ -70,7 +66,7 @@ export function usePlanDetailSpecValidation(specs: Plan_Spec[]) {
return () => {
canceled = true;
};
- }, [sheetStore, specs]);
+ }, [specs]);
return {
emptySpecIdSet,
diff --git a/frontend/src/react/pages/project/plan-detail/utils/createPlan.ts b/frontend/src/react/pages/project/plan-detail/utils/createPlan.ts
index 6f5753c2db..37bce14f67 100644
--- a/frontend/src/react/pages/project/plan-detail/utils/createPlan.ts
+++ b/frontend/src/react/pages/project/plan-detail/utils/createPlan.ts
@@ -1,7 +1,7 @@
import { create } from "@bufbuild/protobuf";
import { head } from "lodash-es";
import { v4 as uuidv4 } from "uuid";
-import { useStorageStore } from "@/store";
+import { keyValueStorage } from "@/react/lib/keyValueStorage";
import type { Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";
import {
Plan_ChangeDatabaseConfigSchema,
@@ -68,13 +68,12 @@ const maybeSetInitialSQLForSpec = (spec: Plan_Spec, initialSQL: InitialSQL) => {
const extractInitialSQLFromQuery = async (
query: Record<string, string>
): Promise<InitialSQL> => {
- const storageStore = useStorageStore();
if (query.sql) {
return { sql: query.sql };
}
if (query.sqlStorageKey) {
return {
- sql: (await storageStore.get<string>(query.sqlStorageKey)) || "",
+ sql: (await keyValueStorage.get<string>(query.sqlStorageKey)) || "",
};
}
const sqlMapText = query.sqlMap;
@@ -91,7 +90,7 @@ const extractInitialSQLFromQuery = async (
if (query.sqlMapStorageKey) {
return {
sqlMap:
- (await storageStore.get<Record<string, string>>(
+ (await keyValueStorage.get<Record<string, string>>(
query.sqlMapStorageKey
)) || {},
};
diff --git a/frontend/src/react/pages/settings/CustomApprovalPage.tsx b/frontend/src/react/pages/settings/CustomApprovalPage.tsx
index 16023f11d2..c71e83818c 100644
--- a/frontend/src/react/pages/settings/CustomApprovalPage.tsx
+++ b/frontend/src/react/pages/settings/CustomApprovalPage.tsx
@@ -7,9 +7,10 @@ import { FeatureAttention } from "@/react/components/FeatureAttention";
import { Alert } from "@/react/components/ui/alert";
import { useVueState } from "@/react/hooks/useVueState";
import {
- useSubscriptionV1Store,
useWorkspaceApprovalSettingStore,
-} from "@/store";
+ type WorkspaceApprovalSettingState,
+} from "@/react/stores/workspaceApprovalSetting";
+import { useSubscriptionV1Store } from "@/store";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import { hasWorkspacePermissionV2 } from "@/utils";
@@ -89,7 +90,7 @@ function SourceSection({
onShowFeatureModal,
}: {
source: (typeof APPROVAL_SOURCES)[number];
- store: ReturnType<typeof useWorkspaceApprovalSettingStore>;
+ store: WorkspaceApprovalSettingState;
allowAdmin: boolean;
hasFeature: boolean;
onShowFeatureModal: () => void;
diff --git a/frontend/src/react/pages/settings/DatabasesPage.tsx b/frontend/src/react/pages/settings/DatabasesPage.tsx
index 3fe1c38eae..4e54c2ad20 100644
--- a/frontend/src/react/pages/settings/DatabasesPage.tsx
+++ b/frontend/src/react/pages/settings/DatabasesPage.tsx
@@ -33,7 +33,6 @@ import {
useEnvironmentV1Store,
useInstanceV1Store,
useProjectV1Store,
- useUIStateStore,
} from "@/store";
import {
environmentNamePrefix,
@@ -69,7 +68,6 @@ export function DatabasesPage() {
);
const actuatorStore = useActuatorV1Store();
const environmentStore = useEnvironmentV1Store();
- const uiStateStore = useUIStateStore();
const [syncing, setSyncing] = useState(false);
const [showCreateDrawer, setShowCreateDrawer] = useState(false);
@@ -307,13 +305,14 @@ export function DatabasesPage() {
// Mark database visit on mount
useEffect(() => {
- if (!uiStateStore.getIntroStateByKey("database.visit")) {
- uiStateStore.saveIntroStateByKey({
+ const store = useAppStore.getState();
+ if (!store.getIntroStateByKey("database.visit")) {
+ store.saveIntroStateByKey({
key: "database.visit",
newState: true,
});
}
- }, [uiStateStore]);
+ }, []);
// Backfill the project scope once the actuator's default project ID
// arrives. The initial `useState` initializer reads the actuator
diff --git a/frontend/src/react/pages/settings/EnvironmentsPage.tsx b/frontend/src/react/pages/settings/EnvironmentsPage.tsx
index b38b72a6b7..f5a52b90ba 100644
--- a/frontend/src/react/pages/settings/EnvironmentsPage.tsx
+++ b/frontend/src/react/pages/settings/EnvironmentsPage.tsx
@@ -61,6 +61,8 @@ import { useVueState } from "@/react/hooks/useVueState";
import { displayRoleTitleFromList } from "@/react/lib/role";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
+import { getEmptyRolloutPolicy } from "@/react/stores/app/policy";
+import { useSQLReviewStore } from "@/react/stores/sqlReview";
import { router } from "@/router";
import {
WORKSPACE_ROUTE_SQL_REVIEW_CREATE,
@@ -72,15 +74,9 @@ import {
useDatabaseV1Store,
useEnvironmentV1Store,
useInstanceV1Store,
- useSQLReviewStore,
useSubscriptionV1Store,
- useUIStateStore,
} from "@/store";
import { environmentNamePrefix } from "@/store/modules/v1/common";
-import {
- getEmptyRolloutPolicy,
- usePolicyV1Store,
-} from "@/store/modules/v1/policy";
import {
formatEnvironmentName,
isValidEnvironmentName,
@@ -475,9 +471,10 @@ function SQLReviewSectionInner(
// Fetch the full review policy list and the current resource's policy on mount
useEffect(() => {
- reviewStore.fetchReviewPolicyList();
- reviewStore.getOrFetchReviewPolicyByResource(resourcePath, true);
- }, [resourcePath, reviewStore]);
+ const store = useSQLReviewStore.getState();
+ store.fetchReviewPolicyList();
+ store.getOrFetchReviewPolicyByResource(resourcePath, true);
+ }, [resourcePath]);
const isDirty =
enforce !== (currentPolicy?.enforce ?? false) ||
@@ -488,9 +485,10 @@ function SQLReviewSectionInner(
}, [isDirty, onDirtyChange]);
const saveSQLReview = useCallback(async () => {
+ const store = useSQLReviewStore.getState();
if (!isEqual(currentPolicy, pendingPolicy)) {
if (currentPolicy) {
- await reviewStore.upsertReviewConfigTag({
+ await store.upsertReviewConfigTag({
oldResources: [...currentPolicy.resources],
newResources: currentPolicy.resources.filter(
(r) => r !== resourcePath
@@ -499,7 +497,7 @@ function SQLReviewSectionInner(
});
}
if (pendingPolicy) {
- await reviewStore.upsertReviewConfigTag({
+ await store.upsertReviewConfigTag({
oldResources: [...pendingPolicy.resources],
newResources: [...pendingPolicy.resources, resourcePath],
review: pendingPolicy.id,
@@ -507,12 +505,12 @@ function SQLReviewSectionInner(
}
}
if (pendingPolicy && pendingPolicy.enforce !== enforce) {
- await reviewStore.upsertReviewPolicy({
+ await store.upsertReviewPolicy({
id: pendingPolicy.id,
enforce,
});
}
- }, [currentPolicy, pendingPolicy, enforce, resourcePath, reviewStore]);
+ }, [currentPolicy, pendingPolicy, enforce, resourcePath]);
const revertSQLReview = useCallback(() => {
setPendingPolicy(currentPolicy);
@@ -650,7 +648,6 @@ function EnvironmentDetail({
}) {
const { t } = useTranslation();
const environmentStore = useEnvironmentV1Store();
- const policyStore = usePolicyV1Store();
const subscriptionStore = useSubscriptionV1Store();
const refreshEnvironmentList = useAppStore(
(state) => state.refreshEnvironmentList
@@ -693,10 +690,12 @@ function EnvironmentDetail({
useEffect(() => {
const fetchPolicy = async () => {
const envName = formatEnvironmentName(environment.id);
- const policy = await policyStore.getOrFetchPolicyByParentAndType({
- parentPath: envName,
- policyType: PolicyType.ROLLOUT_POLICY,
- });
+ const policy = await useAppStore
+ .getState()
+ .getOrFetchPolicyByParentAndType({
+ parentPath: envName,
+ policyType: PolicyType.ROLLOUT_POLICY,
+ });
const result =
policy ??
create(PolicySchema, {
@@ -709,7 +708,7 @@ function EnvironmentDetail({
setOriginalRolloutPolicy(cloneDeep(result));
};
fetchPolicy();
- }, [environment.id, policyStore]);
+ }, [environment.id]);
// Check for related resources (instances/databases)
const instanceStore = useInstanceV1Store();
@@ -808,7 +807,7 @@ function EnvironmentDetail({
// Update rollout policy if changed
if (policyChanged && rolloutPolicy) {
- await policyStore.upsertPolicy({
+ await useAppStore.getState().upsertPolicy({
parentPath: formatEnvironmentName(environment.id),
policy: rolloutPolicy,
});
@@ -1443,8 +1442,6 @@ function ReorderSheetInner({
export function EnvironmentsPage() {
const { t } = useTranslation();
const environmentStore = useEnvironmentV1Store();
- const policyStore = usePolicyV1Store();
- const uiStateStore = useUIStateStore();
const refreshEnvironmentList = useAppStore(
(state) => state.refreshEnvironmentList
);
@@ -1468,13 +1465,14 @@ export function EnvironmentsPage() {
// Initialize selected tab and intro state
useEffect(() => {
- if (!uiStateStore.getIntroStateByKey("environment.visit")) {
- uiStateStore.saveIntroStateByKey({
+ const store = useAppStore.getState();
+ if (!store.getIntroStateByKey("environment.visit")) {
+ store.saveIntroStateByKey({
key: "environment.visit",
newState: true,
});
}
- }, [uiStateStore]);
+ }, []);
// Select from hash or default to first
useEffect(() => {
@@ -1544,7 +1542,7 @@ export function EnvironmentsPage() {
const isCustomized = !isEqual(rolloutPolicy, DEFAULT_POLICY);
if (isCustomized) {
- await policyStore.upsertPolicy({
+ await useAppStore.getState().upsertPolicy({
parentPath: `${environmentNamePrefix}${createdEnvironment.id}`,
policy: rolloutPolicy,
});
diff --git a/frontend/src/react/pages/settings/GlobalMaskingPage.tsx b/frontend/src/react/pages/settings/GlobalMaskingPage.tsx
index cf710cb4b8..782f26f2a6 100644
--- a/frontend/src/react/pages/settings/GlobalMaskingPage.tsx
+++ b/frontend/src/react/pages/settings/GlobalMaskingPage.tsx
@@ -35,10 +35,10 @@ import {
factorOperatorOverrideMap,
getClassificationLevelOptions,
} from "@/react/lib/sensitive-data/components-utils";
+import { useAppStore } from "@/react/stores/app";
import {
pushNotification,
useActuatorV1Store,
- usePolicyV1Store,
useSettingV1Store,
useSubscriptionV1Store,
} from "@/store";
@@ -358,7 +358,6 @@ function MaskingRuleConfig({
export function GlobalMaskingPage() {
const { t } = useTranslation();
- const policyStore = usePolicyV1Store();
const actuatorStore = useActuatorV1Store();
const settingStore = useSettingV1Store();
const subscriptionStore = useSubscriptionV1Store();
@@ -422,10 +421,12 @@ export function GlobalMaskingPage() {
useEffect(() => {
const load = async () => {
- const policy = await policyStore.getOrFetchPolicyByParentAndType({
- parentPath: actuatorStore.workspaceResourceName,
- policyType: PolicyType.MASKING_RULE,
- });
+ const policy = await useAppStore
+ .getState()
+ .getOrFetchPolicyByParentAndType({
+ parentPath: actuatorStore.workspaceResourceName,
+ policyType: PolicyType.MASKING_RULE,
+ });
if (policy) {
const rules =
policy.policy?.case === "maskingRulePolicy"
@@ -460,7 +461,7 @@ export function GlobalMaskingPage() {
}),
},
};
- await policyStore.upsertPolicy({
+ await useAppStore.getState().upsertPolicy({
parentPath: actuatorStore.workspaceResourceName,
policy: patch,
});
@@ -572,7 +573,8 @@ export function GlobalMaskingPage() {
disabled={processing}
onClick={() => {
setReorderRules(false);
- policyStore
+ useAppStore
+ .getState()
.getOrFetchPolicyByParentAndType({
parentPath: actuatorStore.workspaceResourceName,
policyType: PolicyType.MASKING_RULE,
diff --git a/frontend/src/react/pages/settings/InstancesPage.tsx b/frontend/src/react/pages/settings/InstancesPage.tsx
index 8a12854fcf..12c647475a 100644
--- a/frontend/src/react/pages/settings/InstancesPage.tsx
+++ b/frontend/src/react/pages/settings/InstancesPage.tsx
@@ -65,6 +65,7 @@ import {
} from "@/react/hooks/useSessionPageSize";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { INSTANCE_ROUTE_CREATE } from "@/router/dashboard/instance";
import {
@@ -74,7 +75,6 @@ import {
useEnvironmentV1Store,
useInstanceV1Store,
useSubscriptionV1Store,
- useUIStateStore,
} from "@/store";
import { environmentNamePrefix } from "@/store/modules/v1/common";
import type { InstanceFilter } from "@/store/modules/v1/instance";
@@ -675,15 +675,15 @@ export function InstancesPage() {
);
// Mark instance visit on mount
- const uiStateStore = useUIStateStore();
useEffect(() => {
- if (!uiStateStore.getIntroStateByKey("instance.visit")) {
- uiStateStore.saveIntroStateByKey({
+ const store = useAppStore.getState();
+ if (!store.getIntroStateByKey("instance.visit")) {
+ store.saveIntroStateByKey({
key: "instance.visit",
newState: true,
});
}
- }, [uiStateStore]);
+ }, []);
// Sync search state to URL
useEffect(() => {
diff --git a/frontend/src/react/pages/settings/ProjectsPage.tsx b/frontend/src/react/pages/settings/ProjectsPage.tsx
index 28297bde05..d7bb3796f9 100644
--- a/frontend/src/react/pages/settings/ProjectsPage.tsx
+++ b/frontend/src/react/pages/settings/ProjectsPage.tsx
@@ -33,14 +33,10 @@ import {
useSessionPageSize,
} from "@/react/hooks/useSessionPageSize";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_ISSUES } from "@/router/dashboard/projectV1";
-import {
- pushNotification,
- useAuthStore,
- useProjectV1Store,
- useUIStateStore,
-} from "@/store";
+import { pushNotification, useAuthStore, useProjectV1Store } from "@/store";
import { getProjectName } from "@/store/modules/v1/common";
import { State } from "@/types/proto-es/v1/common_pb";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
@@ -307,9 +303,9 @@ export function ProjectsPage() {
// Mark project visit on mount
useEffect(() => {
- const uiStateStore = useUIStateStore();
- if (!uiStateStore.getIntroStateByKey("project.visit")) {
- uiStateStore.saveIntroStateByKey({
+ const store = useAppStore.getState();
+ if (!store.getIntroStateByKey("project.visit")) {
+ store.saveIntroStateByKey({
key: "project.visit",
newState: true,
});
diff --git a/frontend/src/react/pages/settings/SQLReviewCreatePage.tsx b/frontend/src/react/pages/settings/SQLReviewCreatePage.tsx
index 5f26be6a65..a24e647f6c 100644
--- a/frontend/src/react/pages/settings/SQLReviewCreatePage.tsx
+++ b/frontend/src/react/pages/settings/SQLReviewCreatePage.tsx
@@ -1,13 +1,11 @@
import { useEffect, useState } from "react";
-import { useSQLReviewStore } from "@/store";
+import { useSQLReviewStore } from "@/react/stores/sqlReview";
import { ReviewCreation } from "../../components/sql-review/ReviewCreation";
export function SQLReviewCreatePage() {
- const sqlReviewStore = useSQLReviewStore();
-
useEffect(() => {
- sqlReviewStore.fetchReviewPolicyList();
- }, [sqlReviewStore]);
+ useSQLReviewStore.getState().fetchReviewPolicyList();
+ }, []);
const [selectedResources] = useState(() => {
const url = new URL(window.location.href);
diff --git a/frontend/src/react/pages/settings/SQLReviewDetailPage.tsx b/frontend/src/react/pages/settings/SQLReviewDetailPage.tsx
index aba0f810e9..50e9ddae0e 100644
--- a/frontend/src/react/pages/settings/SQLReviewDetailPage.tsx
+++ b/frontend/src/react/pages/settings/SQLReviewDetailPage.tsx
@@ -19,9 +19,10 @@ import {
import { Input } from "@/react/components/ui/input";
import { useVueState } from "@/react/hooks/useVueState";
import { rulesToTemplate } from "@/react/lib/sql-review/utils";
+import { useSQLReviewStore } from "@/react/stores/sqlReview";
import { router } from "@/router";
import { WORKSPACE_ROUTE_SQL_REVIEW } from "@/router/dashboard/workspaceRoutes";
-import { pushNotification, useSQLReviewStore } from "@/store";
+import { pushNotification } from "@/store";
import type { RuleTemplateV2 } from "@/types";
import {
convertRuleMapToPolicyRuleList,
@@ -57,8 +58,10 @@ export function SQLReviewDetailPage({
// Fetch policy
useEffect(() => {
- store.getOrFetchReviewPolicyByName(sqlReviewName, false);
- }, [store, sqlReviewName]);
+ useSQLReviewStore
+ .getState()
+ .getOrFetchReviewPolicyByName(sqlReviewName, false);
+ }, [sqlReviewName]);
const reviewPolicy = useVueState(
() =>
diff --git a/frontend/src/react/pages/settings/SQLReviewPage.tsx b/frontend/src/react/pages/settings/SQLReviewPage.tsx
index 142ce58dc1..3a3317b209 100644
--- a/frontend/src/react/pages/settings/SQLReviewPage.tsx
+++ b/frontend/src/react/pages/settings/SQLReviewPage.tsx
@@ -18,12 +18,13 @@ import {
} from "@/react/components/ui/table";
import { Tooltip } from "@/react/components/ui/tooltip";
import { useVueState } from "@/react/hooks/useVueState";
+import { useSQLReviewStore } from "@/react/stores/sqlReview";
import { router } from "@/router";
import {
WORKSPACE_ROUTE_SQL_REVIEW_CREATE,
WORKSPACE_ROUTE_SQL_REVIEW_DETAIL,
} from "@/router/dashboard/workspaceRoutes";
-import { pushNotification, useSQLReviewStore } from "@/store";
+import { pushNotification } from "@/store";
import type { SQLReviewPolicy } from "@/types";
import { hasWorkspacePermissionV2, sqlReviewPolicySlug } from "@/utils";
@@ -246,8 +247,8 @@ export function SQLReviewPage() {
const [searchText, setSearchText] = useState("");
useEffect(() => {
- sqlReviewStore.fetchReviewPolicyList();
- }, [sqlReviewStore]);
+ useSQLReviewStore.getState().fetchReviewPolicyList();
+ }, []);
const policyList = useVueState(() => [...sqlReviewStore.reviewPolicyList]);
diff --git a/frontend/src/react/pages/settings/general/SQLEditorSection.tsx b/frontend/src/react/pages/settings/general/SQLEditorSection.tsx
index 8e7d135e9a..3eb10f5d57 100644
--- a/frontend/src/react/pages/settings/general/SQLEditorSection.tsx
+++ b/frontend/src/react/pages/settings/general/SQLEditorSection.tsx
@@ -19,7 +19,8 @@ import {
useWorkspaceResourceName,
} from "@/react/hooks/useAppState";
import { useVueState } from "@/react/hooks/useVueState";
-import { DEFAULT_MAX_RESULT_SIZE_IN_MB, usePolicyV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { DEFAULT_MAX_RESULT_SIZE_IN_MB } from "@/store";
import { useSettingV1Store } from "@/store/modules/v1/setting";
import {
PolicyResourceType,
@@ -51,7 +52,6 @@ export const SQLEditorSection = forwardRef<
SQLEditorSectionProps
>(function SQLEditorSection({ title, onDirtyChange }, ref) {
const { t } = useTranslation();
- const policyV1Store = usePolicyV1Store();
const settingV1Store = useSettingV1Store();
const resource = useWorkspaceResourceName();
@@ -75,14 +75,14 @@ export const SQLEditorSection = forwardRef<
useEffect(() => {
if (!resource || fetchedRef.current) return;
fetchedRef.current = true;
- policyV1Store.getOrFetchPolicyByParentAndType({
+ useAppStore.getState().getOrFetchPolicyByParentAndType({
parentPath: resource,
policyType: PolicyType.DATA_QUERY,
});
- }, [resource, policyV1Store]);
+ }, [resource]);
- const policyPayload = useVueState(() =>
- policyV1Store.getQueryDataPolicyByParent(resource)
+ const policyPayload = useAppStore((s) =>
+ s.getQueryDataPolicyByParent(resource)
);
const workspaceProfile = useVueState(() => settingV1Store.workspaceProfile);
@@ -177,7 +177,7 @@ export const SQLEditorSection = forwardRef<
}
// Update policy (toggles + rows)
- await policyV1Store.upsertPolicy({
+ await useAppStore.getState().upsertPolicy({
parentPath: resource,
policy: {
type: PolicyType.DATA_QUERY,
@@ -194,14 +194,7 @@ export const SQLEditorSection = forwardRef<
},
},
});
- }, [
- state,
- resource,
- policyPayload,
- settingV1Store,
- policyV1Store,
- getInitialState,
- ]);
+ }, [state, resource, policyPayload, settingV1Store, getInitialState]);
useImperativeHandle(ref, () => ({ isDirty, revert, update }));
diff --git a/frontend/src/react/stores/app/databaseCatalog.ts b/frontend/src/react/stores/app/databaseCatalog.ts
new file mode 100644
index 0000000000..207597d9d4
--- /dev/null
+++ b/frontend/src/react/stores/app/databaseCatalog.ts
@@ -0,0 +1,158 @@
+import { create as createProto } from "@bufbuild/protobuf";
+import { createContextValues } from "@connectrpc/connect";
+import { databaseCatalogServiceClientConnect } from "@/connect";
+import { silentContextKey } from "@/connect/context-key";
+import { UNKNOWN_ID, UNKNOWN_INSTANCE_NAME } from "@/types";
+import {
+ ColumnCatalogSchema,
+ type DatabaseCatalog,
+ DatabaseCatalogSchema,
+ GetDatabaseCatalogRequestSchema,
+ TableCatalog_ColumnsSchema,
+ TableCatalogSchema,
+ UpdateDatabaseCatalogRequestSchema,
+} from "@/types/proto-es/v1/database_catalog_service_pb";
+import { extractDatabaseResourceName } from "@/utils";
+import type { AppSliceCreator, DatabaseCatalogSlice } from "./types";
+
+// Catalog resource name is `{database}/catalog`.
+export const catalogResourceName = (database: string): string =>
+ `${extractDatabaseResourceName(database).database}/catalog`;
+
+export const emptyDatabaseCatalog = (database: string): DatabaseCatalog =>
+ createProto(DatabaseCatalogSchema, {
+ name: catalogResourceName(database),
+ schemas: [],
+ });
+
+const isUnknownDatabase = (database: string): boolean =>
+ extractDatabaseResourceName(database).databaseName === String(UNKNOWN_ID);
+
+const UNKNOWN_DATABASE = `${UNKNOWN_INSTANCE_NAME}/databases/${UNKNOWN_ID}`;
+
+export const createDatabaseCatalogSlice: AppSliceCreator<
+ DatabaseCatalogSlice
+> = (set, get) => ({
+ catalogsByName: {},
+ catalogRequests: {},
+
+ getDatabaseCatalog: (database) => {
+ if (isUnknownDatabase(database)) {
+ return emptyDatabaseCatalog(UNKNOWN_DATABASE);
+ }
+ return (
+ get().catalogsByName[catalogResourceName(database)] ??
+ emptyDatabaseCatalog(database)
+ );
+ },
+
+ getOrFetchDatabaseCatalog: async ({
+ database,
+ skipCache = false,
+ silent = false,
+ }) => {
+ if (isUnknownDatabase(database)) {
+ return emptyDatabaseCatalog(UNKNOWN_DATABASE);
+ }
+ const key = catalogResourceName(database);
+ if (!skipCache) {
+ const cached = get().catalogsByName[key];
+ if (cached) return cached;
+ const pending = get().catalogRequests[key];
+ if (pending) return pending;
+ }
+ const request = databaseCatalogServiceClientConnect
+ .getDatabaseCatalog(
+ createProto(GetDatabaseCatalogRequestSchema, { name: key }),
+ { contextValues: createContextValues().set(silentContextKey, silent) }
+ )
+ .then((res) => {
+ set((state) => {
+ const { [key]: _, ...catalogRequests } = state.catalogRequests;
+ return {
+ catalogsByName: { ...state.catalogsByName, [res.name]: res },
+ catalogRequests,
+ };
+ });
+ return res;
+ })
+ .catch((err) => {
+ set((state) => {
+ const { [key]: _, ...catalogRequests } = state.catalogRequests;
+ return { catalogRequests };
+ });
+ throw err;
+ });
+ set((state) => ({
+ catalogRequests: { ...state.catalogRequests, [key]: request },
+ }));
+ return request;
+ },
+
+ updateDatabaseCatalog: async (catalog) => {
+ const database = extractDatabaseResourceName(catalog.name).database;
+ const validCatalog = createProto(DatabaseCatalogSchema, {
+ name: catalog.name,
+ schemas: [],
+ });
+ // Drop schemas that no longer exist in the database metadata, but keep
+ // them all if metadata can't be loaded (e.g. missing permission) —
+ // mirrors the legacy Pinia behavior.
+ let metadata;
+ try {
+ metadata = await get().getOrFetchDatabaseMetadata({ database });
+ } catch {
+ metadata = undefined;
+ }
+ for (const schema of catalog.schemas) {
+ if (!metadata || metadata.schemas.some((s) => s.name === schema.name)) {
+ validCatalog.schemas.push(schema);
+ }
+ }
+ const response =
+ await databaseCatalogServiceClientConnect.updateDatabaseCatalog(
+ createProto(UpdateDatabaseCatalogRequestSchema, {
+ catalog: validCatalog,
+ })
+ );
+ set((state) => ({
+ catalogsByName: { ...state.catalogsByName, [response.name]: response },
+ }));
+ return response;
+ },
+});
+
+export const getTableCatalog = (
+ catalog: DatabaseCatalog,
+ schema: string,
+ table: string
+) => {
+ const schemaCatalog = catalog.schemas.find((s) => s.name === schema);
+ return (
+ schemaCatalog?.tables.find((t) => t.name === table) ??
+ createProto(TableCatalogSchema, {
+ name: table,
+ kind: {
+ case: "columns",
+ value: createProto(TableCatalog_ColumnsSchema, {}),
+ },
+ })
+ );
+};
+
+export const getColumnCatalog = (
+ catalog: DatabaseCatalog,
+ schema: string,
+ table: string,
+ column: string
+) => {
+ const tableCatalog = getTableCatalog(catalog, schema, table);
+ const columns =
+ tableCatalog.kind?.case === "columns"
+ ? tableCatalog.kind.value.columns
+ : [];
+ return (
+ columns.find((c) => c.name === column) ??
+ createProto(ColumnCatalogSchema, { name: column })
+ );
+};
diff --git a/frontend/src/react/stores/app/index.ts b/frontend/src/react/stores/app/index.ts
index b472d69548..06eae60d81 100644
--- a/frontend/src/react/stores/app/index.ts
+++ b/frontend/src/react/stores/app/index.ts
@@ -3,6 +3,7 @@ import { createAccessGrantSlice } from "./accessGrant";
import { createAuthSlice } from "./auth";
import { createChangelogSlice } from "./changelog";
import { createDatabaseSlice } from "./database";
+import { createDatabaseCatalogSlice } from "./databaseCatalog";
import { createDBGroupSlice } from "./dbGroup";
import { createDBSchemaSlice } from "./dbSchema";
import { createGroupSlice } from "./group";
@@ -62,6 +63,7 @@ export const createAppStore = () =>
...createRolloutSlice(...args),
...createPlanSlice(...args),
...createIssueCommentSlice(...args),
+ ...createDatabaseCatalogSlice(...args),
...createReleaseSlice(...args),
...createRevisionSlice(...args),
...createChangelogSlice(...args),
diff --git a/frontend/src/react/stores/app/policy.ts b/frontend/src/react/stores/app/policy.ts
index 33a303455e..dfec3996a0 100644
--- a/frontend/src/react/stores/app/policy.ts
+++ b/frontend/src/react/stores/app/policy.ts
@@ -3,14 +3,37 @@ import { Code, ConnectError, createContextValues } from "@connectrpc/connect";
import { orgPolicyServiceClientConnect } from "@/connect";
import { silentContextKey } from "@/connect/context-key";
import {
+ DeletePolicyRequestSchema,
GetPolicyRequestSchema,
+ type Policy,
+ PolicyResourceType,
PolicySchema,
PolicyType,
type QueryDataPolicy,
QueryDataPolicySchema,
+ RolloutPolicySchema,
+ UpdatePolicyRequestSchema,
} from "@/types/proto-es/v1/org_policy_service_pb";
import type { AppSliceCreator, PolicySlice } from "./types";
+// Mirror of the Pinia `getUpdateMaskFromPolicyType`.
+const getUpdateMaskFromPolicyType = (policyType: PolicyType): string[] => {
+ switch (policyType) {
+ case PolicyType.ROLLOUT_POLICY:
+ return [PolicySchema.field.rolloutPolicy.name];
+ case PolicyType.MASKING_EXEMPTION:
+ return [PolicySchema.field.maskingExemptionPolicy.name];
+ case PolicyType.MASKING_RULE:
+ return [PolicySchema.field.maskingRulePolicy.name];
+ case PolicyType.DATA_QUERY:
+ return [PolicySchema.field.queryDataPolicy.name];
+ case PolicyType.TAG:
+ return [PolicySchema.field.tagPolicy.name];
+ default:
+ throw new Error(`unexpected policy type ${policyType}`);
+ }
+};
+
// Inlined to keep the app store's load graph free of `@/store/modules/v1/common`.
const POLICY_NAME_PREFIX = "policies/";
@@ -33,6 +56,23 @@ const EMPTY_QUERY_DATA_POLICY: QueryDataPolicy = createProto(
{ maximumResultRows: -1 }
);
+// Pure helper relocated from the legacy Pinia policy module.
+export const getEmptyRolloutPolicy = (
+ parentPath: string,
+ resourceType: PolicyResourceType
+): Policy =>
+ createProto(PolicySchema, {
+ name: policyResourceName(parentPath, PolicyType.ROLLOUT_POLICY),
+ inheritFromParent: false,
+ type: PolicyType.ROLLOUT_POLICY,
+ resourceType,
+ enforce: true,
+ policy: {
+ case: "rolloutPolicy",
+ value: createProto(RolloutPolicySchema, { automatic: false, roles: [] }),
+ },
+ });
+
const policyResourceName = (parent: string, policyType: PolicyType) =>
replacePolicyTypeNameToLowerCase(
`${parent}/${POLICY_NAME_PREFIX}${PolicyType[policyType]}`
@@ -117,4 +157,41 @@ export const createPolicySlice: AppSliceCreator<PolicySlice> = (set, get) => ({
? policy.policy.value
: EMPTY_QUERY_DATA_POLICY;
},
+
+ upsertPolicy: async ({ parentPath, policy }) => {
+ if (!policy.type) {
+ throw new Error("policy type is required");
+ }
+ const name = policyResourceName(parentPath, policy.type);
+ const response = await orgPolicyServiceClientConnect.updatePolicy(
+ createProto(UpdatePolicyRequestSchema, {
+ policy: createProto(PolicySchema, {
+ name,
+ inheritFromParent: policy.inheritFromParent ?? false,
+ type: policy.type,
+ resourceType:
+ policy.resourceType ?? PolicyResourceType.RESOURCE_TYPE_UNSPECIFIED,
+ enforce: policy.enforce ?? false,
+ policy: policy.policy,
+ }),
+ updateMask: { paths: getUpdateMaskFromPolicyType(policy.type) },
+ allowMissing: true,
+ })
+ );
+ set((state) => ({
+ policyMapByName: { ...state.policyMapByName, [response.name]: response },
+ }));
+ return response;
+ },
+
+ deletePolicy: async (name) => {
+ await orgPolicyServiceClientConnect.deletePolicy(
+ createProto(DeletePolicyRequestSchema, { name })
+ );
+ const key = replacePolicyTypeNameToLowerCase(name);
+ set((state) => {
+ const { [key]: _removed, ...policyMapByName } = state.policyMapByName;
+ return { policyMapByName };
+ });
+ },
});
diff --git a/frontend/src/react/stores/app/preferences.ts b/frontend/src/react/stores/app/preferences.ts
index af1c6210c2..230551ffd5 100644
--- a/frontend/src/react/stores/app/preferences.ts
+++ b/frontend/src/react/stores/app/preferences.ts
@@ -25,9 +25,10 @@ const QUICKSTART_RESET_KEYS = [
];
export const createPreferencesSlice: AppSliceCreator<PreferencesSlice> = (
- _set,
+ set,
get
) => ({
+ introStateVersion: 0,
setRecentProject: (name) => {
const email = getCurrentUserEmail(get);
if (!email || !name) return;
@@ -76,9 +77,23 @@ export const createPreferencesSlice: AppSliceCreator<PreferencesSlice> = (
...Object.fromEntries(QUICKSTART_RESET_KEYS.map((key) => [key, false])),
};
writeJson(key, next);
+ set((state) => ({ introStateVersion: state.introStateVersion + 1 }));
emitReactQuickstartReset({ keys: QUICKSTART_RESET_KEYS });
},
+ // Mirrors the Pinia `useUIStateStore.getIntroStateByKey`. Reads the per-user
+ // localStorage map; `introStateVersion` (read by callers' selectors) is what
+ // makes a subsequent `saveIntroStateByKey` re-trigger the read.
+ getIntroStateByKey: (key) => {
+ const email = getCurrentUserEmail(get);
+ if (!email) return false;
+ const map = readJson<Record<string, boolean>>(
+ storageKeyIntroState(email),
+ {}
+ );
+ return map[key] ?? false;
+ },
+
// Mirrors the Pinia `useUIStateStore.saveIntroStateByKey`: persists a
// single intro flag (e.g. `data.query`) to the per-user localStorage map.
saveIntroStateByKey: ({ key, newState }) => {
@@ -87,5 +102,6 @@ export const createPreferencesSlice: AppSliceCreator<PreferencesSlice> = (
const storageKey = storageKeyIntroState(email);
const previous = readJson<Record<string, boolean>>(storageKey, {});
writeJson(storageKey, { ...previous, [key]: newState });
+ set((state) => ({ introStateVersion: state.introStateVersion + 1 }));
},
});
diff --git a/frontend/src/react/stores/app/sheet.ts b/frontend/src/react/stores/app/sheet.ts
index 395e7d2302..34a0b9742e 100644
--- a/frontend/src/react/stores/app/sheet.ts
+++ b/frontend/src/react/stores/app/sheet.ts
@@ -82,4 +82,12 @@ export const createSheetSlice: AppSliceCreator<SheetSlice> = (set, get) => ({
}));
return response;
},
+
+ // Synchronous cache read (undefined on miss) — mirrors the Pinia
+ // `getSheetByName`.
+ getSheetByName: (name) => get().sheetsByName[name],
+
+ // Cache-first fetch by name — `fetchSheet` already checks the cache and
+ // guards invalid names, so this is a thin alias matching the Pinia API.
+ getOrFetchSheetByName: (name) => get().fetchSheet(name),
});
diff --git a/frontend/src/react/stores/app/types.ts b/frontend/src/react/stores/app/types.ts
index 98e0de5c51..a3d18e0ca0 100644
--- a/frontend/src/react/stores/app/types.ts
+++ b/frontend/src/react/stores/app/types.ts
@@ -7,6 +7,7 @@ import type { NotificationCreate } from "@/types/notification";
import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";
import type { ActuatorInfo } from "@/types/proto-es/v1/actuator_service_pb";
import type { State } from "@/types/proto-es/v1/common_pb";
+import type { DatabaseCatalog } from "@/types/proto-es/v1/database_catalog_service_pb";
import type {
DatabaseGroup,
DatabaseGroupView,
@@ -366,6 +367,8 @@ export type SheetSlice = {
sheetErrorsByName: Record<string, Error | undefined>;
fetchSheet: (name: string, raw?: boolean) => Promise<Sheet | undefined>;
createSheet: (parent: string, sheet: Sheet) => Promise<Sheet>;
+ getSheetByName: (name: string) => Sheet | undefined;
+ getOrFetchSheetByName: (name: string) => Promise<Sheet | undefined>;
};
export type WorksheetView = "FULL" | "BASIC";
@@ -636,10 +639,14 @@ export type NotificationSlice = {
};
export type PreferencesSlice = {
+ // Bumped on every intro-state write so selectors reading `getIntroStateByKey`
+ // re-run (the flags live in localStorage, not Zustand state).
+ introStateVersion: number;
setRecentProject: (name: string) => void;
recordRecentVisit: (path: string) => void;
removeRecentVisit: (path: string) => void;
resetQuickstartProgress: () => void;
+ getIntroStateByKey: (key: string) => boolean;
saveIntroStateByKey: (params: { key: string; newState: boolean }) => void;
};
@@ -665,6 +672,11 @@ export type PolicySlice = {
refresh?: boolean;
}) => Promise<Policy | undefined>;
getQueryDataPolicyByParent: (parent: string) => QueryDataPolicy;
+ upsertPolicy: (params: {
+ parentPath: string;
+ policy: Partial<Policy>;
+ }) => Promise<Policy>;
+ deletePolicy: (name: string) => Promise<void>;
};
// Stateless issue service slice (mirrors the legacy Pinia `useIssueV1Store`):
@@ -766,6 +778,18 @@ export type DBSchemaSlice = {
) => Promise<DatabaseMetadata>;
};
+export type DatabaseCatalogSlice = {
+ catalogsByName: Record<string, DatabaseCatalog>;
+ catalogRequests: Record<string, Promise<DatabaseCatalog>>;
+ getDatabaseCatalog: (database: string) => DatabaseCatalog;
+ getOrFetchDatabaseCatalog: (params: {
+ database: string;
+ skipCache?: boolean;
+ silent?: boolean;
+ }) => Promise<DatabaseCatalog>;
+ updateDatabaseCatalog: (catalog: DatabaseCatalog) => Promise<DatabaseCatalog>;
+};
+
export type IssueCommentSlice = {
// Cache keyed by issue resource name → its comment list.
issueCommentsByIssue: Record<string, IssueComment[]>;
@@ -844,6 +868,7 @@ export type AppStoreState = AuthSlice &
DBSchemaSlice &
RolloutSlice &
PlanSlice &
- IssueCommentSlice;
+ IssueCommentSlice &
+ DatabaseCatalogSlice;
export type AppSliceCreator<Slice> = StateCreator<AppStoreState, [], [], Slice>;
diff --git a/frontend/src/react/stores/sqlReview.ts b/frontend/src/react/stores/sqlReview.ts
new file mode 100644
index 0000000000..c69cd4e3b4
--- /dev/null
+++ b/frontend/src/react/stores/sqlReview.ts
@@ -0,0 +1,264 @@
+import { create as createProto } from "@bufbuild/protobuf";
+import { createContextValues } from "@connectrpc/connect";
+import { pullAt, uniq } from "lodash-es";
+import { create } from "zustand";
+import { reviewConfigServiceClientConnect } from "@/connect";
+import { silentContextKey } from "@/connect/context-key";
+import { useAppStore } from "@/react/stores/app";
+import type { SchemaPolicyRule, SQLReviewPolicy } from "@/types";
+import {
+ PolicyType,
+ TagPolicySchema,
+} from "@/types/proto-es/v1/org_policy_service_pb";
+import type { ReviewConfig } from "@/types/proto-es/v1/review_config_service_pb";
+import {
+ DeleteReviewConfigRequestSchema,
+ GetReviewConfigRequestSchema,
+ ListReviewConfigsRequestSchema,
+ ReviewConfigSchema,
+ UpdateReviewConfigRequestSchema,
+} from "@/types/proto-es/v1/review_config_service_pb";
+
+const reviewConfigTagName = "bb.tag.review_config";
+
+// `${resourcePath}/policies/tag` — PolicyType[TAG] lowercased.
+const getTagPolicyName = (resourcePath: string): string =>
+ `${resourcePath}/policies/${PolicyType[PolicyType.TAG].toLowerCase()}`;
+
+const upsertReviewConfigTag = async (
+ resources: string[],
+ configName: string
+) => {
+ await Promise.all(
+ resources.map((resourcePath) =>
+ useAppStore.getState().upsertPolicy({
+ parentPath: resourcePath,
+ policy: {
+ type: PolicyType.TAG,
+ policy: {
+ case: "tagPolicy",
+ value: createProto(TagPolicySchema, {
+ tags: { [reviewConfigTagName]: configName },
+ }),
+ },
+ },
+ })
+ )
+ );
+};
+
+const removeReviewConfigTag = async (resources: string[]) => {
+ await Promise.all(
+ resources.map((resource) =>
+ useAppStore.getState().deletePolicy(getTagPolicyName(resource))
+ )
+ );
+};
+
+const convertToSQLReviewPolicy = (
+ reviewConfig: ReviewConfig
+): SQLReviewPolicy => ({
+ id: reviewConfig.name,
+ name: reviewConfig.title,
+ resources: reviewConfig.resources,
+ ruleList: reviewConfig.rules,
+ enforce: reviewConfig.enabled,
+});
+
+export type SQLReviewState = {
+ reviewPolicyList: SQLReviewPolicy[];
+ setReviewPolicy: (reviewPolicy: SQLReviewPolicy) => void;
+ removeResourceForReview: (map: Map<string, string[]>) => void;
+ upsertReviewConfigTag: (params: {
+ oldResources: string[];
+ newResources: string[];
+ review: string;
+ }) => Promise<void>;
+ removeReviewPolicy: (id: string) => Promise<void>;
+ upsertReviewPolicy: (params: {
+ id: string;
+ title?: string;
+ enforce?: boolean;
+ ruleList?: SchemaPolicyRule[];
+ resources?: string[];
+ }) => Promise<SQLReviewPolicy>;
+ getReviewPolicyByName: (name: string) => SQLReviewPolicy | undefined;
+ getReviewPolicyByResouce: (
+ resourcePath: string
+ ) => SQLReviewPolicy | undefined;
+ fetchReviewPolicyList: () => Promise<SQLReviewPolicy[]>;
+ fetchReviewPolicyByName: (params: {
+ name: string;
+ silent?: boolean;
+ }) => Promise<SQLReviewPolicy | undefined>;
+ getOrFetchReviewPolicyByName: (
+ name: string,
+ silent: boolean
+ ) => Promise<SQLReviewPolicy | undefined>;
+ getOrFetchReviewPolicyByResource: (
+ resourcePath: string,
+ silent: boolean
+ ) => Promise<SQLReviewPolicy | undefined>;
+};
+
+// Standalone Zustand port of the legacy Pinia `useSQLReviewStore`. Tag-policy
+// reads/writes go through the app store's policy slice (no Pinia dependency).
+// The Vue composables (useSQLReviewPolicyList etc.) had no consumers and are
+// dropped.
+export const useSQLReviewStore = create<SQLReviewState>()((set, get) => ({
+ reviewPolicyList: [],
+
+ setReviewPolicy: (reviewPolicy) => {
+ set((state) => {
+ const index = state.reviewPolicyList.findIndex(
+ (r) => r.id === reviewPolicy.id
+ );
+ if (index < 0) {
+ return { reviewPolicyList: [...state.reviewPolicyList, reviewPolicy] };
+ }
+ const reviewPolicyList = [...state.reviewPolicyList];
+ reviewPolicyList[index] = {
+ ...reviewPolicyList[index],
+ ...reviewPolicy,
+ };
+ return { reviewPolicyList };
+ });
+ },
+
+ removeResourceForReview: (map) => {
+ set((state) => ({
+ reviewPolicyList: state.reviewPolicyList.map((reviewPolicy) => {
+ const toRemove = map.get(reviewPolicy.id);
+ if (!toRemove) {
+ return reviewPolicy;
+ }
+ return {
+ ...reviewPolicy,
+ resources: reviewPolicy.resources.filter(
+ (resource) => !toRemove.includes(resource)
+ ),
+ };
+ }),
+ }));
+ },
+
+ upsertReviewConfigTag: async ({ oldResources, newResources, review }) => {
+ await removeReviewConfigTag(uniq(oldResources));
+ await upsertReviewConfigTag(uniq(newResources), review);
+ set((state) => ({
+ reviewPolicyList: state.reviewPolicyList.map((r) =>
+ r.id === review ? { ...r, resources: newResources } : r
+ ),
+ }));
+ },
+
+ removeReviewPolicy: async (id) => {
+ const index = get().reviewPolicyList.findIndex((g) => g.id === id);
+ if (index < 0) {
+ return;
+ }
+ await reviewConfigServiceClientConnect.deleteReviewConfig(
+ createProto(DeleteReviewConfigRequestSchema, { name: id })
+ );
+ set((state) => {
+ const reviewPolicyList = [...state.reviewPolicyList];
+ pullAt(reviewPolicyList, index);
+ return { reviewPolicyList };
+ });
+ },
+
+ upsertReviewPolicy: async ({ id, title, enforce, ruleList, resources }) => {
+ const patch = createProto(ReviewConfigSchema, { name: id });
+ const updateMask: string[] = [];
+ if (enforce !== undefined) {
+ updateMask.push("enabled");
+ patch.enabled = enforce;
+ }
+ if (title) {
+ updateMask.push("title");
+ patch.title = title;
+ }
+ if (ruleList) {
+ updateMask.push("rules");
+ patch.rules = ruleList;
+ }
+
+ const updated = await reviewConfigServiceClientConnect.updateReviewConfig(
+ createProto(UpdateReviewConfigRequestSchema, {
+ reviewConfig: patch,
+ updateMask: { paths: updateMask },
+ allowMissing: true,
+ })
+ );
+
+ if (resources) {
+ await get().upsertReviewConfigTag({
+ oldResources: [],
+ newResources: resources,
+ review: updated.name,
+ });
+ updated.resources = resources;
+ }
+
+ const reviewPolicy = convertToSQLReviewPolicy(updated);
+ get().setReviewPolicy(reviewPolicy);
+ return reviewPolicy;
+ },
+
+ getReviewPolicyByName: (name) =>
+ get().reviewPolicyList.find((g) => g.id === name),
+
+ getReviewPolicyByResouce: (resourcePath) =>
+ get().reviewPolicyList.find((policy) =>
+ policy.resources.find((resource) => resource === resourcePath)
+ ),
+
+ fetchReviewPolicyList: async () => {
+ const { reviewConfigs } =
+ await reviewConfigServiceClientConnect.listReviewConfigs(
+ createProto(ListReviewConfigsRequestSchema, {})
+ );
+ const reviewPolicyList = reviewConfigs.map(convertToSQLReviewPolicy);
+ set({ reviewPolicyList });
+ return reviewPolicyList;
+ },
+
+ fetchReviewPolicyByName: async ({ name, silent = false }) => {
+ const reviewConfig = await reviewConfigServiceClientConnect.getReviewConfig(
+ createProto(GetReviewConfigRequestSchema, { name }),
+ { contextValues: createContextValues().set(silentContextKey, silent) }
+ );
+ if (!reviewConfig) {
+ return undefined;
+ }
+ const reviewPolicy = convertToSQLReviewPolicy(reviewConfig);
+ get().setReviewPolicy(reviewPolicy);
+ return reviewPolicy;
+ },
+
+ getOrFetchReviewPolicyByName: async (name, silent) => {
+ const policy = get().getReviewPolicyByName(name);
+ if (policy) {
+ return policy;
+ }
+ return get().fetchReviewPolicyByName({ name, silent });
+ },
+
+ getOrFetchReviewPolicyByResource: async (resourcePath, silent) => {
+ const cached = get().getReviewPolicyByResouce(resourcePath);
+ if (cached) {
+ return cached;
+ }
+ const policy = await useAppStore
+ .getState()
+ .getOrFetchPolicyByName(getTagPolicyName(resourcePath));
+ const sqlReviewName =
+ policy?.policy?.case === "tagPolicy"
+ ? policy.policy.value.tags[reviewConfigTagName]
+ : undefined;
+ if (!sqlReviewName) {
+ return undefined;
+ }
+ return get().getOrFetchReviewPolicyByName(sqlReviewName, silent);
+ },
+}));
diff --git a/frontend/src/react/stores/workspaceApprovalSetting.ts b/frontend/src/react/stores/workspaceApprovalSetting.ts
new file mode 100644
index 0000000000..baf5cd7ae2
--- /dev/null
+++ b/frontend/src/react/stores/workspaceApprovalSetting.ts
@@ -0,0 +1,136 @@
+import { create as createProto } from "@bufbuild/protobuf";
+import { v4 as uuidv4 } from "uuid";
+import { create } from "zustand";
+import { settingServiceClientConnect } from "@/connect";
+import { settingNamePrefix } from "@/react/lib/resourceName";
+import { useAppStore } from "@/react/stores/app";
+import type { LocalApprovalConfig, LocalApprovalRule } from "@/types";
+import {
+ Setting_SettingName,
+ SettingSchema,
+ SettingValueSchema,
+ UpdateSettingRequestSchema,
+ type WorkspaceApprovalSetting_Rule_Source,
+} from "@/types/proto-es/v1/setting_service_pb";
+import {
+ buildWorkspaceApprovalSetting,
+ resolveLocalApprovalConfig,
+} from "@/utils";
+
+// Standalone Zustand port of the legacy Pinia `useWorkspaceApprovalSettingStore`.
+// Keeps the same surface (a reactive `config` + rule mutators) so consumers
+// only swap the import path. Reads/writes the WORKSPACE_APPROVAL setting through
+// the app store (fetch) and the setting service (upsert), then syncs the app
+// store cache — no Pinia dependency.
+export type WorkspaceApprovalSettingState = {
+ config: LocalApprovalConfig;
+ fetchConfig: () => Promise<void>;
+ getRulesBySource: (
+ source: WorkspaceApprovalSetting_Rule_Source
+ ) => LocalApprovalRule[];
+ addRule: (rule: Omit<LocalApprovalRule, "uid">) => Promise<void>;
+ updateRule: (
+ uid: string,
+ updates: Partial<LocalApprovalRule>
+ ) => Promise<void>;
+ deleteRule: (uid: string) => Promise<void>;
+ reorderRules: (
+ source: WorkspaceApprovalSetting_Rule_Source,
+ fromIndex: number,
+ toIndex: number
+ ) => Promise<void>;
+};
+
+export const useWorkspaceApprovalSettingStore =
+ create<WorkspaceApprovalSettingState>()((set, get) => {
+ const persist = async (config: LocalApprovalConfig) => {
+ const approvalSetting = await buildWorkspaceApprovalSetting(config);
+ const response = await settingServiceClientConnect.updateSetting(
+ createProto(UpdateSettingRequestSchema, {
+ setting: createProto(SettingSchema, {
+ name: `${settingNamePrefix}${Setting_SettingName[Setting_SettingName.WORKSPACE_APPROVAL]}`,
+ value: createProto(SettingValueSchema, {
+ value: { case: "workspaceApproval", value: approvalSetting },
+ }),
+ }),
+ allowMissing: true,
+ })
+ );
+ // Keep the app-store setting cache in sync (mirrors the Pinia bridge).
+ useAppStore.getState().setSettingByName(response);
+ };
+
+ // Optimistically apply `nextConfig`, persist it, and roll back on failure.
+ const applyAndPersist = async (nextConfig: LocalApprovalConfig) => {
+ const backup = get().config;
+ set({ config: nextConfig });
+ try {
+ await persist(nextConfig);
+ } catch (err) {
+ set({ config: backup });
+ throw err;
+ }
+ };
+
+ return {
+ config: { rules: [] },
+
+ fetchConfig: async () => {
+ try {
+ const setting = await useAppStore
+ .getState()
+ .getOrFetchSettingByName(Setting_SettingName.WORKSPACE_APPROVAL);
+ if (setting?.value?.value?.case === "workspaceApproval") {
+ const config = await resolveLocalApprovalConfig(
+ setting.value.value.value
+ );
+ set({ config });
+ }
+ } catch (ex) {
+ console.error(ex);
+ }
+ },
+
+ getRulesBySource: (source) =>
+ get().config.rules.filter((rule) => rule.source === source),
+
+ addRule: async (rule) => {
+ const newRule: LocalApprovalRule = { ...rule, uid: uuidv4() };
+ await applyAndPersist({
+ ...get().config,
+ rules: [...get().config.rules, newRule],
+ });
+ },
+
+ updateRule: async (uid, updates) => {
+ await applyAndPersist({
+ ...get().config,
+ rules: get().config.rules.map((rule) =>
+ rule.uid === uid ? { ...rule, ...updates } : rule
+ ),
+ });
+ },
+
+ deleteRule: async (uid) => {
+ await applyAndPersist({
+ ...get().config,
+ rules: get().config.rules.filter((rule) => rule.uid !== uid),
+ });
+ },
+
+ reorderRules: async (source, fromIndex, toIndex) => {
+ const sourceRules = get().config.rules.filter(
+ (rule) => rule.source === source
+ );
+ const otherRules = get().config.rules.filter(
+ (rule) => rule.source !== source
+ );
+ const [moved] = sourceRules.splice(fromIndex, 1);
+ sourceRules.splice(toIndex, 0, moved);
+ await applyAndPersist({
+ ...get().config,
+ rules: [...otherRules, ...sourceRules],
+ });
+ },
+ };
+ });
diff --git a/frontend/src/store/modules/index.ts b/frontend/src/store/modules/index.ts
index b8979a3457..0845760070 100644
--- a/frontend/src/store/modules/index.ts
+++ b/frontend/src/store/modules/index.ts
@@ -2,11 +2,9 @@ export * from "./v1/auth";
export * from "./notification";
export * from "./router";
export * from "./uistate";
-export * from "./sqlReview";
export * from "./user";
export * from "./serviceAccount";
export * from "./workloadIdentity";
-export * from "./workspaceApprovalSetting";
export * from "./role";
export * from "./utils";
diff --git a/frontend/src/store/modules/sqlReview.ts b/frontend/src/store/modules/sqlReview.ts
deleted file mode 100644
index da4aae3eaa..0000000000
--- a/frontend/src/store/modules/sqlReview.ts
+++ /dev/null
@@ -1,363 +0,0 @@
-import { create } from "@bufbuild/protobuf";
-import { createContextValues } from "@connectrpc/connect";
-import { pullAt, uniq } from "lodash-es";
-import { defineStore } from "pinia";
-import { computed, unref, watchEffect } from "vue";
-import { reviewConfigServiceClientConnect } from "@/connect";
-import { silentContextKey } from "@/connect/context-key";
-import { policyNamePrefix } from "@/store/modules/v1/common";
-import type { MaybeRef, SchemaPolicyRule, SQLReviewPolicy } from "@/types";
-import type { Database } from "@/types/proto-es/v1/database_service_pb";
-import {
- PolicyType,
- TagPolicySchema,
-} from "@/types/proto-es/v1/org_policy_service_pb";
-import type { ReviewConfig } from "@/types/proto-es/v1/review_config_service_pb";
-import {
- DeleteReviewConfigRequestSchema,
- GetReviewConfigRequestSchema,
- ListReviewConfigsRequestSchema,
- ReviewConfigSchema,
- UpdateReviewConfigRequestSchema,
-} from "@/types/proto-es/v1/review_config_service_pb";
-import {
- replacePolicyTypeNameToLowerCase,
- usePolicyV1Store,
-} from "./v1/policy";
-
-const reviewConfigTagName = "bb.tag.review_config";
-
-const getTagPolicyName = (resourcePath: string): string => {
- return replacePolicyTypeNameToLowerCase(
- `${resourcePath}/${policyNamePrefix}${PolicyType[PolicyType.TAG]}`
- );
-};
-
-const upsertReviewConfigTag = async (
- resources: string[],
- configName: string
-) => {
- const policyStore = usePolicyV1Store();
- await Promise.all(
- resources.map(async (resourcePath) => {
- await policyStore.upsertPolicy({
- parentPath: resourcePath,
- policy: {
- name: getTagPolicyName(resourcePath),
- type: PolicyType.TAG,
- policy: {
- case: "tagPolicy",
- value: create(TagPolicySchema, {
- tags: {
- [reviewConfigTagName]: configName,
- },
- }),
- },
- },
- });
- })
- );
-};
-
-const removeReviewConfigTag = async (resources: string[]) => {
- const policyStore = usePolicyV1Store();
- await Promise.all(
- resources.map((resource) =>
- policyStore.deletePolicy(getTagPolicyName(resource))
- )
- );
-};
-
-const convertToSQLReviewPolicy = (
- reviewConfig: ReviewConfig
-): SQLReviewPolicy | undefined => {
- return {
- id: reviewConfig.name,
- name: reviewConfig.title,
- resources: reviewConfig.resources,
- ruleList: reviewConfig.rules, // Use proto rules directly
- enforce: reviewConfig.enabled,
- };
-};
-
-interface SQLReviewState {
- reviewPolicyList: SQLReviewPolicy[];
-}
-
-export const useSQLReviewStore = defineStore("sqlReview", {
- state: (): SQLReviewState => ({
- reviewPolicyList: [],
- }),
- actions: {
- setReviewPolicy(reviewPolicy: SQLReviewPolicy) {
- const index = this.reviewPolicyList.findIndex(
- (r) => r.id === reviewPolicy.id
- );
- if (index < 0) {
- this.reviewPolicyList.push(reviewPolicy);
- } else {
- this.reviewPolicyList = [
- ...this.reviewPolicyList.slice(0, index),
- {
- ...this.reviewPolicyList[index],
- ...reviewPolicy,
- },
- ...this.reviewPolicyList.slice(index + 1),
- ];
- }
- },
- removeResourceForReview(map: Map<string, string[]>) {
- for (const [configId, resources] of map.entries()) {
- const reviewPolicy = this.reviewPolicyList.find(
- (r) => r.id === configId
- );
- if (!reviewPolicy) {
- continue;
- }
- reviewPolicy.resources = reviewPolicy.resources.filter(
- (resource) => !resources.includes(resource)
- );
- }
- },
- async upsertReviewConfigTag({
- oldResources,
- newResources,
- review,
- }: {
- oldResources: string[];
- newResources: string[];
- review: string;
- }) {
- await removeReviewConfigTag(uniq(oldResources));
- await upsertReviewConfigTag(uniq(newResources), review);
-
- const reviewPolicy = this.reviewPolicyList.find((r) => r.id === review);
- if (reviewPolicy) {
- reviewPolicy.resources = newResources;
- }
- },
- async removeReviewPolicy(id: string) {
- const index = this.reviewPolicyList.findIndex((g) => g.id === id);
- if (index < 0) {
- return;
- }
-
- const targetPolicy = this.reviewPolicyList[index];
- const request = create(DeleteReviewConfigRequestSchema, {
- name: targetPolicy.id,
- });
- await reviewConfigServiceClientConnect.deleteReviewConfig(request);
-
- pullAt(this.reviewPolicyList, index);
- },
- async upsertReviewPolicy({
- id,
- title,
- enforce,
- ruleList,
- resources,
- }: {
- id: string;
- title?: string;
- enforce?: boolean;
- ruleList?: SchemaPolicyRule[];
- resources?: string[];
- }) {
- const patch: ReviewConfig = create(ReviewConfigSchema, {
- name: id,
- });
- const updateMask: string[] = [];
- if (enforce !== undefined) {
- updateMask.push("enabled");
- patch.enabled = enforce;
- }
- if (title) {
- updateMask.push("title");
- patch.title = title;
- }
- if (ruleList) {
- updateMask.push("rules");
- patch.rules = ruleList; // Use proto rules directly
- }
-
- const request = create(UpdateReviewConfigRequestSchema, {
- reviewConfig: patch,
- updateMask: { paths: updateMask },
- allowMissing: true,
- });
- const updated =
- await reviewConfigServiceClientConnect.updateReviewConfig(request);
-
- if (resources) {
- await this.upsertReviewConfigTag({
- oldResources: [],
- newResources: resources,
- review: updated.name,
- });
- updated.resources = resources;
- }
-
- const reviewPolicy = convertToSQLReviewPolicy(updated);
- if (!reviewPolicy) {
- throw new Error(`invalid review config ${JSON.stringify(updated)}`);
- }
- this.setReviewPolicy(reviewPolicy);
- return reviewPolicy;
- },
- getReviewPolicyByName(name: string) {
- return this.reviewPolicyList.find((g) => g.id === name);
- },
- getReviewPolicyByResouce(
- resourcePath: string
- ): SQLReviewPolicy | undefined {
- return this.reviewPolicyList.find((policy) => {
- return policy.resources.find((resource) => resource === resourcePath);
- });
- },
-
- async fetchReviewPolicyList(): Promise<SQLReviewPolicy[]> {
- const request = create(ListReviewConfigsRequestSchema, {});
- const { reviewConfigs } =
- await reviewConfigServiceClientConnect.listReviewConfigs(request);
-
- const reviewPolicyList: SQLReviewPolicy[] = [];
- for (const config of reviewConfigs) {
- const reviewPolicy = convertToSQLReviewPolicy(config);
- if (reviewPolicy) {
- reviewPolicyList.push(reviewPolicy);
- }
- }
- this.reviewPolicyList = reviewPolicyList;
- return reviewPolicyList;
- },
- async fetchReviewPolicyByName({
- name,
- silent = false,
- }: {
- name: string;
- silent?: boolean;
- }) {
- const request = create(GetReviewConfigRequestSchema, { name });
- const reviewConfig =
- await reviewConfigServiceClientConnect.getReviewConfig(request, {
- contextValues: createContextValues().set(silentContextKey, silent),
- });
- if (!reviewConfig) {
- return;
- }
- const reviewPolicy = convertToSQLReviewPolicy(reviewConfig);
- if (reviewPolicy) {
- this.setReviewPolicy(reviewPolicy);
- }
- return reviewPolicy;
- },
- async getOrFetchReviewPolicyByName(name: string, silent: boolean) {
- const policy = this.getReviewPolicyByName(name);
- if (policy) {
- return policy;
- }
-
- const reviewPolicy = await this.fetchReviewPolicyByName({
- name,
- silent,
- });
- return reviewPolicy;
- },
- async getOrFetchReviewPolicyByResource(
- resourcePath: string,
- silent: boolean
- ): Promise<SQLReviewPolicy | undefined> {
- const cached = this.getReviewPolicyByResouce(resourcePath);
- if (cached) {
- return cached;
- }
-
- const policyStore = usePolicyV1Store();
- const policy = await policyStore.getOrFetchPolicyByName(
- getTagPolicyName(resourcePath)
- );
-
- if (!policy) {
- return;
- }
- const sqlReviewName =
- policy.policy?.case === "tagPolicy"
- ? policy.policy.value.tags[reviewConfigTagName]
- : undefined;
- if (!sqlReviewName) {
- return;
- }
-
- return this.getOrFetchReviewPolicyByName(sqlReviewName, silent);
- },
- },
-});
-
-export const useSQLReviewPolicyList = () => {
- const store = useSQLReviewStore();
-
- watchEffect(() => {
- store.fetchReviewPolicyList();
- });
-
- return computed(() => store.reviewPolicyList);
-};
-
-export const useReviewPolicyByResource = (
- resourcePath: MaybeRef<string | undefined>
-) => {
- const store = useSQLReviewStore();
- watchEffect(() => {
- if (!unref(resourcePath)) return;
- store.getOrFetchReviewPolicyByResource(
- unref(resourcePath)!,
- true /* silent */
- );
- });
-
- return computed(() => {
- if (!unref(resourcePath)) return undefined;
- return store.getReviewPolicyByResouce(unref(resourcePath)!);
- });
-};
-
-export const useReviewPolicyForDatabase = (
- database: MaybeRef<Database | undefined>
-) => {
- const store = useSQLReviewStore();
-
- watchEffect(async () => {
- if (!unref(database)) return;
-
- const reviewForProject = await store.getOrFetchReviewPolicyByResource(
- unref(database)!.project,
- true /* silent */
- );
- if (reviewForProject) {
- return;
- }
-
- const { effectiveEnvironment } = unref(database)!;
- if (effectiveEnvironment) {
- await store.getOrFetchReviewPolicyByResource(
- effectiveEnvironment,
- true /* silent */
- );
- }
- });
-
- return computed(() => {
- if (!unref(database)) return undefined;
- const reviewForProject = store.getReviewPolicyByResouce(
- unref(database)!.project
- );
- if (reviewForProject && reviewForProject.enforce) {
- return reviewForProject;
- }
- const { effectiveEnvironment } = unref(database)!;
- if (effectiveEnvironment) {
- return store.getReviewPolicyByResouce(effectiveEnvironment);
- }
- return undefined;
- });
-};
diff --git a/frontend/src/store/modules/v1/databaseCatalog.ts b/frontend/src/store/modules/v1/databaseCatalog.ts
deleted file mode 100644
index 9fc4646e17..0000000000
--- a/frontend/src/store/modules/v1/databaseCatalog.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-import { create } from "@bufbuild/protobuf";
-import { createContextValues } from "@connectrpc/connect";
-import { defineStore } from "pinia";
-import { computed, unref, watchEffect } from "vue";
-import { databaseCatalogServiceClientConnect } from "@/connect";
-import { silentContextKey } from "@/connect/context-key";
-import { useCache } from "@/store/cache";
-import type { MaybeRef } from "@/types";
-import { UNKNOWN_ID, UNKNOWN_INSTANCE_NAME } from "@/types";
-import type { DatabaseCatalog } from "@/types/proto-es/v1/database_catalog_service_pb";
-import {
- ColumnCatalogSchema,
- DatabaseCatalogSchema,
- GetDatabaseCatalogRequestSchema,
- TableCatalog_ColumnsSchema,
- TableCatalogSchema,
- UpdateDatabaseCatalogRequestSchema,
-} from "@/types/proto-es/v1/database_catalog_service_pb";
-import {
- extractDatabaseResourceName,
- getDatabaseProject,
- hasProjectPermissionV2,
-} from "@/utils";
-import { useDatabaseV1Store } from "./database";
-import { useDBSchemaV1Store } from "./dbSchema";
-
-type DatabaseCatalogCacheKey = [string /* database catalog resource name */];
-
-const ensureDatabaseResourceName = (name: string) => {
- return extractDatabaseResourceName(name).database;
-};
-
-const ensureDatabaseCatalogResourceName = (name: string) => {
- const database = ensureDatabaseResourceName(name);
- return `${database}/catalog`;
-};
-
-export const useDatabaseCatalogV1Store = defineStore(
- "databaseCatalog_v1",
- () => {
- const cacheByName = useCache<DatabaseCatalogCacheKey, DatabaseCatalog>(
- "bb.database-catalog.by-name"
- );
- const dbSchemaStore = useDBSchemaV1Store();
-
- const getCache = (name: string): DatabaseCatalog | undefined => {
- const catalogResourceName = ensureDatabaseCatalogResourceName(name);
- return cacheByName.getEntity([catalogResourceName]);
- };
-
- const setCache = (catalog: DatabaseCatalog) => {
- cacheByName.setEntity([catalog.name], catalog);
- return catalog;
- };
-
- const getOrFetchDatabaseCatalog = async (params: {
- database: string;
- skipCache?: boolean;
- silent?: boolean;
- }) => {
- const { database, skipCache = false, silent = false } = params;
- const { databaseName } = extractDatabaseResourceName(database);
- if (
- databaseName === String(UNKNOWN_ID) ||
- databaseName === String(UNKNOWN_ID)
- ) {
- return create(DatabaseCatalogSchema, {
- name: ensureDatabaseCatalogResourceName(
- `${UNKNOWN_INSTANCE_NAME}/databases/${UNKNOWN_ID}`
- ),
- });
- }
-
- const catalogResourceName = ensureDatabaseCatalogResourceName(database);
-
- if (!skipCache) {
- const existed = getCache(database);
- if (existed) {
- return existed;
- }
- }
-
- const request = create(GetDatabaseCatalogRequestSchema, {
- name: catalogResourceName,
- });
- const promise = databaseCatalogServiceClientConnect
- .getDatabaseCatalog(request, {
- contextValues: createContextValues().set(silentContextKey, silent),
- })
- .then((res) => {
- return setCache(res);
- });
-
- return promise;
- };
-
- const updateDatabaseCatalog = async (catalog: DatabaseCatalog) => {
- const databaseName = ensureDatabaseResourceName(catalog.name);
- const validCatalog = create(DatabaseCatalogSchema, {
- name: catalog.name,
- schemas: [],
- });
- for (const schema of catalog.schemas) {
- try {
- const schemaMetadata = await dbSchemaStore.getOrFetchSchemaMetadata({
- database: databaseName,
- schema: schema.name,
- });
- if (!schemaMetadata || schemaMetadata.name !== schema.name) {
- continue;
- }
- validCatalog.schemas.push(schema);
- } catch {
- // fallback to add the schema catalog to avoid current user doesn't have the permission to get the metadata.
- validCatalog.schemas.push(schema);
- }
- }
- const request = create(UpdateDatabaseCatalogRequestSchema, {
- catalog: validCatalog,
- });
- const response =
- await databaseCatalogServiceClientConnect.updateDatabaseCatalog(
- request
- );
- setCache(response);
- return response;
- };
-
- const getDatabaseCatalog = (database: string) => {
- const { databaseName } = extractDatabaseResourceName(database);
- if (
- databaseName === String(UNKNOWN_ID) ||
- databaseName === String(UNKNOWN_ID)
- ) {
- return create(DatabaseCatalogSchema, {
- name: ensureDatabaseCatalogResourceName(
- `${UNKNOWN_INSTANCE_NAME}/databases/${UNKNOWN_ID}`
- ),
- });
- }
-
- const cached = getCache(database);
- if (!cached) {
- return create(DatabaseCatalogSchema, {
- name: ensureDatabaseCatalogResourceName(database),
- schemas: [],
- });
- }
- return cached;
- };
-
- const removeCache = (name: string) => {
- const catalogResourceName = ensureDatabaseCatalogResourceName(name);
- cacheByName.invalidateEntity([catalogResourceName]);
- };
-
- return {
- getOrFetchDatabaseCatalog,
- updateDatabaseCatalog,
- getDatabaseCatalog,
- removeCache,
- };
- }
-);
-
-export const getTableCatalog = (
- catalog: DatabaseCatalog,
- schema: string,
- table: string
-) => {
- const schemaCatalog = catalog.schemas.find((s) => s.name === schema);
- return (
- schemaCatalog?.tables.find((t) => t.name === table) ??
- create(TableCatalogSchema, {
- name: table,
- kind: {
- case: "columns",
- value: create(TableCatalog_ColumnsSchema, {}),
- },
- })
- );
-};
-
-export const getColumnCatalog = (
- catalog: DatabaseCatalog,
- schema: string,
- table: string,
- column: string
-) => {
- const tableCatalog = getTableCatalog(catalog, schema, table);
- const columns =
- tableCatalog.kind?.case === "columns"
- ? tableCatalog.kind.value.columns
- : [];
- return (
- columns.find((c) => c.name === column) ??
- create(ColumnCatalogSchema, {
- name: column,
- })
- );
-};
-
-export const useDatabaseCatalog = (
- database: MaybeRef<string>,
- skipCache: MaybeRef<boolean>
-) => {
- const store = useDatabaseCatalogV1Store();
- const databaseStore = useDatabaseV1Store();
-
- watchEffect(async () => {
- const { databaseName } = extractDatabaseResourceName(unref(database));
- if (
- databaseName === String(UNKNOWN_ID) ||
- databaseName === String(UNKNOWN_ID)
- ) {
- return;
- }
- const db = await databaseStore.getOrFetchDatabaseByName(unref(database));
- if (
- hasProjectPermissionV2(getDatabaseProject(db), "bb.databaseCatalogs.get")
- ) {
- await store.getOrFetchDatabaseCatalog({
- database: unref(database),
- skipCache: unref(skipCache),
- });
- }
- });
- return computed(() => store.getDatabaseCatalog(unref(database)));
-};
diff --git a/frontend/src/store/modules/v1/index.ts b/frontend/src/store/modules/v1/index.ts
index 75d7b24e82..9c0d860b25 100644
--- a/frontend/src/store/modules/v1/index.ts
+++ b/frontend/src/store/modules/v1/index.ts
@@ -2,7 +2,6 @@ export * from "./actuator";
export * from "./auth";
export * from "./common";
export * from "./database";
-export * from "./databaseCatalog";
export * from "./dbSchema";
export * from "./environment";
export * from "./group";
@@ -13,8 +12,5 @@ export * from "./policy";
export * from "./project";
export * from "./projectIamPolicy";
export * from "./setting";
-export * from "./sheet";
-export * from "./sql";
-export * from "./storage";
export * from "./subscription";
export * from "./workspace";
diff --git a/frontend/src/store/modules/v1/sheet.ts b/frontend/src/store/modules/v1/sheet.ts
deleted file mode 100644
index 363d26b287..0000000000
--- a/frontend/src/store/modules/v1/sheet.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { create } from "@bufbuild/protobuf";
-import { defineStore } from "pinia";
-import { computed, unref, watchEffect } from "vue";
-import { sheetServiceClientConnect } from "@/connect";
-import { useCache } from "@/store/cache";
-import type { MaybeRef } from "@/types";
-import { UNKNOWN_ID } from "@/types";
-import type { Sheet } from "@/types/proto-es/v1/sheet_service_pb";
-import {
- CreateSheetRequestSchema,
- GetSheetRequestSchema,
- SheetSchema,
-} from "@/types/proto-es/v1/sheet_service_pb";
-import { extractSheetUID, getSheetStatement } from "@/utils";
-
-export const useSheetV1Store = defineStore("sheet_v1", () => {
- const cacheByUID = useCache<[string], Sheet | undefined>("bb.sheet.by-uid");
-
- // Utilities
- const removeLocalSheet = (name: string) => {
- const uid = extractSheetUID(name);
- if (uid.startsWith("-")) {
- cacheByUID.invalidateEntity([uid]);
- }
- };
- const setCache = (sheet: Sheet) => {
- const uid = extractSheetUID(sheet.name);
- if (uid === String(UNKNOWN_ID)) return;
- cacheByUID.setEntity([uid], sheet);
- };
-
- // CRUD
- const createSheet = async (parent: string, sheet: Partial<Sheet>) => {
- const fullSheet = create(SheetSchema, {
- name: sheet.name || "",
- content: sheet.content || new Uint8Array(),
- contentSize: sheet.contentSize || BigInt(0),
- });
- const request = create(CreateSheetRequestSchema, {
- parent,
- sheet: fullSheet,
- });
- const response = await sheetServiceClientConnect.createSheet(request);
- setCache(response);
- if (sheet.name) {
- removeLocalSheet(sheet.name);
- }
- return response;
- };
-
- const getSheetByUID = (uid: string) => {
- return cacheByUID.getEntity([uid]);
- };
- const getSheetRequestByUID = (uid: string) => {
- return cacheByUID.getRequest([uid]);
- };
- const getSheetByName = (name: string) => {
- const uid = extractSheetUID(name);
- if (!uid || uid === String(UNKNOWN_ID)) {
- return undefined;
- }
- return getSheetByUID(uid);
- };
- const fetchSheetByName = async (name: string) => {
- const uid = extractSheetUID(name);
- if (uid.startsWith("-") || !uid) {
- return undefined;
- }
- try {
- console.debug("[fetchSheetByName]", name);
- const request = create(GetSheetRequestSchema, {
- name,
- raw: false,
- });
- const response = await sheetServiceClientConnect.getSheet(request);
- return response;
- } catch {
- return undefined;
- }
- };
- const getOrFetchSheetByName = async (name: string) => {
- const uid = extractSheetUID(name);
- if (uid.startsWith("-") || !uid) {
- return undefined;
- }
- const entity = getSheetByUID(uid);
- if (entity) {
- return entity;
- }
- const request = getSheetRequestByUID(uid);
- if (request) {
- return request;
- }
-
- const promise = fetchSheetByName(name);
- cacheByUID.setRequest([uid], promise);
- promise.then((sheet) => {
- if (!sheet) {
- // If the request failed
- // remove the request cache entry so we can retry when needed.
- cacheByUID.invalidateRequest([uid]);
- return;
- }
- });
- return promise;
- };
- const getOrFetchSheetByUID = async (uid: string) => {
- return getOrFetchSheetByName(`projects/-/sheets/${uid}`);
- };
-
- return {
- createSheet,
- getSheetByName,
- fetchSheetByName,
- getOrFetchSheetByName,
- getSheetByUID,
- getOrFetchSheetByUID,
- };
-});
-
-export const useSheetStatementByUID = (uid: MaybeRef<string>) => {
- const store = useSheetV1Store();
- watchEffect(async () => {
- await store.getOrFetchSheetByUID(unref(uid));
- });
-
- return computed(() => {
- const sheet = store.getSheetByUID(unref(uid));
- if (!sheet) return "";
- return getSheetStatement(sheet);
- });
-};
diff --git a/frontend/src/store/modules/v1/sql.ts b/frontend/src/store/modules/v1/sql.ts
deleted file mode 100644
index d3c27ce809..0000000000
--- a/frontend/src/store/modules/v1/sql.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Code, ConnectError, createContextValues } from "@connectrpc/connect";
-import { defineStore } from "pinia";
-import { sqlServiceClientConnect } from "@/connect";
-import {
- ignoredCodesContextKey,
- silentContextKey,
-} from "@/connect/context-key";
-import type { SQLResultSetV1 } from "@/types";
-import type {
- ExportRequest,
- QueryRequest,
-} from "@/types/proto-es/v1/sql_service_pb";
-import { extractGrpcErrorMessage } from "@/utils/connect";
-
-export const useSQLStore = defineStore("sql", () => {
- const query = async (
- params: QueryRequest,
- signal: AbortSignal
- ): Promise<SQLResultSetV1> => {
- try {
- const newResponse = await sqlServiceClientConnect.query(params, {
- // Skip global error handling since we will handle and display
- // errors manually.
- contextValues: createContextValues()
- .set(ignoredCodesContextKey, [Code.PermissionDenied])
- .set(silentContextKey, true),
- signal,
- });
- return {
- error: "",
- results: newResponse.results,
- };
- } catch (err) {
- return {
- error: extractGrpcErrorMessage(err),
- results: [],
- status: err instanceof ConnectError ? err.code : Code.Unknown,
- };
- }
- };
-
- const exportData = async (params: ExportRequest) => {
- const newResponse = await sqlServiceClientConnect.export(params, {
- // Won't jump to 403 page when permission denied.
- contextValues: createContextValues().set(ignoredCodesContextKey, [
- Code.PermissionDenied,
- ]),
- });
- return newResponse.content;
- };
-
- return {
- query,
- exportData,
- };
-});
diff --git a/frontend/src/store/modules/v1/storage.ts b/frontend/src/store/modules/v1/storage.ts
deleted file mode 100644
index 96ee9debcd..0000000000
--- a/frontend/src/store/modules/v1/storage.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { defineStore } from "pinia";
-import PouchDB from "pouchdb";
-import PouchDBFind from "pouchdb-find";
-
-PouchDB.plugin(PouchDBFind);
-
-// The simple storage store for saving key-value pairs.
-export const useStorageStore = defineStore("storageStore", () => {
- const db = new PouchDB<{
- _id: string;
- value: unknown;
- }>("bb.storage", {
- // Remove unused and old data automatically.
- auto_compaction: true,
- // Do not save and track old revisions, this is for saving storage usage.
- revs_limit: 1,
- });
-
- const put = async <T = unknown>(key: string, value: T) => {
- await db.put(
- {
- _id: key,
- value,
- },
- { force: true }
- );
- };
- const get = async <T = unknown>(key: string) => {
- try {
- const doc = await db.get(key);
- return doc.value as T;
- } catch {
- // Data not found or error occurred.
- return undefined;
- }
- };
- const remove = async (key: string) => {
- const doc = await db.get(key);
- if (doc) {
- await db.remove(doc);
- }
- };
-
- return {
- get,
- put,
- remove,
- };
-});
diff --git a/frontend/src/store/modules/workspaceApprovalSetting.ts b/frontend/src/store/modules/workspaceApprovalSetting.ts
deleted file mode 100644
index 98ebcfe0c4..0000000000
--- a/frontend/src/store/modules/workspaceApprovalSetting.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-import { create } from "@bufbuild/protobuf";
-import { cloneDeep } from "lodash-es";
-import { defineStore } from "pinia";
-import { v4 as uuidv4 } from "uuid";
-import { ref } from "vue";
-import type { LocalApprovalConfig, LocalApprovalRule } from "@/types";
-import type { Setting } from "@/types/proto-es/v1/setting_service_pb";
-import {
- Setting_SettingName,
- SettingValueSchema as SettingSettingValueSchema,
- WorkspaceApprovalSetting_Rule_Source,
-} from "@/types/proto-es/v1/setting_service_pb";
-import {
- buildWorkspaceApprovalSetting,
- resolveLocalApprovalConfig,
-} from "@/utils";
-import { useGracefulRequest } from "./utils";
-import { useSettingV1Store } from "./v1/setting";
-
-export const useWorkspaceApprovalSettingStore = defineStore(
- "workspaceApprovalSetting",
- () => {
- const settingStore = useSettingV1Store();
- const config = ref<LocalApprovalConfig>({
- rules: [],
- });
-
- const setConfigSetting = async (setting: Setting) => {
- if (setting.value?.value?.case === "workspaceApproval") {
- const _config = setting.value.value.value;
- config.value = await resolveLocalApprovalConfig(_config);
- }
- };
-
- const fetchConfig = async () => {
- try {
- const response = await settingStore.getOrFetchSettingByName(
- Setting_SettingName.WORKSPACE_APPROVAL
- );
- if (!response) {
- return;
- }
- await setConfigSetting(response);
- } catch (ex) {
- console.error(ex);
- }
- };
-
- const updateConfig = async () => {
- const approvalSetting = await buildWorkspaceApprovalSetting(config.value);
- await settingStore.upsertSetting({
- name: Setting_SettingName.WORKSPACE_APPROVAL,
- value: create(SettingSettingValueSchema, {
- value: {
- case: "workspaceApproval",
- value: approvalSetting,
- },
- }),
- });
- };
-
- const useBackupAndUpdateConfig = async (update: () => Promise<void>) => {
- const backup = cloneDeep(config.value);
- try {
- await useGracefulRequest(update);
- } catch (err) {
- config.value = backup;
- throw err;
- }
- };
-
- // Get rules for a specific source
- const getRulesBySource = (
- source: WorkspaceApprovalSetting_Rule_Source
- ): LocalApprovalRule[] => {
- return config.value.rules.filter((r) => r.source === source);
- };
-
- // Add a new rule
- const addRule = async (rule: Omit<LocalApprovalRule, "uid">) => {
- await useBackupAndUpdateConfig(async () => {
- const newRule: LocalApprovalRule = {
- ...rule,
- uid: uuidv4(),
- };
- config.value.rules.push(newRule);
- await updateConfig();
- });
- };
-
- // Update an existing rule
- const updateRule = async (
- uid: string,
- updates: Partial<LocalApprovalRule>
- ) => {
- await useBackupAndUpdateConfig(async () => {
- const index = config.value.rules.findIndex((r) => r.uid === uid);
- if (index >= 0) {
- config.value.rules[index] = {
- ...config.value.rules[index],
- ...updates,
- };
- await updateConfig();
- }
- });
- };
-
- // Delete a rule
- const deleteRule = async (uid: string) => {
- await useBackupAndUpdateConfig(async () => {
- const index = config.value.rules.findIndex((r) => r.uid === uid);
- if (index >= 0) {
- config.value.rules.splice(index, 1);
- await updateConfig();
- }
- });
- };
-
- // Reorder rules (for drag-and-drop within a source)
- const reorderRules = async (
- source: WorkspaceApprovalSetting_Rule_Source,
- fromIndex: number,
- toIndex: number
- ) => {
- await useBackupAndUpdateConfig(async () => {
- // Get all rules for this source
- const sourceRules = config.value.rules.filter(
- (r) => r.source === source
- );
- const otherRules = config.value.rules.filter(
- (r) => r.source !== source
- );
-
- // Reorder within source rules
- const [moved] = sourceRules.splice(fromIndex, 1);
- sourceRules.splice(toIndex, 0, moved);
-
- // Rebuild config with reordered rules
- config.value.rules = [...otherRules, ...sourceRules];
- await updateConfig();
- });
- };
-
- return {
- config,
- fetchConfig,
- getRulesBySource,
- addRule,
- updateRule,
- deleteRule,
- reorderRules,
- };
- }
-);