Skip to content

Fix email column inconsistencies in members list #1479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 19, 2023
Merged

Fix email column inconsistencies in members list #1479

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd328ab
Fix email column inconsistencies in members list
peoray Sep 12, 2023
78d15a2
Merge branch 'main' into email-column-inconsistencies
peoray Sep 12, 2023
00b9c1d
Merge branch 'main' into email-column-inconsistencies
peoray Sep 13, 2023
b94116b
Display remaining emails in popover for member list
peoray Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions frontend/src/modules/member/components/list/member-list-table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
class="text-sm cursor-auto flex flex-wrap gap-1"
>
<el-tooltip
v-for="email of scope.row.emails"
v-for="email of scope.row.emails.slice(0, 3)"
:key="email"
:disabled="!email"
popper-class="custom-identity-tooltip"
Expand All @@ -336,6 +336,45 @@
>{{ email }}</a>
</div>
</el-tooltip>
<el-popover
v-if="scope.row.emails?.length > 3"
placement="top"
:width="400"
trigger="hover"
popper-class="support-popover"
>
<template #reference>
<span
class="badge--interactive hover:text-gray-900"
>+{{ scope.row.emails.length - 3 }}</span>
</template>
<div class="flex flex-wrap gap-3 my-1">
<el-tooltip
v-for="email of scope.row.emails.slice(3)"
:key="email"
:disabled="!email"
popper-class="custom-identity-tooltip flex "
placement="top"
>
<template #content>
<span>Send email
<i
v-if="email"
class="ri-external-link-line text-gray-400"
/></span>
</template>
<div @click.prevent>
<a
target="_blank"
rel="noopener noreferrer"
class="badge--interactive"
:href="`mailto:${email}`"
@click.stop="trackEmailClick"
>{{ email }}</a>
</div>
</el-tooltip>
</div>
</el-popover>
</div>
<span v-else class="text-gray-500">-</span>
</router-link>
Expand Down Expand Up @@ -404,14 +443,14 @@ import { useRouter } from 'vue-router';
import {
computed, onMounted, onUnmounted, ref, defineProps, watch,
} from 'vue';
import { storeToRefs } from 'pinia';
import { i18n } from '@/i18n';
import AppMemberListToolbar from '@/modules/member/components/list/member-list-toolbar.vue';
import AppMemberOrganizations from '@/modules/member/components/member-organizations.vue';
import AppTagList from '@/modules/tag/components/tag-list.vue';
import { formatDateToTimeAgo } from '@/utils/date';
import { formatNumberToCompact, formatNumber } from '@/utils/number';
import { useMemberStore } from '@/modules/member/store/pinia';
import { storeToRefs } from 'pinia';
import { MemberService } from '@/modules/member/member-service';
import AppMemberMergeDialog from '@/modules/member/components/member-merge-dialog.vue';
import AppTagPopover from '@/modules/tag/components/tag-popover.vue';
Expand Down