Skip to content

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

fix: permission for service account and workload identity (#19132)

ecmadao25391ab79933
diff --git a/frontend/src/components/User/Settings/CreateUserDrawer.vue b/frontend/src/components/User/Settings/CreateUserDrawer.vue
index bcf15ce23c..01492dd6b5 100644
--- a/frontend/src/components/User/Settings/CreateUserDrawer.vue
+++ b/frontend/src/components/User/Settings/CreateUserDrawer.vue
@@ -48,6 +48,7 @@
:input-props="{ type: 'text', autocomplete: 'off' }"
placeholder="GitHub Deploy"
:maxlength="200"
+ :disabled="!allowUpdate"
/>
</div>
@@ -74,6 +75,7 @@
<NSelect
v-model:value="state.wif.providerType"
:options="platformOptions"
+ :disabled="!allowUpdate"
@update:value="onPlatformChange"
/>
</div>
@@ -104,6 +106,7 @@
: 'my-org'
"
:maxlength="200"
+ :disabled="!allowUpdate"
/>
</div>
@@ -132,6 +135,7 @@
: 'my-repo'
"
:maxlength="200"
+ :disabled="!allowUpdate"
/>
<span class="text-xs text-gray-500">
<template
@@ -168,6 +172,7 @@
<NSelect
v-model:value="state.wif.refType"
:options="refTypeOptions"
+ :disabled="!allowUpdate"
/>
</div>
@@ -199,6 +204,7 @@
:input-props="{ type: 'text', autocomplete: 'off' }"
:placeholder="state.wif.refType === 'tag' ? 'v1.0.0' : 'main'"
:maxlength="200"
+ :disabled="!allowUpdate"
/>
<span class="text-xs text-gray-500">
<template
@@ -242,6 +248,7 @@
v-model:value="state.wif.issuerUrl"
:input-props="{ type: 'text', autocomplete: 'off' }"
:maxlength="500"
+ :disabled="!allowUpdate"
/>
<span
v-if="
@@ -269,6 +276,7 @@
v-model:value="state.wif.audience"
:input-props="{ type: 'text', autocomplete: 'off' }"
:maxlength="500"
+ :disabled="!allowUpdate"
/>
</div>
@@ -283,6 +291,7 @@
v-model:value="state.wif.subjectPattern"
:input-props="{ type: 'text', autocomplete: 'off' }"
:maxlength="500"
+ :disabled="!allowUpdate"
/>
</div>
</div>
@@ -314,6 +323,7 @@
:input-props="{ type: 'text', autocomplete: 'off' }"
placeholder="Foo"
:maxlength="200"
+ :disabled="!allowUpdate"
/>
</div>
@@ -335,14 +345,25 @@
</div>
</template>
- <div class="flex flex-col gap-y-2">
- <div>
- <label class="block text-sm font-medium leading-5 text-control">
- {{ $t("settings.members.table.roles") }}
- </label>
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="[
+ 'bb.workspaces.setIamPolicy'
+ ]"
+ >
+ <div class="flex flex-col gap-y-2">
+ <div>
+ <label class="block text-sm font-medium leading-5 text-control">
+ {{ $t("settings.members.table.roles") }}
+ </label>
+ </div>
+ <RoleSelect
+ v-model:value="state.roles"
+ :multiple="true"
+ :disabled="slotProps.disabled"
+ />
</div>
- <RoleSelect v-model:value="state.roles" :multiple="true" />
- </div>
+ </PermissionGuardWrapper>
<template v-if="state.user.userType === UserType.USER">
<div class="flex flex-col gap-y-2">
@@ -361,6 +382,7 @@
type: 'tel',
autocomplete: 'new-password',
}"
+ :disabled="!allowUpdate"
/>
</div>
@@ -369,6 +391,7 @@
v-model:password="state.user.password"
v-model:password-confirm="state.passwordConfirm"
:password-restriction="passwordRestrictionSetting"
+ :disabled="!allowUpdate"
/>
</template>
</div>
@@ -378,16 +401,24 @@
<NButton @click="$emit('close')">
{{ $t("common.cancel") }}
</NButton>
- <NButton
- type="primary"
- :disabled="!allowConfirm"
- :loading="state.isRequesting"
- @click="createOrUpdateUser"
+
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :permissions="[
+ isEditMode ? updatePermission : createPermission
+ ]"
>
- {{
- isEditMode ? $t("common.update") : $t("common.confirm")
- }}
- </NButton>
+ <NButton
+ type="primary"
+ :disabled="!allowConfirm || slotProps.disabled"
+ :loading="state.isRequesting"
+ @click="createOrUpdateUser"
+ >
+ {{
+ isEditMode ? $t("common.update") : $t("common.confirm")
+ }}
+ </NButton>
+ </PermissionGuardWrapper>
</div>
</template>
</DrawerContent>
@@ -409,6 +440,7 @@ import {
import { computed, reactive, ref, watch } from "vue";
import { useI18n } from "vue-i18n";
import EmailInput from "@/components/EmailInput.vue";
+import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import RequiredStar from "@/components/RequiredStar.vue";
import { Drawer, DrawerContent } from "@/components/v2";
import { RoleSelect } from "@/components/v2/Select";
@@ -440,6 +472,7 @@ import {
WorkloadIdentityConfig_ProviderType,
WorkloadIdentityConfigSchema,
} from "@/types/proto-es/v1/user_service_pb";
+import { hasWorkspacePermissionV2 } from "@/utils";
import UserPassword from "./UserPassword.vue";
interface WifState {
@@ -501,7 +534,38 @@ const state = reactive<LocalState>({
},
});
-const isEditMode = computed(() => !!props.user);
+const isEditMode = computed(
+ () => !!props.user && props.user.name !== unknownUser().name
+);
+
+const updatePermission = computed(() => {
+ switch (state.user.userType) {
+ case UserType.SERVICE_ACCOUNT:
+ return "bb.serviceAccounts.update";
+ case UserType.WORKLOAD_IDENTITY:
+ return "bb.workloadIdentities.update";
+ default:
+ return "bb.users.update";
+ }
+});
+
+const createPermission = computed(() => {
+ switch (state.user.userType) {
+ case UserType.SERVICE_ACCOUNT:
+ return "bb.serviceAccounts.create";
+ case UserType.WORKLOAD_IDENTITY:
+ return "bb.workloadIdentities.create";
+ default:
+ return "bb.users.create";
+ }
+});
+
+const allowUpdate = computed(() => {
+ if (!isEditMode.value) {
+ return true;
+ }
+ return hasWorkspacePermissionV2(updatePermission.value);
+});
const initialRoles = computed(() => {
if (!props.user) {
diff --git a/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vue b/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vue
index 476ccdfabb..c31abaa31e 100644
--- a/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vue
+++ b/frontend/src/components/User/Settings/UserDataTable/cells/UserOperationsCell.vue
@@ -1,51 +1,49 @@
<template>
<div class="flex justify-end gap-x-2">
- <template v-if="allowEdit">
- <NPopconfirm
- v-if="allowDeleteUser"
- :positive-button-props="{
- type: 'error',
- }"
- @positive-click="() => changeRowStatus(State.DELETED)"
- >
- <template #trigger>
- <MiniActionButton @click.stop type="error">
- <Trash2Icon />
- </MiniActionButton>
- </template>
-
- <template #default>
- <div>
- {{ $t("settings.members.action.deactivate-confirm-title") }}
- </div>
- </template>
- </NPopconfirm>
-
- <MiniActionButton
- v-if="allowUpdateUser"
- @click="(e) => $emit('user-selected', user, e)"
- >
- <PencilIcon v-if="user.userType === UserType.WORKLOAD_IDENTITY || user.userType === UserType.SERVICE_ACCOUNT" />
- <EyeIcon v-else />
- </MiniActionButton>
-
- <NPopconfirm
- v-if="allowReactiveUser"
- @positive-click="() => changeRowStatus(State.ACTIVE)"
- >
- <template #trigger>
- <MiniActionButton @click.stop>
- <Undo2Icon />
- </MiniActionButton>
- </template>
-
- <template #default>
- <div>
- {{ $t("settings.members.action.reactivate-confirm-title") }}
- </div>
- </template>
- </NPopconfirm>
- </template>
+ <NPopconfirm
+ v-if="allowDeleteUser"
+ :positive-button-props="{
+ type: 'error',
+ }"
+ @positive-click="() => changeRowStatus(State.DELETED)"
+ >
+ <template #trigger>
+ <MiniActionButton @click.stop type="error">
+ <Trash2Icon />
+ </MiniActionButton>
+ </template>
+
+ <template #default>
+ <div>
+ {{ $t("settings.members.action.deactivate-confirm-title") }}
+ </div>
+ </template>
+ </NPopconfirm>
+
+ <MiniActionButton
+ v-if="allowViewUser"
+ @click="(e) => $emit('user-selected', user, e)"
+ >
+ <PencilIcon v-if="user.userType === UserType.WORKLOAD_IDENTITY || user.userType === UserType.SERVICE_ACCOUNT" />
+ <EyeIcon v-else />
+ </MiniActionButton>
+
+ <NPopconfirm
+ v-if="allowReactiveUser"
+ @positive-click="() => changeRowStatus(State.ACTIVE)"
+ >
+ <template #trigger>
+ <MiniActionButton @click.stop>
+ <Undo2Icon />
+ </MiniActionButton>
+ </template>
+
+ <template #default>
+ <div>
+ {{ $t("settings.members.action.reactivate-confirm-title") }}
+ </div>
+ </template>
+ </NPopconfirm>
</div>
</template>
@@ -84,25 +82,52 @@ const workloadIdentityStore = useWorkloadIdentityStore();
const { t } = useI18n();
const me = useCurrentUserV1();
-const allowEdit = computed(() => {
- return hasWorkspacePermissionV2("bb.users.update");
+const allowView = computed(() => {
+ switch (props.user.userType) {
+ case UserType.SERVICE_ACCOUNT:
+ return hasWorkspacePermissionV2("bb.serviceAccounts.get");
+ case UserType.WORKLOAD_IDENTITY:
+ return hasWorkspacePermissionV2("bb.workloadIdentities.get");
+ default:
+ return hasWorkspacePermissionV2("bb.users.get");
+ }
});
+
const allowDelete = computed(() => {
- return hasWorkspacePermissionV2("bb.users.delete");
+ switch (props.user.userType) {
+ case UserType.SERVICE_ACCOUNT:
+ return hasWorkspacePermissionV2("bb.serviceAccounts.delete");
+ case UserType.WORKLOAD_IDENTITY:
+ return hasWorkspacePermissionV2("bb.workloadIdentities.delete");
+ default:
+ return hasWorkspacePermissionV2("bb.users.delete");
+ }
});
+
const allowUndelete = computed(() => {
- return hasWorkspacePermissionV2("bb.users.undelete");
+ switch (props.user.userType) {
+ case UserType.SERVICE_ACCOUNT:
+ return hasWorkspacePermissionV2("bb.serviceAccounts.undelete");
+ case UserType.WORKLOAD_IDENTITY:
+ return hasWorkspacePermissionV2("bb.workloadIdentities.undelete");
+ default:
+ return hasWorkspacePermissionV2("bb.users.undelete");
+ }
});
-const allowUpdateUser = computed(() => {
+const canEdit = computed(() => {
if (props.user.userType === UserType.SYSTEM_BOT) {
return false;
}
return props.user.state === State.ACTIVE;
});
+const allowViewUser = computed(() => {
+ return canEdit.value && allowView.value;
+});
+
const allowDeleteUser = computed(() => {
- if (!allowUpdateUser.value) {
+ if (!canEdit.value) {
return false;
}
// cannot delete self.
diff --git a/frontend/src/components/User/Settings/UserDataTable/index.vue b/frontend/src/components/User/Settings/UserDataTable/index.vue
index 3b3e9bd1b8..bc7014b2d7 100644
--- a/frontend/src/components/User/Settings/UserDataTable/index.vue
+++ b/frontend/src/components/User/Settings/UserDataTable/index.vue
@@ -57,6 +57,7 @@ const props = defineProps<{
showRoles: boolean;
userList: User[];
loading: boolean;
+ keyword?: string;
}>();
const emit = defineEmits<{
@@ -96,6 +97,7 @@ const columns = computed(() => {
render: (user) => {
return h(UserNameCell, {
user,
+ keyword: props.keyword,
"onReset-service-key": tryResetServiceKey,
});
},
diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue
index 98766b56a1..e7ce034f40 100644
--- a/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue
+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/index.vue
@@ -48,6 +48,7 @@ const props = withDefaults(
defineProps<{
groups: Group[];
loading: boolean;
+ keyword?: string;
showGroupRole?: boolean;
expandedKeys?: string[];
}>(),
@@ -111,7 +112,13 @@ const columns = computed(() => {
className: "flex items-center",
render: (row: GroupRowData | UserRowData) => {
if (row.type === "group") {
- return <GroupNameCell group={row.group} link={false} />;
+ return (
+ <GroupNameCell
+ group={row.group}
+ link={false}
+ keyword={props.keyword}
+ />
+ );
}
return (
<GroupMemberNameCell
diff --git a/frontend/src/components/User/Settings/UserPassword.vue b/frontend/src/components/User/Settings/UserPassword.vue
index fdd5c6c450..da8a1916ca 100644
--- a/frontend/src/components/User/Settings/UserPassword.vue
+++ b/frontend/src/components/User/Settings/UserPassword.vue
@@ -40,6 +40,7 @@
:status="passwordHint ? 'error' : undefined"
:input-props="{ autocomplete: 'new-password' }"
:placeholder="$t('common.sensitive-placeholder')"
+ :disabled="disabled"
@update:value="$emit('update:password', $event)"
/>
<div
@@ -72,6 +73,7 @@
:status="passwordMismatch ? 'error' : undefined"
:input-props="{ autocomplete: 'new-password' }"
:placeholder="$t('settings.profile.password-confirm-placeholder')"
+ :disabled="disabled"
@update:value="$emit('update:passwordConfirm', $event)"
/>
<div
@@ -117,6 +119,7 @@ const props = withDefaults(
passwordConfirm: string;
passwordRestriction?: WorkspaceProfileSetting_PasswordRestriction;
showLearnMore?: boolean;
+ disabled?: boolean;
}>(),
{
showLearnMore: true,
diff --git a/frontend/src/components/v2/Model/cells/UserNameCell.vue b/frontend/src/components/v2/Model/cells/UserNameCell.vue
index f22a02f2e6..2c9335a3cf 100644
--- a/frontend/src/components/v2/Model/cells/UserNameCell.vue
+++ b/frontend/src/components/v2/Model/cells/UserNameCell.vue
@@ -50,7 +50,11 @@
:line-clamp="1"
:tooltip="true"
>
- {{ user.email }}
+ <HighlightLabelText
+ class="truncate max-w-40 cursor-pointer"
+ :keyword="keyword"
+ :text="user.email"
+ />
</NEllipsis>
</slot>
</div>
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index a700f51004..ccfce753a9 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -515,7 +515,7 @@
"reset-service-key": "Reset Service Key",
"reset-service-key-alert": "This action cannot be undone. The old key will stop working immediately. Are you sure you want to reset this service key?",
"service-key-copied": "Service Key copied to clipboard, please keep it in secret.",
- "show-inactive": "Show inactive users",
+ "show-inactive": "Show inactive accounts",
"view-by-roles": "View by roles",
"add-member": "Add member",
"add-user": "Add user",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index ebab8a24e5..82a33aacb6 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -515,7 +515,7 @@
"reset-service-key": "Restablecer Clave de Servicio",
"reset-service-key-alert": "Esta acción no se puede deshacer. La clave antigua dejará de funcionar de inmediato. ¿Está seguro de que desea restablecer esta clave de servicio?",
"service-key-copied": "Clave de Servicio copiada al portapapeles, por favor manténgala en secreto.",
- "show-inactive": "Mostrar usuarios inactivos",
+ "show-inactive": "Mostrar cuentas inactivas",
"view-by-roles": "Ver por roles",
"add-member": "Agregar miembro",
"add-user": "Agregar usuario",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 4e0e924d43..eda6323c0f 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -515,7 +515,7 @@
"reset-service-key": "サービスキーのリセット",
"reset-service-key-alert": "古いサービス キーはすぐにリセットされ、この操作は元に戻すことはできません。サービス キーをリセットしてもよろしいですか?",
"service-key-copied": "サービスキーはコピーされています。公開しないでください",
- "show-inactive": "非アクティブなユーザーを表示",
+ "show-inactive": "非アクティブなアカウントを表示",
"view-by-roles": "役割ごとに表示",
"add-member": "メンバーを追加",
"add-user": "ユーザーを追加",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 8132fb3189..c5a32c2cb5 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -515,7 +515,7 @@
"reset-service-key": "Đặt lại Khóa Dịch vụ",
"reset-service-key-alert": "Hành động này không thể hoàn tác. Khóa cũ sẽ ngừng hoạt động ngay lập tức. Bạn có chắc chắn muốn đặt lại khóa dịch vụ này?",
"service-key-copied": "Khóa Dịch vụ đã được sao chép vào khay nhớ tạm, vui lòng giữ bí mật.",
- "show-inactive": "Hiển thị người dùng không hoạt động",
+ "show-inactive": "Hiển thị tài khoản không hoạt động",
"view-by-roles": "Xem theo vai trò",
"add-member": "Thêm thành viên",
"add-user": "Thêm người dùng",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index ed509467b1..3dceefa850 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -515,7 +515,7 @@
"reset-service-key": "重置 Service Key",
"reset-service-key-alert": "旧 Service Key 将立即被重置,该操作不可逆。确定要重置 Service Key 吗?",
"service-key-copied": "Service Key 已复制,请勿泄漏",
- "show-inactive": "查看未激活的用户",
+ "show-inactive": "显示已停用账户",
"view-by-roles": "按角色查看",
"add-member": "添加成员",
"add-user": "添加用户",
diff --git a/frontend/src/router/dashboard/workspace.ts b/frontend/src/router/dashboard/workspace.ts
index df9a661b21..16276124a9 100644
--- a/frontend/src/router/dashboard/workspace.ts
+++ b/frontend/src/router/dashboard/workspace.ts
@@ -284,7 +284,6 @@ const workspaceRoutes: RouteRecordRaw[] = [
name: WORKSPACE_ROUTE_USERS,
meta: {
title: () => t("settings.sidebar.users-and-groups"),
- requiredPermissionList: () => ["bb.users.list", "bb.groups.list"],
},
component: () => import("@/views/SettingWorkspaceUsers.vue"),
props: true,
diff --git a/frontend/src/views/SettingWorkspaceUsers.vue b/frontend/src/views/SettingWorkspaceUsers.vue
index 594d090b59..d74026353b 100644
--- a/frontend/src/views/SettingWorkspaceUsers.vue
+++ b/frontend/src/views/SettingWorkspaceUsers.vue
@@ -19,22 +19,27 @@
</div>
</template>
- <PagedTable
- ref="userPagedTable"
- session-key="bb.paged-user-table.active"
- :fetch-list="fetchUserList"
+ <ComponentPermissionGuard
+ :permissions="['bb.users.list']"
>
- <template #table="{ list, loading }">
- <UserDataTable
- :show-roles="false"
- :user-list="list"
- :loading="loading"
- @group-selected="handleGroupSelected"
- @user-selected="handleUserSelected"
- @user-updated="handleUserUpdated"
- />
- </template>
- </PagedTable>
+ <PagedTable
+ ref="userPagedTable"
+ session-key="bb.paged-user-table.active"
+ :fetch-list="fetchUserList"
+ >
+ <template #table="{ list, loading }">
+ <UserDataTable
+ :show-roles="false"
+ :user-list="list"
+ :loading="loading"
+ :keyword="state.activeUserFilterText"
+ @group-selected="handleGroupSelected"
+ @user-selected="handleUserSelected"
+ @user-updated="handleUserUpdated"
+ />
+ </template>
+ </PagedTable>
+ </ComponentPermissionGuard>
</NTabPane>
<NTabPane name="SERVICE_ACCOUNTS">
@@ -49,21 +54,25 @@
</div>
</template>
- <PagedTable
- ref="serviceAccountPagedTable"
- session-key="bb.paged-service-account-table.active"
- :fetch-list="fetchServiceAccountList"
+ <ComponentPermissionGuard
+ :permissions="['bb.serviceAccounts.list']"
>
- <template #table="{ list, loading }">
- <UserDataTable
- :show-roles="false"
- :user-list="list"
- :loading="loading"
- @user-selected="handleUserSelected"
- @user-updated="handleUserUpdated"
- />
- </template>
- </PagedTable>
+ <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>
+ </ComponentPermissionGuard>
</NTabPane>
<NTabPane name="WORKLOAD_IDENTITIES">
@@ -78,21 +87,25 @@
</div>
</template>
- <PagedTable
- ref="workloadIdentityPagedTable"
- session-key="bb.paged-workload-identity-table.active"
- :fetch-list="fetchWorkloadIdentityList"
+ <ComponentPermissionGuard
+ :permissions="['bb.workloadIdentities.list']"
>
- <template #table="{ list, loading }">
- <UserDataTable
- :show-roles="false"
- :user-list="list"
- :loading="loading"
- @user-selected="handleUserSelected"
- @user-updated="handleUserUpdated"
- />
- </template>
- </PagedTable>
+ <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>
+ </ComponentPermissionGuard>
</NTabPane>
<NTabPane name="GROUPS">
@@ -104,30 +117,34 @@
</div>
</template>
- <PagedTable
- ref="groupPagedTable"
- session-key="bb.paged-group-table"
- :fetch-list="fetchGroupList"
+ <ComponentPermissionGuard
+ :permissions="['bb.groups.list']"
>
- <template #table="{ list, loading }">
- <UserDataTableByGroup
- :groups="list"
- :loading="loading"
- v-model:expanded-keys="expandedKeys"
- @group-selected="handleGroupSelected"
- @group-removed="handleGroupRemoved"
- />
- </template>
- </PagedTable>
+ <PagedTable
+ ref="groupPagedTable"
+ session-key="bb.paged-group-table"
+ :fetch-list="fetchGroupList"
+ >
+ <template #table="{ list, loading }">
+ <UserDataTableByGroup
+ :groups="list"
+ :loading="loading"
+ :keyword="state.activeUserFilterText"
+ v-model:expanded-keys="expandedKeys"
+ @group-selected="handleGroupSelected"
+ @group-removed="handleGroupRemoved"
+ />
+ </template>
+ </PagedTable>
+ </ComponentPermissionGuard>
</NTabPane>
<template #suffix>
<div class="flex items-center gap-x-2">
<SearchBox
- v-if="state.typeTab !== 'GROUPS'"
+ v-if="state.typeTab === 'USERS' || 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'">
@@ -174,7 +191,7 @@
<template v-if="state.typeTab === 'SERVICE_ACCOUNTS'">
<PermissionGuardWrapper
v-slot="slotProps"
- :permissions="['bb.users.create']"
+ :permissions="['bb.serviceAccounts.create']"
>
<NButton
type="primary"
@@ -194,7 +211,7 @@
<template v-if="state.typeTab === 'WORKLOAD_IDENTITIES'">
<PermissionGuardWrapper
v-slot="slotProps"
- :permissions="['bb.users.create']"
+ :permissions="['bb.workloadIdentities.create']"
>
<NButton
type="primary"
@@ -212,6 +229,27 @@
<!-- GROUPS tab actions -->
<template v-if="state.typeTab === 'GROUPS'">
+ <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.groups.create']"
@@ -255,7 +293,7 @@
</NTabs>
<!-- Inactive users section for USERS tab -->
- <div v-if="state.typeTab === 'USERS'">
+ <div v-if="state.typeTab === 'USERS' && hasListPermission">
<NCheckbox v-model:checked="state.showInactiveUserList">
<span class="textinfolabel">
{{ $t("settings.members.show-inactive") }}
@@ -286,6 +324,7 @@
:loading="loading"
:show-roles="false"
:user-list="list"
+ :keyword="state.inactiveUserFilterText"
@update-user="handleUserRestore"
/>
</template>
@@ -294,7 +333,7 @@
</div>
<!-- Inactive service accounts section for SERVICE_ACCOUNTS tab -->
- <div v-if="state.typeTab === 'SERVICE_ACCOUNTS'">
+ <div v-if="state.typeTab === 'SERVICE_ACCOUNTS' && hasListPermission">
<NCheckbox v-model:checked="state.showInactiveServiceAccountList">
<span class="textinfolabel">
{{ $t("settings.members.show-inactive") }}
@@ -329,7 +368,7 @@
</div>
<!-- Inactive workload identities section for WORKLOAD_IDENTITIES tab -->
- <div v-if="state.typeTab === 'WORKLOAD_IDENTITIES'">
+ <div v-if="state.typeTab === 'WORKLOAD_IDENTITIES' && hasListPermission">
<NCheckbox v-model:checked="state.showInactiveWorkloadIdentityList">
<span class="textinfolabel">
{{ $t("settings.members.show-inactive") }}
@@ -406,6 +445,7 @@ import { useI18n } from "vue-i18n";
import { RouterLink, useRoute, useRouter } from "vue-router";
import { BBAttention } from "@/bbkit";
import { FeatureBadge } from "@/components/FeatureGuard";
+import ComponentPermissionGuard from "@/components/Permission/ComponentPermissionGuard.vue";
import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import AADSyncDrawer from "@/components/User/Settings/AADSyncDrawer.vue";
import CreateGroupDrawer from "@/components/User/Settings/CreateGroupDrawer.vue";
@@ -438,6 +478,7 @@ 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";
+import { hasWorkspacePermissionV2 } from "@/utils";
const tabList = [
"USERS",
@@ -523,6 +564,18 @@ watch(
}
);
+const hasListPermission = computed(() => {
+ switch (state.typeTab) {
+ case "USERS":
+ return hasWorkspacePermissionV2("bb.users.list");
+ case "SERVICE_ACCOUNTS":
+ return hasWorkspacePermissionV2("bb.serviceAccounts.list");
+ case "WORKLOAD_IDENTITIES":
+ return hasWorkspacePermissionV2("bb.workloadIdentities.list");
+ }
+ return false;
+});
+
const fetchGroupList = async ({
pageToken,
pageSize,