Skip to content

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

refactor(frontend): decouple database stores from Pinia (#20481)

boojack1bbccc70ac37
diff --git a/frontend/src/react/components/DatabaseResourceSelector.test.tsx b/frontend/src/react/components/DatabaseResourceSelector.test.tsx
index 8cc6edeeeb..0470d70af4 100644
--- a/frontend/src/react/components/DatabaseResourceSelector.test.tsx
+++ b/frontend/src/react/components/DatabaseResourceSelector.test.tsx
@@ -11,9 +11,6 @@ const mocks = vi.hoisted(() => ({
fetchDatabases: vi.fn(),
fetchInstanceList: vi.fn(),
getOrFetchDatabaseMetadata: vi.fn(),
- databaseStore: undefined as
- | { fetchDatabases: ReturnType<typeof vi.fn> }
- | undefined,
instanceStore: undefined as
| { fetchInstanceList: ReturnType<typeof vi.fn> }
| undefined,
@@ -35,10 +32,6 @@ const mocks = vi.hoisted(() => ({
}),
}));
-mocks.databaseStore = {
- fetchDatabases: mocks.fetchDatabases,
-};
-
vi.mock("react-i18next", () => ({
useTranslation: () => ({
t: (key: string, options?: { count?: number }) =>
@@ -56,7 +49,6 @@ vi.mock("@/plugins/i18n", () => ({
}));
vi.mock("@/store", () => ({
- useDatabaseV1Store: () => mocks.databaseStore,
useEnvironmentV1Store: () => mocks.environmentStore,
}));
@@ -93,21 +85,19 @@ vi.mock("@/react/components/AdvancedSearch", () => ({
),
}));
-vi.mock("@/react/stores/app", () => ({
- useAppStore: Object.assign(
- (selector: (state: unknown) => unknown) =>
- selector({
- getOrFetchDatabaseMetadata: mocks.getOrFetchDatabaseMetadata,
- fetchInstanceList: mocks.fetchInstanceList,
- }),
- {
- getState: () => ({
- getOrFetchDatabaseMetadata: mocks.getOrFetchDatabaseMetadata,
- fetchInstanceList: mocks.fetchInstanceList,
- }),
- }
- ),
-}));
+vi.mock("@/react/stores/app", () => {
+ const appState = () => ({
+ getOrFetchDatabaseMetadata: mocks.getOrFetchDatabaseMetadata,
+ fetchInstanceList: mocks.fetchInstanceList,
+ fetchDatabases: mocks.fetchDatabases,
+ });
+ return {
+ useAppStore: Object.assign(
+ (selector: (state: unknown) => unknown) => selector(appState()),
+ { getState: appState }
+ ),
+ };
+});
vi.mock("@/react/components/EnvironmentLabel", () => ({
EnvironmentLabel: ({ environmentName }: { environmentName: string }) => (
diff --git a/frontend/src/react/components/DatabaseResourceSelector.tsx b/frontend/src/react/components/DatabaseResourceSelector.tsx
index b20722027b..c6f314cb15 100644
--- a/frontend/src/react/components/DatabaseResourceSelector.tsx
+++ b/frontend/src/react/components/DatabaseResourceSelector.tsx
@@ -20,7 +20,7 @@ import { EnvironmentLabel } from "@/react/components/EnvironmentLabel";
import { Checkbox } from "@/react/components/ui/checkbox";
import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
-import { useDatabaseV1Store, useEnvironmentV1Store } from "@/store";
+import { useEnvironmentV1Store } from "@/store";
import type { DatabaseResource } from "@/types";
import { Engine } from "@/types/proto-es/v1/common_pb";
import type {
@@ -95,7 +95,6 @@ export function DatabaseResourceSelector({
includeColumns?: boolean;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const getOrFetchDatabaseMetadata = useAppStore(
(s) => s.getOrFetchDatabaseMetadata
);
@@ -233,7 +232,7 @@ export function DatabaseResourceSelector({
let allDatabases: Database[] = [];
let pageToken = "";
do {
- const result = await databaseStore.fetchDatabases({
+ const result = await useAppStore.getState().fetchDatabases({
parent: projectName,
pageSize: 1000,
pageToken,
@@ -248,7 +247,7 @@ export function DatabaseResourceSelector({
return () => {
cancelled = true;
};
- }, [projectName, databaseStore, databaseFilter]);
+ }, [projectName, databaseFilter]);
const selectedResourceMap = useMemo(() => {
const map = new Map<string, DatabaseSelection>();
diff --git a/frontend/src/react/components/DatabaseSelect.tsx b/frontend/src/react/components/DatabaseSelect.tsx
index c3038f79ac..2bf4d69280 100644
--- a/frontend/src/react/components/DatabaseSelect.tsx
+++ b/frontend/src/react/components/DatabaseSelect.tsx
@@ -3,7 +3,8 @@ import { useTranslation } from "react-i18next";
import { EngineIcon } from "@/react/components/EngineIcon";
import { EnvironmentLabel } from "@/react/components/EnvironmentLabel";
import { Combobox } from "@/react/components/ui/combobox";
-import { useActuatorV1Store, useDatabaseV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { useActuatorV1Store } from "@/store";
import type { Engine } from "@/types/proto-es/v1/common_pb";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import {
@@ -37,7 +38,6 @@ export function DatabaseSelect({
allowedEngineTypeList,
}: DatabaseSelectProps) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const actuatorStore = useActuatorV1Store();
const [databases, setDatabases] = useState<Database[]>([]);
@@ -59,7 +59,8 @@ export function DatabaseSelect({
const fetchDatabases = useCallback(
(query: string) => {
- databaseStore
+ useAppStore
+ .getState()
.fetchDatabases({
parent: projectName ?? actuatorStore.workspaceResourceName,
filter: {
@@ -72,7 +73,7 @@ export function DatabaseSelect({
})
.then((result) => setDatabases(result.databases));
},
- [databaseStore, projectName, environmentName, stableEngines, actuatorStore]
+ [projectName, environmentName, stableEngines, actuatorStore]
);
useEffect(() => {
diff --git a/frontend/src/react/components/InstanceAssignmentSheet.tsx b/frontend/src/react/components/InstanceAssignmentSheet.tsx
index b7de9065da..3586739854 100644
--- a/frontend/src/react/components/InstanceAssignmentSheet.tsx
+++ b/frontend/src/react/components/InstanceAssignmentSheet.tsx
@@ -22,7 +22,7 @@ import {
} from "@/react/hooks/useAppState";
import { PagedTableFooter } from "@/react/hooks/usePagedData";
import { useAppStore } from "@/react/stores/app";
-import { pushNotification, useDatabaseV1Store } from "@/store";
+import { pushNotification } from "@/store";
import { isValidInstanceName } from "@/types";
import type {
Instance,
@@ -48,7 +48,6 @@ export function InstanceAssignmentSheet({
onUpdated,
}: InstanceAssignmentSheetProps) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const refreshServerInfo = useAppStore((state) => state.refreshServerInfo);
const { instanceLicenseCount, currentPlan } = useSubscriptionState();
@@ -193,7 +192,7 @@ export function InstanceAssignmentSheet({
.getState()
.batchUpdateInstances(requests);
for (const instance of updated) {
- databaseStore.updateDatabaseInstance(instance);
+ useAppStore.getState().updateDatabaseInstance(instance);
}
await refreshServerInfo();
pushNotification({
@@ -208,7 +207,6 @@ export function InstanceAssignmentSheet({
}
}, [
canManageSubscription,
- databaseStore,
instances,
onOpenChange,
onUpdated,
diff --git a/frontend/src/react/components/MatchedDatabaseView.tsx b/frontend/src/react/components/MatchedDatabaseView.tsx
index f07ed38a0d..3bc40bdc3f 100644
--- a/frontend/src/react/components/MatchedDatabaseView.tsx
+++ b/frontend/src/react/components/MatchedDatabaseView.tsx
@@ -3,7 +3,6 @@ import { useTranslation } from "react-i18next";
import type { ConditionGroupExpr } from "@/plugins/cel";
import { validateSimpleExpr } from "@/plugins/cel";
import { useAppStore } from "@/react/stores/app";
-import { useDatabaseV1Store } from "@/store";
import { DEBOUNCE_SEARCH_DELAY, isValidDatabaseName } from "@/types";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import {
@@ -52,7 +51,6 @@ export function MatchedDatabaseView({
matchedNamesRef.current = matchedNames;
const pageSize = getDefaultPagination();
- const databaseStore = useDatabaseV1Store();
const toggleSection = useCallback((name: string) => {
setExpandedSections((prev) => {
@@ -75,9 +73,9 @@ export function MatchedDatabaseView({
setMatchedDbs((prev) => ({ ...prev, loading: true }));
try {
- await databaseStore.batchGetOrFetchDatabases(slice);
+ await useAppStore.getState().batchGetOrFetchDatabases(slice);
const newDbs = slice
- .map((n) => databaseStore.getDatabaseByName(n))
+ .map((n) => useAppStore.getState().getDatabaseByName(n))
.filter((db) => isValidDatabaseName(db.name));
setMatchedDbs({
databases: [...currentDbs, ...newDbs],
@@ -88,7 +86,7 @@ export function MatchedDatabaseView({
setMatchedDbs((prev) => ({ ...prev, loading: false }));
}
},
- [databaseStore, pageSize]
+ [pageSize]
);
const loadMoreUnmatched = useCallback(
@@ -99,8 +97,9 @@ export function MatchedDatabaseView({
let unmatched: Database[] = [];
let pageToken = token;
while (true) {
- const { databases, nextPageToken } =
- await databaseStore.fetchDatabases({
+ const { databases, nextPageToken } = await useAppStore
+ .getState()
+ .fetchDatabases({
pageToken,
pageSize,
parent: project,
@@ -122,7 +121,7 @@ export function MatchedDatabaseView({
setUnmatchedDbs((prev) => ({ ...prev, loading: false }));
}
},
- [databaseStore, pageSize, project]
+ [pageSize, project]
);
// Debounced expression validation and data loading
@@ -160,9 +159,9 @@ export function MatchedDatabaseView({
let newMatchedDbs: Database[] = [];
if (matchedSlice.length > 0) {
- await databaseStore.batchGetOrFetchDatabases(matchedSlice);
+ await useAppStore.getState().batchGetOrFetchDatabases(matchedSlice);
newMatchedDbs = matchedSlice
- .map((n) => databaseStore.getDatabaseByName(n))
+ .map((n) => useAppStore.getState().getDatabaseByName(n))
.filter((db) => isValidDatabaseName(db.name));
}
setMatchedDbs({ databases: newMatchedDbs, loading: false });
@@ -172,8 +171,9 @@ export function MatchedDatabaseView({
let unmatchedList: Database[] = [];
let pageToken = "";
while (true) {
- const { databases, nextPageToken } =
- await databaseStore.fetchDatabases({
+ const { databases, nextPageToken } = await useAppStore
+ .getState()
+ .fetchDatabases({
pageToken,
pageSize,
parent: project,
@@ -205,7 +205,7 @@ export function MatchedDatabaseView({
}
}, DEBOUNCE_SEARCH_DELAY);
return () => clearTimeout(timerRef.current);
- }, [expr, project, presetNames, databaseStore, pageSize]);
+ }, [expr, project, presetNames, pageSize]);
const hasMoreMatched = matchedToken < matchedNames.length;
const hasMoreUnmatched = !!unmatchedToken;
diff --git a/frontend/src/react/components/database/DatabaseTable.tsx b/frontend/src/react/components/database/DatabaseTable.tsx
index eb6cdd3293..10e085da41 100644
--- a/frontend/src/react/components/database/DatabaseTable.tsx
+++ b/frontend/src/react/components/database/DatabaseTable.tsx
@@ -6,8 +6,9 @@ import {
} from "@/react/hooks/useSessionPageSize";
import { useVueState } from "@/react/hooks/useVueState";
import type { DatabaseFilter } from "@/react/lib/databaseFilter";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
-import { useActuatorV1Store, useDatabaseV1Store } from "@/store";
+import { useActuatorV1Store } from "@/store";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import { autoDatabaseRoute } from "@/utils";
import {
@@ -53,7 +54,6 @@ export function DatabaseTable({
onDatabasesChange,
refreshToken,
}: DatabaseTableProps) {
- const databaseStore = useDatabaseV1Store();
const actuatorStore = useActuatorV1Store();
const [databases, setDatabases] = useState<Database[]>([]);
@@ -83,7 +83,7 @@ export function DatabaseTable({
try {
const token = isRefresh ? "" : nextPageTokenRef.current;
- const result = await databaseStore.fetchDatabases({
+ const result = await useAppStore.getState().fetchDatabases({
pageToken: token,
pageSize,
parent: parent || workspaceResourceName,
@@ -111,7 +111,7 @@ export function DatabaseTable({
}
}
},
- [pageSize, filter, orderBy, databaseStore, parent, workspaceResourceName]
+ [pageSize, filter, orderBy, parent, workspaceResourceName]
);
const isFirstLoad = useRef(true);
diff --git a/frontend/src/react/components/instance/InstanceFormBody.tsx b/frontend/src/react/components/instance/InstanceFormBody.tsx
index a138f28d50..8caf9ccdda 100644
--- a/frontend/src/react/components/instance/InstanceFormBody.tsx
+++ b/frontend/src/react/components/instance/InstanceFormBody.tsx
@@ -26,7 +26,6 @@ import { useAppStore } from "@/react/stores/app";
import {
pushNotification,
useActuatorV1Store,
- useDatabaseV1Store,
useSubscriptionV1Store,
} from "@/store";
import {
@@ -969,7 +968,7 @@ export function InstanceFormBody({ onOpenInfoPanel }: InstanceFormBodyProps) {
const updated = await useAppStore
.getState()
.updateInstance(instancePatch, ["activation"]);
- useDatabaseV1Store().updateDatabaseInstance(updated);
+ useAppStore.getState().updateDatabaseInstance(updated);
await actuatorStore.fetchServerInfo(
actuatorStore.workspaceResourceName
);
diff --git a/frontend/src/react/components/instance/InstanceFormButtons.tsx b/frontend/src/react/components/instance/InstanceFormButtons.tsx
index abe4a24839..32a8e3acb4 100644
--- a/frontend/src/react/components/instance/InstanceFormButtons.tsx
+++ b/frontend/src/react/components/instance/InstanceFormButtons.tsx
@@ -5,11 +5,7 @@ import { useTranslation } from "react-i18next";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
-import {
- pushNotification,
- useDatabaseV1Store,
- useSubscriptionV1Store,
-} from "@/store";
+import { pushNotification, useSubscriptionV1Store } from "@/store";
import { Engine } from "@/types/proto-es/v1/common_pb";
import type {
DataSource,
@@ -57,7 +53,6 @@ export function InstanceFormButtons({
className,
}: InstanceFormButtonsProps) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const subscriptionStore = useSubscriptionV1Store();
const context = useInstanceFormContext();
@@ -353,7 +348,7 @@ export function InstanceFormButtons({
const refreshInstanceDatabases = async (instanceName: string) => {
await useAppStore.getState().syncInstance(instanceName, true);
- databaseStore.removeCacheByInstance(instanceName);
+ useAppStore.getState().removeCacheByInstance(instanceName);
};
const maybeQueueUpdateDataSource = async (
diff --git a/frontend/src/react/components/instance/InstanceSyncButton.tsx b/frontend/src/react/components/instance/InstanceSyncButton.tsx
index 8e539351c4..a01450e41f 100644
--- a/frontend/src/react/components/instance/InstanceSyncButton.tsx
+++ b/frontend/src/react/components/instance/InstanceSyncButton.tsx
@@ -8,7 +8,8 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/react/components/ui/dropdown-menu";
-import { pushNotification, useDatabaseV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { pushNotification } from "@/store";
import { SyncStatus } from "@/types/proto-es/v1/database_service_pb";
import { hasWorkspacePermissionV2 } from "@/utils";
@@ -60,8 +61,7 @@ export function InstanceSyncButton({
let notificationShown = false;
const checkSyncStatus = async () => {
- const databaseStore = useDatabaseV1Store();
- const { databases } = await databaseStore.fetchDatabases({
+ const { databases } = await useAppStore.getState().fetchDatabases({
parent: instanceName,
pageSize: 1000,
silent: true,
diff --git a/frontend/src/react/components/sql-editor/ConnectionPane/ConnectionPane.test.tsx b/frontend/src/react/components/sql-editor/ConnectionPane/ConnectionPane.test.tsx
index 50d1674f87..e00d65acff 100644
--- a/frontend/src/react/components/sql-editor/ConnectionPane/ConnectionPane.test.tsx
+++ b/frontend/src/react/components/sql-editor/ConnectionPane/ConnectionPane.test.tsx
@@ -58,9 +58,6 @@ const mocks = vi.hoisted(() => {
state: "READY" as "LOADING" | "READY" | "UNSET",
nodeKeysByTarget: vi.fn(() => []),
};
- const instanceStore = {
- getInstanceByName: vi.fn(),
- };
const appStore = {
fetchInstance: vi.fn(async () => undefined),
fetchDBGroup: vi.fn(async () => undefined),
@@ -100,7 +97,6 @@ const mocks = vi.hoisted(() => {
databaseStore,
project,
treeStore,
- instanceStore,
appStore,
currentUser,
usePiniaBridge: vi.fn<(getter: () => unknown) => unknown>(),
@@ -129,8 +125,6 @@ vi.mock("@/react/hooks/useAppState", () => ({
vi.mock("@/store", () => ({
pushNotification: mocks.pushNotification,
- useDatabaseV1Store: () => mocks.databaseStore,
- useInstanceV1Store: () => mocks.instanceStore,
}));
vi.mock("@/react/hooks/useAppProject", () => ({
diff --git a/frontend/src/react/components/sql-editor/SchemaPane/SchemaPane.test.tsx b/frontend/src/react/components/sql-editor/SchemaPane/SchemaPane.test.tsx
index 02838bc74e..95c18ae938 100644
--- a/frontend/src/react/components/sql-editor/SchemaPane/SchemaPane.test.tsx
+++ b/frontend/src/react/components/sql-editor/SchemaPane/SchemaPane.test.tsx
@@ -40,14 +40,6 @@ vi.mock("@/react/i18n", () => ({
}));
vi.mock("@/store", () => ({
- useDBSchemaV1Store: () => ({
- getOrFetchDatabaseMetadata: mocks.getOrFetchDatabaseMetadata,
- // SchemaPane reads cached metadata reactively via this getter; return
- // null so the tree stays empty unless a test seeds the cache.
- getDatabaseMetadataWithoutDefault: () => null,
- syncDatabase: vi.fn(),
- getTableMetadata: vi.fn(),
- }),
pushNotification: vi.fn(),
}));
diff --git a/frontend/src/react/hooks/useAppDatabaseMetadata.ts b/frontend/src/react/hooks/useAppDatabaseMetadata.ts
index b8f15d9815..73946ec12d 100644
--- a/frontend/src/react/hooks/useAppDatabaseMetadata.ts
+++ b/frontend/src/react/hooks/useAppDatabaseMetadata.ts
@@ -18,9 +18,8 @@ interface UseAppDatabaseMetadataOptions {
/**
* Reactively reads a database's metadata from the Zustand app store,
- * self-fetching when the route hasn't preloaded it. Mirrors the legacy
- * Pinia `useDBSchemaV1Store.getDatabaseMetadata(...)` + `getOrFetchDatabaseMetadata(...)`
- * pair, but exposed as a single React hook with stable refs.
+ * self-fetching when the route hasn't preloaded it. Exposes the React
+ * DB schema slice as a single hook with stable refs.
*/
export const useAppDatabaseMetadata = (
database: string,
diff --git a/frontend/src/react/lib/plan/issue.ts b/frontend/src/react/lib/plan/issue.ts
index 5fdf08e2f5..a1bae1146d 100644
--- a/frontend/src/react/lib/plan/issue.ts
+++ b/frontend/src/react/lib/plan/issue.ts
@@ -1,7 +1,7 @@
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_PLAN_DETAIL_SPEC_DETAIL } from "@/router/dashboard/projectV1";
-import { useDatabaseV1Store, useProjectV1Store } from "@/store";
+import { useProjectV1Store } from "@/store";
import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";
import {
extractDatabaseGroupName,
@@ -13,7 +13,6 @@ import { applyPlanTitleToQuery } from "./title";
export const preCreateIssue = async (project: string, targets: string[]) => {
const type = "bb.plan.change-database";
- const databaseStore = useDatabaseV1Store();
const projectStore = useProjectV1Store();
const databaseNames: string[] = [];
@@ -22,7 +21,7 @@ export const preCreateIssue = async (project: string, targets: string[]) => {
const dbGroup = useAppStore.getState().getDBGroupByName(target);
databaseNames.push(dbGroup.title);
} else if (isValidDatabaseName(target)) {
- const db = databaseStore.getDatabaseByName(target);
+ const db = useAppStore.getState().getDatabaseByName(target);
databaseNames.push(extractDatabaseResourceName(db.name).databaseName);
}
}
diff --git a/frontend/src/react/lib/resourceName.ts b/frontend/src/react/lib/resourceName.ts
index e6341a3699..42aa205e6b 100644
--- a/frontend/src/react/lib/resourceName.ts
+++ b/frontend/src/react/lib/resourceName.ts
@@ -2,6 +2,7 @@ export const workspaceNamePrefix = "workspaces/";
export const userNamePrefix = "users/";
export const projectNamePrefix = "projects/";
export const instanceNamePrefix = "instances/";
+export const databaseNamePrefix = "databases/";
export const settingNamePrefix = "settings/";
export function getResourceId(name: string, prefix: string): string {
diff --git a/frontend/src/react/no-legacy-vue-deps.test.ts b/frontend/src/react/no-legacy-vue-deps.test.ts
index 97b33a12cc..281554f85f 100644
--- a/frontend/src/react/no-legacy-vue-deps.test.ts
+++ b/frontend/src/react/no-legacy-vue-deps.test.ts
@@ -42,6 +42,56 @@ const currentUserMigrationSources = import.meta.glob(
}
) as Record<string, string>;
+const instanceMigrationSources = import.meta.glob(
+ [
+ "../router/index.ts",
+ "../router/dashboard/instance.ts",
+ "../utils/expr.ts",
+ "../utils/v1/issue/issue.ts",
+ ],
+ {
+ query: "?raw",
+ import: "default",
+ eager: true,
+ }
+) as Record<string, string>;
+
+const removedLegacyInstanceStoreSources = import.meta.glob(
+ ["./pages/settings/InstancesPage.tsx", "../store/modules/v1/index.ts"],
+ {
+ query: "?raw",
+ import: "default",
+ eager: true,
+ }
+) as Record<string, string>;
+
+const databaseMigrationSources = import.meta.glob(
+ [
+ "../router/index.ts",
+ "../router/dashboard/instance.ts",
+ "../utils/expr.ts",
+ "../utils/v1/revision.ts",
+ "../utils/v1/changelog.ts",
+ "../utils/v1/issue/rollout.ts",
+ "../utils/v1/issue/issue.ts",
+ "../store/modules/v1/index.ts",
+ ],
+ {
+ query: "?raw",
+ import: "default",
+ eager: true,
+ }
+) as Record<string, string>;
+
+const dbSchemaMigrationSources = import.meta.glob(
+ ["./**/*.{ts,tsx}", "../store/modules/v1/index.ts"],
+ {
+ query: "?raw",
+ import: "default",
+ eager: true,
+ }
+) as Record<string, string>;
+
const legacyVueImportPattern =
/@\/components\/(?:Plan|RolloutV1|IssueV1|PlanCheckRun|DatabaseDetail)\/[^"']+\.vue/g;
@@ -185,4 +235,90 @@ describe("React Project and Settings legacy Vue dependencies", () => {
}
expect(violations).toEqual([]);
});
+
+ test("migrated router and utility surfaces do not use legacy instance stores", () => {
+ const bannedImports = ["useInstanceV1Store", "useInstanceResourceByName"];
+ const violations: string[] = [];
+ for (const [file, source] of Object.entries(instanceMigrationSources)) {
+ for (const bannedImport of bannedImports) {
+ if (source.includes(bannedImport)) {
+ violations.push(`${file}: ${bannedImport}`);
+ }
+ }
+ }
+ expect(violations).toEqual([]);
+ });
+
+ test("migrated instance surfaces do not expose the legacy instance store module", () => {
+ const bannedImports = ["@/store/modules/v1/instance", "./instance"];
+ const violations: string[] = [];
+ for (const [file, source] of Object.entries(
+ removedLegacyInstanceStoreSources
+ )) {
+ for (const bannedImport of bannedImports) {
+ if (source.includes(bannedImport)) {
+ violations.push(`${file}: ${bannedImport}`);
+ }
+ }
+ }
+ expect(violations).toEqual([]);
+ });
+
+ test("migrated database surfaces do not use the legacy database store", () => {
+ const bannedImports = ["useDatabaseV1Store", "@/store/modules/v1/database"];
+ const violations: string[] = [];
+ for (const [file, source] of Object.entries(databaseMigrationSources)) {
+ for (const bannedImport of bannedImports) {
+ if (source.includes(bannedImport)) {
+ violations.push(`${file}: ${bannedImport}`);
+ }
+ }
+ if (file.endsWith("../store/modules/v1/index.ts")) {
+ const bannedStoreModuleExport = "./database";
+ if (source.includes(bannedStoreModuleExport)) {
+ violations.push(`${file}: ${bannedStoreModuleExport}`);
+ }
+ }
+ }
+ expect(violations).toEqual([]);
+ });
+
+ test("instance database redirect stays in the React view layer", () => {
+ const source = databaseMigrationSources["../router/dashboard/instance.ts"];
+ const bannedRouterLogic = [
+ "@/react/stores/app/databaseAccess",
+ "getOrFetchDatabaseByName",
+ "beforeEnter",
+ ];
+ const violations = bannedRouterLogic.filter((pattern) =>
+ source.includes(pattern)
+ );
+ expect(violations).toEqual([]);
+ });
+
+ test("migrated DB schema surfaces do not expose the legacy DB schema store", () => {
+ const violations: string[] = [];
+ for (const [file, source] of Object.entries(dbSchemaMigrationSources)) {
+ if (file.endsWith("/no-legacy-vue-deps.test.ts")) {
+ continue;
+ }
+ if (source.includes("@/store/modules/v1/dbSchema")) {
+ violations.push(`${file}: @/store/modules/v1/dbSchema`);
+ }
+ if (
+ !file.endsWith(".test.ts") &&
+ !file.endsWith(".test.tsx") &&
+ source.includes("useDBSchemaV1Store")
+ ) {
+ violations.push(`${file}: useDBSchemaV1Store`);
+ }
+ if (
+ file.endsWith("../store/modules/v1/index.ts") &&
+ source.includes("./dbSchema")
+ ) {
+ violations.push(`${file}: ./dbSchema`);
+ }
+ }
+ expect(violations).toEqual([]);
+ });
});
diff --git a/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx b/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx
index 4ed5d0d55a..3c549a59f7 100644
--- a/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx
+++ b/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx
@@ -36,12 +36,7 @@ import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
import type { AccessGrantFilter as AccessFilter } from "@/react/stores/app/types";
import { router } from "@/router";
-import {
- featureToRef,
- pushNotification,
- useDatabaseV1Store,
- useProjectV1Store,
-} from "@/store";
+import { featureToRef, pushNotification, useProjectV1Store } from "@/store";
import { extractUserEmail, projectNamePrefix } from "@/store/modules/v1/common";
import { getTimeForPbTimestampProtoEs } from "@/types";
import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";
@@ -112,7 +107,6 @@ function mapDatabase(db: Database) {
export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
const projectStore = useProjectV1Store();
- const databaseStore = useDatabaseV1Store();
const listUsers = useAppStore((state) => state.listUsers);
const listAccessGrants = useAppStore((state) => state.listAccessGrants);
const activateAccessGrant = useAppStore((state) => state.activateAccessGrant);
@@ -164,7 +158,7 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {
if (!project || !hasProjectPermissionV2(project, "bb.databases.list")) {
return [];
}
- const result = await databaseStore.fetchDatabases({
+ const result = await useAppStore.getState().fetchDatabases({
parent: projectName,
pageSize: getDefaultPagination(),
filter: keyword ? { query: keyword } : undefined,
@@ -195,7 +189,7 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {
};
});
},
- [databaseStore, projectName, project]
+ [projectName, project]
);
// Server-side search for creator filter options
diff --git a/frontend/src/react/pages/project/ProjectDataExportPage.tsx b/frontend/src/react/pages/project/ProjectDataExportPage.tsx
index ac89f4d9a2..7a696b020b 100644
--- a/frontend/src/react/pages/project/ProjectDataExportPage.tsx
+++ b/frontend/src/react/pages/project/ProjectDataExportPage.tsx
@@ -17,7 +17,7 @@ import { displayRoleTitleFromList } from "@/react/lib/role";
import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { WORKSPACE_ROUTE_USER_PROFILE } from "@/router/dashboard/workspaceRoutes";
-import { useDatabaseV1Store, useProjectV1Store } from "@/store";
+import { useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { getTimeForPbTimestampProtoEs, unknownUser } from "@/types";
import { ApprovalStatus, RiskLevel } from "@/types/proto-es/v1/common_pb";
@@ -84,7 +84,6 @@ export function ProjectDataExportPage({ projectId }: { projectId: string }) {
setSearchParams(defaultSearchParams());
}, [projectId]);
- const databaseStore = useDatabaseV1Store();
const searchInstances = useCallback(
async (keyword: string): Promise<ValueOption[]> => {
if (!hasWorkspacePermissionV2("bb.instances.list")) return [];
@@ -104,7 +103,7 @@ export function ProjectDataExportPage({ projectId }: { projectId: string }) {
if (!project || !hasProjectPermissionV2(project, "bb.databases.list")) {
return [];
}
- const { databases } = await databaseStore.fetchDatabases({
+ const { databases } = await useAppStore.getState().fetchDatabases({
parent: projectName,
pageSize: getDefaultPagination(),
filter: keyword.trim() ? { query: keyword } : undefined,
@@ -114,7 +113,7 @@ export function ProjectDataExportPage({ projectId }: { projectId: string }) {
return { value: db.name, keywords: [databaseName, db.name] };
});
},
- [databaseStore, projectName, project]
+ [projectName, project]
);
// Scope options for the search bar
diff --git a/frontend/src/react/pages/project/ProjectDatabaseDetailPage.test.tsx b/frontend/src/react/pages/project/ProjectDatabaseDetailPage.test.tsx
index bf9783d31d..725919d8e5 100644
--- a/frontend/src/react/pages/project/ProjectDatabaseDetailPage.test.tsx
+++ b/frontend/src/react/pages/project/ProjectDatabaseDetailPage.test.tsx
@@ -124,7 +124,7 @@ const mocks = vi.hoisted(() => {
title: "Project 1",
})),
})),
- useDatabaseV1Store: vi.fn(() => ({
+ databaseStore: vi.fn(() => ({
syncDatabase: vi.fn(),
batchUpdateDatabases: vi.fn(),
getOrFetchDatabaseByName: vi.fn(async (name: string) => ({
@@ -132,7 +132,7 @@ const mocks = vi.hoisted(() => {
project: "projects/proj1",
})),
})),
- useDBSchemaV1Store: vi.fn(() => ({
+ dbSchemaStore: vi.fn(() => ({
getOrFetchDatabaseMetadata: vi.fn(),
getDatabaseMetadata: vi.fn((_name: string) => undefined as unknown),
getSchemaList: vi.fn(() => [] as unknown[]),
@@ -272,22 +272,28 @@ vi.mock("@/store", () => ({
pinia: mocks.pinia,
pushNotification: mocks.pushNotification,
useProjectV1Store: mocks.useProjectV1Store,
- useDatabaseV1Store: mocks.useDatabaseV1Store,
usePermissionStore: mocks.usePermissionStore,
}));
// Page composes child panels that now read dbSchema getters via the app
-// store. Route the existing `mocks.useDBSchemaV1Store` shape through
+// store. Route the existing `mocks.dbSchemaStore` shape through
// `useAppStore` so the per-scenario `.mockReturnValue({...})` calls keep
// working unchanged.
vi.mock("@/react/stores/app", () => ({
- useAppStore: (selector: (s: unknown) => unknown) =>
- selector(mocks.useDBSchemaV1Store()),
+ useAppStore: Object.assign(
+ (selector: (s: unknown) => unknown) => selector(mocks.dbSchemaStore()),
+ {
+ getState: () => ({
+ ...mocks.dbSchemaStore(),
+ ...mocks.databaseStore(),
+ }),
+ }
+ ),
}));
vi.mock("@/react/hooks/useAppDatabaseMetadata", () => ({
useAppDatabaseMetadata: (name: string) =>
- mocks.useDBSchemaV1Store().getDatabaseMetadata?.(name) ?? { schemas: [] },
+ mocks.dbSchemaStore().getDatabaseMetadata?.(name) ?? { schemas: [] },
}));
vi.mock("@/react/components/database", () => ({
@@ -484,8 +490,8 @@ beforeEach(() => {
title: "Project 1",
})),
});
- mocks.useDatabaseV1Store.mockReset();
- mocks.useDatabaseV1Store.mockReturnValue({
+ mocks.databaseStore.mockReset();
+ mocks.databaseStore.mockReturnValue({
syncDatabase: vi.fn(),
batchUpdateDatabases: vi.fn(),
getOrFetchDatabaseByName: vi.fn(async (name: string) => ({
@@ -493,8 +499,8 @@ beforeEach(() => {
project: "projects/proj1",
})),
});
- mocks.useDBSchemaV1Store.mockReset();
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReset();
+ mocks.dbSchemaStore.mockReturnValue({
getOrFetchDatabaseMetadata: vi.fn(),
getDatabaseMetadata: vi.fn(() => undefined as unknown),
getSchemaList: vi.fn(() => [] as unknown[]),
@@ -795,7 +801,7 @@ describe("ProjectDatabaseDetailPage", () => {
});
test("renders the header metadata and top-level action cluster", async () => {
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getOrFetchDatabaseMetadata: vi.fn(),
getDatabaseMetadata: vi.fn(() => ({
schemas: [
@@ -1118,7 +1124,7 @@ describe("ProjectDatabaseDetailPage", () => {
name: "instances/inst1/databases/db1",
project: "projects/proj2",
}));
- mocks.useDatabaseV1Store.mockReturnValue({
+ mocks.databaseStore.mockReturnValue({
syncDatabase: vi.fn(),
batchUpdateDatabases,
getOrFetchDatabaseByName,
diff --git a/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx b/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx
index 66b5c1a754..fb852082ee 100644
--- a/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx
+++ b/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx
@@ -14,9 +14,10 @@ import {
DialogTitle,
} from "@/react/components/ui/dialog";
import { Tabs, TabsList, TabsTrigger } from "@/react/components/ui/tabs";
+import { useAppStore } from "@/react/stores/app";
import { router } from "@/router";
import { PROJECT_V1_ROUTE_DATABASE_DETAIL } from "@/router/dashboard/projectV1";
-import { pushNotification, useDatabaseV1Store } from "@/store";
+import { pushNotification } from "@/store";
import {
BatchUpdateDatabasesRequestSchema,
DatabaseSchema$,
@@ -86,7 +87,6 @@ export function ProjectDatabaseDetailPage({
query,
}: ProjectDatabaseDetailPageProps) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const detail = useProjectDatabaseDetail({
projectId,
instanceId,
@@ -138,7 +138,7 @@ export function ProjectDatabaseDetailPage({
const handleTransferProject = useCallback(
async (projectName: string) => {
try {
- await databaseStore.batchUpdateDatabases(
+ await useAppStore.getState().batchUpdateDatabases(
create(BatchUpdateDatabasesRequestSchema, {
parent: "-",
requests: [
@@ -154,9 +154,9 @@ export function ProjectDatabaseDetailPage({
],
})
);
- const updatedDatabase = await databaseStore.getOrFetchDatabaseByName(
- detail.database.name
- );
+ const updatedDatabase = await useAppStore
+ .getState()
+ .getOrFetchDatabaseByName(detail.database.name);
pushNotification({
module: "bytebase",
style: "SUCCESS",
@@ -177,7 +177,7 @@ export function ProjectDatabaseDetailPage({
});
}
},
- [databaseStore, detail.database, query, selectedTab, t]
+ [detail.database, query, selectedTab, t]
);
if (!detail.ready) {
diff --git a/frontend/src/react/pages/project/ProjectDatabasesPage.tsx b/frontend/src/react/pages/project/ProjectDatabasesPage.tsx
index e54fe9d799..d6cf89d1b8 100644
--- a/frontend/src/react/pages/project/ProjectDatabasesPage.tsx
+++ b/frontend/src/react/pages/project/ProjectDatabasesPage.tsx
@@ -26,12 +26,12 @@ import {
} from "@/react/components/ui/alert-dialog";
import { Button } from "@/react/components/ui/button";
import { useVueState } from "@/react/hooks/useVueState";
+import type { DatabaseFilter } from "@/react/lib/databaseFilter";
import { preCreateIssue } from "@/react/lib/plan/issue";
import { useAppStore } from "@/react/stores/app";
import {
pushNotification,
useActuatorV1Store,
- useDatabaseV1Store,
useEnvironmentV1Store,
useProjectV1Store,
} from "@/store";
@@ -40,7 +40,6 @@ import {
instanceNamePrefix,
projectNamePrefix,
} from "@/store/modules/v1/common";
-import type { DatabaseFilter } from "@/store/modules/v1/database";
import type { Permission } from "@/types";
import {
isDefaultProject,
@@ -55,6 +54,7 @@ import {
DatabaseSchema$,
UpdateDatabaseRequestSchema,
} from "@/types/proto-es/v1/database_service_pb";
+import { unknownDatabase } from "@/types/v1/database";
import {
engineNameV1,
extractInstanceResourceName,
@@ -68,10 +68,10 @@ import { DataExportPrepSheet } from "./export-center/DataExportPrepSheet";
export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const removeDatabaseMetadataCache = useAppStore(
(s) => s.removeDatabaseMetadataCache
);
+ const databasesByName = useAppStore((s) => s.databasesByName);
const actuatorStore = useActuatorV1Store();
const environmentStore = useEnvironmentV1Store();
const projectStore = useProjectV1Store();
@@ -224,8 +224,8 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
if (selectedNames.size === 0) return [];
return Array.from(selectedNames)
.filter((name) => isValidDatabaseName(name))
- .map((name) => databaseStore.getDatabaseByName(name));
- }, [selectedNames, databaseStore]);
+ .map((name) => databasesByName[name] ?? unknownDatabase());
+ }, [selectedNames, databasesByName]);
// Stable references for downstream sheets. Without these the JSX would
// rebuild a fresh array + fresh object literal on every parent re-render
@@ -264,7 +264,9 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
title: t("db.start-to-sync-schema"),
});
try {
- await databaseStore.batchSyncDatabases(Array.from(selectedNames));
+ await useAppStore
+ .getState()
+ .batchSyncDatabases(Array.from(selectedNames));
for (const name of selectedNames) {
removeDatabaseMetadataCache(name);
}
@@ -283,12 +285,12 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
} finally {
setSyncing(false);
}
- }, [syncing, selectedNames, databaseStore, removeDatabaseMetadataCache, t]);
+ }, [syncing, selectedNames, removeDatabaseMetadataCache, t]);
const handleLabelsApply = useCallback(
async (labelsList: { [key: string]: string }[]) => {
try {
- await databaseStore.batchUpdateDatabases(
+ await useAppStore.getState().batchUpdateDatabases(
create(BatchUpdateDatabasesRequestSchema, {
parent: "-",
requests: selectedDatabasesRef.current.map((database, i) =>
@@ -316,13 +318,13 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
});
}
},
- [databaseStore, refresh, t]
+ [refresh, t]
);
const handleEnvironmentUpdate = useCallback(
async (environment: string) => {
try {
- await databaseStore.batchUpdateDatabases(
+ await useAppStore.getState().batchUpdateDatabases(
create(BatchUpdateDatabasesRequestSchema, {
parent: "-",
requests: selectedDatabasesRef.current.map((database) =>
@@ -350,13 +352,13 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
});
}
},
- [databaseStore, refresh, t]
+ [refresh, t]
);
const handleUnassign = useCallback(async () => {
const defaultProject = actuatorStore.serverInfo?.defaultProject ?? "";
try {
- await databaseStore.batchUpdateDatabases(
+ await useAppStore.getState().batchUpdateDatabases(
create(BatchUpdateDatabasesRequestSchema, {
parent: "-",
requests: selectedDatabasesRef.current.map((database) =>
@@ -383,7 +385,7 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {
title: t("common.failed"),
});
}
- }, [databaseStore, actuatorStore, refresh, t]);
+ }, [actuatorStore, refresh, t]);
const handleChangeDatabase = useCallback(() => {
preCreateIssue(projectName, selectedDatabaseNames);
diff --git a/frontend/src/react/pages/project/ProjectGitOpsPage.tsx b/frontend/src/react/pages/project/ProjectGitOpsPage.tsx
index 0bf362dc61..fd1c5ed2ff 100644
--- a/frontend/src/react/pages/project/ProjectGitOpsPage.tsx
+++ b/frontend/src/react/pages/project/ProjectGitOpsPage.tsx
@@ -20,11 +20,7 @@ import { useAppStore } from "@/react/stores/app";
import { extractWorkloadIdentityId } from "@/react/stores/app/workloadIdentity";
import { router } from "@/router";
import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/router/dashboard/workspaceSetting";
-import {
- useActuatorV1Store,
- useDatabaseV1Store,
- useProjectV1Store,
-} from "@/store";
+import { useActuatorV1Store, useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";
import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";
@@ -41,7 +37,6 @@ import {
export function ProjectGitOpsPage({ projectId }: { projectId: string }) {
const { t } = useTranslation();
const actuatorStore = useActuatorV1Store();
- const databaseStore = useDatabaseV1Store();
const projectStore = useProjectV1Store();
const listWorkloadIdentities = useAppStore(
(state) => state.listWorkloadIdentities
@@ -132,7 +127,7 @@ export function ProjectGitOpsPage({ projectId }: { projectId: string }) {
const all: ComboboxOption[] = [];
let pageToken: string | undefined;
do {
- const resp = await databaseStore.fetchDatabases({
+ const resp = await useAppStore.getState().fetchDatabases({
parent: projectName,
filter: dbSearch ? { query: dbSearch } : {},
pageSize: getDefaultPagination(),
@@ -150,7 +145,7 @@ export function ProjectGitOpsPage({ projectId }: { projectId: string }) {
setDbOptions(all);
};
fetchAllDatabases().catch(() => {});
- }, [projectName, dbSearch, databaseStore]);
+ }, [projectName, dbSearch]);
// Fetch the selected identity into the store cache so getWorkloadIdentity
// returns the real object (with workloadIdentityConfig) instead of a stub.
diff --git a/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx b/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx
index aca09e9b07..56fa7488b4 100644
--- a/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx
+++ b/frontend/src/react/pages/project/ProjectMaskingExemptionPage.tsx
@@ -52,7 +52,6 @@ import {
extractUserEmail,
hasFeature,
pushNotification,
- useDatabaseV1Store,
useProjectV1Store,
useSettingV1Store,
} from "@/store";
@@ -96,7 +95,6 @@ export function ProjectMaskingExemptionPage({
}) {
const { t } = useTranslation();
const projectStore = useProjectV1Store();
- const databaseStore = useDatabaseV1Store();
const listUsers = useAppStore((state) => state.listUsers);
const currentUser = useCurrentUser();
@@ -277,7 +275,7 @@ export function ProjectMaskingExemptionPage({
if (!project || !hasProjectPermissionV2(project, "bb.databases.list")) {
return [];
}
- const result = await databaseStore.fetchDatabases({
+ const result = await useAppStore.getState().fetchDatabases({
parent: projectName,
pageSize: getDefaultPagination(),
filter: keyword ? { query: keyword } : undefined,
@@ -296,7 +294,7 @@ export function ProjectMaskingExemptionPage({
};
});
},
- [databaseStore, projectName, project]
+ [projectName, project]
);
const searchUsers = useCallback(
diff --git a/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx b/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx
index 9ea43f760d..ecefcdcb69 100644
--- a/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx
+++ b/frontend/src/react/pages/project/ProjectPlanDashboardPage.tsx
@@ -61,7 +61,6 @@ import {
} from "@/router/dashboard/projectV1";
import {
pushNotification,
- useDatabaseV1Store,
useEnvironmentV1Store,
useProjectV1Store,
} from "@/store";
@@ -719,7 +718,6 @@ function AddSpecDrawer({
title: string;
}) {
const { t } = useTranslation();
- const dbStore = useDatabaseV1Store();
const [creating, setCreating] = useState(false);
const [changeSource, setChangeSource] = useState<"DATABASE" | "GROUP">(
@@ -759,7 +757,9 @@ function AddSpecDrawer({
try {
// Preload database information
if (changeSource === "DATABASE" && selectedDatabaseNames.size > 0) {
- await dbStore.batchGetOrFetchDatabases([...selectedDatabaseNames]);
+ await useAppStore
+ .getState()
+ .batchGetOrFetchDatabases([...selectedDatabaseNames]);
}
const spec = createProto(Plan_SpecSchema, {
@@ -913,7 +913,6 @@ function DatabaseSelector({
onSelectedNamesChange: (names: Set<string>) => void;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const [databases, setDatabases] = useState<Database[]>([]);
const [loading, setLoading] = useState(true);
@@ -934,7 +933,7 @@ function DatabaseSelector({
}
try {
const token = isRefresh ? "" : nextPageTokenRef.current;
- const result = await databaseStore.fetchDatabases({
+ const result = await useAppStore.getState().fetchDatabases({
parent: projectName,
pageSize,
pageToken: token || undefined,
@@ -953,7 +952,7 @@ function DatabaseSelector({
}
}
},
- [databaseStore, projectName, pageSize, query]
+ [projectName, pageSize, query]
);
const isFirstLoad = useRef(true);
diff --git a/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx b/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx
index bf09932d9f..2607cb99a7 100644
--- a/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx
+++ b/frontend/src/react/pages/project/ProjectSyncSchemaPage.tsx
@@ -53,7 +53,6 @@ import { router } from "@/router";
import { PROJECT_V1_ROUTE_PLAN_DETAIL_SPEC_DETAIL } from "@/router/dashboard/projectV1";
import {
pushNotification,
- useDatabaseV1Store,
useEnvironmentV1Store,
useProjectV1Store,
} from "@/store";
@@ -143,7 +142,6 @@ export function ProjectSyncSchemaPage({ projectId }: { projectId: string }) {
const fetchPreviousChangelog = useAppStore(
(state) => state.fetchPreviousChangelog
);
- const databaseStore = useDatabaseV1Store();
const projectStore = useProjectV1Store();
const projectName = `${projectNamePrefix}${projectId}`;
@@ -238,9 +236,9 @@ export function ProjectSyncSchemaPage({ projectId }: { projectId: string }) {
setSourceSchemaString(changelog?.schema ?? "");
return;
} else if (isValidDatabaseName(changelogSource.databaseName)) {
- const databaseSchema = await databaseStore.fetchDatabaseSchema(
- changelogSource.databaseName
- );
+ const databaseSchema = await useAppStore
+ .getState()
+ .fetchDatabaseSchema(changelogSource.databaseName);
if (!cancelled) setSourceSchemaString(databaseSchema.schema);
return;
}
@@ -266,9 +264,9 @@ export function ProjectSyncSchemaPage({ projectId }: { projectId: string }) {
const sourceEngine = useMemo(() => {
if (sourceSchemaType === SourceSchemaType.SCHEMA_HISTORY_VERSION) {
if (!changelogSource.databaseName) return Engine.ENGINE_UNSPECIFIED;
- const database = databaseStore.getDatabaseByName(
- changelogSource.databaseName
- );
+ const database = useAppStore
+ .getState()
+ .getDatabaseByName(changelogSource.databaseName);
return getInstanceResource(database).engine;
}
return rawSQLState.engine;
@@ -304,9 +302,9 @@ export function ProjectSyncSchemaPage({ projectId }: { projectId: string }) {
const { databaseName } =
extractDatabaseNameAndChangelogUID(changelogName);
- await databaseStore.getOrFetchDatabaseByName(databaseName);
+ await useAppStore.getState().getOrFetchDatabaseByName(databaseName);
if (cancelled) return;
- const database = databaseStore.getDatabaseByName(databaseName);
+ const database = useAppStore.getState().getDatabaseByName(databaseName);
setChangelogSource({
environmentName: database.effectiveEnvironment,
databaseName: databaseName,
@@ -323,12 +321,7 @@ export function ProjectSyncSchemaPage({ projectId }: { projectId: string }) {
return () => {
cancelled = true;
};
- }, [
- databaseStore,
- fetchPreviousChangelog,
- getOrFetchChangelogByName,
- projectId,
- ]);
+ }, [fetchPreviousChangelog, getOrFetchChangelogByName, projectId]);
const stepList = useMemo(
() => [
@@ -397,7 +390,7 @@ export function ProjectSyncSchemaPage({ projectId }: { projectId: string }) {
const handleFinish = useCallback(async () => {
const targetDatabases = selectedDatabaseNameList.map((name) =>
- databaseStore.getDatabaseByName(name)
+ useAppStore.getState().getDatabaseByName(name)
);
const query: Record<string, string> = {
template: "bb.plan.change-database",
@@ -758,7 +751,6 @@ function ChangelogSelector({
}) {
const { t } = useTranslation();
const listChangelogs = useAppStore((state) => state.listChangelogs);
- const databaseStore = useDatabaseV1Store();
const [entries, setEntries] = useState<ChangelogEntry[]>([]);
const [nextPageToken, setNextPageToken] = useState("");
const [loadingMore, setLoadingMore] = useState(false);
@@ -811,7 +803,7 @@ function ChangelogSelector({
let items = fetchedChangelogs.map(toEntry);
if (items.length === 0) {
- const db = databaseStore.getDatabaseByName(database);
+ const db = useAppStore.getState().getDatabaseByName(database);
const changelog = mockLatestChangelog(db);
items = [{ name: changelog.name, date: undefined, planTitle: "" }];
}
@@ -828,7 +820,7 @@ function ChangelogSelector({
return () => {
cancelled = true;
};
- }, [database, databaseStore, listChangelogs, toEntry]);
+ }, [database, listChangelogs, toEntry]);
const loadMore = useCallback(async () => {
if (!nextPageToken || !isValidDatabaseName(database) || loadingMore) return;
@@ -1077,12 +1069,11 @@ function SourceSchemaInfo({
changelogSourceSchema?: ChangelogSourceSchema;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const databaseFromChangelog = useMemo(() => {
- return databaseStore.getDatabaseByName(
- changelogSourceSchema?.databaseName || ""
- );
+ return useAppStore
+ .getState()
+ .getDatabaseByName(changelogSourceSchema?.databaseName || "");
}, [changelogSourceSchema?.databaseName]);
const changelogUID = useMemo(() => {
@@ -1181,7 +1172,6 @@ function SelectTargetDatabasesView({
(state) => state.getOrFetchChangelogByName
);
const environmentStore = useEnvironmentV1Store();
- const databaseStore = useDatabaseV1Store();
const [isLoadingDiff, setIsLoadingDiff] = useState(false);
// Refs for values read inside the diff-fetching effect without triggering re-runs
@@ -1198,7 +1188,7 @@ function SelectTargetDatabasesView({
const targetDatabaseList = useMemo(
() =>
selectedDatabaseNameList.map((name) =>
- databaseStore.getDatabaseByName(name)
+ useAppStore.getState().getDatabaseByName(name)
),
[selectedDatabaseNameList]
);
@@ -1288,7 +1278,7 @@ function SelectTargetDatabasesView({
if (cancelled) break;
if (!newSchemaCache[name]) {
- const db = databaseStore.getDatabaseByName(name);
+ const db = useAppStore.getState().getDatabaseByName(name);
const isRollback = isValidChangelogName(
clsRef?.targetChangelogName
);
@@ -1299,13 +1289,15 @@ function SelectTargetDatabasesView({
);
newSchemaCache[name] = previousChangelog?.schema ?? "";
} else {
- const schema = await databaseStore.fetchDatabaseSchema(db.name);
+ const schema = await useAppStore
+ .getState()
+ .fetchDatabaseSchema(db.name);
newSchemaCache[name] = schema.schema;
}
}
if (!newDiffCache[name]) {
- const db = databaseStore.getDatabaseByName(name);
+ const db = useAppStore.getState().getDatabaseByName(name);
const isRollback = isValidChangelogName(
clsRef?.targetChangelogName
);
@@ -1333,7 +1325,9 @@ function SelectTargetDatabasesView({
},
});
- const diffResp = await databaseStore.diffSchema(diffRequest);
+ const diffResp = await useAppStore
+ .getState()
+ .diffSchema(diffRequest);
const schemaDiff = diffResp.diff ?? "";
newDiffCache[name] = { raw: schemaDiff, edited: schemaDiff };
}
@@ -1382,8 +1376,9 @@ function SelectTargetDatabasesView({
const currentRoute = router.currentRoute.value;
const targetDatabaseName = currentRoute.query.target as string;
if (isValidDatabaseName(targetDatabaseName)) {
- const database =
- await databaseStore.getOrFetchDatabaseByName(targetDatabaseName);
+ const database = await useAppStore
+ .getState()
+ .getOrFetchDatabaseByName(targetDatabaseName);
if (database && getInstanceResource(database).engine === sourceEngine) {
onSelectedDatabaseNameListChange([targetDatabaseName]);
onSelectedDatabaseNameChange(targetDatabaseName);
@@ -1996,7 +1991,6 @@ function TargetDatabasesSelectPanel({
onUpdate: (databaseNameList: string[]) => void;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const [selected, setSelected] = useState<Set<string>>(
new Set(initialSelected || [])
);
@@ -2012,8 +2006,9 @@ function TargetDatabasesSelectPanel({
useEffect(() => {
(async () => {
setLoading(true);
- const { databases: fetched, nextPageToken: token } =
- await databaseStore.fetchDatabases({
+ const { databases: fetched, nextPageToken: token } = await useAppStore
+ .getState()
+ .fetchDatabases({
parent: project,
pageSize: getDefaultPagination(),
});
@@ -2026,8 +2021,9 @@ function TargetDatabasesSelectPanel({
const loadMoreDatabases = useCallback(async () => {
if (!dbNextPageToken || loadingMoreDbs) return;
setLoadingMoreDbs(true);
- const { databases: more, nextPageToken: token } =
- await databaseStore.fetchDatabases({
+ const { databases: more, nextPageToken: token } = await useAppStore
+ .getState()
+ .fetchDatabases({
parent: project,
pageSize: getDefaultPagination(),
pageToken: dbNextPageToken,
diff --git a/frontend/src/react/pages/project/database-detail/DatabaseSyncButton.tsx b/frontend/src/react/pages/project/database-detail/DatabaseSyncButton.tsx
index 74dfa6c5d4..a13cfedc02 100644
--- a/frontend/src/react/pages/project/database-detail/DatabaseSyncButton.tsx
+++ b/frontend/src/react/pages/project/database-detail/DatabaseSyncButton.tsx
@@ -4,7 +4,7 @@ import { useCallback, useState } from "react";
import { useTranslation } from "react-i18next";
import { Button } from "@/react/components/ui/button";
import { useAppStore } from "@/react/stores/app";
-import { pushNotification, useDatabaseV1Store } from "@/store";
+import { pushNotification } from "@/store";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
const extractDatabaseName = (resource: string) => {
@@ -22,7 +22,6 @@ export function DatabaseSyncButton({
disabled?: boolean;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const getOrFetchDatabaseMetadata = useAppStore(
(s) => s.getOrFetchDatabaseMetadata
);
@@ -32,7 +31,7 @@ export function DatabaseSyncButton({
setSyncing(true);
try {
- await databaseStore.syncDatabase(database.name);
+ await useAppStore.getState().syncDatabase(database.name);
await getOrFetchDatabaseMetadata({
database: database.name,
skipCache: true,
@@ -60,7 +59,7 @@ export function DatabaseSyncButton({
} finally {
setSyncing(false);
}
- }, [database, databaseStore, getOrFetchDatabaseMetadata, t]);
+ }, [database, getOrFetchDatabaseMetadata, t]);
return (
<Button
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 def49e2869..96e6f83cc3 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
@@ -26,7 +26,7 @@ const mocks = vi.hoisted(() => {
})),
getTableCatalog: vi.fn(),
featureToRef: vi.fn(() => ({ value: true })),
- useDBSchemaV1Store: vi.fn(),
+ dbSchemaStore: vi.fn(),
useSettingV1Store: vi.fn(),
getDatabaseProject: vi.fn((database: { project: string }) => ({
name: database.project,
@@ -69,17 +69,17 @@ vi.mock("@/router", () => ({
}));
// The component now reads dbSchema getters via the app store. Route the
-// existing `mocks.useDBSchemaV1Store` shape through `useAppStore` so the
+// existing `mocks.dbSchemaStore` shape through `useAppStore` so the
// test bodies' per-scenario `.mockReturnValue({ getSchemaList, ... })`
// calls keep working without further changes.
vi.mock("@/react/stores/app", () => ({
useAppStore: (selector: (s: unknown) => unknown) =>
- selector(mocks.useDBSchemaV1Store()),
+ selector(mocks.dbSchemaStore()),
}));
vi.mock("@/react/hooks/useAppDatabaseMetadata", () => ({
useAppDatabaseMetadata: (name: string) =>
- mocks.useDBSchemaV1Store().getDatabaseMetadata?.(name) ?? { schemas: [] },
+ mocks.dbSchemaStore().getDatabaseMetadata?.(name) ?? { schemas: [] },
}));
vi.mock("@/store", () => ({
@@ -222,8 +222,8 @@ beforeEach(async () => {
mocks.bytesToString.mockImplementation((size: number) => `${size} B`);
mocks.hasProjectPermissionV2.mockReset();
mocks.hasProjectPermissionV2.mockReturnValue(true);
- mocks.useDBSchemaV1Store.mockReset();
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReset();
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => [{ name: "public" }]),
getTableList: vi.fn(() => [makeTable("orders")]),
getViewList: vi.fn(() => []),
@@ -281,7 +281,7 @@ beforeEach(async () => {
describe("DatabaseObjectExplorer", () => {
test("renders the default schema label when the schema name is empty", async () => {
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => [{ name: "" }]),
getTableList: vi.fn(() => []),
getViewList: vi.fn(() => []),
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 4b3d646241..ffdfd05d4f 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
@@ -32,7 +32,7 @@ const mocks = vi.hoisted(() => {
currentRoute,
routerReplace: vi.fn(() => Promise.resolve()),
useVueState: vi.fn(),
- useDBSchemaV1Store: vi.fn(),
+ dbSchemaStore: vi.fn(),
useDatabaseCatalog: vi.fn(),
updateDatabaseCatalog: vi.fn(),
useSubscriptionV1Store: vi.fn(),
@@ -90,12 +90,12 @@ vi.mock("@/router", () => ({
}));
// The component (and its child `DatabaseObjectExplorer`) now read dbSchema
-// getters via the app store. Route the existing `mocks.useDBSchemaV1Store`
+// getters via the app store. Route the existing `mocks.dbSchemaStore`
// shape through `useAppStore` so the per-scenario `.mockReturnValue({...})`
// calls in test bodies keep working without further changes.
vi.mock("@/react/stores/app", () => {
const useAppStore = (selector: (s: unknown) => unknown) =>
- selector(mocks.useDBSchemaV1Store());
+ selector(mocks.dbSchemaStore());
useAppStore.getState = () => ({
updateDatabaseCatalog: mocks.updateDatabaseCatalog,
});
@@ -104,7 +104,7 @@ vi.mock("@/react/stores/app", () => {
vi.mock("@/react/hooks/useAppDatabaseMetadata", () => ({
useAppDatabaseMetadata: (name: string) =>
- mocks.useDBSchemaV1Store().getDatabaseMetadata?.(name) ?? { schemas: [] },
+ mocks.dbSchemaStore().getDatabaseMetadata?.(name) ?? { schemas: [] },
}));
vi.mock("@/store", () => ({
@@ -334,8 +334,8 @@ beforeEach(async () => {
mocks.bytesToString.mockImplementation((size: number) => `${size} B`);
mocks.humanizeDate.mockReset();
mocks.humanizeDate.mockReturnValue("5 minutes ago");
- mocks.useDBSchemaV1Store.mockReset();
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReset();
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => mocks.schemaList),
getTableList: vi.fn(() => [makeTable("orders")]),
getViewList: vi.fn(() => []),
@@ -453,7 +453,7 @@ describe("DatabaseOverviewPanel", () => {
test("restores the table engine column for MySQL overview rows", async () => {
mocks.getDatabaseEngine.mockReturnValue(Engine.MYSQL);
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => mocks.schemaList),
getTableList: vi.fn(
() =>
@@ -653,7 +653,7 @@ describe("DatabaseOverviewPanel", () => {
test("treats the empty-string schema as a valid resolved selection", async () => {
mocks.schemaList = [{ name: "" }];
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => mocks.schemaList),
getTableList: vi.fn(() => []),
getViewList: vi.fn(() => []),
@@ -747,7 +747,7 @@ describe("DatabaseOverviewPanel", () => {
mocks.hasSchemaProperty.mockReturnValue(false);
mocks.instanceV1HasCollationAndCharacterSet.mockReturnValue(true);
mocks.instanceV1SupportsPackage.mockReturnValue(true);
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => []),
getTableList: vi.fn(() => []),
getViewList: vi.fn(() => []),
@@ -796,7 +796,7 @@ describe("DatabaseOverviewPanel", () => {
});
test("uses function signatures for overloaded function identity and display", async () => {
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => mocks.schemaList),
getTableList: vi.fn(() => [makeTable("orders")]),
getViewList: vi.fn(() => []),
@@ -835,7 +835,7 @@ describe("DatabaseOverviewPanel", () => {
test("flattens sequences across schemas when schema properties are unsupported", async () => {
mocks.hasSchemaProperty.mockReturnValue(false);
mocks.instanceV1SupportsSequence.mockReturnValue(true);
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => []),
getTableList: vi.fn(() => []),
getViewList: vi.fn(() => []),
@@ -876,7 +876,7 @@ describe("DatabaseOverviewPanel", () => {
router.currentRoute.value.query = { schema: "sales" };
mocks.instanceV1SupportsSequence.mockReturnValue(true);
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => mocks.schemaList),
getTableList: vi.fn(() => []),
getViewList: vi.fn(() => []),
@@ -914,7 +914,7 @@ describe("DatabaseOverviewPanel", () => {
test("flattens streams and tasks across schemas when schema properties are unsupported", async () => {
mocks.getDatabaseEngine.mockReturnValue(Engine.SNOWFLAKE);
mocks.hasSchemaProperty.mockReturnValue(false);
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => []),
getTableList: vi.fn(() => []),
getViewList: vi.fn(() => []),
@@ -965,7 +965,7 @@ describe("DatabaseOverviewPanel", () => {
router.currentRoute.value.query = { schema: "sales" };
mocks.getDatabaseEngine.mockReturnValue(Engine.SNOWFLAKE);
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => mocks.schemaList),
getTableList: vi.fn(() => []),
getViewList: vi.fn(() => []),
@@ -1012,7 +1012,7 @@ describe("DatabaseOverviewPanel", () => {
mocks.getDatabaseEngine.mockReturnValue(Engine.ORACLE);
mocks.hasSchemaProperty.mockReturnValue(true);
mocks.instanceV1SupportsPackage.mockReturnValue(true);
- mocks.useDBSchemaV1Store.mockReturnValue({
+ mocks.dbSchemaStore.mockReturnValue({
getSchemaList: vi.fn(() => mocks.schemaList),
getTableList: vi.fn(() => []),
getViewList: vi.fn(() => []),
diff --git a/frontend/src/react/pages/project/database-detail/panels/DatabaseSettingsPanel.tsx b/frontend/src/react/pages/project/database-detail/panels/DatabaseSettingsPanel.tsx
index 925ee7b3b7..9f6565f266 100644
--- a/frontend/src/react/pages/project/database-detail/panels/DatabaseSettingsPanel.tsx
+++ b/frontend/src/react/pages/project/database-detail/panels/DatabaseSettingsPanel.tsx
@@ -7,7 +7,8 @@ import { EnvironmentSelect } from "@/react/components/EnvironmentSelect";
import { LabelListEditor } from "@/react/components/LabelListEditor";
import { PermissionGuard } from "@/react/components/PermissionGuard";
import { Button } from "@/react/components/ui/button";
-import { pushNotification, useDatabaseV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { pushNotification } from "@/store";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import { UpdateDatabaseRequestSchema } from "@/types/proto-es/v1/database_service_pb";
import {
@@ -22,7 +23,6 @@ const EMPTY_LABELS: Record<string, string> = {};
export function DatabaseSettingsPanel({ database }: { database: Database }) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const labels = database.labels ?? EMPTY_LABELS;
const instanceEnvironment = getInstanceResource(database).environment ?? "";
const allowClearEnvironment = !instanceEnvironment;
@@ -65,7 +65,7 @@ export function DatabaseSettingsPanel({ database }: { database: Database }) {
const databasePatch = cloneDeep(database);
databasePatch.environment = nextEnvironment;
- await databaseStore.updateDatabase(
+ await useAppStore.getState().updateDatabase(
create(UpdateDatabaseRequestSchema, {
database: databasePatch,
updateMask: create(FieldMaskSchema, {
@@ -92,7 +92,7 @@ export function DatabaseSettingsPanel({ database }: { database: Database }) {
setIsUpdatingLabels(true);
try {
const labels = convertKVListToLabels(kvList, false);
- await databaseStore.updateDatabase(
+ await useAppStore.getState().updateDatabase(
create(UpdateDatabaseRequestSchema, {
database: {
...database,
diff --git a/frontend/src/react/pages/project/database-detail/useProjectDatabaseDetail.test.tsx b/frontend/src/react/pages/project/database-detail/useProjectDatabaseDetail.test.tsx
index 438ab356ce..7c36fe61f6 100644
--- a/frontend/src/react/pages/project/database-detail/useProjectDatabaseDetail.test.tsx
+++ b/frontend/src/react/pages/project/database-detail/useProjectDatabaseDetail.test.tsx
@@ -60,25 +60,33 @@ vi.mock("@/router/dashboard/projectV1", () => ({
mocks.routeNames.databaseRevisionDetail,
}));
-vi.mock("@/store", () => ({
- useDatabaseV1Store: () => mocks.databaseStore,
-}));
+vi.mock("@/store", () => ({}));
+
+// Build the `databasesByName` cache the hook subscribes to from the mocked
+// `getDatabaseByName` return value, keyed by its `name`.
+const buildDatabasesByName = (): Record<string, unknown> => {
+ const db = mocks.getDatabaseByName() as { name?: string } | undefined;
+ if (db?.name) {
+ return { [db.name]: db };
+ }
+ return {};
+};
-vi.mock("@/react/stores/app", () => ({
- useAppStore: Object.assign(
- (selector: (s: unknown) => unknown) =>
- selector({
- getOrFetchDatabaseMetadata:
- mocks.dbSchemaStore.getOrFetchDatabaseMetadata,
- }),
- {
- getState: () => ({
- getOrFetchDatabaseMetadata:
- mocks.dbSchemaStore.getOrFetchDatabaseMetadata,
- }),
- }
- ),
-}));
+vi.mock("@/react/stores/app", () => {
+ const appState = () => ({
+ getOrFetchDatabaseMetadata: mocks.dbSchemaStore.getOrFetchDatabaseMetadata,
+ getOrFetchDatabaseByName: mocks.databaseStore.getOrFetchDatabaseByName,
+ databasesByName: buildDatabasesByName(),
+ });
+ return {
+ useAppStore: Object.assign(
+ (selector: (s: unknown) => unknown) => selector(appState()),
+ {
+ getState: appState,
+ }
+ ),
+ };
+});
vi.mock("@/utils", () => ({
getInstanceResource: mocks.getInstanceResource,
diff --git a/frontend/src/react/pages/project/database-detail/useProjectDatabaseDetail.ts b/frontend/src/react/pages/project/database-detail/useProjectDatabaseDetail.ts
index 47dc1c92d4..2df28e6d08 100644
--- a/frontend/src/react/pages/project/database-detail/useProjectDatabaseDetail.ts
+++ b/frontend/src/react/pages/project/database-detail/useProjectDatabaseDetail.ts
@@ -8,7 +8,7 @@ import {
PROJECT_V1_ROUTE_DATABASE_DETAIL,
PROJECT_V1_ROUTE_DATABASE_REVISION_DETAIL,
} from "@/router/dashboard/projectV1";
-import { useDatabaseV1Store } from "@/store";
+import { unknownDatabase } from "@/types/v1/database";
import { isDefaultProject } from "@/types/v1/project";
import { getInstanceResource, instanceV1HasAlterSchema } from "@/utils";
import { extractProjectResourceName } from "@/utils/v1/project";
@@ -34,13 +34,13 @@ export function useProjectDatabaseDetail({
changelogId,
revisionId,
}: UseProjectDatabaseDetailOptions) {
- const databaseStore = useDatabaseV1Store();
const getOrFetchDatabaseMetadata = useAppStore(
(s) => s.getOrFetchDatabaseMetadata
);
+ const databasesByName = useAppStore((s) => s.databasesByName);
const fullDatabaseName = `instances/${instanceId}/databases/${databaseName}`;
- const database = useVueState(() =>
- databaseStore.getDatabaseByName(fullDatabaseName)
+ const database = useVueState(
+ () => databasesByName[fullDatabaseName] ?? unknownDatabase()
);
const [loading, setLoading] = useState(true);
@@ -48,7 +48,8 @@ export function useProjectDatabaseDetail({
let cancelled = false;
setLoading(true);
- void databaseStore
+ void useAppStore
+ .getState()
.getOrFetchDatabaseByName(fullDatabaseName)
.then(async (db) => {
try {
@@ -94,7 +95,6 @@ export function useProjectDatabaseDetail({
}, [
changelogId,
databaseName,
- databaseStore,
getOrFetchDatabaseMetadata,
fullDatabaseName,
instanceId,
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 76167c5d6c..7ddabfea0b 100644
--- a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.test.tsx
+++ b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.test.tsx
@@ -147,6 +147,10 @@ vi.mock("@/types", () => ({
typeof name === "string" && name.includes("/databaseGroups/"),
}));
+vi.mock("@/types/v1/database", () => ({
+ unknownDatabase: () => ({ name: "instances/-/databases/-" }),
+}));
+
vi.mock("@/utils", () => ({
DEFAULT_MAX_RESULT_SIZE_IN_MB: 100,
extractDatabaseGroupName: (name: string) =>
@@ -191,30 +195,6 @@ const stableProjectStore = {
},
};
-const stableDatabaseStore = {
- get fetchDatabases() {
- return mocks.fetchDatabases;
- },
- get getOrFetchDatabaseByName() {
- return mocks.getOrFetchDatabaseByName;
- },
- get getDatabaseByName() {
- return mocks.getDatabaseByName;
- },
-};
-
-const stableDBGroupStore = {
- get getOrFetchDBGroupByName() {
- return mocks.getOrFetchDBGroupByName;
- },
- get fetchDBGroupListByProjectName() {
- return mocks.fetchDBGroupListByProjectName;
- },
- get createSheet() {
- return mocks.createSheet;
- },
-};
-
const stableSettingStore = {
workspaceProfile: { sqlResultSize: BigInt(100 * 1024 * 1024) },
};
@@ -222,14 +202,29 @@ const stableSettingStore = {
vi.mock("@/store", () => ({
DEFAULT_MAX_RESULT_SIZE_IN_MB: 100,
useProjectV1Store: () => stableProjectStore,
- useDatabaseV1Store: () => stableDatabaseStore,
useSettingV1Store: () => stableSettingStore,
pushNotification: mocks.pushNotification,
}));
-vi.mock("@/react/stores/app", () => ({
- useAppStore: { getState: () => stableDBGroupStore },
-}));
+vi.mock("@/react/stores/app", () => {
+ const appState = () => ({
+ fetchDatabases: mocks.fetchDatabases,
+ getOrFetchDatabaseByName: mocks.getOrFetchDatabaseByName,
+ getDatabaseByName: mocks.getDatabaseByName,
+ getOrFetchDBGroupByName: mocks.getOrFetchDBGroupByName,
+ fetchDBGroupListByProjectName: mocks.fetchDBGroupListByProjectName,
+ createSheet: mocks.createSheet,
+ // TargetBadge subscribes to this map; default mock has no entries so it
+ // falls back to unknownDatabase() (matching the production cache miss).
+ databasesByName: {} as Record<string, unknown>,
+ });
+ return {
+ useAppStore: Object.assign(
+ (selector: (s: unknown) => unknown) => selector(appState()),
+ { getState: appState }
+ ),
+ };
+});
vi.mock("@/react/stores/app/issue", () => ({
experimentalCreateIssueByPlan: mocks.experimentalCreateIssueByPlan,
diff --git a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
index e6bacf3a77..4aa12a599d 100644
--- a/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
+++ b/frontend/src/react/pages/project/export-center/DataExportPrepSheet.tsx
@@ -30,7 +30,6 @@ import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";
import {
DEFAULT_MAX_RESULT_SIZE_IN_MB,
pushNotification,
- useDatabaseV1Store,
useProjectV1Store,
useSettingV1Store,
} from "@/store";
@@ -46,6 +45,7 @@ import {
PlanSchema,
} from "@/types/proto-es/v1/plan_service_pb";
import { SheetSchema } from "@/types/proto-es/v1/sheet_service_pb";
+import { unknownDatabase } from "@/types/v1/database";
import {
extractDatabaseGroupName,
extractDatabaseResourceName,
@@ -93,7 +93,6 @@ export function DataExportPrepSheet({
}: DataExportPrepSheetProps) {
const { t } = useTranslation();
const currentUser = useCurrentUser();
- const dbStore = useDatabaseV1Store();
const projectStore = useProjectV1Store();
const settingStore = useSettingV1Store();
@@ -173,14 +172,14 @@ export function DataExportPrepSheet({
useEffect(() => {
for (const target of targets) {
if (isValidDatabaseName(target)) {
- dbStore.getOrFetchDatabaseByName(target);
+ useAppStore.getState().getOrFetchDatabaseByName(target);
} else if (isValidDatabaseGroupName(target)) {
useAppStore.getState().getOrFetchDBGroupByName(target, {
view: DatabaseGroupView.FULL,
});
}
}
- }, [targets, dbStore]);
+ }, [targets]);
// Reset on open or when seed changes while open
const seedKey = seed?.selectedDatabaseNames?.join(",") ?? "";
@@ -555,13 +554,15 @@ function StepIndicator({
// ---------------------------------------------------------------------------
function TargetBadge({ target }: { target: string }) {
- const dbStore = useDatabaseV1Store();
const isDatabaseTarget = isValidDatabaseName(target);
const isGroupTarget = isValidDatabaseGroupName(target);
+ const databasesByName = useAppStore((s) => s.databasesByName);
// Always call useVueState unconditionally (rules of hooks)
const db = useVueState(() =>
- isDatabaseTarget ? dbStore.getDatabaseByName(target) : undefined
+ isDatabaseTarget
+ ? (databasesByName[target] ?? unknownDatabase())
+ : undefined
);
if (isDatabaseTarget && db) {
@@ -684,7 +685,6 @@ function DatabaseSelector({
onSelectedNamesChange: (names: Set<string>) => void;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const [databases, setDatabases] = useState<Database[]>([]);
const [loading, setLoading] = useState(true);
@@ -706,7 +706,7 @@ function DatabaseSelector({
try {
const token = isRefresh ? "" : nextPageTokenRef.current;
const filter = { query };
- const result = await databaseStore.fetchDatabases({
+ const result = await useAppStore.getState().fetchDatabases({
parent: projectName,
pageSize,
pageToken: token || undefined,
@@ -725,7 +725,7 @@ function DatabaseSelector({
}
}
},
- [databaseStore, projectName, pageSize, query]
+ [projectName, pageSize, query]
);
const isFirstLoad = useRef(true);
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx
index bad6eb0c37..36d1663067 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailAccessGrantDetails.tsx
@@ -6,14 +6,11 @@ import { Alert } from "@/react/components/ui/alert";
import { Checkbox } from "@/react/components/ui/checkbox";
import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
-import {
- useDatabaseV1Store,
- useEnvironmentV1Store,
- useProjectV1Store,
-} from "@/store";
+import { useEnvironmentV1Store, useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import { isValidDatabaseName } from "@/types";
import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";
+import { unknownDatabase } from "@/types/v1/database";
import { extractProjectResourceName, hasProjectPermissionV2 } from "@/utils";
import { getAccessGrantExpirationText } from "@/utils/accessGrant";
import { extractDatabaseResourceName } from "@/utils/v1/database";
@@ -23,7 +20,6 @@ export function IssueDetailAccessGrantDetails() {
const { t } = useTranslation();
const page = useIssueDetailContext();
const projectStore = useProjectV1Store();
- const databaseStore = useDatabaseV1Store();
const fetchAccessGrant = useAppStore((state) => state.fetchAccessGrant);
const searchMyAccessGrants = useAppStore(
(state) => state.searchMyAccessGrants
@@ -66,7 +62,7 @@ export function IssueDetailAccessGrantDetails() {
if (grant) {
for (const target of grant.targets) {
if (isValidDatabaseName(target)) {
- void databaseStore.getOrFetchDatabaseByName(target);
+ void useAppStore.getState().getOrFetchDatabaseByName(target);
}
}
}
@@ -81,13 +77,7 @@ export function IssueDetailAccessGrantDetails() {
return () => {
canceled = true;
};
- }, [
- fetchAccessGrant,
- searchMyAccessGrants,
- databaseStore,
- page.issue,
- project,
- ]);
+ }, [fetchAccessGrant, searchMyAccessGrants, page.issue, project]);
const expirationInfo = accessGrant
? getAccessGrantExpirationText(accessGrant)
@@ -163,9 +153,11 @@ export function IssueDetailAccessGrantDetails() {
}
function IssueDetailAccessGrantTarget({ target }: { target: string }) {
- const databaseStore = useDatabaseV1Store();
const environmentStore = useEnvironmentV1Store();
- const database = useVueState(() => databaseStore.getDatabaseByName(target));
+ const databasesByName = useAppStore((s) => s.databasesByName);
+ const database = useVueState(
+ () => databasesByName[target] ?? unknownDatabase()
+ );
const environment = useVueState(() =>
environmentStore.getEnvironmentByName(
database.effectiveEnvironment ?? database.environment ?? ""
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 76f8d18c24..b455c1ac7b 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
@@ -225,10 +225,6 @@ vi.mock("@/router/dashboard/projectV1RouteHelpers", () => ({
vi.mock("@/store", () => ({
getProjectNameAndDatabaseGroupName: mocks.getProjectNameAndDatabaseGroupName,
- useDatabaseV1Store: () => ({
- getDatabaseByName: mocks.getDatabaseByName,
- batchGetOrFetchDatabases: mocks.batchGetOrFetchDatabases,
- }),
useEnvironmentV1Store: () => ({
getEnvironmentByName: mocks.getEnvironmentByName,
}),
@@ -240,23 +236,37 @@ vi.mock("@/types", () => ({
unknownDatabaseGroup: () => ({ name: "", matchedDatabases: [] }),
}));
+vi.mock("@/types/v1/database", () => ({
+ unknownDatabase: () => ({ name: "instances/-/databases/-" }),
+}));
+
vi.mock("@/react/stores/app", () => {
- // The migrated component reads dbGroup state two ways: imperative
- // `useAppStore.getState().<method>()` and the reactive selector
- // `useAppStore((s) => s.dbGroupsByName[name])`. Delegate the map lookup to
- // the existing `getDBGroupByName` mock so per-test setup keeps working.
+ // The migrated component reads cache state two ways: imperative
+ // `useAppStore.getState().<method>()` and reactive selectors
+ // `useAppStore((s) => s.dbGroupsByName[name])` / `s.databasesByName[name]`.
+ // Delegate the map lookups to the existing mocks so per-test setup keeps
+ // working.
const dbGroupsByName = new Proxy({} as Record<string, unknown>, {
get: (_t, key) =>
typeof key === "string" ? mocks.getDBGroupByName(key) : undefined,
});
+ const databasesByName = new Proxy({} as Record<string, unknown>, {
+ get: (_t, key) =>
+ typeof key === "string" ? mocks.getDatabaseByName(key) : undefined,
+ });
const useAppStore = Object.assign(
- (selector: (s: { dbGroupsByName: Record<string, unknown> }) => unknown) =>
- selector({ dbGroupsByName }),
+ (
+ selector: (s: {
+ dbGroupsByName: Record<string, unknown>;
+ databasesByName: Record<string, unknown>;
+ }) => unknown
+ ) => selector({ dbGroupsByName, databasesByName }),
{
getState: () => ({
getDBGroupByName: mocks.getDBGroupByName,
getOrFetchDBGroupByName: mocks.getOrFetchDBGroupByName,
getOrFetchSheetByName: mocks.getOrFetchSheetByName,
+ batchGetOrFetchDatabases: mocks.batchGetOrFetchDatabases,
}),
}
);
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 6723ad8395..604f8205b3 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseChangeView.tsx
@@ -32,7 +32,6 @@ import {
import { buildPlanDeployRouteFromPlanName } from "@/router/dashboard/projectV1RouteHelpers";
import {
getProjectNameAndDatabaseGroupName,
- useDatabaseV1Store,
useEnvironmentV1Store,
} from "@/store";
import {
@@ -44,6 +43,7 @@ import { Engine } from "@/types/proto-es/v1/common_pb";
import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";
import { ListInstanceRolesRequestSchema } from "@/types/proto-es/v1/instance_role_service_pb";
import type { Plan_Spec } from "@/types/proto-es/v1/plan_service_pb";
+import { unknownDatabase } from "@/types/v1/database";
import {
extractDatabaseResourceName,
extractInstanceResourceName,
@@ -177,7 +177,7 @@ function IssueDetailDatabaseChangeOptions({
selectedSpec: Plan_Spec;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
const [sheetStatement, setSheetStatement] = useState("");
const [isSheetOversize, setIsSheetOversize] = useState(false);
const [instanceRoles, setInstanceRoles] = useState<string[]>([]);
@@ -190,7 +190,7 @@ function IssueDetailDatabaseChangeOptions({
}, [selectedSpec]);
const databases = useVueState(() =>
targets
- .map((target) => databaseStore.getDatabaseByName(target))
+ .map((target) => databasesByName[target] ?? unknownDatabase())
.filter((database) => isValidDatabaseName(database.name))
);
const parsedStatement = useMemo(
@@ -509,7 +509,7 @@ function IssueDetailDatabaseChangeTargets({
selectedSpec: Plan_Spec;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
const [showAllTargetsDialog, setShowAllTargetsDialog] = useState(false);
const [searchText, setSearchText] = useState("");
const [isLoadingTargets, setIsLoadingTargets] = useState(false);
@@ -541,7 +541,8 @@ function IssueDetailDatabaseChangeTargets({
);
})
.filter(
- (name) => !databaseStore.getDatabaseByName(name).effectiveEnvironment
+ (name) =>
+ !(databasesByName[name] ?? unknownDatabase()).effectiveEnvironment
);
});
const filteredTargets = useVueState(() => {
@@ -552,7 +553,7 @@ function IssueDetailDatabaseChangeTargets({
const normalizedSearchText = searchText.toLowerCase();
return targets.filter((target) => {
if (isValidDatabaseName(target)) {
- const database = databaseStore.getDatabaseByName(target);
+ const database = databasesByName[target] ?? unknownDatabase();
return extractDatabaseResourceName(database.name)
.databaseName.toLowerCase()
.includes(normalizedSearchText);
@@ -580,7 +581,7 @@ function IssueDetailDatabaseChangeTargets({
setIsLoadingTargets(true);
try {
- await fetchTargets(visibleTargets, databaseStore);
+ await fetchTargets(visibleTargets);
} catch {
// Ignore target loading failures to match the current Vue behavior.
} finally {
@@ -595,7 +596,7 @@ function IssueDetailDatabaseChangeTargets({
return () => {
canceled = true;
};
- }, [databaseStore, targets, visibleTargets]);
+ }, [targets, visibleTargets]);
useEffect(() => {
if (!showAllTargetsDialog) {
@@ -608,7 +609,7 @@ function IssueDetailDatabaseChangeTargets({
const loadAllTargets = async () => {
setIsLoadingAllTargets(true);
try {
- await fetchTargets(targets, databaseStore);
+ await fetchTargets(targets);
} catch {
// Ignore target loading failures to match the current Vue behavior.
} finally {
@@ -623,7 +624,7 @@ function IssueDetailDatabaseChangeTargets({
return () => {
canceled = true;
};
- }, [databaseStore, showAllTargetsDialog, targets]);
+ }, [showAllTargetsDialog, targets]);
return (
<>
@@ -762,9 +763,11 @@ function IssueDetailDatabaseTarget({
target: string;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const environmentStore = useEnvironmentV1Store();
- const database = useVueState(() => databaseStore.getDatabaseByName(target));
+ const databasesByName = useAppStore((s) => s.databasesByName);
+ const database = useVueState(
+ () => databasesByName[target] ?? unknownDatabase()
+ );
const environment = useVueState(() =>
environmentStore.getEnvironmentByName(
database.effectiveEnvironment ??
@@ -818,7 +821,6 @@ function IssueDetailDatabaseGroupTarget({
target: string;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
// Subscribe to the cached entry directly (stable ref) and derive the unknown
// fallback outside the selector — a selector returning `unknownDatabaseGroup()`
// would yield a fresh object each call and loop forever.
@@ -845,9 +847,9 @@ function IssueDetailDatabaseGroupTarget({
useEffect(() => {
if (databases.length > 0) {
- void databaseStore.batchGetOrFetchDatabases(databases);
+ void useAppStore.getState().batchGetOrFetchDatabases(databases);
}
- }, [databaseStore, databases]);
+ }, [databases]);
const gotoDatabaseGroupDetailPage = () => {
const [projectId, databaseGroupName] =
@@ -917,10 +919,7 @@ function IssueDetailDatabaseGroupTarget({
);
}
-const fetchTargets = async (
- targets: string[],
- databaseStore: ReturnType<typeof useDatabaseV1Store>
-) => {
+const fetchTargets = async (targets: string[]) => {
const databaseTargets = new Set<string>();
for (const target of targets) {
@@ -946,7 +945,7 @@ const fetchTargets = async (
}
if (databaseTargets.size > 0) {
- await databaseStore.batchGetOrFetchDatabases([...databaseTargets]);
+ await useAppStore.getState().batchGetOrFetchDatabases([...databaseTargets]);
}
return [...databaseTargets];
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseExportView.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseExportView.tsx
index efe9459dc1..e17a9e70d4 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseExportView.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseExportView.tsx
@@ -33,7 +33,6 @@ import {
DEFAULT_MAX_RESULT_SIZE_IN_MB,
getProjectNameAndDatabaseGroupName,
pushNotification,
- useDatabaseV1Store,
useEnvironmentV1Store,
useSettingV1Store,
} from "@/store";
@@ -50,6 +49,7 @@ import {
UpdatePlanRequestSchema,
} from "@/types/proto-es/v1/plan_service_pb";
import { type Task, Task_Status } from "@/types/proto-es/v1/rollout_service_pb";
+import { unknownDatabase } from "@/types/v1/database";
import {
extractDatabaseResourceName,
extractInstanceResourceName,
@@ -382,7 +382,6 @@ function IssueDetailDatabaseExportTasks({
tasksExpanded: boolean;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const visibleTasks = tasksExpanded
? tasks
: tasks.slice(0, DEFAULT_DISPLAY_COUNT);
@@ -392,9 +391,9 @@ function IssueDetailDatabaseExportTasks({
useEffect(() => {
const targets = tasks.map((task) => task.target);
if (targets.length > 0) {
- void databaseStore.batchGetOrFetchDatabases(targets);
+ void useAppStore.getState().batchGetOrFetchDatabases(targets);
}
- }, [databaseStore, tasks]);
+ }, [tasks]);
if (tasks.length === 0) {
return (
@@ -591,19 +590,18 @@ function IssueDetailDatabaseExportExecutionHistory({
function IssueDetailDatabaseExportTargets({ targets }: { targets: string[] }) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
useEffect(() => {
for (const target of targets) {
if (isValidDatabaseName(target)) {
- void databaseStore.getOrFetchDatabaseByName(target);
+ void useAppStore.getState().getOrFetchDatabaseByName(target);
} else if (isValidDatabaseGroupName(target)) {
void useAppStore.getState().getOrFetchDBGroupByName(target, {
view: DatabaseGroupView.FULL,
});
}
}
- }, [databaseStore, targets]);
+ }, [targets]);
if (targets.length === 0) {
return (
@@ -642,9 +640,11 @@ function IssueDetailDatabaseExportDatabaseTarget({
target: string;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const environmentStore = useEnvironmentV1Store();
- const database = useVueState(() => databaseStore.getDatabaseByName(target));
+ const databasesByName = useAppStore((s) => s.databasesByName);
+ const database = useVueState(
+ () => databasesByName[target] ?? unknownDatabase()
+ );
const environment = useVueState(() =>
environmentStore.getEnvironmentByName(
database.effectiveEnvironment ??
@@ -681,7 +681,6 @@ function IssueDetailDatabaseExportDatabaseGroupTarget({
target: string;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const cachedGroup = useAppStore((s) => s.dbGroupsByName[target]);
const databaseGroup = useMemo(
() => cachedGroup ?? unknownDatabaseGroup(),
@@ -705,9 +704,9 @@ function IssueDetailDatabaseExportDatabaseGroupTarget({
useEffect(() => {
if (databases.length > 0) {
- void databaseStore.batchGetOrFetchDatabases(databases);
+ void useAppStore.getState().batchGetOrFetchDatabases(databases);
}
- }, [databaseStore, databases]);
+ }, [databases]);
const gotoDatabaseGroupDetailPage = () => {
const [projectId, databaseGroupName] =
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.test.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.test.tsx
index b181b9ddb0..28e2ebb913 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.test.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.test.tsx
@@ -57,38 +57,46 @@ vi.mock("@/react/hooks/useVueState", () => ({
}));
vi.mock("@/store", () => ({
- useDatabaseV1Store: () => ({
- batchGetOrFetchDatabases: vi.fn(),
- getDatabaseByName: () => ({
- effectiveEnvironment: "",
- instanceResource: undefined,
- }),
- }),
useEnvironmentV1Store: () => ({
getEnvironmentByName: () => ({ title: "" }),
}),
- useInstanceV1Store: () => ({ getInstanceByName: () => ({ title: "" }) }),
}));
-vi.mock("@/react/stores/app", () => ({
- useAppStore: (selector: (state: unknown) => unknown) =>
- selector({
- roleList: [
- {
- name: "roles/sqlEditorUser",
- permissions: ["bb.sql.ddl", "bb.sql.dml"],
- },
- { name: "roles/queryOnly", permissions: ["bb.sql.select"] },
- ],
- getRoleByName: (role: string) =>
- role === "roles/sqlEditorUser"
- ? { name: role, permissions: ["bb.sql.ddl", "bb.sql.dml"] }
- : role === "roles/queryOnly"
- ? { name: role, permissions: ["bb.sql.select"] }
- : undefined,
- }),
+vi.mock("@/types/v1/database", () => ({
+ unknownDatabase: () => ({
+ name: "instances/-/databases/-",
+ effectiveEnvironment: "",
+ instanceResource: undefined,
+ }),
}));
+vi.mock("@/react/stores/app", () => {
+ const appState = () => ({
+ roleList: [
+ {
+ name: "roles/sqlEditorUser",
+ permissions: ["bb.sql.ddl", "bb.sql.dml"],
+ },
+ { name: "roles/queryOnly", permissions: ["bb.sql.select"] },
+ ],
+ getRoleByName: (role: string) =>
+ role === "roles/sqlEditorUser"
+ ? { name: role, permissions: ["bb.sql.ddl", "bb.sql.dml"] }
+ : role === "roles/queryOnly"
+ ? { name: role, permissions: ["bb.sql.select"] }
+ : undefined,
+ instancesByName: {} as Record<string, unknown>,
+ databasesByName: {} as Record<string, unknown>,
+ batchGetOrFetchDatabases: vi.fn(),
+ });
+ return {
+ useAppStore: Object.assign(
+ (selector: (state: unknown) => unknown) => selector(appState()),
+ { getState: appState }
+ ),
+ };
+});
+
vi.mock("@/utils", () => ({
displayRoleTitle: (r: string) => r,
}));
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.tsx
index 3ed3e0fd92..9f4a14810c 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.tsx
@@ -15,8 +15,9 @@ import { useVueState } from "@/react/hooks/useVueState";
import { getRoleEnvironmentLimitationKind } from "@/react/lib/project-member/utils";
import { displayRoleTitleFromList } from "@/react/lib/role";
import { useAppStore } from "@/react/stores/app";
-import { useDatabaseV1Store, useEnvironmentV1Store } from "@/store";
+import { useEnvironmentV1Store } from "@/store";
import type { DatabaseResource } from "@/types";
+import { unknownDatabase } from "@/types/v1/database";
import {
type ConditionExpression,
convertFromCELString,
@@ -27,7 +28,6 @@ import { useIssueDetailContext } from "../context/IssueDetailContext";
export function IssueDetailRoleGrantDetails() {
const { t } = useTranslation();
const page = useIssueDetailContext();
- const databaseStore = useDatabaseV1Store();
const issue = page.issue;
const requestRoleName = issue?.roleGrant?.role ?? "";
const roleList = useAppStore((state) => state.roleList);
@@ -61,11 +61,13 @@ export function IssueDetailRoleGrantDetails() {
useEffect(() => {
const resources = condition?.databaseResources ?? [];
if (resources.length > 0) {
- void databaseStore.batchGetOrFetchDatabases(
- resources.map((resource) => resource.databaseFullName)
- );
+ void useAppStore
+ .getState()
+ .batchGetOrFetchDatabases(
+ resources.map((resource) => resource.databaseFullName)
+ );
}
- }, [condition?.databaseResources, databaseStore]);
+ }, [condition?.databaseResources]);
const envKind = getRoleEnvironmentLimitationKind(requestRoleName);
const envNames = condition?.environments ?? [];
@@ -175,17 +177,16 @@ function IssueDetailDatabaseResourceTable({
databaseResourceList: DatabaseResource[];
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const environmentStore = useEnvironmentV1Store();
// Subscribe to the instance cache so rows reactively pick up titles once
// instances hydrate; a bare getState() read would not re-render here because
// useVueState only tracks Vue dependencies.
const instancesByName = useAppStore((s) => s.instancesByName);
+ const databasesByName = useAppStore((s) => s.databasesByName);
const rows = useVueState(() =>
databaseResourceList.map((resource) => {
- const database = databaseStore.getDatabaseByName(
- resource.databaseFullName
- );
+ const database =
+ databasesByName[resource.databaseFullName] ?? unknownDatabase();
const { databaseName, instanceName } = extractDatabaseResourceName(
resource.databaseFullName
);
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 f67db5d99b..16f2dafbc6 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailStatementSection.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailStatementSection.tsx
@@ -14,7 +14,6 @@ import { useAppStore } from "@/react/stores/app";
import {
projectNamePrefix,
pushNotification,
- useDatabaseV1Store,
useProjectV1Store,
} from "@/store";
import { extractUserEmail } from "@/store/modules/v1/common";
@@ -61,7 +60,6 @@ export function IssueDetailStatementSection({
const { setEditing } = page;
const fetchRelease = useAppStore((state) => state.fetchRelease);
const projectStore = useProjectV1Store();
- const databaseStore = useDatabaseV1Store();
const currentUser = useCurrentUser();
const project = useVueState(() =>
projectStore.getProjectByName(`${projectNamePrefix}${page.projectId}`)
@@ -97,9 +95,11 @@ export function IssueDetailStatementSection({
if (!targetDatabaseName) {
return "sql";
}
- const database = databaseStore.getDatabaseByName(targetDatabaseName);
+ const database = useAppStore
+ .getState()
+ .getDatabaseByName(targetDatabaseName);
return languageOfEngineV1(getInstanceResource(database).engine);
- }, [databaseStore, targetDatabaseName]);
+ }, [targetDatabaseName]);
const autoCompleteContext = useMemo(() => {
if (!targetDatabaseName) {
return undefined;
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx
index 1675ca9fb5..6b4c28dfc8 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRolloutActionPanel.tsx
@@ -21,9 +21,9 @@ import { Tooltip } from "@/react/components/ui/tooltip";
import { useCurrentUser } from "@/react/hooks/useAppState";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
+import { useAppStore } from "@/react/stores/app";
import {
pushNotification,
- useDatabaseV1Store,
useEnvironmentV1Store,
useProjectV1Store,
} from "@/store";
@@ -40,6 +40,7 @@ import {
Task_Type,
TaskRun_Status,
} from "@/types/proto-es/v1/rollout_service_pb";
+import { unknownDatabase } from "@/types/v1/database";
import {
extractDatabaseResourceName,
extractInstanceResourceName,
@@ -596,9 +597,11 @@ function IssueDetailTaskDatabaseName({ task }: { task: Task }) {
function IssueDetailDatabaseTarget({ target }: { target: string }) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
const environmentStore = useEnvironmentV1Store();
- const database = useVueState(() => databaseStore.getDatabaseByName(target));
+ const database = useVueState(
+ () => databasesByName[target] ?? unknownDatabase()
+ );
const environment = useVueState(() =>
environmentStore.getEnvironmentByName(
database.effectiveEnvironment ??
diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRunTable.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRunTable.tsx
index 3dbf2c4841..d4a76e10eb 100644
--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRunTable.tsx
+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailTaskRunTable.tsx
@@ -16,11 +16,8 @@ import {
import { Tooltip } from "@/react/components/ui/tooltip";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
-import {
- useDatabaseV1Store,
- useEnvironmentV1Store,
- useProjectV1Store,
-} from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { useEnvironmentV1Store, useProjectV1Store } from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import {
getDateForPbTimestampProtoEs,
@@ -55,7 +52,6 @@ export function IssueDetailTaskRunTable({
const { t } = useTranslation();
const page = useIssueDetailContext();
const projectStore = useProjectV1Store();
- const databaseStore = useDatabaseV1Store();
const projectName = `${projectNamePrefix}${page.projectId}`;
const project = useVueState(() => projectStore.getProjectByName(projectName));
@@ -90,9 +86,9 @@ export function IssueDetailTaskRunTable({
),
];
if (targets.length > 0) {
- void databaseStore.batchGetOrFetchDatabases(targets);
+ void useAppStore.getState().batchGetOrFetchDatabases(targets);
}
- }, [databaseStore, showDatabaseColumn, taskByUID, taskRuns]);
+ }, [showDatabaseColumn, taskByUID, taskRuns]);
const getTaskForTaskRun = (taskRun: TaskRun) => {
return taskByUID.get(extractTaskUID(taskRun.name));
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 efd46ca332..a2932d21d4 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
@@ -265,20 +265,24 @@ vi.mock("@/store", () => ({
getProjectNameAndDatabaseGroupName: (name: string) =>
name.split("/databaseGroups/"),
pushNotification: vi.fn(),
- useDatabaseV1Store: () => mocks.databaseStore,
useEnvironmentV1Store: () => mocks.environmentStore,
useProjectV1Store: () => mocks.projectStore,
}));
-// The migrated component reads dbGroup state via imperative
-// `useAppStore.getState().<method>()` and reactive selectors over
-// `dbGroupsByName` / `dbGroupViewByName`. Delegate the map lookups to the
-// existing `dbGroupStore` mock (treating every cached entry as FULL) so the
-// per-test `getDBGroupByName` / `getOrFetchDBGroupByName` setup keeps working.
+// The migrated component reads resource state via imperative
+// `useAppStore.getState().<method>()` and reactive selectors over app-store
+// maps. Delegate map lookups to the existing store mocks so per-test setup
+// keeps working.
vi.mock("@/react/stores/app", async () => {
const { DatabaseGroupView } = await vi.importActual<
typeof import("@/types/proto-es/v1/database_group_service_pb")
>("@/types/proto-es/v1/database_group_service_pb");
+ const databasesByName = new Proxy({} as Record<string, unknown>, {
+ get: (_t, key) =>
+ typeof key === "string"
+ ? mocks.databaseStore.getDatabaseByName(key)
+ : undefined,
+ });
const dbGroupsByName = new Proxy({} as Record<string, unknown>, {
get: (_t, key) =>
typeof key === "string"
@@ -292,11 +296,12 @@ vi.mock("@/react/stores/app", async () => {
const useAppStore = Object.assign(
(
selector: (s: {
+ databasesByName: Record<string, unknown>;
dbGroupsByName: Record<string, unknown>;
dbGroupViewByName: Record<string, unknown>;
}) => unknown
- ) => selector({ dbGroupsByName, dbGroupViewByName }),
- { getState: () => mocks.dbGroupStore }
+ ) => selector({ databasesByName, dbGroupsByName, dbGroupViewByName }),
+ { getState: () => ({ ...mocks.databaseStore, ...mocks.dbGroupStore }) }
);
return { useAppStore };
});
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 8acefe730e..0c1390872b 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailChangesBranch.tsx
@@ -70,7 +70,6 @@ import {
import {
getProjectNameAndDatabaseGroupName,
pushNotification,
- useDatabaseV1Store,
useProjectV1Store,
} from "@/store";
import {
@@ -93,6 +92,7 @@ import {
UpdatePlanRequestSchema,
} from "@/types/proto-es/v1/plan_service_pb";
import type { CheckReleaseResponse_CheckResult } from "@/types/proto-es/v1/release_service_pb";
+import { unknownDatabase } from "@/types/v1/database";
import {
extractDatabaseResourceName,
getDatabaseEnvironment,
@@ -717,7 +717,7 @@ function OptionsSection({
const project = useVueState(() =>
projectStore.getProjectByName(`projects/${page.projectId}`)
);
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
const [sheetStatement, setSheetStatementValue] = useState("");
const [isSheetOversize, setIsSheetOversize] = useState(false);
const [instanceRoles, setInstanceRoles] = useState<string[]>([]);
@@ -732,14 +732,14 @@ function OptionsSection({
targets
.flatMap((target) => {
if (isValidDatabaseName(target)) {
- return [databaseStore.getDatabaseByName(target)];
+ return [databasesByName[target] ?? unknownDatabase()];
}
if (isValidDatabaseGroupName(target)) {
const dbGroup = useAppStore
.getState()
.getDBGroupByName(target, DatabaseGroupView.FULL);
- return (dbGroup.matchedDatabases ?? []).map((database) =>
- databaseStore.getDatabaseByName(database.name)
+ return (dbGroup.matchedDatabases ?? []).map(
+ (database) => databasesByName[database.name] ?? unknownDatabase()
);
}
return [];
@@ -819,8 +819,8 @@ function OptionsSection({
if (targets.length === 0) {
return;
}
- void fetchTargets(targets, databaseStore);
- }, [databaseStore, targets]);
+ void fetchTargets(targets);
+ }, [targets]);
useEffect(() => {
let canceled = false;
@@ -1205,7 +1205,7 @@ function TargetsSection({
selectedSpec: Plan_Spec;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
const [showAllTargetsDialog, setShowAllTargetsDialog] = useState(false);
const [searchText, setSearchText] = useState("");
const [isLoadingTargets, setIsLoadingTargets] = useState(false);
@@ -1234,21 +1234,22 @@ function TargetsSection({
);
})
.filter(
- (name) => !databaseStore.getDatabaseByName(name).effectiveEnvironment
+ (name) =>
+ !(databasesByName[name] ?? unknownDatabase()).effectiveEnvironment
);
- }, [databaseStore, isLoadingTargets, targets]);
+ }, [databasesByName, isLoadingTargets, targets]);
const filteredTargets = useMemo(
() =>
filterPlanTargets({
getDatabaseDisplayName: (target) => {
if (!isValidDatabaseName(target)) return target;
- const database = databaseStore.getDatabaseByName(target);
+ const database = databasesByName[target] ?? unknownDatabase();
return extractDatabaseResourceName(database.name).databaseName;
},
query: searchText,
targets,
}),
- [databaseStore, searchText, targets]
+ [databasesByName, searchText, targets]
);
const nonEnvWarning =
nonEnvDatabaseNames.length === 1
@@ -1268,7 +1269,7 @@ function TargetsSection({
}
setIsLoadingTargets(true);
try {
- await fetchTargets(visibleTargets, databaseStore);
+ await fetchTargets(visibleTargets);
} finally {
if (!canceled) setIsLoadingTargets(false);
}
@@ -1277,7 +1278,7 @@ function TargetsSection({
return () => {
canceled = true;
};
- }, [databaseStore, targets, visibleTargets]);
+ }, [targets, visibleTargets]);
useEffect(() => {
if (!showAllTargetsDialog) return;
@@ -1286,7 +1287,7 @@ function TargetsSection({
const load = async () => {
setIsLoadingAllTargets(true);
try {
- await fetchTargets(targets, databaseStore);
+ await fetchTargets(targets);
} finally {
if (!canceled) setIsLoadingAllTargets(false);
}
@@ -1295,7 +1296,7 @@ function TargetsSection({
return () => {
canceled = true;
};
- }, [databaseStore, showAllTargetsDialog, targets]);
+ }, [showAllTargetsDialog, targets]);
return (
<>
@@ -1603,7 +1604,6 @@ function DatabaseSelector({
onSelectedNamesChange: (names: Set<string>) => void;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const [databases, setDatabases] = useState<Database[]>([]);
const [loading, setLoading] = useState(true);
const [hasMore, setHasMore] = useState(false);
@@ -1623,7 +1623,7 @@ function DatabaseSelector({
}
try {
const token = isRefresh ? "" : nextPageTokenRef.current;
- const result = await databaseStore.fetchDatabases({
+ const result = await useAppStore.getState().fetchDatabases({
parent: projectName,
pageSize,
pageToken: token || undefined,
@@ -1642,7 +1642,7 @@ function DatabaseSelector({
}
}
},
- [databaseStore, pageSize, projectName, query]
+ [pageSize, projectName, query]
);
useEffect(() => {
@@ -1861,7 +1861,6 @@ export function DatabaseGroupTarget({
target: string;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
const [searchText, setSearchText] = useState("");
// Subscribe to the cached FULL entry directly (stable ref); deriving the
// unknown fallback inside the selector would loop on a fresh object each call.
@@ -1907,11 +1906,11 @@ export function DatabaseGroupTarget({
const databaseNames =
group.matchedDatabases?.map((database) => database.name) ?? [];
if (databaseNames.length > 0) {
- await databaseStore.batchGetOrFetchDatabases(databaseNames);
+ await useAppStore.getState().batchGetOrFetchDatabases(databaseNames);
}
};
void load();
- }, [databaseStore, target]);
+ }, [target]);
const route = {
name: PROJECT_V1_ROUTE_DATABASE_GROUP_DETAIL,
@@ -2044,14 +2043,11 @@ function parseStatement(statement: string): {
};
}
-async function fetchTargets(
- targets: string[],
- databaseStore: ReturnType<typeof useDatabaseV1Store>
-) {
+async function fetchTargets(targets: string[]) {
await Promise.all(
targets.map(async (target) => {
if (isValidDatabaseName(target)) {
- await databaseStore.getOrFetchDatabaseByName(target, true);
+ await useAppStore.getState().getOrFetchDatabaseByName(target, true);
return;
}
if (isValidDatabaseGroupName(target)) {
@@ -2064,7 +2060,7 @@ async function fetchTargets(
const databaseNames =
dbGroup.matchedDatabases?.map((database) => database.name) ?? [];
if (databaseNames.length > 0) {
- await databaseStore.batchGetOrFetchDatabases(databaseNames);
+ await useAppStore.getState().batchGetOrFetchDatabases(databaseNames);
}
}
})
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 80b326284a..bf6af3fc1f 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailStatementSection.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailStatementSection.tsx
@@ -14,7 +14,7 @@ import { Button } from "@/react/components/ui/button";
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
-import { pushNotification, useDatabaseV1Store } from "@/store";
+import { pushNotification } from "@/store";
import {
isValidDatabaseName,
isValidReleaseName,
@@ -32,6 +32,7 @@ import {
type Release,
} from "@/types/proto-es/v1/release_service_pb";
import { GetSheetRequestSchema } from "@/types/proto-es/v1/sheet_service_pb";
+import { unknownDatabase } from "@/types/v1/database";
import { extractDatabaseResourceName, hasProjectPermissionV2 } from "@/utils";
import { engineSupportsSchemaEditor } from "@/utils/schemaEditor";
import { getStatementSize, MAX_UPLOAD_FILE_SIZE_MB } from "@/utils/sheet";
@@ -65,7 +66,7 @@ export function PlanDetailStatementSection({
const { t } = useTranslation();
const page = usePlanDetailContext();
const { patchState, setEditing } = page;
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
const currentUser = page.currentUser;
const project = page.project;
const releaseName =
@@ -103,9 +104,9 @@ export function PlanDetailStatementSection({
// the unknownDatabase() stub returned for cache misses.
useEffect(() => {
if (targetDatabaseNames.length > 0) {
- void databaseStore.batchGetOrFetchDatabases(targetDatabaseNames);
+ void useAppStore.getState().batchGetOrFetchDatabases(targetDatabaseNames);
}
- }, [targetDatabaseNames, databaseStore]);
+ }, [targetDatabaseNames]);
// Show Schema Editor only when at least one target's engine supports it.
// Wrapped in useVueState so the eligibility flips back on once the Pinia
// store hydrates the targets — otherwise a Plan opened before its targets
@@ -113,16 +114,16 @@ export function PlanDetailStatementSection({
const schemaEditorEligible = useVueState(() => {
if (targetDatabaseNames.length === 0) return false;
return targetDatabaseNames.some((name) => {
- const db = databaseStore.getDatabaseByName(name);
+ const db = databasesByName[name];
if (!db || !isValidDatabaseName(db.name)) return false;
return engineSupportsSchemaEditor(getInstanceResource(db).engine);
});
});
const language = useMemo(() => {
if (!targetDatabaseName) return "sql";
- const database = databaseStore.getDatabaseByName(targetDatabaseName);
+ const database = databasesByName[targetDatabaseName] ?? unknownDatabase();
return languageOfEngineV1(getInstanceResource(database).engine);
- }, [databaseStore, targetDatabaseName]);
+ }, [databasesByName, targetDatabaseName]);
const autoCompleteContext = useMemo(() => {
if (!targetDatabaseName) return undefined;
return {
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailTaskRunTable.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailTaskRunTable.tsx
index 133d6bc7b0..d8bcbeac60 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailTaskRunTable.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailTaskRunTable.tsx
@@ -21,7 +21,7 @@ import {
TableRow,
} from "@/react/components/ui/table";
import { Tooltip } from "@/react/components/ui/tooltip";
-import { useDatabaseV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
import {
getDateForPbTimestampProtoEs,
getTimeForPbTimestampProtoEs,
@@ -47,7 +47,7 @@ export function PlanDetailTaskRunTable({
onSelectTaskRun?: (taskRunName: string) => void;
}) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
const [detailTaskRun, setDetailTaskRun] = useState<TaskRun | undefined>();
const sortedTaskRuns = useMemo(() => {
return [...taskRuns].sort((left, right) => {
@@ -56,9 +56,7 @@ export function PlanDetailTaskRunTable({
return rightTime - leftTime;
});
}, [taskRuns]);
- const database = databaseName
- ? databaseStore.getDatabaseByName(databaseName)
- : undefined;
+ const database = databaseName ? databasesByName[databaseName] : undefined;
return (
<>
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanTargetDisplay.test.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanTargetDisplay.test.tsx
index cce91007eb..fb8f885935 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanTargetDisplay.test.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanTargetDisplay.test.tsx
@@ -9,9 +9,7 @@ import { PlanTargetDisplay } from "./PlanTargetDisplay";
).IS_REACT_ACT_ENVIRONMENT = true;
const mocks = vi.hoisted(() => ({
- databaseStore: {
- getDatabaseByName: vi.fn(),
- },
+ databasesByName: {} as Record<string, unknown>,
environmentStore: {
getEnvironmentByName: vi.fn(),
},
@@ -36,8 +34,13 @@ vi.mock("@/react/lib/utils", () => ({
classes.filter(Boolean).join(" "),
}));
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: <T,>(
+ selector: (state: { databasesByName: Record<string, unknown> }) => T
+ ) => selector({ databasesByName: mocks.databasesByName }),
+}));
+
vi.mock("@/store", () => ({
- useDatabaseV1Store: () => mocks.databaseStore,
useEnvironmentV1Store: () => mocks.environmentStore,
}));
@@ -62,14 +65,16 @@ describe("PlanTargetDisplay", () => {
container = document.createElement("div");
document.body.append(container);
root = createRoot(container);
- mocks.databaseStore.getDatabaseByName.mockReturnValue({
- name: "projects/p/instances/prod/databases/app",
- effectiveEnvironment: "environments/prod",
- instanceResource: {
- engine: Engine.POSTGRES,
- title: "prod-instance",
+ mocks.databasesByName = {
+ "projects/p/instances/prod/databases/app": {
+ name: "projects/p/instances/prod/databases/app",
+ effectiveEnvironment: "environments/prod",
+ instanceResource: {
+ engine: Engine.POSTGRES,
+ title: "prod-instance",
+ },
},
- });
+ };
mocks.environmentStore.getEnvironmentByName.mockReturnValue({
name: "environments/prod",
title: "Production",
diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanTargetDisplay.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanTargetDisplay.tsx
index 88ec3d1d5a..c3b1f6cdab 100644
--- a/frontend/src/react/pages/project/plan-detail/components/PlanTargetDisplay.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/PlanTargetDisplay.tsx
@@ -1,8 +1,10 @@
import { ChevronRight } from "lucide-react";
import { EngineIcon } from "@/react/components/EngineIcon";
import { cn } from "@/react/lib/utils";
-import { useDatabaseV1Store, useEnvironmentV1Store } from "@/store";
+import { useAppStore } from "@/react/stores/app";
+import { useEnvironmentV1Store } from "@/store";
import { isValidDatabaseName } from "@/types";
+import { unknownDatabase } from "@/types/v1/database";
import { extractDatabaseResourceName, getInstanceResource } from "@/utils";
type PlanTargetDisplaySize = "sm" | "md";
@@ -51,7 +53,7 @@ export function PlanTargetDisplay({
size?: PlanTargetDisplaySize;
target: string;
}) {
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
const environmentStore = useEnvironmentV1Store();
const classes = sizeClasses[size];
@@ -69,7 +71,7 @@ export function PlanTargetDisplay({
);
}
- const database = databaseStore.getDatabaseByName(target);
+ const database = databasesByName[target] ?? unknownDatabase();
const environmentName =
database.effectiveEnvironment ??
database.instanceResource?.environment ??
diff --git a/frontend/src/react/pages/project/plan-detail/components/SchemaEditorSheet.tsx b/frontend/src/react/pages/project/plan-detail/components/SchemaEditorSheet.tsx
index 12f90574d7..9fa564a05b 100644
--- a/frontend/src/react/pages/project/plan-detail/components/SchemaEditorSheet.tsx
+++ b/frontend/src/react/pages/project/plan-detail/components/SchemaEditorSheet.tsx
@@ -17,9 +17,10 @@ import {
} from "@/react/components/ui/sheet";
import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
-import { pushNotification, useDatabaseV1Store } from "@/store";
+import { pushNotification } from "@/store";
import { isValidDatabaseName } from "@/types";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
+import { unknownDatabase } from "@/types/v1/database";
import { extractDatabaseResourceName, getInstanceResource } from "@/utils";
import { engineSupportsSchemaEditor } from "@/utils/schemaEditor";
@@ -90,7 +91,7 @@ function SchemaEditorSheetBody({
const getOrFetchDatabaseMetadata = useAppStore(
(s) => s.getOrFetchDatabaseMetadata
);
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
const schemaEditorRef = useRef<SchemaEditorHandle>(null);
const [selectedDatabaseName, setSelectedDatabaseName] = useState(
@@ -110,16 +111,16 @@ function SchemaEditorSheetBody({
// entries fall back to the raw resource name and stay disabled).
useEffect(() => {
if (databaseNames.length > 0) {
- void databaseStore.batchGetOrFetchDatabases(databaseNames);
+ void useAppStore.getState().batchGetOrFetchDatabases(databaseNames);
}
- }, [databaseNames, databaseStore]);
+ }, [databaseNames]);
// Subscribed to the Pinia store via useVueState — re-derives once the
// hydration above completes so newly-fetched targets switch from the
// bare-name placeholder to a real "<db> (<instance>)" label.
const databaseOptions = useVueState(() =>
databaseNames.map((name) => {
- const db = databaseStore.getDatabaseByName(name);
+ const db = databasesByName[name] ?? unknownDatabase();
const hydrated = db && isValidDatabaseName(db.name);
const instance = hydrated ? getInstanceResource(db) : undefined;
const databaseLabel = extractDatabaseResourceName(name).databaseName;
@@ -150,7 +151,7 @@ function SchemaEditorSheetBody({
skipCache: true,
limit: 200,
}),
- databaseStore.getOrFetchDatabaseByName(databaseName),
+ useAppStore.getState().getOrFetchDatabaseByName(databaseName),
]);
// A newer prepareMetadata call superseded us — drop this result so
// the user can't end up editing one database while seeing another
@@ -169,7 +170,7 @@ function SchemaEditorSheetBody({
}
}
},
- [getOrFetchDatabaseMetadata, databaseStore]
+ [getOrFetchDatabaseMetadata]
);
useEffect(() => {
diff --git a/frontend/src/react/pages/project/plan-detail/utils/rolloutPreview.ts b/frontend/src/react/pages/project/plan-detail/utils/rolloutPreview.ts
index bc3bda37bc..f61cb01a0b 100644
--- a/frontend/src/react/pages/project/plan-detail/utils/rolloutPreview.ts
+++ b/frontend/src/react/pages/project/plan-detail/utils/rolloutPreview.ts
@@ -1,6 +1,6 @@
import { create } from "@bufbuild/protobuf";
import { useAppStore } from "@/react/stores/app";
-import { useDatabaseV1Store, useEnvironmentV1Store } from "@/store";
+import { useEnvironmentV1Store } from "@/store";
import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";
import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";
import type {
@@ -50,10 +50,9 @@ export async function generateRolloutPreview(
): Promise<Rollout> {
// Step 1: Extract all database targets from specs and expand database groups
const allDatabaseNames = await extractAndExpandDatabaseTargets(plan.specs);
- const dbStore = useDatabaseV1Store();
// Step 2: Fetch databases that are not cached
- await dbStore.batchGetOrFetchDatabases(allDatabaseNames);
+ await useAppStore.getState().batchGetOrFetchDatabases(allDatabaseNames);
// Step 3: Generate tasks from specs
const tasks = await generateTasksFromSpecs(plan.specs);
@@ -164,13 +163,11 @@ function groupTasksIntoStages(
environmentOrder: string[],
projectName: string
): Stage[] {
- const databaseStore = useDatabaseV1Store();
-
// Group tasks by effectiveEnvironment
const tasksByEnv = new Map<string, TaskCreate[]>();
for (const task of tasks) {
- const db = databaseStore.getDatabaseByName(task.databaseName);
+ const db = useAppStore.getState().getDatabaseByName(task.databaseName);
const env = db.effectiveEnvironment ?? "";
if (env === "") {
continue;
diff --git a/frontend/src/react/pages/settings/DatabasesPage.tsx b/frontend/src/react/pages/settings/DatabasesPage.tsx
index 47c2447cd6..b104fa028a 100644
--- a/frontend/src/react/pages/settings/DatabasesPage.tsx
+++ b/frontend/src/react/pages/settings/DatabasesPage.tsx
@@ -29,7 +29,6 @@ import { router } from "@/router";
import {
pushNotification,
useActuatorV1Store,
- useDatabaseV1Store,
useEnvironmentV1Store,
useProjectV1Store,
} from "@/store";
@@ -61,7 +60,8 @@ import {
export function DatabasesPage() {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
+ const getDatabaseByName = useAppStore((s) => s.getDatabaseByName);
const removeDatabaseMetadataCache = useAppStore(
(s) => s.removeDatabaseMetadataCache
);
@@ -354,8 +354,8 @@ export function DatabasesPage() {
if (selectedNames.size === 0) return [];
return Array.from(selectedNames)
.filter((name) => isValidDatabaseName(name))
- .map((name) => databaseStore.getDatabaseByName(name));
- }, [selectedNames, databaseStore]);
+ .map((name) => getDatabaseByName(name));
+ }, [selectedNames, getDatabaseByName, databasesByName]);
// Mirror `selectedDatabases` into a ref so the batch-operation handlers
// below can read the latest value without listing it as a dep. Otherwise
@@ -380,7 +380,9 @@ export function DatabasesPage() {
title: t("db.start-to-sync-schema"),
});
try {
- await databaseStore.batchSyncDatabases(Array.from(selectedNames));
+ await useAppStore
+ .getState()
+ .batchSyncDatabases(Array.from(selectedNames));
for (const name of selectedNames) {
removeDatabaseMetadataCache(name);
}
@@ -399,12 +401,12 @@ export function DatabasesPage() {
} finally {
setSyncing(false);
}
- }, [syncing, selectedNames, databaseStore, removeDatabaseMetadataCache, t]);
+ }, [syncing, selectedNames, removeDatabaseMetadataCache, t]);
const handleLabelsApply = useCallback(
async (labelsList: { [key: string]: string }[]) => {
try {
- await databaseStore.batchUpdateDatabases(
+ await useAppStore.getState().batchUpdateDatabases(
create(BatchUpdateDatabasesRequestSchema, {
parent: "-",
requests: selectedDatabasesRef.current.map((database, i) =>
@@ -432,13 +434,13 @@ export function DatabasesPage() {
});
}
},
- [databaseStore, refresh, t]
+ [refresh, t]
);
const handleEnvironmentUpdate = useCallback(
async (environment: string) => {
try {
- await databaseStore.batchUpdateDatabases(
+ await useAppStore.getState().batchUpdateDatabases(
create(BatchUpdateDatabasesRequestSchema, {
parent: "-",
requests: selectedDatabasesRef.current.map((database) =>
@@ -466,13 +468,13 @@ export function DatabasesPage() {
});
}
},
- [databaseStore, refresh, t]
+ [refresh, t]
);
const handleTransferProject = useCallback(
async (projectName: string) => {
try {
- await databaseStore.batchUpdateDatabases(
+ await useAppStore.getState().batchUpdateDatabases(
create(BatchUpdateDatabasesRequestSchema, {
parent: "-",
requests: selectedDatabasesRef.current.map((database) =>
@@ -500,7 +502,7 @@ export function DatabasesPage() {
});
}
},
- [databaseStore, refresh, t]
+ [refresh, t]
);
return (
diff --git a/frontend/src/react/pages/settings/EnvironmentsPage.tsx b/frontend/src/react/pages/settings/EnvironmentsPage.tsx
index 38bcad6eb5..ec41b57335 100644
--- a/frontend/src/react/pages/settings/EnvironmentsPage.tsx
+++ b/frontend/src/react/pages/settings/EnvironmentsPage.tsx
@@ -71,7 +71,6 @@ import {
import {
pushNotification,
useActuatorV1Store,
- useDatabaseV1Store,
useEnvironmentV1Store,
useSubscriptionV1Store,
} from "@/store";
@@ -710,7 +709,6 @@ function EnvironmentDetail({
}, [environment.id]);
// Check for related resources (instances/databases)
- const databaseStore = useDatabaseV1Store();
const actuatorStore = useActuatorV1Store();
useEffect(() => {
@@ -726,7 +724,7 @@ function EnvironmentDetail({
filter: { environment: environment.name },
silent: true,
}),
- databaseStore.fetchDatabases({
+ useAppStore.getState().fetchDatabases({
pageSize: 1,
parent: actuatorStore.workspaceResourceName,
filter: { environment: environment.name },
@@ -746,7 +744,6 @@ function EnvironmentDetail({
environment.name,
canEdit,
environmentList.length,
- databaseStore,
actuatorStore,
]);
diff --git a/frontend/src/react/pages/settings/InstanceDatabaseRedirectPage.tsx b/frontend/src/react/pages/settings/InstanceDatabaseRedirectPage.tsx
new file mode 100644
index 0000000000..1b867974ef
--- /dev/null
+++ b/frontend/src/react/pages/settings/InstanceDatabaseRedirectPage.tsx
@@ -0,0 +1,78 @@
+import { useEffect } from "react";
+import {
+ databaseNamePrefix,
+ getProjectName,
+ instanceNamePrefix,
+ isValidProjectName,
+} from "@/react/lib/resourceName";
+import { getOrFetchDatabaseByName } from "@/react/stores/app/databaseAccess";
+import { router } from "@/router";
+import { INSTANCE_ROUTE_DETAIL } from "@/router/dashboard/instance";
+import { PROJECT_V1_ROUTE_DATABASE_DETAIL } from "@/router/dashboard/projectV1";
+import { pushNotification } from "@/store";
+
+export function InstanceDatabaseRedirectPage({
+ instanceId,
+ databaseName,
+}: {
+ instanceId: string;
+ databaseName: string;
+}) {
+ useEffect(() => {
+ let active = true;
+
+ const redirect = async () => {
+ try {
+ const database = await getOrFetchDatabaseByName(
+ `${instanceNamePrefix}${instanceId}/${databaseNamePrefix}${databaseName}`
+ );
+ if (!active) {
+ return;
+ }
+ if (isValidProjectName(database.project)) {
+ void router.replace({
+ name: PROJECT_V1_ROUTE_DATABASE_DETAIL,
+ params: {
+ projectId: getProjectName(database.project),
+ instanceId,
+ databaseName,
+ },
+ });
+ return;
+ }
+ pushNotification({
+ module: "bytebase",
+ style: "WARN",
+ title: "Database not found",
+ description: `Database: ${databaseName}`,
+ });
+ } catch (error) {
+ if (!active) {
+ return;
+ }
+ console.error("Failed to fetch database:", error);
+ pushNotification({
+ module: "bytebase",
+ style: "CRITICAL",
+ title: "Error",
+ description: `Failed to load database: ${databaseName}`,
+ });
+ }
+
+ void router.replace({
+ name: INSTANCE_ROUTE_DETAIL,
+ params: {
+ instanceId,
+ },
+ });
+ };
+
+ void redirect();
+
+ return () => {
+ active = false;
+ };
+ }, [databaseName, instanceId]);
+
+ return null;
+}
diff --git a/frontend/src/react/pages/settings/InstanceDetailPage.tsx b/frontend/src/react/pages/settings/InstanceDetailPage.tsx
index 00f2422c28..600a37b558 100644
--- a/frontend/src/react/pages/settings/InstanceDetailPage.tsx
+++ b/frontend/src/react/pages/settings/InstanceDetailPage.tsx
@@ -36,11 +36,11 @@ import {
} from "@/react/components/ui/tabs";
import { useUnsavedChangesGuard } from "@/react/hooks/useUnsavedChangesGuard";
import { useVueState } from "@/react/hooks/useVueState";
+import type { DatabaseFilter } from "@/react/lib/databaseFilter";
import { useAppStore } from "@/react/stores/app";
import {
pushNotification,
useActuatorV1Store,
- useDatabaseV1Store,
useEnvironmentV1Store,
useProjectV1Store,
} from "@/store";
@@ -49,7 +49,6 @@ import {
instanceNamePrefix,
projectNamePrefix,
} from "@/store/modules/v1/common";
-import type { DatabaseFilter } from "@/store/modules/v1/database";
import {
isValidDatabaseName,
UNKNOWN_ENVIRONMENT_NAME,
@@ -77,7 +76,8 @@ const isInstanceHash = (x: unknown): x is InstanceHash =>
export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
const { t } = useTranslation();
- const databaseStore = useDatabaseV1Store();
+ const databasesByName = useAppStore((s) => s.databasesByName);
+ const getDatabaseByName = useAppStore((s) => s.getDatabaseByName);
const removeDatabaseMetadataCache = useAppStore(
(s) => s.removeDatabaseMetadataCache
);
@@ -107,8 +107,8 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
if (selectedNames.size === 0) return [];
return Array.from(selectedNames)
.filter((name) => isValidDatabaseName(name))
- .map((name) => databaseStore.getDatabaseByName(name));
- }, [selectedNames, databaseStore]);
+ .map((name) => getDatabaseByName(name));
+ }, [selectedNames, getDatabaseByName, databasesByName]);
// Mirror `selectedDatabases` into a ref so the batch-operation handlers
// below can read the latest value without listing it as a dep. Otherwise
@@ -132,7 +132,9 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
title: t("db.start-to-sync-schema"),
});
try {
- await databaseStore.batchSyncDatabases(Array.from(selectedNames));
+ await useAppStore
+ .getState()
+ .batchSyncDatabases(Array.from(selectedNames));
for (const name of selectedNames) {
removeDatabaseMetadataCache(name);
}
@@ -151,12 +153,12 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
} finally {
setSyncing(false);
}
- }, [syncing, selectedNames, databaseStore, removeDatabaseMetadataCache, t]);
+ }, [syncing, selectedNames, removeDatabaseMetadataCache, t]);
const handleLabelsApply = useCallback(
async (labelsList: { [key: string]: string }[]) => {
try {
- await databaseStore.batchUpdateDatabases(
+ await useAppStore.getState().batchUpdateDatabases(
create(BatchUpdateDatabasesRequestSchema, {
parent: "-",
requests: selectedDatabasesRef.current.map((database, i) =>
@@ -184,13 +186,13 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
});
}
},
- [databaseStore, refresh, t]
+ [refresh, t]
);
const handleEnvironmentUpdate = useCallback(
async (environment: string) => {
try {
- await databaseStore.batchUpdateDatabases(
+ await useAppStore.getState().batchUpdateDatabases(
create(BatchUpdateDatabasesRequestSchema, {
parent: "-",
requests: selectedDatabasesRef.current.map((database) =>
@@ -218,13 +220,13 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
});
}
},
- [databaseStore, refresh, t]
+ [refresh, t]
);
const handleTransferProject = useCallback(
async (projectName: string) => {
try {
- await databaseStore.batchUpdateDatabases(
+ await useAppStore.getState().batchUpdateDatabases(
create(BatchUpdateDatabasesRequestSchema, {
parent: "-",
requests: selectedDatabasesRef.current.map((database) =>
@@ -252,7 +254,7 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
});
}
},
- [databaseStore, refresh, t]
+ [refresh, t]
);
// Trigger a fetch on mount so the instance is hydrated into the
// `useAppStore` cache. Without this, hard-refreshing the page shows
@@ -286,9 +288,9 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {
const syncSchema = useCallback(
async (enableFullSync: boolean) => {
await useAppStore.getState().syncInstance(instance.name, enableFullSync);
- databaseStore.removeCacheByInstance(instance.name);
+ useAppStore.getState().removeCacheByInstance(instance.name);
},
- [instance.name, databaseStore]
+ [instance.name]
);
// Database filter
diff --git a/frontend/src/react/pages/settings/InstancesPage.tsx b/frontend/src/react/pages/settings/InstancesPage.tsx
index 04d0e87a05..dbdc8ba90c 100644
--- a/frontend/src/react/pages/settings/InstancesPage.tsx
+++ b/frontend/src/react/pages/settings/InstancesPage.tsx
@@ -66,6 +66,7 @@ import {
import { useVueState } from "@/react/hooks/useVueState";
import { cn } from "@/react/lib/utils";
import { useAppStore } from "@/react/stores/app";
+import type { InstanceFilter } from "@/react/stores/app/types";
import { router } from "@/router";
import { INSTANCE_ROUTE_CREATE } from "@/router/dashboard/instance";
import {
@@ -76,7 +77,6 @@ import {
useSubscriptionV1Store,
} from "@/store";
import { environmentNamePrefix } from "@/store/modules/v1/common";
-import type { InstanceFilter } from "@/store/modules/v1/instance";
import {
isValidInstanceName,
NULL_ENVIRONMENT_NAME,
diff --git a/frontend/src/react/pages/settings/MemberDatabaseResourceName.test.tsx b/frontend/src/react/pages/settings/MemberDatabaseResourceName.test.tsx
index eaa29fa0fc..655a6868de 100644
--- a/frontend/src/react/pages/settings/MemberDatabaseResourceName.test.tsx
+++ b/frontend/src/react/pages/settings/MemberDatabaseResourceName.test.tsx
@@ -4,21 +4,21 @@ import type { DatabaseResource } from "@/types";
import { MemberDatabaseResourceName } from "./MemberDatabaseResourceName";
const mocks = vi.hoisted(() => ({
- getDatabaseByName: vi.fn(),
- getInstanceByName: vi.fn(),
+ databasesByName: {} as Record<string, unknown>,
+ instancesByName: {} as Record<string, unknown>,
}));
-vi.mock("@/react/hooks/useVueState", () => ({
- useVueState: <T,>(getter: () => T) => getter(),
-}));
-
-vi.mock("@/store", () => ({
- useDatabaseV1Store: () => ({
- getDatabaseByName: mocks.getDatabaseByName,
- }),
- useInstanceV1Store: () => ({
- getInstanceByName: mocks.getInstanceByName,
- }),
+vi.mock("@/react/stores/app", () => ({
+ useAppStore: <T,>(
+ selector: (state: {
+ databasesByName: Record<string, unknown>;
+ instancesByName: Record<string, unknown>;
+ }) => T
+ ) =>
+ selector({
+ databasesByName: mocks.databasesByName,
+ instancesByName: mocks.instancesByName,
+ }),
}));
vi.mock("@/react/components/EngineIcon", () => ({
@@ -47,19 +47,23 @@ const resource: DatabaseResource = {
describe("MemberDatabaseResourceName", () => {
beforeEach(() => {
vi.clearAllMocks();
- mocks.getDatabaseByName.mockReturnValue({
- name: "instances/prod/databases/hr",
- instanceResource: {
+ mocks.databasesByName = {
+ "instances/prod/databases/hr": {
+ name: "instances/prod/databases/hr",
+ instanceResource: {
+ name: "instances/prod",
+ title: "Production",
+ engine: "POSTGRES",
+ },
+ },
+ };
+ mocks.instancesByName = {
+ "instances/prod": {
name: "instances/prod",
title: "Production",
engine: "POSTGRES",
},
- });
- mocks.getInstanceByName.mockReturnValue({
- name: "instances/prod",
- title: "Production",
- engine: "POSTGRES",
- });
+ };
});
test("renders instance title and database name instead of raw resource path", () => {
@@ -74,14 +78,18 @@ describe("MemberDatabaseResourceName", () => {
});
test("falls back to instance id without showing unknown instance engine", () => {
- mocks.getDatabaseByName.mockReturnValue({
- name: "instances/prod/databases/hr",
- });
- mocks.getInstanceByName.mockReturnValue({
- name: "instances/-",
- title: "",
- engine: "MYSQL",
- });
+ mocks.databasesByName = {
+ "instances/prod/databases/hr": {
+ name: "instances/prod/databases/hr",
+ },
+ };
+ mocks.instancesByName = {
+ "instances/prod": {
+ name: "instances/-",
+ title: "",
+ engine: "MYSQL",
+ },
+ };
render(<MemberDatabaseResourceName resource={resource} />);
diff --git a/frontend/src/react/pages/settings/MemberDatabaseResourceName.tsx b/frontend/src/react/pages/settings/MemberDatabaseResourceName.tsx
index d3680a3dc0..00e97500a3 100644
--- a/frontend/src/react/pages/settings/MemberDatabaseResourceName.tsx
+++ b/frontend/src/react/pages/settings/MemberDatabaseResourceName.tsx
@@ -1,8 +1,7 @@
import { ChevronRight } from "lucide-react";
+import { useMemo } from "react";
import { EngineIcon } from "@/react/components/EngineIcon";
-import { useVueState } from "@/react/hooks/useVueState";
import { useAppStore } from "@/react/stores/app";
-import { useDatabaseV1Store } from "@/store";
import type { DatabaseResource } from "@/types";
import {
extractDatabaseResourceName,
@@ -14,25 +13,28 @@ export function MemberDatabaseResourceName({
}: {
resource?: DatabaseResource;
}) {
- const databaseStore = useDatabaseV1Store();
-
- const display = useVueState(() => {
+ const { instanceName } = resource
+ ? extractDatabaseResourceName(resource.databaseFullName)
+ : { instanceName: "" };
+ const expectedInstanceName = instanceName ? `instances/${instanceName}` : "";
+ const database = useAppStore((s) =>
+ resource ? s.databasesByName[resource.databaseFullName] : undefined
+ );
+ const instance = useAppStore((s) =>
+ expectedInstanceName ? s.instancesByName[expectedInstanceName] : undefined
+ );
+ const display = useMemo(() => {
if (!resource) {
return undefined;
}
- const { databaseName, instanceName } = extractDatabaseResourceName(
+ const { databaseName } = extractDatabaseResourceName(
resource.databaseFullName
);
- const database = databaseStore.getDatabaseByName(resource.databaseFullName);
- const expectedInstanceName = `instances/${instanceName}`;
- const instance = instanceName
- ? useAppStore.getState().getInstanceByName(expectedInstanceName)
- : undefined;
const validInstance =
instance?.name === expectedInstanceName ? instance : undefined;
const instanceResource =
- database.instanceResource?.name === expectedInstanceName
+ database?.instanceResource?.name === expectedInstanceName
? database.instanceResource
: undefined;
const instanceTitle =
@@ -45,7 +47,7 @@ export function MemberDatabaseResourceName({
engine: instanceResource?.engine || validInstance?.engine,
instanceTitle,
};
- });
+ }, [database, expectedInstanceName, instance, resource]);
if (!display) {
return <span>*</span>;
diff --git a/frontend/src/react/plugins/agent/logic/context.ts b/frontend/src/react/plugins/agent/logic/context.ts
index bc3a44dcd5..8f3ca8bc40 100644
--- a/frontend/src/react/plugins/agent/logic/context.ts
+++ b/frontend/src/react/plugins/agent/logic/context.ts
@@ -56,11 +56,9 @@ export async function extractRouteContext(
// Database context
if (instanceId && databaseName) {
try {
- const { useDatabaseV1Store } = await import("@/store");
- const store = useDatabaseV1Store();
- const db = store.getDatabaseByName(
- `instances/${instanceId}/databases/${databaseName}`
- );
+ const db = useAppStore
+ .getState()
+ .getDatabaseByName(`instances/${instanceId}/databases/${databaseName}`);
if (db?.name) {
ctx.database = {
name: db.name,
diff --git a/frontend/src/react/stores/app/database.ts b/frontend/src/react/stores/app/database.ts
index 58920402ef..e4443301fd 100644
--- a/frontend/src/react/stores/app/database.ts
+++ b/frontend/src/react/stores/app/database.ts
@@ -3,27 +3,31 @@ import { createContextValues } from "@connectrpc/connect";
import { uniq } from "lodash-es";
import { databaseServiceClientConnect } from "@/connect";
import { silentContextKey } from "@/connect/context-key";
-import { UNKNOWN_ID } from "@/types/const";
-import { State } from "@/types/proto-es/v1/common_pb";
import {
BatchGetDatabasesRequestSchema,
+ BatchSyncDatabasesRequestSchema,
+ type BatchUpdateDatabasesRequest,
+ BatchUpdateDatabasesRequestSchema,
type Database,
- DatabaseSchema$,
+ type DiffSchemaRequest,
+ DiffSchemaRequestSchema,
GetDatabaseRequestSchema,
+ GetDatabaseSchemaRequestSchema,
ListDatabasesRequestSchema,
SyncDatabaseRequestSchema,
+ type UpdateDatabaseRequest,
+ UpdateDatabaseRequestSchema,
} from "@/types/proto-es/v1/database_service_pb";
-import { isValidDatabaseName } from "@/types/v1/database";
import {
- formatEnvironmentName,
- unknownEnvironment,
-} from "@/types/v1/environment";
+ type Instance,
+ InstanceResourceSchema,
+} from "@/types/proto-es/v1/instance_service_pb";
+import { isValidDatabaseName } from "@/types/v1/database";
import { unknownInstanceResource } from "@/types/v1/instance";
+import { createUnknownDatabase, setDatabaseAccess } from "./databaseAccess";
import type { AppSliceCreator, DatabaseSlice } from "./types";
import { buildDatabaseFilter, toError } from "./utils";
-const UNKNOWN_PROJECT_NAME = `projects/${UNKNOWN_ID}`;
-
// Inlined to keep the app store's load graph free of the Pinia `@/store`
// barrel that `@/utils/v1/database` pulls in.
function instanceResourceNameFromDatabase(databaseName: string): string {
@@ -31,19 +35,6 @@ function instanceResourceNameFromDatabase(databaseName: string): string {
return match ? `instances/${match[1]}` : "";
}
-// Mirrors the legacy Pinia `unknownDatabase`, inlined so this module does not
-// import `@/types/v1/project` (which pulls the Pinia actuator store).
-function createUnknownDatabase(): Database {
- const instanceResource = unknownInstanceResource();
- return createProto(DatabaseSchema$, {
- name: `${instanceResource.name}/databases/${UNKNOWN_ID}`,
- state: State.ACTIVE,
- project: UNKNOWN_PROJECT_NAME,
- effectiveEnvironment: formatEnvironmentName(unknownEnvironment().id),
- instanceResource,
- });
-}
-
export const createDatabaseSlice: AppSliceCreator<DatabaseSlice> = (
set,
get
@@ -66,6 +57,22 @@ export const createDatabaseSlice: AppSliceCreator<DatabaseSlice> = (
return databases;
};
+ // Compose then immutably merge into the by-name cache; returns the composed
+ // list so callers can hand it straight back to their consumers.
+ const upsertDatabases = async (
+ databases: Database[]
+ ): Promise<Database[]> => {
+ const composed = await composeDatabases(databases);
+ set((state) => {
+ const next = { ...state.databasesByName };
+ for (const db of composed) {
+ next[db.name] = db;
+ }
+ return { databasesByName: next };
+ });
+ return composed;
+ };
+
const fetchByName = async (
name: string,
silent: boolean
@@ -120,11 +127,21 @@ export const createDatabaseSlice: AppSliceCreator<DatabaseSlice> = (
return request;
};
- return {
+ const slice: DatabaseSlice = {
databasesByName: {},
databaseRequests: {},
databaseErrorsByName: {},
+ resetDatabases: () => {
+ set({
+ databasesByName: {},
+ databaseRequests: {},
+ databaseErrorsByName: {},
+ });
+ },
+
+ getDatabaseList: () => Object.values(get().databasesByName),
+
getDatabaseByName: (name) =>
get().databasesByName[name] ?? createUnknownDatabase(),
@@ -170,6 +187,7 @@ export const createDatabaseSlice: AppSliceCreator<DatabaseSlice> = (
filter,
orderBy,
silent,
+ skipCacheRemoval,
}) => {
const filterString =
typeof filter === "string"
@@ -195,14 +213,10 @@ export const createDatabaseSlice: AppSliceCreator<DatabaseSlice> = (
),
}
);
- const composed = await composeDatabases(response.databases);
- set((state) => {
- const next = { ...state.databasesByName };
- for (const db of composed) {
- next[db.name] = db;
- }
- return { databasesByName: next };
- });
+ if (parent.startsWith("instances/") && !skipCacheRemoval) {
+ get().removeCacheByInstance(parent);
+ }
+ const composed = await upsertDatabases(response.databases);
return {
databases: composed,
nextPageToken: response.nextPageToken,
@@ -217,14 +231,107 @@ export const createDatabaseSlice: AppSliceCreator<DatabaseSlice> = (
const database = await databaseServiceClientConnect.getDatabase(
createProto(GetDatabaseRequestSchema, { name })
);
- const [composed] = await composeDatabases([database]);
- set((state) => ({
- databasesByName: {
- ...state.databasesByName,
- [composed.name]: composed,
- },
- }));
+ await upsertDatabases([database]);
+ }
+ },
+
+ batchSyncDatabases: async (databases) => {
+ await databaseServiceClientConnect.batchSyncDatabases(
+ createProto(BatchSyncDatabasesRequestSchema, {
+ parent: "instances/-",
+ names: databases,
+ })
+ );
+ },
+
+ batchUpdateDatabases: async (params: BatchUpdateDatabasesRequest) => {
+ const response = await databaseServiceClientConnect.batchUpdateDatabases(
+ createProto(BatchUpdateDatabasesRequestSchema, {
+ parent: params.parent,
+ requests: params.requests.map((req) => ({
+ database: req.database,
+ updateMask: req.updateMask,
+ })),
+ })
+ );
+ return upsertDatabases(response.databases);
+ },
+
+ updateDatabase: async (params: UpdateDatabaseRequest) => {
+ if (!params.database) {
+ throw new Error("Database is required for update");
}
+ const updated = await databaseServiceClientConnect.updateDatabase(
+ createProto(UpdateDatabaseRequestSchema, {
+ database: params.database,
+ updateMask: params.updateMask,
+ })
+ );
+ const [composed] = await upsertDatabases([updated]);
+ return composed;
},
+
+ removeCacheByInstance: (instance) => {
+ const names = Object.keys(get().databasesByName).filter(
+ (name) => instanceResourceNameFromDatabase(name) === instance
+ );
+ if (!names.length) return;
+ set((state) => {
+ const next = { ...state.databasesByName };
+ for (const name of names) {
+ delete next[name];
+ }
+ return { databasesByName: next };
+ });
+ for (const name of names) {
+ get().removeDatabaseMetadataCache(name);
+ }
+ },
+
+ updateDatabaseInstance: (instance: Instance) => {
+ set((state) => {
+ const next = { ...state.databasesByName };
+ for (const [name, database] of Object.entries(next)) {
+ if (instanceResourceNameFromDatabase(name) !== instance.name) {
+ continue;
+ }
+ next[name] = {
+ ...database,
+ instanceResource: createProto(InstanceResourceSchema, {
+ name: instance.name,
+ title: instance.title,
+ engine: instance.engine,
+ environment: instance.environment,
+ activation: instance.activation,
+ dataSources: [],
+ }),
+ };
+ }
+ return { databasesByName: next };
+ });
+ },
+
+ fetchDatabaseSchema: (database) =>
+ databaseServiceClientConnect.getDatabaseSchema(
+ createProto(GetDatabaseSchemaRequestSchema, {
+ name: `${database}/schema`,
+ })
+ ),
+
+ diffSchema: (params: DiffSchemaRequest) =>
+ databaseServiceClientConnect.diffSchema(
+ createProto(DiffSchemaRequestSchema, params)
+ ),
};
+
+ setDatabaseAccess({
+ resetDatabases: slice.resetDatabases,
+ getDatabaseList: slice.getDatabaseList,
+ getDatabaseByName: slice.getDatabaseByName,
+ getOrFetchDatabaseByName: slice.getOrFetchDatabaseByName,
+ batchGetOrFetchDatabases: slice.batchGetOrFetchDatabases,
+ fetchDatabases: slice.fetchDatabases,
+ });
+
+ return slice;
};
diff --git a/frontend/src/react/stores/app/databaseAccess.ts b/frontend/src/react/stores/app/databaseAccess.ts
new file mode 100644
index 0000000000..912f837683
--- /dev/null
+++ b/frontend/src/react/stores/app/databaseAccess.ts
@@ -0,0 +1,70 @@
+import { create as createProto } from "@bufbuild/protobuf";
+import { UNKNOWN_ID } from "@/types/const";
+import { State } from "@/types/proto-es/v1/common_pb";
+import {
+ type Database,
+ DatabaseSchema$,
+} from "@/types/proto-es/v1/database_service_pb";
+import {
+ formatEnvironmentName,
+ unknownEnvironment,
+} from "@/types/v1/environment";
+import { unknownInstanceResource } from "@/types/v1/instance";
+import type { DatabaseListParams } from "./types";
+
+const UNKNOWN_PROJECT_NAME = `projects/${UNKNOWN_ID}`;
+
+export function createUnknownDatabase(): Database {
+ const instanceResource = unknownInstanceResource();
+ return createProto(DatabaseSchema$, {
+ name: `${instanceResource.name}/databases/${UNKNOWN_ID}`,
+ state: State.ACTIVE,
+ project: UNKNOWN_PROJECT_NAME,
+ effectiveEnvironment: formatEnvironmentName(unknownEnvironment().id),
+ instanceResource,
+ });
+}
+
+type DatabaseAccess = {
+ resetDatabases: () => void;
+ getDatabaseList: () => Database[];
+ getDatabaseByName: (name: string) => Database;
+ getOrFetchDatabaseByName: (
+ name: string,
+ silent?: boolean
+ ) => Promise<Database>;
+ batchGetOrFetchDatabases: (names: string[]) => Promise<Database[]>;
+ fetchDatabases: (params: DatabaseListParams) => Promise<{
+ databases: Database[];
+ nextPageToken: string;
+ }>;
+};
+
+let databaseAccess: DatabaseAccess = {
+ resetDatabases: () => {},
+ getDatabaseList: () => [],
+ getDatabaseByName: () => createUnknownDatabase(),
+ getOrFetchDatabaseByName: async () => createUnknownDatabase(),
+ batchGetOrFetchDatabases: async () => [],
+ fetchDatabases: async () => ({ databases: [], nextPageToken: "" }),
+};
+
+export const setDatabaseAccess = (access: DatabaseAccess) => {
+ databaseAccess = access;
+};
+
+export const resetDatabases = () => databaseAccess.resetDatabases();
+
+export const getDatabaseList = () => databaseAccess.getDatabaseList();
+
+export const getDatabaseByName = (name: string) =>
+ databaseAccess.getDatabaseByName(name);
+
+export const getOrFetchDatabaseByName = (name: string, silent?: boolean) =>
+ databaseAccess.getOrFetchDatabaseByName(name, silent);
+
+export const batchGetOrFetchDatabases = (names: string[]) =>
+ databaseAccess.batchGetOrFetchDatabases(names);
+
+export const fetchDatabases = (params: DatabaseListParams) =>
+ databaseAccess.fetchDatabases(params);
diff --git a/frontend/src/react/stores/app/instance.ts b/frontend/src/react/stores/app/instance.ts
index 20c64801e0..7c5a4ef472 100644
--- a/frontend/src/react/stores/app/instance.ts
+++ b/frontend/src/react/stores/app/instance.ts
@@ -90,6 +90,14 @@ export const createInstanceSlice: AppSliceCreator<InstanceSlice> = (
instanceRequests: {},
instanceErrorsByName: {},
+ resetInstances: () => {
+ set({
+ instancesByName: {},
+ instanceRequests: {},
+ instanceErrorsByName: {},
+ });
+ },
+
fetchInstance: async (name) => {
if (!isValidInstanceName(name) || name === UNKNOWN_INSTANCE_NAME) {
return undefined;
diff --git a/frontend/src/react/stores/app/types.ts b/frontend/src/react/stores/app/types.ts
index f4df1adf30..c0efb2a477 100644
--- a/frontend/src/react/stores/app/types.ts
+++ b/frontend/src/react/stores/app/types.ts
@@ -13,10 +13,14 @@ import type {
DatabaseGroupView,
} from "@/types/proto-es/v1/database_group_service_pb";
import type {
+ BatchUpdateDatabasesRequest,
Changelog,
ChangelogView,
Database,
DatabaseMetadata,
+ DatabaseSchema,
+ DiffSchemaRequest,
+ DiffSchemaResponse,
ExtensionMetadata,
ExternalTableMetadata,
FunctionMetadata,
@@ -24,6 +28,7 @@ import type {
ListChangelogsRequest,
SchemaMetadata,
TableMetadata,
+ UpdateDatabaseRequest,
ViewMetadata,
} from "@/types/proto-es/v1/database_service_pb";
import type { Group } from "@/types/proto-es/v1/group_service_pb";
@@ -291,6 +296,7 @@ export type InstanceSlice = {
instancesByName: Record<string, Instance>;
instanceRequests: Record<string, Promise<Instance | undefined>>;
instanceErrorsByName: Record<string, Error | undefined>;
+ resetInstances: () => void;
fetchInstance: (name: string) => Promise<Instance | undefined>;
getInstanceByName: (name: string) => Instance;
getOrFetchInstanceByName: (
@@ -356,12 +362,17 @@ export type DatabaseListParams = {
filter?: string | DatabaseFilter;
orderBy?: string;
silent?: boolean;
+ // When listing by instance parent, stale cached databases for that instance
+ // are evicted first unless this is set (e.g. paginated "load more").
+ skipCacheRemoval?: boolean;
};
export type DatabaseSlice = {
databasesByName: Record<string, Database>;
databaseRequests: Record<string, Promise<Database | undefined>>;
databaseErrorsByName: Record<string, Error | undefined>;
+ resetDatabases: () => void;
+ getDatabaseList: () => Database[];
// Synchronous read with the `unknownDatabase` fallback (never null), so
// callers can read `.project` / `.instanceResource` without null checks.
getDatabaseByName: (name: string) => Database;
@@ -379,6 +390,17 @@ export type DatabaseSlice = {
nextPageToken: string;
}>;
syncDatabase: (name: string, refresh?: boolean) => Promise<void>;
+ batchSyncDatabases: (databases: string[]) => Promise<void>;
+ batchUpdateDatabases: (
+ params: BatchUpdateDatabasesRequest
+ ) => Promise<Database[]>;
+ updateDatabase: (params: UpdateDatabaseRequest) => Promise<Database>;
+ // Drops cached databases (and their schema metadata) for the given instance.
+ removeCacheByInstance: (instance: string) => void;
+ // Patches the cached `instanceResource` of every database under `instance`.
+ updateDatabaseInstance: (instance: Instance) => void;
+ fetchDatabaseSchema: (database: string) => Promise<DatabaseSchema>;
+ diffSchema: (params: DiffSchemaRequest) => Promise<DiffSchemaResponse>;
};
export type DBGroupSlice = {
diff --git a/frontend/src/router/dashboard/instance.ts b/frontend/src/router/dashboard/instance.ts
index 0bae431ca0..bbde9c731f 100644
--- a/frontend/src/router/dashboard/instance.ts
+++ b/frontend/src/router/dashboard/instance.ts
@@ -1,63 +1,11 @@
import type { RouteLocationNormalized, RouteRecordRaw } from "vue-router";
-import DummyRootView from "@/DummyRootView";
import { t } from "@/plugins/i18n";
-import {
- databaseNamePrefix,
- instanceNamePrefix,
- pushNotification,
- useDatabaseV1Store,
-} from "@/store";
-import { isValidProjectName } from "@/types";
-import { extractProjectResourceName } from "@/utils/v1";
-import { PROJECT_V1_ROUTE_DATABASE_DETAIL } from "./projectV1";
import { INSTANCE_ROUTE_DASHBOARD } from "./workspaceRoutes";
export const INSTANCE_ROUTE_CREATE = `${INSTANCE_ROUTE_DASHBOARD}.create`;
export const INSTANCE_ROUTE_DETAIL = `${INSTANCE_ROUTE_DASHBOARD}.detail`;
export const INSTANCE_ROUTE_DATABASE_DETAIL = `${INSTANCE_ROUTE_DASHBOARD}.database.detail`;
-const redirectToProjectDatabaseDetail = async (
- route: RouteLocationNormalized
-) => {
- const instanceId = route.params.instanceId as string;
- const databaseName = route.params.databaseName as string;
- try {
- const database = await useDatabaseV1Store().getOrFetchDatabaseByName(
- `${instanceNamePrefix}${instanceId}/${databaseNamePrefix}${databaseName}`
- );
- if (database && isValidProjectName(database.project)) {
- return {
- name: PROJECT_V1_ROUTE_DATABASE_DETAIL,
- params: {
- projectId: extractProjectResourceName(database.project),
- instanceId,
- databaseName,
- },
- };
- }
- pushNotification({
- module: "bytebase",
- style: "WARN",
- title: "Database not found",
- description: `Database: ${databaseName}`,
- });
- } catch (error) {
- console.error("Failed to fetch database:", error);
- pushNotification({
- module: "bytebase",
- style: "CRITICAL",
- title: "Error",
- description: `Failed to load database: ${databaseName}`,
- });
- }
- return {
- name: INSTANCE_ROUTE_DETAIL,
- params: {
- instanceId,
- },
- };
-};
-
const instanceRoutes: RouteRecordRaw[] = [
{
path: "instances/new",
@@ -111,8 +59,12 @@ const instanceRoutes: RouteRecordRaw[] = [
meta: {
requiredPermissionList: () => ["bb.projects.get", "bb.databases.get"],
},
- component: DummyRootView,
- beforeEnter: redirectToProjectDatabaseDetail,
+ component: () => import("@/react/ReactPageMount.vue"),
+ props: (route: RouteLocationNormalized) => ({
+ page: "InstanceDatabaseRedirectPage",
+ instanceId: route.params.instanceId,
+ databaseName: route.params.databaseName,
+ }),
},
],
},
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 0423dc46ab..d404451d81 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -11,8 +11,6 @@ import {
useRouterStore,
useCurrentUserV1,
useProjectV1Store,
- useDatabaseV1Store,
- useInstanceV1Store,
useSettingV1Store,
} from "@/store";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
@@ -170,9 +168,11 @@ router.beforeEach((to, from, next) => {
// Auth pages: Reset stores and allow access
if (isAuthRelatedRoute(to.name as string)) {
- useDatabaseV1Store().reset();
useProjectV1Store().reset();
- useInstanceV1Store().reset();
+ void import("@/react/stores/app").then(({ useAppStore }) => {
+ useAppStore.getState().resetDatabases();
+ useAppStore.getState().resetInstances();
+ });
import("@/plugins/ai/store").then(({ useConversationStore }) => {
useConversationStore().reset();
});
diff --git a/frontend/src/store/modules/v1/database.ts b/frontend/src/store/modules/v1/database.ts
deleted file mode 100644
index 0df2cfca80..0000000000
--- a/frontend/src/store/modules/v1/database.ts
+++ /dev/null
@@ -1,425 +0,0 @@
-import { create } from "@bufbuild/protobuf";
-import { createContextValues } from "@connectrpc/connect";
-import { uniq } from "lodash-es";
-import { defineStore } from "pinia";
-import { computed, markRaw, reactive, ref, unref, watch } from "vue";
-import { databaseServiceClientConnect } from "@/connect";
-import { silentContextKey } from "@/connect/context-key";
-// Canonical definition lives in `@/react/lib/databaseFilter`; re-exported
-// here so existing `from "@/store/modules/v1/database"` consumers keep
-// working until they migrate to the React-lib path.
-import type { DatabaseFilter } from "@/react/lib/databaseFilter";
-import type { MaybeRef } from "@/types";
-import {
- isValidDatabaseName,
- isValidEnvironmentName,
- isValidInstanceName,
- isValidProjectName,
- unknownDatabase,
- unknownEnvironment,
- unknownInstanceResource,
-} from "@/types";
-import { Engine } from "@/types/proto-es/v1/common_pb";
-import type {
- BatchUpdateDatabasesRequest,
- Database,
- DiffSchemaRequest,
- UpdateDatabaseRequest,
-} from "@/types/proto-es/v1/database_service_pb";
-import {
- BatchGetDatabasesRequestSchema,
- BatchSyncDatabasesRequestSchema,
- BatchUpdateDatabasesRequestSchema,
- DiffSchemaRequestSchema,
- GetDatabaseRequestSchema,
- GetDatabaseSchemaRequestSchema,
- ListDatabasesRequestSchema,
- SyncDatabaseRequestSchema,
- UpdateDatabaseRequestSchema,
-} from "@/types/proto-es/v1/database_service_pb";
-import {
- type Instance,
- InstanceResourceSchema,
-} from "@/types/proto-es/v1/instance_service_pb";
-import { extractDatabaseResourceName } from "@/utils";
-import {
- instanceNamePrefix,
- projectNamePrefix,
- workspaceNamePrefix,
-} from "./common";
-import { useDBSchemaV1Store } from "./dbSchema";
-import { useProjectV1Store } from "./project";
-
-export type { DatabaseFilter };
-
-const isValidParentName = (parent: string): boolean => {
- if (parent.startsWith(workspaceNamePrefix)) {
- return true;
- }
- if (parent.startsWith(projectNamePrefix)) {
- return isValidProjectName(parent);
- }
- if (parent.startsWith(instanceNamePrefix)) {
- return isValidInstanceName(parent);
- }
- return false;
-};
-
-// getLabelFilter convert the input to API label filter format like: labels.{key} == {value}
-// the input label should be "{label key}:{value1},{value2}" format
-export const getLabelFilter = (labels: string[]): string[] => {
- const labelMap = new Map<string, string[]>(); // key: value[]
- for (const label of labels) {
- const sections = label.split(":");
- if (sections.length !== 2) {
- continue;
- }
- const [key, rawValue] = sections;
- const values = rawValue.split(",");
- if (!labelMap.has(key)) {
- labelMap.set(key, []);
- }
- labelMap.get(key)?.push(...values);
- }
-
- return [...labelMap.entries()].reduce((result, [key, values]) => {
- switch (values.length) {
- case 0:
- return result;
- case 1:
- result.push(`labels.${key} == "${values[0]}"`);
- return result;
- default:
- result.push(
- `labels.${key} in [${values.map((v) => `"${v}"`).join(", ")}]`
- );
- return result;
- }
- }, [] as string[]);
-};
-
-const getListDatabaseFilter = (filter: DatabaseFilter): string => {
- const params: string[] = [];
- if (isValidProjectName(filter.project)) {
- params.push(`project == "${filter.project}"`);
- }
- if (isValidInstanceName(filter.instance)) {
- params.push(`instance == "${filter.instance}"`);
- }
- if (filter.environment === unknownEnvironment().name) {
- params.push(`environment == ""`);
- } else if (isValidEnvironmentName(filter.environment)) {
- params.push(`environment == "${filter.environment}"`);
- }
- if (filter.excludeUnassigned) {
- params.push(`exclude_unassigned == true`);
- }
- if (filter.engines && filter.engines.length > 0) {
- // engine filter should be:
- // engine in ["MYSQL", "POSTGRES"]
- params.push(
- `engine in [${filter.engines.map((e) => `"${Engine[e]}"`).join(", ")}]`
- );
- } else if (filter.excludeEngines && filter.excludeEngines.length > 0) {
- // engine filter should be:
- // !(engine in ["REDIS", "MONGODB"])
- params.push(
- `!(engine in [${filter.excludeEngines.map((e) => `"${Engine[e]}"`).join(", ")}])`
- );
- }
- const keyword = filter.query?.trim()?.toLowerCase();
- if (keyword) {
- params.push(`name.contains("${keyword}")`);
- }
-
- if (filter.labels) {
- params.push(...getLabelFilter(filter.labels));
- }
-
- if (filter.table) {
- params.push(`table.contains("${filter.table}")`);
- }
-
- return params.join(" && ");
-};
-
-export const useDatabaseV1Store = defineStore("database_v1", () => {
- const databaseMapByName = reactive(new Map<string, Database>());
- const dbSchemaStore = useDBSchemaV1Store();
- const databaseRequestCache = new Map<string, Promise<Database>>();
-
- // Getters
- const databaseList = computed(() => {
- return Array.from(databaseMapByName.values());
- });
-
- // Actions
- const reset = () => {
- databaseMapByName.clear();
- };
-
- const removeCacheByInstance = (instance: string) => {
- for (const db of databaseList.value) {
- const { instance: dbInstance } = extractDatabaseResourceName(db.name);
- if (dbInstance === instance) {
- databaseMapByName.delete(db.name);
- dbSchemaStore.removeCache(db.name);
- }
- }
- };
-
- const fetchDatabases = async (params: {
- pageSize: number;
- pageToken?: string;
- parent: string;
- filter?: DatabaseFilter;
- skipCacheRemoval?: boolean;
- orderBy?: string;
- silent?: boolean;
- }): Promise<{
- databases: Database[];
- nextPageToken: string;
- }> => {
- if (!isValidParentName(params.parent)) {
- return {
- databases: [],
- nextPageToken: "",
- };
- }
-
- const request = create(ListDatabasesRequestSchema, {
- parent: params.parent,
- pageSize: params.pageSize,
- pageToken: params.pageToken,
- orderBy: params.orderBy,
- showDeleted: params.filter?.showDeleted,
- filter: getListDatabaseFilter(params.filter ?? {}),
- });
- const response = await databaseServiceClientConnect.listDatabases(request, {
- contextValues: createContextValues().set(silentContextKey, params.silent),
- });
- const databases = response.databases; // Work directly with proto-es types
- const { nextPageToken } = response;
- if (
- params.parent.startsWith(instanceNamePrefix) &&
- !params.skipCacheRemoval
- ) {
- removeCacheByInstance(params.parent);
- }
-
- const composedDatabases = await upsertDatabaseMap(databases);
- return {
- databases: composedDatabases,
- nextPageToken,
- };
- };
-
- const upsertDatabaseMap = async (databaseList: Database[]) => {
- const composedDatabaseList = await batchComposeDatabase(databaseList);
- composedDatabaseList.forEach((database) => {
- databaseMapByName.set(database.name, database);
- });
- return composedDatabaseList;
- };
- const updateDatabaseInstance = (instance: Instance) => {
- for (const [_, database] of databaseMapByName) {
- const { instance: dbInstance } = extractDatabaseResourceName(
- database.name
- );
- if (dbInstance !== instance.name) {
- continue;
- }
- database.instanceResource = create(InstanceResourceSchema, {
- name: instance.name,
- title: instance.title,
- engine: instance.engine,
- environment: instance.environment,
- activation: instance.activation,
- dataSources: [],
- });
- }
- };
- const batchSyncDatabases = async (databases: string[]) => {
- const request = create(BatchSyncDatabasesRequestSchema, {
- parent: `${instanceNamePrefix}-`,
- names: databases,
- });
- await databaseServiceClientConnect.batchSyncDatabases(request);
- };
- const syncDatabase = async (database: string, refresh = false) => {
- const request = create(SyncDatabaseRequestSchema, {
- name: database,
- });
- await databaseServiceClientConnect.syncDatabase(request);
- if (refresh) {
- await fetchDatabaseByName(database);
- }
- };
- const getDatabaseByName = (name: string) => {
- return databaseMapByName.get(name) ?? unknownDatabase();
- };
- const fetchDatabaseByName = async (name: string, silent = false) => {
- const request = create(GetDatabaseRequestSchema, {
- name,
- });
- const database = await databaseServiceClientConnect.getDatabase(request, {
- contextValues: createContextValues().set(silentContextKey, silent),
- });
-
- const [composed] = await upsertDatabaseMap([database]);
-
- return composed;
- };
- const getOrFetchDatabaseByName = async (name: string, silent = true) => {
- const existed = databaseMapByName.get(name);
- if (existed) {
- return existed;
- }
- if (!isValidDatabaseName(name)) {
- return unknownDatabase();
- }
- const cached = databaseRequestCache.get(name);
- if (cached) return cached;
- const request = fetchDatabaseByName(name, silent);
- databaseRequestCache.set(name, request);
- return request;
- };
-
- const batchGetDatabases = async (names: string[], silent = true) => {
- const validNames = names.filter(isValidDatabaseName);
- if (validNames.length === 0) {
- return [];
- }
- const request = create(BatchGetDatabasesRequestSchema, {
- names: validNames,
- });
- const response = await databaseServiceClientConnect.batchGetDatabases(
- request,
- {
- contextValues: createContextValues().set(silentContextKey, silent),
- }
- );
- const databases = response.databases; // Work directly with proto-es types
- const composed = await upsertDatabaseMap(databases);
- return composed;
- };
-
- const batchGetOrFetchDatabases = async (databaseNames: string[]) => {
- const validDatabaseList = uniq(databaseNames).filter(isValidDatabaseName);
- const pendingFetch = validDatabaseList.filter((databaseName) => {
- if (
- getDatabaseByName(databaseName) &&
- isValidDatabaseName(getDatabaseByName(databaseName).name)
- ) {
- return false;
- }
- return true;
- });
- await batchGetDatabases(pendingFetch);
- return validDatabaseList.map(getDatabaseByName);
- };
-
- const batchUpdateDatabases = async (params: BatchUpdateDatabasesRequest) => {
- const request = create(BatchUpdateDatabasesRequestSchema, {
- parent: params.parent,
- requests: params.requests.map((req) => ({
- database: req.database,
- updateMask: req.updateMask,
- })),
- });
- const response =
- await databaseServiceClientConnect.batchUpdateDatabases(request);
- const updatedDatabases = response.databases; // Work directly with proto-es types
- const composed = await upsertDatabaseMap(updatedDatabases);
- return composed;
- };
- const updateDatabase = async (params: UpdateDatabaseRequest) => {
- if (!params.database) {
- throw new Error("Database is required for update");
- }
- const request = create(UpdateDatabaseRequestSchema, {
- ...params,
- database: params.database,
- updateMask: params.updateMask,
- });
- const updated = await databaseServiceClientConnect.updateDatabase(request);
- const [composed] = await upsertDatabaseMap([updated]);
- return composed;
- };
- const fetchDatabaseSchema = async (database: string) => {
- const request = create(GetDatabaseSchemaRequestSchema, {
- name: `${database}/schema`,
- });
- const schema =
- await databaseServiceClientConnect.getDatabaseSchema(request);
- return schema;
- };
- const diffSchema = async (params: DiffSchemaRequest) => {
- const request = create(DiffSchemaRequestSchema, params);
- const resp = await databaseServiceClientConnect.diffSchema(request);
- return resp;
- };
-
- return {
- reset,
- databaseList,
- removeCacheByInstance,
- upsertDatabaseMap,
- syncDatabase,
- batchSyncDatabases,
- getDatabaseByName,
- fetchDatabaseByName,
- getOrFetchDatabaseByName,
- batchGetOrFetchDatabases,
- batchUpdateDatabases,
- updateDatabase,
- fetchDatabaseSchema,
- updateDatabaseInstance,
- diffSchema,
- fetchDatabases,
- };
-});
-
-export const useDatabaseV1ByName = (name: MaybeRef<string>) => {
- const store = useDatabaseV1Store();
- const ready = ref(true);
- watch(
- () => unref(name),
- (name) => {
- ready.value = false;
- store.getOrFetchDatabaseByName(name).then(() => {
- ready.value = true;
- });
- },
- { immediate: true }
- );
- const database = computed(() => store.getDatabaseByName(unref(name)));
-
- return {
- database,
- ready,
- };
-};
-
-export const batchComposeDatabase = async (
- databaseList: Database[]
-): Promise<Database[]> => {
- const projectV1Store = useProjectV1Store();
-
- // Pre-fetch projects for all databases to ensure they're cached
- await projectV1Store.batchGetOrFetchProjects(
- databaseList.map((db) => db.project)
- );
-
- return databaseList.map((db) => {
- // Ensure instanceResource is populated with a fallback
- if (!db.instanceResource) {
- const { instance } = extractDatabaseResourceName(db.name);
- db.instanceResource = {
- ...unknownInstanceResource(),
- name: instance,
- };
- }
- return markRaw(db);
- });
-};
diff --git a/frontend/src/store/modules/v1/dbSchema.ts b/frontend/src/store/modules/v1/dbSchema.ts
deleted file mode 100644
index cc8f57d59c..0000000000
--- a/frontend/src/store/modules/v1/dbSchema.ts
+++ /dev/null
@@ -1,470 +0,0 @@
-import { create } from "@bufbuild/protobuf";
-import { createContextValues } from "@connectrpc/connect";
-import { defineStore } from "pinia";
-import { computed, unref, watchEffect } from "vue";
-import { databaseServiceClientConnect } from "@/connect";
-import { silentContextKey } from "@/connect/context-key";
-// Removed conversion imports as part of Bold Migration Strategy
-import { useCache } from "@/store/cache";
-import type { MaybeRef } from "@/types";
-import { UNKNOWN_ID, UNKNOWN_INSTANCE_NAME } from "@/types";
-import type { DatabaseMetadata } from "@/types/proto-es/v1/database_service_pb";
-import {
- DatabaseMetadataSchema,
- ExternalTableMetadataSchema,
- GetDatabaseMetadataRequestSchema,
- SchemaMetadataSchema,
- TableMetadataSchema,
- ViewMetadataSchema,
-} from "@/types/proto-es/v1/database_service_pb";
-import { extractDatabaseResourceName } from "@/utils";
-
-type DatabaseMetadataCacheKey = [
- string /* database metadata resource name */,
- string /* filter */,
- number /* limit */,
-];
-
-export const useDBSchemaV1Store = defineStore("dbSchema_v1", () => {
- const cacheByName = useCache<DatabaseMetadataCacheKey, DatabaseMetadata>(
- "bb.db-schema.by-name"
- );
-
- // getCache try use cache.
- const getCache = ({
- name,
- filter,
- limit,
- }: {
- name: string;
- filter: string;
- limit: number;
- }): DatabaseMetadata | undefined => {
- const metadataResourceName = ensureDatabaseMetadataResourceName(name);
- return cacheByName.getEntity([metadataResourceName, filter, limit]);
- };
-
- const getRequestCache = ({
- name,
- filter,
- limit,
- }: {
- name: string;
- filter: string;
- limit: number;
- }): Promise<DatabaseMetadata> | undefined => {
- const metadataResourceName = ensureDatabaseMetadataResourceName(name);
- return cacheByName.getRequest([metadataResourceName, filter, limit]);
- };
-
- const setCache = ({
- metadata,
- filter,
- limit,
- }: {
- metadata: DatabaseMetadata;
- filter: string;
- limit: number;
- }) => {
- cacheByName.setEntity([metadata.name, filter, limit], metadata);
- return metadata;
- };
-
- const setRequestCache = ({
- name,
- filter,
- limit,
- promise,
- }: {
- name: string;
- filter: string;
- limit: number;
- promise: Promise<DatabaseMetadata>;
- }) => {
- const metadataResourceName = ensureDatabaseMetadataResourceName(name);
- cacheByName.setRequest([metadataResourceName, filter, limit], promise);
- return promise;
- };
-
- const getDatabaseMetadataWithoutDefault = (database: string) =>
- getCache({
- name: database,
- filter: "",
- limit: 0,
- });
-
- /**
- *
- * @param database
- * @param view if not specified, try find full -> basic
- * @returns
- */
- const getDatabaseMetadata = (database: string) => {
- return (
- getDatabaseMetadataWithoutDefault(database) ??
- create(DatabaseMetadataSchema, {
- name: ensureDatabaseMetadataResourceName(database),
- })
- );
- };
- /**
- * @param params if view is not specified, try use cache (full -> basic), use basic if cache missed
- * @returns
- */
- const getOrFetchDatabaseMetadata = async (params: {
- database: string;
- skipCache?: boolean;
- silent?: boolean;
- limit?: number; // limit the number of returned tables per schema
- filter?: string; // used to filter schema and table, e.g. schema == "public" && table.contains("user")
- }) => {
- const {
- limit = 0,
- filter = "",
- database,
- silent = false,
- skipCache = false,
- } = params;
- const { databaseName, instanceName } =
- extractDatabaseResourceName(database);
- if (
- databaseName === String(UNKNOWN_ID) ||
- instanceName === String(UNKNOWN_ID)
- ) {
- return create(DatabaseMetadataSchema, {
- name: ensureDatabaseMetadataResourceName(
- `${UNKNOWN_INSTANCE_NAME}/databases/${UNKNOWN_ID}`
- ),
- });
- }
-
- if (!skipCache) {
- const existed = getCache({ name: database, filter, limit });
- if (existed) {
- // The metadata entity is stored in local dictionary.
- return existed;
- }
- const cachedRequest = getRequestCache({
- name: database,
- filter,
- limit,
- });
- if (cachedRequest) {
- // The request was sent but still not returned.
- // We won't create a duplicated request.
- return cachedRequest;
- }
- }
-
- // Send a request and cache it.
- console.debug("[getOrFetchDatabaseMetadata]", {
- database,
- limit,
- filter,
- });
- const request = create(GetDatabaseMetadataRequestSchema, {
- name: ensureDatabaseMetadataResourceName(database),
- limit,
- filter,
- });
- const promise = databaseServiceClientConnect
- .getDatabaseMetadata(request, {
- contextValues: createContextValues().set(silentContextKey, silent),
- })
- .then((res) => setCache({ metadata: res, filter, limit }));
- return setRequestCache({ name: database, filter, limit, promise });
- };
-
- const getSchemaList = (database: string) => {
- return getDatabaseMetadataWithoutDefault(database)?.schemas ?? [];
- };
-
- const getSchemaMetadata = ({
- database,
- schema,
- }: {
- database: string;
- schema: string;
- }) => {
- return getSchemaList(database).find((s) => s.name === schema);
- };
-
- const getOrFetchSchemaMetadata = async ({
- database,
- schema,
- }: {
- database: string;
- schema: string;
- }) => {
- const { databaseName } = extractDatabaseResourceName(database);
- if (
- databaseName === String(UNKNOWN_ID) ||
- databaseName === String(UNKNOWN_ID)
- ) {
- return create(SchemaMetadataSchema, {
- name: schema,
- });
- }
-
- const schemaMetadata = getSchemaMetadata({ database, schema });
- if (schemaMetadata?.name === schema) {
- return schemaMetadata;
- }
-
- return getOrFetchDatabaseMetadata({
- database,
- silent: true,
- filter: `schema == "${schema}"`,
- }).then((res) => {
- return res.schemas.find((s) => s.name === schema);
- });
- };
-
- const getTableList = ({
- database,
- schema,
- }: {
- database: string;
- schema?: string;
- }) => {
- const databaseMetadata = getDatabaseMetadataWithoutDefault(database);
- if (!databaseMetadata) {
- return [];
- }
-
- if (schema) {
- return (
- databaseMetadata.schemas.find((s) => s.name === schema)?.tables ?? []
- );
- }
-
- return databaseMetadata.schemas.flatMap((s) => s.tables);
- };
-
- const getTableMetadata = ({
- database,
- table,
- schema,
- }: {
- database: string;
- table: string;
- schema?: string;
- }) => {
- const tableList = getTableList({ database, schema });
- return (
- tableList.find((t) => t.name === table) ?? create(TableMetadataSchema, {})
- );
- };
-
- const getOrFetchTableMetadata = async ({
- database,
- schema,
- table,
- silent = false,
- }: {
- database: string;
- schema: string;
- table: string;
- silent?: boolean;
- }) => {
- const { databaseName } = extractDatabaseResourceName(database);
- if (
- databaseName === String(UNKNOWN_ID) ||
- databaseName === String(UNKNOWN_ID)
- ) {
- return create(TableMetadataSchema, {
- name: table,
- });
- }
-
- const tableMetadata = getTableMetadata({ database, schema, table });
- if (tableMetadata.name === table) {
- return tableMetadata;
- }
-
- return getOrFetchDatabaseMetadata({
- database,
- silent,
- filter: `schema == "${schema}" && table == "${table}"`,
- }).then((res) => {
- return res.schemas
- .find((s) => s.name === schema)
- ?.tables.find((t) => t.name === table);
- });
- };
-
- const getExternalTableList = ({
- database,
- schema,
- }: {
- database: string;
- schema?: string;
- }) => {
- const databaseMetadata = getDatabaseMetadataWithoutDefault(database);
- if (!databaseMetadata) {
- return [];
- }
-
- if (schema) {
- return (
- databaseMetadata.schemas.find((s) => s.name === schema)
- ?.externalTables ?? []
- );
- }
-
- return databaseMetadata.schemas.flatMap((s) => s.externalTables);
- };
-
- const getExternalTableMetadata = ({
- database,
- schema,
- externalTable,
- }: {
- database: string;
- schema?: string;
- externalTable: string;
- }) => {
- return (
- getExternalTableList({ database, schema }).find(
- (metadata) => metadata.name === externalTable
- ) ?? create(ExternalTableMetadataSchema, {})
- );
- };
-
- const getOrFetchExternalTableList = async (
- database: string,
- schema?: string
- ) => {
- if (!getDatabaseMetadataWithoutDefault(database)) {
- await getOrFetchDatabaseMetadata({ database });
- }
- return getExternalTableList({ database, schema });
- };
-
- const getViewList = ({
- database,
- schema,
- }: {
- database: string;
- schema?: string;
- }) => {
- const databaseMetadata = getDatabaseMetadataWithoutDefault(database);
- if (!databaseMetadata) {
- return [];
- }
-
- if (schema) {
- return (
- databaseMetadata.schemas.find((s) => s.name === schema)?.views ?? []
- );
- }
-
- return databaseMetadata.schemas.flatMap((s) => s.views);
- };
-
- const getViewMetadata = ({
- database,
- schema,
- view,
- }: {
- database: string;
- schema?: string;
- view: string;
- }) => {
- return (
- getViewList({ database, schema }).find((v) => v.name === view) ??
- create(ViewMetadataSchema, {})
- );
- };
-
- const getExtensionList = (database: string) => {
- const databaseMetadata = getDatabaseMetadataWithoutDefault(database);
- if (!databaseMetadata) {
- return [];
- }
-
- return databaseMetadata.extensions;
- };
-
- const getFunctionList = ({
- database,
- schema,
- }: {
- database: string;
- schema?: string;
- }) => {
- const databaseMetadata = getDatabaseMetadataWithoutDefault(database);
- if (!databaseMetadata) {
- return [];
- }
- if (schema) {
- return (
- databaseMetadata.schemas.find((s) => s.name === schema)?.functions ?? []
- );
- }
- return databaseMetadata.schemas.flatMap((s) => s.functions);
- };
-
- const removeCache = (name: string) => {
- const metadataResourceName = ensureDatabaseMetadataResourceName(name);
- Array.from(cacheByName.requestCacheMap.values()).forEach((cache) => {
- if (cache.keys[0] === metadataResourceName) {
- cacheByName.invalidateRequest(cache.keys);
- }
- });
- Array.from(cacheByName.entityCacheMap.values()).forEach((cache) => {
- if (cache.keys[0] === metadataResourceName) {
- cacheByName.invalidateEntity(cache.keys);
- }
- });
- };
-
- return {
- getDatabaseMetadataWithoutDefault,
- getDatabaseMetadata,
- getOrFetchDatabaseMetadata,
- getSchemaList,
- getSchemaMetadata,
- getOrFetchSchemaMetadata,
- getTableList,
- getTableMetadata,
- getOrFetchTableMetadata,
- getExternalTableList,
- getExternalTableMetadata,
- getOrFetchExternalTableList,
- getViewList,
- getViewMetadata,
- getExtensionList,
- getFunctionList,
- removeCache,
- };
-});
-
-const ensureDatabaseResourceName = (name: string) => {
- return extractDatabaseResourceName(name).database;
-};
-const ensureDatabaseMetadataResourceName = (name: string) => {
- const database = ensureDatabaseResourceName(name);
- return `${database}/metadata`;
-};
-
-export const useMetadata = (
- database: MaybeRef<string>,
- skipCache: MaybeRef<boolean>
-) => {
- const store = useDBSchemaV1Store();
- watchEffect(() => {
- const { databaseName } = extractDatabaseResourceName(unref(database));
- if (
- databaseName === String(UNKNOWN_ID) ||
- databaseName === String(UNKNOWN_ID)
- ) {
- return;
- }
- store.getOrFetchDatabaseMetadata({
- database: unref(database),
- skipCache: unref(skipCache),
- });
- });
- return computed(() => store.getDatabaseMetadata(unref(database)));
-};
diff --git a/frontend/src/store/modules/v1/index.ts b/frontend/src/store/modules/v1/index.ts
index 9c0d860b25..c5d6ac045a 100644
--- a/frontend/src/store/modules/v1/index.ts
+++ b/frontend/src/store/modules/v1/index.ts
@@ -1,12 +1,8 @@
export * from "./actuator";
export * from "./auth";
export * from "./common";
-export * from "./database";
-export * from "./dbSchema";
export * from "./environment";
export * from "./group";
-export * from "./instance";
-export * from "./instanceResource";
export * from "./permission";
export * from "./policy";
export * from "./project";
diff --git a/frontend/src/store/modules/v1/instance.ts b/frontend/src/store/modules/v1/instance.ts
deleted file mode 100644
index 62cfef8db6..0000000000
--- a/frontend/src/store/modules/v1/instance.ts
+++ /dev/null
@@ -1,346 +0,0 @@
-import { create } from "@bufbuild/protobuf";
-import { createContextValues } from "@connectrpc/connect";
-import { defineStore } from "pinia";
-import { reactive } from "vue";
-import { instanceServiceClientConnect } from "@/connect";
-// Removed conversion imports - using proto-es types directly
-import { silentContextKey } from "@/connect/context-key";
-import {
- isValidEnvironmentName,
- isValidInstanceName,
- isValidProjectName,
- unknownEnvironment,
- unknownInstance,
-} from "@/types";
-import { Engine, State } from "@/types/proto-es/v1/common_pb";
-// Using proto-es types directly, no conversions needed for internal operations
-import type {
- DataSource,
- Instance,
- UpdateInstanceRequest,
-} from "@/types/proto-es/v1/instance_service_pb";
-import {
- AddDataSourceRequestSchema,
- BatchSyncInstancesRequestSchema,
- BatchUpdateInstancesRequestSchema,
- CreateInstanceRequestSchema,
- DeleteInstanceRequestSchema,
- GetInstanceRequestSchema,
- ListInstanceDatabaseRequestSchema,
- ListInstancesRequestSchema,
- RemoveDataSourceRequestSchema,
- SyncInstanceRequestSchema,
- UndeleteInstanceRequestSchema,
- UpdateDataSourceRequestSchema,
- UpdateInstanceRequestSchema,
-} from "@/types/proto-es/v1/instance_service_pb";
-import { extractInstanceResourceName, hasWorkspacePermissionV2 } from "@/utils";
-import { getLabelFilter } from "./database";
-
-export interface InstanceFilter {
- environment?: string;
- project?: string;
- host?: string;
- port?: string;
- query?: string;
- engines?: Engine[];
- state?: State;
- labels?: string[];
-}
-
-const getListInstanceFilter = (params: InstanceFilter) => {
- const list = [];
- const search = params.query?.trim().toLowerCase();
- if (search) {
- list.push(
- `(name.contains("${search}") || resource_id.contains("${search}"))`
- );
- }
- if (isValidProjectName(params.project)) {
- list.push(`project == "${params.project}"`);
- }
- if (params.environment === unknownEnvironment().name) {
- list.push(`environment == ""`);
- } else if (isValidEnvironmentName(params.environment)) {
- list.push(`environment == "${params.environment}"`);
- }
- if (params.host) {
- list.push(`host.contains("${params.host}")`);
- }
- if (params.port) {
- list.push(`port.contains("${params.port}")`);
- }
- if (params.engines && params.engines.length > 0) {
- // engine filter should be:
- // engine in ["MYSQL", "POSTGRES"]
- list.push(
- `engine in [${params.engines.map((e) => `"${Engine[e]}"`).join(", ")}]`
- );
- }
- if (params.state === State.DELETED) {
- list.push(`state == "${State[params.state]}"`);
- }
- if (params.labels) {
- list.push(...getLabelFilter(params.labels));
- }
- return list.join(" && ");
-};
-
-export const useInstanceV1Store = defineStore("instance_v1", () => {
- // Store uses proto-es types directly
- const instanceMapByName = reactive(new Map<string, Instance>());
- const instanceRequestCache = new Map<string, Promise<Instance>>();
-
- const reset = () => {
- instanceMapByName.clear();
- };
-
- // Actions
- const upsertInstances = (list: Instance[]): Instance[] => {
- list.forEach((instance) => {
- instanceMapByName.set(instance.name, instance);
- });
- return list;
- };
- const createInstance = async (
- instance: Instance,
- validateOnly: boolean = false
- ) => {
- const request = create(CreateInstanceRequestSchema, {
- instance: instance,
- instanceId: extractInstanceResourceName(instance.name),
- validateOnly: validateOnly,
- });
- const response = await instanceServiceClientConnect.createInstance(
- request,
- {
- contextValues: createContextValues().set(
- silentContextKey,
- validateOnly
- ),
- }
- );
- if (!validateOnly) {
- upsertInstances([response]);
- }
- return response;
- };
- const updateInstance = async (instance: Instance, updateMask: string[]) => {
- const request = create(UpdateInstanceRequestSchema, {
- instance: instance,
- updateMask: { paths: updateMask },
- });
- const response = await instanceServiceClientConnect.updateInstance(request);
- const instances = upsertInstances([response]);
- return instances[0];
- };
- const archiveInstance = async (instance: Instance, force = false) => {
- const request = create(DeleteInstanceRequestSchema, {
- name: instance.name,
- force,
- });
- await instanceServiceClientConnect.deleteInstance(request);
- instance.state = State.DELETED;
- const instances = upsertInstances([instance]);
- return instances[0];
- };
- const deleteInstance = async (instance: string) => {
- const request = create(DeleteInstanceRequestSchema, {
- name: instance,
- purge: true,
- });
- await instanceServiceClientConnect.deleteInstance(request);
- instanceMapByName.delete(instance);
- };
- const restoreInstance = async (instance: Instance) => {
- const request = create(UndeleteInstanceRequestSchema, {
- name: instance.name,
- });
- await instanceServiceClientConnect.undeleteInstance(request);
- instance.state = State.ACTIVE;
- const instances = upsertInstances([instance]);
- return instances[0];
- };
- const syncInstance = async (instance: string, enableFullSync: boolean) => {
- const request = create(SyncInstanceRequestSchema, {
- name: instance,
- enableFullSync,
- });
- return await instanceServiceClientConnect.syncInstance(request);
- };
- const listInstanceDatabases = async (name: string, instance?: Instance) => {
- const request = create(ListInstanceDatabaseRequestSchema, {
- name,
- instance: instance,
- });
- return await instanceServiceClientConnect.listInstanceDatabase(request);
- };
- const batchSyncInstances = async (
- instanceNameList: string[],
- enableFullSync: boolean
- ) => {
- const request = create(BatchSyncInstancesRequestSchema, {
- requests: instanceNameList.map((name) => ({ name, enableFullSync })),
- });
- await instanceServiceClientConnect.batchSyncInstances(request);
- };
-
- const batchUpdateInstances = async (requests: UpdateInstanceRequest[]) => {
- const request = create(BatchUpdateInstancesRequestSchema, {
- requests: requests,
- });
- const response =
- await instanceServiceClientConnect.batchUpdateInstances(request);
- const instances = upsertInstances(response.instances);
- return instances;
- };
-
- const fetchInstanceByName = async (
- name: string,
- silent = false
- ): Promise<Instance> => {
- const request = create(GetInstanceRequestSchema, {
- name,
- });
- const response = await instanceServiceClientConnect.getInstance(request, {
- contextValues: createContextValues().set(silentContextKey, silent),
- });
- const instances = upsertInstances([response]);
- return instances[0];
- };
- const getInstanceByName = (name: string): Instance => {
- const instance = instanceMapByName.get(name);
- return instance ?? unknownInstance();
- };
- const getOrFetchInstanceByName = async (
- name: string,
- silent = false
- ): Promise<Instance> => {
- const cachedData = instanceMapByName.get(name);
- if (cachedData) {
- return cachedData;
- }
- if (
- !isValidInstanceName(name) ||
- !hasWorkspacePermissionV2("bb.instances.get")
- ) {
- return unknownInstance();
- }
- const cached = instanceRequestCache.get(name);
- if (cached) return cached;
- const request = fetchInstanceByName(name, silent);
- instanceRequestCache.set(name, request);
- return request;
- };
- const createDataSource = async ({
- instance,
- dataSource,
- validateOnly,
- }: {
- instance: string;
- dataSource: DataSource;
- validateOnly?: boolean;
- }) => {
- const request = create(AddDataSourceRequestSchema, {
- name: instance,
- dataSource: dataSource,
- validateOnly,
- });
- const response = await instanceServiceClientConnect.addDataSource(request, {
- contextValues: createContextValues().set(silentContextKey, validateOnly),
- });
- if (!validateOnly) {
- upsertInstances([response]);
- }
- return response;
- };
- const updateDataSource = async ({
- instance,
- dataSource,
- updateMask,
- validateOnly,
- }: {
- instance: string;
- dataSource: DataSource;
- updateMask: string[];
- validateOnly?: boolean;
- }) => {
- const request = create(UpdateDataSourceRequestSchema, {
- name: instance,
- dataSource: dataSource,
- updateMask: { paths: updateMask },
- validateOnly,
- });
- const response = await instanceServiceClientConnect.updateDataSource(
- request,
- {
- contextValues: createContextValues().set(
- silentContextKey,
- validateOnly
- ),
- }
- );
- if (!validateOnly) {
- upsertInstances([response]);
- }
- return response;
- };
- const deleteDataSource = async (
- instance: Instance,
- dataSource: DataSource
- ) => {
- const request = create(RemoveDataSourceRequestSchema, {
- name: instance.name,
- dataSource: dataSource,
- });
- const response =
- await instanceServiceClientConnect.removeDataSource(request);
- const [updatedInstance] = upsertInstances([response]);
- return updatedInstance;
- };
-
- const fetchInstanceList = async (params: {
- pageSize?: number;
- pageToken?: string;
- orderBy?: string;
- filter?: InstanceFilter;
- silent?: boolean;
- }) => {
- const request = create(ListInstancesRequestSchema, {
- pageSize: params.pageSize,
- pageToken: params.pageToken,
- orderBy: params.orderBy,
- filter: getListInstanceFilter(params.filter ?? {}),
- showDeleted: params.filter?.state !== State.ACTIVE,
- });
- const response = await instanceServiceClientConnect.listInstances(request, {
- contextValues: createContextValues().set(silentContextKey, params.silent),
- });
- const nextPageToken = response.nextPageToken;
-
- const instances = upsertInstances(response.instances);
- return {
- instances: instances,
- nextPageToken,
- };
- };
-
- return {
- reset,
- createInstance,
- updateInstance,
- archiveInstance,
- restoreInstance,
- deleteInstance,
- syncInstance,
- batchSyncInstances,
- batchUpdateInstances,
- getInstanceByName,
- getOrFetchInstanceByName,
- createDataSource,
- updateDataSource,
- deleteDataSource,
- listInstanceDatabases,
- fetchInstanceList,
- };
-});
diff --git a/frontend/src/store/modules/v1/instanceResource.ts b/frontend/src/store/modules/v1/instanceResource.ts
deleted file mode 100644
index 4a87e60091..0000000000
--- a/frontend/src/store/modules/v1/instanceResource.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { uniqBy } from "lodash-es";
-import { computed, type MaybeRef, ref, unref, watchEffect } from "vue";
-import { isValidInstanceName } from "@/types";
-import type { InstanceResource } from "@/types/proto-es/v1/instance_service_pb";
-import { getInstanceResource } from "@/utils";
-import { useDatabaseV1Store } from "./database";
-import { useInstanceV1Store } from "./instance";
-
-// Instance resource list is a list of all instance resources in the database list.
-// Current user should have access to all instance resources in the list.
-export const useInstanceResourceByName = (
- instanceName: MaybeRef<string> // Format: instances/{instance}
-) => {
- const store = useInstanceV1Store();
- const databaseStore = useDatabaseV1Store();
- const ready = ref(false);
-
- const instanceList = computed(() => {
- return uniqBy(
- databaseStore.databaseList.map((db) => getInstanceResource(db)),
- (i) => i.name
- ) as InstanceResource[];
- });
-
- watchEffect(async () => {
- ready.value = false;
- await store.getOrFetchInstanceByName(
- unref(instanceName),
- /* silent */ true
- );
- ready.value = true;
- });
-
- const instance = computed(() => {
- const name = unref(instanceName);
- const existed = store.getInstanceByName(name);
- if (isValidInstanceName(existed.name)) {
- return existed;
- }
- return (
- instanceList.value.find((i) => i.name === name) ??
- store.getInstanceByName(name)
- );
- });
-
- return { instance, ready };
-};
diff --git a/frontend/src/store/modules/v1/project.ts b/frontend/src/store/modules/v1/project.ts
index f73752c490..4e47c052e6 100644
--- a/frontend/src/store/modules/v1/project.ts
+++ b/frontend/src/store/modules/v1/project.ts
@@ -29,7 +29,6 @@ import {
} from "@/types/proto-es/v1/project_service_pb";
import { hasWorkspacePermissionV2 } from "@/utils";
import { projectNamePrefix } from "./common";
-import { getLabelFilter } from "./database";
export interface ProjectFilter {
query?: string;
@@ -39,6 +38,37 @@ export interface ProjectFilter {
labels?: string[];
}
+const getLabelFilter = (labels: string[]): string[] => {
+ const labelMap = new Map<string, string[]>();
+ for (const label of labels) {
+ const sections = label.split(":");
+ if (sections.length !== 2) {
+ continue;
+ }
+ const [key, rawValue] = sections;
+ const values = rawValue.split(",");
+ if (!labelMap.has(key)) {
+ labelMap.set(key, []);
+ }
+ labelMap.get(key)?.push(...values);
+ }
+
+ return [...labelMap.entries()].reduce((result, [key, values]) => {
+ switch (values.length) {
+ case 0:
+ return result;
+ case 1:
+ result.push(`labels.${key} == "${values[0]}"`);
+ return result;
+ default:
+ result.push(
+ `labels.${key} in [${values.map((v) => `"${v}"`).join(", ")}]`
+ );
+ return result;
+ }
+ }, [] as string[]);
+};
+
const getListProjectFilter = (params: ProjectFilter) => {
const list = [];
const search = params.query?.trim();
diff --git a/frontend/src/utils/expr.ts b/frontend/src/utils/expr.ts
index 257ad64519..df7b506cd3 100644
--- a/frontend/src/utils/expr.ts
+++ b/frontend/src/utils/expr.ts
@@ -1,9 +1,11 @@
+import {
+ batchGetOrFetchDatabases,
+ fetchDatabases,
+} from "@/react/stores/app/databaseAccess";
import {
instanceNamePrefix,
projectNamePrefix,
- useDatabaseV1Store,
useEnvironmentV1Store,
- useInstanceV1Store,
useProjectV1Store,
} from "@/store";
import { isValidInstanceName } from "@/types";
@@ -101,14 +103,16 @@ export const getProjectIdOptionConfig = (): OptionConfig => {
};
export const getInstanceIdOptionConfig = (): OptionConfig => {
- const store = useInstanceV1Store();
return {
options: [],
fetch: async (instanceIds: string[]) => {
+ const { useAppStore } = await import("@/react/stores/app");
// TODO(ed): batch fetch instances
const instances = await Promise.all(
instanceIds.map((instanceId) =>
- store.getOrFetchInstanceByName(`${instanceNamePrefix}${instanceId}`)
+ useAppStore
+ .getState()
+ .getOrFetchInstanceByName(`${instanceNamePrefix}${instanceId}`)
)
);
const options: LabeledOption[] = [];
@@ -121,7 +125,9 @@ export const getInstanceIdOptionConfig = (): OptionConfig => {
return options;
},
search: async (params) => {
- return store
+ const { useAppStore } = await import("@/react/stores/app");
+ return useAppStore
+ .getState()
.fetchInstanceList({
pageSize: params.pageSize,
pageToken: params.pageToken,
@@ -139,7 +145,6 @@ export const getInstanceIdOptionConfig = (): OptionConfig => {
};
export const getDatabaseIdOptionConfig = (parent: string): OptionConfig => {
- const dbStore = useDatabaseV1Store();
return {
options: [],
// Since we use the database name (not the fullname) as the value, we cannot
@@ -149,47 +154,42 @@ export const getDatabaseIdOptionConfig = (parent: string): OptionConfig => {
// database name instead of the entire database entity.
fallback: (value: string) => ({ label: value, value }),
search: async (params) => {
- return dbStore
- .fetchDatabases({
- pageSize: params.pageSize,
- pageToken: params.pageToken,
- parent: parent,
- filter: {
- query: params.search,
- },
- silent: true,
- })
- .then((resp) => ({
- nextPageToken: resp.nextPageToken,
- options: getDatabaseIdOptions(resp.databases),
- }));
+ return fetchDatabases({
+ pageSize: params.pageSize,
+ pageToken: params.pageToken,
+ parent: parent,
+ filter: {
+ query: params.search,
+ },
+ silent: true,
+ }).then((resp) => ({
+ nextPageToken: resp.nextPageToken,
+ options: getDatabaseIdOptions(resp.databases),
+ }));
},
};
};
export const getDatabaseNameOptionConfig = (parent: string): OptionConfig => {
- const dbStore = useDatabaseV1Store();
return {
options: [],
fetch: async (names: string[]) => {
- const databases = await dbStore.batchGetOrFetchDatabases(names);
+ const databases = await batchGetOrFetchDatabases(names);
return databases.map(getDatabaseFullNameOption);
},
search: async (params) => {
- return dbStore
- .fetchDatabases({
- pageSize: params.pageSize,
- pageToken: params.pageToken,
- parent,
- filter: {
- query: params.search,
- },
- silent: true,
- })
- .then((resp) => ({
- nextPageToken: resp.nextPageToken,
- options: resp.databases.map(getDatabaseFullNameOption),
- }));
+ return fetchDatabases({
+ pageSize: params.pageSize,
+ pageToken: params.pageToken,
+ parent,
+ filter: {
+ query: params.search,
+ },
+ silent: true,
+ }).then((resp) => ({
+ nextPageToken: resp.nextPageToken,
+ options: resp.databases.map(getDatabaseFullNameOption),
+ }));
},
};
};
diff --git a/frontend/src/utils/v1/changelog.ts b/frontend/src/utils/v1/changelog.ts
index 41261fff61..9720788506 100644
--- a/frontend/src/utils/v1/changelog.ts
+++ b/frontend/src/utils/v1/changelog.ts
@@ -1,5 +1,5 @@
import { create } from "@bufbuild/protobuf";
-import { useDatabaseV1Store } from "@/store";
+import { getDatabaseByName } from "@/react/stores/app/databaseAccess";
import { UNKNOWN_ID } from "@/types";
import type {
Changelog,
@@ -36,7 +36,7 @@ export const isValidChangelogName = (name: string | undefined) => {
export const changelogLink = (changelog: Changelog): string => {
const { changelogUID } = extractDatabaseNameAndChangelogUID(changelog.name);
const { database } = extractDatabaseResourceName(changelog.name);
- const composedDatabase = useDatabaseV1Store().getDatabaseByName(database);
+ const composedDatabase = getDatabaseByName(database);
return [databaseV1Url(composedDatabase), "changelogs", changelogUID].join(
"/"
);
diff --git a/frontend/src/utils/v1/issue/issue.ts b/frontend/src/utils/v1/issue/issue.ts
index 5d8efdee70..d81740723c 100644
--- a/frontend/src/utils/v1/issue/issue.ts
+++ b/frontend/src/utils/v1/issue/issue.ts
@@ -1,13 +1,12 @@
import { create } from "@bufbuild/protobuf";
import dayjs from "dayjs";
import { t } from "@/plugins/i18n";
-import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";
import {
- projectNamePrefix,
- useDatabaseV1Store,
- useInstanceResourceByName,
- useProjectV1Store,
-} from "@/store";
+ getDatabaseByName,
+ getDatabaseList,
+} from "@/react/stores/app/databaseAccess";
+import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";
+import { projectNamePrefix, useProjectV1Store } from "@/store";
import { isValidDatabaseName, UNKNOWN_ID, unknownDatabase } from "@/types";
import { State } from "@/types/proto-es/v1/common_pb";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
@@ -21,7 +20,11 @@ import type { Plan } from "@/types/proto-es/v1/plan_service_pb";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
import type { Rollout, Task } from "@/types/proto-es/v1/rollout_service_pb";
import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";
-import { extractDatabaseResourceName, extractProjectResourceName } from "..";
+import {
+ extractDatabaseResourceName,
+ extractProjectResourceName,
+ getInstanceResource,
+} from "..";
export const extractIssueUID = (name: string) => {
const pattern = /(?:^|\/)issues\/(\d+)(?:$|\/)/;
@@ -157,9 +160,7 @@ export const mockDatabase = (
db.name = database;
const { instance } = extractDatabaseResourceName(db.name);
- const { instance: instanceFromStore } = useInstanceResourceByName(instance);
- // Create InstanceResource from the instance data
- const instanceData = instanceFromStore.value;
+ const instanceData = getCachedInstanceResourceByName(instance);
db.instanceResource = create(InstanceResourceSchema, {
name: instanceData.name,
engine: instanceData.engine,
@@ -182,15 +183,12 @@ export const extractCoreDatabaseInfoFromDatabaseCreateTask = (
): Database => {
const coreDatabaseInfo = (instanceName: string, dbName: string): Database => {
const name = `${instanceName}/databases/${dbName}`;
- const maybeExistedDatabase = useDatabaseV1Store().getDatabaseByName(name);
+ const maybeExistedDatabase = getDatabaseByName(name);
if (isValidDatabaseName(maybeExistedDatabase.name)) {
return maybeExistedDatabase;
}
- const { instance: instanceFromStore } =
- useInstanceResourceByName(instanceName);
- // Create InstanceResource from the instance data
- const instanceData = instanceFromStore.value;
+ const instanceData = getCachedInstanceResourceByName(instanceName);
const instanceResource = create(InstanceResourceSchema, {
name: instanceData.name,
engine: instanceData.engine,
@@ -222,3 +220,16 @@ export const extractCoreDatabaseInfoFromDatabaseCreateTask = (
return unknownDatabase();
};
+
+const getCachedInstanceResourceByName = (
+ instanceName: string
+): ReturnType<typeof getInstanceResource> => {
+ const cachedDatabase = getDatabaseList().find(
+ (database) => getInstanceResource(database).name === instanceName
+ );
+ if (cachedDatabase) {
+ return getInstanceResource(cachedDatabase);
+ }
+
+ return create(InstanceResourceSchema, { name: instanceName });
+};
diff --git a/frontend/src/utils/v1/issue/rollout.ts b/frontend/src/utils/v1/issue/rollout.ts
index 339f4ed8e6..e488856b7c 100644
--- a/frontend/src/utils/v1/issue/rollout.ts
+++ b/frontend/src/utils/v1/issue/rollout.ts
@@ -1,5 +1,5 @@
import { t as translate } from "@/plugins/i18n";
-import { useDatabaseV1Store } from "@/store";
+import { getDatabaseByName } from "@/react/stores/app/databaseAccess";
import { isValidDatabaseName, UNKNOWN_ID, unknownDatabase } from "@/types";
import type { Plan } from "@/types/proto-es/v1/plan_service_pb";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
@@ -180,7 +180,7 @@ export const databaseForTask = (project: Project, task: Task, plan?: Plan) => {
return extractCoreDatabaseInfoFromDatabaseCreateTask(project, task, plan);
case Task_Type.DATABASE_MIGRATE:
case Task_Type.DATABASE_EXPORT:
- const db = useDatabaseV1Store().getDatabaseByName(task.target);
+ const db = getDatabaseByName(task.target);
if (!isValidDatabaseName(db.name)) {
return mockDatabase(project, task.target);
}
diff --git a/frontend/src/utils/v1/revision.ts b/frontend/src/utils/v1/revision.ts
index 41f7c6d036..009ef2be05 100644
--- a/frontend/src/utils/v1/revision.ts
+++ b/frontend/src/utils/v1/revision.ts
@@ -1,5 +1,5 @@
import { t } from "@/plugins/i18n";
-import { useDatabaseV1Store } from "@/store";
+import { getDatabaseByName } from "@/react/stores/app/databaseAccess";
import type { Revision } from "@/types/proto-es/v1/revision_service_pb";
import { Revision_Type } from "@/types/proto-es/v1/revision_service_pb";
import { databaseV1Url, extractDatabaseResourceName } from "./database";
@@ -16,7 +16,7 @@ export const revisionLink = (revision: Revision): string => {
return "";
}
const { database } = extractDatabaseResourceName(revision.name);
- const composedDatabase = useDatabaseV1Store().getDatabaseByName(database);
+ const composedDatabase = getDatabaseByName(database);
return `${databaseV1Url(composedDatabase)}/revisions/${parts[1]}`;
};