Browse Source

fix(user-management): show tooltip on hover user display_name

pull/7413/head
Ramesh Mane 10 months ago
parent
commit
1a24ea60ca
  1. 14
      packages/nc-gui/components/account/UserList.vue
  2. 10
      packages/nc-gui/components/project/AccessSettings.vue
  3. 10
      packages/nc-gui/components/workspace/CollaboratorsList.vue

14
packages/nc-gui/components/account/UserList.vue

@ -203,13 +203,13 @@ const openDeleteModal = (user: UserType) => {
data-rec="true" data-rec="true"
> >
<span> <span>
{{ $t('labels.email') }} {{ $t('objects.users') }}
</span> </span>
<LazyAccountUserMenu :direction="sortDirection.email" field="email" :handle-user-sort="saveOrUpdate" /> <LazyAccountUserMenu :direction="sortDirection.email" field="email" :handle-user-sort="saveOrUpdate" />
</div> </div>
<div class="py-3.5 text-gray-500 font-medium text-3.5 w-1/3 text-start flex items-center space-x-2" data-rec="true"> <div class="py-3.5 text-gray-500 font-medium text-3.5 w-1/3 text-start flex items-center space-x-2" data-rec="true">
<span> <span>
{{ $t('objects.role') }} {{ $t('general.access') }}
</span> </span>
<LazyAccountUserMenu :direction="sortDirection.roles" field="roles" :handle-user-sort="saveOrUpdate" /> <LazyAccountUserMenu :direction="sortDirection.roles" field="roles" :handle-user-sort="saveOrUpdate" />
</div> </div>
@ -235,8 +235,16 @@ const openDeleteModal = (user: UserType) => {
}" }"
> >
<div class="text-3.5 text-start w-2/3 pl-5 flex items-center"> <div class="text-3.5 text-start w-2/3 pl-5 flex items-center">
<NcTooltip v-if="el.display_name">
<template #title>
{{ el.email }}
</template>
<GeneralTruncateText length="29"> <GeneralTruncateText length="29">
{{ el.display_name || el.email }} {{ el.display_name }}
</GeneralTruncateText>
</NcTooltip>
<GeneralTruncateText v-else length="29">
{{ el.email }}
</GeneralTruncateText> </GeneralTruncateText>
</div> </div>
<div class="text-3.5 text-start w-1/3"> <div class="text-3.5 text-start w-1/3">

10
packages/nc-gui/components/project/AccessSettings.vue

@ -187,8 +187,16 @@ onMounted(async () => {
> >
<div class="flex gap-3 items-center users-email-grid"> <div class="flex gap-3 items-center users-email-grid">
<GeneralUserIcon size="base" :email="collab.email" /> <GeneralUserIcon size="base" :email="collab.email" />
<NcTooltip v-if="collab.display_name">
<template #title>
{{ collab.email }}
</template>
<span class="truncate"> <span class="truncate">
{{ collab.display_name || collab.email }} {{ collab.display_name }}
</span>
</NcTooltip>
<span v-else class="truncate">
{{ collab.email }}
</span> </span>
</div> </div>
<div class="user-access-grid"> <div class="user-access-grid">

10
packages/nc-gui/components/workspace/CollaboratorsList.vue

@ -100,8 +100,16 @@ onMounted(async () => {
> >
<div class="flex gap-3 items-center users-email-grid w-3/8 ml-10"> <div class="flex gap-3 items-center users-email-grid w-3/8 ml-10">
<GeneralUserIcon size="base" :name="collab.email" :email="collab.email" /> <GeneralUserIcon size="base" :name="collab.email" :email="collab.email" />
<NcTooltip v-if="collab.display_name">
<template #title>
{{ collab.email }}
</template>
<span class="truncate"> <span class="truncate">
{{ collab.display_name || collab.email }} {{ collab.display_name }}
</span>
</NcTooltip>
<span v-else class="truncate">
{{ collab.email }}
</span> </span>
</div> </div>
<div class="user-access-grid w-2/8"> <div class="user-access-grid w-2/8">

Loading…
Cancel
Save