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: batch get or fetch (#18594)
ecmadao9f50cd570693
diff --git a/frontend/src/AuthContext.vue b/frontend/src/AuthContext.vueindex 00316851ce..726e8a0188 100644--- a/frontend/src/AuthContext.vue+++ b/frontend/src/AuthContext.vue@@ -16,10 +16,10 @@ import SigninModal from "@/views/auth/SigninModal.vue";import { t } from "./plugins/i18n";import { WORKSPACE_ROOT_MODULE } from "./router/dashboard/workspaceRoutes";import {- batchGetOrFetchGroups,pushNotification,useAuthStore,useCurrentUserV1,+ useGroupStore,useRoleStore,useWorkspaceV1Store,} from "./store";@@ -34,6 +34,7 @@ const authStore = useAuthStore();const currentUser = useCurrentUserV1();const workspaceStore = useWorkspaceV1Store();const roleStore = useRoleStore();+const groupStore = useGroupStore();const authCheckIntervalId = ref<NodeJS.Timeout>();@@ -101,7 +102,7 @@ watch(workspaceStore.fetchIamPolicy(),roleStore.fetchRoleList(),// we only care about the groups for the current user.- batchGetOrFetchGroups(currentUser.value.groups),+ groupStore.batchGetOrFetchGroups(currentUser.value.groups),]);},{diff --git a/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue b/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vueindex 0aa4594640..af7c139b22 100644--- a/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue+++ b/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue@@ -72,11 +72,7 @@ import {} from "@/components/v2";import type { ConditionGroupExpr } from "@/plugins/cel";import { validateSimpleExpr } from "@/plugins/cel";-import {- batchGetOrFetchDatabases,- useDatabaseV1Store,- useDBGroupStore,-} from "@/store";+import { useDatabaseV1Store, useDBGroupStore } from "@/store";import {type ComposedDatabase,DEBOUNCE_SEARCH_DELAY,@@ -125,7 +121,7 @@ const loadMoreMatched = async (index: number) => {const previous = index;const next = previous + pageSize.value;const databaseNames = matchedDatabaseNameList.value.slice(previous, next);- await batchGetOrFetchDatabases(databaseNames);+ await databaseStore.batchGetOrFetchDatabases(databaseNames);return {databases: databaseNames.map(databaseStore.getDatabaseByName),diff --git a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vueindex 0b797ba2fa..b73f94e009 100644--- a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue+++ b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue@@ -36,7 +36,6 @@ import { BBSpin } from "@/bbkit";import AdvancedSearch from "@/components/AdvancedSearch";import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch/useCommonSearchScopeOptions";import {- batchGetOrFetchDatabases,type DatabaseFilter,useDatabaseV1Store,useDBSchemaV1Store,@@ -300,7 +299,7 @@ watch();onMounted(async () => {- await batchGetOrFetchDatabases(+ await databaseStore.batchGetOrFetchDatabases(props.databaseResources.map((resource) => resource.databaseFullName));await refreshData();diff --git a/frontend/src/components/IssueV1/components/GrantRequest/DatabaseResourceTable.vue b/frontend/src/components/IssueV1/components/GrantRequest/DatabaseResourceTable.vueindex ccd030052b..cf5cbd434a 100644--- a/frontend/src/components/IssueV1/components/GrantRequest/DatabaseResourceTable.vue+++ b/frontend/src/components/IssueV1/components/GrantRequest/DatabaseResourceTable.vue@@ -9,13 +9,12 @@</template><script lang="tsx" setup>-import { uniq } from "lodash-es";import type { DataTableColumn } from "naive-ui";import { NDataTable } from "naive-ui";import { computed, watch } from "vue";import { useI18n } from "vue-i18n";import { EnvironmentV1Name, InstanceV1Name } from "@/components/v2";-import { batchGetOrFetchDatabases, useDatabaseV1Store } from "@/store";+import { useDatabaseV1Store } from "@/store";import type { DatabaseResource } from "@/types";import type { DatabaseGroup } from "@/types/proto-es/v1/database_group_service_pb";@@ -59,11 +58,9 @@ const extractComposedDatabase = (databaseResource: DatabaseResource) => {watch(() => props.databaseResourceList,async () => {- await batchGetOrFetchDatabases(- uniq(- props.databaseResourceList.map(- (databaseResource) => databaseResource.databaseFullName- )+ await databaseStore.batchGetOrFetchDatabases(+ props.databaseResourceList.map(+ (databaseResource) => databaseResource.databaseFullName));},diff --git a/frontend/src/components/IssueV1/components/TaskListSection/TaskListSection.vue b/frontend/src/components/IssueV1/components/TaskListSection/TaskListSection.vueindex c2d4ccf4e2..9d0c891f35 100644--- a/frontend/src/components/IssueV1/components/TaskListSection/TaskListSection.vue+++ b/frontend/src/components/IssueV1/components/TaskListSection/TaskListSection.vue@@ -66,7 +66,7 @@ import { computed, reactive, ref, watch } from "vue";import { BBSpin } from "@/bbkit";import { usePlanSQLCheckContext } from "@/components/Plan/components/SQLCheckSection/context";import { useVerticalScrollState } from "@/composables/useScrollState";-import { batchGetOrFetchDatabases, useCurrentProjectV1 } from "@/store";+import { useCurrentProjectV1, useDatabaseV1Store } from "@/store";import { DEBOUNCE_SEARCH_DELAY } from "@/types";import type { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import type { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";@@ -106,6 +106,7 @@ const { project } = useCurrentProjectV1();const { resultMap } = usePlanSQLCheckContext();const taskBar = ref<HTMLDivElement>();const taskBarScrollState = useVerticalScrollState(taskBar, MAX_LIST_HEIGHT);+const dbStore = useDatabaseV1Store();const taskList = computed(() => {return selectedStage.value.tasks;@@ -173,7 +174,7 @@ const loadMore = useDebounceFn(async () => {.map((task) => databaseForTask(project.value, task).name);try {- await batchGetOrFetchDatabases(databaseNames);+ await dbStore.batchGetOrFetchDatabases(databaseNames);} catch {// Ignore errors// If the issue type is create database,diff --git a/frontend/src/components/Member/MemberDataTable/index.vue b/frontend/src/components/Member/MemberDataTable/index.vueindex afb22c31b9..4063ed54e6 100644--- a/frontend/src/components/Member/MemberDataTable/index.vue+++ b/frontend/src/components/Member/MemberDataTable/index.vue@@ -86,10 +86,9 @@ const onGroupLoad = async (row: DataTableRowData) => {return;}- const memberUserIds = binding.group.members.map((m) => m.member);- if (memberUserIds.length > 0) {- await userStore.batchGetUsers(memberUserIds);- }+ await userStore.batchGetOrFetchUsers(+ binding.group.members.map((m) => m.member)+ );const children: UserRoleData[] = [];for (const member of binding.group.members) {diff --git a/frontend/src/components/Plan/components/AddSpecDrawer.vue b/frontend/src/components/Plan/components/AddSpecDrawer.vueindex ccd51d80b3..3d1ff69839 100644--- a/frontend/src/components/Plan/components/AddSpecDrawer.vue+++ b/frontend/src/components/Plan/components/AddSpecDrawer.vue@@ -53,9 +53,9 @@ import DatabaseAndGroupSelector from "@/components/DatabaseAndGroupSelector";import { getLocalSheetByName, getNextLocalSheetUID } from "@/components/Plan";import { Drawer, DrawerContent } from "@/components/v2";import {- batchGetOrFetchDatabases,pushNotification,useCurrentProjectV1,+ useDatabaseV1Store,} from "@/store";import type { ComposedDatabase } from "@/types";import { DatabaseChangeType } from "@/types/proto-es/v1/common_pb";@@ -77,6 +77,7 @@ const emit = defineEmits<{const { project } = useCurrentProjectV1();const { t } = useI18n();+const dbStore = useDatabaseV1Store();const show = defineModel<boolean>("show", { default: false });const isCreating = ref(false);@@ -127,7 +128,7 @@ const handleUpdateSelection = async (newState: DatabaseSelectState) => {newState.changeSource === "DATABASE" &&newState.selectedDatabaseNameList?.length > 0) {- await batchGetOrFetchDatabases(newState.selectedDatabaseNameList);+ await dbStore.batchGetOrFetchDatabases(newState.selectedDatabaseNameList);}};diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vueindex f45aa45aca..ae019ae3d8 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue@@ -76,9 +76,9 @@ import { NTimelineItem } from "naive-ui";import { computed, watchEffect } from "vue";import { useI18n } from "vue-i18n";import {- batchGetOrFetchGroups,useCurrentProjectV1,useCurrentUserV1,+ useGroupStore,useProjectIamPolicyStore,useRoleStore,useUserStore,@@ -112,6 +112,7 @@ const { project } = useCurrentProjectV1();const currentUser = useCurrentUserV1();const userStore = useUserStore();const roleStore = useRoleStore();+const groupStore = useGroupStore();const projectIamPolicyStore = useProjectIamPolicyStore();const currentUserEmail = computed(() => currentUser.value.email);@@ -216,7 +217,7 @@ watchEffect(async () => {}}- await batchGetOrFetchGroups(groupNames);+ await groupStore.batchGetOrFetchGroups(groupNames);});// Get candidates for this approval step@@ -282,19 +283,15 @@ const potentialApprovers = computedAsync(async () => {return [];}- const users: UserType[] = [];- await userStore.batchGetUsers(+ const users = await userStore.batchGetOrFetchUsers(filteredCandidateEmails.value.map(ensureUserFullName));- for (const email of filteredCandidateEmails.value) {- const user = userStore.getUserByIdentifier(email);- if (user && user.state === State.ACTIVE) {- users.push(user);- }- }-// Sort to put current user first if they're in the list- return users.sort((a, b) => {+ return (+ users.filter((user) => {+ return user && user.state === State.ACTIVE;+ }) as UserType[]+ ).sort((a, b) => {if (a.email === currentUserEmail.value) return -1;if (b.email === currentUserEmail.value) return 1;return a.title.localeCompare(b.title);diff --git a/frontend/src/components/Plan/components/RolloutView/TaskTable.vue b/frontend/src/components/Plan/components/RolloutView/TaskTable.vueindex 64268de47d..cc48f065b3 100644--- a/frontend/src/components/Plan/components/RolloutView/TaskTable.vue+++ b/frontend/src/components/Plan/components/RolloutView/TaskTable.vue@@ -30,7 +30,7 @@ import Timestamp from "@/components/misc/Timestamp.vue";import DatabaseDisplay from "@/components/Plan/components/common/DatabaseDisplay.vue";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL } from "@/router/dashboard/projectV1";-import { batchGetOrFetchDatabases, useCurrentProjectV1 } from "@/store";+import { useCurrentProjectV1, useDatabaseV1Store } from "@/store";import { getTimeForPbTimestampProtoEs } from "@/types";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";@@ -64,6 +64,7 @@ const router = useRouter();const { project } = useCurrentProjectV1();const { rollout, mergedStages } = useRolloutViewContext();const { taskRuns } = usePlanContextWithRollout();+const dbStore = useDatabaseV1Store();const taskList = computed(() => {if (props.taskStatusFilter.length === 0) {@@ -105,7 +106,9 @@ const stageMap = computed(() => {const prepareDatabases = async () => {if (taskList.value.length > 0) {try {- await batchGetOrFetchDatabases(taskList.value.map((task) => task.target));+ await dbStore.batchGetOrFetchDatabases(+ taskList.value.map((task) => task.target)+ );} catch {// Ignore errors - this is just for pre-loading data}diff --git a/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskInstancePreload.ts b/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskInstancePreload.tsindex 1b645ff2d7..34bfdaad8d 100644--- a/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskInstancePreload.ts+++ b/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskInstancePreload.ts@@ -1,5 +1,5 @@import { ref, watch } from "vue";-import { batchGetOrFetchDatabases } from "@/store";+import { useDatabaseV1Store } from "@/store";import type { Stage } from "@/types/proto-es/v1/rollout_service_pb";/**@@ -8,6 +8,7 @@ import type { Stage } from "@/types/proto-es/v1/rollout_service_pb";*/export const useTaskInstancePreload = (stages: () => Stage[]) => {const fetchedDatabases = ref(new Set<string>());+ const dbStore = useDatabaseV1Store();watch(stages,@@ -31,7 +32,7 @@ export const useTaskInstancePreload = (stages: () => Stage[]) => {if (newDatabases.length > 0) {// Batch fetch databases (which also fetches their instances)try {- await batchGetOrFetchDatabases(newDatabases);+ await dbStore.batchGetOrFetchDatabases(newDatabases);// Mark these databases as fetchednewDatabases.forEach((name) => fetchedDatabases.value.add(name));} catch {diff --git a/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vue b/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vueindex a3b2b9ba8e..ac90d84d43 100644--- a/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/AllTargetsDrawer.vue@@ -63,11 +63,7 @@import { computed, reactive, watch } from "vue";import { BBSpin } from "@/bbkit";import { Drawer, DrawerContent, SearchBox } from "@/components/v2";-import {- batchGetOrFetchDatabases,- useDatabaseV1Store,- useDBGroupStore,-} from "@/store";+import { useDatabaseV1Store, useDBGroupStore } from "@/store";import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";import DatabaseDisplay from "../common/DatabaseDisplay.vue";import { useSelectedSpec } from "./context";@@ -129,7 +125,9 @@ const loadAllTargets = async () => {const fetchPromises: Promise<unknown>[] = [];if (databaseTargets.length > 0) {- fetchPromises.push(batchGetOrFetchDatabases(databaseTargets));+ fetchPromises.push(+ databaseStore.batchGetOrFetchDatabases(databaseTargets)+ );}const dbGroupPromises = dbGroupTargets.map((target) =>diff --git a/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vue b/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vueindex 1d1c1c2561..fe66a99aa4 100644--- a/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/TargetListSection.vue@@ -84,9 +84,9 @@ import { useI18n } from "vue-i18n";import { BBSpin } from "@/bbkit";import { planServiceClientConnect } from "@/grpcweb";import {- batchGetOrFetchDatabases,projectNamePrefix,pushNotification,+ useDatabaseV1Store,useDBGroupStore,useProjectV1Store,} from "@/store";@@ -106,6 +106,7 @@ const { plan, isCreating, readonly } = usePlanContext();const { selectedSpec, targets, getDatabaseTargets } = useSelectedSpec();const dbGroupStore = useDBGroupStore();const projectStore = useProjectV1Store();+const dbStore = useDatabaseV1Store();const isLoadingTargets = ref(false);const showTargetsSelector = ref(false);@@ -172,17 +173,14 @@ const loadTargetData = async () => {visibleTargets.value);- if (databaseTargets.length > 0) {- await batchGetOrFetchDatabases(databaseTargets);- }-- const dbGroupPromises = dbGroupTargets.map((target) =>- dbGroupStore.getOrFetchDBGroupByName(target, {- view: DatabaseGroupView.FULL,- })+ await dbStore.batchGetOrFetchDatabases(databaseTargets);+ await Promise.allSettled(+ dbGroupTargets.map((target) =>+ dbGroupStore.getOrFetchDBGroupByName(target, {+ view: DatabaseGroupView.FULL,+ })+ ));-- await Promise.allSettled(dbGroupPromises);} catch {// Ignore errors} finally {diff --git a/frontend/src/components/Plan/components/StatementSection/SchemaEditorDrawer.vue b/frontend/src/components/Plan/components/StatementSection/SchemaEditorDrawer.vueindex da74e0c18f..86d8213769 100644--- a/frontend/src/components/Plan/components/StatementSection/SchemaEditorDrawer.vue+++ b/frontend/src/components/Plan/components/StatementSection/SchemaEditorDrawer.vue@@ -68,11 +68,7 @@ import SchemaEditorLite, {generateDiffDDL,} from "@/components/SchemaEditorLite";import { Drawer, DrawerContent } from "@/components/v2";-import {- batchGetOrFetchDatabases,- useDatabaseV1Store,- useDBSchemaV1Store,-} from "@/store";+import { useDatabaseV1Store, useDBSchemaV1Store } from "@/store";import { DEBOUNCE_SEARCH_DELAY } from "@/types";import type { Project } from "@/types/proto-es/v1/project_service_pb";import { engineSupportsSchemaEditor } from "@/utils/schemaEditor";@@ -117,7 +113,7 @@ watchDebounced(() => state.databaseSelectorPageIndex,async (index) => {try {- await batchGetOrFetchDatabases(+ await databaseStore.batchGetOrFetchDatabases(props.databaseNames.slice(DEFAULT_VISIBLE_TARGETS * index,DEFAULT_VISIBLE_TARGETS * (index + 1)diff --git a/frontend/src/components/Plan/logic/rolloutPreview.ts b/frontend/src/components/Plan/logic/rolloutPreview.tsindex 6c4b598a2b..c35678058f 100644--- a/frontend/src/components/Plan/logic/rolloutPreview.ts+++ b/frontend/src/components/Plan/logic/rolloutPreview.ts@@ -4,7 +4,6 @@ import {useDBGroupStore,useEnvironmentV1Store,} from "@/store";-import { batchGetOrFetchDatabases } from "@/store/modules/v1/database";import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";import { DatabaseChangeType } from "@/types/proto-es/v1/common_pb";import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pb";@@ -47,11 +46,10 @@ export async function generateRolloutPreview(): Promise<Rollout> {// Step 1: Extract all database targets from specs and expand database groupsconst allDatabaseNames = await extractAndExpandDatabaseTargets(plan.specs);+ const dbStore = useDatabaseV1Store();// Step 2: Fetch databases that are not cached- if (allDatabaseNames.length > 0) {- await batchGetOrFetchDatabases(allDatabaseNames);- }+ await dbStore.batchGetOrFetchDatabases(allDatabaseNames);// Step 3: Generate tasks from specsconst tasks = await generateTasksFromSpecs(plan.specs);diff --git a/frontend/src/components/Project/useRecentProjects.ts b/frontend/src/components/Project/useRecentProjects.tsindex a34406e670..df5fa095a6 100644--- a/frontend/src/components/Project/useRecentProjects.ts+++ b/frontend/src/components/Project/useRecentProjects.ts@@ -1,10 +1,6 @@import { computedAsync } from "@vueuse/core";import { computed } from "vue";-import {- batchGetOrFetchProjects,- useCurrentUserV1,- useProjectV1Store,-} from "@/store";+import { useCurrentUserV1, useProjectV1Store } from "@/store";import { isValidProjectName } from "@/types";import { hasProjectPermissionV2, useDynamicLocalStorage } from "@/utils";@@ -40,7 +36,7 @@ export const useRecentProjects = () => {const projects = [];const invalidProjects: string[] = [];- await batchGetOrFetchProjects(recentViewProjectNames.value);+ await projectV1Store.batchGetOrFetchProjects(recentViewProjectNames.value);for (const projectName of recentViewProjectNames.value) {try {diff --git a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vueindex c8b088c666..6b27bd0270 100644--- a/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue+++ b/frontend/src/components/ProjectMember/ProjectMemberRolePanel/index.vue@@ -151,7 +151,6 @@ import {MiniActionButton,} from "@/components/v2";import {- batchGetOrFetchDatabases,extractGroupEmail,extractUserId,pushNotification,@@ -588,7 +587,7 @@ watch(Array.isArray(conditionExpr.databaseResources) &&conditionExpr.databaseResources.length > 0) {- await batchGetOrFetchDatabases(+ await databaseStore.batchGetOrFetchDatabases(conditionExpr.databaseResources.map((resource) => resource.databaseFullName)@@ -638,10 +637,7 @@ const groupMembers = computedAsync(async () => {// Fetch user data for group membersconst members = props.binding.group?.members ?? [];- if (members.length > 0) {- const memberUserIds = members.map((m) => m.member);- await userStore.batchGetUsers(memberUserIds);- }+ await userStore.batchGetOrFetchUsers(members.map((m) => m.member));const resp = [];for (const member of members) {diff --git a/frontend/src/components/User/Settings/UserDataTable/index.vue b/frontend/src/components/User/Settings/UserDataTable/index.vueindex 91153c1cb9..f946edd3fa 100644--- a/frontend/src/components/User/Settings/UserDataTable/index.vue+++ b/frontend/src/components/User/Settings/UserDataTable/index.vue@@ -31,8 +31,8 @@ import { useI18n } from "vue-i18n";import { BBAlert } from "@/bbkit";import { UserNameCell } from "@/components/v2/Model/cells";import {- batchGetOrFetchGroups,pushNotification,+ useGroupStore,useUserStore,useWorkspaceV1Store,} from "@/store";@@ -69,6 +69,7 @@ const emit = defineEmits<{const { t } = useI18n();const userStore = useUserStore();const workspaceStore = useWorkspaceV1Store();+const groupStore = useGroupStore();const { copy: copyTextToClipboard, isSupported } = useClipboard({legacy: true,@@ -79,7 +80,7 @@ watchEffect(async () => {for (const user of props.userList) {groupNames.push(...user.groups);}- await batchGetOrFetchGroups(groupNames);+ await groupStore.batchGetOrFetchGroups(groupNames);});const state = reactive<LocalState>({diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/index.vueindex efbb4f474e..30002b6164 100644--- a/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue@@ -72,7 +72,7 @@ const onGroupLoad = async (row: DataTableRowData) => {const group = (row as GroupRowData).group;const memberUserIds = group.members.map((m) => m.member);if (memberUserIds.length > 0) {- await userStore.batchGetUsers(memberUserIds);+ await userStore.batchGetOrFetchUsers(memberUserIds);}const members: UserRowData[] = [];diff --git a/frontend/src/components/v2/Select/DatabaseSelect.vue b/frontend/src/components/v2/Select/DatabaseSelect.vueindex 7630f8ee3d..a98b3f9c9f 100644--- a/frontend/src/components/v2/Select/DatabaseSelect.vue+++ b/frontend/src/components/v2/Select/DatabaseSelect.vue@@ -76,7 +76,7 @@ const additionalOptions = computedAsync(async () => {databaseNames = [props.value];}- const databases = await databaseStore.batchGetDatabases(databaseNames);+ const databases = await databaseStore.batchGetOrFetchDatabases(databaseNames);options.push(...databases.map(getOption));return options;diff --git a/frontend/src/components/v2/Select/GroupSelect.vue b/frontend/src/components/v2/Select/GroupSelect.vueindex a070c6185a..b637ad63b0 100644--- a/frontend/src/components/v2/Select/GroupSelect.vue+++ b/frontend/src/components/v2/Select/GroupSelect.vue@@ -59,9 +59,11 @@ const additionalOptions = computedAsync(async () => {groupNames = [props.value];}- const groups = await groupStore.batchFetchGroups(groupNames);+ const groups = await groupStore.batchGetOrFetchGroups(groupNames);for (const group of groups) {- options.push(getOption(group));+ if (group) {+ options.push(getOption(group));+ }}return options;diff --git a/frontend/src/components/v2/Select/ProjectSelect.vue b/frontend/src/components/v2/Select/ProjectSelect.vueindex c6148b8458..e08a299420 100644--- a/frontend/src/components/v2/Select/ProjectSelect.vue+++ b/frontend/src/components/v2/Select/ProjectSelect.vue@@ -118,7 +118,7 @@ const additionalOptions = computedAsync(async () => {options.unshift(getOption(dummyAll));}- const projects = await projectStore.batchGetProjects(projectNames);+ const projects = await projectStore.batchGetOrFetchProjects(projectNames);options.push(...projects.map(getOption));return options;diff --git a/frontend/src/components/v2/Select/UserSelect.vue b/frontend/src/components/v2/Select/UserSelect.vueindex 22f64baed8..176f47d1c3 100644--- a/frontend/src/components/v2/Select/UserSelect.vue+++ b/frontend/src/components/v2/Select/UserSelect.vue@@ -95,7 +95,7 @@ const additionalOptions = computedAsync(async () => {}// Ensure users are fetched into store- await userStore.batchGetUsers(+ await userStore.batchGetOrFetchUsers(userEmails.map((email) => `${userNamePrefix}${email}`));diff --git a/frontend/src/composables/useExecuteSQL.ts b/frontend/src/composables/useExecuteSQL.tsindex 5545e55151..6072462fa5 100644--- a/frontend/src/composables/useExecuteSQL.ts+++ b/frontend/src/composables/useExecuteSQL.ts@@ -5,7 +5,6 @@ import { v4 as uuidv4 } from "uuid";import { markRaw, reactive } from "vue";import { t } from "@/plugins/i18n";import {- batchGetOrFetchDatabases,hasFeature,pushNotification,useDatabaseV1Store,@@ -205,7 +204,7 @@ const useExecuteSQL = () => {}const isBatch = batchQueryDatabaseSet.size > 1;- await batchGetOrFetchDatabases([...batchQueryDatabaseSet.keys()]);+ await dbStore.batchGetOrFetchDatabases([...batchQueryDatabaseSet.keys()]);for (const databaseName of batchQueryDatabaseSet.values()) {if (!databaseQueryContexts.has(databaseName)) {diff --git a/frontend/src/store/modules/user.ts b/frontend/src/store/modules/user.tsindex 04b3826c09..119cb08d19 100644--- a/frontend/src/store/modules/user.ts+++ b/frontend/src/store/modules/user.ts@@ -174,7 +174,7 @@ export const useUserStore = defineStore("user", () => {return setUser(response);};- const batchGetUsers = async (userNameList: string[]) => {+ const batchGetOrFetchUsers = async (userNameList: string[]) => {const distinctList = uniq(userNameList).filter((name) =>@@ -197,7 +197,7 @@ export const useUserStore = defineStore("user", () => {for (const user of response.users) {setUser(user);}- return response.users;+ return distinctList.map((name) => getUserByIdentifier(name));};const getOrFetchUserByIdentifier = async (@@ -245,7 +245,7 @@ export const useUserStore = defineStore("user", () => {createUser,updateUser,updateEmail,- batchGetUsers,+ batchGetOrFetchUsers,getOrFetchUserByIdentifier,getUserByIdentifier,archiveUser,diff --git a/frontend/src/store/modules/v1/database.ts b/frontend/src/store/modules/v1/database.tsindex 1c8cc13aea..4cf6ca0760 100644--- a/frontend/src/store/modules/v1/database.ts+++ b/frontend/src/store/modules/v1/database.ts@@ -45,7 +45,7 @@ import {} from "./common";import { useDBSchemaV1Store } from "./dbSchema";import { useEnvironmentV1Store } from "./environment";-import { batchGetOrFetchProjects, useProjectV1Store } from "./project";+import { useProjectV1Store } from "./project";export interface DatabaseFilter {project?: string;@@ -288,6 +288,7 @@ export const useDatabaseV1Store = defineStore("database_v1", () => {databaseRequestCache.set(name, request);return request;};+const batchGetDatabases = async (names: string[], silent = true) => {const validNames = names.filter(isValidDatabaseName);if (validNames.length === 0) {@@ -306,6 +307,24 @@ export const useDatabaseV1Store = defineStore("database_v1", () => {const composed = await upsertDatabaseMap(databases);return composed;};++ const batchGetOrFetchDatabases = async (databaseNames: string[]) => {+ const distinctDatabaseList = uniq(databaseNames).filter((databaseName) => {+ if (!databaseName || !isValidDatabaseName(databaseName)) {+ return false;+ }+ if (+ getDatabaseByName(databaseName) &&+ isValidDatabaseName(getDatabaseByName(databaseName).name)+ ) {+ return false;+ }+ return true;+ });+ await batchGetDatabases(distinctDatabaseList);+ return distinctDatabaseList.map(getDatabaseByName);+ };+const batchUpdateDatabases = async (params: BatchUpdateDatabasesRequest) => {const request = create(BatchUpdateDatabasesRequestSchema, {parent: params.parent,@@ -357,7 +376,7 @@ export const useDatabaseV1Store = defineStore("database_v1", () => {getDatabaseByName,fetchDatabaseByName,getOrFetchDatabaseByName,- batchGetDatabases,+ batchGetOrFetchDatabases,batchUpdateDatabases,updateDatabase,fetchDatabaseSchema,@@ -388,30 +407,13 @@ export const useDatabaseV1ByName = (name: MaybeRef<string>) => {};};-export const batchGetOrFetchDatabases = async (databaseNames: string[]) => {- const store = useDatabaseV1Store();- const distinctDatabaseList = uniq(databaseNames).filter((databaseName) => {- if (!databaseName || !isValidDatabaseName(databaseName)) {- return false;- }- if (- store.getDatabaseByName(databaseName) &&- isValidDatabaseName(store.getDatabaseByName(databaseName).name)- ) {- return false;- }- return true;- });- if (distinctDatabaseList.length > 0) {- await store.batchGetDatabases(distinctDatabaseList);- }-};-export const batchComposeDatabase = async (databaseList: Database[]) => {const environmentV1Store = useEnvironmentV1Store();const projectV1Store = useProjectV1Store();- await batchGetOrFetchProjects(databaseList.map((db) => db.project));+ await projectV1Store.batchGetOrFetchProjects(+ databaseList.map((db) => db.project)+ );return databaseList.map((db) => {const composed = db as ComposedDatabase;diff --git a/frontend/src/store/modules/v1/group.ts b/frontend/src/store/modules/v1/group.tsindex d910a53668..879d0c8a50 100644--- a/frontend/src/store/modules/v1/group.ts+++ b/frontend/src/store/modules/v1/group.ts@@ -102,6 +102,21 @@ export const useGroupStore = defineStore("group", () => {return groups;};+ const batchGetOrFetchGroups = async (groupNames: string[]) => {+ const distinctGroupList = uniq(groupNames).filter((groupName) => {+ if (!groupName) {+ return false;+ }+ const group = getGroupByIdentifier(groupName);+ if (group) {+ return false;+ }+ return true;+ });+ await batchFetchGroups(distinctGroupList);+ return distinctGroupList.map(getGroupByIdentifier);+ };+const getOrFetchGroupByIdentifier = async (id: string) => {if (!hasWorkspacePermissionV2("bb.groups.get")) {return;@@ -152,7 +167,7 @@ export const useGroupStore = defineStore("group", () => {return {groupList,fetchGroupList,- batchFetchGroups,+ batchGetOrFetchGroups,getGroupByIdentifier,getOrFetchGroupByIdentifier,deleteGroup,@@ -160,21 +175,3 @@ export const useGroupStore = defineStore("group", () => {createGroup,};});--export const batchGetOrFetchGroups = async (groupNames: string[]) => {- const store = useGroupStore();-- const distinctGroupList = uniq(groupNames).filter((groupName) => {- if (!groupName) {- return false;- }- const group = store.getGroupByIdentifier(groupName);- if (group) {- return false;- }- return true;- });- if (distinctGroupList.length > 0) {- return store.batchFetchGroups(distinctGroupList);- }-};diff --git a/frontend/src/store/modules/v1/issue.ts b/frontend/src/store/modules/v1/issue.tsindex e88d9008eb..b888d33d5c 100644--- a/frontend/src/store/modules/v1/issue.ts+++ b/frontend/src/store/modules/v1/issue.ts@@ -28,7 +28,7 @@ import {type ComposeIssueConfig,shallowComposeIssue,} from "./experimental-issue";-import { batchGetOrFetchProjects, useProjectV1Store } from "./project";+import { useProjectV1Store } from "./project";import { useProjectIamPolicyStore } from "./projectIamPolicy";export type ListIssueParams = {@@ -114,13 +114,13 @@ export const useIssueV1Store = defineStore("issue_v1", () => {const projects = issues.map((issue) => {return `projects/${extractProjectResourceName(issue.name)}`;});- await batchGetOrFetchProjects(projects);+ await projectStore.batchGetOrFetchProjects(projects);const composedIssues = await Promise.all(issues.map((issue) => shallowComposeIssue(issue, composeIssueConfig)));// Preprare creator for the issues.const users = uniq(composedIssues.map((issue) => issue.creator));- await useUserStore().batchGetUsers(users);+ await useUserStore().batchGetOrFetchUsers(users);return {nextPageToken: resp.nextPageToken,issues: composedIssues,diff --git a/frontend/src/store/modules/v1/plan.ts b/frontend/src/store/modules/v1/plan.tsindex fc85b04e1a..4e9e56e848 100644--- a/frontend/src/store/modules/v1/plan.ts+++ b/frontend/src/store/modules/v1/plan.ts@@ -103,7 +103,7 @@ export const usePlanStore = defineStore("plan", () => {await planServiceClientConnect.searchPlans(request);// Prepare creator for the plans.const users = uniq(plans.map((plan) => plan.creator));- await useUserStore().batchGetUsers(users);+ await useUserStore().batchGetOrFetchUsers(users);return {nextPageToken: nextPageToken,plans,diff --git a/frontend/src/store/modules/v1/project.ts b/frontend/src/store/modules/v1/project.tsindex 844fdff402..ccb0225fa3 100644--- a/frontend/src/store/modules/v1/project.ts+++ b/frontend/src/store/modules/v1/project.ts@@ -204,6 +204,25 @@ export const useProjectV1Store = defineStore("project_v1", () => {return composedProjects;};+ const batchGetOrFetchProjects = async (projectNames: string[]) => {+ const distinctProjectList = uniq(projectNames).filter((projectName) => {+ if (+ !projectName ||+ !isValidProjectName(projectName) ||+ projectName === DEFAULT_PROJECT_NAME+ ) {+ return false;+ }+ const project = getProjectByName(projectName);+ if (isValidProjectName(project.name)) {+ return false;+ }+ return true;+ });+ await batchGetProjects(distinctProjectList, true /* silent */);+ return distinctProjectList.map(getProjectByName);+ };+const getOrFetchProjectByName = async (name: string, silent = true) => {const cachedData = getProjectByName(name);if (cachedData && cachedData.name !== UNKNOWN_PROJECT_NAME) {@@ -296,7 +315,7 @@ export const useProjectV1Store = defineStore("project_v1", () => {restoreProject,updateProjectCache,fetchProjectList,- batchGetProjects,+ batchGetOrFetchProjects,};});@@ -324,25 +343,3 @@ export const useCurrentProjectV1 = () => {);return useProjectByName(projectName);};--export const batchGetOrFetchProjects = async (projectNames: string[]) => {- const store = useProjectV1Store();-- const distinctProjectList = uniq(projectNames).filter((projectName) => {- if (- !projectName ||- !isValidProjectName(projectName) ||- projectName === DEFAULT_PROJECT_NAME- ) {- return false;- }- const project = store.getProjectByName(projectName);- if (isValidProjectName(project.name)) {- return false;- }- return true;- });- if (distinctProjectList.length > 0) {- return store.batchGetProjects(distinctProjectList, true /* silent */);- }-};diff --git a/frontend/src/store/modules/v1/projectIamPolicy.ts b/frontend/src/store/modules/v1/projectIamPolicy.tsindex ca2a872ba3..dde67b87a6 100644--- a/frontend/src/store/modules/v1/projectIamPolicy.ts+++ b/frontend/src/store/modules/v1/projectIamPolicy.ts@@ -44,8 +44,8 @@ export const composePolicyBindings = async (}}await Promise.all([- useUserStore().batchGetUsers(users),- useGroupStore().batchFetchGroups(groups),+ useUserStore().batchGetOrFetchUsers(users),+ useGroupStore().batchGetOrFetchGroups(groups),]);};diff --git a/frontend/src/store/modules/v1/worksheet.ts b/frontend/src/store/modules/v1/worksheet.tsindex 946aeb4f1d..0c55479996 100644--- a/frontend/src/store/modules/v1/worksheet.ts+++ b/frontend/src/store/modules/v1/worksheet.ts@@ -31,8 +31,8 @@ import { useSQLEditorTabStore } from "../sqlEditor";import { useUserStore } from "../user";import { useCurrentUserV1 } from "./auth";import { extractUserId } from "./common";-import { batchGetOrFetchDatabases, useDatabaseV1Store } from "./database";-import { batchGetOrFetchProjects, useProjectV1Store } from "./project";+import { useDatabaseV1Store } from "./database";+import { useProjectV1Store } from "./project";type WorksheetView = "FULL" | "BASIC";type WorksheetCacheKey = [string /* uid */, WorksheetView];@@ -90,11 +90,15 @@ export const useWorkSheetStore = defineStore("worksheet_v1", () => {const setListCache = async (worksheets: Worksheet[]) => {await Promise.all([- batchGetOrFetchProjects(worksheets.map((worksheet) => worksheet.project)),- batchGetOrFetchDatabases(+ projectStore.batchGetOrFetchProjects(+ worksheets.map((worksheet) => worksheet.project)+ ),+ databaseStore.batchGetOrFetchDatabases(worksheets.map((worksheet) => worksheet.database)),- userStore.batchGetUsers(worksheets.map((worksheet) => worksheet.creator)),+ userStore.batchGetOrFetchUsers(+ worksheets.map((worksheet) => worksheet.creator)+ ),]);for (const worksheet of worksheets) {setCacheEntry(worksheet, "BASIC");diff --git a/frontend/src/utils/expr.ts b/frontend/src/utils/expr.tsindex 49f8dff210..1152df5189 100644--- a/frontend/src/utils/expr.ts+++ b/frontend/src/utils/expr.ts@@ -137,7 +137,7 @@ export const getProjectIdOptionConfig = (): OptionConfig => {return {options: [],fetch: async (projectIds: string[]) => {- const projects = await projectStore.batchGetProjects(+ const projects = await projectStore.batchGetOrFetchProjects(projectIds.map((projectId) => `${projectNamePrefix}${projectId}`));return projects.map(getProjectIdOption);@@ -245,7 +245,7 @@ export const getDatabaseNameOptionConfig = (parent: string): OptionConfig => {return {options: [],fetch: async (names: string[]) => {- const databases = await dbStore.batchGetDatabases(names);+ const databases = await dbStore.batchGetOrFetchDatabases(names);return databases.map(getDatabasFullNameOption);},search: async (params: {diff --git a/frontend/src/views/SettingWorkspaceAuditLog.vue b/frontend/src/views/SettingWorkspaceAuditLog.vueindex a66bee9b85..acd4b0d6d2 100644--- a/frontend/src/views/SettingWorkspaceAuditLog.vue+++ b/frontend/src/views/SettingWorkspaceAuditLog.vue@@ -53,9 +53,9 @@ import DataExportButton from "@/components/DataExportButton.vue";import { FeatureAttention } from "@/components/FeatureGuard";import PagedTable from "@/components/v2/Model/PagedTable.vue";import {- batchGetOrFetchProjects,featureToRef,useAuditLogStore,+ useProjectV1Store,useUserStore,} from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";@@ -89,6 +89,7 @@ const state = reactive<LocalState>({});const { t } = useI18n();const auditLogStore = useAuditLogStore();+const projectStore = useProjectV1Store();const auditLogPagedTable = ref<ComponentExposed<typeof PagedTable<AuditLog>>>();const hasAuditLogFeature = featureToRef(PlanFeature.FEATURE_AUDIT_LOG);@@ -111,7 +112,7 @@ const fetchAuditLog = async ({pageToken,pageSize,});- await batchGetOrFetchProjects(+ await projectStore.batchGetOrFetchProjects(auditLogs.map((auditLog) => {const projectResourceId = extractProjectResourceName(auditLog.name);if (!projectResourceId) {@@ -120,7 +121,7 @@ const fetchAuditLog = async ({return `${projectNamePrefix}${projectResourceId}`;}));- await useUserStore().batchGetUsers(auditLogs.map((log) => log.user));+ await useUserStore().batchGetOrFetchUsers(auditLogs.map((log) => log.user));return { nextPageToken, list: auditLogs };};diff --git a/frontend/src/views/project/ProjectAuditLogDashboard.vue b/frontend/src/views/project/ProjectAuditLogDashboard.vueindex d18c242b6c..6e32877f03 100644--- a/frontend/src/views/project/ProjectAuditLogDashboard.vue+++ b/frontend/src/views/project/ProjectAuditLogDashboard.vue@@ -122,7 +122,7 @@ const fetchAuditLog = async ({pageToken,pageSize,});- await useUserStore().batchGetUsers(auditLogs.map((log) => log.user));+ await useUserStore().batchGetOrFetchUsers(auditLogs.map((log) => log.user));return { nextPageToken, list: auditLogs };};diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vueindex ad582ddf9e..a9318687ec 100644--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue@@ -218,7 +218,6 @@ import MaskSpinner from "@/components/misc/MaskSpinner.vue";import { RichDatabaseName } from "@/components/v2";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";import {- batchGetOrFetchDatabases,type DatabaseFilter,featureToRef,idForSQLEditorTreeNodeTarget,@@ -409,7 +408,7 @@ const getQueryableDatabase = async (batchQueryContext: BatchQueryContext) => {for (const databaseGroupName of batchQueryContext.databaseGroups ?? []) {const databaseGroup = dbGroupStore.getDBGroupByName(databaseGroupName);- await batchGetOrFetchDatabases(+ await databaseStore.batchGetOrFetchDatabases(databaseGroup.matchedDatabases.map((db) => db.name));for (const matchedDatabase of databaseGroup.matchedDatabases) {@@ -507,7 +506,7 @@ watch(return;}const databases = tabStore.currentTab.batchQueryContext.databases ?? [];- await batchGetOrFetchDatabases(databases);+ await databaseStore.batchGetOrFetchDatabases(databases);},{immediate: true,diff --git a/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vue b/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vueindex 9913d9ccf6..c01e1f6ce3 100644--- a/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vue+++ b/frontend/src/views/sql-editor/EditorPanel/TerminalPanel/TerminalPanel.vue@@ -90,7 +90,6 @@ import {import { BBSpin } from "@/bbkit";import type { IStandaloneCodeEditor } from "@/components/MonacoEditor";import {- batchGetOrFetchDatabases,useDatabaseV1Store,useSQLEditorTabStore,useWebTerminalStore,@@ -120,7 +119,7 @@ const queryList = computed(() => {});watchEffect(async () => {- await batchGetOrFetchDatabases(+ await databaseStore.batchGetOrFetchDatabases(queryList.value.map((query) => query?.params?.connection.database ?? ""));});