Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(frontend): migrate project Service Accounts & Workload Identities to React, consolidate ReactPageMount (#19857)
Danny Xud89feb1e2f6e
diff --git a/frontend/src/components/RoleGrantPanel/RoleGrantPanel.vue b/frontend/src/components/RoleGrantPanel/RoleGrantPanel.vueindex fe6e34469d..5a19e07e51 100644--- a/frontend/src/components/RoleGrantPanel/RoleGrantPanel.vue+++ b/frontend/src/components/RoleGrantPanel/RoleGrantPanel.vue@@ -154,7 +154,8 @@ const doCreateIssue = async () => {}),uniq(databaseResources?.map(- (databaseResource) => databaseResource.databaseFullName+ (databaseResource: DatabaseResource) =>+ databaseResource.databaseFullName))),diff --git a/frontend/src/components/User/Settings/ServiceAccountPanel.vue b/frontend/src/components/User/Settings/ServiceAccountPanel.vuedeleted file mode 100644index bb93cb2c61..0000000000--- a/frontend/src/components/User/Settings/ServiceAccountPanel.vue+++ /dev/null@@ -1,231 +0,0 @@-<template>- <div class="w-full overflow-x-hidden flex flex-col py-4">- <div class="flex justify-between items-center px-4 pb-2">- <div class="flex items-center gap-x-2">- <p class="text-lg font-medium leading-7 text-main">- <span>{{ $t("settings.members.service-accounts") }}</span>- </p>- </div>-- <PermissionGuardWrapper- v-slot="slotProps"- :permissions="['bb.serviceAccounts.create']"- :project="project"- >- <NButton- type="primary"- class="capitalize"- :disabled="slotProps.disabled || !allowEdit"- @click="handleCreateServiceAccount"- >- <template #icon>- <PlusIcon class="h-5 w-5" />- </template>- {{ $t("settings.members.add-service-account") }}- </NButton>- </PermissionGuardWrapper>- </div>-- <PagedTable- ref="serviceAccountPagedTable"- :session-key="sessionKey"- :fetch-list="fetchServiceAccountList"- :footer-class="'mx-4'"- >- <template #table="{ list, loading }">- <UserDataTable- :show-roles="false"- :show-groups="false"- :user-list="list"- :loading="loading"- @user-selected="handleServiceAccountSelected"- @user-updated="handleServiceAccountUpdated"- />- </template>- </PagedTable>-- <div class="px-4">- <NCheckbox v-model:checked="state.showInactiveList">- <span class="textinfolabel">- {{ $t("settings.members.show-inactive") }}- </span>- </NCheckbox>- </div>-- <template v-if="state.showInactiveList">- <div class="flex justify-between items-center mt-2 px-4 pb-2">- <p class="text-lg font-medium leading-7">- <span>{{ $t("settings.members.inactive-service-accounts") }}</span>- </p>- </div>-- <PagedTable- ref="deletedServiceAccountPagedTable"- :session-key="deletedSessionKey"- :fetch-list="fetchInactiveServiceAccountList"- :footer-class="'mx-4'"- >- <template #table="{ list, loading }">- <UserDataTable- :loading="loading"- :show-roles="false"- :show-groups="false"- :user-list="list"- @user-updated="handleServiceAccountRestore"- />- </template>- </PagedTable>- </template>- </div>-- <CreateServiceAccountDrawer- v-if="state.showCreateDrawer"- :service-account="state.editingServiceAccount"- :project="project?.name"- @close="- () => {- state.showCreateDrawer = false;- state.editingServiceAccount = undefined;- }- "- @created="sa => handleServiceAccountUpdated(serviceAccountToUser(sa))"- @updated="sa => handleServiceAccountUpdated(serviceAccountToUser(sa))"- />-</template>--<script setup lang="ts">-import { PlusIcon } from "lucide-vue-next";-import { NButton, NCheckbox } from "naive-ui";-import { computed, reactive, ref } from "vue";-import type { ComponentExposed } from "vue-component-type-helpers";-import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";-import CreateServiceAccountDrawer from "@/components/User/Settings/CreateServiceAccountDrawer.vue";-import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";-import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useActuatorV1Store, useCurrentProjectV1 } from "@/store";-import {- serviceAccountToUser,- useServiceAccountStore,-} from "@/store/modules/serviceAccount";-import { isValidProjectName } from "@/types";-import { State } from "@/types/proto-es/v1/common_pb";-import type { ServiceAccount } from "@/types/proto-es/v1/service_account_service_pb";-import type { User } from "@/types/proto-es/v1/user_service_pb";--type LocalState = {- showInactiveList: boolean;- showCreateDrawer: boolean;- editingServiceAccount?: ServiceAccount;-};--const state = reactive<LocalState>({- showInactiveList: false,- showCreateDrawer: false,-});--const serviceAccountStore = useServiceAccountStore();-const serviceAccountPagedTable =- ref<ComponentExposed<typeof PagedTable<User>>>();-const deletedServiceAccountPagedTable =- ref<ComponentExposed<typeof PagedTable<User>>>();--const { project: currentProject } = useCurrentProjectV1();-const project = computed(() =>- isValidProjectName(currentProject.value.name)- ? currentProject.value- : undefined-);--const sessionKey = computed(- () =>- `bb.paged-service-account-table${project.value ? `.${project.value.name}` : ""}.active`-);--const deletedSessionKey = computed(- () =>- `bb.paged-service-account-table${project.value ? `.${project.value.name}` : ""}.deleted`-);--const parent = computed(- () => project.value?.name ?? useActuatorV1Store().workspaceResourceName-);--const allowEdit = computed(() => {- if (!project.value) {- return true;- }- return project.value.state === State.ACTIVE;-});--const fetchServiceAccountList = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const response = await serviceAccountStore.listServiceAccounts({- parent: parent.value,- pageSize,- pageToken,- showDeleted: false,- });- const users: User[] = response.serviceAccounts.map(serviceAccountToUser);- return { list: users, nextPageToken: response.nextPageToken };-};--const fetchInactiveServiceAccountList = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const response = await serviceAccountStore.listServiceAccounts({- parent: parent.value,- pageSize,- pageToken,- showDeleted: true,- filter: {- state: State.DELETED,- },- });- const users: User[] = response.serviceAccounts.map(serviceAccountToUser);- return { list: users, nextPageToken: response.nextPageToken };-};--const handleCreateServiceAccount = () => {- state.editingServiceAccount = undefined;- state.showCreateDrawer = true;-};--const handleServiceAccountSelected = (user: User) => {- state.editingServiceAccount = serviceAccountStore.getServiceAccount(- user.email- );- state.showCreateDrawer = true;-};--const handleServiceAccountUpdated = (user: User) => {- if (user.state === State.DELETED) {- return handleServiceAccountArchived(user);- }- return serviceAccountPagedTable.value?.updateCache([user]);-};--const handleServiceAccountRestore = (user: User) => {- if (user.state !== State.ACTIVE) {- return;- }- deletedServiceAccountPagedTable.value?.removeCache(user);- serviceAccountPagedTable.value?.refresh();-};--const handleServiceAccountArchived = (user: User) => {- if (user) {- return;- }- serviceAccountPagedTable.value?.removeCache(user);- deletedServiceAccountPagedTable.value?.refresh();-};-</script>diff --git a/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue b/frontend/src/components/User/Settings/WorkloadIdentityPanel.vuedeleted file mode 100644index ee4ecd4615..0000000000--- a/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue+++ /dev/null@@ -1,233 +0,0 @@-<template>- <div class="w-full overflow-x-hidden flex flex-col py-4">- <div class="flex justify-between items-center px-4 pb-2">- <div class="flex items-center gap-x-2">- <p class="text-lg font-medium leading-7 text-main">- <span>{{ $t("settings.members.workload-identities") }}</span>- </p>- </div>-- <PermissionGuardWrapper- v-slot="slotProps"- :permissions="['bb.workloadIdentities.create']"- :project="project"- >- <NButton- type="primary"- class="capitalize"- :disabled="slotProps.disabled || !allowEdit"- @click="handleCreateWorkloadIdentity"- >- <template #icon>- <PlusIcon class="h-5 w-5" />- </template>- {{ $t("settings.members.add-workload-identity") }}- </NButton>- </PermissionGuardWrapper>- </div>-- <PagedTable- ref="workloadIdentityPagedTable"- :session-key="sessionKey"- :fetch-list="fetchWorkloadIdentityList"- :footer-class="'mx-4'"- >- <template #table="{ list, loading }">- <UserDataTable- :show-roles="false"- :show-groups="false"- :user-list="list"- :loading="loading"- @user-selected="handleWorkloadIdentitySelected"- @user-updated="handleWorkloadIdentityUpdated"- />- </template>- </PagedTable>-- <div class="px-4">- <NCheckbox v-model:checked="state.showInactiveList">- <span class="textinfolabel">- {{ $t("settings.members.show-inactive") }}- </span>- </NCheckbox>- </div>-- <template v-if="state.showInactiveList">- <div class="flex justify-between items-center mt-2 px-4 pb-2">- <p class="text-lg font-medium leading-7">- <span>{{- $t("settings.members.inactive-workload-identities")- }}</span>- </p>- </div>-- <PagedTable- ref="deletedWorkloadIdentityPagedTable"- :session-key="deletedSessionKey"- :fetch-list="fetchInactiveWorkloadIdentityList"- :footer-class="'mx-4'"- >- <template #table="{ list, loading }">- <UserDataTable- :loading="loading"- :show-roles="false"- :show-groups="false"- :user-list="list"- @user-updated="handleWorkloadIdentityRestore"- />- </template>- </PagedTable>- </template>- </div>-- <CreateWorkloadIdentityDrawer- v-if="state.showCreateDrawer"- :workload-identity="state.editingWorkloadIdentity"- :project="project?.name"- @close="- () => {- state.showCreateDrawer = false;- state.editingWorkloadIdentity = undefined;- }- "- @created="wi => handleWorkloadIdentityUpdated(workloadIdentityToUser(wi))"- @updated="wi => handleWorkloadIdentityUpdated(workloadIdentityToUser(wi))"- />-</template>--<script setup lang="ts">-import { PlusIcon } from "lucide-vue-next";-import { NButton, NCheckbox } from "naive-ui";-import { computed, reactive, ref } from "vue";-import type { ComponentExposed } from "vue-component-type-helpers";-import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";-import CreateWorkloadIdentityDrawer from "@/components/User/Settings/CreateWorkloadIdentityDrawer.vue";-import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";-import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useActuatorV1Store, useCurrentProjectV1 } from "@/store";-import {- useWorkloadIdentityStore,- workloadIdentityToUser,-} from "@/store/modules/workloadIdentity";-import { isValidProjectName } from "@/types";-import { State } from "@/types/proto-es/v1/common_pb";-import type { User } from "@/types/proto-es/v1/user_service_pb";-import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";--type LocalState = {- showInactiveList: boolean;- showCreateDrawer: boolean;- editingWorkloadIdentity?: WorkloadIdentity;-};--const state = reactive<LocalState>({- showInactiveList: false,- showCreateDrawer: false,-});--const workloadIdentityStore = useWorkloadIdentityStore();-const workloadIdentityPagedTable =- ref<ComponentExposed<typeof PagedTable<User>>>();-const deletedWorkloadIdentityPagedTable =- ref<ComponentExposed<typeof PagedTable<User>>>();--const { project: currentProject } = useCurrentProjectV1();-const project = computed(() =>- isValidProjectName(currentProject.value.name)- ? currentProject.value- : undefined-);--const sessionKey = computed(- () =>- `bb.paged-workload-identity-table${project.value ? `.${project.value.name}` : ""}.active`-);--const deletedSessionKey = computed(- () =>- `bb.paged-workload-identity-table${project.value ? `.${project.value.name}` : ""}.deleted`-);--const parent = computed(- () => project.value?.name ?? useActuatorV1Store().workspaceResourceName-);--const allowEdit = computed(() => {- if (!project.value) {- return true;- }- return project.value.state === State.ACTIVE;-});--const fetchWorkloadIdentityList = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const response = await workloadIdentityStore.listWorkloadIdentities({- parent: parent.value,- pageSize,- pageToken,- showDeleted: false,- });- const users: User[] = response.workloadIdentities.map(workloadIdentityToUser);- return { list: users, nextPageToken: response.nextPageToken };-};--const fetchInactiveWorkloadIdentityList = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const response = await workloadIdentityStore.listWorkloadIdentities({- parent: parent.value,- pageSize,- pageToken,- showDeleted: true,- filter: {- state: State.DELETED,- },- });- const users: User[] = response.workloadIdentities.map(workloadIdentityToUser);- return { list: users, nextPageToken: response.nextPageToken };-};--const handleCreateWorkloadIdentity = () => {- state.editingWorkloadIdentity = undefined;- state.showCreateDrawer = true;-};--const handleWorkloadIdentitySelected = (user: User) => {- // Look up the original WorkloadIdentity from the store to get the config- const wi = workloadIdentityStore.getWorkloadIdentity(user.email);- state.editingWorkloadIdentity = wi;- state.showCreateDrawer = true;-};--const handleWorkloadIdentityUpdated = (user: User) => {- if (user.state === State.DELETED) {- return handleWorkloadIdentityArchived(user);- }- return workloadIdentityPagedTable.value?.updateCache([user]);-};--const handleWorkloadIdentityRestore = (user: User) => {- if (user.state !== State.ACTIVE) {- return;- }- deletedWorkloadIdentityPagedTable.value?.removeCache(user);- workloadIdentityPagedTable.value?.refresh();-};--const handleWorkloadIdentityArchived = (user: User) => {- if (user.state !== State.DELETED) {- return;- }- workloadIdentityPagedTable.value?.removeCache(user);- deletedWorkloadIdentityPagedTable.value?.refresh();-};-</script>diff --git a/frontend/src/react/LandingPageMount.vue b/frontend/src/react/LandingPageMount.vueindex c22b857735..e44d3bae64 100644--- a/frontend/src/react/LandingPageMount.vue+++ b/frontend/src/react/LandingPageMount.vue@@ -1,5 +1,5 @@<template>- <div ref="container" class="h-full" />+ <ReactPageMount page="LandingPage" v-bind="pageProps" /><ProjectSwitchModal:show="showProjectModal"@dismiss="showProjectModal = false"@@ -7,43 +7,15 @@</template><script lang="ts" setup>-import { onMounted, onUnmounted, ref, watch } from "vue";-import { useI18n } from "vue-i18n";+import { ref } from "vue";import ProjectSwitchModal from "@/components/Project/ProjectSwitch/ProjectSwitchModal.vue";--const { locale } = useI18n();-const container = ref<HTMLElement>();-// biome-ignore lint/suspicious/noExplicitAny: React Root type from dynamic import-let root: any = null; // eslint-disable-line @typescript-eslint/no-explicit-any+import ReactPageMount from "./ReactPageMount.vue";const showProjectModal = ref(false);-const props = {+const pageProps = {onOpenProjectSwitch: () => {showProjectModal.value = true;},};--async function render() {- if (!container.value) return;- const [{ mountReactPage, updateReactPage }, i18nModule] = await Promise.all([- import("./mount"),- import("./i18n"),- ]);- if (i18nModule.default.language !== locale.value) {- await i18nModule.default.changeLanguage(locale.value);- }- if (!root) {- root = await mountReactPage(container.value, "LandingPage", props);- } else {- await updateReactPage(root, "LandingPage", props);- }-}--onMounted(() => render());-watch(locale, () => render());-onUnmounted(() => {- root?.unmount();- root = null;-});</script>diff --git a/frontend/src/react/SubscriptionPageMount.vue b/frontend/src/react/SubscriptionPageMount.vueindex 2bd97edace..8290f8f602 100644--- a/frontend/src/react/SubscriptionPageMount.vue+++ b/frontend/src/react/SubscriptionPageMount.vue@@ -1,5 +1,5 @@<template>- <div ref="container" />+ <ReactPageMount page="SubscriptionPage" v-bind="pageProps" /><InstanceAssignment:show="showInstanceAssignmentDrawer"@dismiss="showInstanceAssignmentDrawer = false"@@ -7,19 +7,14 @@</template><script lang="ts" setup>-import { onMounted, onUnmounted, ref, watch } from "vue";-import { useI18n } from "vue-i18n";+import { ref } from "vue";import InstanceAssignment from "@/components/InstanceAssignment.vue";import { ENTERPRISE_INQUIRE_LINK } from "@/types";--const { locale } = useI18n();-const container = ref<HTMLElement>();-// biome-ignore lint/suspicious/noExplicitAny: React Root type from dynamic import-let root: any = null; // eslint-disable-line @typescript-eslint/no-explicit-any+import ReactPageMount from "./ReactPageMount.vue";const showInstanceAssignmentDrawer = ref(false);-const props = {+const pageProps = {onRequireEnterprise: () => {window.open(ENTERPRISE_INQUIRE_LINK, "_blank");},@@ -27,27 +22,4 @@ const props = {showInstanceAssignmentDrawer.value = true;},};--async function render() {- if (!container.value) return;- const [{ mountReactPage, updateReactPage }, i18nModule] = await Promise.all([- import("./mount"),- import("./i18n"),- ]);- if (i18nModule.default.language !== locale.value) {- await i18nModule.default.changeLanguage(locale.value);- }- if (!root) {- root = await mountReactPage(container.value, "SubscriptionPage", props);- } else {- await updateReactPage(root, "SubscriptionPage", props);- }-}--onMounted(() => render());-watch(locale, () => render());-onUnmounted(() => {- root?.unmount();- root = null;-});</script>diff --git a/frontend/src/react/components/CreateWorkloadIdentityDrawer.tsx b/frontend/src/react/components/CreateWorkloadIdentityDrawer.tsxindex 5fd94bb376..760180ca86 100644--- a/frontend/src/react/components/CreateWorkloadIdentityDrawer.tsx+++ b/frontend/src/react/components/CreateWorkloadIdentityDrawer.tsx@@ -8,6 +8,7 @@ import { Input } from "@/react/components/ui/input";import { useEscapeKey } from "@/react/hooks/useEscapeKey";import { useVueState } from "@/react/hooks/useVueState";import { RoleMultiSelect } from "@/react/pages/settings/shared/RoleMultiSelect";+import { updateProjectIamPolicyForMember } from "@/react/pages/settings/shared/updateProjectIamPolicyForMember";import {ensureWorkloadIdentityFullName,pushNotification,@@ -21,7 +22,6 @@ import {getWorkloadIdentityNameInBinding,getWorkloadIdentitySuffix,} from "@/types";-import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";import {WorkloadIdentityConfig_ProviderType,@@ -234,35 +234,6 @@ export function CreateWorkloadIdentityDrawer({}};- const updateProjectIamPolicyForMember = async (- projectName: string,- member: string,- newRoles: string[]- ) => {- const policy = structuredClone(- projectIamPolicyStore.getProjectIamPolicy(projectName)- );- for (const binding of policy.bindings) {- binding.members = binding.members.filter((m) => m !== member);- }- policy.bindings = policy.bindings.filter(- (binding) => binding.members.length > 0- );- for (const role of newRoles) {- const existing = policy.bindings.find((b) => b.role === role);- if (existing) {- if (!existing.members.includes(member)) {- existing.members.push(member);- }- } else {- policy.bindings.push(- create(BindingSchema, { role, members: [member] })- );- }- }- await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);- };-const handleCreate = async () => {const wi = await workloadIdentityStore.createWorkloadIdentity(emailPrefix,@@ -282,6 +253,7 @@ export function CreateWorkloadIdentityDrawer({const member = getWorkloadIdentityNameInBinding(wi.email);if (projectEntity) {await updateProjectIamPolicyForMember(+ projectIamPolicyStore,projectEntity.name,member,rolesdiff --git a/frontend/src/react/pages/settings/ServiceAccountsPage.tsx b/frontend/src/react/pages/settings/ServiceAccountsPage.tsxindex d4e72df7ec..14896641b2 100644--- a/frontend/src/react/pages/settings/ServiceAccountsPage.tsx+++ b/frontend/src/react/pages/settings/ServiceAccountsPage.tsx@@ -12,22 +12,27 @@ import {ensureServiceAccountFullName,pushNotification,useActuatorV1Store,+ useProjectV1Store,useWorkspaceV1Store,} from "@/store";import {serviceAccountToUser,useServiceAccountStore,} from "@/store/modules/serviceAccount";+import { projectNamePrefix } from "@/store/modules/v1/common";+import { useProjectIamPolicyStore } from "@/store/modules/v1/projectIamPolicy";import {getServiceAccountNameInBinding,getServiceAccountSuffix,} from "@/types";import { State } from "@/types/proto-es/v1/common_pb";+import type { Project } from "@/types/proto-es/v1/project_service_pb";import type { ServiceAccount } from "@/types/proto-es/v1/service_account_service_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";-import { hasWorkspacePermissionV2 } from "@/utils";+import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";import { RoleMultiSelect } from "./shared/RoleMultiSelect";import { UserAvatar } from "./shared/UserAvatar";+import { updateProjectIamPolicyForMember } from "./shared/updateProjectIamPolicyForMember";import { PagedTableFooter, usePagedData } from "./shared/usePagedData";// ============================================================@@ -36,10 +41,12 @@ import { PagedTableFooter, usePagedData } from "./shared/usePagedData";function ServiceAccountTable({users,+ project,onUserUpdated,onUserSelected,}: {users: User[];+ project?: Project;onUserUpdated: (user: User) => void;onUserSelected?: (user: User) => void;}) {@@ -247,9 +254,14 @@ function ServiceAccountTable({<div className="flex justify-end gap-x-1">{!isDeleted && (<>- {hasWorkspacePermissionV2(- "bb.serviceAccounts.delete"- ) && (+ {(project+ ? hasProjectPermissionV2(+ project,+ "bb.serviceAccounts.delete"+ )+ : hasWorkspacePermissionV2(+ "bb.serviceAccounts.delete"+ )) && (<Tooltipcontent={t("settings.members.action.deactivate-confirm-title"@@ -265,7 +277,14 @@ function ServiceAccountTable({</Button></Tooltip>)}- {hasWorkspacePermissionV2("bb.serviceAccounts.get") && (+ {(project+ ? hasProjectPermissionV2(+ project,+ "bb.serviceAccounts.get"+ )+ : hasWorkspacePermissionV2(+ "bb.serviceAccounts.get"+ )) && (<Tooltip content={t("common.edit")}><Buttonvariant="ghost"@@ -280,9 +299,14 @@ function ServiceAccountTable({</>)}{isDeleted &&- hasWorkspacePermissionV2(- "bb.serviceAccounts.undelete"- ) && (+ (project+ ? hasProjectPermissionV2(+ project,+ "bb.serviceAccounts.undelete"+ )+ : hasWorkspacePermissionV2(+ "bb.serviceAccounts.undelete"+ )) && (<Tooltipcontent={t("settings.members.action.reactivate-confirm-title"@@ -315,11 +339,13 @@ function ServiceAccountTable({function CreateServiceAccountDrawer({serviceAccount,+ project,onClose,onCreated,onUpdated,}: {serviceAccount: ServiceAccount | undefined;+ project?: string;onClose: () => void;onCreated: (sa: ServiceAccount) => void;onUpdated: (sa: ServiceAccount) => void;@@ -328,8 +354,16 @@ function CreateServiceAccountDrawer({const serviceAccountStore = useServiceAccountStore();const workspaceStore = useWorkspaceV1Store();const actuatorStore = useActuatorV1Store();+ const projectStore = useProjectV1Store();+ const projectIamPolicyStore = useProjectIamPolicyStore();- const parent = useVueState(() => actuatorStore.workspaceResourceName);+ const projectEntity = useVueState(() =>+ project ? projectStore.getProjectByName(project) : undefined+ );++ const parent = useVueState(+ () => project ?? actuatorStore.workspaceResourceName+ );const isEditMode = !!serviceAccount && !!serviceAccount.email;const emailSuffix = getServiceAccountSuffix();@@ -345,9 +379,12 @@ function CreateServiceAccountDrawer({const allowConfirm = isEditMode ? true : emailPrefix.trim().length > 0;- const hasPermission = hasWorkspacePermissionV2(- isEditMode ? "bb.serviceAccounts.update" : "bb.serviceAccounts.create"- );+ const requiredPermission = isEditMode+ ? "bb.serviceAccounts.update"+ : "bb.serviceAccounts.create";+ const hasPermission = projectEntity+ ? hasProjectPermissionV2(projectEntity, requiredPermission)+ : hasWorkspacePermissionV2(requiredPermission);const handleSubmit = async () => {if (!allowConfirm || !hasPermission) return;@@ -373,12 +410,17 @@ function CreateServiceAccountDrawer({);if (roles.length > 0) {- await workspaceStore.patchIamPolicy([- {- member: getServiceAccountNameInBinding(sa.email),- roles,- },- ]);+ const member = getServiceAccountNameInBinding(sa.email);+ if (projectEntity) {+ await updateProjectIamPolicyForMember(+ projectIamPolicyStore,+ projectEntity.name,+ member,+ roles+ );+ } else {+ await workspaceStore.patchIamPolicy([{ member, roles }]);+ }}onCreated(sa);@@ -491,7 +533,12 @@ function CreateServiceAccountDrawer({{/* Roles (create mode only) */}{!isEditMode &&- hasWorkspacePermissionV2("bb.workspaces.setIamPolicy") && (+ (projectEntity+ ? hasProjectPermissionV2(+ projectEntity,+ "bb.projects.setIamPolicy"+ )+ : hasWorkspacePermissionV2("bb.workspaces.setIamPolicy")) && (<div className="flex flex-col gap-y-2"><label className="block text-sm font-medium text-control">{t("settings.members.table.roles")}@@ -500,6 +547,7 @@ function CreateServiceAccountDrawer({value={roles}onChange={setRoles}disabled={false}+ scope={project ? "project" : undefined}/></div>)}@@ -527,12 +575,22 @@ function CreateServiceAccountDrawer({// ServiceAccountsPage (main)// ============================================================-export function ServiceAccountsPage() {+export function ServiceAccountsPage({ projectId }: { projectId?: string }) {const { t } = useTranslation();const actuatorStore = useActuatorV1Store();const serviceAccountStore = useServiceAccountStore();+ const projectStore = useProjectV1Store();- const parent = useVueState(() => actuatorStore.workspaceResourceName);+ const projectName = projectId+ ? `${projectNamePrefix}${projectId}`+ : undefined;+ const project = useVueState(() =>+ projectName ? projectStore.getProjectByName(projectName) : undefined+ );++ const parent = useVueState(+ () => projectName ?? actuatorStore.workspaceResourceName+ );const [showInactive, setShowInactive] = useState(false);const [showDrawer, setShowDrawer] = useState(false);@@ -556,7 +614,7 @@ export function ServiceAccountsPage() {);const activeData = usePagedData<User>({- sessionKey: "bb.service-accounts.active.page-size",+ sessionKey: `bb.service-accounts${projectName ? `.${projectName}` : ""}.active.page-size`,fetchList: fetchActive,});@@ -577,7 +635,7 @@ export function ServiceAccountsPage() {);const inactiveData = usePagedData<User>({- sessionKey: "bb.service-accounts.inactive.page-size",+ sessionKey: `bb.service-accounts${projectName ? `.${projectName}` : ""}.inactive.page-size`,enabled: showInactive,fetchList: fetchInactive,});@@ -622,7 +680,11 @@ export function ServiceAccountsPage() {{t("settings.members.service-accounts")}</h2><Button- disabled={!hasWorkspacePermissionV2("bb.serviceAccounts.create")}+ disabled={+ project+ ? !hasProjectPermissionV2(project, "bb.serviceAccounts.create")+ : !hasWorkspacePermissionV2("bb.serviceAccounts.create")+ }onClick={() => {setEditingSa(undefined);setShowDrawer(true);@@ -643,6 +705,7 @@ export function ServiceAccountsPage() {<><ServiceAccountTableusers={activeData.dataList}+ project={project}onUserUpdated={handleActiveUserUpdated}onUserSelected={handleOpenEdit}/>@@ -684,6 +747,7 @@ export function ServiceAccountsPage() {<><ServiceAccountTableusers={inactiveData.dataList}+ project={project}onUserUpdated={handleInactiveUserUpdated}/><PagedTableFooter@@ -703,6 +767,7 @@ export function ServiceAccountsPage() {{showDrawer && (<CreateServiceAccountDrawerserviceAccount={editingSa}+ project={projectName}onClose={() => {setShowDrawer(false);setEditingSa(undefined);diff --git a/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx b/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsxindex f676f89ccd..0b05b0c9d4 100644--- a/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx+++ b/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx@@ -1,7 +1,6 @@import { Pencil, Plus, Trash2, Undo2 } from "lucide-react";import { useCallback, useState } from "react";import { useTranslation } from "react-i18next";-import { ComponentPermissionGuard } from "@/react/components/ComponentPermissionGuard";import { CreateWorkloadIdentityDrawer } from "@/react/components/CreateWorkloadIdentityDrawer";import { Button } from "@/react/components/ui/button";import { Tooltip } from "@/react/components/ui/tooltip";@@ -10,15 +9,18 @@ import {ensureWorkloadIdentityFullName,pushNotification,useActuatorV1Store,+ useProjectV1Store,} from "@/store";+import { projectNamePrefix } from "@/store/modules/v1/common";import {useWorkloadIdentityStore,workloadIdentityToUser,} from "@/store/modules/workloadIdentity";import { State } from "@/types/proto-es/v1/common_pb";+import type { Project } from "@/types/proto-es/v1/project_service_pb";import type { User } from "@/types/proto-es/v1/user_service_pb";import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";-import { hasWorkspacePermissionV2 } from "@/utils";+import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";import { UserAvatar } from "./shared/UserAvatar";import { PagedTableFooter, usePagedData } from "./shared/usePagedData";@@ -28,10 +30,12 @@ import { PagedTableFooter, usePagedData } from "./shared/usePagedData";function WorkloadIdentityTable({users,+ project,onUserUpdated,onUserSelected,}: {users: User[];+ project?: Project;onUserUpdated: (user: User) => void;onUserSelected?: (user: User) => void;}) {@@ -131,9 +135,14 @@ function WorkloadIdentityTable({<div className="flex justify-end gap-x-1">{!isDeleted && (<>- {hasWorkspacePermissionV2(- "bb.workloadIdentities.delete"- ) && (+ {(project+ ? hasProjectPermissionV2(+ project,+ "bb.workloadIdentities.delete"+ )+ : hasWorkspacePermissionV2(+ "bb.workloadIdentities.delete"+ )) && (<Tooltipcontent={t("settings.members.action.deactivate-confirm-title"@@ -149,9 +158,14 @@ function WorkloadIdentityTable({</Button></Tooltip>)}- {hasWorkspacePermissionV2(- "bb.workloadIdentities.get"- ) &&+ {(project+ ? hasProjectPermissionV2(+ project,+ "bb.workloadIdentities.get"+ )+ : hasWorkspacePermissionV2(+ "bb.workloadIdentities.get"+ )) &&onUserSelected && (<Tooltip content={t("common.edit")}><Button@@ -167,9 +181,14 @@ function WorkloadIdentityTable({</>)}{isDeleted &&- hasWorkspacePermissionV2(- "bb.workloadIdentities.undelete"- ) && (+ (project+ ? hasProjectPermissionV2(+ project,+ "bb.workloadIdentities.undelete"+ )+ : hasWorkspacePermissionV2(+ "bb.workloadIdentities.undelete"+ )) && (<Tooltipcontent={t("settings.members.action.reactivate-confirm-title"@@ -200,13 +219,21 @@ function WorkloadIdentityTable({// WorkloadIdentitiesPage (main)// ============================================================-export function WorkloadIdentitiesPage() {+export function WorkloadIdentitiesPage({ projectId }: { projectId?: string }) {const { t } = useTranslation();const workloadIdentityStore = useWorkloadIdentityStore();const actuatorStore = useActuatorV1Store();+ const projectStore = useProjectV1Store();- const workspaceResourceName = useVueState(- () => actuatorStore.workspaceResourceName+ const projectName = projectId+ ? `${projectNamePrefix}${projectId}`+ : undefined;+ const project = useVueState(() =>+ projectName ? projectStore.getProjectByName(projectName) : undefined+ );++ const parent = useVueState(+ () => projectName ?? actuatorStore.workspaceResourceName);const [showInactive, setShowInactive] = useState(false);@@ -218,7 +245,7 @@ export function WorkloadIdentitiesPage() {const fetchActive = useCallback(async (params: { pageSize: number; pageToken: string }) => {const response = await workloadIdentityStore.listWorkloadIdentities({- parent: workspaceResourceName,+ parent,pageSize: params.pageSize,pageToken: params.pageToken,showDeleted: false,@@ -228,13 +255,13 @@ export function WorkloadIdentitiesPage() {nextPageToken: response.nextPageToken,};},- [workloadIdentityStore, workspaceResourceName]+ [workloadIdentityStore, parent]);const fetchInactive = useCallback(async (params: { pageSize: number; pageToken: string }) => {const response = await workloadIdentityStore.listWorkloadIdentities({- parent: workspaceResourceName,+ parent,pageSize: params.pageSize,pageToken: params.pageToken,showDeleted: true,@@ -245,16 +272,16 @@ export function WorkloadIdentitiesPage() {nextPageToken: response.nextPageToken,};},- [workloadIdentityStore, workspaceResourceName]+ [workloadIdentityStore, parent]);const activeData = usePagedData<User>({- sessionKey: "bb.paged-workload-identity-table.active",+ sessionKey: `bb.paged-workload-identity-table${projectName ? `.${projectName}` : ""}.active`,fetchList: fetchActive,});const inactiveData = usePagedData<User>({- sessionKey: "bb.paged-workload-identity-table.deleted",+ sessionKey: `bb.paged-workload-identity-table${projectName ? `.${projectName}` : ""}.deleted`,fetchList: fetchInactive,enabled: showInactive,});@@ -291,7 +318,11 @@ export function WorkloadIdentitiesPage() {{t("settings.members.workload-identities")}</p><Button- disabled={!hasWorkspacePermissionV2("bb.workloadIdentities.create")}+ disabled={+ project+ ? !hasProjectPermissionV2(project, "bb.workloadIdentities.create")+ : !hasWorkspacePermissionV2("bb.workloadIdentities.create")+ }onClick={() => {setEditingWI(undefined);setShowDrawer(true);@@ -303,29 +334,28 @@ export function WorkloadIdentitiesPage() {</div><div className="flex flex-col gap-y-4 px-4">- <ComponentPermissionGuard permissions={["bb.workloadIdentities.list"]}>- {activeData.isLoading && activeData.dataList.length === 0 ? (- <div className="flex items-center justify-center h-32">- <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />- </div>- ) : (- <>- <WorkloadIdentityTable- users={activeData.dataList}- onUserUpdated={handleActiveUpdated}- onUserSelected={handleUserSelected}- />- <PagedTableFooter- pageSize={activeData.pageSize}- pageSizeOptions={activeData.pageSizeOptions}- onPageSizeChange={activeData.onPageSizeChange}- hasMore={activeData.hasMore}- isFetchingMore={activeData.isFetchingMore}- onLoadMore={activeData.loadMore}- />- </>- )}- </ComponentPermissionGuard>+ {activeData.isLoading && activeData.dataList.length === 0 ? (+ <div className="flex items-center justify-center h-32">+ <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />+ </div>+ ) : (+ <>+ <WorkloadIdentityTable+ users={activeData.dataList}+ project={project}+ onUserUpdated={handleActiveUpdated}+ onUserSelected={handleUserSelected}+ />+ <PagedTableFooter+ pageSize={activeData.pageSize}+ pageSizeOptions={activeData.pageSizeOptions}+ onPageSizeChange={activeData.onPageSizeChange}+ hasMore={activeData.hasMore}+ isFetchingMore={activeData.isFetchingMore}+ onLoadMore={activeData.loadMore}+ />+ </>+ )}{/* Show inactive toggle */}<label className="flex items-center gap-x-2 text-sm cursor-pointer">@@ -353,6 +383,7 @@ export function WorkloadIdentitiesPage() {<><WorkloadIdentityTableusers={inactiveData.dataList}+ project={project}onUserUpdated={handleInactiveUpdated}/><PagedTableFooter@@ -372,6 +403,7 @@ export function WorkloadIdentitiesPage() {{showDrawer && (<CreateWorkloadIdentityDrawerworkloadIdentity={editingWI}+ project={projectName}onClose={() => {setShowDrawer(false);setEditingWI(undefined);diff --git a/frontend/src/react/pages/settings/shared/RoleMultiSelect.tsx b/frontend/src/react/pages/settings/shared/RoleMultiSelect.tsxindex fea4513fd4..241eb4c4cf 100644--- a/frontend/src/react/pages/settings/shared/RoleMultiSelect.tsx+++ b/frontend/src/react/pages/settings/shared/RoleMultiSelect.tsx@@ -18,10 +18,12 @@ export function RoleMultiSelect({value,onChange,disabled,+ scope,}: {value: string[];onChange: (roles: string[]) => void;disabled?: boolean;+ scope?: "project";}) {const { t } = useTranslation();const roleStore = useRoleStore();@@ -54,7 +56,7 @@ export function RoleMultiSelect({.filter(matchRole);const result: { label: string; roles: string[] }[] = [];- if (workspace.length > 0)+ if (scope !== "project" && workspace.length > 0)result.push({label: t("role.workspace-roles.self"),roles: workspace,@@ -64,7 +66,7 @@ export function RoleMultiSelect({if (custom.length > 0)result.push({ label: t("role.custom-roles.self"), roles: custom });return result;- }, [roleList, search, t]);+ }, [roleList, search, scope, t]);const isCustomRole = (name: string) => !PRESET_ROLES.includes(name);diff --git a/frontend/src/react/pages/settings/shared/updateProjectIamPolicyForMember.ts b/frontend/src/react/pages/settings/shared/updateProjectIamPolicyForMember.tsnew file mode 100644index 0000000000..10632bc5a9--- /dev/null+++ b/frontend/src/react/pages/settings/shared/updateProjectIamPolicyForMember.ts@@ -0,0 +1,31 @@+import { create } from "@bufbuild/protobuf";+import { useProjectIamPolicyStore } from "@/store/modules/v1/projectIamPolicy";+import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";++export async function updateProjectIamPolicyForMember(+ projectIamPolicyStore: ReturnType<typeof useProjectIamPolicyStore>,+ projectName: string,+ member: string,+ newRoles: string[]+) {+ const policy = structuredClone(+ projectIamPolicyStore.getProjectIamPolicy(projectName)+ );+ for (const binding of policy.bindings) {+ binding.members = binding.members.filter((m) => m !== member);+ }+ policy.bindings = policy.bindings.filter(+ (binding) => binding.members.length > 0+ );+ for (const role of newRoles) {+ const existing = policy.bindings.find((b) => b.role === role);+ if (existing) {+ if (!existing.members.includes(member)) {+ existing.members.push(member);+ }+ } else {+ policy.bindings.push(create(BindingSchema, { role, members: [member] }));+ }+ }+ await projectIamPolicyStore.updateProjectIamPolicy(projectName, policy);+}diff --git a/frontend/src/router/dashboard/projectV1.ts b/frontend/src/router/dashboard/projectV1.tsindex 74e9091084..eaedb6c001 100644--- a/frontend/src/router/dashboard/projectV1.ts+++ b/frontend/src/router/dashboard/projectV1.ts@@ -360,9 +360,11 @@ const projectV1Routes: RouteRecordRaw[] = [title: () => t("settings.members.service-accounts"),requiredPermissionList: () => ["bb.serviceAccounts.list"],},- component: () =>- import("@/components/User/Settings/ServiceAccountPanel.vue"),- props: true,+ component: () => import("@/react/ReactPageMount.vue"),+ props: (route: RouteLocationNormalized) => ({+ page: "ServiceAccountsPage",+ ...route.params,+ }),},{path: "workload-identities",@@ -371,9 +373,11 @@ const projectV1Routes: RouteRecordRaw[] = [title: () => t("settings.members.workload-identities"),requiredPermissionList: () => ["bb.workloadIdentities.list"],},- component: () =>- import("@/components/User/Settings/WorkloadIdentityPanel.vue"),- props: true,+ component: () => import("@/react/ReactPageMount.vue"),+ props: (route: RouteLocationNormalized) => ({+ page: "WorkloadIdentitiesPage",+ ...route.params,+ }),},{path: "settings",