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: remove legacy vue store (#20484)
ecmadao8ba0c7ead016
diff --git a/frontend/src/utils/v1/member.test.ts b/frontend/src/react/lib/memberBindings.test.tssimilarity index 94%rename from frontend/src/utils/v1/member.test.tsrename to frontend/src/react/lib/memberBindings.test.tsindex 5fe15ef2a3..39f75bb130 100644--- a/frontend/src/utils/v1/member.test.ts+++ b/frontend/src/react/lib/memberBindings.test.ts@@ -2,7 +2,10 @@ import { create } from "@bufbuild/protobuf";import { describe, expect, test } from "vitest";import { ExprSchema as ConditionExprSchema } from "@/types/proto-es/google/type/expr_pb";import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";-import { getProjectRoleBindingKey, groupProjectRoleBindings } from "./member";+import {+ getProjectRoleBindingKey,+ groupProjectRoleBindings,+} from "./memberBindings";describe("groupProjectRoleBindings", () => {test("groups repeated roles without dropping distinct bindings", () => {diff --git a/frontend/src/utils/v1/member.ts b/frontend/src/react/lib/memberBindings.tssimilarity index 86%rename from frontend/src/utils/v1/member.tsrename to frontend/src/react/lib/memberBindings.tsindex efba094099..da7217dd19 100644--- a/frontend/src/utils/v1/member.ts+++ b/frontend/src/react/lib/memberBindings.ts@@ -1,14 +1,9 @@import { create } from "@bufbuild/protobuf";import { orderBy } from "lodash-es";-import {- extractGroupEmail,- serviceAccountToUser,- useGroupStore,- useServiceAccountStore,- useUserStore,- useWorkloadIdentityStore,- workloadIdentityToUser,-} from "@/store";+import { useAppStore } from "@/react/stores/app";+import { serviceAccountToUser } from "@/react/stores/app/serviceAccount";+import { workloadIdentityToUser } from "@/react/stores/app/workloadIdentity";+import { extractGroupEmail } from "@/store";import {extractUserEmail,groupNamePrefix,@@ -27,18 +22,20 @@ import { type User, UserSchema } from "@/types/proto-es/v1/user_service_pb";import type { GroupBinding, MemberBinding } from "@/types/v1/member";import { convertMemberToFullname, hasWorkspacePermissionV2 } from "@/utils";+// Lives under `@/react/lib/` (not `@/utils/`) so the app-store reads don't+// drag `@/react/stores/app` into the `@/utils` import graph — that would+// recreate the static ESM cycle the SQL editor connection move fixed.+// Members surfaces are React-only, so a React-side location is natural.+const getMemberBinding = (member: string,searchText: string): MemberBinding | undefined => {- const groupStore = useGroupStore();- const userStore = useUserStore();- const serviceAccountStore = useServiceAccountStore();- const workloadIdentityStore = useWorkloadIdentityStore();+ const appStore = useAppStore.getState();let memberBinding: MemberBinding | undefined = undefined;if (member.startsWith(groupBindingPrefix)) {- const g = groupStore.getGroupByIdentifier(member);+ const g = appStore.getGroupByIdentifier(member);let group: GroupBinding | undefined;if (g) {group = {@@ -69,13 +66,13 @@ const getMemberBinding = (let isPending = false;const fullname = convertMemberToFullname(member);if (fullname.startsWith(serviceAccountNamePrefix)) {- const sa = serviceAccountStore.getServiceAccount(fullname);+ const sa = appStore.getServiceAccount(fullname);user = serviceAccountToUser(sa);} else if (fullname.startsWith(workloadIdentityNamePrefix)) {- const wi = workloadIdentityStore.getWorkloadIdentity(fullname);+ const wi = appStore.getWorkloadIdentity(fullname);user = workloadIdentityToUser(wi);} else {- const realUser = userStore.getUserByIdentifier(member);+ const realUser = appStore.getUserByIdentifier(member);if (realUser) {user = realUser;} else {diff --git a/frontend/src/react/no-legacy-vue-deps.test.ts b/frontend/src/react/no-legacy-vue-deps.test.tsindex 281554f85f..5926abca92 100644--- a/frontend/src/react/no-legacy-vue-deps.test.ts+++ b/frontend/src/react/no-legacy-vue-deps.test.ts@@ -184,12 +184,8 @@ describe("React Project and Settings legacy Vue dependencies", () => {test("Phase 1 protobuf resource consumers use the React app store", () => {const bannedImports = ["useGroupStore",- "useServiceAccountStore",- "useWorkloadIdentityStore","useIdentityProviderStore","useAccessGrantStore",- "@/store/modules/serviceAccount",- "@/store/modules/workloadIdentity","@/store/modules/idp","@/store/modules/accessGrant",];diff --git a/frontend/src/react/pages/settings/MembersPage.test.tsx b/frontend/src/react/pages/settings/MembersPage.test.tsxindex b8f823a786..f9e25a8728 100644--- a/frontend/src/react/pages/settings/MembersPage.test.tsx+++ b/frontend/src/react/pages/settings/MembersPage.test.tsx@@ -259,7 +259,7 @@ vi.mock("@/utils/issue/cel", () => ({stringifyConditionExpression: () => "",}));-vi.mock("@/utils/v1/member", () => ({+vi.mock("@/react/lib/memberBindings", () => ({getMemberBindings: () => [],groupProjectRoleBindings: () => [],}));diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsxindex 59425c85c8..9c8984e875 100644--- a/frontend/src/react/pages/settings/MembersPage.tsx+++ b/frontend/src/react/pages/settings/MembersPage.tsx@@ -70,6 +70,10 @@ import { Tooltip } from "@/react/components/ui/tooltip";import { useCurrentUser } from "@/react/hooks/useAppState";import { useEscapeKey } from "@/react/hooks/useEscapeKey";import { useVueState } from "@/react/hooks/useVueState";+import {+ getMemberBindings,+ groupProjectRoleBindings,+} from "@/react/lib/memberBindings";import {getRoleEnvironmentLimitationKind,roleHasDatabaseLimitation,@@ -123,7 +127,6 @@ import {convertFromExpr,stringifyConditionExpression,} from "@/utils/issue/cel";-import { getMemberBindings, groupProjectRoleBindings } from "@/utils/v1/member";import { MemberBindingEnvironmentBanner } from "./MemberBindingEnvironmentBanner";import { MemberDatabaseResourceName } from "./MemberDatabaseResourceName";import { getSetIamPolicyPermissionGuardConfig } from "./membersPageActions";diff --git a/frontend/src/react/stores/app/iam.ts b/frontend/src/react/stores/app/iam.tsindex 717186feeb..e4df22c64c 100644--- a/frontend/src/react/stores/app/iam.ts+++ b/frontend/src/react/stores/app/iam.ts@@ -141,25 +141,38 @@ export const createIamSlice: AppSliceCreator<IamSlice> = (set, get) => ({projectPolicyRequests,};});+ // Prefetch policy members into the app-store group/user caches+ // so `getMemberBindings` (in `@/react/lib/memberBindings`) can+ // resolve titles synchronously on first render. Service-account+ // and workload-identity members are fetched independently by+ // their respective settings pages — the IAM policy itself only+ // carries `user:` / `group:` prefixed members for those.+ const groupMembers: string[] = [];+ const userMembers: string[] = [];+ for (const binding of policy.bindings) {+ for (const member of binding.members) {+ if (member.startsWith(groupBindingPrefix)) {+ groupMembers.push(member);+ } else {+ userMembers.push(member);+ }+ }+ }+ await Promise.allSettled([+ get().batchGetOrFetchGroups(groupMembers),+ get().batchGetOrFetchUsers(userMembers),+ ]);+// Bridge to the Pinia projectIamPolicy store so the legacy// `usePermissionStore.currentPermissionsInProjectV1` chain sees// the policy without a second fetch. Dynamic import to avoid a// static module-load cycle (Pinia projectIamPolicy transitively// imports `@/store` chains that would re-enter this app store).- // Also run composePolicyBindings so the Pinia user / group /- // service-account / workload-identity stores that `getMemberBindings`- // reads from are populated — without this prefetch, the project- // members table renders "unknown" titles until some unrelated- // load happens.try {- const { useProjectIamPolicyStore, composePolicyBindings } =- await import("@/store/modules/v1/projectIamPolicy");+ const { useProjectIamPolicyStore } = await import(+ "@/store/modules/v1/projectIamPolicy"+ );useProjectIamPolicyStore().setProjectIamPolicy(project, policy);- // Prefetch policy members into the Pinia user / group /- // service-account / workload-identity stores so getMemberBindings- // can resolve titles immediately. This is the same step the- // legacy fetchProjectIamPolicy path used to run.- await composePolicyBindings(policy.bindings);} catch {// Pinia not available (e.g. some isolated test). Safe to ignore —// the app-store cache is already populated.diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.tsindex 537d451727..5e28f7a4b8 100644--- a/frontend/src/router/index.ts+++ b/frontend/src/router/index.ts@@ -1,5 +1,5 @@import { nextTick } from "vue";-import { setDocumentTitle } from "@/utils";+import { setDocumentTitle, STORAGE_KEY_BACK_PATH } from "@/utils";import {createRouter,createWebHistory,@@ -8,7 +8,6 @@ import {import {hasFeature,useAuthStore,- useRouterStore,useCurrentUserV1,useSettingV1Store,} from "@/store";@@ -113,7 +112,6 @@ router.beforeEach((to, from, next) => {}const authStore = useAuthStore();- const routerStore = useRouterStore();const settingV1Store = useSettingV1Store();// Allow access to 2FA setup and password reset for logged-in users@@ -134,7 +132,10 @@ router.beforeEach((to, from, next) => {const toModule = to.name?.toString().split(".")[0] || WORKSPACE_ROOT_MODULE;if (toModule !== fromModule) {- routerStore.setBackPath(from.fullPath);+ // Inline write — the previous `useRouterStore().setBackPath(...)` was a+ // thin wrapper around the same localStorage key, and no consumer reads+ // `backPath`, so cross-tab reactivity wasn't actually needed.+ localStorage.setItem(STORAGE_KEY_BACK_PATH, from.fullPath);}// === AUTHENTICATION LOGIC ===diff --git a/frontend/src/store/modules/index.ts b/frontend/src/store/modules/index.tsindex 0845760070..fa8c7440ff 100644--- a/frontend/src/store/modules/index.ts+++ b/frontend/src/store/modules/index.ts@@ -1,10 +1,7 @@export * from "./v1/auth";export * from "./notification";-export * from "./router";export * from "./uistate";export * from "./user";-export * from "./serviceAccount";-export * from "./workloadIdentity";export * from "./role";export * from "./utils";diff --git a/frontend/src/store/modules/router.ts b/frontend/src/store/modules/router.tsdeleted file mode 100644index 775c735859..0000000000--- a/frontend/src/store/modules/router.ts+++ /dev/null@@ -1,17 +0,0 @@-import { useLocalStorage } from "@vueuse/core";-import { defineStore } from "pinia";-import { STORAGE_KEY_BACK_PATH } from "@/utils";--export const useRouterStore = defineStore("router", () => {- const backPath = useLocalStorage(STORAGE_KEY_BACK_PATH, "/");-- const setBackPath = (path: string) => {- backPath.value = path;- return path;- };-- return {- backPath,- setBackPath,- };-});diff --git a/frontend/src/store/modules/serviceAccount.ts b/frontend/src/store/modules/serviceAccount.tsdeleted file mode 100644index 3c8f6b9ba5..0000000000--- a/frontend/src/store/modules/serviceAccount.ts+++ /dev/null@@ -1,178 +0,0 @@-import { create } from "@bufbuild/protobuf";-import { createContextValues } from "@connectrpc/connect";-import { defineStore } from "pinia";-import { ref } from "vue";-import { serviceAccountServiceClientConnect } from "@/connect";-import { silentContextKey } from "@/connect/context-key";-import { State } from "@/types/proto-es/v1/common_pb";-import type { ServiceAccount } from "@/types/proto-es/v1/service_account_service_pb";-import {- CreateServiceAccountRequestSchema,- DeleteServiceAccountRequestSchema,- GetServiceAccountRequestSchema,- ListServiceAccountsRequestSchema,- ServiceAccountSchema,- UndeleteServiceAccountRequestSchema,- UpdateServiceAccountRequestSchema,-} from "@/types/proto-es/v1/service_account_service_pb";-import { type User, UserSchema } from "@/types/proto-es/v1/user_service_pb";-import { extractServiceAccountId, serviceAccountNamePrefix } from "./v1/common";--export interface AccountFilter {- query?: string;- state?: State;-}--export const getAccountListFilter = (params: AccountFilter) => {- const filter = [];- const search = params.query?.trim()?.toLowerCase();- if (search) {- filter.push(`(name.contains("${search}") || email.contains("${search}"))`);- }- if (params.state === State.DELETED) {- filter.push(`state == "${State[params.state]}"`);- }- return filter.join(" && ");-};--export const ensureServiceAccountFullName = (identifier: string) => {- const id = extractServiceAccountId(identifier);- return `${serviceAccountNamePrefix}${id}`;-};--export const useServiceAccountStore = defineStore("serviceAccount", () => {- const cacheByName = ref<Map<string, ServiceAccount>>(new Map());-- const listServiceAccounts = async ({- parent,- pageSize,- pageToken,- showDeleted,- filter,- }: {- parent: string;- pageSize: number;- pageToken: string | undefined;- showDeleted: boolean;- filter?: AccountFilter;- }) => {- const request = create(ListServiceAccountsRequestSchema, {- parent,- pageSize,- pageToken,- showDeleted,- filter: getAccountListFilter(filter ?? {}),- });- return serviceAccountServiceClientConnect.listServiceAccounts(request);- };-- const fetchServiceAccount = async (name: string, silent = false) => {- const request = create(GetServiceAccountRequestSchema, {- name,- });- return serviceAccountServiceClientConnect.getServiceAccount(request, {- contextValues: createContextValues().set(silentContextKey, silent),- });- };-- const getServiceAccount = (name: string) => {- const validName = ensureServiceAccountFullName(name);- const email = extractServiceAccountId(validName);- return (- cacheByName.value.get(validName) ??- create(ServiceAccountSchema, {- name,- email,- state: State.ACTIVE,- title: email.split("@")[0],- })- );- };-- const getOrFetchServiceAccount = async (name: string, silent = false) => {- const validName = ensureServiceAccountFullName(name);- if (cacheByName.value.has(validName)) {- return cacheByName.value.get(validName)!;- }- const sa = await fetchServiceAccount(validName, silent);- cacheByName.value.set(sa.name, sa);- return sa;- };-- const createServiceAccount = async (- serviceAccountId: string,- serviceAccount: Partial<ServiceAccount>,- parent: string- ) => {- const request = create(CreateServiceAccountRequestSchema, {- parent,- serviceAccountId,- serviceAccount: create(- ServiceAccountSchema,- serviceAccount as ServiceAccount- ),- });- const sa =- await serviceAccountServiceClientConnect.createServiceAccount(request);- cacheByName.value.set(sa.name, sa);- return sa;- };-- const updateServiceAccount = async (- serviceAccount: Partial<ServiceAccount>,- updateMask: { paths: string[] }- ) => {- const request = create(UpdateServiceAccountRequestSchema, {- serviceAccount: create(- ServiceAccountSchema,- serviceAccount as ServiceAccount- ),- updateMask,- });- const sa =- await serviceAccountServiceClientConnect.updateServiceAccount(request);- cacheByName.value.set(sa.name, sa);- return sa;- };-- const deleteServiceAccount = async (name: string) => {- const request = create(DeleteServiceAccountRequestSchema, {- name,- });- await serviceAccountServiceClientConnect.deleteServiceAccount(request);- const sa = cacheByName.value.get(name);- if (sa) {- sa.state = State.DELETED;- }- };-- const undeleteServiceAccount = async (name: string) => {- const request = create(UndeleteServiceAccountRequestSchema, {- name,- });- const sa =- await serviceAccountServiceClientConnect.undeleteServiceAccount(request);- cacheByName.value.set(sa.name, sa);- return sa;- };-- return {- listServiceAccounts,- getServiceAccount,- getOrFetchServiceAccount,- createServiceAccount,- updateServiceAccount,- deleteServiceAccount,- undeleteServiceAccount,- };-});--export const serviceAccountToUser = (sa: ServiceAccount): User => {- return create(UserSchema, {- name: `users/${sa.email}`,- email: sa.email,- title: sa.title,- state: sa.state,- serviceKey: sa.serviceKey,- });-};diff --git a/frontend/src/store/modules/workloadIdentity.ts b/frontend/src/store/modules/workloadIdentity.tsdeleted file mode 100644index 1211f9918d..0000000000--- a/frontend/src/store/modules/workloadIdentity.ts+++ /dev/null@@ -1,173 +0,0 @@-import { create } from "@bufbuild/protobuf";-import { createContextValues } from "@connectrpc/connect";-import { defineStore } from "pinia";-import { ref } from "vue";-import { workloadIdentityServiceClientConnect } from "@/connect";-import { silentContextKey } from "@/connect/context-key";-import { State } from "@/types/proto-es/v1/common_pb";-import { type User, UserSchema } from "@/types/proto-es/v1/user_service_pb";-import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";-import {- CreateWorkloadIdentityRequestSchema,- DeleteWorkloadIdentityRequestSchema,- GetWorkloadIdentityRequestSchema,- ListWorkloadIdentitiesRequestSchema,- UndeleteWorkloadIdentityRequestSchema,- UpdateWorkloadIdentityRequestSchema,- WorkloadIdentitySchema,-} from "@/types/proto-es/v1/workload_identity_service_pb";-import { type AccountFilter, getAccountListFilter } from "./serviceAccount";-import {- extractWorkloadIdentityId,- workloadIdentityNamePrefix,-} from "./v1/common";--export const ensureWorkloadIdentityFullName = (identifier: string) => {- const id = extractWorkloadIdentityId(identifier);- return `${workloadIdentityNamePrefix}${id}`;-};--export const useWorkloadIdentityStore = defineStore("workloadIdentity", () => {- const cacheByName = ref<Map<string, WorkloadIdentity>>(new Map());-- const listWorkloadIdentities = async ({- parent,- pageSize,- pageToken,- showDeleted,- filter,- }: {- parent: string;- pageSize: number;- pageToken: string | undefined;- showDeleted: boolean;- filter?: AccountFilter;- }) => {- const request = create(ListWorkloadIdentitiesRequestSchema, {- parent,- pageSize,- pageToken,- showDeleted,- filter: getAccountListFilter(filter ?? {}),- });- return workloadIdentityServiceClientConnect.listWorkloadIdentities(request);- };-- const fetchWorkloadIdentity = async (name: string, silent = false) => {- const request = create(GetWorkloadIdentityRequestSchema, {- name,- });- return workloadIdentityServiceClientConnect.getWorkloadIdentity(request, {- contextValues: createContextValues().set(silentContextKey, silent),- });- };-- const getWorkloadIdentity = (name: string) => {- const validName = ensureWorkloadIdentityFullName(name);- const email = extractWorkloadIdentityId(validName);- return (- cacheByName.value.get(ensureWorkloadIdentityFullName(name)) ??- create(WorkloadIdentitySchema, {- name,- email,- state: State.ACTIVE,- title: email.split("@")[0],- })- );- };-- const getOrFetchWorkloadIdentity = async (- name: string,- silent = false- ): Promise<WorkloadIdentity> => {- const validName = ensureWorkloadIdentityFullName(name);- if (cacheByName.value.has(validName)) {- return cacheByName.value.get(validName)!;- }- const wi = await fetchWorkloadIdentity(validName, silent);- cacheByName.value.set(wi.name, wi);- return wi;- };-- const createWorkloadIdentity = async (- workloadIdentityId: string,- workloadIdentity: Partial<WorkloadIdentity>,- parent: string- ) => {- const request = create(CreateWorkloadIdentityRequestSchema, {- parent,- workloadIdentityId,- workloadIdentity: create(- WorkloadIdentitySchema,- workloadIdentity as WorkloadIdentity- ),- });- const wi =- await workloadIdentityServiceClientConnect.createWorkloadIdentity(- request- );- cacheByName.value.set(wi.name, wi);- return wi;- };-- const updateWorkloadIdentity = async (- workloadIdentity: Partial<WorkloadIdentity>,- updateMask: { paths: string[] }- ) => {- const request = create(UpdateWorkloadIdentityRequestSchema, {- workloadIdentity: create(- WorkloadIdentitySchema,- workloadIdentity as WorkloadIdentity- ),- updateMask,- });- const wi =- await workloadIdentityServiceClientConnect.updateWorkloadIdentity(- request- );- cacheByName.value.set(wi.name, wi);- return wi;- };-- const deleteWorkloadIdentity = async (name: string) => {- const request = create(DeleteWorkloadIdentityRequestSchema, {- name,- });- await workloadIdentityServiceClientConnect.deleteWorkloadIdentity(request);- const wi = cacheByName.value.get(name);- if (wi) {- wi.state = State.DELETED;- }- };-- const undeleteWorkloadIdentity = async (name: string) => {- const request = create(UndeleteWorkloadIdentityRequestSchema, {- name,- });- const wi =- await workloadIdentityServiceClientConnect.undeleteWorkloadIdentity(- request- );- cacheByName.value.set(wi.name, wi);- return wi;- };-- return {- listWorkloadIdentities,- getWorkloadIdentity,- getOrFetchWorkloadIdentity,- createWorkloadIdentity,- updateWorkloadIdentity,- deleteWorkloadIdentity,- undeleteWorkloadIdentity,- };-});--export const workloadIdentityToUser = (wi: WorkloadIdentity): User => {- return create(UserSchema, {- name: `users/${wi.email}`,- email: wi.email,- title: wi.title,- state: wi.state,- });-};