diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue index 59d377bc6..7be9987cc 100644 --- a/admin/src/components/DeletedUserFormular.vue +++ b/admin/src/components/DeletedUserFormular.vue @@ -17,7 +17,7 @@ export default { name: 'DeletedUser', props: { item: { - type: Array, + type: Object, }, }, data() { diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index 38f3cb5e7..4ef9f23bc 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -18,6 +18,7 @@ export const searchUsers = gql` emailChecked hasElopage emailConfirmationSend + deletedAt } } } diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts index 11cf384b3..7a2c2f65a 100644 --- a/backend/src/graphql/model/UserAdmin.ts +++ b/backend/src/graphql/model/UserAdmin.ts @@ -23,6 +23,9 @@ export class UserAdmin { @Field(() => Boolean) hasElopage: boolean + @Field(() => Date, { nullable: true }) + deletedAt?: Date | null + @Field(() => String, { nullable: true }) emailConfirmationSend?: string } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index c314b5bb7..49d7740fc 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -46,6 +46,7 @@ export class AdminResolver { adminUser.creation = await getUserCreations(user.id) adminUser.emailChecked = user.emailChecked adminUser.hasElopage = await hasElopageBuys(user.email) + adminUser.deletedAt = user.deletedAt if (!user.emailChecked) { const emailOptIn = await LoginEmailOptIn.findOne( {