Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(frontend): port instance store onto the React app store (#20470)
boojacke78e3d23b713
diff --git a/frontend/src/react/components/DatabaseResourceSelector.test.tsx b/frontend/src/react/components/DatabaseResourceSelector.test.tsxindex 3e50b45dc8..8cc6edeeeb 100644--- a/frontend/src/react/components/DatabaseResourceSelector.test.tsx+++ b/frontend/src/react/components/DatabaseResourceSelector.test.tsx@@ -38,9 +38,6 @@ const mocks = vi.hoisted(() => ({mocks.databaseStore = {fetchDatabases: mocks.fetchDatabases,};-mocks.instanceStore = {- fetchInstanceList: mocks.fetchInstanceList,-};vi.mock("react-i18next", () => ({useTranslation: () => ({@@ -61,7 +58,6 @@ vi.mock("@/plugins/i18n", () => ({vi.mock("@/store", () => ({useDatabaseV1Store: () => mocks.databaseStore,useEnvironmentV1Store: () => mocks.environmentStore,- useInstanceV1Store: () => mocks.instanceStore,}));vi.mock("@/react/hooks/useVueState", () => ({@@ -102,10 +98,12 @@ vi.mock("@/react/stores/app", () => ({(selector: (state: unknown) => unknown) =>selector({getOrFetchDatabaseMetadata: mocks.getOrFetchDatabaseMetadata,+ fetchInstanceList: mocks.fetchInstanceList,}),{getState: () => ({getOrFetchDatabaseMetadata: mocks.getOrFetchDatabaseMetadata,+ fetchInstanceList: mocks.fetchInstanceList,}),}),diff --git a/frontend/src/react/components/DatabaseResourceSelector.tsx b/frontend/src/react/components/DatabaseResourceSelector.tsxindex d5759ecedb..b20722027b 100644--- a/frontend/src/react/components/DatabaseResourceSelector.tsx+++ b/frontend/src/react/components/DatabaseResourceSelector.tsx@@ -20,11 +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,- useInstanceV1Store,-} from "@/store";+import { useDatabaseV1Store, useEnvironmentV1Store } from "@/store";import type { DatabaseResource } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type {@@ -104,7 +100,6 @@ export function DatabaseResourceSelector({(s) => s.getOrFetchDatabaseMetadata);const environmentStore = useEnvironmentV1Store();- const instanceStore = useInstanceV1Store();const [databases, setDatabases] = useState<Database[]>([]);const [searchParams, setSearchParams] = useState<SearchParams>({@@ -130,7 +125,7 @@ export function DatabaseResourceSelector({const searchInstances = useCallback(async (keyword: string): Promise<ValueOption[]> => {- const result = await instanceStore.fetchInstanceList({+ const result = await useAppStore.getState().fetchInstanceList({pageSize: 1000,filter: keyword.trim() ? { query: keyword } : undefined,silent: true,@@ -143,7 +138,7 @@ export function DatabaseResourceSelector({};});},- [instanceStore]+ []);const scopeOptions: ScopeOption[] = useMemo(diff --git a/frontend/src/react/components/InstanceAssignmentSheet.tsx b/frontend/src/react/components/InstanceAssignmentSheet.tsxindex 76d1ed9fcf..b7de9065da 100644--- a/frontend/src/react/components/InstanceAssignmentSheet.tsx+++ b/frontend/src/react/components/InstanceAssignmentSheet.tsx@@ -22,11 +22,7 @@ import {} from "@/react/hooks/useAppState";import { PagedTableFooter } from "@/react/hooks/usePagedData";import { useAppStore } from "@/react/stores/app";-import {- pushNotification,- useDatabaseV1Store,- useInstanceV1Store,-} from "@/store";+import { pushNotification, useDatabaseV1Store } from "@/store";import { isValidInstanceName } from "@/types";import type {Instance,@@ -52,7 +48,6 @@ export function InstanceAssignmentSheet({onUpdated,}: InstanceAssignmentSheetProps) {const { t } = useTranslation();- const instanceStore = useInstanceV1Store();const databaseStore = useDatabaseV1Store();const refreshServerInfo = useAppStore((state) => state.refreshServerInfo);@@ -101,7 +96,7 @@ export function InstanceAssignmentSheet({setFetchingMore(true);}try {- const result = await instanceStore.fetchInstanceList({+ const result = await useAppStore.getState().fetchInstanceList({pageSize: PAGE_SIZE,pageToken: refresh ? "" : pageToken,});@@ -120,7 +115,7 @@ export function InstanceAssignmentSheet({}}},- [applyActivatedSelection, instanceStore]+ [applyActivatedSelection]);useEffect(() => {@@ -159,8 +154,10 @@ export function InstanceAssignmentSheet({const requests: UpdateInstanceRequest[] = [];for (const instanceName of selectedNames) {const instance =- (await instanceStore.getOrFetchInstanceByName(instanceName)) ??- instanceStore.getInstanceByName(instanceName);+ (await useAppStore+ .getState()+ .getOrFetchInstanceByName(instanceName)) ??+ useAppStore.getState().getInstanceByName(instanceName);if (!isValidInstanceName(instance.name)) {continue;}@@ -192,7 +189,9 @@ export function InstanceAssignmentSheet({}}- const updated = await instanceStore.batchUpdateInstances(requests);+ const updated = await useAppStore+ .getState()+ .batchUpdateInstances(requests);for (const instance of updated) {databaseStore.updateDatabaseInstance(instance);}@@ -210,7 +209,6 @@ export function InstanceAssignmentSheet({}, [canManageSubscription,databaseStore,- instanceStore,instances,onOpenChange,onUpdated,diff --git a/frontend/src/react/components/InstanceSelect.tsx b/frontend/src/react/components/InstanceSelect.tsxindex caf0311c53..f41b565991 100644--- a/frontend/src/react/components/InstanceSelect.tsx+++ b/frontend/src/react/components/InstanceSelect.tsx@@ -3,7 +3,7 @@ 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 { useInstanceV1Store } from "@/store";+import { useAppStore } from "@/react/stores/app";import type { Engine } from "@/types/proto-es/v1/common_pb";import type { Instance } from "@/types/proto-es/v1/instance_service_pb";import { extractInstanceResourceName, getDefaultPagination } from "@/utils";@@ -29,7 +29,6 @@ export function InstanceSelect({engines,}: InstanceSelectProps) {const { t } = useTranslation();- const instanceStore = useInstanceV1Store();const [instances, setInstances] = useState<Instance[]>([]);// Stabilize engines array to avoid re-fetching on every render@@ -50,14 +49,15 @@ export function InstanceSelect({const fetchInstances = useCallback((query: string) => {- instanceStore+ useAppStore+ .getState().fetchInstanceList({pageSize: getDefaultPagination(),filter: { query, engines: stableEngines },}).then((result) => setInstances(result.instances));},- [instanceStore, stableEngines]+ [stableEngines]);useEffect(() => {diff --git a/frontend/src/react/components/database/CreateDatabaseSheet.test.tsx b/frontend/src/react/components/database/CreateDatabaseSheet.test.tsxindex 570dd2a50c..93af7fe5cf 100644--- a/frontend/src/react/components/database/CreateDatabaseSheet.test.tsx+++ b/frontend/src/react/components/database/CreateDatabaseSheet.test.tsx@@ -131,19 +131,24 @@ const stableProjectStore = {},fetchProjectList: vi.fn().mockResolvedValue({ projects: [] }),};-const stableInstanceStore = {- get getOrFetchInstanceByName() {- return mocks.getOrFetchInstanceByName;- },-};-vi.mock("@/store", () => ({useProjectV1Store: () => stableProjectStore,- useInstanceV1Store: () => stableInstanceStore,useEnvironmentV1Store: () => ({ environmentList: [] }),pushNotification: vi.fn(),}));+vi.mock("@/react/stores/app", () => ({+ useAppStore: Object.assign(+ (selector: (state: unknown) => unknown) =>+ selector({ getOrFetchInstanceByName: mocks.getOrFetchInstanceByName }),+ {+ getState: () => ({+ getOrFetchInstanceByName: mocks.getOrFetchInstanceByName,+ }),+ }+ ),+}));+vi.mock("@/react/stores/app/issue", () => ({experimentalCreateIssueByPlan: mocks.experimentalCreateIssueByPlan,}));diff --git a/frontend/src/react/components/database/CreateDatabaseSheet.tsx b/frontend/src/react/components/database/CreateDatabaseSheet.tsxindex 0535ed9271..72332c3272 100644--- a/frontend/src/react/components/database/CreateDatabaseSheet.tsx+++ b/frontend/src/react/components/database/CreateDatabaseSheet.tsx@@ -20,12 +20,12 @@ import {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 { experimentalCreateIssueByPlan } from "@/react/stores/app/issue";import { router } from "@/router";import {pushNotification,useEnvironmentV1Store,- useInstanceV1Store,useProjectV1Store,} from "@/store";import {@@ -65,7 +65,6 @@ export function CreateDatabaseSheet({}: CreateDatabaseSheetProps) {const { t } = useTranslation();const projectStore = useProjectV1Store();- const instanceStore = useInstanceV1Store();const environmentStore = useEnvironmentV1Store();const currentUser = useCurrentUser();@@ -241,7 +240,7 @@ export function CreateDatabaseSheet({)) {const fetchId = ++instanceFetchRef.current;- const full = await instanceStore.getOrFetchInstanceByName(name);+ const full = await useAppStore.getState().getOrFetchInstanceByName(name);if (fetchId !== instanceFetchRef.current) return;if (full?.roles) {setInstanceRoles(diff --git a/frontend/src/react/components/instance/DataSourceSection.tsx b/frontend/src/react/components/instance/DataSourceSection.tsxindex ee09fdcaee..b4837dc9ea 100644--- a/frontend/src/react/components/instance/DataSourceSection.tsx+++ b/frontend/src/react/components/instance/DataSourceSection.tsx@@ -3,7 +3,7 @@ import { useCallback } from "react";import { useTranslation } from "react-i18next";import { Alert } from "@/react/components/ui/alert";import { Button } from "@/react/components/ui/button";-import { useInstanceV1Store } from "@/store";+import { useAppStore } from "@/react/stores/app";import { DATASOURCE_READONLY_USER_NAME } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import { DataSourceType } from "@/types/proto-es/v1/instance_service_pb";@@ -37,7 +37,6 @@ export function DataSourceSection({readonlyDataSourceList,hasReadOnlyDataSource,} = ctx;- const instanceStore = useInstanceV1Store();const allowUpdate = hasWorkspacePermissionV2("bb.instances.update");@@ -67,7 +66,7 @@ export function DataSourceSection({const handleDeleteDataSource = useCallback(async (ds: EditDataSource) => {if (instance && !ds.pendingCreate) {- await instanceStore.deleteDataSource(instance, ds);+ await useAppStore.getState().deleteDataSource(instance, ds);}setDataSourceEditState((prev) => {const dataSources = prev.dataSources.filter((d) => d.id !== ds.id);@@ -80,7 +79,7 @@ export function DataSourceSection({return { dataSources, editingDataSourceId };});},- [instance, instanceStore, setDataSourceEditState]+ [instance, setDataSourceEditState]);const handleDataSourceChange = useCallback(diff --git a/frontend/src/react/components/instance/InstanceActionDropdown.tsx b/frontend/src/react/components/instance/InstanceActionDropdown.tsxindex 08394f9663..2278b0a9d2 100644--- a/frontend/src/react/components/instance/InstanceActionDropdown.tsx+++ b/frontend/src/react/components/instance/InstanceActionDropdown.tsx@@ -7,9 +7,10 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from "@/react/components/ui/dropdown-menu";+import { useAppStore } from "@/react/stores/app";import { router } from "@/router";import { INSTANCE_ROUTE_DASHBOARD } from "@/router/dashboard/workspaceRoutes";-import { pushNotification, useInstanceV1Store } from "@/store";+import { pushNotification } from "@/store";import { State } from "@/types/proto-es/v1/common_pb";import type { Instance } from "@/types/proto-es/v1/instance_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";@@ -24,7 +25,6 @@ export function InstanceActionDropdown({onDeleted,}: InstanceActionDropdownProps) {const { t } = useTranslation();- const instanceStore = useInstanceV1Store();const canArchive = hasWorkspacePermissionV2("bb.instances.delete");const canRestore = hasWorkspacePermissionV2("bb.instances.undelete");@@ -38,7 +38,7 @@ export function InstanceActionDropdown({);if (!forceArchive) return;- await instanceStore.archiveInstance(instance, true);+ await useAppStore.getState().archiveInstance(instance, true);pushNotification({module: "bytebase",style: "INFO",@@ -47,7 +47,7 @@ export function InstanceActionDropdown({}),});router.replace({ name: INSTANCE_ROUTE_DASHBOARD });- }, [instance, instanceStore, t]);+ }, [instance, t]);const handleRestore = useCallback(async () => {if (@@ -59,7 +59,7 @@ export function InstanceActionDropdown({)return;- await instanceStore.restoreInstance(instance);+ await useAppStore.getState().restoreInstance(instance);pushNotification({module: "bytebase",style: "SUCCESS",@@ -67,7 +67,7 @@ export function InstanceActionDropdown({0: instance.title,}),});- }, [instance, instanceStore, t]);+ }, [instance, t]);const handleDelete = useCallback(async () => {if (@@ -77,7 +77,7 @@ export function InstanceActionDropdown({)return;- await instanceStore.deleteInstance(instance.name);+ await useAppStore.getState().deleteInstance(instance.name);pushNotification({module: "bytebase",style: "SUCCESS",@@ -88,7 +88,7 @@ export function InstanceActionDropdown({name: INSTANCE_ROUTE_DASHBOARD,query: { q: "state:DELETED" },});- }, [instance, instanceStore, t, onDeleted]);+ }, [instance, t, onDeleted]);const showArchive = instance.state === State.ACTIVE && canArchive;const showRestore = instance.state === State.DELETED && canRestore;diff --git a/frontend/src/react/components/instance/InstanceFormBody.tsx b/frontend/src/react/components/instance/InstanceFormBody.tsxindex 5e062ab42e..a138f28d50 100644--- a/frontend/src/react/components/instance/InstanceFormBody.tsx+++ b/frontend/src/react/components/instance/InstanceFormBody.tsx@@ -22,11 +22,11 @@ import { Checkbox } from "@/react/components/ui/checkbox";import { Input } from "@/react/components/ui/input";import { useVueState } from "@/react/hooks/useVueState";import { cn } from "@/react/lib/utils";+import { useAppStore } from "@/react/stores/app";import {pushNotification,useActuatorV1Store,useDatabaseV1Store,- useInstanceV1Store,useSubscriptionV1Store,} from "@/store";import {@@ -408,7 +408,6 @@ function SyncDatabases({const { t } = useTranslation();const ctx = useInstanceFormContext();const { hideAdvancedFeatures, instance, pendingCreateInstance } = ctx;- const instanceStore = useInstanceV1Store();const [syncAll, setSyncAll] = useState(syncDatabases.length === 0);const [selectedSet, setSelectedSet] = useState<Set<string>>(@@ -439,10 +438,9 @@ function SyncDatabases({if (!inst) return;setLoading(true);try {- const resp = await instanceStore.listInstanceDatabases(- inst.name,- isCreatingProp ? inst : undefined- );+ const resp = await useAppStore+ .getState()+ .listInstanceDatabases(inst.name, isCreatingProp ? inst : undefined);if (!cancelled) {setDatabaseList(new Set([...resp.databases, ...selectedSet]));}@@ -598,7 +596,6 @@ export function InstanceFormBody({ onOpenInfoPanel }: InstanceFormBodyProps) {} = ctx;const { isEngineBeta, defaultPort, instanceLink, allowEditPort } = specs;- const instanceV1Store = useInstanceV1Store();const actuatorStore = useActuatorV1Store();const subscriptionStore = useSubscriptionV1Store();const hasUnifiedInstanceLicense = useVueState(@@ -710,10 +707,12 @@ export function InstanceFormBody({ onOpenInfoPanel }: InstanceFormBodyProps) {async (id: string): Promise<ValidatedMessage[]> => {if (!isCreating || !id) return [];try {- const existing = await instanceV1Store.getOrFetchInstanceByName(- `${instanceNamePrefix}${id}`,- true /* silent */- );+ const existing = await useAppStore+ .getState()+ .getOrFetchInstanceByName(+ `${instanceNamePrefix}${id}`,+ true /* silent */+ );if (existing) {return [{@@ -729,7 +728,7 @@ export function InstanceFormBody({ onOpenInfoPanel }: InstanceFormBodyProps) {}return [];},- [instanceV1Store, isCreating, t]+ [isCreating, t]);const currentMongoDBConnectionSchema = useMemo(() => {@@ -967,9 +966,9 @@ export function InstanceFormBody({ onOpenInfoPanel }: InstanceFormBodyProps) {updateBasicInfo({ activation: on });if (instance) {const instancePatch = { ...instance, activation: on };- const updated = await instanceV1Store.updateInstance(instancePatch, [- "activation",- ]);+ const updated = await useAppStore+ .getState()+ .updateInstance(instancePatch, ["activation"]);useDatabaseV1Store().updateDatabaseInstance(updated);await actuatorStore.fetchServerInfo(actuatorStore.workspaceResourceName@@ -981,7 +980,7 @@ export function InstanceFormBody({ onOpenInfoPanel }: InstanceFormBodyProps) {});}},- [instance, instanceV1Store, actuatorStore, updateBasicInfo, t]+ [instance, actuatorStore, updateBasicInfo, t]);const testConnectionForCurrentEditingDS = useCallback(async () => {diff --git a/frontend/src/react/components/instance/InstanceFormButtons.tsx b/frontend/src/react/components/instance/InstanceFormButtons.tsxindex 313b8ff246..abe4a24839 100644--- a/frontend/src/react/components/instance/InstanceFormButtons.tsx+++ b/frontend/src/react/components/instance/InstanceFormButtons.tsx@@ -3,11 +3,11 @@ import { cloneDeep, isEqual } from "lodash-es";import { useMemo, useState } from "react";import { useTranslation } from "react-i18next";import { cn } from "@/react/lib/utils";+import { useAppStore } from "@/react/stores/app";import { router } from "@/router";import {pushNotification,useDatabaseV1Store,- useInstanceV1Store,useSubscriptionV1Store,} from "@/store";import { Engine } from "@/types/proto-es/v1/common_pb";@@ -57,7 +57,6 @@ export function InstanceFormButtons({className,}: InstanceFormButtonsProps) {const { t } = useTranslation();- const instanceV1Store = useInstanceV1Store();const databaseStore = useDatabaseV1Store();const subscriptionStore = useSubscriptionV1Store();@@ -232,7 +231,9 @@ export function InstanceFormButtons({setState((prev) => ({ ...prev, isRequesting: true }));try {- const createdInstance = await instanceV1Store.createInstance(payload);+ const createdInstance = await useAppStore+ .getState()+ .createInstance(payload);if (onCreated) {onCreated(createdInstance);} else {@@ -339,16 +340,19 @@ export function InstanceFormButtons({if (updateMask.length === 0) return;pendingRequestRunners.push(() =>- instanceV1Store.updateInstance(instancePatch, updateMask).then(() => {- if (updateMask.includes("sync_databases")) {- return refreshInstanceDatabases(instancePatch.name);- }- })+ useAppStore+ .getState()+ .updateInstance(instancePatch, updateMask)+ .then(() => {+ if (updateMask.includes("sync_databases")) {+ return refreshInstanceDatabases(instancePatch.name);+ }+ }));};const refreshInstanceDatabases = async (instanceName: string) => {- await instanceV1Store.syncInstance(instanceName, true);+ await useAppStore.getState().syncInstance(instanceName, true);databaseStore.removeCacheByInstance(instanceName);};@@ -371,7 +375,7 @@ export function InstanceFormButtons({}pendingRequestRunners.push(() =>- instanceV1Store.updateDataSource({+ useAppStore.getState().updateDataSource({instance: inst.name,dataSource: editing,updateMask,@@ -410,7 +414,7 @@ export function InstanceFormButtons({if (!continueAnyway) return true;}pendingRequestRunners.push(() =>- instanceV1Store.createDataSource({+ useAppStore.getState().createDataSource({instance: inst.name,dataSource: patch,})@@ -442,7 +446,9 @@ export function InstanceFormButtons({await pendingRequestRunners[i]();}- const updatedInstance = instanceV1Store.getInstanceByName(inst.name);+ const updatedInstance = useAppStore+ .getState()+ .getInstanceByName(inst.name);updateEditState(updatedInstance);pushNotification({module: "bytebase",diff --git a/frontend/src/react/components/instance/InstanceFormContext.test.tsx b/frontend/src/react/components/instance/InstanceFormContext.test.tsxindex 4812ac1050..c58b35ae8f 100644--- a/frontend/src/react/components/instance/InstanceFormContext.test.tsx+++ b/frontend/src/react/components/instance/InstanceFormContext.test.tsx@@ -57,11 +57,6 @@ vi.mock("@/store", () => ({useEnvironmentV1Store: () => ({getEnvironmentByName: (name: string) => ({ name }),}),- useInstanceV1Store: () => ({- createDataSource: vi.fn(),- createInstance: vi.fn(),- updateDataSource: vi.fn(),- }),useSubscriptionV1Store: () => ({currentPlan: 1,instanceLicenseCount: 1,@@ -69,6 +64,16 @@ vi.mock("@/store", () => ({}),}));+vi.mock("@/react/stores/app", () => ({+ useAppStore: Object.assign(() => undefined, {+ getState: () => ({+ createDataSource: vi.fn(),+ createInstance: vi.fn(),+ updateDataSource: vi.fn(),+ }),+ }),+}));+vi.mock("@/utils", () => ({calcUpdateMask: () => [],convertKVListToLabels: (list: { key: string; value: string }[]) =>diff --git a/frontend/src/react/components/instance/InstanceFormContext.tsx b/frontend/src/react/components/instance/InstanceFormContext.tsxindex 915c740fc6..8e3269d4de 100644--- a/frontend/src/react/components/instance/InstanceFormContext.tsx+++ b/frontend/src/react/components/instance/InstanceFormContext.tsx@@ -11,10 +11,10 @@ import {useState,} from "react";import { useTranslation } from "react-i18next";+import { useAppStore } from "@/react/stores/app";import {pushNotification,useEnvironmentV1Store,- useInstanceV1Store,useSubscriptionV1Store,} from "@/store";import { Engine, State } from "@/types/proto-es/v1/common_pb";@@ -130,7 +130,6 @@ export function InstanceFormProvider({children: ReactNode;}) {const { t } = useTranslation();- const instanceStore = useInstanceV1Store();const subscriptionStore = useSubscriptionV1Store();const environmentStore = useEnvironmentV1Store();@@ -472,7 +471,7 @@ export function InstanceFormProvider({);inst.dataSources = [dataSourceCreate];try {- await instanceStore.createInstance(inst, true);+ await useAppStore.getState().createInstance(inst, true);return ok();} catch (err) {return fail(dataSourceCreate.host, err);@@ -481,7 +480,7 @@ export function InstanceFormProvider({const ds = extractDataSourceFromEdit(instance!.engine, editingDS);if (editingDS.pendingCreate) {try {- await instanceStore.createDataSource({+ await useAppStore.getState().createDataSource({instance: instance!.name,dataSource: ds,validateOnly: true,@@ -501,7 +500,7 @@ export function InstanceFormProvider({original,editingDS);- await instanceStore.updateDataSource({+ await useAppStore.getState().updateDataSource({instance: instance!.name,dataSource: ds,updateMask,@@ -514,14 +513,7 @@ export function InstanceFormProvider({}}},- [- isCreating,- basicInfo,- instance,- instanceStore,- extractDataSourceFromEdit,- t,- ]+ [isCreating, basicInfo, instance, extractDataSourceFromEdit, t]);// Debounced valueChanged to avoid expensive deep comparison on every keystroke.diff --git a/frontend/src/react/components/useCommonSearchScopeOptions.tsx b/frontend/src/react/components/useCommonSearchScopeOptions.tsxindex d10001483c..355ffe44d4 100644--- a/frontend/src/react/components/useCommonSearchScopeOptions.tsx+++ b/frontend/src/react/components/useCommonSearchScopeOptions.tsx@@ -5,7 +5,7 @@ import type {ValueOption,} from "@/react/components/AdvancedSearch";import { EngineIcon } from "@/react/components/EngineIcon";-import { useInstanceV1Store } from "@/store";+import { useAppStore } from "@/react/stores/app";import { Engine } from "@/types/proto-es/v1/common_pb";import {extractEnvironmentResourceName,@@ -27,11 +27,10 @@ export function useCommonSearchScopeOptions(supportOptionIdList: SearchScopeId[]): ScopeOption[] {const { t } = useTranslation();- const instanceStore = useInstanceV1Store();const searchInstance = useCallback(async (keyword: string): Promise<ValueOption[]> => {- const resp = await instanceStore.fetchInstanceList({+ const resp = await useAppStore.getState().fetchInstanceList({pageToken: undefined,pageSize: getDefaultPagination(),filter: { query: keyword },@@ -55,7 +54,7 @@ export function useCommonSearchScopeOptions(};});},- [instanceStore]+ []);return useMemo(() => {diff --git a/frontend/src/react/pages/project/ProjectDataExportPage.tsx b/frontend/src/react/pages/project/ProjectDataExportPage.tsxindex 136571af22..ac89f4d9a2 100644--- a/frontend/src/react/pages/project/ProjectDataExportPage.tsx+++ b/frontend/src/react/pages/project/ProjectDataExportPage.tsx@@ -17,11 +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,- useInstanceV1Store,- useProjectV1Store,-} from "@/store";+import { useDatabaseV1Store, 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";@@ -88,12 +84,11 @@ export function ProjectDataExportPage({ projectId }: { projectId: string }) {setSearchParams(defaultSearchParams());}, [projectId]);- const instanceStore = useInstanceV1Store();const databaseStore = useDatabaseV1Store();const searchInstances = useCallback(async (keyword: string): Promise<ValueOption[]> => {if (!hasWorkspacePermissionV2("bb.instances.list")) return [];- const { instances } = await instanceStore.fetchInstanceList({+ const { instances } = await useAppStore.getState().fetchInstanceList({pageSize: getDefaultPagination(),filter: keyword.trim() ? { query: keyword } : undefined,});@@ -102,7 +97,7 @@ export function ProjectDataExportPage({ projectId }: { projectId: string }) {return { value: id, keywords: [id, i.title] };});},- [instanceStore]+ []);const searchDatabases = useCallback(async (keyword: string): Promise<ValueOption[]> => {diff --git a/frontend/src/react/pages/project/ProjectDatabasesPage.tsx b/frontend/src/react/pages/project/ProjectDatabasesPage.tsxindex f36d4c0270..e54fe9d799 100644--- a/frontend/src/react/pages/project/ProjectDatabasesPage.tsx+++ b/frontend/src/react/pages/project/ProjectDatabasesPage.tsx@@ -33,7 +33,6 @@ import {useActuatorV1Store,useDatabaseV1Store,useEnvironmentV1Store,- useInstanceV1Store,useProjectV1Store,} from "@/store";import {@@ -110,11 +109,10 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {() => environmentStore.environmentList ?? []);- const instanceStore = useInstanceV1Store();const searchInstances = useCallback(async (keyword: string): Promise<ValueOption[]> => {if (!hasWorkspacePermissionV2("bb.instances.list")) return [];- const { instances } = await instanceStore.fetchInstanceList({+ const { instances } = await useAppStore.getState().fetchInstanceList({pageSize: getDefaultPagination(),filter: keyword.trim() ? { query: keyword } : undefined,});@@ -123,7 +121,7 @@ export function ProjectDatabasesPage({ projectId }: { projectId: string }) {return { value: id, keywords: [id, i.title] };});},- [instanceStore]+ []);const scopeOptions: ScopeOption[] = useMemo(() => {diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsxindex 47b20f36aa..5832ee78bb 100644--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailDatabaseCreateView.tsx@@ -8,11 +8,7 @@ import { cn } from "@/react/lib/utils";import { useAppStore } from "@/react/stores/app";import { router } from "@/router";import { INSTANCE_ROUTE_DETAIL } from "@/router/dashboard/instance";-import {- useEnvironmentV1Store,- useInstanceV1Store,- useProjectV1Store,-} from "@/store";+import { useEnvironmentV1Store, useProjectV1Store } from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";import {formatEnvironmentName,@@ -21,6 +17,7 @@ import {} from "@/types";import type { Plan_CreateDatabaseConfig } from "@/types/proto-es/v1/plan_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";+import { unknownInstance } from "@/types/v1/instance";import {databaseV1Url,extractCoreDatabaseInfoFromDatabaseCreateTask,@@ -38,7 +35,6 @@ export function IssueDetailDatabaseCreateView() {const page = useIssueDetailContext();const projectStore = useProjectV1Store();const environmentStore = useEnvironmentV1Store();- const instanceStore = useInstanceV1Store();const projectName = `${projectNamePrefix}${page.projectId}`;const project = useVueState(() => projectStore.getProjectByName(projectName));@@ -58,8 +54,12 @@ export function IssueDetailDatabaseCreateView() {const environment = useVueState(() =>environmentStore.getEnvironmentByName(environmentName));- const instance = useVueState(() =>- instanceStore.getInstanceByName(targetInstanceName)+ const cachedInstance = useAppStore(+ (s) => s.instancesByName[targetInstanceName]+ );+ const instance = useMemo(+ () => cachedInstance ?? unknownInstance(),+ [cachedInstance, targetInstanceName]);const createDatabaseTask = useMemo(() => {@@ -99,9 +99,9 @@ export function IssueDetailDatabaseCreateView() {useEffect(() => {if (targetInstanceName) {- void instanceStore.getOrFetchInstanceByName(targetInstanceName);+ void useAppStore.getState().getOrFetchInstanceByName(targetInstanceName);}- }, [instanceStore, targetInstanceName]);+ }, [targetInstanceName]);const isTaskDone = createDatabaseTask?.status === Task_Status.DONE;const createdDatabase =@@ -232,9 +232,10 @@ function IssueDetailDatabaseCreateInstance({params: { instanceId },}).href: "";- const instanceStore = useInstanceV1Store();- const instance = useVueState(() =>- instanceStore.getInstanceByName(instanceName)+ const cachedInstance = useAppStore((s) => s.instancesByName[instanceName]);+ const instance = useMemo(+ () => cachedInstance ?? unknownInstance(),+ [cachedInstance, instanceName]);if (!instanceHref) {diff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.tsxindex 54102c6613..3ed3e0fd92 100644--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.tsx+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailRoleGrantDetails.tsx@@ -15,11 +15,7 @@ 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,- useInstanceV1Store,-} from "@/store";+import { useDatabaseV1Store, useEnvironmentV1Store } from "@/store";import type { DatabaseResource } from "@/types";import {type ConditionExpression,@@ -181,7 +177,10 @@ function IssueDetailDatabaseResourceTable({const { t } = useTranslation();const databaseStore = useDatabaseV1Store();const environmentStore = useEnvironmentV1Store();- const instanceStore = useInstanceV1Store();+ // 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 rows = useVueState(() =>databaseResourceList.map((resource) => {const database = databaseStore.getDatabaseByName(@@ -191,7 +190,7 @@ function IssueDetailDatabaseResourceTable({resource.databaseFullName);const instance = instanceName- ? instanceStore.getInstanceByName(`instances/${instanceName}`)+ ? instancesByName[`instances/${instanceName}`]: database.instanceResource;const environmentName =database.effectiveEnvironment ??diff --git a/frontend/src/react/pages/settings/DatabasesPage.tsx b/frontend/src/react/pages/settings/DatabasesPage.tsxindex 4e54c2ad20..47c2447cd6 100644--- a/frontend/src/react/pages/settings/DatabasesPage.tsx+++ b/frontend/src/react/pages/settings/DatabasesPage.tsx@@ -31,7 +31,6 @@ import {useActuatorV1Store,useDatabaseV1Store,useEnvironmentV1Store,- useInstanceV1Store,useProjectV1Store,} from "@/store";import {@@ -167,11 +166,10 @@ export function DatabasesPage() {[projectStore, defaultProjectId, unassignedProjectOption]);- const instanceStore = useInstanceV1Store();const searchInstances = useCallback(async (keyword: string): Promise<ValueOption[]> => {if (!hasWorkspacePermissionV2("bb.instances.list")) return [];- const { instances } = await instanceStore.fetchInstanceList({+ const { instances } = await useAppStore.getState().fetchInstanceList({pageSize: getDefaultPagination(),filter: keyword.trim() ? { query: keyword } : undefined,});@@ -183,7 +181,7 @@ export function DatabasesPage() {};});},- [instanceStore]+ []);const scopeOptions: ScopeOption[] = useMemo(() => {diff --git a/frontend/src/react/pages/settings/EnvironmentsPage.tsx b/frontend/src/react/pages/settings/EnvironmentsPage.tsxindex f5a52b90ba..38bcad6eb5 100644--- a/frontend/src/react/pages/settings/EnvironmentsPage.tsx+++ b/frontend/src/react/pages/settings/EnvironmentsPage.tsx@@ -73,7 +73,6 @@ import {useActuatorV1Store,useDatabaseV1Store,useEnvironmentV1Store,- useInstanceV1Store,useSubscriptionV1Store,} from "@/store";import { environmentNamePrefix } from "@/store/modules/v1/common";@@ -711,7 +710,6 @@ function EnvironmentDetail({}, [environment.id]);// Check for related resources (instances/databases)- const instanceStore = useInstanceV1Store();const databaseStore = useDatabaseV1Store();const actuatorStore = useActuatorV1Store();@@ -723,7 +721,7 @@ function EnvironmentDetail({}try {const [instResp, dbResp] = await Promise.all([- instanceStore.fetchInstanceList({+ useAppStore.getState().fetchInstanceList({pageSize: 1,filter: { environment: environment.name },silent: true,@@ -748,7 +746,6 @@ function EnvironmentDetail({environment.name,canEdit,environmentList.length,- instanceStore,databaseStore,actuatorStore,]);diff --git a/frontend/src/react/pages/settings/InstanceDetailPage.tsx b/frontend/src/react/pages/settings/InstanceDetailPage.tsxindex d213861bab..00f2422c28 100644--- a/frontend/src/react/pages/settings/InstanceDetailPage.tsx+++ b/frontend/src/react/pages/settings/InstanceDetailPage.tsx@@ -42,7 +42,6 @@ import {useActuatorV1Store,useDatabaseV1Store,useEnvironmentV1Store,- useInstanceV1Store,useProjectV1Store,} from "@/store";import {@@ -63,6 +62,7 @@ import {DatabaseSchema$,UpdateDatabaseRequestSchema,} from "@/types/proto-es/v1/database_service_pb";+import { unknownInstance } from "@/types/v1/instance";import {extractProjectResourceName,getDefaultPagination,@@ -77,14 +77,15 @@ const isInstanceHash = (x: unknown): x is InstanceHash =>export function InstanceDetailPage({ instanceId }: { instanceId: string }) {const { t } = useTranslation();- const instanceStore = useInstanceV1Store();const databaseStore = useDatabaseV1Store();const removeDatabaseMetadataCache = useAppStore((s) => s.removeDatabaseMetadataCache);const instanceName = `${instanceNamePrefix}${instanceId}`;- const instance = useVueState(() =>- instanceStore.getInstanceByName(instanceName)+ const cachedInstance = useAppStore((s) => s.instancesByName[instanceName]);+ const instance = useMemo(+ () => cachedInstance ?? unknownInstance(),+ [cachedInstance, instanceName]);const [selectedTab, setSelectedTab] = useState<InstanceHash>("overview");@@ -253,14 +254,12 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {},[databaseStore, refresh, t]);- // Trigger a Pinia-side fetch on mount. The parent `InstanceRouteShell`- // populates the React-side `useAppStore` cache, but this page reads- // from the Pinia v1 store (`useInstanceV1Store`) — they're separate- // caches. Without this, hard-refreshing the page shows "Unknown- // instance" because the Pinia cache hasn't been hydrated.+ // Trigger a fetch on mount so the instance is hydrated into the+ // `useAppStore` cache. Without this, hard-refreshing the page shows+ // "Unknown instance" because the cache hasn't been populated yet.useEffect(() => {- void instanceStore.getOrFetchInstanceByName(instanceName);- }, [instanceStore, instanceName]);+ void useAppStore.getState().getOrFetchInstanceByName(instanceName);+ }, [instanceName]);// Sync tab with URL hashuseEffect(() => {@@ -286,10 +285,10 @@ export function InstanceDetailPage({ instanceId }: { instanceId: string }) {const syncSchema = useCallback(async (enableFullSync: boolean) => {- await instanceStore.syncInstance(instance.name, enableFullSync);+ await useAppStore.getState().syncInstance(instance.name, enableFullSync);databaseStore.removeCacheByInstance(instance.name);},- [instance.name, instanceStore, databaseStore]+ [instance.name, databaseStore]);// Database filterdiff --git a/frontend/src/react/pages/settings/InstancesPage.tsx b/frontend/src/react/pages/settings/InstancesPage.tsxindex 12c647475a..04d0e87a05 100644--- a/frontend/src/react/pages/settings/InstancesPage.tsx+++ b/frontend/src/react/pages/settings/InstancesPage.tsx@@ -73,7 +73,6 @@ import {pushNotification,useActuatorV1Store,useEnvironmentV1Store,- useInstanceV1Store,useSubscriptionV1Store,} from "@/store";import { environmentNamePrefix } from "@/store/modules/v1/common";@@ -251,7 +250,6 @@ function InstanceActionDropdown({onAction: () => void;}) {const { t } = useTranslation();- const instanceStore = useInstanceV1Store();const [showArchiveConfirm, setShowArchiveConfirm] = useState(false);const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);const [forceArchive, setForceArchive] = useState(false);@@ -261,7 +259,7 @@ function InstanceActionDropdown({const handleArchive = useCallback(async () => {try {- await instanceStore.archiveInstance(instance, forceArchive);+ await useAppStore.getState().archiveInstance(instance, forceArchive);pushNotification({module: "bytebase",style: "INFO",@@ -280,11 +278,11 @@ function InstanceActionDropdown({description: (error as { message?: string }).message,});}- }, [instance, instanceStore, forceArchive, t, onAction]);+ }, [instance, forceArchive, t, onAction]);const handleRestore = useCallback(async () => {try {- await instanceStore.restoreInstance(instance);+ await useAppStore.getState().restoreInstance(instance);pushNotification({module: "bytebase",style: "SUCCESS",@@ -301,11 +299,11 @@ function InstanceActionDropdown({description: (error as { message?: string }).message,});}- }, [instance, instanceStore, t, onAction]);+ }, [instance, t, onAction]);const handleDelete = useCallback(async () => {try {- await instanceStore.deleteInstance(instance.name);+ await useAppStore.getState().deleteInstance(instance.name);pushNotification({module: "bytebase",style: "SUCCESS",@@ -321,7 +319,7 @@ function InstanceActionDropdown({description: (error as { message?: string }).message,});}- }, [instance, instanceStore, t, onAction]);+ }, [instance, t, onAction]);if (!canArchive && !canRestore) return null;@@ -522,7 +520,6 @@ function EditEnvironmentSheet({export function InstancesPage() {const { t } = useTranslation();- const instanceStore = useInstanceV1Store();const subscriptionStore = useSubscriptionV1Store();const actuatorStore = useActuatorV1Store();@@ -777,7 +774,7 @@ export function InstancesPage() {try {const token = isRefresh ? "" : nextPageTokenRef.current;- const result = await instanceStore.fetchInstanceList({+ const result = await useAppStore.getState().fetchInstanceList({pageToken: token,pageSize,filter,@@ -803,7 +800,7 @@ export function InstancesPage() {}}},- [pageSize, filter, orderBy, instanceStore]+ [pageSize, filter, orderBy]);// Fetch on mount + re-fetch on filter/sort/pageSize changes@@ -831,8 +828,8 @@ export function InstancesPage() {if (selectedNames.size === 0) return [];return Array.from(selectedNames).filter((name) => isValidInstanceName(name))- .map((name) => instanceStore.getInstanceByName(name));- }, [selectedNames, instanceStore]);+ .map((name) => useAppStore.getState().getInstanceByName(name));+ }, [selectedNames]);const toggleSelection = useCallback((name: string) => {setSelectedNames((prev) => {@@ -860,10 +857,9 @@ export function InstancesPage() {async (enableFullSync: boolean) => {setSyncing(true);try {- await instanceStore.batchSyncInstances(- Array.from(selectedNames),- enableFullSync- );+ await useAppStore+ .getState()+ .batchSyncInstances(Array.from(selectedNames), enableFullSync);pushNotification({module: "bytebase",style: "INFO",@@ -873,13 +869,13 @@ export function InstancesPage() {setSyncing(false);}},- [selectedNames, instanceStore, t]+ [selectedNames, t]);const handleEnvironmentUpdate = useCallback(async (environment: string) => {try {- await instanceStore.batchUpdateInstances(+ await useAppStore.getState().batchUpdateInstances(selectedInstanceList.map((instance) =>create(UpdateInstanceRequestSchema, {instance: { ...instance, environment },@@ -903,7 +899,7 @@ export function InstancesPage() {});}},- [selectedInstanceList, instanceStore, t, fetchInstances]+ [selectedInstanceList, t, fetchInstances]);const handleRowAction = useCallback(() => {diff --git a/frontend/src/react/pages/settings/MemberDatabaseResourceName.tsx b/frontend/src/react/pages/settings/MemberDatabaseResourceName.tsxindex c6dc934883..d3680a3dc0 100644--- a/frontend/src/react/pages/settings/MemberDatabaseResourceName.tsx+++ b/frontend/src/react/pages/settings/MemberDatabaseResourceName.tsx@@ -1,7 +1,8 @@import { ChevronRight } from "lucide-react";import { EngineIcon } from "@/react/components/EngineIcon";import { useVueState } from "@/react/hooks/useVueState";-import { useDatabaseV1Store, useInstanceV1Store } from "@/store";+import { useAppStore } from "@/react/stores/app";+import { useDatabaseV1Store } from "@/store";import type { DatabaseResource } from "@/types";import {extractDatabaseResourceName,@@ -14,7 +15,6 @@ export function MemberDatabaseResourceName({resource?: DatabaseResource;}) {const databaseStore = useDatabaseV1Store();- const instanceStore = useInstanceV1Store();const display = useVueState(() => {if (!resource) {@@ -27,7 +27,7 @@ export function MemberDatabaseResourceName({const database = databaseStore.getDatabaseByName(resource.databaseFullName);const expectedInstanceName = `instances/${instanceName}`;const instance = instanceName- ? instanceStore.getInstanceByName(expectedInstanceName)+ ? useAppStore.getState().getInstanceByName(expectedInstanceName): undefined;const validInstance =instance?.name === expectedInstanceName ? instance : undefined;diff --git a/frontend/src/react/stores/app/instance.ts b/frontend/src/react/stores/app/instance.tsindex 84b9f5e73c..20c64801e0 100644--- a/frontend/src/react/stores/app/instance.ts+++ b/frontend/src/react/stores/app/instance.ts@@ -1,71 +1,327 @@import { create as createProto } from "@bufbuild/protobuf";+import { createContextValues } from "@connectrpc/connect";import { instanceServiceClientConnect } from "@/connect";+import { silentContextKey } from "@/connect/context-key";+import { Engine, State } from "@/types/proto-es/v1/common_pb";import {+ AddDataSourceRequestSchema,+ BatchSyncInstancesRequestSchema,+ BatchUpdateInstancesRequestSchema,+ CreateInstanceRequestSchema,+ DeleteInstanceRequestSchema,GetInstanceRequestSchema,type Instance,+ ListInstanceDatabaseRequestSchema,+ ListInstancesRequestSchema,+ RemoveDataSourceRequestSchema,+ SyncInstanceRequestSchema,+ UndeleteInstanceRequestSchema,+ UpdateDataSourceRequestSchema,+ UpdateInstanceRequestSchema,} from "@/types/proto-es/v1/instance_service_pb";+import {+ isValidEnvironmentName,+ unknownEnvironment,+} from "@/types/v1/environment";import {isValidInstanceName,UNKNOWN_INSTANCE_NAME,+ unknownInstance,} from "@/types/v1/instance";-import type { AppSliceCreator, InstanceSlice } from "./types";-import { toError } from "./utils";+import { isValidProjectName } from "@/types/v1/project";+import { extractInstanceResourceName, hasWorkspacePermissionV2 } from "@/utils";+import type { AppSliceCreator, InstanceFilter, InstanceSlice } from "./types";+import { getLabelFilter, toError } from "./utils";++const getListInstanceFilter = (params: InstanceFilter): string => {+ const list: string[] = [];+ 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) {+ 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 createInstanceSlice: AppSliceCreator<InstanceSlice> = (set,get-) => ({- instancesByName: {},- instanceRequests: {},- instanceErrorsByName: {},-- fetchInstance: async (name) => {- if (!isValidInstanceName(name) || name === UNKNOWN_INSTANCE_NAME) {- return undefined;- }- const existing = get().instancesByName[name];- if (existing) return existing;- const pending = get().instanceRequests[name];- if (pending) return pending;-- const request = instanceServiceClientConnect- .getInstance(createProto(GetInstanceRequestSchema, { name }))- .then((instance: Instance) => {- set((state) => {- const { [name]: _, ...instanceRequests } = state.instanceRequests;- return {- instancesByName: {- ...state.instancesByName,- [instance.name]: instance,- },- instanceErrorsByName: {- ...state.instanceErrorsByName,- [name]: undefined,- },- instanceRequests,- };- });- return instance;- })- .catch((error) => {- set((state) => {- const { [name]: _, ...instanceRequests } = state.instanceRequests;- return {- instanceErrorsByName: {- ...state.instanceErrorsByName,- [name]: toError(error),- },- instanceRequests,- };- });+) => {+ // Immutable bulk upsert into the by-name cache.+ const upsertInstances = (instances: Instance[]): Instance[] => {+ set((state) => {+ const instancesByName = { ...state.instancesByName };+ for (const instance of instances) {+ instancesByName[instance.name] = instance;+ }+ return { instancesByName };+ });+ return instances;+ };++ return {+ instancesByName: {},+ instanceRequests: {},+ instanceErrorsByName: {},++ fetchInstance: async (name) => {+ if (!isValidInstanceName(name) || name === UNKNOWN_INSTANCE_NAME) {return undefined;+ }+ const existing = get().instancesByName[name];+ if (existing) return existing;+ const pending = get().instanceRequests[name];+ if (pending) return pending;++ const request = instanceServiceClientConnect+ .getInstance(createProto(GetInstanceRequestSchema, { name }))+ .then((instance: Instance) => {+ set((state) => {+ const { [name]: _, ...instanceRequests } = state.instanceRequests;+ return {+ instancesByName: {+ ...state.instancesByName,+ [instance.name]: instance,+ },+ instanceErrorsByName: {+ ...state.instanceErrorsByName,+ [name]: undefined,+ },+ instanceRequests,+ };+ });+ return instance;+ })+ .catch((error) => {+ set((state) => {+ const { [name]: _, ...instanceRequests } = state.instanceRequests;+ return {+ instanceErrorsByName: {+ ...state.instanceErrorsByName,+ [name]: toError(error),+ },+ instanceRequests,+ };+ });+ return undefined;+ });+ set((state) => ({+ instanceRequests: { ...state.instanceRequests, [name]: request },+ }));+ return request;+ },++ getInstanceByName: (name) =>+ get().instancesByName[name] ?? unknownInstance(),++ getOrFetchInstanceByName: async (name, silent = false) => {+ const cached = get().instancesByName[name];+ if (cached) return cached;+ if (+ !isValidInstanceName(name) ||+ !hasWorkspacePermissionV2("bb.instances.get")+ ) {+ return unknownInstance();+ }+ // Propagate fetch failures (e.g. NotFound) to the caller — callers such+ // as `validateInstanceId` rely on a rejection to mean "id is available".+ // Do NOT swallow into `unknownInstance()` here; that variant is+ // `fetchInstance`.+ const response = await instanceServiceClientConnect.getInstance(+ createProto(GetInstanceRequestSchema, { name }),+ { contextValues: createContextValues().set(silentContextKey, silent) }+ );+ return upsertInstances([response])[0];+ },++ createInstance: async (instance, validateOnly = false) => {+ const response = await instanceServiceClientConnect.createInstance(+ createProto(CreateInstanceRequestSchema, {+ instance,+ instanceId: extractInstanceResourceName(instance.name),+ validateOnly,+ }),+ {+ contextValues: createContextValues().set(+ silentContextKey,+ validateOnly+ ),+ }+ );+ if (!validateOnly) {+ upsertInstances([response]);+ }+ return response;+ },++ updateInstance: async (instance, updateMask) => {+ const response = await instanceServiceClientConnect.updateInstance(+ createProto(UpdateInstanceRequestSchema, {+ instance,+ updateMask: { paths: updateMask },+ })+ );+ return upsertInstances([response])[0];+ },++ archiveInstance: async (instance, force = false) => {+ await instanceServiceClientConnect.deleteInstance(+ createProto(DeleteInstanceRequestSchema, { name: instance.name, force })+ );+ return upsertInstances([{ ...instance, state: State.DELETED }])[0];+ },++ restoreInstance: async (instance) => {+ await instanceServiceClientConnect.undeleteInstance(+ createProto(UndeleteInstanceRequestSchema, { name: instance.name })+ );+ return upsertInstances([{ ...instance, state: State.ACTIVE }])[0];+ },++ deleteInstance: async (instance) => {+ await instanceServiceClientConnect.deleteInstance(+ createProto(DeleteInstanceRequestSchema, {+ name: instance,+ purge: true,+ })+ );+ set((state) => {+ const { [instance]: _removed, ...instancesByName } =+ state.instancesByName;+ return { instancesByName };});- set((state) => ({- instanceRequests: {- ...state.instanceRequests,- [name]: request,- },- }));- return request;- },-});+ },++ syncInstance: (instance, enableFullSync) =>+ instanceServiceClientConnect.syncInstance(+ createProto(SyncInstanceRequestSchema, {+ name: instance,+ enableFullSync,+ })+ ),++ batchSyncInstances: async (instanceNameList, enableFullSync) => {+ await instanceServiceClientConnect.batchSyncInstances(+ createProto(BatchSyncInstancesRequestSchema, {+ requests: instanceNameList.map((name) => ({ name, enableFullSync })),+ })+ );+ },++ batchUpdateInstances: async (requests) => {+ const response = await instanceServiceClientConnect.batchUpdateInstances(+ createProto(BatchUpdateInstancesRequestSchema, { requests })+ );+ return upsertInstances(response.instances);+ },++ createDataSource: async ({ instance, dataSource, validateOnly }) => {+ const response = await instanceServiceClientConnect.addDataSource(+ createProto(AddDataSourceRequestSchema, {+ name: instance,+ dataSource,+ validateOnly,+ }),+ {+ contextValues: createContextValues().set(+ silentContextKey,+ validateOnly+ ),+ }+ );+ if (!validateOnly) {+ upsertInstances([response]);+ }+ return response;+ },++ updateDataSource: async ({+ instance,+ dataSource,+ updateMask,+ validateOnly,+ }) => {+ const response = await instanceServiceClientConnect.updateDataSource(+ createProto(UpdateDataSourceRequestSchema, {+ name: instance,+ dataSource,+ updateMask: { paths: updateMask },+ validateOnly,+ }),+ {+ contextValues: createContextValues().set(+ silentContextKey,+ validateOnly+ ),+ }+ );+ if (!validateOnly) {+ upsertInstances([response]);+ }+ return response;+ },++ deleteDataSource: async (instance, dataSource) => {+ const response = await instanceServiceClientConnect.removeDataSource(+ createProto(RemoveDataSourceRequestSchema, {+ name: instance.name,+ dataSource,+ })+ );+ return upsertInstances([response])[0];+ },++ listInstanceDatabases: (name, instance) =>+ instanceServiceClientConnect.listInstanceDatabase(+ createProto(ListInstanceDatabaseRequestSchema, { name, instance })+ ),++ fetchInstanceList: async (params) => {+ const response = await instanceServiceClientConnect.listInstances(+ createProto(ListInstancesRequestSchema, {+ pageSize: params.pageSize,+ pageToken: params.pageToken,+ orderBy: params.orderBy,+ filter: getListInstanceFilter(params.filter ?? {}),+ showDeleted: params.filter?.state !== State.ACTIVE,+ }),+ {+ contextValues: createContextValues().set(+ silentContextKey,+ params.silent+ ),+ }+ );+ return {+ instances: upsertInstances(response.instances),+ nextPageToken: response.nextPageToken,+ };+ },+ };+};diff --git a/frontend/src/react/stores/app/types.ts b/frontend/src/react/stores/app/types.tsindex a3d18e0ca0..f4df1adf30 100644--- a/frontend/src/react/stores/app/types.ts+++ b/frontend/src/react/stores/app/types.ts@@ -6,7 +6,7 @@ import type { Permission } from "@/types/iam/permission";import type { NotificationCreate } from "@/types/notification";import type { AccessGrant } from "@/types/proto-es/v1/access_grant_service_pb";import type { ActuatorInfo } from "@/types/proto-es/v1/actuator_service_pb";-import type { State } from "@/types/proto-es/v1/common_pb";+import type { Engine, State } from "@/types/proto-es/v1/common_pb";import type { DatabaseCatalog } from "@/types/proto-es/v1/database_catalog_service_pb";import type {DatabaseGroup,@@ -31,8 +31,12 @@ import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";import type { IdentityProvider } from "@/types/proto-es/v1/idp_service_pb";import type { InstanceRole } from "@/types/proto-es/v1/instance_role_service_pb";import type {+ DataSource,Instance,InstanceResource,+ ListInstanceDatabaseResponse,+ SyncInstanceResponse,+ UpdateInstanceRequest,} from "@/types/proto-es/v1/instance_service_pb";import type {Issue,@@ -272,11 +276,75 @@ export type ProjectSlice = {createProject: (title: string, resourceId: string) => Promise<Project>;};+export interface InstanceFilter {+ environment?: string;+ project?: string;+ host?: string;+ port?: string;+ query?: string;+ engines?: Engine[];+ state?: State;+ labels?: string[];+}+export type InstanceSlice = {instancesByName: Record<string, Instance>;instanceRequests: Record<string, Promise<Instance | undefined>>;instanceErrorsByName: Record<string, Error | undefined>;fetchInstance: (name: string) => Promise<Instance | undefined>;+ getInstanceByName: (name: string) => Instance;+ getOrFetchInstanceByName: (+ name: string,+ silent?: boolean+ ) => Promise<Instance>;+ createInstance: (+ instance: Instance,+ validateOnly?: boolean+ ) => Promise<Instance>;+ updateInstance: (+ instance: Instance,+ updateMask: string[]+ ) => Promise<Instance>;+ archiveInstance: (instance: Instance, force?: boolean) => Promise<Instance>;+ restoreInstance: (instance: Instance) => Promise<Instance>;+ deleteInstance: (instance: string) => Promise<void>;+ syncInstance: (+ instance: string,+ enableFullSync: boolean+ ) => Promise<SyncInstanceResponse>;+ batchSyncInstances: (+ instanceNameList: string[],+ enableFullSync: boolean+ ) => Promise<void>;+ batchUpdateInstances: (+ requests: UpdateInstanceRequest[]+ ) => Promise<Instance[]>;+ createDataSource: (params: {+ instance: string;+ dataSource: DataSource;+ validateOnly?: boolean;+ }) => Promise<Instance>;+ updateDataSource: (params: {+ instance: string;+ dataSource: DataSource;+ updateMask: string[];+ validateOnly?: boolean;+ }) => Promise<Instance>;+ deleteDataSource: (+ instance: Instance,+ dataSource: DataSource+ ) => Promise<Instance>;+ listInstanceDatabases: (+ name: string,+ instance?: Instance+ ) => Promise<ListInstanceDatabaseResponse>;+ fetchInstanceList: (params: {+ pageSize?: number;+ pageToken?: string;+ orderBy?: string;+ filter?: InstanceFilter;+ silent?: boolean;+ }) => Promise<{ instances: Instance[]; nextPageToken: string }>;};export type DatabaseListParams = {diff --git a/frontend/src/react/stores/app/utils.ts b/frontend/src/react/stores/app/utils.tsindex cbe03c6666..6b761cdc06 100644--- a/frontend/src/react/stores/app/utils.ts+++ b/frontend/src/react/stores/app/utils.ts@@ -55,7 +55,7 @@ export function buildProjectFilter(query: string | undefined) {// Converts label selectors like "{key}:{v1},{v2}" into API filter clauses// (`labels.{key} == "v"` or `labels.{key} in [...]`). Ported verbatim from// the legacy Pinia database store.-function getLabelFilter(labels: string[]): string[] {+export function getLabelFilter(labels: string[]): string[] {const labelMap = new Map<string, string[]>();for (const label of labels) {const sections = label.split(":");