Skip to content

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

refactor: remove the batchGetProjects and batchGetUsers for audit log (#18638)

ecmadaof068e97f262c
diff --git a/frontend/src/components/AuditLog/AuditLogDataTable.vue b/frontend/src/components/AuditLog/AuditLogDataTable.vue
index 0e4e54f8e0..dfc7333761 100644
--- a/frontend/src/components/AuditLog/AuditLogDataTable.vue
+++ b/frontend/src/components/AuditLog/AuditLogDataTable.vue
@@ -18,14 +18,15 @@ import { ExternalLinkIcon } from "lucide-vue-next";
import { type DataTableColumn, NButton, NDataTable } from "naive-ui";
import { computed } from "vue";
import { useI18n } from "vue-i18n";
-import BBAvatar from "@/bbkit/BBAvatar.vue";
-import { useProjectV1Store, useUserStore } from "@/store";
+import { ProjectV1Name } from "@/components/v2";
+import { UserLink } from "@/components/v2/Model/cells";
import {
+ extractUserId,
getProjectIdRolloutUidStageUid,
projectNamePrefix,
rolloutNamePrefix,
} from "@/store/modules/v1/common";
-import { getDateForPbTimestampProtoEs } from "@/types";
+import { emptyProject, getDateForPbTimestampProtoEs } from "@/types";
import { StatusSchema } from "@/types/proto-es/google/rpc/status_pb";
import type { AuditLog } from "@/types/proto-es/v1/audit_log_service_pb";
import {
@@ -68,8 +69,6 @@ const props = withDefaults(
);
const { t } = useI18n();
-const projectStore = useProjectV1Store();
-const userStore = useUserStore();
const columnList = computed((): AuditDataTableColumn[] => {
return (
@@ -77,7 +76,11 @@ const columnList = computed((): AuditDataTableColumn[] => {
{
key: "created-ts",
title: t("audit-log.table.created-ts"),
- width: 240,
+ width: 220,
+ resizable: true,
+ ellipsis: {
+ tooltip: true,
+ },
render: (auditLog) =>
dayjs(getDateForPbTimestampProtoEs(auditLog.createTime)).format(
"YYYY-MM-DD HH:mm:ss Z"
@@ -85,24 +88,27 @@ const columnList = computed((): AuditDataTableColumn[] => {
},
{
key: "severity",
- width: 96,
+ width: 60,
title: t("audit-log.table.level"),
render: (auditLog) => AuditLog_Severity[auditLog.severity],
},
{
key: "project",
- width: 96,
+ width: 120,
title: t("common.project"),
+ resizable: true,
hide: !props.showProject,
render: (auditLog) => {
const projectResourceId = extractProjectResourceName(auditLog.name);
if (!projectResourceId) {
return <span>-</span>;
}
- const project = projectStore.getProjectByName(
- `${projectNamePrefix}${projectResourceId}`
- );
- return <span>{project.title}</span>;
+ const mockProject = {
+ ...emptyProject(),
+ name: `${projectNamePrefix}${projectResourceId}`,
+ title: projectResourceId,
+ };
+ return <ProjectV1Name project={mockProject} />;
},
},
{
@@ -110,23 +116,22 @@ const columnList = computed((): AuditDataTableColumn[] => {
resizable: true,
width: 256,
title: t("audit-log.table.method"),
+ ellipsis: {
+ tooltip: true,
+ },
render: (auditLog) => auditLog.method,
},
{
key: "actor",
- width: 128,
+ width: 180,
title: t("audit-log.table.actor"),
+ resizable: true,
render: (auditLog) => {
- const user = userStore.getUserByIdentifier(auditLog.user);
- if (!user) {
+ if (!auditLog.user) {
return <span>-</span>;
}
- return (
- <div class="flex flex-row items-center overflow-hidden gap-x-1">
- <BBAvatar size="SMALL" username={user.title} />
- <span class="truncate">{user.title}</span>
- </div>
- );
+ const email = extractUserId(auditLog.user);
+ return <UserLink title={email} email={email} />;
},
},
{
diff --git a/frontend/src/components/AuditLog/AuditLogSearch/AuditLogSearch.vue b/frontend/src/components/AuditLog/AuditLogSearch/AuditLogSearch.vue
index e4e77c3928..ba1564c792 100644
--- a/frontend/src/components/AuditLog/AuditLogSearch/AuditLogSearch.vue
+++ b/frontend/src/components/AuditLog/AuditLogSearch/AuditLogSearch.vue
@@ -18,18 +18,15 @@
<script lang="tsx" setup>
import { computed, ref } from "vue";
import { useI18n } from "vue-i18n";
-import { BBAvatar } from "@/bbkit";
import AdvancedSearch, { TimeRange } from "@/components/AdvancedSearch";
import type {
ScopeOption,
ValueOption,
} from "@/components/AdvancedSearch/types";
-import SystemBotTag from "@/components/misc/SystemBotTag.vue";
-import YouTag from "@/components/misc/YouTag.vue";
import { ProjectV1Name } from "@/components/v2";
+import { UserNameCell } from "@/components/v2/Model/cells";
import { ALL_METHODS_WITH_AUDIT } from "@/grpcweb/methods";
-import { useCurrentUserV1, useProjectV1Store, useUserStore } from "@/store";
-import { SYSTEM_BOT_USER_NAME } from "@/types";
+import { useProjectV1Store, useUserStore } from "@/store";
import { AuditLog_Severity } from "@/types/proto-es/v1/audit_log_service_pb";
import { UserType } from "@/types/proto-es/v1/user_service_pb";
import {
@@ -46,7 +43,6 @@ defineEmits<{
}>();
const { t } = useI18n();
-const me = useCurrentUserV1();
const userStore = useUserStore();
const projectStore = useProjectV1Store();
const showTimeRange = ref(false);
@@ -124,18 +120,15 @@ const scopeOptions = computed((): ScopeOption[] => {
value: user.email,
keywords: [user.email, user.title],
render: () => {
- const children = [
- <BBAvatar size="TINY" username={user.title} />,
- <span>{user.title}</span>,
- ];
- if (user.name === me.value.name) {
- children.push(<YouTag />);
- }
- if (user.name === SYSTEM_BOT_USER_NAME) {
- children.push(<SystemBotTag />);
- }
return (
- <div class="flex items-center gap-x-1">{children}</div>
+ <UserNameCell
+ user={user}
+ size="small"
+ allowEdit={false}
+ showMfaEnabled={false}
+ showSource={false}
+ showEmail={false}
+ />
);
},
};
diff --git a/frontend/src/components/Member/MemberDataTable/index.vue b/frontend/src/components/Member/MemberDataTable/index.vue
index 4063ed54e6..26afa345bc 100644
--- a/frontend/src/components/Member/MemberDataTable/index.vue
+++ b/frontend/src/components/Member/MemberDataTable/index.vue
@@ -158,6 +158,7 @@ const columns = computed(
user={binding.user ?? unknownUser()}
onClickUser={props.onClickUser}
allowEdit={false}
+ showMfaEnabled={false}
/>
);
},
diff --git a/frontend/src/components/Member/MemberDataTableByRole.vue b/frontend/src/components/Member/MemberDataTableByRole.vue
index 3a4bbd03f2..b52c274c31 100644
--- a/frontend/src/components/Member/MemberDataTableByRole.vue
+++ b/frontend/src/components/Member/MemberDataTableByRole.vue
@@ -102,6 +102,7 @@ const columns = computed(() => {
user={row.member.user ?? unknownUser()}
onClickUser={props.onClickUser}
allowEdit={false}
+ showMfaEnabled={false}
/>
);
},
diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalCandidate.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalCandidate.vue
deleted file mode 100644
index d5c9fd62f0..0000000000
--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalCandidate.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
- <div
- v-if="candidateUser"
- class="flex items-center py-1 gap-x-1"
- :class="[candidateUser.name === currentUser.name && 'font-bold']"
- >
- <UserAvatar :user="candidateUser" size="SMALL" />
- <span class="whitespace-nowrap">{{ candidateUser.title }}</span>
- <span class="whitespace-nowrap opacity-80">
- ({{ candidateUser.email }})
- </span>
- <span
- v-if="currentUser.name === candidateUser.name"
- class="inline-flex items-center px-1 py-0.5 rounded-lg text-xs font-semibold bg-green-100 text-green-800"
- >
- {{ $t("custom-approval.issue-review.you") }}
- </span>
- </div>
-</template>
-
-<script setup lang="ts">
-import { computedAsync } from "@vueuse/core";
-import UserAvatar from "@/components/User/UserAvatar.vue";
-import { useCurrentUserV1, useUserStore } from "@/store";
-import { State } from "@/types/proto-es/v1/common_pb";
-import { UserType } from "@/types/proto-es/v1/user_service_pb";
-
-const props = defineProps<{
- // candidate in users/{email} format.
- candidate: string;
-}>();
-
-const currentUser = useCurrentUserV1();
-const userStore = useUserStore();
-
-const candidateUser = computedAsync(async () => {
- const user = await userStore.getOrFetchUserByIdentifier(props.candidate);
- if (!user) {
- return;
- }
- if (user.userType !== UserType.USER || user.state !== State.ACTIVE) {
- return;
- }
- return user;
-});
-</script>
diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue
index 9ffe01b2d6..c4b1f5121e 100644
--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue
+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalStepItem.vue
@@ -29,27 +29,25 @@
</div>
<div class="mt-1 text-sm text-gray-600">
<template v-if="status === 'approved'">
- <div class="flex items-center gap-1">
+ <div class="flex flex-col items-start gap-1">
<span class="text-xs">{{
$t("custom-approval.issue-review.approved-by")
}}</span>
<ApprovalUserView
v-if="stepApprover"
:candidate="stepApprover.principal"
- size="tiny"
/>
</div>
</template>
<template v-else-if="status === 'rejected'">
<div class="flex flex-col gap-1">
- <div class="flex items-center gap-1">
+ <div class="flex flex-col items-start gap-1">
<span class="text-xs">{{
$t("custom-approval.issue-review.rejected-by")
}}</span>
<ApprovalUserView
v-if="stepApprover"
:candidate="stepApprover.principal"
- size="tiny"
/>
</div>
<!-- Re-request review button for issue creator -->
diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalUserView.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalUserView.vue
index 65c114b96e..c21a64dcfb 100644
--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalUserView.vue
+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/ApprovalUserView.vue
@@ -1,54 +1,29 @@
<template>
- <div v-if="candidateUser" class="inline-flex items-center gap-1">
- <UserAvatar :user="candidateUser" :size="avatarSize" />
- <span class="text-xs font-medium">{{ candidateUser.title }}</span>
- <NTag
- v-if="currentUser.name === candidateUser.name"
- size="tiny"
- round
- type="success"
- >
- {{ $t("custom-approval.issue-review.you") }}
- </NTag>
- </div>
+ <UserNameCell
+ v-if="candidateUser"
+ :user="candidateUser"
+ size="tiny"
+ :show-mfa-enabled="false"
+ :show-source="false"
+ :allow-edit="false"
+ :show-email="false"
+ />
</template>
<script setup lang="ts">
import { computedAsync } from "@vueuse/core";
-import { NTag } from "naive-ui";
-import { computed } from "vue";
-import UserAvatar from "@/components/User/UserAvatar.vue";
-import { useCurrentUserV1, useUserStore } from "@/store";
+import { UserNameCell } from "@/components/v2/Model/cells";
+import { useUserStore } from "@/store";
import { State } from "@/types/proto-es/v1/common_pb";
import { UserType } from "@/types/proto-es/v1/user_service_pb";
-type SizeType = "tiny" | "small" | "normal";
+const props = defineProps<{
+ // candidate in users/{email} format.
+ candidate: string;
+}>();
-const props = withDefaults(
- defineProps<{
- // candidate in users/{email} format.
- candidate: string;
- size?: SizeType;
- }>(),
- {
- size: "normal",
- }
-);
-
-const currentUser = useCurrentUserV1();
const userStore = useUserStore();
-const avatarSize = computed(() => {
- switch (props.size) {
- case "tiny":
- return "TINY";
- case "small":
- return "SMALL";
- default:
- return "NORMAL";
- }
-});
-
const candidateUser = computedAsync(async () => {
const user = await userStore.getOrFetchUserByIdentifier(props.candidate);
if (!user) {
diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/PotentialApprovers.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/PotentialApprovers.vue
index e8f4ad368c..611378c600 100644
--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/PotentialApprovers.vue
+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/PotentialApprovers.vue
@@ -13,21 +13,29 @@
</template>
<div class="max-w-xs">
<div class="flex flex-col gap-y-1 max-h-64 overflow-y-auto">
- <ApprovalCandidate
+ <UserNameCell
v-for="user in users"
- :key="user.email"
- :candidate="`users/${user.email}`"
+ :key="user.name"
+ :user="user"
+ size="small"
+ :show-mfa-enabled="false"
+ :show-source="false"
+ :allow-edit="false"
/>
</div>
</div>
</NPopover>
<!-- Show user avatars when 3 or fewer users -->
<div v-else class="flex flex-col items-start gap-1">
- <UserView
+ <UserNameCell
v-for="user in users"
- :key="user.email"
+ :key="user.name"
:user="user"
size="tiny"
+ :show-mfa-enabled="false"
+ :show-source="false"
+ :allow-edit="false"
+ :show-email="false"
/>
</div>
</template>
@@ -37,9 +45,8 @@
import { NPopover } from "naive-ui";
import { computed } from "vue";
import { useI18n } from "vue-i18n";
-import UserView from "@/components/User/UserView.vue";
+import { UserNameCell } from "@/components/v2/Model/cells";
import type { User as UserType } from "@/types/proto-es/v1/user_service_pb";
-import ApprovalCandidate from "./ApprovalCandidate.vue";
const props = defineProps<{
users: UserType[];
diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/DatabaseChangeSection.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/DatabaseChangeSection.vue
index 99ea306a0d..739d231b2f 100644
--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/DatabaseChangeSection.vue
+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/DatabaseChangeSection.vue
@@ -57,7 +57,7 @@
</div>
</div>
- <NDivider class="!my-0" />
+ <NDivider class="my-0!" />
<ChecksDrawer
v-if="selectedResultStatus"
diff --git a/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue b/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
index e83e1fba3e..e00e6b09ef 100644
--- a/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
+++ b/frontend/src/components/SensitiveData/MaskingExceptionUserTable.vue
@@ -21,14 +21,14 @@ import { NDataTable, NDatePicker, NTooltip, useDialog } from "naive-ui";
import type { VNodeChild } from "vue";
import { computed, h, reactive, watchEffect } from "vue";
import { useI18n } from "vue-i18n";
-import { RouterLink, useRouter } from "vue-router";
+import { useRouter } from "vue-router";
import GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";
import {
DatabaseV1Name,
InstanceV1Name,
MiniActionButton,
} from "@/components/v2";
-import { WORKSPACE_ROUTE_USER_PROFILE } from "@/router/dashboard/workspaceRoutes";
+import { UserNameCell } from "@/components/v2/Model/cells";
import {
composePolicyBindings,
extractGroupEmail,
@@ -57,7 +57,6 @@ import {
batchConvertFromCELString,
type ConditionExpression,
} from "@/utils/issue/cel";
-import UserAvatar from "../User/UserAvatar.vue";
import { type AccessUser } from "./types";
interface LocalState {
@@ -206,7 +205,8 @@ const getAccessUsers = (
const result: AccessUser[] = [];
for (const member of exception.members) {
const access: AccessUser = {
- type: "user",
+ type: member.startsWith(groupBindingPrefix) ? "group" : "user",
+ member,
key: `${member}:${expression}.${description}`,
expirationTimestamp,
rawExpression: expression,
@@ -217,16 +217,12 @@ const getAccessUsers = (
};
if (member.startsWith(groupBindingPrefix)) {
- access.type = "group";
access.group = groupStore.getGroupByIdentifier(member);
} else {
- access.type = "user";
access.user = userStore.getUserByIdentifier(member);
}
- if (access.group || access.user) {
- result.push(access);
- }
+ result.push(access);
}
return result;
@@ -305,29 +301,20 @@ const accessTableColumns = computed(
title: t("common.members"),
resizable: true,
render: (item: AccessUser) => {
- if (item.type === "group") {
- return <GroupNameCell group={item.group!} />;
+ if (item.group) {
+ return <GroupNameCell group={item.group} />;
+ } else if (item.user) {
+ return (
+ <UserNameCell
+ user={item.user}
+ size="small"
+ allowEdit={false}
+ showMfaEnabled={false}
+ showSource={false}
+ />
+ );
}
-
- return (
- <div class="flex items-center gap-x-2">
- <UserAvatar size="SMALL" user={item.user} />
- <div class="flex flex-col">
- <RouterLink
- to={{
- name: WORKSPACE_ROUTE_USER_PROFILE,
- params: {
- principalEmail: item.user!.email,
- },
- }}
- class="normal-link"
- >
- {item.user!.title}
- </RouterLink>
- <span class="textinfolabel">{item.user!.email}</span>
- </div>
- </div>
- );
+ return <span>{item.member}</span>;
},
},
{
diff --git a/frontend/src/components/SensitiveData/types.ts b/frontend/src/components/SensitiveData/types.ts
index 51210d1538..e9a9b11ae3 100644
--- a/frontend/src/components/SensitiveData/types.ts
+++ b/frontend/src/components/SensitiveData/types.ts
@@ -28,6 +28,7 @@ export interface SensitiveColumn {
export interface AccessUser {
type: "user" | "group";
key: string;
+ member: string;
group?: Group;
user?: User;
expirationTimestamp?: number;
diff --git a/frontend/src/components/TenantIcon.vue b/frontend/src/components/TenantIcon.vue
deleted file mode 100644
index 20d6bf1558..0000000000
--- a/frontend/src/components/TenantIcon.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- fill="none"
- viewBox="0 0 24 24"
- stroke-width="1.5"
- stroke="currentColor"
- class="w-4 h-4"
- v-bind="$attrs"
- >
- <path
- stroke-linecap="round"
- stroke-linejoin="round"
- d="M6 6.878V6a2.25 2.25 0 012.25-2.25h7.5A2.25 2.25 0 0118 6v.878m-12 0c.235-.083.487-.128.75-.128h10.5c.263 0 .515.045.75.128m-12 0A2.25 2.25 0 004.5 9v.878m13.5-3A2.25 2.25 0 0119.5 9v.878m0 0a2.246 2.246 0 00-.75-.128H5.25c-.263 0-.515.045-.75.128m15 0A2.25 2.25 0 0121 12v6a2.25 2.25 0 01-2.25 2.25H5.25A2.25 2.25 0 013 18v-6c0-.98.626-1.813 1.5-2.122"
- />
- </svg>
-</template>
diff --git a/frontend/src/components/User/Settings/CreateUserDrawer.vue b/frontend/src/components/User/Settings/CreateUserDrawer.vue
index 0f23c0ff60..bc3399f74b 100644
--- a/frontend/src/components/User/Settings/CreateUserDrawer.vue
+++ b/frontend/src/components/User/Settings/CreateUserDrawer.vue
@@ -693,6 +693,8 @@ const tryCreateOrUpdateUser = async () => {
title: t("common.created"),
});
emit("close");
+ } catch {
+ // nothing
} finally {
state.isRequesting = false;
}
diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vue
index b7368d1d35..ac16bc9b6a 100644
--- a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vue
+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupMemberNameCell.vue
@@ -1,69 +1,41 @@
<template>
- <div class="flex flex-row items-center shrink 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">
- <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">
- {{ user.title }}
- </router-link>
- <YouTag v-if="currentUserV1.name === user.name" />
- <SystemBotTag v-if="user.name === SYSTEM_BOT_USER_NAME" />
- <ServiceAccountTag
- v-if="user.userType === UserType.SERVICE_ACCOUNT"
- />
- <NTag
- v-if="role"
- size="small"
- round
- :type="role === GroupMember_Role.OWNER ? 'primary' : 'default'"
- >
- {{
- (() => {
- switch (role) {
- case GroupMember_Role.OWNER:
- return $t("settings.members.groups.form.role.owner");
- case GroupMember_Role.MEMBER:
- return $t("settings.members.groups.form.role.member");
- default:
- return "ROLE UNRECOGNIZED";
- }
- })()
- }}
- </NTag>
- </div>
- <span v-if="user.name !== SYSTEM_BOT_USER_NAME" class="textlabel">
- {{ user.email }}
- </span>
- </div>
- </div>
- </div>
+ <UserNameCell
+ :allow-edit="false"
+ :show-mfa-enabled="false"
+ :show-source="false"
+ :user="user"
+ :on-click-user="onClickUser"
+ >
+ <template #suffix>
+ <NTag
+ v-if="role"
+ size="small"
+ round
+ class="mx-1"
+ :type="role === GroupMember_Role.OWNER ? 'primary' : 'default'"
+ >
+ {{
+ (() => {
+ switch (role) {
+ case GroupMember_Role.OWNER:
+ return $t("settings.members.groups.form.role.owner");
+ case GroupMember_Role.MEMBER:
+ return $t("settings.members.groups.form.role.member");
+ default:
+ return "ROLE UNRECOGNIZED";
+ }
+ })()
+ }}
+ </NTag>
+ </template>
+ </UserNameCell>
</template>
<script lang="ts" setup>
import { NTag } from "naive-ui";
-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 } from "@/types";
+import { UserNameCell } from "@/components/v2/Model/cells";
import { GroupMember_Role } from "@/types/proto-es/v1/group_service_pb";
-import { type User, UserType } from "@/types/proto-es/v1/user_service_pb";
+import { type User } from "@/types/proto-es/v1/user_service_pb";
withDefaults(
defineProps<{
@@ -76,11 +48,4 @@ withDefaults(
onClickUser: undefined,
}
);
-
-defineEmits<{
- (event: "reset-service-key", user: User): void;
-}>();
-
-const currentUserV1 = useCurrentUserV1();
-const permissionStore = usePermissionStore();
</script>
diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue
index fc1c11a575..916b7eccfb 100644
--- a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue
+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue
@@ -3,7 +3,11 @@
<UsersIcon v-if="showIcon" class="w-8" />
<div>
<div class="flex items-center gap-x-2">
- <div :class="deleted ? 'line-through' : ''">
+ <NEllipsis
+ :line-clamp="1"
+ :tooltip="true"
+ :class="deleted ? 'line-through' : ''"
+ >
<router-link
v-if="allowGetGroup && link"
:to="{
@@ -25,33 +29,38 @@
:text="group.title"
:keyword="keyword"
/>
- </div>
+ </NEllipsis>
<NTag v-if="deleted" size="small" round type="error">
{{ $t("common.deleted") }}
</NTag>
- <NTag v-if="group.source" size="small" round type="primary">
+ <NTag v-else-if="group.source" size="small" round type="primary">
{{ group.source }}
</NTag>
- <span class="font-normal text-control-light">
+ <span v-if="showMember" class="font-normal text-control-light">
{{
`(${$t("settings.members.groups.n-members", { n: group.members.length })})`
}}
</span>
<UserRolesCell v-if="role" :role="role" />
</div>
- <HighlightLabelText
+ <NEllipsis
v-if="showEmail && group.email"
- class="textinfolabel text-sm"
- :text="group.email"
- :keyword="keyword"
- />
+ :line-clamp="1"
+ :tooltip="true"
+ >
+ <HighlightLabelText
+ class="textinfolabel text-sm"
+ :text="group.email"
+ :keyword="keyword"
+ />
+ </NEllipsis>
</div>
</div>
</template>
<script lang="ts" setup>
import { UsersIcon } from "lucide-vue-next";
-import { NTag } from "naive-ui";
+import { NEllipsis, NTag } from "naive-ui";
import { computed } from "vue";
import UserRolesCell from "@/components/Member/MemberDataTable/cells/UserRolesCell.vue";
import type { MemberRole } from "@/components/Member/types";
@@ -67,6 +76,7 @@ const props = withDefaults(
role?: MemberRole;
showIcon?: boolean;
showEmail?: boolean;
+ showMember?: boolean;
link?: boolean;
deleted?: boolean;
keyword?: string;
@@ -77,7 +87,7 @@ const props = withDefaults(
role: undefined,
link: true,
deleted: false,
- keyword: "",
+ showMember: true,
}
);
diff --git a/frontend/src/components/User/UserView.vue b/frontend/src/components/User/UserView.vue
deleted file mode 100644
index 03295d5130..0000000000
--- a/frontend/src/components/User/UserView.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
- <div class="inline-flex items-center gap-1">
- <UserAvatar :user="user" :size="avatarSize" />
- <span v-if="showName" :class="textClass">
- {{ displayName }}
- </span>
- </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from "vue";
-import type { BBAvatarSizeType } from "@/bbkit/types";
-import type { User } from "@/types/proto-es/v1/user_service_pb";
-import UserAvatar from "./UserAvatar.vue";
-
-type SizeType = "tiny" | "small" | "normal" | "large";
-
-const props = withDefaults(
- defineProps<{
- user: User;
- size?: SizeType;
- showName?: boolean;
- nameOnly?: boolean;
- }>(),
- {
- size: "normal",
- showName: true,
- nameOnly: false,
- }
-);
-
-const displayName = computed(() => {
- if (props.nameOnly) {
- return props.user.title || props.user.email.split("@")[0];
- }
- return props.user.title || props.user.email;
-});
-
-const avatarSize = computed((): BBAvatarSizeType => {
- const sizeMap: Record<SizeType, BBAvatarSizeType> = {
- tiny: "TINY",
- small: "SMALL",
- normal: "NORMAL",
- large: "LARGE",
- };
- return sizeMap[props.size];
-});
-
-const textClass = computed(() => {
- const sizeClasses: Record<SizeType, string> = {
- tiny: "text-xs",
- small: "text-sm",
- normal: "text-base",
- large: "text-lg",
- };
- return sizeClasses[props.size];
-});
-</script>
diff --git a/frontend/src/components/v2/Model/HighlightLabelText.vue b/frontend/src/components/v2/Model/HighlightLabelText.vue
index 31fb8fa6af..233d673e7e 100644
--- a/frontend/src/components/v2/Model/HighlightLabelText.vue
+++ b/frontend/src/components/v2/Model/HighlightLabelText.vue
@@ -1,5 +1,5 @@
<template>
- <span v-if="!keyword.trim()" v-bind="$attrs">{{ text }}</span>
+ <span v-if="!keyword?.trim()" v-bind="$attrs">{{ text }}</span>
<!-- eslint-disable-next-line vue/no-v-html -->
<span v-else v-bind="$attrs" v-html="html" />
</template>
@@ -11,13 +11,13 @@ import { getHighlightHTMLByRegExp } from "@/utils";
const props = defineProps<{
text: string;
- keyword: string;
+ keyword?: string;
}>();
const html = computed(() => {
return getHighlightHTMLByRegExp(
escape(props.text),
- escape(props.keyword.trim()),
+ escape(props.keyword?.trim() ?? ""),
false /* !caseSensitive */
);
});
diff --git a/frontend/src/components/v2/Model/ProjectV1Name.vue b/frontend/src/components/v2/Model/ProjectV1Name.vue
index 59dd3620c2..6545d209ca 100644
--- a/frontend/src/components/v2/Model/ProjectV1Name.vue
+++ b/frontend/src/components/v2/Model/ProjectV1Name.vue
@@ -5,7 +5,7 @@
class="inline-flex items-center gap-x-1"
:class="link && !plain && 'normal-link'"
>
- <NPerformantEllipsis>
+ <NPerformantEllipsis :line-clamp="1" :tooltip="true">
<HighlightLabelText :text="projectV1Name(project)" :keyword="keyword" />
</NPerformantEllipsis>
</component>
diff --git a/frontend/src/components/v2/Model/cells/UserLink.vue b/frontend/src/components/v2/Model/cells/UserLink.vue
new file mode 100644
index 0000000000..8c497f9059
--- /dev/null
+++ b/frontend/src/components/v2/Model/cells/UserLink.vue
@@ -0,0 +1,37 @@
+<template>
+ <component
+ :is="isLink ? 'router-link' : 'div'"
+ class="truncate max-w-[10em]"
+ :class="isLink && 'normal-link'"
+ :to="`/users/${email}`"
+ >
+ <HighlightLabelText
+ :keyword="keyword ?? ''"
+ :text="title"
+ />
+ </component>
+</template>
+
+<script lang="tsx" setup>
+import { computed } from "vue";
+import { HighlightLabelText } from "@/components/v2";
+import { usePermissionStore } from "@/store";
+
+const props = withDefaults(
+ defineProps<{
+ email: string;
+ title: string;
+ keyword?: string;
+ link?: boolean;
+ }>(),
+ {
+ link: true,
+ }
+);
+
+const permissionStore = usePermissionStore();
+
+const isLink = computed(
+ () => props.link && !permissionStore.onlyWorkspaceMember
+);
+</script>
\ No newline at end of file
diff --git a/frontend/src/components/v2/Model/cells/UserNameCell.vue b/frontend/src/components/v2/Model/cells/UserNameCell.vue
index 082722a334..2fa254fc0d 100644
--- a/frontend/src/components/v2/Model/cells/UserNameCell.vue
+++ b/frontend/src/components/v2/Model/cells/UserNameCell.vue
@@ -7,37 +7,26 @@
<div class="flex flex-row items-center gap-x-1">
<div :class="isDeleted ? 'line-through' : ''">
<HighlightLabelText
- v-if="permissionStore.onlyWorkspaceMember"
- class="truncate max-w-[10em]"
+ v-if="onClickUser"
+ class="truncate max-w-40"
:keyword="keyword"
:text="user.title"
+ @click="onClickUser(user, $event)"
+ />
+ <UserLink
+ v-else
+ :keyword="keyword"
+ :title="user.title"
+ :email="user.email"
+ :link="link"
/>
- <template v-else>
- <HighlightLabelText
- v-if="onClickUser || !link"
- :class="['truncate max-w-40', link ? 'normal-link' : '']"
- :keyword="keyword"
- :text="user.title"
- @click="onClickUser ? onClickUser(user, $event) : null"
- />
- <router-link
- v-else
- :to="`/users/${user.email}`"
- class="normal-link truncate max-w-[10em]"
- >
- <HighlightLabelText
- :keyword="keyword"
- :text="user.title"
- />
- </router-link>
- </template>
</div>
<slot name="suffix">
</slot>
<NTag v-if="isDeleted" :size="tagSize" type="error" round>
{{$t("common.deleted")}}
</NTag>
- <NTag v-if="user.profile?.source" :size="tagSize" round type="primary">
+ <NTag v-if="user.profile?.source && showSource" :size="tagSize" round type="primary">
{{ user.profile.source }}
</NTag>
<YouTag v-if="currentUserV1.name === user.name" :size="tagSize"/>
@@ -50,14 +39,19 @@
v-if="user.userType === UserType.WORKLOAD_IDENTITY"
:size="tagSize"
/>
- <NTag v-if="user.mfaEnabled" :size="tagSize" type="success" round>
+ <NTag v-if="user.mfaEnabled && showMfaEnabled" :size="tagSize" type="success" round>
{{ $t("two-factor.enabled") }}
</NTag>
</div>
<slot name="footer">
- <span v-if="user.name !== SYSTEM_BOT_USER_NAME" class="textinfolabel">
+ <NEllipsis
+ v-if="user.name !== SYSTEM_BOT_USER_NAME && showEmail"
+ class="textinfolabel"
+ :line-clamp="1"
+ :tooltip="true"
+ >
{{ user.email }}
- </span>
+ </NEllipsis>
</slot>
</div>
<div
@@ -92,7 +86,7 @@
<script lang="ts" setup>
import { ReplyIcon } from "lucide-vue-next";
-import { NButton, NTag } from "naive-ui";
+import { NButton, NEllipsis, NTag } from "naive-ui";
import { computed } from "vue";
import ServiceAccountTag from "@/components/misc/ServiceAccountTag.vue";
import SystemBotTag from "@/components/misc/SystemBotTag.vue";
@@ -100,22 +94,33 @@ import WorkloadIdentityTag from "@/components/misc/WorkloadIdentityTag.vue";
import YouTag from "@/components/misc/YouTag.vue";
import UserAvatar from "@/components/User/UserAvatar.vue";
import { CopyButton, HighlightLabelText } from "@/components/v2";
-import { useCurrentUserV1, usePermissionStore } from "@/store";
+import { useCurrentUserV1 } 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";
+import UserLink from "./UserLink.vue";
const props = withDefaults(
defineProps<{
user: User;
allowEdit?: boolean;
keyword?: string;
- size?: "small" | "medium";
+ size?: "tiny" | "small" | "medium";
link?: boolean;
+ showSource?: boolean;
+ showMfaEnabled?: boolean;
+ showEmail?: boolean;
onClickUser?: (user: User, event: MouseEvent) => void;
}>(),
- { allowEdit: true, size: "medium", link: true, keyword: "" }
+ {
+ allowEdit: true,
+ size: "medium",
+ link: true,
+ showSource: true,
+ showMfaEnabled: true,
+ showEmail: true,
+ }
);
defineEmits<{
@@ -123,7 +128,6 @@ defineEmits<{
}>();
const currentUserV1 = useCurrentUserV1();
-const permissionStore = usePermissionStore();
const hasPermission = computed(() => {
return hasWorkspacePermissionV2("bb.policies.update");
@@ -132,16 +136,20 @@ const hasPermission = computed(() => {
const isDeleted = computed(() => props.user.state === State.DELETED);
const tagSize = computed(() => {
- if (props.size === "small") {
+ if (props.size === "tiny") {
return "tiny";
}
return "small";
});
const avatarSize = computed(() => {
- if (props.size === "small") {
- return "SMALL";
+ switch (props.size) {
+ case "tiny":
+ return "TINY";
+ case "small":
+ return "SMALL";
+ default:
+ return "NORMAL";
}
- return "NORMAL";
});
</script>
diff --git a/frontend/src/components/v2/Model/cells/index.ts b/frontend/src/components/v2/Model/cells/index.ts
index 8c19d77fb0..72d0246f1a 100644
--- a/frontend/src/components/v2/Model/cells/index.ts
+++ b/frontend/src/components/v2/Model/cells/index.ts
@@ -2,5 +2,12 @@ import DatabaseNameCell from "./DatabaseNameCell.vue";
import LabelsCell from "./LabelsCell.vue";
import ProjectNameCell from "./ProjectNameCell.vue";
import UserNameCell from "./UserNameCell.vue";
+import UserLink from "./UserLink.vue";
-export { DatabaseNameCell, LabelsCell, ProjectNameCell, UserNameCell };
+export {
+ DatabaseNameCell,
+ LabelsCell,
+ ProjectNameCell,
+ UserNameCell,
+ UserLink,
+};
diff --git a/frontend/src/components/v2/Select/UserSelect.vue b/frontend/src/components/v2/Select/UserSelect.vue
index 176f47d1c3..d64fa21ae0 100644
--- a/frontend/src/components/v2/Select/UserSelect.vue
+++ b/frontend/src/components/v2/Select/UserSelect.vue
@@ -131,6 +131,9 @@ const customLabel = (user: User, keyword: string) => {
<UserNameCell
user={user}
allowEdit={false}
+ showMfaEnabled={false}
+ showSource={false}
+ showEmail={false}
link={false}
size="small"
keyword={keyword}
@@ -142,7 +145,6 @@ const customLabel = (user: User, keyword: string) => {
(<HighlightLabelText keyword={keyword} text={user.email} />)
</span>
),
- footer: () => <div />,
}}
</UserNameCell>
);
diff --git a/frontend/src/composables/useRouteHash.ts b/frontend/src/composables/useRouteHash.ts
deleted file mode 100644
index be952ebdf8..0000000000
--- a/frontend/src/composables/useRouteHash.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { computed } from "vue";
-import { useRoute, useRouter } from "vue-router";
-
-export const useRouteHash = <TS extends readonly string[]>(
- defaultValue: TS[number],
- values?: TS,
- method: "replace" | "push" = "replace"
-) => {
- type T = TS[number];
-
- const route = useRoute();
- const router = useRouter();
- const normalize = (value: T): T => {
- if (!values) return value;
- if (values.includes(value)) return value;
- return defaultValue;
- };
- return computed<T>({
- get() {
- const hash = (route.hash ?? "").replace(/^#?/, "") as T;
- return normalize(hash || defaultValue);
- },
- set(value) {
- value = normalize(value);
- router[method](`#${value}`);
- },
- });
-};
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index fe0393dad4..a1e419ab40 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -2712,7 +2712,6 @@
},
"issue-review": {
"approve-issue": "Approve issue?",
- "you": "You",
"generating-approval-flow": "Generating approval flow",
"approved-issue": "approved issue",
"disallow-approve-reason": {
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 503c659289..dec26d0eab 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -2712,7 +2712,6 @@
},
"issue-review": {
"approve-issue": "¿Aprobar incidencia?",
- "you": "Tú",
"generating-approval-flow": "Generando flujo de aprobación",
"approved-issue": "incidencia aprobada",
"disallow-approve-reason": {
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 2f2f1f5e38..80b0123f84 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -2712,7 +2712,6 @@
},
"issue-review": {
"approve-issue": "イシューを承認しますか?",
- "you": "あなた",
"generating-approval-flow": "承認フローが生成されています",
"approved-issue": "イシューを承認する",
"disallow-approve-reason": {
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 6c4252b728..6f8151d9ee 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -2712,7 +2712,6 @@
},
"issue-review": {
"approve-issue": "Phê duyệt vấn đề?",
- "you": "Bạn",
"generating-approval-flow": "Đang tạo quy trình phê duyệt",
"approved-issue": "đã phê duyệt vấn đề",
"disallow-approve-reason": {
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index a6a5cd9f7d..b51848f444 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -2712,7 +2712,6 @@
},
"issue-review": {
"approve-issue": "批准工单?",
- "you": "你",
"generating-approval-flow": "正在生成审批流",
"approved-issue": "批准工单",
"disallow-approve-reason": {
diff --git a/frontend/src/views/SettingWorkspaceAuditLog.vue b/frontend/src/views/SettingWorkspaceAuditLog.vue
index acd4b0d6d2..f415ef09f2 100644
--- a/frontend/src/views/SettingWorkspaceAuditLog.vue
+++ b/frontend/src/views/SettingWorkspaceAuditLog.vue
@@ -52,18 +52,12 @@ import type {
import DataExportButton from "@/components/DataExportButton.vue";
import { FeatureAttention } from "@/components/FeatureGuard";
import PagedTable from "@/components/v2/Model/PagedTable.vue";
-import {
- featureToRef,
- useAuditLogStore,
- useProjectV1Store,
- useUserStore,
-} from "@/store";
-import { projectNamePrefix } from "@/store/modules/v1/common";
+import { featureToRef, useAuditLogStore } from "@/store";
import { type SearchAuditLogsParams } from "@/types";
import type { AuditLog } from "@/types/proto-es/v1/audit_log_service_pb";
import { ExportFormat } from "@/types/proto-es/v1/common_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
-import { extractProjectResourceName, type SearchParams } from "@/utils";
+import { type SearchParams } from "@/utils";
interface LocalState {
params: SearchParams;
@@ -89,7 +83,6 @@ const state = reactive<LocalState>({
});
const { t } = useI18n();
const auditLogStore = useAuditLogStore();
-const projectStore = useProjectV1Store();
const auditLogPagedTable = ref<ComponentExposed<typeof PagedTable<AuditLog>>>();
const hasAuditLogFeature = featureToRef(PlanFeature.FEATURE_AUDIT_LOG);
@@ -112,16 +105,6 @@ const fetchAuditLog = async ({
pageToken,
pageSize,
});
- await projectStore.batchGetOrFetchProjects(
- auditLogs.map((auditLog) => {
- const projectResourceId = extractProjectResourceName(auditLog.name);
- if (!projectResourceId) {
- return "";
- }
- return `${projectNamePrefix}${projectResourceId}`;
- })
- );
- await useUserStore().batchGetOrFetchUsers(auditLogs.map((log) => log.user));
return { nextPageToken, list: auditLogs };
};
diff --git a/frontend/src/views/project/ProjectAuditLogDashboard.vue b/frontend/src/views/project/ProjectAuditLogDashboard.vue
index 6e32877f03..79e0743a90 100644
--- a/frontend/src/views/project/ProjectAuditLogDashboard.vue
+++ b/frontend/src/views/project/ProjectAuditLogDashboard.vue
@@ -54,7 +54,7 @@ import type {
import DataExportButton from "@/components/DataExportButton.vue";
import { FeatureAttention } from "@/components/FeatureGuard";
import PagedTable from "@/components/v2/Model/PagedTable.vue";
-import { featureToRef, useAuditLogStore, useUserStore } from "@/store";
+import { featureToRef, useAuditLogStore } from "@/store";
import { type SearchAuditLogsParams } from "@/types";
import type { AuditLog } from "@/types/proto-es/v1/audit_log_service_pb";
import { ExportFormat } from "@/types/proto-es/v1/common_pb";
@@ -122,7 +122,6 @@ const fetchAuditLog = async ({
pageToken,
pageSize,
});
- await useUserStore().batchGetOrFetchUsers(auditLogs.map((log) => log.user));
return { nextPageToken, list: auditLogs };
};