diff --git a/packages/nc-gui/components/account/UserList.vue b/packages/nc-gui/components/account/UserList.vue
index b73f89c4d8..8ffe11c589 100644
--- a/packages/nc-gui/components/account/UserList.vue
+++ b/packages/nc-gui/components/account/UserList.vue
@@ -203,13 +203,13 @@ const openDeleteModal = (user: UserType) => {
data-rec="true"
>
- {{ $t('labels.email') }}
+ {{ $t('objects.users') }}
- {{ $t('objects.role') }}
+ {{ $t('general.access') }}
@@ -235,7 +235,15 @@ const openDeleteModal = (user: UserType) => {
}"
>
-
+
+
+ {{ el.email }}
+
+
+ {{ el.display_name }}
+
+
+
{{ el.email }}
diff --git a/packages/nc-gui/components/cell/Text.vue b/packages/nc-gui/components/cell/Text.vue
index c8d69d06f0..29cb2e17b1 100644
--- a/packages/nc-gui/components/cell/Text.vue
+++ b/packages/nc-gui/components/cell/Text.vue
@@ -60,5 +60,5 @@ const focus: VNodeRef = (el) =>
{{ $t('general.null') }}
-
+
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index cfcd2b44e1..9070a744c2 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -30,6 +30,7 @@ interface Collaborators {
base_roles: Roles
workspace_roles: WorkspaceUserRoles
created_at: string
+ display_name: string | null
}
const collaborators = ref([])
const totalCollaborators = ref(0)
@@ -40,7 +41,9 @@ const isSearching = ref(false)
const accessibleRoles = ref<(typeof ProjectRoles)[keyof typeof ProjectRoles][]>([])
const filteredCollaborators = computed(() =>
- collaborators.value.filter((collab) => collab.email.toLowerCase().includes(userSearchText.value.toLowerCase())),
+ collaborators.value.filter((collab) =>
+ (collab.display_name || collab.email).toLowerCase().includes(userSearchText.value.toLowerCase()),
+ ),
)
const sortedCollaborators = computed(() => {
@@ -182,7 +185,15 @@ onMounted(async () => {
>
-
+
+
+ {{ collab.email }}
+
+
+ {{ collab.display_name }}
+
+
+
{{ collab.email }}
diff --git a/packages/nc-gui/components/smartsheet/header/Cell.vue b/packages/nc-gui/components/smartsheet/header/Cell.vue
index 8cced36a08..456379a4e0 100644
--- a/packages/nc-gui/components/smartsheet/header/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/header/Cell.vue
@@ -1,6 +1,18 @@