Merge pull request #3589 from gradido/admin_add_registerdAt_on_usersearch

feat(admin): show user registered at in admin
This commit is contained in:
einhornimmond 2025-12-04 09:06:08 +01:00 committed by GitHub
commit 4ace9bc5a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 13 additions and 1 deletions

View File

@ -16,6 +16,10 @@
<div v-html="data.value" /> <div v-html="data.value" />
</template> </template>
<template #cell(createdAt)="data">
{{ $d(new Date(data.value), 'long') }}
</template>
<template #cell(status)="row"> <template #cell(status)="row">
<div class="d-flex gap-3 justify-content-end align-items-center"> <div class="d-flex gap-3 justify-content-end align-items-center">
<div <div

View File

@ -26,6 +26,7 @@ export const searchUsers = gql`
hasElopage hasElopage
emailConfirmationSend emailConfirmationSend
deletedAt deletedAt
createdAt
roles roles
} }
} }

View File

@ -244,6 +244,7 @@
}, },
"redeemed": "eingelöst", "redeemed": "eingelöst",
"registered": "Registriert", "registered": "Registriert",
"registered_at": "Registriert am",
"removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.", "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
"reset": "Zurücksetzen", "reset": "Zurücksetzen",
"save": "Speichern", "save": "Speichern",

View File

@ -244,6 +244,7 @@
}, },
"redeemed": "redeemed", "redeemed": "redeemed",
"registered": "Registered", "registered": "Registered",
"registered_at": "Registered at",
"removeNotSelf": "As an admin/moderator, you cannot delete yourself.", "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
"reset": "Reset", "reset": "Reset",
"save": "Save", "save": "Save",

View File

@ -125,6 +125,7 @@ const fields = computed(() => [
return value.join(' | ') return value.join(' | ')
}, },
}, },
{ key: 'createdAt', label: t('registered_at') },
// { key: 'show_details', label: t('details') }, // { key: 'show_details', label: t('details') },
// { key: 'confirm_mail', label: t('confirmed') }, // { key: 'confirm_mail', label: t('confirmed') },
// { key: 'has_elopage', label: 'elopage' }, // { key: 'has_elopage', label: 'elopage' },

View File

@ -13,6 +13,7 @@ export class UserAdmin {
this.emailChecked = user.emailContact?.emailChecked this.emailChecked = user.emailContact?.emailChecked
this.hasElopage = hasElopage this.hasElopage = hasElopage
this.deletedAt = user.deletedAt this.deletedAt = user.deletedAt
this.createdAt = user.createdAt
this.emailConfirmationSend = emailConfirmationSend this.emailConfirmationSend = emailConfirmationSend
this.roles = user.userRoles?.map((userRole) => userRole.role) ?? [] this.roles = user.userRoles?.map((userRole) => userRole.role) ?? []
} }
@ -41,6 +42,9 @@ export class UserAdmin {
@Field(() => Date, { nullable: true }) @Field(() => Date, { nullable: true })
deletedAt: Date | null deletedAt: Date | null
@Field(() => Date)
createdAt: Date
@Field(() => String, { nullable: true }) @Field(() => String, { nullable: true })
emailConfirmationSend: string | null emailConfirmationSend: string | null

View File

@ -976,7 +976,7 @@ export class UserResolver {
@Ctx() context: Context, @Ctx() context: Context,
): Promise<SearchUsersResult> { ): Promise<SearchUsersResult> {
const clientTimezoneOffset = getClientTimezoneOffset(context) const clientTimezoneOffset = getClientTimezoneOffset(context)
const userFields = ['id', 'firstName', 'lastName', 'emailId', 'emailContact', 'deletedAt'] const userFields = ['id', 'firstName', 'lastName', 'emailId', 'emailContact', 'deletedAt', 'createdAt']
const [users, count] = await findUsers( const [users, count] = await findUsers(
userFields, userFields,
query, query,