diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js index bbb2f3806..46773c7d8 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js @@ -68,6 +68,16 @@ const defaultData = { }, } +const defaultUser = { + firstName: 'Peter', + lastName: 'Lustig', + humhubUsername: 'peter.lustig', + createdAt: new Date().toString(), + emailContact: { + email: 'peter.lustig@example.com', + }, +} + describe('ContributionMessagesList', () => { let wrapper let mockMessages @@ -98,6 +108,7 @@ describe('ContributionMessagesList', () => { memo: 'test memo', userId: 108, status: 'PENDING', + user: defaultUser, }, hideResubmission: true, }, @@ -139,7 +150,12 @@ describe('ContributionMessagesList', () => { }) it('does not render the ContributionMessagesFormular when status is not PENDING or IN_PROGRESS', async () => { - await wrapper.setProps({ contribution: { status: 'COMPLETED' } }) + await wrapper.setProps({ + contribution: { + status: 'COMPLETED', + user: defaultUser, + }, + }) expect(wrapper.find('contribution-messages-formular-stub').exists()).toBe(false) }) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index 9b0d11cbe..8f06d841e 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -3,16 +3,16 @@ - {{ contribution.firstName }} {{ contribution.lastName }} + {{ contribution.user.firstName }} {{ contribution.user.lastName }}   - {{ contribution.email }} + {{ email }} {{ $t('filter.byEmail') }}   - {{ contribution.username }} + {{ contribution.user.humhubUsername }}   - {{ $t('registered') }}: {{ new Date(contribution.createdAt).toLocaleString() }} + {{ $t('registered') }}: {{ new Date(contribution.user.createdAt).toLocaleDateString() }}, + {{ $t('createdAt') }}: {{ new Date(contribution.createdAt).toLocaleDateString() }} @@ -84,12 +85,15 @@ const emit = defineEmits([ 'update-contributions', 'search-for-email', ]) +const email = computed(() => { + return props.contribution.user.emailContact.email +}) const { toastError } = useAppToast() const mailtoLink = computed(() => { - return `mailto:${props.contribution.email}` + return `mailto:${email.value}` }) const searchLink = computed(() => { - return `/user?search=${props.contribution.email}` + return `/user?search=${email.value}` }) const humhubProfileLink = computed(() => { if (CONFIG.HUMHUB_ACTIVE !== true) { @@ -135,7 +139,7 @@ const updateContributions = () => { } const searchForEmail = () => { - emit('search-for-email', props.contribution.email) + emit('search-for-email', email.value) }