Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(frontend): centralize permission-data prep so project pages stop missing IAM (#20450)
boojack74a2182ba821
diff --git a/frontend/src/react/components/CreateWorkloadIdentitySheet.tsx b/frontend/src/react/components/CreateWorkloadIdentitySheet.tsxindex a1995d5b5b..4a10f714e9 100644--- a/frontend/src/react/components/CreateWorkloadIdentitySheet.tsx+++ b/frontend/src/react/components/CreateWorkloadIdentitySheet.tsx@@ -22,7 +22,6 @@ import {useActuatorV1Store,useProjectV1Store,} from "@/store";-import { useProjectIamPolicyStore } from "@/store/modules/v1/projectIamPolicy";import {getWorkloadIdentityNameInBinding,getWorkloadIdentitySuffix,@@ -135,7 +134,10 @@ function WorkloadIdentityForm({const { t } = useTranslation();const actuatorStore = useActuatorV1Store();const projectStore = useProjectV1Store();- const projectIamPolicyStore = useProjectIamPolicyStore();+ const getProjectIamPolicy = useAppStore((state) => state.getProjectIamPolicy);+ const updateProjectIamPolicy = useAppStore(+ (state) => state.updateProjectIamPolicy+ );const patchWorkspaceIamPolicy = useAppStore((state) => state.patchWorkspaceIamPolicy);@@ -328,9 +330,7 @@ function WorkloadIdentityForm({member: string,newRoles: string[]) => {- const policy = structuredClone(- projectIamPolicyStore.getProjectIamPolicy(projectName)- );+ const policy = structuredClone(getProjectIamPolicy(projectName));for (const binding of policy.bindings) {binding.members = binding.members.filter((m) => m !== member);}@@ -349,7 +349,7 @@ function WorkloadIdentityForm({);}}- await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);+ await updateProjectIamPolicy(projectName, policy);};const handleCreate = async () => {diff --git a/frontend/src/react/components/DashboardFrameShell.test.tsx b/frontend/src/react/components/DashboardFrameShell.test.tsxindex c63a6530d7..bf17a61021 100644--- a/frontend/src/react/components/DashboardFrameShell.test.tsx+++ b/frontend/src/react/components/DashboardFrameShell.test.tsx@@ -10,8 +10,12 @@ const mocks = vi.hoisted(() => ({getOrFetchSettingByName: vi.fn(),fetchEnvironments: vi.fn(),loadCurrentUser: vi.fn(),+ loadServerInfo: vi.fn(),+ loadWorkspace: vi.fn(),loadEnvironmentList: vi.fn(),loadWorkspaceProfile: vi.fn(),+ loadWorkspacePermissionState: vi.fn(),+ loadSubscription: vi.fn(),useAppStore: vi.fn(),}));@@ -38,18 +42,30 @@ beforeEach(async () => {mocks.getOrFetchSettingByName.mockReset();mocks.fetchEnvironments.mockReset();mocks.loadCurrentUser.mockReset();+ mocks.loadServerInfo.mockReset();+ mocks.loadWorkspace.mockReset();mocks.loadEnvironmentList.mockReset();mocks.loadWorkspaceProfile.mockReset();+ mocks.loadWorkspacePermissionState.mockReset();+ mocks.loadSubscription.mockReset();mocks.getOrFetchSettingByName.mockResolvedValue(undefined);mocks.fetchEnvironments.mockResolvedValue([]);mocks.loadCurrentUser.mockResolvedValue(undefined);+ mocks.loadServerInfo.mockResolvedValue(undefined);+ mocks.loadWorkspace.mockResolvedValue(undefined);mocks.loadEnvironmentList.mockResolvedValue([]);mocks.loadWorkspaceProfile.mockResolvedValue(undefined);+ mocks.loadWorkspacePermissionState.mockResolvedValue(undefined);+ mocks.loadSubscription.mockResolvedValue(undefined);mocks.useAppStore.mockImplementation((selector) =>selector({loadCurrentUser: mocks.loadCurrentUser,+ loadServerInfo: mocks.loadServerInfo,+ loadWorkspace: mocks.loadWorkspace,loadEnvironmentList: mocks.loadEnvironmentList,loadWorkspaceProfile: mocks.loadWorkspaceProfile,+ loadWorkspacePermissionState: mocks.loadWorkspacePermissionState,+ loadSubscription: mocks.loadSubscription,}));({ DashboardFrameShell } = await import("./DashboardFrameShell"));diff --git a/frontend/src/react/components/DashboardFrameShell.tsx b/frontend/src/react/components/DashboardFrameShell.tsxindex fc411ec98a..759a37cf4c 100644--- a/frontend/src/react/components/DashboardFrameShell.tsx+++ b/frontend/src/react/components/DashboardFrameShell.tsx@@ -1,11 +1,14 @@import { LoaderCircle } from "lucide-react";import { useEffect, useRef, useState } from "react";import type { DashboardFrameShellProps } from "@/react/dashboard-shell";-import { useAppStore } from "@/react/stores/app";+import { useEnsureWorkspaceCommonData } from "@/react/hooks/useEnsureWorkspaceCommonData";import { useEnvironmentV1Store, useSettingV1Store } from "@/store";import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";import { BannersWrapper } from "./BannersWrapper";+// Legacy Pinia bootstrap kept alongside the app-store bootstrap because the+// remaining Vue surfaces still read from these Pinia stores. Once those Vue+// readers are migrated this block can go away.const loadLegacyDashboardState = () => {return Promise.all([useEnvironmentV1Store().fetchEnvironments(),@@ -18,31 +21,24 @@ const loadLegacyDashboardState = () => {export function DashboardFrameShell({ onReady }: DashboardFrameShellProps) {const bannerRef = useRef<HTMLDivElement>(null);const bodyRef = useRef<HTMLDivElement>(null);- const [initialized, setInitialized] = useState(false);- const loadCurrentUser = useAppStore((state) => state.loadCurrentUser);- const loadEnvironmentList = useAppStore((state) => state.loadEnvironmentList);- const loadWorkspaceProfile = useAppStore(- (state) => state.loadWorkspaceProfile- );+ const [legacyReady, setLegacyReady] = useState(false);+ const commonDataReady = useEnsureWorkspaceCommonData();useEffect(() => {let mounted = true;- void Promise.all([- loadCurrentUser(),- loadEnvironmentList(),- loadWorkspaceProfile(),- loadLegacyDashboardState(),- ])+ void loadLegacyDashboardState().catch(() => undefined).then(() => {if (mounted) {- setInitialized(true);+ setLegacyReady(true);}});return () => {mounted = false;};- }, [loadCurrentUser, loadEnvironmentList, loadWorkspaceProfile]);+ }, []);++ const initialized = commonDataReady && legacyReady;useEffect(() => {if (!initialized) return;diff --git a/frontend/src/react/components/Quickstart.tsx b/frontend/src/react/components/Quickstart.tsxindex 79b35ad759..d4943e546d 100644--- a/frontend/src/react/components/Quickstart.tsx+++ b/frontend/src/react/components/Quickstart.tsx@@ -19,7 +19,6 @@ import {pushNotification,useActuatorV1Store,useIssueV1Store,- useProjectIamPolicyStore,useProjectV1Store,useUIStateStore,} from "@/store";@@ -73,7 +72,9 @@ export function Quickstart() {const uiStateStore = useUIStateStore();const actuatorStore = useActuatorV1Store();const issueStore = useIssueV1Store();- const projectIamPolicyStore = useProjectIamPolicyStore();+ const loadProjectIamPolicy = useAppStore(+ (state) => state.loadProjectIamPolicy+ );const quickStartEnabled = useVueState(() => actuatorStore.quickStartEnabled);const hidden = useVueState(() => uiStateStore.getIntroStateByKey("hidden"));@@ -124,14 +125,14 @@ export function Quickstart() {setSampleProject(undefined);return;}- await projectIamPolicyStore.getOrFetchProjectIamPolicy(project.name);+ await loadProjectIamPolicy(project.name);if (cancelled) return;setSampleProject(project);})();return () => {cancelled = true;};- }, [quickStartEnabled, projectStore, projectIamPolicyStore]);+ }, [quickStartEnabled, projectStore, loadProjectIamPolicy]);useEffect(() => {if (!sampleProject) {diff --git a/frontend/src/react/components/sql-editor/SQLEditorLayout.tsx b/frontend/src/react/components/sql-editor/SQLEditorLayout.tsxindex 085def06a3..e041c26cd8 100644--- a/frontend/src/react/components/sql-editor/SQLEditorLayout.tsx+++ b/frontend/src/react/components/sql-editor/SQLEditorLayout.tsx@@ -1,8 +1,7 @@import { useEffect, useState } from "react";import { BannersWrapper } from "@/react/components/BannersWrapper";-import { useAppStore } from "@/react/stores/app";+import { useEnsureWorkspaceCommonData } from "@/react/hooks/useEnsureWorkspaceCommonData";import { router } from "@/router";-import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";import { provideSheetContext } from "@/views/sql-editor/Sheet";import { RequestDrawerHost } from "./RequestDrawerHost";import { SQLEditorRouteShell } from "./SQLEditorRouteShell";@@ -15,47 +14,34 @@ import { useSQLEditorAutoSave } from "./useSQLEditorAutoSave";* - the legacy `#sql-editor-debug` teleport target (kept hidden by* default, used by debug `<li>` strings the inner shells emit).* - the React `<BannersWrapper>` at the top.- * - workspace profile + environment fetch on mount, gated by Vue- * Router's `isReady()` so the SQL Editor doesn't bootstrap before- * initial route resolution.+ * - workspace-scope common data via `useEnsureWorkspaceCommonData()` —+ * the same hook DashboardFrameShell uses. Idempotent loaders make it+ * safe to call from every top-level shell.* - `useSQLEditorAutoSave()` — the 2-second debounced worksheet* auto-save extracted from the legacy `provideSQLEditorContext()`.* - the `<SQLEditorRouteShell>` once `ready` flips true.*/export function SQLEditorLayout() {- const getOrFetchSettingByName = useAppStore((s) => s.getOrFetchSettingByName);- const loadEnvironmentList = useAppStore((s) => s.loadEnvironmentList);- const loadServerInfo = useAppStore((s) => s.loadServerInfo);- const loadCurrentUser = useAppStore((s) => s.loadCurrentUser);// Boots the per-view watchers (selectedKeys ↔ active tab) the moment// the layout appears. The sheet-context singleton is module-level and// lazy — calling it here ensures the watchers are wired before any// child component reads from it.provideSheetContext();- const [ready, setReady] = useState(false);+ const commonDataReady = useEnsureWorkspaceCommonData();+ const [routerReady, setRouterReady] = useState(false);useEffect(() => {let cancelled = false;- void (async () => {- await router.isReady();- await Promise.all([- getOrFetchSettingByName(Setting_SettingName.WORKSPACE_PROFILE),- loadEnvironmentList(),- loadServerInfo(),- loadCurrentUser(),- ]);- if (!cancelled) setReady(true);- })();+ void router.isReady().then(() => {+ if (!cancelled) setRouterReady(true);+ });return () => {cancelled = true;};- }, [- getOrFetchSettingByName,- loadEnvironmentList,- loadServerInfo,- loadCurrentUser,- ]);+ }, []);++ const ready = commonDataReady && routerReady;useSQLEditorAutoSave();diff --git a/frontend/src/react/hooks/useEnsureWorkspaceCommonData.ts b/frontend/src/react/hooks/useEnsureWorkspaceCommonData.tsnew file mode 100644index 0000000000..73d578b641--- /dev/null+++ b/frontend/src/react/hooks/useEnsureWorkspaceCommonData.ts@@ -0,0 +1,72 @@+import { useEffect, useState } from "react";+import { useAppStore } from "@/react/stores/app";++/**+ * Workspace-scope common data bootstrap.+ *+ * Every top-level React shell (DashboardFrameShell, SQLEditorLayout, and any+ * future scope shell) calls this once. All loaders are idempotent (they+ * dedupe via in-flight request refs in the app store), so wiring this hook+ * up at multiple shells does not produce duplicate gRPC calls — it just+ * guarantees the data is loading by the time any descendant page mounts.+ *+ * Pages should not call these loaders individually any more. The whole+ * point of this hook is to remove the "did I remember to fetch on this+ * page?" failure mode. Anything that needs to wait until permissions are+ * ready can use `usePermissionDataReady()` from ComponentPermissionGuard,+ * which awaits the same idempotent request.+ *+ * Auth-flow pages (SetupPage, ProfileSetupPage, OAuth2ConsentPage) render+ * outside any shell; they still handle their own loads because they need+ * a subset of this data before any shell would otherwise mount.+ *+ * Returns `true` once the initial bootstrap promise has settled. Shells+ * use it to gate their loading spinner.+ */+export function useEnsureWorkspaceCommonData(): boolean {+ const loadCurrentUser = useAppStore((state) => state.loadCurrentUser);+ const loadServerInfo = useAppStore((state) => state.loadServerInfo);+ const loadWorkspace = useAppStore((state) => state.loadWorkspace);+ const loadWorkspaceProfile = useAppStore(+ (state) => state.loadWorkspaceProfile+ );+ const loadEnvironmentList = useAppStore((state) => state.loadEnvironmentList);+ const loadWorkspacePermissionState = useAppStore(+ (state) => state.loadWorkspacePermissionState+ );+ const loadSubscription = useAppStore((state) => state.loadSubscription);++ const [ready, setReady] = useState(false);++ useEffect(() => {+ let cancelled = false;+ void Promise.all([+ loadCurrentUser(),+ loadServerInfo(),+ loadWorkspace(),+ loadWorkspaceProfile(),+ loadEnvironmentList(),+ loadWorkspacePermissionState(),+ loadSubscription(),+ ])+ .catch(() => undefined)+ .then(() => {+ if (!cancelled) {+ setReady(true);+ }+ });+ return () => {+ cancelled = true;+ };+ }, [+ loadCurrentUser,+ loadServerInfo,+ loadWorkspace,+ loadWorkspaceProfile,+ loadEnvironmentList,+ loadWorkspacePermissionState,+ loadSubscription,+ ]);++ return ready;+}diff --git a/frontend/src/react/pages/project/database-detail/DatabaseDetailActions.tsx b/frontend/src/react/pages/project/database-detail/DatabaseDetailActions.tsxindex 322e533496..9068fc49b0 100644--- a/frontend/src/react/pages/project/database-detail/DatabaseDetailActions.tsx+++ b/frontend/src/react/pages/project/database-detail/DatabaseDetailActions.tsx@@ -5,7 +5,8 @@ import { PermissionGuard } from "@/react/components/PermissionGuard";import { Button } from "@/react/components/ui/button";import { useVueState } from "@/react/hooks/useVueState";import { preCreateIssue } from "@/react/lib/plan/issue";-import { usePermissionStore, useProjectV1Store } from "@/store";+import { useAppStore } from "@/react/stores/app";+import { useProjectV1Store } from "@/store";import type { Permission } from "@/types";import type { Database } from "@/types/proto-es/v1/database_service_pb";import { DatabaseExportSchemaButton } from "./DatabaseExportSchemaButton";@@ -27,20 +28,23 @@ export function DatabaseDetailActions({}) {const { t } = useTranslation();const projectStore = useProjectV1Store();- const permissionStore = usePermissionStore();+ const hasProjectPermissionFn = useAppStore(+ (state) => state.hasProjectPermission+ );+ const hasWorkspacePermissionFn = useAppStore(+ (state) => state.hasWorkspacePermission+ );const project = useVueState(() =>projectStore.getProjectByName(database.project));const hasProjectPermission = useMemo(() => (permission: Permission) => {- if (permissionStore.currentPermissions.has(permission)) {+ if (hasWorkspacePermissionFn(permission)) {return true;}- return project- ? permissionStore.currentPermissionsInProjectV1(project).has(permission)- : false;+ return project ? hasProjectPermissionFn(project, permission) : false;},- [permissionStore, project]+ [hasProjectPermissionFn, hasWorkspacePermissionFn, project]);const canUpdate = useMemo(diff --git a/frontend/src/react/pages/project/database-detail/DatabaseSQLEditorButton.tsx b/frontend/src/react/pages/project/database-detail/DatabaseSQLEditorButton.tsxindex a0fd77ed9a..4621fc6f37 100644--- a/frontend/src/react/pages/project/database-detail/DatabaseSQLEditorButton.tsx+++ b/frontend/src/react/pages/project/database-detail/DatabaseSQLEditorButton.tsx@@ -1,9 +1,9 @@import { SquareTerminal } from "lucide-react";import { useCallback } from "react";import { useTranslation } from "react-i18next";+import { useAppStore } from "@/react/stores/app";import { router } from "@/router";import { SQL_EDITOR_DATABASE_MODULE } from "@/router/sqlEditor";-import { usePermissionStore } from "@/store";import type { Database } from "@/types/proto-es/v1/database_service_pb";import { defaultProject, isDefaultProject } from "@/types/v1/project";@@ -32,7 +32,12 @@ export function DatabaseSQLEditorButton({onFailed?: (database: Database) => void;}) {const { t } = useTranslation();- const permissionStore = usePermissionStore();+ const hasProjectPermissionFn = useAppStore(+ (state) => state.hasProjectPermission+ );+ const hasWorkspacePermissionFn = useAppStore(+ (state) => state.hasWorkspacePermission+ );const handleClick = useCallback(() => {if (disabled) {@@ -40,12 +45,13 @@ export function DatabaseSQLEditorButton({}if (isDefaultProject(database.project)) {- if (- !permissionStore.currentPermissions.has("bb.sql.select") &&- !permissionStore- .currentPermissionsInProjectV1(defaultProject(database.project))- .has("bb.sql.select")- ) {+ const canQuery =+ hasWorkspacePermissionFn("bb.sql.select") ||+ hasProjectPermissionFn(+ defaultProject(database.project),+ "bb.sql.select"+ );+ if (!canQuery) {onFailed?.(database);return;}@@ -67,7 +73,13 @@ export function DatabaseSQLEditorButton({}window.open(route.fullPath, "_blank");- }, [database, disabled, onFailed, permissionStore]);+ }, [+ database,+ disabled,+ hasProjectPermissionFn,+ hasWorkspacePermissionFn,+ onFailed,+ ]);return (<dddiff --git a/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx b/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsxindex 35b3eb908f..65551e81f0 100644--- a/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx+++ b/frontend/src/react/pages/project/issue-detail/components/IssueDetailApprovalFlow.tsx@@ -20,11 +20,7 @@ import { displayRoleTitleFromList } from "@/react/lib/role";import { cn } from "@/react/lib/utils";import { useAppStore } from "@/react/stores/app";import { ensureGroupIdentifier } from "@/react/stores/app/group";-import {- pushNotification,- useProjectIamPolicyStore,- useProjectV1Store,-} from "@/store";+import { pushNotification, useProjectV1Store } from "@/store";import { projectNamePrefix, userNamePrefix } from "@/store/modules/v1/common";import {ApprovalStatus,@@ -57,7 +53,9 @@ export function IssueDetailApprovalFlow() {const { t } = useTranslation();const page = useIssueDetailContext();const projectStore = useProjectV1Store();- const projectIamPolicyStore = useProjectIamPolicyStore();+ const loadProjectIamPolicy = useAppStore(+ (state) => state.loadProjectIamPolicy+ );const projectName = `${projectNamePrefix}${page.projectId}`;const issue = page.issue;@@ -65,10 +63,8 @@ export function IssueDetailApprovalFlow() {void projectStore.getOrFetchProjectByName(projectName).catch(() => undefined);- void projectIamPolicyStore- .getOrFetchProjectIamPolicy(projectName)- .catch(() => undefined);- }, [projectIamPolicyStore, projectName, projectStore]);+ void loadProjectIamPolicy(projectName).catch(() => undefined);+ }, [loadProjectIamPolicy, projectName, projectStore]);if (!issue) {return null;@@ -505,7 +501,6 @@ function useApprovalStep(issue: Issue, step: string, stepIndex: number) {const page = useIssueDetailContext();const currentUser = useCurrentUser();const projectStore = useProjectV1Store();- const projectIamPolicyStore = useProjectIamPolicyStore();const batchGetOrFetchUsers = useAppStore((state) => state.batchGetOrFetchUsers);@@ -565,10 +560,19 @@ function useApprovalStep(issue: Issue, step: string, stepIndex: number) {);}, [currentUserEmail, issue.creator, stepApprover?.status]);- const groupNamesKey = useVueState(() => {- const policy = projectIamPolicyStore.getProjectIamPolicy(projectName);+ // Subscribe directly to the Zustand project IAM cache so groupNames /+ // candidateEmails recompute the moment loadProjectIamPolicy() resolves.+ // Wrapping the Zustand getter in useVueState would only react to Vue+ // dependencies and miss the Zustand write, leaving the approval step+ // empty on a cold issue page.+ const projectIamPolicy = useAppStore(+ (state) => state.projectPoliciesByName[projectName]+ );++ const groupNames = useMemo(() => {+ if (!projectIamPolicy) return [];const names: string[] = [];- for (const binding of policy.bindings) {+ for (const binding of projectIamPolicy.bindings) {if (binding.role !== step || isBindingPolicyExpired(binding)) {continue;}@@ -578,20 +582,17 @@ function useApprovalStep(issue: Issue, step: string, stepIndex: number) {}}}- return [...new Set(names)].sort().join("\u0000");- });- const groupNames = useMemo(() => {- return groupNamesKey ? groupNamesKey.split("\u0000") : [];- }, [groupNamesKey]);+ return [...new Set(names)].sort();+ }, [projectIamPolicy, step]);useEffect(() => {void batchGetOrFetchGroups(groupNames).catch(() => undefined);}, [groupNames, batchGetOrFetchGroups]);- const candidateEmailsKey = useVueState(() => {- const policy = projectIamPolicyStore.getProjectIamPolicy(projectName);+ const candidateEmails = useMemo(() => {+ if (!projectIamPolicy) return [];const memberMap = memberMapToRolesInProjectIAM(- policy,+ projectIamPolicy,step,getGroupByIdentifier);@@ -601,11 +602,8 @@ function useApprovalStep(issue: Issue, step: string, stepIndex: number) {candidates.push(fullname);}}- return [...new Set(candidates)].sort().join("\u0000");- });- const candidateEmails = useMemo(() => {- return candidateEmailsKey ? candidateEmailsKey.split("\u0000") : [];- }, [candidateEmailsKey]);+ return [...new Set(candidates)].sort();+ }, [projectIamPolicy, step, getGroupByIdentifier]);const isCurrentUserInCandidates = useMemo(() => {return candidateEmails.includes(`${userNamePrefix}${currentUserEmail}`);diff --git a/frontend/src/react/pages/project/issue-detail/utils/rollout.ts b/frontend/src/react/pages/project/issue-detail/utils/rollout.tsindex f934fc10fd..3c996e0142 100644--- a/frontend/src/react/pages/project/issue-detail/utils/rollout.ts+++ b/frontend/src/react/pages/project/issue-detail/utils/rollout.ts@@ -1,4 +1,5 @@-import { usePolicyV1Store, useProjectIamPolicyStore } from "@/store";+import { useAppStore } from "@/react/stores/app";+import { usePolicyV1Store } from "@/store";import { roleNamePrefix } from "@/store/modules/v1/common";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";@@ -59,11 +60,10 @@ export const canRolloutTasks = ({return true;}- const projectIamPolicyStore = useProjectIamPolicyStore();const policyStore = usePolicyV1Store();- const projectIamPolicy = projectIamPolicyStore.getProjectIamPolicy(- project.name- );+ const projectIamPolicy = useAppStore+ .getState()+ .getProjectIamPolicy(project.name);const memberRoles = memberMapToRolesInProjectIAM(projectIamPolicy);const userRoles = memberRoles.get(currentUser.name);@@ -117,10 +117,9 @@ export const preloadRolloutPermissionContext = async ({}const policyStore = usePolicyV1Store();- const projectIamPolicyStore = useProjectIamPolicyStore();await Promise.allSettled([- projectIamPolicyStore.getOrFetchProjectIamPolicy(projectName),+ useAppStore.getState().loadProjectIamPolicy(projectName),]);const policyResults = await Promise.allSettled([diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsxindex 24b4dfe279..2dfd595181 100644--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.test.tsx@@ -77,7 +77,6 @@ vi.mock("@/connect", () => ({vi.mock("@/store", () => ({pushNotification: mocks.pushNotification,- useProjectIamPolicyStore: () => mocks.projectIamPolicyStore,useProjectV1Store: () => mocks.projectStore,}));@@ -92,6 +91,11 @@ vi.mock("@/react/stores/app", () => ({batchGetOrFetchUsers: mocks.batchGetOrFetchUsers,getOrFetchUserByIdentifier: mocks.getOrFetchUserByIdentifier,roleList: mocks.roleList,+ loadProjectIamPolicy:+ mocks.projectIamPolicyStore.getOrFetchProjectIamPolicy,+ // The approval flow now subscribes to projectPoliciesByName directly+ // so the candidate list re-renders when the policy resolves.+ projectPoliciesByName: { "projects/p1": { bindings: [] } },}),}));diff --git a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsxindex aae6caf8e9..05679356c6 100644--- a/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx+++ b/frontend/src/react/pages/project/plan-detail/components/PlanDetailApprovalFlow.tsx@@ -22,11 +22,7 @@ import { useAppStore } from "@/react/stores/app";import { ensureGroupIdentifier } from "@/react/stores/app/group";import { router } from "@/router";import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";-import {- pushNotification,- useProjectIamPolicyStore,- useProjectV1Store,-} from "@/store";+import { pushNotification, useProjectV1Store } from "@/store";import { projectNamePrefix, userNamePrefix } from "@/store/modules/v1/common";import {getIssueCommentType,@@ -86,7 +82,9 @@ function PlanDetailApprovalFlowContent({const { t } = useTranslation();const page = usePlanDetailContext();const projectStore = useProjectV1Store();- const projectIamPolicyStore = useProjectIamPolicyStore();+ const loadProjectIamPolicy = useAppStore(+ (state) => state.loadProjectIamPolicy+ );const issueCommentStore = useIssueCommentStore();const projectName = `${projectNamePrefix}${page.projectId}`;const issue = page.issue;@@ -95,10 +93,8 @@ function PlanDetailApprovalFlowContent({void projectStore.getOrFetchProjectByName(projectName).catch(() => undefined);- void projectIamPolicyStore- .getOrFetchProjectIamPolicy(projectName)- .catch(() => undefined);- }, [projectIamPolicyStore, projectName, projectStore]);+ void loadProjectIamPolicy(projectName).catch(() => undefined);+ }, [loadProjectIamPolicy, projectName, projectStore]);useEffect(() => {if (mode !== "review") {@@ -667,7 +663,6 @@ function useApprovalStep(issue: Issue, step: string, stepIndex: number) {const { patchState } = page;const currentUser = useCurrentUser();const projectStore = useProjectV1Store();- const projectIamPolicyStore = useProjectIamPolicyStore();const batchGetOrFetchUsers = useAppStore((state) => state.batchGetOrFetchUsers);@@ -689,8 +684,13 @@ function useApprovalStep(issue: Issue, step: string, stepIndex: number) {const projectName = `${projectNamePrefix}${page.projectId}`;const currentUserEmail = currentUser?.email ?? "";const project = useVueState(() => projectStore.getProjectByName(projectName));- const projectIamPolicy = useVueState(() =>- projectIamPolicyStore.getProjectIamPolicy(projectName)+ // Subscribe directly to the Zustand project IAM cache so this step+ // re-renders the moment loadProjectIamPolicy() resolves. Wrapping the+ // Zustand getter in useVueState would only react to Vue dependencies+ // and miss the Zustand write, leaving the candidates list empty on a+ // cold plan page.+ const projectIamPolicy = useAppStore(+ (state) => state.projectPoliciesByName[projectName]);const stepApprover = issue.approvers[stepIndex];diff --git a/frontend/src/react/pages/settings/MembersPage.test.tsx b/frontend/src/react/pages/settings/MembersPage.test.tsxindex f00d7d9ac5..99c459bb04 100644--- a/frontend/src/react/pages/settings/MembersPage.test.tsx+++ b/frontend/src/react/pages/settings/MembersPage.test.tsx@@ -279,11 +279,6 @@ vi.mock("@/store", () => ({isSaaSMode: false,userCountInIam: 1,}),- useProjectIamPolicyStore: () => ({- getOrFetchProjectIamPolicy: vi.fn(),- getProjectIamPolicy: () => projectIamPolicy,- updateProjectIamPolicy: mockUpdateProjectIamPolicy,- }),useProjectV1Store: () => ({getProjectByName: (name: string) => ({allowRequestRole: true,@@ -318,6 +313,13 @@ vi.mock("@/react/stores/app", () => ({patchWorkspaceIamPolicy: vi.fn(),findWorkspaceRolesByMember: () => [],fetchWorkspaceIamPolicy: vi.fn(async () => undefined),+ // MembersPage now subscribes to projectPoliciesByName directly so it+ // re-renders when loadProjectIamPolicy() resolves. The getter form is+ // still used inside async handlers.+ projectPoliciesByName: { "projects/sample-project": projectIamPolicy },+ getProjectIamPolicy: () => projectIamPolicy,+ updateProjectIamPolicy: mockUpdateProjectIamPolicy,+ loadProjectIamPolicy: vi.fn(async () => undefined),}),}));diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsxindex 896612e07e..c4b800aa7f 100644--- a/frontend/src/react/pages/settings/MembersPage.tsx+++ b/frontend/src/react/pages/settings/MembersPage.tsx@@ -83,7 +83,6 @@ import { useAppStore } from "@/react/stores/app";import {pushNotification,useActuatorV1Store,- useProjectIamPolicyStore,useProjectV1Store,useSettingV1Store,useSubscriptionV1Store,@@ -1244,7 +1243,10 @@ function EditMemberRoleDrawer({const findWorkspaceRolesByMember = useAppStore((state) => state.findWorkspaceRolesByMember);- const projectIamPolicyStore = useProjectIamPolicyStore();+ const getProjectIamPolicy = useAppStore((state) => state.getProjectIamPolicy);+ const updateProjectIamPolicy = useAppStore(+ (state) => state.updateProjectIamPolicy+ );const isSaaSMode = useVueState(() => useActuatorV1Store().isSaaSMode);const settingV1Store = useSettingV1Store();const roleList = useAppStore((state) => state.roleList);@@ -1263,7 +1265,7 @@ function EditMemberRoleDrawer({// Active bindings come first, expired ones last; original order is preserved within each group.const liveProjectRoleBindings = useVueState(() => {if (!isProjectEditMode || !member || !projectName) return [];- const policy = projectIamPolicyStore.getProjectIamPolicy(projectName);+ const policy = getProjectIamPolicy(projectName);const matching = policy.bindings.filter((b) =>b.members.includes(member.binding));@@ -1340,9 +1342,7 @@ function EditMemberRoleDrawer({return;setIsRequesting(true);try {- const policy = structuredClone(- projectIamPolicyStore.getProjectIamPolicy(projectName)- );+ const policy = structuredClone(getProjectIamPolicy(projectName));const match = policy.bindings.find((b) =>b.role === roleBinding.role &&@@ -1353,7 +1353,7 @@ function EditMemberRoleDrawer({match.members = match.members.filter((m) => m !== member.binding);}policy.bindings = policy.bindings.filter((b) => b.members.length > 0);- await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);+ await updateProjectIamPolicy(projectName, policy);pushNotification({module: "bytebase",style: "SUCCESS",@@ -1377,9 +1377,7 @@ function EditMemberRoleDrawer({setIsRequesting(true);try {if (projectName) {- const policy = structuredClone(- projectIamPolicyStore.getProjectIamPolicy(projectName)- );+ const policy = structuredClone(getProjectIamPolicy(projectName));if (isEditMode) {// Remove member from unconditional bindings only;// preserve conditional bindings (expiration, database scope)@@ -1544,7 +1542,7 @@ function EditMemberRoleDrawer({}}}- await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);+ await updateProjectIamPolicy(projectName, policy);} else {if (isEditMode) {await patchWorkspaceIamPolicy([@@ -1587,14 +1585,12 @@ function EditMemberRoleDrawer({setIsRequesting(true);try {if (projectName) {- const policy = structuredClone(- projectIamPolicyStore.getProjectIamPolicy(projectName)- );+ const policy = structuredClone(getProjectIamPolicy(projectName));for (const binding of policy.bindings) {binding.members = binding.members.filter((m) => m !== member.binding);}policy.bindings = policy.bindings.filter((b) => b.members.length > 0);- await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);+ await updateProjectIamPolicy(projectName, policy);} else {await patchWorkspaceIamPolicy([{ member: member.binding, roles: [] }]);}@@ -1897,14 +1893,13 @@ export function MembersPage({ projectId }: { projectId?: string }) {const patchWorkspaceIamPolicy = useAppStore((state) => state.patchWorkspaceIamPolicy);- const fetchWorkspaceIamPolicy = useAppStore(- (state) => state.fetchWorkspaceIamPolicy- );const actuatorStore = useActuatorV1Store();const subscriptionStore = useSubscriptionV1Store();const currentUser = useCurrentUser();const projectStore = useProjectV1Store();- const projectIamPolicyStore = useProjectIamPolicyStore();+ const updateProjectIamPolicy = useAppStore(+ (state) => state.updateProjectIamPolicy+ );const userCountInIam = useVueState(() => actuatorStore.userCountInIam);const userCountLimit = useVueState(() => subscriptionStore.userCountLimit);@@ -1935,19 +1930,17 @@ export function MembersPage({ projectId }: { projectId?: string }) {subscriptionStore.hasFeature(PlanFeature.FEATURE_REQUEST_ROLE_WORKFLOW));- // Fetch project IAM policy on mount- useEffect(() => {- if (projectName) {- projectIamPolicyStore.getOrFetchProjectIamPolicy(projectName);- } else {- void fetchWorkspaceIamPolicy();- }- }, [projectName, projectIamPolicyStore, fetchWorkspaceIamPolicy]);-- const projectIamPolicy = useVueState(() =>- projectName- ? projectIamPolicyStore.getProjectIamPolicy(projectName)- : undefined+ // IAM policy loads are owned by the parent shells: ProjectRouteShell+ // loads project IAM on /projects/:projectId/members, and+ // DashboardFrameShell's useEnsureWorkspaceCommonData loads workspace IAM+ // (+ referenced groups) on /settings/members. This page just reads them.+ // Subscribe directly to the Zustand projectPoliciesByName slice so the+ // member table re-renders when loadProjectIamPolicy / updateProjectIamPolicy+ // writes to the app store. Wrapping `getProjectIamPolicy()` in+ // `useVueState` would only re-render on Vue reactivity changes and miss+ // these Zustand writes.+ const projectIamPolicy = useAppStore((state) =>+ projectName ? state.projectPoliciesByName[projectName] : undefined);// `useVueState` ensures we re-render whenever any reactive dep@@ -2005,10 +1998,7 @@ export function MembersPage({ projectId }: { projectId?: string }) {);}policy.bindings = policy.bindings.filter((b) => b.members.length > 0);- await projectIamPolicyStore.updateProjectIamPolicy(- projectName,- policy- );+ await updateProjectIamPolicy(projectName, policy);} else {await patchWorkspaceIamPolicy(selectedMembers.map((m) => ({ member: m, roles: [] }))@@ -2039,7 +2029,7 @@ export function MembersPage({ projectId }: { projectId?: string }) {b.members = b.members.filter((member) => member !== binding.binding);}policy.bindings = policy.bindings.filter((b) => b.members.length > 0);- await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);+ await updateProjectIamPolicy(projectName, policy);} else {await patchWorkspaceIamPolicy([{ member: binding.binding, roles: [] }]);}diff --git a/frontend/src/react/pages/settings/RolesPage.tsx b/frontend/src/react/pages/settings/RolesPage.tsxindex 149a9a2977..30744e0c49 100644--- a/frontend/src/react/pages/settings/RolesPage.tsx+++ b/frontend/src/react/pages/settings/RolesPage.tsx@@ -674,9 +674,6 @@ export function RolesPage() {const listRoles = useAppStore((state) => state.listRoles);const getRoleByName = useAppStore((state) => state.getRoleByName);const deleteRole = useAppStore((state) => state.deleteRole);- const fetchWorkspaceIamPolicy = useAppStore(- (state) => state.fetchWorkspaceIamPolicy- );const subscriptionStore = useSubscriptionV1Store();const [ready, setReady] = useState(false);@@ -703,11 +700,11 @@ export function RolesPage() {);}, [roleList]);- // Fetch roles on mount and handle query param+ // Fetch roles on mount and handle query param. The workspace IAM policy+ // and its referenced groups (used by the "users with this role" delete+ // confirmation) are loaded centrally by useEnsureWorkspaceCommonData in+ // the dashboard shell, so this page doesn't need to hedge here.useEffect(() => {- // The workspace IAM policy backs the "users with this role" list shown in- // the delete confirmation; load it (and referenced groups) alongside roles.- void fetchWorkspaceIamPolicy();listRoles().then(() => {const urlParams = new URLSearchParams(window.location.search);diff --git a/frontend/src/react/pages/settings/ServiceAccountsPage.tsx b/frontend/src/react/pages/settings/ServiceAccountsPage.tsxindex dd7262cad2..e02b548e80 100644--- a/frontend/src/react/pages/settings/ServiceAccountsPage.tsx+++ b/frontend/src/react/pages/settings/ServiceAccountsPage.tsx@@ -41,7 +41,6 @@ import {useProjectV1Store,} from "@/store";import { projectNamePrefix } from "@/store/modules/v1/common";-import { useProjectIamPolicyStore } from "@/store/modules/v1/projectIamPolicy";import {getServiceAccountNameInBinding,getServiceAccountSuffix,@@ -436,7 +435,10 @@ function ServiceAccountForm({);const actuatorStore = useActuatorV1Store();const projectStore = useProjectV1Store();- const projectIamPolicyStore = useProjectIamPolicyStore();+ const getProjectIamPolicy = useAppStore((state) => state.getProjectIamPolicy);+ const updateProjectIamPolicy = useAppStore(+ (state) => state.updateProjectIamPolicy+ );const projectEntity = useVueState(() =>project ? projectStore.getProjectByName(project) : undefined@@ -504,9 +506,7 @@ function ServiceAccountForm({member: string,newRoles: string[]) => {- const policy = structuredClone(- projectIamPolicyStore.getProjectIamPolicy(projectName)- );+ const policy = structuredClone(getProjectIamPolicy(projectName));for (const binding of policy.bindings) {binding.members = binding.members.filter((m) => m !== member);}@@ -525,7 +525,7 @@ function ServiceAccountForm({);}}- await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);+ await updateProjectIamPolicy(projectName, policy);};const handleCreate = async () => {diff --git a/frontend/src/react/pages/settings/UsersPage.tsx b/frontend/src/react/pages/settings/UsersPage.tsxindex 60881ccd12..0f3241589f 100644--- a/frontend/src/react/pages/settings/UsersPage.tsx+++ b/frontend/src/react/pages/settings/UsersPage.tsx@@ -926,15 +926,6 @@ export function UsersPage() {const actuatorStore = useActuatorV1Store();const subscriptionStore = useSubscriptionV1Store();const listUsers = useAppStore((state) => state.listUsers);- const fetchWorkspaceIamPolicy = useAppStore(- (state) => state.fetchWorkspaceIamPolicy- );-- // Load the workspace IAM policy (and the groups it references) so the- // create/edit user sheet can resolve each user's current roles at open.- useEffect(() => {- void fetchWorkspaceIamPolicy();- }, [fetchWorkspaceIamPolicy]);const isSaaSMode = useVueState(() => actuatorStore.isSaaSMode);diff --git a/frontend/src/react/pages/settings/profile/ProfilePage.tsx b/frontend/src/react/pages/settings/profile/ProfilePage.tsxindex c3045bad06..fb3b68ec98 100644--- a/frontend/src/react/pages/settings/profile/ProfilePage.tsx+++ b/frontend/src/react/pages/settings/profile/ProfilePage.tsx@@ -80,15 +80,8 @@ export function ProfilePage({ principalEmail }: ProfilePageProps) {const getWorkspaceRolesByName = useAppStore((state) => state.getWorkspaceRolesByName);- const fetchWorkspaceIamPolicy = useAppStore(- (state) => state.fetchWorkspaceIamPolicy- );const actuatorStore = useActuatorV1Store();- useEffect(() => {- void fetchWorkspaceIamPolicy();- }, [fetchWorkspaceIamPolicy]);-// --- Reactive Vue state ---const legacyCurrentUser = useCurrentUser();const [currentUser, setCurrentUser] = useState(legacyCurrentUser);diff --git a/frontend/src/react/stores/app/iam.ts b/frontend/src/react/stores/app/iam.tsindex ecf84199fe..717186feeb 100644--- a/frontend/src/react/stores/app/iam.ts+++ b/frontend/src/react/stores/app/iam.ts@@ -11,6 +11,7 @@ import {BindingSchema,GetIamPolicyRequestSchema,type IamPolicy,+ IamPolicySchema,SetIamPolicyRequestSchema,} from "@/types/proto-es/v1/iam_policy_pb";import { ListRolesRequestSchema } from "@/types/proto-es/v1/role_service_pb";@@ -91,8 +92,20 @@ export const createIamSlice: AppSliceCreator<IamSlice> = (set, get) => ({.getIamPolicy(createProto(GetIamPolicyRequestSchema, { resource: policyResource }))- .then((workspacePolicy) => {+ .then(async (workspacePolicy) => {set({ workspacePolicy, workspacePolicyRequest: undefined });+ // Prefetch groups referenced by the policy so derived role/user+ // maps (and any UI that resolves group display names) read from+ // a populated cache. Without this every page that reads the+ // policy had to hedge with its own fetchWorkspaceIamPolicy().+ const groupMembers = workspacePolicy.bindings+ .flatMap((binding) => binding.members)+ .filter((member) => member.startsWith(groupBindingPrefix));+ if (groupMembers.length > 0) {+ await get()+ .batchGetOrFetchGroups(groupMembers)+ .catch(() => []);+ }return workspacePolicy;}).catch(() => {@@ -133,11 +146,20 @@ export const createIamSlice: AppSliceCreator<IamSlice> = (set, get) => ({// 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 } = await import(- "@/store/modules/v1/projectIamPolicy"- );+ const { useProjectIamPolicyStore, composePolicyBindings } =+ 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.@@ -161,6 +183,52 @@ export const createIamSlice: AppSliceCreator<IamSlice> = (set, get) => ({return request;},+ getProjectIamPolicy: (project) => {+ return (+ get().projectPoliciesByName[project] ?? createProto(IamPolicySchema, {})+ );+ },++ updateProjectIamPolicy: async (project, policy) => {+ // Dedupe members within each binding (mirrors the Pinia store's+ // pre-write normalization).+ const deduped = cloneDeep(policy);+ for (const binding of deduped.bindings) {+ if (binding.members) {+ binding.members = [...new Set(binding.members)];+ }+ }+ const updated = await projectServiceClientConnect.setIamPolicy(+ createProto(SetIamPolicyRequestSchema, {+ resource: project,+ policy: deduped,+ etag: deduped.etag,+ })+ );+ set((state) => ({+ projectPoliciesByName: {+ ...state.projectPoliciesByName,+ [project]: updated,+ },+ }));+ // Bridge to the Pinia projectIamPolicy store so the legacy+ // permission chain sees the updated policy. setProjectIamPolicy also+ // invalidates the Pinia permission cache by project. composePolicyBindings+ // refreshes the Pinia user / group / service-account / workload-identity+ // stores that getMemberBindings reads — without it the members table+ // could render stale titles for newly granted members.+ try {+ const { useProjectIamPolicyStore, composePolicyBindings } = await import(+ "@/store/modules/v1/projectIamPolicy"+ );+ useProjectIamPolicyStore().setProjectIamPolicy(project, updated);+ await composePolicyBindings(updated.bindings);+ } catch {+ // Pinia not available — app-store cache is already populated.+ }+ return updated;+ },+fetchWorkspaceIamPolicy: async () => {const resource =get().serverInfo?.workspace ||diff --git a/frontend/src/react/stores/app/projectWebhook.ts b/frontend/src/react/stores/app/projectWebhook.tsindex 59ab916a81..4e7c23fe3c 100644--- a/frontend/src/react/stores/app/projectWebhook.ts+++ b/frontend/src/react/stores/app/projectWebhook.ts@@ -6,7 +6,7 @@ import {TestWebhookRequestSchema,UpdateWebhookRequestSchema,} from "@/types/proto-es/v1/project_service_pb";-import { extractProjectWebhookID } from "@/utils";+import { extractProjectWebhookID } from "@/utils/v1/projectWebhook";import type { AppSliceCreator, ProjectWebhookSlice } from "./types";export const createProjectWebhookSlice: AppSliceCreator<ProjectWebhookSlice> = (diff --git a/frontend/src/react/stores/app/types.ts b/frontend/src/react/stores/app/types.tsindex 7b001d5096..8c45870a59 100644--- a/frontend/src/react/stores/app/types.ts+++ b/frontend/src/react/stores/app/types.ts@@ -221,6 +221,11 @@ export type IamSlice = {rolesRequest?: Promise<Role[]>;loadWorkspacePermissionState: () => Promise<void>;loadProjectIamPolicy: (project: string) => Promise<IamPolicy | undefined>;+ getProjectIamPolicy: (project: string) => IamPolicy;+ updateProjectIamPolicy: (+ project: string,+ policy: IamPolicy+ ) => Promise<IamPolicy>;fetchWorkspaceIamPolicy: () => Promise<IamPolicy>;patchWorkspaceIamPolicy: (batchPatch: { member: string; roles: string[] }[]diff --git a/frontend/src/react/stores/app/user.ts b/frontend/src/react/stores/app/user.tsindex 452494403f..0a10ff696d 100644--- a/frontend/src/react/stores/app/user.ts+++ b/frontend/src/react/stores/app/user.ts@@ -23,7 +23,7 @@ import {UpdateEmailRequestSchema,UpdateUserRequestSchema,} from "@/types/proto-es/v1/user_service_pb";-import { ensureUserFullName } from "@/utils";+import { ensureUserFullName } from "@/utils/v1/user";import type { AppSliceCreator, UserFilter, UserSlice } from "./types";const UNKNOWN_PROJECT_NAME_LEGACY = "projects/-";diff --git a/frontend/src/react/stores/app/worksheet.ts b/frontend/src/react/stores/app/worksheet.tsindex dd62a65083..fde105245c 100644--- a/frontend/src/react/stores/app/worksheet.ts+++ b/frontend/src/react/stores/app/worksheet.ts@@ -20,7 +20,7 @@ import {WorksheetSchema,} from "@/types/proto-es/v1/worksheet_service_pb";import { isValidDatabaseName } from "@/types/v1/database";-import { extractWorksheetID } from "@/utils";+import { extractWorksheetID } from "@/utils/v1/worksheet";import type { AppSliceCreator, WorksheetSlice, WorksheetView } from "./types";const cacheKey = (uid: string, view: WorksheetView) => `${uid}:${view}`;diff --git a/frontend/src/utils/v1/iam.ts b/frontend/src/utils/v1/iam.tsindex ce49b32b0c..dd6100ad99 100644--- a/frontend/src/utils/v1/iam.ts+++ b/frontend/src/utils/v1/iam.ts@@ -20,8 +20,8 @@ import {} from "@/types";import type { Group } from "@/types/proto-es/v1/group_service_pb";import type { Binding, IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";-import { ensureUserFullName } from "@/utils";import { convertFromExpr } from "@/utils/issue/cel";+import { ensureUserFullName } from "@/utils/v1/user";export const isBindingPolicyExpired = (binding: Binding): boolean => {if (binding.parsedExpr) {