Skip to content

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

chore: show error message & fix permission check (#19158)

ecmadao6e16f14ae46d
diff --git a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
index 72f0e60b79..7135e5eaba 100644
--- a/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
+++ b/frontend/src/components/ProjectMember/AddProjectMember/AddProjectMemberForm.vue
@@ -75,7 +75,14 @@
<div
v-if="
state.role !== PresetRoleType.PROJECT_OWNER &&
- checkRoleContainsAnyPermission(state.role, 'bb.sql.select')
+ checkRoleContainsAnyPermission(
+ state.role,
+ 'bb.sql.select',
+ 'bb.sql.ddl',
+ 'bb.sql.dml',
+ 'bb.sql.explain',
+ 'bb.sql.info'
+ )
"
class="w-full flex flex-col gap-y-2"
>
diff --git a/frontend/src/components/User/Settings/CreateGroupDrawer.vue b/frontend/src/components/User/Settings/CreateGroupDrawer.vue
index c579bacf5f..0089ac402f 100644
--- a/frontend/src/components/User/Settings/CreateGroupDrawer.vue
+++ b/frontend/src/components/User/Settings/CreateGroupDrawer.vue
@@ -61,7 +61,6 @@
:value="member.member"
:multiple="false"
:size="'medium'"
- :include-all="false"
:disabled="!allowEdit"
:filter="(user) => userFilter(user, member.member)"
@update:value="($event) => updateMemberEmail(i, $event as (string | undefined))"
diff --git a/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue b/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue
index 11d66bdccd..3516bc9f70 100644
--- a/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue
+++ b/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue
@@ -19,7 +19,6 @@
:input-props="{ type: 'text', autocomplete: 'off' }"
placeholder="Foo"
:maxlength="200"
- :disabled="!allowUpdate"
/>
</div>
@@ -36,19 +35,25 @@
/>
</div>
- <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-if="!isEditMode"
+ v-slot="slotProps"
+ :project="projectEntity"
+ :permissions="[project ? 'bb.projects.setIamPolicy' : '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"
- :disabled="!allowUpdateRoles"
- :project="project"
- />
- </div>
+ </PermissionGuardWrapper>
</div>
</template>
<template #footer>
@@ -57,16 +62,22 @@
{{ $t("common.cancel") }}
</NButton>
- <NButton
- type="primary"
- :disabled="!allowConfirm"
- :loading="state.isRequesting"
- @click="createOrUpdateServiceAccount"
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="projectEntity"
+ :permissions="[isEditMode ? 'bb.serviceAccounts.update' : 'bb.serviceAccounts.create']"
>
- {{
- isEditMode ? $t("common.update") : $t("common.confirm")
- }}
- </NButton>
+ <NButton
+ type="primary"
+ :disabled="!allowConfirm || slotProps.disabled"
+ :loading="state.isRequesting"
+ @click="createOrUpdateServiceAccount"
+ >
+ {{
+ isEditMode ? $t("common.update") : $t("common.confirm")
+ }}
+ </NButton>
+ </PermissionGuardWrapper>
</div>
</template>
</DrawerContent>
@@ -76,16 +87,18 @@
<script lang="ts" setup>
import { create } from "@bufbuild/protobuf";
import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
-import { cloneDeep, isEqual } from "lodash-es";
+import { cloneDeep } from "lodash-es";
import { NButton, NInput } from "naive-ui";
import { computed, reactive, 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";
import {
ensureServiceAccountFullName,
+ getProjectName,
pushNotification,
serviceAccountToUser,
useProjectIamPolicyStore,
@@ -96,14 +109,12 @@ import {
import {
getServiceAccountNameInBinding,
getServiceAccountSuffix,
- UNKNOWN_USER_NAME,
unknownUser,
} from "@/types";
import { PresetRoleType } from "@/types/iam";
import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";
import type { User } from "@/types/proto-es/v1/user_service_pb";
import { UserSchema } from "@/types/proto-es/v1/user_service_pb";
-import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";
interface LocalState {
isRequesting: boolean;
@@ -113,7 +124,7 @@ interface LocalState {
const props = defineProps<{
serviceAccount?: User;
- projectId?: string;
+ project?: string;
}>();
const emit = defineEmits<{
@@ -131,73 +142,30 @@ const projectIamPolicyStore = useProjectIamPolicyStore();
const state = reactive<LocalState>({
isRequesting: false,
serviceAccount: unknownUser(),
- roles: props.projectId ? [] : [PresetRoleType.WORKSPACE_MEMBER],
+ roles: props.project ? [] : [PresetRoleType.WORKSPACE_MEMBER],
});
-const project = computed(() => {
- if (!props.projectId) return undefined;
- return projectStore.getProjectByName(`projects/${props.projectId}`);
+const projectEntity = computed(() => {
+ if (!props.project) return undefined;
+ return projectStore.getProjectByName(props.project);
});
const parent = computed(() => {
- if (props.projectId) {
- return `projects/${props.projectId}`;
+ if (props.project) {
+ return props.project;
}
return "workspaces/-";
});
-const emailSuffix = computed(() => getServiceAccountSuffix(props.projectId));
+const emailSuffix = computed(() =>
+ getServiceAccountSuffix(getProjectName(props.project ?? ""))
+);
const isEditMode = computed(
() =>
!!props.serviceAccount && props.serviceAccount.name !== unknownUser().name
);
-const allowUpdate = computed(() => {
- if (!isEditMode.value) {
- return true;
- }
- if (props.projectId && project.value) {
- return hasProjectPermissionV2(project.value, "bb.serviceAccounts.update");
- }
- return hasWorkspacePermissionV2("bb.serviceAccounts.update");
-});
-
-const allowUpdateRoles = computed(() => {
- if (props.projectId && project.value) {
- return hasProjectPermissionV2(project.value, "bb.projects.setIamPolicy");
- }
- return hasWorkspacePermissionV2("bb.workspaces.setIamPolicy");
-});
-
-const initialRoles = computed(() => {
- if (
- !props.serviceAccount ||
- props.serviceAccount.name === UNKNOWN_USER_NAME
- ) {
- return props.projectId ? [] : [PresetRoleType.WORKSPACE_MEMBER];
- }
-
- if (props.projectId && project.value) {
- const policy = projectIamPolicyStore.getProjectIamPolicy(
- project.value.name
- );
- const roles = policy.bindings
- .filter((binding: Binding) =>
- binding.members.includes(
- getServiceAccountNameInBinding(props.serviceAccount!.email)
- )
- )
- .map((binding: Binding) => binding.role);
- return roles;
- }
-
- const roles = workspaceStore.userMapToRoles.get(
- `serviceAccounts/${props.serviceAccount.email}`
- );
- return roles ? [...roles] : [];
-});
-
watch(
() => props.serviceAccount,
(sa) => {
@@ -205,7 +173,6 @@ watch(
return;
}
state.serviceAccount = cloneDeep(create(UserSchema, sa));
- state.roles = [...initialRoles.value];
},
{
immediate: true,
@@ -294,9 +261,9 @@ const createServiceAccount = async () => {
const createdUser = serviceAccountToUser(sa);
if (state.roles.length > 0) {
- if (props.projectId && project.value) {
+ if (projectEntity.value) {
await updateProjectIamPolicyForMember(
- project.value.name,
+ projectEntity.value.name,
getServiceAccountNameInBinding(createdUser.email),
state.roles
);
@@ -344,23 +311,6 @@ const updateServiceAccount = async () => {
updatedUser = serviceAccountToUser(updated);
}
- if (!isEqual([...initialRoles.value].sort(), [...state.roles].sort())) {
- if (props.projectId && project.value) {
- await updateProjectIamPolicyForMember(
- project.value.name,
- getServiceAccountNameInBinding(updatedUser.email),
- state.roles
- );
- } else {
- await workspaceStore.patchIamPolicy([
- {
- member: getServiceAccountNameInBinding(updatedUser.email),
- roles: state.roles,
- },
- ]);
- }
- }
-
emit("updated", updatedUser);
pushNotification({
module: "bytebase",
diff --git a/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue b/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue
index c52f3e3669..23ca41fb15 100644
--- a/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue
+++ b/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue
@@ -20,7 +20,6 @@
:input-props="{ type: 'text', autocomplete: 'off' }"
placeholder="GitHub Deploy"
:maxlength="200"
- :disabled="!allowUpdate"
/>
</div>
@@ -47,7 +46,6 @@
<NSelect
v-model:value="state.wif.providerType"
:options="platformOptions"
- :disabled="!allowUpdate"
@update:value="onPlatformChange"
/>
</div>
@@ -78,7 +76,6 @@
: 'my-org'
"
:maxlength="200"
- :disabled="!allowUpdate"
/>
</div>
@@ -107,7 +104,6 @@
: 'my-repo'
"
:maxlength="200"
- :disabled="!allowUpdate"
/>
<span class="text-xs text-gray-500">
<template
@@ -144,7 +140,6 @@
<NSelect
v-model:value="state.wif.refType"
:options="refTypeOptions"
- :disabled="!allowUpdate"
/>
</div>
@@ -176,7 +171,6 @@
: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
@@ -220,7 +214,6 @@
v-model:value="state.wif.issuerUrl"
:input-props="{ type: 'text', autocomplete: 'off' }"
:maxlength="500"
- :disabled="!allowUpdate"
/>
<span
v-if="
@@ -248,7 +241,6 @@
v-model:value="state.wif.audience"
:input-props="{ type: 'text', autocomplete: 'off' }"
:maxlength="500"
- :disabled="!allowUpdate"
/>
</div>
@@ -263,7 +255,6 @@
v-model:value="state.wif.subjectPattern"
:input-props="{ type: 'text', autocomplete: 'off' }"
:maxlength="500"
- :disabled="!allowUpdate"
/>
</div>
</div>
@@ -283,19 +274,25 @@
</template>
</NButton>
- <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-if="!isEditMode"
+ v-slot="slotProps"
+ :project="projectEntity"
+ :permissions="[projectEntity ? 'bb.projects.setIamPolicy' : '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"
- :disabled="!allowUpdateRoles"
- :project="project"
- />
- </div>
+ </PermissionGuardWrapper>
</div>
</template>
<template #footer>
@@ -304,16 +301,22 @@
{{ $t("common.cancel") }}
</NButton>
- <NButton
- type="primary"
- :disabled="!allowConfirm"
- :loading="state.isRequesting"
- @click="createOrUpdateWorkloadIdentity"
+ <PermissionGuardWrapper
+ v-slot="slotProps"
+ :project="projectEntity"
+ :permissions="[isEditMode ? 'bb.workloadIdentities.update' : 'bb.workloadIdentities.create']"
>
- {{
- isEditMode ? $t("common.update") : $t("common.confirm")
- }}
- </NButton>
+ <NButton
+ type="primary"
+ :disabled="!allowConfirm || slotProps.disabled"
+ :loading="state.isRequesting"
+ @click="createOrUpdateWorkloadIdentity"
+ >
+ {{
+ isEditMode ? $t("common.update") : $t("common.confirm")
+ }}
+ </NButton>
+ </PermissionGuardWrapper>
</div>
</template>
</DrawerContent>
@@ -323,16 +326,18 @@
<script lang="ts" setup>
import { create } from "@bufbuild/protobuf";
import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
-import { cloneDeep, isEqual } from "lodash-es";
+import { cloneDeep } from "lodash-es";
import { NButton, NCollapseTransition, NInput, NSelect } from "naive-ui";
import { computed, reactive, 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";
import {
ensureWorkloadIdentityFullName,
+ getProjectName,
pushNotification,
useProjectIamPolicyStore,
useProjectV1Store,
@@ -343,7 +348,6 @@ import {
import {
getWorkloadIdentityNameInBinding,
getWorkloadIdentitySuffix,
- UNKNOWN_USER_NAME,
unknownUser,
} from "@/types";
import { PresetRoleType } from "@/types/iam";
@@ -354,7 +358,6 @@ import {
WorkloadIdentityConfig_ProviderType,
WorkloadIdentityConfigSchema,
} from "@/types/proto-es/v1/user_service_pb";
-import { hasProjectPermissionV2, hasWorkspacePermissionV2 } from "@/utils";
interface WifState {
emailPrefix: string;
@@ -378,7 +381,7 @@ interface LocalState {
const props = defineProps<{
workloadIdentity?: User;
- projectId?: string;
+ project?: string;
}>();
const emit = defineEmits<{
@@ -396,7 +399,7 @@ const projectIamPolicyStore = useProjectIamPolicyStore();
const state = reactive<LocalState>({
isRequesting: false,
workloadIdentity: unknownUser(),
- roles: props.projectId ? [] : [PresetRoleType.WORKSPACE_MEMBER],
+ roles: props.project ? [] : [PresetRoleType.WORKSPACE_MEMBER],
wif: {
emailPrefix: "",
providerType: WorkloadIdentityConfig_ProviderType.GITHUB,
@@ -411,19 +414,21 @@ const state = reactive<LocalState>({
},
});
-const project = computed(() => {
- if (!props.projectId) return undefined;
- return projectStore.getProjectByName(`projects/${props.projectId}`);
+const projectEntity = computed(() => {
+ if (!props.project) return undefined;
+ return projectStore.getProjectByName(props.project);
});
const parent = computed(() => {
- if (props.projectId) {
- return `projects/${props.projectId}`;
+ if (props.project) {
+ return props.project;
}
return "workspaces/-";
});
-const emailSuffix = computed(() => getWorkloadIdentitySuffix(props.projectId));
+const emailSuffix = computed(() =>
+ getWorkloadIdentitySuffix(getProjectName(props.project ?? ""))
+);
const isEditMode = computed(
() =>
@@ -431,54 +436,6 @@ const isEditMode = computed(
props.workloadIdentity.name !== unknownUser().name
);
-const allowUpdate = computed(() => {
- if (!isEditMode.value) {
- return true;
- }
- if (props.projectId && project.value) {
- return hasProjectPermissionV2(
- project.value,
- "bb.workloadIdentities.update"
- );
- }
- return hasWorkspacePermissionV2("bb.workloadIdentities.update");
-});
-
-const allowUpdateRoles = computed(() => {
- if (props.projectId && project.value) {
- return hasProjectPermissionV2(project.value, "bb.projects.setIamPolicy");
- }
- return hasWorkspacePermissionV2("bb.workspaces.setIamPolicy");
-});
-
-const initialRoles = computed(() => {
- if (
- !props.workloadIdentity ||
- props.workloadIdentity.name === UNKNOWN_USER_NAME
- ) {
- return props.projectId ? [] : [PresetRoleType.WORKSPACE_MEMBER];
- }
-
- if (props.projectId && project.value) {
- const policy = projectIamPolicyStore.getProjectIamPolicy(
- project.value.name
- );
- const roles = policy.bindings
- .filter((binding: Binding) =>
- binding.members.includes(
- getWorkloadIdentityNameInBinding(props.workloadIdentity!.email)
- )
- )
- .map((binding: Binding) => binding.role);
- return roles;
- }
-
- const roles = workspaceStore.userMapToRoles.get(
- `workloadIdentities/${props.workloadIdentity.email}`
- );
- return roles ? [...roles] : [];
-});
-
// Parse subject pattern and extract owner/repo/branch/refType
const parseSubjectPattern = (pattern: string) => {
const { providerType } = state.wif;
@@ -544,7 +501,6 @@ watch(
return;
}
state.workloadIdentity = cloneDeep(create(UserSchema, wi));
- state.roles = [...initialRoles.value];
const config = wi.workloadIdentityConfig;
if (config) {
@@ -780,9 +736,9 @@ const createWorkloadIdentity = async () => {
const createdUser = workloadIdentityToUser(wi);
if (state.roles.length > 0) {
- if (props.projectId && project.value) {
+ if (projectEntity.value) {
await updateProjectIamPolicyForMember(
- project.value.name,
+ projectEntity.value.name,
getWorkloadIdentityNameInBinding(createdUser.email),
state.roles
);
@@ -833,24 +789,6 @@ const updateWorkloadIdentity = async () => {
})
);
updatedUser = workloadIdentityToUser(updated);
-
- if (!isEqual([...initialRoles.value].sort(), [...state.roles].sort())) {
- if (props.projectId && project.value) {
- await updateProjectIamPolicyForMember(
- project.value.name,
- getWorkloadIdentityNameInBinding(updatedUser.email),
- state.roles
- );
- } else {
- await workspaceStore.patchIamPolicy([
- {
- member: getWorkloadIdentityNameInBinding(updatedUser.email),
- roles: state.roles,
- },
- ]);
- }
- }
-
emit("updated", updatedUser);
pushNotification({
module: "bytebase",
diff --git a/frontend/src/components/User/Settings/ServiceAccountPanel.vue b/frontend/src/components/User/Settings/ServiceAccountPanel.vue
index 0f6f1b53e4..02290ba370 100644
--- a/frontend/src/components/User/Settings/ServiceAccountPanel.vue
+++ b/frontend/src/components/User/Settings/ServiceAccountPanel.vue
@@ -29,27 +29,22 @@
</PermissionGuardWrapper>
</div>
- <ComponentPermissionGuard
- :permissions="['bb.serviceAccounts.list']"
- :project="project"
+ <PagedTable
+ ref="serviceAccountPagedTable"
+ :session-key="sessionKey"
+ :fetch-list="fetchServiceAccountList"
>
- <PagedTable
- ref="serviceAccountPagedTable"
- :session-key="sessionKey"
- :fetch-list="fetchServiceAccountList"
- >
- <template #table="{ list, loading }">
- <UserDataTable
- :show-roles="false"
- :show-groups="false"
- :user-list="list"
- :loading="loading"
- @user-selected="handleServiceAccountSelected"
- @user-updated="handleServiceAccountUpdated"
- />
- </template>
- </PagedTable>
- </ComponentPermissionGuard>
+ <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>
<NCheckbox v-model:checked="state.showInactiveList">
@@ -87,7 +82,7 @@
<CreateServiceAccountDrawer
v-if="state.showCreateDrawer"
:service-account="state.editingServiceAccount"
- :project-id="projectId"
+ :project="project.name"
@close="
() => {
state.showCreateDrawer = false;
@@ -104,7 +99,6 @@ 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 ComponentPermissionGuard from "@/components/Permission/ComponentPermissionGuard.vue";
import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import CreateServiceAccountDrawer from "@/components/User/Settings/CreateServiceAccountDrawer.vue";
import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";
@@ -119,7 +113,6 @@ import { DEFAULT_PROJECT_NAME, unknownUser } from "@/types";
import { State } from "@/types/proto-es/v1/common_pb";
import type { User } from "@/types/proto-es/v1/user_service_pb";
import { UserType } from "@/types/proto-es/v1/user_service_pb";
-import { hasProjectPermissionV2 } from "@/utils";
const props = defineProps<{
projectId?: string;
@@ -164,20 +157,17 @@ const deletedSessionKey = computed(() =>
);
const parent = computed(() =>
- props.projectId ? `projects/${props.projectId}` : "workspaces/-"
+ props.projectId ? `${projectNamePrefix}${props.projectId}` : "workspaces/-"
);
const allowEdit = computed(() => {
- if (!props.projectId) {
- return true;
- }
if (project.value.name === DEFAULT_PROJECT_NAME) {
return false;
}
if (project.value.state === State.DELETED) {
return false;
}
- return hasProjectPermissionV2(project.value, "bb.serviceAccounts.create");
+ return true;
});
const fetchServiceAccountList = async ({
diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue
index 916b7eccfb..fd8bd3a983 100644
--- a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue
+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue
@@ -44,13 +44,13 @@
<UserRolesCell v-if="role" :role="role" />
</div>
<NEllipsis
- v-if="showEmail && group.email"
+ v-if="showName"
:line-clamp="1"
:tooltip="true"
>
<HighlightLabelText
class="textinfolabel text-sm"
- :text="group.email"
+ :text="group.name"
:keyword="keyword"
/>
</NEllipsis>
@@ -75,7 +75,7 @@ const props = withDefaults(
group: Group;
role?: MemberRole;
showIcon?: boolean;
- showEmail?: boolean;
+ showName?: boolean;
showMember?: boolean;
link?: boolean;
deleted?: boolean;
@@ -83,7 +83,7 @@ const props = withDefaults(
}>(),
{
showIcon: true,
- showEmail: true,
+ showName: true,
role: undefined,
link: true,
deleted: false,
diff --git a/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue b/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue
index 257b2836dc..74842c8945 100644
--- a/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue
+++ b/frontend/src/components/User/Settings/WorkloadIdentityPanel.vue
@@ -29,27 +29,22 @@
</PermissionGuardWrapper>
</div>
- <ComponentPermissionGuard
- :permissions="['bb.workloadIdentities.list']"
- :project="project"
+ <PagedTable
+ ref="workloadIdentityPagedTable"
+ :session-key="sessionKey"
+ :fetch-list="fetchWorkloadIdentityList"
>
- <PagedTable
- ref="workloadIdentityPagedTable"
- :session-key="sessionKey"
- :fetch-list="fetchWorkloadIdentityList"
- >
- <template #table="{ list, loading }">
- <UserDataTable
- :show-roles="false"
- :show-groups="false"
- :user-list="list"
- :loading="loading"
- @user-selected="handleWorkloadIdentitySelected"
- @user-updated="handleWorkloadIdentityUpdated"
- />
- </template>
- </PagedTable>
- </ComponentPermissionGuard>
+ <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>
<NCheckbox v-model:checked="state.showInactiveList">
@@ -89,7 +84,7 @@
<CreateWorkloadIdentityDrawer
v-if="state.showCreateDrawer"
:workload-identity="state.editingWorkloadIdentity"
- :project-id="projectId"
+ :project="project.name"
@close="
() => {
state.showCreateDrawer = false;
@@ -106,7 +101,6 @@ 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 ComponentPermissionGuard from "@/components/Permission/ComponentPermissionGuard.vue";
import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import CreateWorkloadIdentityDrawer from "@/components/User/Settings/CreateWorkloadIdentityDrawer.vue";
import UserDataTable from "@/components/User/Settings/UserDataTable/index.vue";
@@ -121,7 +115,6 @@ import { DEFAULT_PROJECT_NAME, unknownUser } from "@/types";
import { State } from "@/types/proto-es/v1/common_pb";
import type { User } from "@/types/proto-es/v1/user_service_pb";
import { UserType } from "@/types/proto-es/v1/user_service_pb";
-import { hasProjectPermissionV2 } from "@/utils";
const props = defineProps<{
projectId?: string;
@@ -166,20 +159,17 @@ const deletedSessionKey = computed(() =>
);
const parent = computed(() =>
- props.projectId ? `projects/${props.projectId}` : "workspaces/-"
+ props.projectId ? `${projectNamePrefix}${props.projectId}` : "workspaces/-"
);
const allowEdit = computed(() => {
- if (!props.projectId) {
- return true;
- }
if (project.value.name === DEFAULT_PROJECT_NAME) {
return false;
}
if (project.value.state === State.DELETED) {
return false;
}
- return hasProjectPermissionV2(project.value, "bb.workloadIdentities.create");
+ return true;
});
const fetchWorkloadIdentityList = async ({
diff --git a/frontend/src/components/v2/Model/cells/UserNameCell.vue b/frontend/src/components/v2/Model/cells/UserNameCell.vue
index c588582a25..cd5ccf99da 100644
--- a/frontend/src/components/v2/Model/cells/UserNameCell.vue
+++ b/frontend/src/components/v2/Model/cells/UserNameCell.vue
@@ -128,7 +128,7 @@ defineEmits<{
const currentUserV1 = useCurrentUserV1();
const hasPermission = computed(() => {
- return hasWorkspacePermissionV2("bb.policies.update");
+ return hasWorkspacePermissionV2("bb.serviceAccounts.update");
});
const isDeleted = computed(() => props.user.state === State.DELETED);
diff --git a/frontend/src/components/v2/Select/AccountSelect.vue b/frontend/src/components/v2/Select/AccountSelect.vue
index 846fbec606..6bfd07bb40 100644
--- a/frontend/src/components/v2/Select/AccountSelect.vue
+++ b/frontend/src/components/v2/Select/AccountSelect.vue
@@ -1,25 +1,31 @@
<template>
- <RemoteResourceSelector
- v-bind="$attrs"
- :multiple="multiple"
- :disabled="disabled"
- :size="size"
- :value="value"
- :tag="true"
- :remote="true"
- :additional-options="additionalOptions"
- :render-label="renderLabel"
- :render-tag="renderTag"
- :search="handleSearch"
- @update:value="(val) => $emit('update:value', val)"
- />
+ <div>
+ <RemoteResourceSelector
+ ref="remoteResourceSelectorRef"
+ v-bind="$attrs"
+ :multiple="multiple"
+ :disabled="disabled"
+ :size="size"
+ :value="value"
+ :tag="true"
+ :remote="true"
+ :additional-options="additionalOptions"
+ :render-label="renderLabel"
+ :render-tag="renderTag"
+ :search="handleSearch"
+ @update:value="(val) => $emit('update:value', val)"
+ />
+ <div v-if="errorMessage" class="text-red-600 mt-0.5">
+ {{ errorMessage }}
+ </div>
+ </div>
</template>
<script lang="tsx" setup>
import { create } from "@bufbuild/protobuf";
import { computedAsync } from "@vueuse/core";
import { computed, ref } from "vue";
-import EllipsisText from "@/components/EllipsisText.vue";
+import type { ComponentExposed } from "vue-component-type-helpers";
import GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";
import { HighlightLabelText } from "@/components/v2";
import { UserNameCell } from "@/components/v2/Model/cells";
@@ -33,7 +39,6 @@ import {
groupNamePrefix,
serviceAccountToUser,
useGroupStore,
- userNamePrefix,
useServiceAccountStore,
useUserStore,
useWorkloadIdentityStore,
@@ -50,6 +55,7 @@ import { ServiceAccountSchema } from "@/types/proto-es/v1/service_account_servic
import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";
import { WorkloadIdentitySchema } from "@/types/proto-es/v1/workload_identity_service_pb";
import { ensureUserFullName, hasWorkspacePermissionV2 } from "@/utils";
+import { extractGrpcErrorMessage } from "@/utils/connect";
import RemoteResourceSelector from "./RemoteResourceSelector/index.vue";
import type {
ResourceSelectOption,
@@ -89,6 +95,10 @@ const combinedPageToken = ref<{
user: "",
group: "",
});
+const errorMessage = ref<string | undefined>();
+const remoteResourceSelectorRef =
+ ref<ComponentExposed<typeof RemoteResourceSelector<AccountResource>>>();
+
const userStore = useUserStore();
const groupStore = useGroupStore();
const serviceAccountStore = useServiceAccountStore();
@@ -202,14 +212,38 @@ const handleSearch = async (params: {
pageToken: string;
pageSize: number;
}) => {
- const loadNextPage = !!params.pageToken;
- if (!loadNextPage) {
+ errorMessage.value = undefined;
+ if (!params.pageToken) {
combinedPageToken.value = {
user: "",
group: "",
};
}
+ try {
+ const resp = await fetchAccounts(params);
+ return resp;
+ } catch (error) {
+ errorMessage.value = extractGrpcErrorMessage(error);
+ return {
+ nextPageToken: "",
+ options: [],
+ };
+ } finally {
+ if (errorMessage.value) {
+ setTimeout(() => remoteResourceSelectorRef.value?.close(), 500);
+ }
+ }
+};
+
+const fetchAccounts = async (params: {
+ search: string;
+ pageToken: string;
+ pageSize: number;
+}): Promise<{
+ nextPageToken: string;
+ options: ResourceSelectOption<AccountResource>[];
+}> => {
const userType = getUserTypeByEmail(params.search);
switch (userType) {
case UserType.SERVICE_ACCOUNT:
@@ -230,6 +264,7 @@ const handleSearch = async (params: {
],
};
}
+
const sa = await serviceAccountStore.getOrFetchServiceAccount(
params.search,
true
@@ -256,6 +291,7 @@ const handleSearch = async (params: {
],
};
}
+
const wi = await workloadIdentityStore.getOrFetchWorkloadIdentity(
params.search,
true
@@ -269,7 +305,7 @@ const handleSearch = async (params: {
const requests: Promise<ResourceSelectOption<AccountResource>[]>[] = [];
- if (!loadNextPage) {
+ if (!params.pageToken) {
requests.push(
handleSearchUser({
search: params.search,
@@ -319,10 +355,7 @@ const handleSearchUser = async (params: {
pageToken: string;
pageSize: number;
}) => {
- if (
- !hasListUserPermission.value &&
- params.search.startsWith(userNamePrefix)
- ) {
+ if (!hasListUserPermission.value) {
return [getUserOption(unknownUser(ensureUserFullName(params.search)))];
}
@@ -370,22 +403,13 @@ const customLabel = (
) => {
if (resource.type === "group") {
return (
- <div>
- <GroupNameCell
- showEmail={false}
- group={resource.resource as Group}
- showIcon={false}
- link={false}
- keyword={keyword}
- />
- {showName && (
- <div>
- <EllipsisText class="opacity-60 textinfolabel">
- <HighlightLabelText keyword={keyword} text={resource.name} />
- </EllipsisText>
- </div>
- )}
- </div>
+ <GroupNameCell
+ showName={showName}
+ group={resource.resource as Group}
+ showIcon={false}
+ link={false}
+ keyword={keyword}
+ />
);
}
@@ -396,18 +420,19 @@ const customLabel = (
allowEdit={false}
showMfaEnabled={false}
showSource={false}
- showEmail={false}
+ showEmail={showName}
link={false}
size="small"
keyword={keyword}
onClickUser={() => {}}
>
{{
- suffix: () => (
- <span class="textinfolabel truncate">
- (<HighlightLabelText keyword={keyword} text={user.email} />)
- </span>
- ),
+ suffix: () =>
+ !showName && (
+ <span class="textinfolabel truncate">
+ (<HighlightLabelText keyword={keyword} text={user.email} />)
+ </span>
+ ),
}}
</UserNameCell>
);
diff --git a/frontend/src/components/v2/Select/GroupSelect.vue b/frontend/src/components/v2/Select/GroupSelect.vue
index b637ad63b0..37d3bb440a 100644
--- a/frontend/src/components/v2/Select/GroupSelect.vue
+++ b/frontend/src/components/v2/Select/GroupSelect.vue
@@ -92,7 +92,7 @@ const handleSearch = async (params: {
const customLabel = (group: Group, keyword: string) => {
return (
<GroupNameCell
- showEmail={false}
+ showName={false}
group={group}
showIcon={false}
link={false}
diff --git a/frontend/src/components/v2/Select/RemoteResourceSelector/index.vue b/frontend/src/components/v2/Select/RemoteResourceSelector/index.vue
index b1e66f64ce..93a50b231e 100644
--- a/frontend/src/components/v2/Select/RemoteResourceSelector/index.vue
+++ b/frontend/src/components/v2/Select/RemoteResourceSelector/index.vue
@@ -211,5 +211,8 @@ defineExpose({
await handleSearch("", false);
},
options,
+ close: () => {
+ nextTick(() => (show.value = false));
+ },
});
</script>
diff --git a/frontend/src/components/v2/Select/UserSelect.vue b/frontend/src/components/v2/Select/UserSelect.vue
index 938fe0d346..6e4c0cdf4a 100644
--- a/frontend/src/components/v2/Select/UserSelect.vue
+++ b/frontend/src/components/v2/Select/UserSelect.vue
@@ -21,8 +21,7 @@ import { computedAsync } from "@vueuse/core";
import { computed } from "vue";
import { HighlightLabelText } from "@/components/v2";
import { UserNameCell } from "@/components/v2/Model/cells";
-import { getUserFullNameByType, type UserFilter, useUserStore } from "@/store";
-import { allUsersUser } from "@/types";
+import { getUserFullNameByType, useUserStore } from "@/store";
import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";
import { hasWorkspacePermissionV2 } from "@/utils";
import RemoteResourceSelector from "./RemoteResourceSelector/index.vue";
@@ -41,9 +40,6 @@ const props = defineProps<{
size?: SelectSize;
value?: string | string[] | undefined; // user fullname
projectName?: string;
- // allUsers is a special user that represents all users in the project.
- includeAllUsers?: boolean;
- includeSystemBot?: boolean;
filter?: (user: User) => boolean;
}>();
@@ -56,19 +52,6 @@ const userStore = useUserStore();
const hasPermission = computed(() => hasWorkspacePermissionV2("bb.users.list"));
-const getFilter = (search: string): UserFilter => {
- const allowedType = [UserType.USER];
- if (props.includeSystemBot) {
- allowedType.push(UserType.SYSTEM_BOT);
- }
-
- return {
- query: search,
- project: props.projectName,
- types: allowedType,
- };
-};
-
const getOption = (user: User): ResourceSelectOption<User> => ({
resource: user,
value: getUserFullNameByType(user),
@@ -77,9 +60,6 @@ const getOption = (user: User): ResourceSelectOption<User> => ({
const additionalOptions = computedAsync(async () => {
const options: ResourceSelectOption<User>[] = [];
- if (props.includeAllUsers) {
- options.push(getOption(allUsersUser()));
- }
let userEmails: string[] = [];
if (Array.isArray(props.value)) {
@@ -107,10 +87,12 @@ const handleSearch = async (params: {
pageToken: string;
pageSize: number;
}) => {
- const filter = getFilter(params.search);
-
const { users, nextPageToken } = await userStore.fetchUserList({
- filter,
+ filter: {
+ query: params.search,
+ project: props.projectName,
+ types: [UserType.USER],
+ },
pageToken: params.pageToken,
pageSize: params.pageSize,
});