Skip to content

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

chore: ui fix (#18119)

ecmadao79b1f1f53843
diff --git a/frontend/src/components/ColumnDataTable/LabelsCell.vue b/frontend/src/components/ColumnDataTable/LabelsCell.vue
index 3069cdcd41..c68388892c 100644
--- a/frontend/src/components/ColumnDataTable/LabelsCell.vue
+++ b/frontend/src/components/ColumnDataTable/LabelsCell.vue
@@ -1,13 +1,9 @@
<template>
<div class="flex items-center gap-x-1">
<LabelsCell :labels="labels" :show-count="2" />
- <button
- v-if="!readonly"
- class="w-5 h-5 p-0.5 hover:bg-gray-300 rounded-sm cursor-pointer"
- @click.prevent="openLabelsDrawer()"
- >
- <heroicons-outline:pencil class="w-4 h-4" />
- </button>
+ <MiniActionButton v-if="!readonly" @click.prevent="openLabelsDrawer()">
+ <PencilIcon class="w-3 h-3" />
+ </MiniActionButton>
</div>
<LabelEditorDrawer
@@ -22,7 +18,9 @@
</template>
<script lang="ts" setup>
+import { PencilIcon } from "lucide-vue-next";
import { computed, reactive } from "vue";
+import { MiniActionButton } from "@/components/v2";
import { LabelsCell } from "@/components/v2/Model/cells";
import { getColumnCatalog, useDatabaseCatalog } from "@/store";
import LabelEditorDrawer from "../LabelEditorDrawer.vue";
diff --git a/frontend/src/components/Label/LabelEditorRow.vue b/frontend/src/components/Label/LabelEditorRow.vue
index 025fd8df2d..6ce80a4592 100644
--- a/frontend/src/components/Label/LabelEditorRow.vue
+++ b/frontend/src/components/Label/LabelEditorRow.vue
@@ -1,52 +1,54 @@
<template>
- <div class="contents text-sm flex gap-x-2">
- <div class="flex flex-col">
- <span class="text-xs font-medium mb-1"> Key {{ index + 1 }} </span>
- <span v-if="readonly" class="leading-[34px]">
- {{ kv.key }}
- </span>
- <NInput
- v-else
- :value="kv.key"
- :placeholder="$t('setting.label.key-placeholder')"
- :status="errors.key.length > 0 ? 'error' : undefined"
- @update:value="$emit('update-key', $event)"
- />
- </div>
- <div class="flex flex-col">
- <span class="text-xs font-medium mb-1"> Value {{ index + 1 }} </span>
- <div class="flex items-center gap-x-2">
+ <div class="flex flex-col gap-y-1">
+ <div class="text-sm flex gap-x-2">
+ <div class="flex flex-col">
+ <span class="text-xs font-medium mb-1"> Key {{ index + 1 }} </span>
<span v-if="readonly" class="leading-[34px]">
- <template v-if="kv.value">{{ kv.value }}</template>
- <span v-else class="text-control-placeholder">
- {{ $t("label.empty-label-value") }}
- </span>
+ {{ kv.key }}
</span>
<NInput
v-else
- :value="kv.value"
- :placeholder="$t('setting.label.value-placeholder')"
- :status="errors.value.length > 0 ? 'error' : undefined"
- @update:value="$emit('update-value', $event)"
+ :value="kv.key"
+ :placeholder="$t('setting.label.key-placeholder')"
+ :status="errors.key.length > 0 ? 'error' : undefined"
+ @update:value="$emit('update-key', $event)"
/>
- <NButton
- quaternary
- size="small"
- style="--n-padding: 0 6px"
- :class="['ml-1', readonly ? 'invisible' : 'visible']"
- @click="$emit('remove')"
- >
- <template #icon>
- <heroicons:trash />
- </template>
- </NButton>
</div>
- <div v-if="kv.message" class="textinfolabel">{{ kv.message }}</div>
+ <div class="flex flex-col">
+ <span class="text-xs font-medium mb-1"> Value {{ index + 1 }} </span>
+ <div class="flex items-center gap-x-2">
+ <span v-if="readonly" class="leading-[34px]">
+ <template v-if="kv.value">{{ kv.value }}</template>
+ <span v-else class="text-control-placeholder">
+ {{ $t("label.empty-label-value") }}
+ </span>
+ </span>
+ <NInput
+ v-else
+ :value="kv.value"
+ :placeholder="$t('setting.label.value-placeholder')"
+ :status="errors.value.length > 0 ? 'error' : undefined"
+ @update:value="$emit('update-value', $event)"
+ />
+ <NButton
+ quaternary
+ size="tiny"
+ style="--n-padding: 0 6px"
+ :class="['ml-1', readonly ? 'invisible' : 'visible']"
+ @click="$emit('remove')"
+ >
+ <template #icon>
+ <heroicons:trash />
+ </template>
+ </NButton>
+ </div>
+ <div v-if="kv.message" class="textinfolabel">{{ kv.message }}</div>
+ </div>
+ <div />
+ </div>
+ <div v-if="combinedErrors.length > 0" class="text-xs text-error col-span-3">
+ <ErrorList :errors="combinedErrors" bullets="always" />
</div>
- <div />
- </div>
- <div v-if="combinedErrors.length > 0" class="text-xs text-error col-span-3">
- <ErrorList :errors="combinedErrors" bullets="always" />
</div>
</template>
diff --git a/frontend/src/components/Label/LabelListEditor.vue b/frontend/src/components/Label/LabelListEditor.vue
index 3afa2801e3..7f162ae4a3 100644
--- a/frontend/src/components/Label/LabelListEditor.vue
+++ b/frontend/src/components/Label/LabelListEditor.vue
@@ -1,8 +1,7 @@
<template>
<div class="flex flex-col gap-y-2">
<div
- class="grid gap-x-1 gap-y-2"
- style="grid-template-columns: 1fr 1fr auto"
+ class="flex flex-wrap gap-x-2 gap-y-2"
>
<LabelEditorRow
v-for="(kv, i) in kvList"
diff --git a/frontend/src/components/Member/MemberDataTable/cells/UserNameCell.vue b/frontend/src/components/Member/MemberDataTable/cells/UserNameCell.vue
deleted file mode 100644
index 6903f37455..0000000000
--- a/frontend/src/components/Member/MemberDataTable/cells/UserNameCell.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
- <div class="flex flex-row items-center gap-x-2">
- <UserAvatar :user="user" />
-
- <div class="flex flex-row items-center">
- <div class="flex flex-col">
- <div class="flex flex-row items-center gap-x-2">
- <div :class="user.state === State.DELETED ? 'line-through' : ''">
- <span
- v-if="onClickUser"
- class="normal-link truncate max-w-40"
- @click="onClickUser(user, $event)"
- >
- {{ user.title }}
- </span>
- <span
- v-else-if="permissionStore.onlyWorkspaceMember"
- class="truncate max-w-[10em]"
- >
- {{ user.title }}
- </span>
- <router-link
- v-else
- :to="`/users/${user.email}`"
- class="normal-link truncate max-w-[10em]"
- >
- {{ user.title }}
- </router-link>
- </div>
- <NTag
- v-if="user.state === State.DELETED"
- size="small"
- round
- type="error"
- >
- {{ $t("settings.members.inactive") }}
- </NTag>
- <NTag v-if="user.profile?.source" size="small" round type="primary">
- {{ user.profile.source }}
- </NTag>
- <YouTag v-if="currentUserV1.name === user.name" />
- <SystemBotTag v-if="user.name === SYSTEM_BOT_USER_NAME" />
- <ServiceAccountTag
- v-if="user.userType === UserType.SERVICE_ACCOUNT"
- />
- </div>
- <span v-if="user.name !== SYSTEM_BOT_USER_NAME" class="textlabel">
- {{ user.email }}
- </span>
- </div>
- </div>
- </div>
-</template>
-
-<script lang="ts" setup>
-import { NTag } from "naive-ui";
-import { computed } from "vue";
-import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";
-import SystemBotTag from "@/components/misc/SystemBotTag.vue";
-import YouTag from "@/components/misc/YouTag.vue";
-import UserAvatar from "@/components/User/UserAvatar.vue";
-import { useCurrentUserV1, usePermissionStore } from "@/store";
-import { SYSTEM_BOT_USER_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 type { MemberBinding } from "../../types";
-
-const props = defineProps<{
- binding: MemberBinding;
- onClickUser?: (user: User, event: MouseEvent) => void;
-}>();
-
-const currentUserV1 = useCurrentUserV1();
-const permissionStore = usePermissionStore();
-
-const user = computed(() => props.binding.user ?? unknownUser());
-</script>
diff --git a/frontend/src/components/Member/MemberDataTable/index.vue b/frontend/src/components/Member/MemberDataTable/index.vue
index 29f5d4547b..afb22c31b9 100644
--- a/frontend/src/components/Member/MemberDataTable/index.vue
+++ b/frontend/src/components/Member/MemberDataTable/index.vue
@@ -27,10 +27,11 @@ import { computed, h, ref } from "vue";
import { useI18n } from "vue-i18n";
import GroupMemberNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vue";
import GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";
+import { UserNameCell } from "@/components/v2/Model/cells";
import { useUserStore } from "@/store";
+import { unknownUser } from "@/types";
import type { User } from "@/types/proto-es/v1/user_service_pb";
import type { MemberBinding } from "../types";
-import UserNameCell from "./cells/UserNameCell.vue";
import UserOperationsCell from "./cells/UserOperationsCell.vue";
import UserRolesCell from "./cells/UserRolesCell.vue";
@@ -154,7 +155,11 @@ const columns = computed(
);
}
return (
- <UserNameCell binding={binding} onClickUser={props.onClickUser} />
+ <UserNameCell
+ user={binding.user ?? unknownUser()}
+ onClickUser={props.onClickUser}
+ allowEdit={false}
+ />
);
},
},
diff --git a/frontend/src/components/Member/MemberDataTableByRole.vue b/frontend/src/components/Member/MemberDataTableByRole.vue
index 2f60ee154b..3a4bbd03f2 100644
--- a/frontend/src/components/Member/MemberDataTableByRole.vue
+++ b/frontend/src/components/Member/MemberDataTableByRole.vue
@@ -18,11 +18,11 @@ import { NDataTable, NPopconfirm, NTooltip } from "naive-ui";
import { computed } from "vue";
import { useI18n } from "vue-i18n";
import GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";
-import { PresetRoleType } from "@/types";
+import { UserNameCell } from "@/components/v2/Model/cells";
+import { PresetRoleType, unknownUser } from "@/types";
import type { Binding } from "@/types/proto-es/v1/iam_policy_pb";
import type { User } from "@/types/proto-es/v1/user_service_pb";
import { displayRoleTitle, isBindingPolicyExpired } from "@/utils";
-import UserNameCell from "./MemberDataTable/cells/UserNameCell.vue";
import UserOperationsCell from "./MemberDataTable/cells/UserOperationsCell.vue";
import type { MemberBinding } from "./types";
@@ -98,7 +98,11 @@ const columns = computed(() => {
}
return (
- <UserNameCell binding={row.member} onClickUser={props.onClickUser} />
+ <UserNameCell
+ user={row.member.user ?? unknownUser()}
+ onClickUser={props.onClickUser}
+ allowEdit={false}
+ />
);
},
},
diff --git a/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue b/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue
index dc6b37078e..b43a84381d 100644
--- a/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue
+++ b/frontend/src/components/Project/Settings/ProjectGeneralSettingPanel.vue
@@ -35,7 +35,6 @@
v-model:kv-list="labelKVList"
:readonly="!allowEdit"
:show-errors="true"
- class="max-w-120"
/>
</div>
</form>
diff --git a/frontend/src/components/User/Settings/UserDataTable/index.vue b/frontend/src/components/User/Settings/UserDataTable/index.vue
index d533c89d73..9800967884 100644
--- a/frontend/src/components/User/Settings/UserDataTable/index.vue
+++ b/frontend/src/components/User/Settings/UserDataTable/index.vue
@@ -28,6 +28,7 @@ import { NDataTable } from "naive-ui";
import { computed, h, reactive, watchEffect } from "vue";
import { useI18n } from "vue-i18n";
import { BBAlert } from "@/bbkit";
+import { UserNameCell } from "@/components/v2/Model/cells";
import {
pushNotification,
useGroupStore,
@@ -41,7 +42,6 @@ import {
} from "@/types/proto-es/v1/user_service_pb";
import { toClipboard } from "@/utils";
import GroupsCell from "./cells/GroupsCell.vue";
-import UserNameCell from "./cells/UserNameCell.vue";
import UserOperationsCell from "./cells/UserOperationsCell.vue";
import UserRolesCell from "./cells/UserRolesCell.vue";
diff --git a/frontend/src/components/User/UserAvatar.vue b/frontend/src/components/User/UserAvatar.vue
index b95acbbb29..582aecff4e 100644
--- a/frontend/src/components/User/UserAvatar.vue
+++ b/frontend/src/components/User/UserAvatar.vue
@@ -9,7 +9,6 @@
</template>
<script lang="ts" setup>
-import type { PropType } from "vue";
import { computed } from "vue";
import { BBAvatar } from "@/bbkit";
import type { BBAvatarSizeType } from "@/bbkit/types";
@@ -17,24 +16,20 @@ import { UNKNOWN_ID, unknownUser } from "@/types";
import { type User } from "@/types/proto-es/v1/user_service_pb";
import type { VueClass } from "@/utils";
-const props = defineProps({
- user: {
- type: Object as PropType<User>,
- default: () => unknownUser(),
- },
- size: {
- type: String as PropType<BBAvatarSizeType>,
- default: "NORMAL",
- },
- overrideClass: {
- type: [String, Object, Array] as PropType<VueClass>,
- default: undefined,
- },
- overrideTextSize: {
- type: String,
- default: undefined,
- },
-});
+const props = withDefaults(
+ defineProps<{
+ user?: User;
+ size?: BBAvatarSizeType;
+ overrideClass?: VueClass;
+ overrideTextSize?: string;
+ }>(),
+ {
+ user: () => unknownUser(),
+ size: "NORMAL",
+ overrideClass: undefined,
+ overrideTextSize: undefined,
+ }
+);
const username = computed((): string => {
if (props.user.name === `users/${UNKNOWN_ID}`) {
diff --git a/frontend/src/components/misc/ServiceAccountTag.vue b/frontend/src/components/misc/ServiceAccountTag.vue
index d9d1b0136c..4fd870375b 100644
--- a/frontend/src/components/misc/ServiceAccountTag.vue
+++ b/frontend/src/components/misc/ServiceAccountTag.vue
@@ -1,9 +1,18 @@
<template>
- <NTag size="small" round type="info">
+ <NTag :size="size" round type="info">
{{ $t("settings.members.service-account") }}
</NTag>
</template>
<script lang="ts" setup>
import { NTag } from "naive-ui";
+
+withDefaults(
+ defineProps<{
+ size?: "tiny" | "small" | "medium" | "large";
+ }>(),
+ {
+ size: "small",
+ }
+);
</script>
diff --git a/frontend/src/components/misc/SystemBotTag.vue b/frontend/src/components/misc/SystemBotTag.vue
index e3a8dbfa0f..25323228e0 100644
--- a/frontend/src/components/misc/SystemBotTag.vue
+++ b/frontend/src/components/misc/SystemBotTag.vue
@@ -1,9 +1,18 @@
<template>
- <NTag size="small" round type="info">
+ <NTag :size="size" round type="info">
{{ $t("settings.members.system-bot") }}
</NTag>
</template>
<script lang="ts" setup>
import { NTag } from "naive-ui";
+
+withDefaults(
+ defineProps<{
+ size?: "tiny" | "small" | "medium" | "large";
+ }>(),
+ {
+ size: "small",
+ }
+);
</script>
diff --git a/frontend/src/components/misc/YouTag.vue b/frontend/src/components/misc/YouTag.vue
index e2dcceac6d..19e05ffa65 100644
--- a/frontend/src/components/misc/YouTag.vue
+++ b/frontend/src/components/misc/YouTag.vue
@@ -1,9 +1,18 @@
<template>
- <NTag size="small" round type="success">
+ <NTag :size="size" v-bind="$attrs" round type="success">
{{ $t("common.you") }}
</NTag>
</template>
<script lang="ts" setup>
import { NTag } from "naive-ui";
+
+withDefaults(
+ defineProps<{
+ size?: "tiny" | "small" | "medium" | "large";
+ }>(),
+ {
+ size: "small",
+ }
+);
</script>
diff --git a/frontend/src/components/User/Settings/UserDataTable/cells/UserNameCell.vue b/frontend/src/components/v2/Model/cells/UserNameCell.vue
similarity index 63%
rename from frontend/src/components/User/Settings/UserDataTable/cells/UserNameCell.vue
rename to frontend/src/components/v2/Model/cells/UserNameCell.vue
index e28547d62f..d5744ad33a 100644
--- a/frontend/src/components/User/Settings/UserDataTable/cells/UserNameCell.vue
+++ b/frontend/src/components/v2/Model/cells/UserNameCell.vue
@@ -1,10 +1,13 @@
<template>
<div class="flex flex-row items-center gap-x-2">
- <UserAvatar :user="user" />
+ <UserAvatar :user="user" :size="avatarSize" />
<div class="flex flex-row items-center">
<div class="flex flex-col">
- <div class="flex flex-row items-center gap-x-2">
+ <div :class="[
+ 'flex flex-row items-center gap-x-1',
+ user.state === State.DELETED ? 'line-through' : ''
+ ]">
<span
v-if="onClickUser"
class="normal-link truncate max-w-40"
@@ -25,27 +28,38 @@
>
{{ user.title }}
</router-link>
- <NTag v-if="user.profile?.source" size="small" round type="primary">
+ <slot name="suffix">
+ </slot>
+ <NTag v-if="user.state === State.DELETED" :size="tagSize" type="error" round>
+ {{$t("common.deleted")}}
+ </NTag>
+ <NTag v-if="user.profile?.source" :size="tagSize" round type="primary">
{{ user.profile.source }}
</NTag>
- <YouTag v-if="currentUserV1.name === user.name" />
- <SystemBotTag v-if="user.name === SYSTEM_BOT_USER_NAME" />
+ <YouTag v-if="currentUserV1.name === user.name" :size="tagSize"/>
+ <SystemBotTag v-if="user.name === SYSTEM_BOT_USER_NAME" :size="tagSize"/>
<ServiceAccountTag
v-if="user.userType === UserType.SERVICE_ACCOUNT"
+ :size="tagSize"
/>
- <span
+ <NTag v-if="user.mfaEnabled" :size="tagSize" type="success" round>
+ {{ $t("two-factor.enabled") }}
+ </NTag>
+ <!-- <span
v-if="user.mfaEnabled"
class="inline-flex items-center px-2 py-0.5 rounded-lg text-xs bg-green-800 text-green-100"
>
{{ $t("two-factor.enabled") }}
- </span>
+ </span> -->
</div>
- <span v-if="user.name !== SYSTEM_BOT_USER_NAME" class="textlabel">
- {{ user.email }}
- </span>
+ <slot name="footer">
+ <span v-if="user.name !== SYSTEM_BOT_USER_NAME" class="textinfolabel">
+ {{ user.email }}
+ </span>
+ </slot>
</div>
<div
- v-if="user.userType === UserType.SERVICE_ACCOUNT && allowEdit"
+ v-if="user.state === State.ACTIVE && user.userType === UserType.SERVICE_ACCOUNT && allowEdit && hasPermission"
class="ml-3 text-xs"
>
<CopyButton
@@ -85,13 +99,19 @@ import UserAvatar from "@/components/User/UserAvatar.vue";
import { CopyButton } from "@/components/v2";
import { useCurrentUserV1, usePermissionStore } from "@/store";
import { SYSTEM_BOT_USER_NAME } from "@/types";
+import { State } from "@/types/proto-es/v1/common_pb";
import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";
import { hasWorkspacePermissionV2 } from "@/utils";
-defineProps<{
- user: User;
- onClickUser?: (user: User, event: MouseEvent) => void;
-}>();
+const props = withDefaults(
+ defineProps<{
+ user: User;
+ allowEdit?: boolean;
+ size?: "small" | "medium";
+ onClickUser?: (user: User, event: MouseEvent) => void;
+ }>(),
+ { allowEdit: true, size: "medium" }
+);
defineEmits<{
(event: "reset-service-key", user: User): void;
@@ -100,7 +120,21 @@ defineEmits<{
const currentUserV1 = useCurrentUserV1();
const permissionStore = usePermissionStore();
-const allowEdit = computed(() => {
+const hasPermission = computed(() => {
return hasWorkspacePermissionV2("bb.policies.update");
});
+
+const tagSize = computed(() => {
+ if (props.size === "small") {
+ return "tiny";
+ }
+ return "small";
+});
+
+const avatarSize = computed(() => {
+ if (props.size === "small") {
+ return "SMALL";
+ }
+ return "NORMAL";
+});
</script>
diff --git a/frontend/src/components/v2/Model/cells/index.ts b/frontend/src/components/v2/Model/cells/index.ts
index 6696f6c72c..8c19d77fb0 100644
--- a/frontend/src/components/v2/Model/cells/index.ts
+++ b/frontend/src/components/v2/Model/cells/index.ts
@@ -1,5 +1,6 @@
import DatabaseNameCell from "./DatabaseNameCell.vue";
import LabelsCell from "./LabelsCell.vue";
import ProjectNameCell from "./ProjectNameCell.vue";
+import UserNameCell from "./UserNameCell.vue";
-export { DatabaseNameCell, LabelsCell, ProjectNameCell };
+export { DatabaseNameCell, LabelsCell, ProjectNameCell, UserNameCell };
diff --git a/frontend/src/components/v2/Select/ResourceSelect.vue b/frontend/src/components/v2/Select/ResourceSelect.vue
index f48e4730b7..4b6017ed4d 100644
--- a/frontend/src/components/v2/Select/ResourceSelect.vue
+++ b/frontend/src/components/v2/Select/ResourceSelect.vue
@@ -105,8 +105,8 @@ const renderLabel = (option: SelectOption, selected: boolean) => {
);
if (props.multiple) {
return (
- <div class="flex items-start gap-x-2 py-2">
- <NCheckbox checked={selected} size="small" class="mt-2" />
+ <div class="flex items-center gap-x-2 py-2">
+ <NCheckbox checked={selected} size="small" />
{node}
</div>
);
diff --git a/frontend/src/components/v2/Select/UserSelect.vue b/frontend/src/components/v2/Select/UserSelect.vue
index 3c232ff2e5..81cba9f3f2 100644
--- a/frontend/src/components/v2/Select/UserSelect.vue
+++ b/frontend/src/components/v2/Select/UserSelect.vue
@@ -12,7 +12,6 @@
:placeholder="$t('settings.members.select-user', multiple ? 2 : 1)"
:filter="filterByEmail"
:show-resource-name="false"
- class="bb-user-select"
@search="handleSearch"
@update:value="(val) => $emit('update:user', val)"
@update:values="(val) => $emit('update:users', val)"
@@ -22,20 +21,11 @@
<script lang="tsx" setup>
import { useDebounceFn } from "@vueuse/core";
import { computed, onMounted, reactive, watch } from "vue";
-import { useI18n } from "vue-i18n";
-import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";
-import UserAvatar from "@/components/User/UserAvatar.vue";
+import { UserNameCell } from "@/components/v2/Model/cells";
import { extractUserId, type UserFilter, useUserStore } from "@/store";
-import {
- allUsersUser,
- DEBOUNCE_SEARCH_DELAY,
- isValidUserName,
- SYSTEM_BOT_USER_NAME,
- UNKNOWN_USER_NAME,
-} from "@/types";
+import { allUsersUser, DEBOUNCE_SEARCH_DELAY, isValidUserName } from "@/types";
import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";
import { ensureUserFullName, getDefaultPagination } from "@/utils";
-import UserIcon from "~icons/heroicons-outline/user";
import ResourceSelect from "./ResourceSelect.vue";
const props = withDefaults(
@@ -76,7 +66,6 @@ interface LocalState {
rawUserList: User[];
}
-const { t } = useI18n();
const userStore = useUserStore();
const state = reactive<LocalState>({
loading: false,
@@ -148,42 +137,21 @@ onMounted(async () => {
await handleSearch("");
});
-const renderAvatar = (user: User) => {
- if (user.name === UNKNOWN_USER_NAME) {
- return (
- <div class="bb-user-select--avatar w-6 h-6 rounded-full border-2 border-current flex justify-center items-center select-none bg-white">
- <UserIcon class="w-4 h-4 text-main text-current" />
- </div>
- );
- } else {
- return (
- <UserAvatar class="bb-user-select--avatar" user={user} size="SMALL" />
- );
- }
-};
-
const renderLabel = (user: User) => {
- const avatar = renderAvatar(user);
- const title =
- user.name === SYSTEM_BOT_USER_NAME
- ? t("settings.members.system-bot")
- : user.title;
- const children = [<span class="truncate">{title}</span>];
- if (user.name !== UNKNOWN_USER_NAME && user.name !== SYSTEM_BOT_USER_NAME) {
- children.push(
- <span class="text-gray-400 truncate">{`(${user.email})`}</span>
- );
- }
- if (user.userType === UserType.SERVICE_ACCOUNT) {
- children.push(<ServiceAccountTag />);
- }
return (
- <div class="w-full flex items-center gap-x-2">
- {avatar}
- <div class="flex flex-row justify-start items-center gap-x-0.5 truncate">
- {children}
- </div>
- </div>
+ <UserNameCell
+ user={user}
+ allowEdit={false}
+ size="small"
+ onClickUser={() => {}}
+ >
+ {{
+ suffix: () => (
+ <span class="textinfolabel truncate">{`(${user.email})`}</span>
+ ),
+ footer: () => <div />,
+ }}
+ </UserNameCell>
);
};
@@ -227,9 +195,3 @@ watch(
}
);
</script>
-
-<style lang="postcss" scoped>
-.bb-user-select :deep(.n-base-selection--active .bb-user-select--avatar) {
- opacity: 0.3;
-}
-</style>
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 818e76559a..c971ae5ca6 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -410,7 +410,6 @@
"subscription": "(Upgrade to enable role management)"
},
"members": {
- "inactive": "Inactive",
"inactive-users": "Inactive users",
"table": {
"account": "Account",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 238f9370c6..cba2fb3857 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -410,7 +410,6 @@
"subscription": "(Actualice para habilitar la gestión de roles)"
},
"members": {
- "inactive": "Inactivo",
"inactive-users": "Usuarios inactivos",
"table": {
"account": "Cuenta",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index f36b1703cb..f509bd1168 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -410,7 +410,6 @@
"subscription": "(有料プランにアップグレードするとキャラクター管理が可能になります)"
},
"members": {
- "inactive": "非アクティブ",
"inactive-users": "非アクティブユーザー",
"table": {
"account": "アカウント",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 28a489758d..25eea581dd 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -410,7 +410,6 @@
"subscription": "(Nâng cấp để kích hoạt quản lý vai trò)"
},
"members": {
- "inactive": "Không hoạt động",
"inactive-users": "Người dùng không hoạt động",
"table": {
"account": "Tài khoản",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index 9989e85267..d16d3a7e53 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -410,7 +410,6 @@
"subscription": "(升级到付费方案来解锁角色管理)"
},
"members": {
- "inactive": "未激活",
"inactive-users": "未激活用户",
"table": {
"account": "账户",