From 757cf48fc2ef3eb6daf8faca09475687105001e6 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 3 Dec 2025 16:45:43 +0100 Subject: [PATCH 1/2] show user registered at in admin, update backend graphql query --- admin/src/graphql/searchUsers.js | 1 + admin/src/locales/de.json | 1 + admin/src/locales/en.json | 1 + admin/src/pages/UserSearch.vue | 1 + backend/src/graphql/model/UserAdmin.ts | 4 ++++ backend/src/graphql/resolver/UserResolver.ts | 2 +- 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index 9f82452c3..e63550546 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -26,6 +26,7 @@ export const searchUsers = gql` hasElopage emailConfirmationSend deletedAt + createdAt roles } } diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index d1622fb8d..58e3efcfc 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -244,6 +244,7 @@ }, "redeemed": "eingelöst", "registered": "Registriert", + "registered_at": "Registriert am", "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.", "reset": "Zurücksetzen", "save": "Speichern", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 6119ffc41..4cd9f9860 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -244,6 +244,7 @@ }, "redeemed": "redeemed", "registered": "Registered", + "registered_at": "Registered at", "removeNotSelf": "As an admin/moderator, you cannot delete yourself.", "reset": "Reset", "save": "Save", diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 5db3a034f..7f1e020b3 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -125,6 +125,7 @@ const fields = computed(() => [ return value.join(' | ') }, }, + { key: 'createdAt', label: t('registered_at') }, // { key: 'show_details', label: t('details') }, // { key: 'confirm_mail', label: t('confirmed') }, // { key: 'has_elopage', label: 'elopage' }, diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts index 46eccf4c2..2a9b27eeb 100644 --- a/backend/src/graphql/model/UserAdmin.ts +++ b/backend/src/graphql/model/UserAdmin.ts @@ -13,6 +13,7 @@ export class UserAdmin { this.emailChecked = user.emailContact?.emailChecked this.hasElopage = hasElopage this.deletedAt = user.deletedAt + this.createdAt = user.createdAt this.emailConfirmationSend = emailConfirmationSend this.roles = user.userRoles?.map((userRole) => userRole.role) ?? [] } @@ -41,6 +42,9 @@ export class UserAdmin { @Field(() => Date, { nullable: true }) deletedAt: Date | null + @Field(() => Date) + createdAt: Date + @Field(() => String, { nullable: true }) emailConfirmationSend: string | null diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 4a2ca85ca..ea68934c6 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -976,7 +976,7 @@ export class UserResolver { @Ctx() context: Context, ): Promise { 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( userFields, query, From 0171b9a84f4145a459dc4546081727100c7a1266 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 4 Dec 2025 09:02:48 +0100 Subject: [PATCH 2/2] format created at date in user search --- admin/src/components/Tables/SearchUserTable.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue index 1a92962e3..9bca3745b 100644 --- a/admin/src/components/Tables/SearchUserTable.vue +++ b/admin/src/components/Tables/SearchUserTable.vue @@ -16,6 +16,10 @@
+ +