Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

feat(frontend): separate tabs for Users, Service Accounts, Workload Identities in Workspace Members (#19127)

rebeliced86ab4948fcc
diff --git a/frontend/src/components/User/Settings/CreateUserDrawer.vue b/frontend/src/components/User/Settings/CreateUserDrawer.vue
index 12a398e26d..134b5565f0 100644
--- a/frontend/src/components/User/Settings/CreateUserDrawer.vue
+++ b/frontend/src/components/User/Settings/CreateUserDrawer.vue
@@ -463,6 +463,7 @@ interface LocalState {
const props = defineProps<{
user?: User;
+ initialUserType?: UserType;
}>();
const emit = defineEmits<{
@@ -582,6 +583,10 @@ watch(
() => props.user,
(user) => {
if (!user) {
+ // Apply initialUserType when creating a new user
+ if (props.initialUserType) {
+ state.user.userType = props.initialUserType;
+ }
return;
}
state.user = create(UserSchema, user);
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 094406a6df..a700f51004 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -452,7 +452,13 @@
"subscription": "(Upgrade to enable role management)"
},
"members": {
+ "service-accounts": "Service Accounts",
+ "add-service-account": "Add Service Account",
+ "workload-identities": "Workload Identities",
+ "add-workload-identity": "Add Workload Identity",
"inactive-users": "Inactive users",
+ "inactive-service-accounts": "Inactive service accounts",
+ "inactive-workload-identities": "Inactive workload identities",
"table": {
"account": "Account",
"role": "Role",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index cb1bff6c45..ebab8a24e5 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -452,7 +452,13 @@
"subscription": "(Actualice para habilitar la gestión de roles)"
},
"members": {
+ "service-accounts": "Cuentas de Servicio",
+ "add-service-account": "Añadir Cuenta de Servicio",
+ "workload-identities": "Identidades de Carga de Trabajo",
+ "add-workload-identity": "Añadir Identidad de Carga de Trabajo",
"inactive-users": "Usuarios inactivos",
+ "inactive-service-accounts": "Cuentas de servicio inactivas",
+ "inactive-workload-identities": "Identidades de carga de trabajo inactivas",
"table": {
"account": "Cuenta",
"role": "Rol",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index e312ac8882..4e0e924d43 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -452,7 +452,13 @@
"subscription": "(有料プランにアップグレードするとキャラクター管理が可能になります)"
},
"members": {
+ "service-accounts": "サービスアカウント",
+ "add-service-account": "サービスアカウントを追加",
+ "workload-identities": "ワークロードID",
+ "add-workload-identity": "ワークロードIDを追加",
"inactive-users": "非アクティブユーザー",
+ "inactive-service-accounts": "非アクティブサービスアカウント",
+ "inactive-workload-identities": "非アクティブワークロードID",
"table": {
"account": "アカウント",
"role": "役割",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index e0b66c065d..8132fb3189 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -452,7 +452,13 @@
"subscription": "(Nâng cấp để kích hoạt quản lý vai trò)"
},
"members": {
+ "service-accounts": "Tài khoản dịch vụ",
+ "add-service-account": "Thêm tài khoản dịch vụ",
+ "workload-identities": "Danh tính Workload",
+ "add-workload-identity": "Thêm danh tính Workload",
"inactive-users": "Người dùng không hoạt động",
+ "inactive-service-accounts": "Tài khoản dịch vụ không hoạt động",
+ "inactive-workload-identities": "Danh tính Workload không hoạt động",
"table": {
"account": "Tài khoản",
"role": "Vai trò",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index c99ba2bbfb..ed509467b1 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -452,7 +452,13 @@
"subscription": "(升级到付费方案来解锁角色管理)"
},
"members": {
+ "service-accounts": "服务账号",
+ "add-service-account": "添加服务账号",
+ "workload-identities": "工作负载身份",
+ "add-workload-identity": "添加工作负载身份",
"inactive-users": "未激活用户",
+ "inactive-service-accounts": "未激活服务账号",
+ "inactive-workload-identities": "未激活工作负载身份",
"table": {
"account": "账户",
"role": "角色",
diff --git a/frontend/src/store/modules/v1/actuator.ts b/frontend/src/store/modules/v1/actuator.ts
index 28ae46faca..3239492a71 100644
--- a/frontend/src/store/modules/v1/actuator.ts
+++ b/frontend/src/store/modules/v1/actuator.ts
@@ -111,7 +111,59 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
const inactiveUserCount = computed(() => {
return (serverInfo.value?.userStats ?? []).reduce((count, stat) => {
- if (stat.state === State.DELETED) {
+ if (
+ stat.state === State.DELETED &&
+ stat.userType !== UserType.SERVICE_ACCOUNT &&
+ stat.userType !== UserType.WORKLOAD_IDENTITY
+ ) {
+ count += stat.count;
+ }
+ return count;
+ }, 0);
+ });
+
+ const serviceAccountCount = computed(() => {
+ return (serverInfo.value?.userStats ?? []).reduce((count, stat) => {
+ if (
+ stat.state === State.ACTIVE &&
+ stat.userType === UserType.SERVICE_ACCOUNT
+ ) {
+ count += stat.count;
+ }
+ return count;
+ }, 0);
+ });
+
+ const workloadIdentityCount = computed(() => {
+ return (serverInfo.value?.userStats ?? []).reduce((count, stat) => {
+ if (
+ stat.state === State.ACTIVE &&
+ stat.userType === UserType.WORKLOAD_IDENTITY
+ ) {
+ count += stat.count;
+ }
+ return count;
+ }, 0);
+ });
+
+ const inactiveServiceAccountCount = computed(() => {
+ return (serverInfo.value?.userStats ?? []).reduce((count, stat) => {
+ if (
+ stat.state === State.DELETED &&
+ stat.userType === UserType.SERVICE_ACCOUNT
+ ) {
+ count += stat.count;
+ }
+ return count;
+ }, 0);
+ });
+
+ const inactiveWorkloadIdentityCount = computed(() => {
+ return (serverInfo.value?.userStats ?? []).reduce((count, stat) => {
+ if (
+ stat.state === State.DELETED &&
+ stat.userType === UserType.WORKLOAD_IDENTITY
+ ) {
count += stat.count;
}
return count;
@@ -275,6 +327,10 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {
totalInstanceCount,
replicaCount,
inactiveUserCount,
+ serviceAccountCount,
+ workloadIdentityCount,
+ inactiveServiceAccountCount,
+ inactiveWorkloadIdentityCount,
quickStartEnabled,
// Actions
getActiveUserCount,
diff --git a/frontend/src/views/SettingWorkspaceUsers.vue b/frontend/src/views/SettingWorkspaceUsers.vue
index 3366c6e701..e1d3eec2c9 100644
--- a/frontend/src/views/SettingWorkspaceUsers.vue
+++ b/frontend/src/views/SettingWorkspaceUsers.vue
@@ -37,6 +37,64 @@
</PagedTable>
</NTabPane>
+ <NTabPane name="SERVICE_ACCOUNTS">
+ <template #tab>
+ <div class="flex-1 flex gap-x-2">
+ <p class="text-base font-medium leading-7 text-main">
+ <span>{{ $t("settings.members.service-accounts") }}</span>
+ <span class="ml-1 font-normal text-control-light">
+ ({{ activeServiceAccountCount }})
+ </span>
+ </p>
+ </div>
+ </template>
+
+ <PagedTable
+ ref="serviceAccountPagedTable"
+ session-key="bb.paged-service-account-table.active"
+ :fetch-list="fetchServiceAccountList"
+ >
+ <template #table="{ list, loading }">
+ <UserDataTable
+ :show-roles="false"
+ :user-list="list"
+ :loading="loading"
+ @user-selected="handleUserSelected"
+ @user-updated="handleUserUpdated"
+ />
+ </template>
+ </PagedTable>
+ </NTabPane>
+
+ <NTabPane name="WORKLOAD_IDENTITIES">
+ <template #tab>
+ <div class="flex-1 flex gap-x-2">
+ <p class="text-base font-medium leading-7 text-main">
+ <span>{{ $t("settings.members.workload-identities") }}</span>
+ <span class="ml-1 font-normal text-control-light">
+ ({{ activeWorkloadIdentityCount }})
+ </span>
+ </p>
+ </div>
+ </template>
+
+ <PagedTable
+ ref="workloadIdentityPagedTable"
+ session-key="bb.paged-workload-identity-table.active"
+ :fetch-list="fetchWorkloadIdentityList"
+ >
+ <template #table="{ list, loading }">
+ <UserDataTable
+ :show-roles="false"
+ :user-list="list"
+ :loading="loading"
+ @user-selected="handleUserSelected"
+ @user-updated="handleUserUpdated"
+ />
+ </template>
+ </PagedTable>
+ </NTabPane>
+
<NTabPane name="GROUPS">
<template #tab>
<div>
@@ -65,95 +123,144 @@
<template #suffix>
<div class="flex items-center gap-x-2">
- <SearchBox v-model:value="state.activeUserFilterText" />
-
- <PermissionGuardWrapper
- v-slot="slotProps"
- :permissions="['bb.settings.get']"
- >
- <NButton
- class="capitalize"
- :disabled="!hasDirectorySyncFeature || slotProps.disabled"
- @click="
- () => {
- state.showAadSyncDrawer = true;
- }
- "
+ <SearchBox
+ v-if="state.typeTab !== 'GROUPS'"
+ v-model:value="state.activeUserFilterText"
+ />
+ <SearchBox v-else v-model:value="state.activeUserFilterText" />
+
+ <!-- USERS tab actions -->
+ <template v-if="state.typeTab === 'USERS'">
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.settings.get']"
+ >
+ <NButton
+ class="capitalize"
+ :disabled="!hasDirectorySyncFeature || slotProps.disabled"
+ @click="
+ () => {
+ state.showAadSyncDrawer = true;
+ }
+ "
+ >
+ <template #icon>
+ <SettingsIcon class="h-5 w-5" />
+ <FeatureBadge :feature="PlanFeature.FEATURE_DIRECTORY_SYNC" />
+ </template>
+ {{ $t(`settings.members.entra-sync.self`) }}
+ </NButton>
+ </PermissionGuardWrapper>
+
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.users.create']"
+ >
+ <NButton
+ type="primary"
+ class="capitalize"
+ :disabled="slotProps.disabled"
+ @click="handleCreateUser"
+ >
+ <template #icon>
+ <PlusIcon class="h-5 w-5" />
+ </template>
+ {{ $t(`settings.members.add-user`) }}
+ </NButton>
+ </PermissionGuardWrapper>
+ </template>
+
+ <!-- SERVICE_ACCOUNTS tab actions -->
+ <template v-if="state.typeTab === 'SERVICE_ACCOUNTS'">
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.users.create']"
>
- <template #icon>
- <SettingsIcon class="h-5 w-5" />
- <FeatureBadge :feature="PlanFeature.FEATURE_DIRECTORY_SYNC" />
- </template>
- {{ $t(`settings.members.entra-sync.self`) }}
- </NButton>
- </PermissionGuardWrapper>
-
- <PermissionGuardWrapper
- v-slot="slotProps"
- :permissions="['bb.groups.create']"
- >
- <NPopover
- :disabled="slotProps.disabled || settingV1Store.workspaceProfile.domains.length > 0"
+ <NButton
+ type="primary"
+ class="capitalize"
+ :disabled="slotProps.disabled"
+ @click="handleCreateServiceAccount"
+ >
+ <template #icon>
+ <PlusIcon class="h-5 w-5" />
+ </template>
+ {{ $t(`settings.members.add-service-account`) }}
+ </NButton>
+ </PermissionGuardWrapper>
+ </template>
+
+ <!-- WORKLOAD_IDENTITIES tab actions -->
+ <template v-if="state.typeTab === 'WORKLOAD_IDENTITIES'">
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.users.create']"
>
- <template #trigger>
- <NButton
- :disabled="
- slotProps.disabled ||
- settingV1Store.workspaceProfile.domains.length === 0 ||
- !hasUserGroupFeature
- "
- @click="handleCreateGroup"
- >
- <template #icon>
- <PlusIcon class="h-5 w-5" />
- <FeatureBadge :feature="PlanFeature.FEATURE_USER_GROUPS" />
- </template>
- {{ $t(`settings.members.groups.add-group`) }}
- </NButton>
- </template>
- <p>
- {{ $t("settings.members.groups.workspace-domain-required") }}
- <router-link
- :to="{
- name: SETTING_ROUTE_WORKSPACE_GENERAL,
- hash: '#domain-restriction',
- }"
- class="normal-link"
- >
- {{ $t("common.configure") }}
- </router-link>
- </p>
- </NPopover>
- </PermissionGuardWrapper>
-
- <PermissionGuardWrapper
- v-slot="slotProps"
- :permissions="['bb.users.create']"
- >
- <NButton
- type="primary"
- class="capitalize"
- :disabled="slotProps.disabled"
- @click="handleCreateUser"
+ <NButton
+ type="primary"
+ class="capitalize"
+ :disabled="slotProps.disabled"
+ @click="handleCreateWorkloadIdentity"
+ >
+ <template #icon>
+ <PlusIcon class="h-5 w-5" />
+ </template>
+ {{ $t(`settings.members.add-workload-identity`) }}
+ </NButton>
+ </PermissionGuardWrapper>
+ </template>
+
+ <!-- GROUPS tab actions -->
+ <template v-if="state.typeTab === 'GROUPS'">
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="['bb.groups.create']"
>
- <template #icon>
- <PlusIcon class="h-5 w-5" />
- </template>
- {{ $t(`settings.members.add-user`) }}
- </NButton>
- </PermissionGuardWrapper>
+ <NPopover
+ :disabled="slotProps.disabled || settingV1Store.workspaceProfile.domains.length > 0"
+ >
+ <template #trigger>
+ <NButton
+ :disabled="
+ slotProps.disabled ||
+ settingV1Store.workspaceProfile.domains.length === 0 ||
+ !hasUserGroupFeature
+ "
+ @click="handleCreateGroup"
+ >
+ <template #icon>
+ <PlusIcon class="h-5 w-5" />
+ <FeatureBadge :feature="PlanFeature.FEATURE_USER_GROUPS" />
+ </template>
+ {{ $t(`settings.members.groups.add-group`) }}
+ </NButton>
+ </template>
+ <p>
+ {{ $t("settings.members.groups.workspace-domain-required") }}
+ <router-link
+ :to="{
+ name: SETTING_ROUTE_WORKSPACE_GENERAL,
+ hash: '#domain-restriction',
+ }"
+ class="normal-link"
+ >
+ {{ $t("common.configure") }}
+ </router-link>
+ </p>
+ </NPopover>
+ </PermissionGuardWrapper>
+ </template>
</div>
</template>
</NTabs>
- <div>
- <div v-if="state.typeTab === 'USERS'">
- <NCheckbox v-model:checked="state.showInactiveUserList">
- <span class="textinfolabel">
- {{ $t("settings.members.show-inactive") }}
- </span>
- </NCheckbox>
- </div>
+ <!-- Inactive users section for USERS tab -->
+ <div v-if="state.typeTab === 'USERS'">
+ <NCheckbox v-model:checked="state.showInactiveUserList">
+ <span class="textinfolabel">
+ {{ $t("settings.members.show-inactive") }}
+ </span>
+ </NCheckbox>
<template v-if="state.showInactiveUserList">
<div class="flex justify-between items-center mt-2 mb-4">
@@ -185,14 +292,88 @@
</PagedTable>
</template>
</div>
+
+ <!-- Inactive service accounts section for SERVICE_ACCOUNTS tab -->
+ <div v-if="state.typeTab === 'SERVICE_ACCOUNTS'">
+ <NCheckbox v-model:checked="state.showInactiveServiceAccountList">
+ <span class="textinfolabel">
+ {{ $t("settings.members.show-inactive") }}
+ </span>
+ </NCheckbox>
+
+ <template v-if="state.showInactiveServiceAccountList">
+ <div class="flex justify-between items-center mt-2 mb-4">
+ <p class="text-lg font-medium leading-7">
+ <span>{{ $t("settings.members.inactive-service-accounts") }}</span>
+ <span class="ml-1 font-normal text-control-light">
+ ({{ inactiveServiceAccountCount }})
+ </span>
+ </p>
+ </div>
+
+ <PagedTable
+ ref="deletedServiceAccountPagedTable"
+ session-key="bb.paged-service-account-table.deleted"
+ :fetch-list="fetchInactiveServiceAccountList"
+ >
+ <template #table="{ list, loading }">
+ <UserDataTable
+ :loading="loading"
+ :show-roles="false"
+ :user-list="list"
+ @update-user="handleServiceAccountRestore"
+ />
+ </template>
+ </PagedTable>
+ </template>
+ </div>
+
+ <!-- Inactive workload identities section for WORKLOAD_IDENTITIES tab -->
+ <div v-if="state.typeTab === 'WORKLOAD_IDENTITIES'">
+ <NCheckbox v-model:checked="state.showInactiveWorkloadIdentityList">
+ <span class="textinfolabel">
+ {{ $t("settings.members.show-inactive") }}
+ </span>
+ </NCheckbox>
+
+ <template v-if="state.showInactiveWorkloadIdentityList">
+ <div class="flex justify-between items-center mt-2 mb-4">
+ <p class="text-lg font-medium leading-7">
+ <span>{{
+ $t("settings.members.inactive-workload-identities")
+ }}</span>
+ <span class="ml-1 font-normal text-control-light">
+ ({{ inactiveWorkloadIdentityCount }})
+ </span>
+ </p>
+ </div>
+
+ <PagedTable
+ ref="deletedWorkloadIdentityPagedTable"
+ session-key="bb.paged-workload-identity-table.deleted"
+ :fetch-list="fetchInactiveWorkloadIdentityList"
+ >
+ <template #table="{ list, loading }">
+ <UserDataTable
+ :loading="loading"
+ :show-roles="false"
+ :user-list="list"
+ @update-user="handleWorkloadIdentityRestore"
+ />
+ </template>
+ </PagedTable>
+ </template>
+ </div>
</div>
<CreateUserDrawer
v-if="state.showCreateUserDrawer"
:user="state.editingUser"
+ :initial-user-type="state.createUserType"
@close="() => {
state.showCreateUserDrawer = false
state.editingUser = undefined
+ state.createUserType = undefined
}"
@created="handleUserCreated"
/>
@@ -244,13 +425,26 @@ import {
useUIStateStore,
useUserStore,
} from "@/store";
+import {
+ serviceAccountToUser,
+ useServiceAccountStore,
+} from "@/store/modules/serviceAccount";
import { groupNamePrefix } from "@/store/modules/v1/common";
+import {
+ useWorkloadIdentityStore,
+ workloadIdentityToUser,
+} from "@/store/modules/workloadIdentity";
import { State } from "@/types/proto-es/v1/common_pb";
import type { Group } from "@/types/proto-es/v1/group_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";
-const tabList = ["USERS", "GROUPS"] as const;
+const tabList = [
+ "USERS",
+ "SERVICE_ACCOUNTS",
+ "WORKLOAD_IDENTITIES",
+ "GROUPS",
+] as const;
type MemberTab = (typeof tabList)[number];
const isMemberTab = (tab: unknown): tab is MemberTab =>
tabList.includes(tab as MemberTab);
@@ -261,11 +455,14 @@ type LocalState = {
activeUserFilterText: string;
inactiveUserFilterText: string;
showInactiveUserList: boolean;
+ showInactiveServiceAccountList: boolean;
+ showInactiveWorkloadIdentityList: boolean;
showCreateUserDrawer: boolean;
showCreateGroupDrawer: boolean;
showAadSyncDrawer: boolean;
editingGroup?: Group;
editingUser?: User;
+ createUserType?: UserType;
};
const state = reactive<LocalState>({
@@ -273,6 +470,8 @@ const state = reactive<LocalState>({
activeUserFilterText: "",
inactiveUserFilterText: "",
showInactiveUserList: false,
+ showInactiveServiceAccountList: false,
+ showInactiveWorkloadIdentityList: false,
showCreateUserDrawer: false,
showCreateGroupDrawer: false,
showAadSyncDrawer: false,
@@ -283,11 +482,21 @@ const route = useRoute();
const router = useRouter();
const userStore = useUserStore();
const groupStore = useGroupStore();
+const serviceAccountStore = useServiceAccountStore();
+const workloadIdentityStore = useWorkloadIdentityStore();
const uiStateStore = useUIStateStore();
const actuatorStore = useActuatorV1Store();
const settingV1Store = useSettingV1Store();
const subscriptionV1Store = useSubscriptionV1Store();
const userPagedTable = ref<ComponentExposed<typeof PagedTable<User>>>();
+const serviceAccountPagedTable =
+ ref<ComponentExposed<typeof PagedTable<User>>>();
+const workloadIdentityPagedTable =
+ ref<ComponentExposed<typeof PagedTable<User>>>();
+const deletedServiceAccountPagedTable =
+ ref<ComponentExposed<typeof PagedTable<User>>>();
+const deletedWorkloadIdentityPagedTable =
+ ref<ComponentExposed<typeof PagedTable<User>>>();
const groupPagedTable = ref<ComponentExposed<typeof PagedTable<Group>>>();
const deletedUserPagedTable = ref<ComponentExposed<typeof PagedTable<User>>>();
const expandedKeys = ref<string[]>([]);
@@ -343,16 +552,89 @@ const fetchUserList = async ({
pageSize,
filter: {
query: state.activeUserFilterText,
+ types: [UserType.USER, UserType.SYSTEM_BOT],
},
});
return { list: users, nextPageToken };
};
+const fetchServiceAccountList = async ({
+ pageToken,
+ pageSize,
+}: {
+ pageToken: string;
+ pageSize: number;
+}) => {
+ const response = await serviceAccountStore.listServiceAccounts(
+ pageSize,
+ pageToken,
+ false
+ );
+ const users: User[] = response.serviceAccounts.map(serviceAccountToUser);
+ return { list: users, nextPageToken: response.nextPageToken };
+};
+
+const fetchWorkloadIdentityList = async ({
+ pageToken,
+ pageSize,
+}: {
+ pageToken: string;
+ pageSize: number;
+}) => {
+ const response = await workloadIdentityStore.listWorkloadIdentities(
+ pageSize,
+ pageToken,
+ false
+ );
+ const users: User[] = response.workloadIdentities.map(workloadIdentityToUser);
+ return { list: users, nextPageToken: response.nextPageToken };
+};
+
+const fetchInactiveServiceAccountList = async ({
+ pageToken,
+ pageSize,
+}: {
+ pageToken: string;
+ pageSize: number;
+}) => {
+ const response = await serviceAccountStore.listServiceAccounts(
+ pageSize,
+ pageToken,
+ true
+ );
+ const users: User[] = response.serviceAccounts
+ .filter((sa) => sa.state === State.DELETED)
+ .map(serviceAccountToUser);
+ return { list: users, nextPageToken: response.nextPageToken };
+};
+
+const fetchInactiveWorkloadIdentityList = async ({
+ pageToken,
+ pageSize,
+}: {
+ pageToken: string;
+ pageSize: number;
+}) => {
+ const response = await workloadIdentityStore.listWorkloadIdentities(
+ pageSize,
+ pageToken,
+ true
+ );
+ const users: User[] = response.workloadIdentities
+ .filter((wi) => wi.state === State.DELETED)
+ .map(workloadIdentityToUser);
+ return { list: users, nextPageToken: response.nextPageToken };
+};
+
watch(
() => state.activeUserFilterText,
() => {
if (state.typeTab === "USERS") {
userPagedTable.value?.refresh();
+ } else if (state.typeTab === "SERVICE_ACCOUNTS") {
+ serviceAccountPagedTable.value?.refresh();
+ } else if (state.typeTab === "WORKLOAD_IDENTITIES") {
+ workloadIdentityPagedTable.value?.refresh();
} else {
groupPagedTable.value?.refresh();
}
@@ -371,6 +653,7 @@ const fetchInactiveUserList = async ({
pageSize,
filter: {
state: State.DELETED,
+ types: [UserType.USER, UserType.SYSTEM_BOT],
},
});
return { list: users, nextPageToken };
@@ -401,14 +684,30 @@ onMounted(async () => {
const activeUserCount = computed(() => {
return actuatorStore.getActiveUserCount({
includeBot: true,
- includeServiceAccount: true,
+ includeServiceAccount: false,
});
});
+const activeServiceAccountCount = computed(() => {
+ return actuatorStore.serviceAccountCount;
+});
+
+const activeWorkloadIdentityCount = computed(() => {
+ return actuatorStore.workloadIdentityCount;
+});
+
const inactiveUserCount = computed(() => {
return actuatorStore.inactiveUserCount;
});
+const inactiveServiceAccountCount = computed(() => {
+ return actuatorStore.inactiveServiceAccountCount;
+});
+
+const inactiveWorkloadIdentityCount = computed(() => {
+ return actuatorStore.inactiveWorkloadIdentityCount;
+});
+
const remainingUserCount = computed((): number => {
return Math.max(
0,
@@ -470,21 +769,72 @@ const handleGroupRemoved = (group: Group) => {
};
const handleCreateUser = () => {
+ state.createUserType = UserType.USER;
+ state.showCreateUserDrawer = true;
+};
+
+const handleCreateServiceAccount = () => {
+ state.createUserType = UserType.SERVICE_ACCOUNT;
+ state.showCreateUserDrawer = true;
+};
+
+const handleCreateWorkloadIdentity = () => {
+ state.createUserType = UserType.WORKLOAD_IDENTITY;
state.showCreateUserDrawer = true;
};
const handleUserCreated = (user: User) => {
- userPagedTable.value?.refresh().then(() => {
- userPagedTable.value?.updateCache([user]);
- });
+ if (user.userType === UserType.SERVICE_ACCOUNT) {
+ serviceAccountPagedTable.value?.refresh().then(() => {
+ serviceAccountPagedTable.value?.updateCache([user]);
+ });
+ } else if (user.userType === UserType.WORKLOAD_IDENTITY) {
+ workloadIdentityPagedTable.value?.refresh().then(() => {
+ workloadIdentityPagedTable.value?.updateCache([user]);
+ });
+ } else {
+ userPagedTable.value?.refresh().then(() => {
+ userPagedTable.value?.updateCache([user]);
+ });
+ }
};
const handleUserUpdated = (user: User) => {
- if (user.state === State.DELETED) {
- userPagedTable.value?.removeCache(user);
+ if (user.userType === UserType.SERVICE_ACCOUNT) {
+ if (user.state === State.DELETED) {
+ serviceAccountPagedTable.value?.removeCache(user);
+ } else {
+ serviceAccountPagedTable.value?.updateCache([user]);
+ }
+ } else if (user.userType === UserType.WORKLOAD_IDENTITY) {
+ if (user.state === State.DELETED) {
+ workloadIdentityPagedTable.value?.removeCache(user);
+ } else {
+ workloadIdentityPagedTable.value?.updateCache([user]);
+ }
} else {
- userPagedTable.value?.updateCache([user]);
+ if (user.state === State.DELETED) {
+ userPagedTable.value?.removeCache(user);
+ } else {
+ userPagedTable.value?.updateCache([user]);
+ }
+ }
+};
+
+const handleServiceAccountRestore = (user: User) => {
+ if (user.state !== State.ACTIVE) {
+ return;
+ }
+ deletedServiceAccountPagedTable.value?.removeCache(user);
+ serviceAccountPagedTable.value?.refresh();
+};
+
+const handleWorkloadIdentityRestore = (user: User) => {
+ if (user.state !== State.ACTIVE) {
+ return;
}
+ deletedWorkloadIdentityPagedTable.value?.removeCache(user);
+ workloadIdentityPagedTable.value?.refresh();
};
const handleUserRestore = (user: User) => {