From 40bcc3ff8cae1fe4e7e9d30d49e1d0928acb3e76 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 17 Feb 2022 20:17:16 +0100
Subject: [PATCH 01/45] prepared the deletion of a user in the admin area.

---
 admin/src/components/DeletedUserFormular.vue  | 39 +++++++++++++++++++
 .../src/components/Tables/SearchUserTable.vue | 26 ++++++++++++-
 admin/src/locales/de.json                     |  4 ++
 admin/src/locales/en.json                     |  4 ++
 admin/src/pages/UserSearch.vue                | 16 +++++++-
 5 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 admin/src/components/DeletedUserFormular.vue

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
new file mode 100644
index 000000000..59d377bc6
--- /dev/null
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -0,0 +1,39 @@
+<template>
+  <div>
+    {{ item }}
+    <div class="mt-5">
+      <b-form-checkbox switch size="lg" v-model="checked">deleted User</b-form-checkbox>
+    </div>
+    <div class="mt-3">GDD Stand: 20 GDD</div>
+    <div class="mt-3 mb-5">
+      <b-button v-if="checked" variant="success" @click="deleteAdd">User now deleted</b-button>
+    </div>
+  </div>
+</template>
+<script>
+// import { sendActivationEmail } from '../graphql/sendActivationEmail'
+
+export default {
+  name: 'DeletedUser',
+  props: {
+    item: {
+      type: Array,
+    },
+  },
+  data() {
+    return {
+      checked: false,
+    }
+  },
+  methods: {
+    deleteAdd() {
+      alert('TODO: Apollo query deleteAdd')
+    },
+  },
+}
+</script>
+<style>
+.input-group-text {
+  background-color: rgb(255, 252, 205);
+}
+</style>
diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index df7cacf9a..1169c7f25 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -4,6 +4,20 @@
       <template #cell(creation)="data">
         <div v-html="data.value"></div>
       </template>
+      <template #cell(enabled)="row">
+        <b-icon
+          @click="rowToogleDetails(row, 3)"
+          :variant="row.item.enabled ? 'success' : 'danger'"
+          :icon="row.item.enabled ? 'check-circle' : 'x-circle'"
+          :title="row.item.enabled ? $t('enabled') : $t('disabled')"
+        ></b-icon>
+        <b-icon
+          @click="rowToogleDetails(row, 3)"
+          :variant="row.item.enabled ? 'dark' : 'dark'"
+          :icon="row.item.enabled ? 'gear' : 'gear'"
+          :title="row.item.enabled ? $t('enabled') : $t('disabled')"
+        ></b-icon>
+      </template>
       <template #cell(show_details)="row">
         <b-button
           variant="info"
@@ -73,6 +87,9 @@
           <template #show-transaction-list>
             <creation-transaction-list-formular :userId="row.item.userId" />
           </template>
+          <template #show-deleted-user>
+            <deleted-user-formular :item="row.item" />
+          </template>
         </row-details>
       </template>
     </b-table-lite>
@@ -83,9 +100,15 @@ import CreationFormular from '../CreationFormular.vue'
 import ConfirmRegisterMailFormular from '../ConfirmRegisterMailFormular.vue'
 import RowDetails from '../RowDetails.vue'
 import CreationTransactionListFormular from '../CreationTransactionListFormular.vue'
+import DeletedUserFormular from '../DeletedUserFormular.vue'
 import { toggleRowDetails } from '../../mixins/toggleRowDetails'
 
-const slotNames = ['show-creation', 'show-register-mail', 'show-transaction-list']
+const slotNames = [
+  'show-creation',
+  'show-register-mail',
+  'show-transaction-list',
+  'show-deleted-user',
+]
 
 export default {
   name: 'SearchUserTable',
@@ -94,6 +117,7 @@ export default {
     CreationFormular,
     ConfirmRegisterMailFormular,
     CreationTransactionListFormular,
+    DeletedUserFormular,
     RowDetails,
   },
   props: {
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 90a60475c..c1868427c 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -24,6 +24,10 @@
   "delete": "Löschen",
   "details": "Details",
   "edit": "Bearbeiten",
+  "enabled":"aktiviert",
+  "disabled":"deaktiviert",
+  "disabled_user":"deaktivierte Nutzer anzeigen",
+  "enabled_user":"aktivierte Nutzer anzeigen",
   "e_mail": "E-Mail",
   "firstname": "Vorname",
   "gradido_admin_footer": "Gradido Akademie Adminkonsole",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 8775393dd..0896a630a 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -24,6 +24,10 @@
   "delete": "Delete",
   "details": "Details",
   "edit": "Edit",
+  "enabled":"enabled",
+  "disabled":"disabled",
+  "enabled_user":"show enabled user",
+  "disabled_user":"show disabled user",
   "e_mail": "E-mail",
   "firstname": "Firstname",
   "gradido_admin_footer": "Gradido Academy Admin Console",
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index de041282a..961a483b1 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -1,10 +1,14 @@
 <template>
   <div class="user-search">
     <div style="text-align: right">
-      <b-button block variant="danger" @click="unconfirmedRegisterMails">
-        <b-icon icon="envelope" variant="light"></b-icon>
+      <b-button variant="light" @click="unconfirmedRegisterMails">
+        <b-icon icon="envelope" variant="danger"></b-icon>
         {{ filterCheckedEmails ? $t('all_emails') : $t('unregistered_emails') }}
       </b-button>
+      <b-button variant="light" @click="disabledUserSearch">
+        <b-icon icon="x-circle" variant="danger"></b-icon>
+        {{ filterDisabledUser ? $t('enabled_user') : $t('disabled_user') }}
+      </b-button>
     </div>
     <label>{{ $t('user_search') }}</label>
     <div>
@@ -52,6 +56,7 @@ export default {
       massCreation: [],
       criteria: '',
       filterCheckedEmails: false,
+      filterDisabledUser: false,
       rows: 0,
       currentPage: 1,
       perPage: 25,
@@ -63,6 +68,11 @@ export default {
       this.filterCheckedEmails = !this.filterCheckedEmails
       this.getUsers()
     },
+    disabledUserSearch() {
+      this.filterDisabledUser = !this.filterDisabledUser
+      this.getUsers()
+      alert('TODO: disabled user filter in search und im backend prüfen')
+    },
     getUsers() {
       this.$apollo
         .query({
@@ -72,6 +82,7 @@ export default {
             currentPage: this.currentPage,
             pageSize: this.perPage,
             notActivated: this.filterCheckedEmails,
+            disabledUser: this.filterDisabledUser,
           },
         })
         .then((result) => {
@@ -108,6 +119,7 @@ export default {
         { key: 'confirm_mail', label: this.$t('confirmed') },
         { key: 'has_elopage', label: 'elopage' },
         { key: 'transactions_list', label: this.$t('transaction') },
+        { key: 'enabled', label: this.$t('enabled') },
       ]
     },
   },

From 671dacef53eea5c5ef48e73716bd583ff9a935f4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Feb 2022 09:27:01 +0100
Subject: [PATCH 02/45] remove unused code and icon, refactor button for filter
 deleted user

---
 admin/src/components/Tables/SearchUserTable.vue | 6 ------
 admin/src/locales/de.json                       | 3 +--
 admin/src/locales/en.json                       | 3 +--
 admin/src/pages/UserSearch.vue                  | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 1169c7f25..5c1cb5aa8 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -5,12 +5,6 @@
         <div v-html="data.value"></div>
       </template>
       <template #cell(enabled)="row">
-        <b-icon
-          @click="rowToogleDetails(row, 3)"
-          :variant="row.item.enabled ? 'success' : 'danger'"
-          :icon="row.item.enabled ? 'check-circle' : 'x-circle'"
-          :title="row.item.enabled ? $t('enabled') : $t('disabled')"
-        ></b-icon>
         <b-icon
           @click="rowToogleDetails(row, 3)"
           :variant="row.item.enabled ? 'dark' : 'dark'"
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index c1868427c..56031566f 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -26,8 +26,7 @@
   "edit": "Bearbeiten",
   "enabled":"aktiviert",
   "disabled":"deaktiviert",
-  "disabled_user":"deaktivierte Nutzer anzeigen",
-  "enabled_user":"aktivierte Nutzer anzeigen",
+  "disabled_user":"alle deaktivierten Nutzer",
   "e_mail": "E-Mail",
   "firstname": "Vorname",
   "gradido_admin_footer": "Gradido Akademie Adminkonsole",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 0896a630a..4ebf04f99 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -26,8 +26,7 @@
   "edit": "Edit",
   "enabled":"enabled",
   "disabled":"disabled",
-  "enabled_user":"show enabled user",
-  "disabled_user":"show disabled user",
+  "disabled_user":"all disabled user",
   "e_mail": "E-mail",
   "firstname": "Firstname",
   "gradido_admin_footer": "Gradido Academy Admin Console",
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 961a483b1..e7b4e7a6c 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -7,7 +7,7 @@
       </b-button>
       <b-button variant="light" @click="disabledUserSearch">
         <b-icon icon="x-circle" variant="danger"></b-icon>
-        {{ filterDisabledUser ? $t('enabled_user') : $t('disabled_user') }}
+        {{ filterDisabledUser ? $t('all_emails') : $t('disabled_user') }}
       </b-button>
     </div>
     <label>{{ $t('user_search') }}</label>

From e654b751470e1a1586c372de1b7eb5ab867992c3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Feb 2022 09:32:41 +0100
Subject: [PATCH 03/45] change wording, deactivated to deleted

---
 admin/src/components/Tables/SearchUserTable.vue |  2 +-
 admin/src/locales/de.json                       |  4 ++--
 admin/src/locales/en.json                       |  4 ++--
 admin/src/pages/UserSearch.vue                  | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 5c1cb5aa8..a25243bb2 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -9,7 +9,7 @@
           @click="rowToogleDetails(row, 3)"
           :variant="row.item.enabled ? 'dark' : 'dark'"
           :icon="row.item.enabled ? 'gear' : 'gear'"
-          :title="row.item.enabled ? $t('enabled') : $t('disabled')"
+          :title="row.item.enabled ? $t('enabled') : $t('deleted')"
         ></b-icon>
       </template>
       <template #cell(show_details)="row">
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 56031566f..fb5d4ef1b 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -25,8 +25,8 @@
   "details": "Details",
   "edit": "Bearbeiten",
   "enabled":"aktiviert",
-  "disabled":"deaktiviert",
-  "disabled_user":"alle deaktivierten Nutzer",
+  "deleted":"gelöscht",
+  "deleted_user":"alle gelöschten Nutzer",
   "e_mail": "E-Mail",
   "firstname": "Vorname",
   "gradido_admin_footer": "Gradido Akademie Adminkonsole",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 4ebf04f99..631638dee 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -25,8 +25,8 @@
   "details": "Details",
   "edit": "Edit",
   "enabled":"enabled",
-  "disabled":"disabled",
-  "disabled_user":"all disabled user",
+  "deleted":"deleted",
+  "deleted_user":"all deleted user",
   "e_mail": "E-mail",
   "firstname": "Firstname",
   "gradido_admin_footer": "Gradido Academy Admin Console",
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index e7b4e7a6c..ac0637141 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -5,9 +5,9 @@
         <b-icon icon="envelope" variant="danger"></b-icon>
         {{ filterCheckedEmails ? $t('all_emails') : $t('unregistered_emails') }}
       </b-button>
-      <b-button variant="light" @click="disabledUserSearch">
+      <b-button variant="light" @click="deletedUserSearch">
         <b-icon icon="x-circle" variant="danger"></b-icon>
-        {{ filterDisabledUser ? $t('all_emails') : $t('disabled_user') }}
+        {{ filterDeletedUser ? $t('all_emails') : $t('deleted_user') }}
       </b-button>
     </div>
     <label>{{ $t('user_search') }}</label>
@@ -56,7 +56,7 @@ export default {
       massCreation: [],
       criteria: '',
       filterCheckedEmails: false,
-      filterDisabledUser: false,
+      filterDeletedUser: false,
       rows: 0,
       currentPage: 1,
       perPage: 25,
@@ -68,10 +68,10 @@ export default {
       this.filterCheckedEmails = !this.filterCheckedEmails
       this.getUsers()
     },
-    disabledUserSearch() {
-      this.filterDisabledUser = !this.filterDisabledUser
+    deletedUserSearch() {
+      this.filterDeletedUser = !this.filterDeletedUser
       this.getUsers()
-      alert('TODO: disabled user filter in search und im backend prüfen')
+      alert('TODO: deleted user filter in search and check in backend ')
     },
     getUsers() {
       this.$apollo
@@ -82,7 +82,7 @@ export default {
             currentPage: this.currentPage,
             pageSize: this.perPage,
             notActivated: this.filterCheckedEmails,
-            disabledUser: this.filterDisabledUser,
+            deletedUser: this.filterDeletedUser,
           },
         })
         .then((result) => {

From 19930eec452e8bea2e5f8f14d728dd13bf19444b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Feb 2022 09:33:39 +0100
Subject: [PATCH 04/45] yarn locales fix

---
 admin/src/locales/de.json | 6 +++---
 admin/src/locales/en.json | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index fb5d4ef1b..06df8a2f0 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -22,11 +22,11 @@
   },
   "date": "Datum",
   "delete": "Löschen",
+  "deleted": "gelöscht",
+  "deleted_user": "alle gelöschten Nutzer",
   "details": "Details",
   "edit": "Bearbeiten",
-  "enabled":"aktiviert",
-  "deleted":"gelöscht",
-  "deleted_user":"alle gelöschten Nutzer",
+  "enabled": "aktiviert",
   "e_mail": "E-Mail",
   "firstname": "Vorname",
   "gradido_admin_footer": "Gradido Akademie Adminkonsole",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 631638dee..50dc9afd4 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -22,11 +22,11 @@
   },
   "date": "Date",
   "delete": "Delete",
+  "deleted": "deleted",
+  "deleted_user": "all deleted user",
   "details": "Details",
   "edit": "Edit",
-  "enabled":"enabled",
-  "deleted":"deleted",
-  "deleted_user":"all deleted user",
+  "enabled": "enabled",
   "e_mail": "E-mail",
   "firstname": "Firstname",
   "gradido_admin_footer": "Gradido Academy Admin Console",

From 3bd9e66079ad7e733058613bc63039b756d353ac Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Feb 2022 12:06:18 +0100
Subject: [PATCH 05/45] add in backend deletedAt in UserAdmin.ts and
 AdminResolver.ts and in AdminFrontend add deletedAt in searchUser.js

---
 admin/src/components/DeletedUserFormular.vue  | 2 +-
 admin/src/graphql/searchUsers.js              | 1 +
 backend/src/graphql/model/UserAdmin.ts        | 3 +++
 backend/src/graphql/resolver/AdminResolver.ts | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

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(
             {

From a1a9b77a5db34ce110b5d2ba17d9e838e9734bdb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Feb 2022 12:51:47 +0100
Subject: [PATCH 06/45] yarn test fixed

---
 admin/src/pages/UserSearch.spec.js | 28 +++++++++++++++++++++++++++-
 admin/src/pages/UserSearch.vue     |  4 ++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index fe7bde0cc..616052a26 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -2,6 +2,7 @@ import { mount } from '@vue/test-utils'
 import UserSearch from './UserSearch.vue'
 
 const localVue = global.localVue
+jest.spyOn(window, 'alert').mockImplementation(() => {})
 
 const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
@@ -83,6 +84,7 @@ describe('UserSearch', () => {
             currentPage: 1,
             pageSize: 25,
             notActivated: false,
+            deletedUser: false,
           },
         }),
       )
@@ -90,7 +92,7 @@ describe('UserSearch', () => {
 
     describe('unconfirmed emails', () => {
       beforeEach(async () => {
-        await wrapper.find('button.btn-block').trigger('click')
+        await wrapper.find('button.unconfirmedRegisterMails').trigger('click')
       })
 
       it('calls API with filter', () => {
@@ -101,6 +103,27 @@ describe('UserSearch', () => {
               currentPage: 1,
               pageSize: 25,
               notActivated: true,
+              deletedUser: false,
+            },
+          }),
+        )
+      })
+    })
+
+    describe('deleted Users', () => {
+      beforeEach(async () => {
+        await wrapper.find('button.deletedUserSearch').trigger('click')
+      })
+
+      it('calls API with filter', () => {
+        expect(apolloQueryMock).toBeCalledWith(
+          expect.objectContaining({
+            variables: {
+              searchText: '',
+              currentPage: 1,
+              pageSize: 25,
+              notActivated: false,
+              deletedUser: true,
             },
           }),
         )
@@ -120,6 +143,7 @@ describe('UserSearch', () => {
               currentPage: 2,
               pageSize: 25,
               notActivated: false,
+              deletedUser: false,
             },
           }),
         )
@@ -139,6 +163,7 @@ describe('UserSearch', () => {
               currentPage: 1,
               pageSize: 25,
               notActivated: false,
+              deletedUser: false,
             },
           }),
         )
@@ -155,6 +180,7 @@ describe('UserSearch', () => {
                 currentPage: 1,
                 pageSize: 25,
                 notActivated: false,
+                deletedUser: false,
               },
             }),
           )
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index ac0637141..ff823ad4b 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="user-search">
     <div style="text-align: right">
-      <b-button variant="light" @click="unconfirmedRegisterMails">
+      <b-button class="unconfirmedRegisterMails" variant="light" @click="unconfirmedRegisterMails">
         <b-icon icon="envelope" variant="danger"></b-icon>
         {{ filterCheckedEmails ? $t('all_emails') : $t('unregistered_emails') }}
       </b-button>
-      <b-button variant="light" @click="deletedUserSearch">
+      <b-button class="deletedUserSearch" variant="light" @click="deletedUserSearch">
         <b-icon icon="x-circle" variant="danger"></b-icon>
         {{ filterDeletedUser ? $t('all_emails') : $t('deleted_user') }}
       </b-button>

From 9f4762647be923781bd83bfea1c992fc2b569550 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Feb 2022 14:15:18 +0100
Subject: [PATCH 07/45] add deletedUser and unDeleteUser function in admin
 frontend

---
 admin/src/components/DeletedUserFormular.vue | 37 +++++++++++++++++---
 admin/src/graphql/deleteUser.js              |  7 ++++
 admin/src/graphql/unDeleteUser.js            |  7 ++++
 3 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 admin/src/graphql/deleteUser.js
 create mode 100644 admin/src/graphql/unDeleteUser.js

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 7be9987cc..2e9b46bec 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -6,12 +6,14 @@
     </div>
     <div class="mt-3">GDD Stand: 20 GDD</div>
     <div class="mt-3 mb-5">
-      <b-button v-if="checked" variant="success" @click="deleteAdd">User now deleted</b-button>
+      <b-button v-if="checked" variant="danger" @click="deleteUser">Delete User</b-button>
+      <b-button v-if="checked" variant="success" @click="unDeleteUser">Undelete User</b-button>
     </div>
   </div>
 </template>
 <script>
-// import { sendActivationEmail } from '../graphql/sendActivationEmail'
+import { deleteUser } from '../graphql/deleteUser'
+import { unDeleteUser } from '../graphql/unDeleteUser'
 
 export default {
   name: 'DeletedUser',
@@ -26,8 +28,35 @@ export default {
     }
   },
   methods: {
-    deleteAdd() {
-      alert('TODO: Apollo query deleteAdd')
+    deleteUser() {
+      this.$apollo
+        .mutate({
+          mutation: deleteUser,
+          variables: {
+            userId: this.item.userId,
+          },
+        })
+        .then(() => {
+          this.$toasted.success('user is deleted')
+        })
+        .catch((error) => {
+          this.$toasted.error('user deleted error', error)
+        })
+    },
+    unDeleteUser() {
+      this.$apollo
+        .mutate({
+          mutation: unDeleteUser,
+          variables: {
+            userId: this.item.userId,
+          },
+        })
+        .then(() => {
+          this.$toasted.success('user is undeleted')
+        })
+        .catch((error) => {
+          this.$toasted.error('user undeleted error', error)
+        })
     },
   },
 }
diff --git a/admin/src/graphql/deleteUser.js b/admin/src/graphql/deleteUser.js
new file mode 100644
index 000000000..9e3606bd7
--- /dev/null
+++ b/admin/src/graphql/deleteUser.js
@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+
+export const deleteUser = gql`
+  mutation ($userId: Int!) {
+    deleteUser(userId: $userId)
+  }
+`
diff --git a/admin/src/graphql/unDeleteUser.js b/admin/src/graphql/unDeleteUser.js
new file mode 100644
index 000000000..b48c8981f
--- /dev/null
+++ b/admin/src/graphql/unDeleteUser.js
@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+
+export const unDeleteUser = gql`
+  mutation ($userId: Int!) {
+    unDeleteUser(userId: $userId)
+  }
+`

From 09258eb57a245848898451d02f0ba5cf320c830e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Feb 2022 14:44:56 +0100
Subject: [PATCH 08/45] rename disabled to deleted

---
 backend/src/graphql/resolver/UserResolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 81bd9b1a8..dfa685ed0 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -252,7 +252,7 @@ export class UserResolver {
       throw new Error('No user with this credentials')
     })
     if (dbUser.deletedAt) {
-      throw new Error('This user was permanently disabled. Contact support for questions.')
+      throw new Error('This user was permanently deleted. Contact support for questions.')
     }
     if (!dbUser.emailChecked) {
       throw new Error('User email not validated')

From fed3562e4d544273d33692e6873bd0651de872fb Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Feb 2022 14:46:09 +0100
Subject: [PATCH 09/45] add in backend function deleteUser()

---
 admin/src/graphql/deleteUser.js               |  2 +-
 backend/src/auth/RIGHTS.ts                    |  1 +
 backend/src/graphql/resolver/AdminResolver.ts | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/admin/src/graphql/deleteUser.js b/admin/src/graphql/deleteUser.js
index 9e3606bd7..3b9bc73b2 100644
--- a/admin/src/graphql/deleteUser.js
+++ b/admin/src/graphql/deleteUser.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const deleteUser = gql`
-  mutation ($userId: Int!) {
+  mutation ($userId: Float!) {
     deleteUser(userId: $userId)
   }
 `
diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index cca4365fe..b7b23c931 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -26,4 +26,5 @@ export enum RIGHTS {
   DELETE_PENDING_CREATION = 'DELETE_PENDING_CREATION',
   CONFIRM_PENDING_CREATION = 'CONFIRM_PENDING_CREATION',
   SEND_ACTIVATION_EMAIL = 'SEND_ACTIVATION_EMAIL',
+  DELETE_USER = 'DELETE_USER',
 }
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index fd12af0f8..484fad7d8 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -95,6 +95,25 @@ export class AdminResolver {
     }
   }
 
+  @Authorized([RIGHTS.DELETE_USER])
+  @Mutation(() => Boolean)
+  async deleteUser(@Arg('userId') userId: number, @Ctx() context: any): Promise<boolean> {
+    const user = await User.findOne({ id: userId })
+    // user exists ?
+    if (!user) {
+      throw new Error(`Could not find user with userId: ${userId}`)
+    }
+    // moderator user disabled own account?
+    const userRepository = getCustomRepository(UserRepository)
+    const moderatorUser = await userRepository.findByPubkeyHex(context.pubKey)
+    if (moderatorUser.id === userId) {
+      throw new Error('Moderator can not delete his own account!')
+    }
+    // soft-delete user
+    await user.softRemove()
+    return true
+  }
+
   @Authorized([RIGHTS.CREATE_PENDING_CREATION])
   @Mutation(() => [Number])
   async createPendingCreation(

From fc3d7e2cbb4f83dd1ed2ff9c8213315e040e7a12 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 18 Feb 2022 15:02:49 +0100
Subject: [PATCH 10/45] add in backend function unDeleteUser()

---
 admin/src/graphql/unDeleteUser.js             |  2 +-
 backend/src/auth/RIGHTS.ts                    |  1 +
 backend/src/graphql/resolver/AdminResolver.ts | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/admin/src/graphql/unDeleteUser.js b/admin/src/graphql/unDeleteUser.js
index b48c8981f..2c6d603b2 100644
--- a/admin/src/graphql/unDeleteUser.js
+++ b/admin/src/graphql/unDeleteUser.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const unDeleteUser = gql`
-  mutation ($userId: Int!) {
+  mutation ($userId: Float!) {
     unDeleteUser(userId: $userId)
   }
 `
diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index b7b23c931..3b3f7580c 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -27,4 +27,5 @@ export enum RIGHTS {
   CONFIRM_PENDING_CREATION = 'CONFIRM_PENDING_CREATION',
   SEND_ACTIVATION_EMAIL = 'SEND_ACTIVATION_EMAIL',
   DELETE_USER = 'DELETE_USER',
+  UNDELETE_USER = 'UNDELETE_USER',
 }
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 484fad7d8..0e1002382 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -114,6 +114,19 @@ export class AdminResolver {
     return true
   }
 
+  @Authorized([RIGHTS.UNDELETE_USER])
+  @Mutation(() => Boolean)
+  async unDeleteUser(@Arg('userId') userId: number): Promise<boolean> {
+    const user = await User.findOne({ id: userId }, { withDeleted: true })
+    // user exists ?
+    if (!user) {
+      throw new Error(`Could not find user with userId: ${userId}`)
+    }
+    // recover user account
+    await user.recover()
+    return true
+  }
+
   @Authorized([RIGHTS.CREATE_PENDING_CREATION])
   @Mutation(() => [Number])
   async createPendingCreation(

From d7b3e9434389b2b32b74bfe92c7306ec2e762dd0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Feb 2022 19:16:22 +0100
Subject: [PATCH 11/45] change icon managment in adminarea nutzersuche

---
 admin/src/components/DeletedUserFormular.vue  |  23 +++-
 .../src/components/Tables/SearchUserTable.vue | 103 +++++++-----------
 admin/src/locales/de.json                     |   2 +-
 admin/src/locales/en.json                     |   2 +-
 admin/src/pages/UserSearch.vue                |  10 +-
 5 files changed, 61 insertions(+), 79 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 2e9b46bec..75f630fcc 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -1,13 +1,24 @@
 <template>
   <div>
     {{ item }}
-    <div class="mt-5">
-      <b-form-checkbox switch size="lg" v-model="checked">deleted User</b-form-checkbox>
+    <div v-if="item.userId === $store.state.moderator.id" class="mt-5 mb-5">
+      Als Admin / Moderator kannst du dich nicht selber löschen.
     </div>
-    <div class="mt-3">GDD Stand: 20 GDD</div>
-    <div class="mt-3 mb-5">
-      <b-button v-if="checked" variant="danger" @click="deleteUser">Delete User</b-button>
-      <b-button v-if="checked" variant="success" @click="unDeleteUser">Undelete User</b-button>
+    <div v-else class="mt-5">
+      <b-form-checkbox switch size="lg" v-model="checked" value="xxsxsx">
+        <div v-if="item.deletedAt === null">delete user</div>
+        <div v-if="item.deletedAt !== null">unDelete user</div>
+      </b-form-checkbox>
+
+      <div class="mt-3">GDD Stand: 20 GDD</div>
+      <div class="mt-3 mb-5">
+        <b-button v-if="checked && item.deletedAt === null" variant="danger" @click="deleteUser">
+          Delete User
+        </b-button>
+        <b-button v-if="checked && item.deletedAt !== null" variant="success" @click="unDeleteUser">
+          Undelete User
+        </b-button>
+      </div>
     </div>
   </div>
 </template>
diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index a25243bb2..328b85d40 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -2,51 +2,35 @@
   <div class="search-user-table">
     <b-table-lite :items="items" :fields="fields" caption-top striped hover stacked="md">
       <template #cell(creation)="data">
-        <div v-html="data.value"></div>
+        <div v-html="data.value" @click="rowToogleDetails(row, 0)"></div>
       </template>
-      <template #cell(enabled)="row">
-        <b-icon
-          @click="rowToogleDetails(row, 3)"
-          :variant="row.item.enabled ? 'dark' : 'dark'"
-          :icon="row.item.enabled ? 'gear' : 'gear'"
-          :title="row.item.enabled ? $t('enabled') : $t('deleted')"
-        ></b-icon>
-      </template>
-      <template #cell(show_details)="row">
-        <b-button
-          variant="info"
-          size="md"
-          v-if="row.item.emailChecked"
-          @click="rowToogleDetails(row, 0)"
-          class="mr-2"
-        >
-          <b-icon :icon="row.detailsShowing ? 'eye-slash-fill' : 'eye-fill'"></b-icon>
-        </b-button>
-      </template>
-      <template #cell(confirm_mail)="row">
-        <b-button
-          :variant="row.item.emailChecked ? 'success' : 'danger'"
-          size="md"
-          @click="rowToogleDetails(row, 1)"
-          class="mr-2"
-        >
-          <b-icon
-            :icon="row.item.emailChecked ? 'envelope-open' : 'envelope'"
-            aria-label="Help"
-          ></b-icon>
-        </b-button>
-      </template>
-      <template #cell(has_elopage)="row">
-        <b-icon
-          :variant="row.item.hasElopage ? 'success' : 'danger'"
-          :icon="row.item.hasElopage ? 'check-circle' : 'x-circle'"
-        ></b-icon>
-      </template>
-      <template #cell(transactions_list)="row">
-        <b-button variant="warning" size="md" @click="rowToogleDetails(row, 2)" class="mr-2">
-          <b-icon icon="list"></b-icon>
-        </b-button>
+
+      <template #cell(status)="row">
+        <div @click="rowToogleDetails(row, 0)" class="text-right">
+          <b-table-simple fixed-width small>
+            <b-tr>
+              <b-td>
+                <b-badge v-if="!row.item.emailChecked" variant="danger" class="mr-2">
+                  <b-icon class="h4" icon="envelope" aria-label="Help"></b-icon>
+                </b-badge>
+              </b-td>
+              <b-td>
+                <b-badge v-if="!row.item.hasElopage" variant="danger" class="mr-2">
+                  <b-icon class="h4" icon="x-circle"></b-icon>
+                </b-badge>
+              </b-td>
+              <b-td>
+                <b-icon
+                  variant="dark"
+                  :icon="row.detailsShowing ? 'caret-up-fill' : 'caret-down'"
+                  :title="row.item.enabled ? $t('enabled') : $t('deleted')"
+                ></b-icon>
+              </b-td>
+            </b-tr>
+          </b-table-simple>
+        </div>
       </template>
+
       <template #row-details="row">
         <row-details
           :row="row"
@@ -55,19 +39,15 @@
           :index="slotIndex"
           @row-toogle-details="rowToogleDetails"
         >
-          <template #show-creation>
-            <div>
-              <creation-formular
-                type="singleCreation"
-                pagetype="singleCreation"
-                :creation="row.item.creation"
-                :item="row.item"
-                :creationUserData="creationUserData"
-                @update-user-data="updateUserData"
-              />
-            </div>
-          </template>
-          <template #show-register-mail>
+          <template #show-collaps>
+            <creation-formular
+              type="singleCreation"
+              pagetype="singleCreation"
+              :creation="row.item.creation"
+              :item="row.item"
+              :creationUserData="creationUserData"
+              @update-user-data="updateUserData"
+            />
             <confirm-register-mail-formular
               :checked="row.item.emailChecked"
               :email="row.item.email"
@@ -77,11 +57,7 @@
                   : ''
               "
             />
-          </template>
-          <template #show-transaction-list>
             <creation-transaction-list-formular :userId="row.item.userId" />
-          </template>
-          <template #show-deleted-user>
             <deleted-user-formular :item="row.item" />
           </template>
         </row-details>
@@ -97,12 +73,7 @@ import CreationTransactionListFormular from '../CreationTransactionListFormular.
 import DeletedUserFormular from '../DeletedUserFormular.vue'
 import { toggleRowDetails } from '../../mixins/toggleRowDetails'
 
-const slotNames = [
-  'show-creation',
-  'show-register-mail',
-  'show-transaction-list',
-  'show-deleted-user',
-]
+const slotNames = ['show-collaps']
 
 export default {
   name: 'SearchUserTable',
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 06df8a2f0..784768c02 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -26,7 +26,7 @@
   "deleted_user": "alle gelöschten Nutzer",
   "details": "Details",
   "edit": "Bearbeiten",
-  "enabled": "aktiviert",
+  "status": "Status",
   "e_mail": "E-Mail",
   "firstname": "Vorname",
   "gradido_admin_footer": "Gradido Akademie Adminkonsole",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 50dc9afd4..44a0bf65d 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -26,7 +26,7 @@
   "deleted_user": "all deleted user",
   "details": "Details",
   "edit": "Edit",
-  "enabled": "enabled",
+  "status": "Status",
   "e_mail": "E-mail",
   "firstname": "Firstname",
   "gradido_admin_footer": "Gradido Academy Admin Console",
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index ff823ad4b..f80654efa 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -115,11 +115,11 @@ export default {
             return value.join(' | ')
           },
         },
-        { key: 'show_details', label: this.$t('details') },
-        { key: 'confirm_mail', label: this.$t('confirmed') },
-        { key: 'has_elopage', label: 'elopage' },
-        { key: 'transactions_list', label: this.$t('transaction') },
-        { key: 'enabled', label: this.$t('enabled') },
+        // { key: 'show_details', label: this.$t('details') },
+        // { key: 'confirm_mail', label: this.$t('confirmed') },
+        // { key: 'has_elopage', label: 'elopage' },
+        // { key: 'transactions_list', label: this.$t('transaction') },
+        { key: 'status', label: this.$t('status') },
       ]
     },
   },

From 047b990c9c32de4a077f8724faf05305efc4c046 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 10:01:17 +0100
Subject: [PATCH 12/45] change status danger icon to avatars, add elopage icon
 as img

---
 admin/public/img/elopage_favicon_w.png        | Bin 0 -> 1341 bytes
 .../src/components/Tables/SearchUserTable.vue |  24 +++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 admin/public/img/elopage_favicon_w.png

diff --git a/admin/public/img/elopage_favicon_w.png b/admin/public/img/elopage_favicon_w.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d4ef93b4782790ee7e6d832653a3205928a20f9
GIT binary patch
literal 1341
zcmV-D1;YA?P)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*40004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>8^(94sQ@kfFM0K~%(1t5AdrrB-Ow!Q|2}Xws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;qmz@Oi<J1kq|hS9gX4a@yZ5+z2MCP{Q_Ze%K-DZG
zorsIs+^QIOg@Aqp5yq&*OnokuO2Tt|-NVP%yBN>%KKJJcD|wRvK9P8q>4rtTK|H-_
z>74h8BdjDT#OK6g23?T&k?XR{Z=8z`3p_JoWYY7*5n{2}!Ey()lA#h$5l0nOqkJLj
zvch?bvs$UK);;+PLwRjwnd>x%kia6Akb(#qHIz|-g&3_GDJIgiANTMNI{p;7WO9|k
z$gzMbR7j2={11M2YZfLa+@w$(=zg*7k6|FN3pDGt{e5iP%@e@?3|wh#f3*S3e3D*o
zYtbX1cN@64Zfo)$aJd5vJn51lIg+2IP$&TJXY@@upzjvwS#x`9?c?+T$WT|w8{ps&
z7%5Wry2rbNoxS~grq$mMO7n7;nleoD00006VoOIv0RI30001*5eDeSR010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<^mQ7I3ZS^^Z@_>13F1WK~z}7?U+r7l~owWe~)8+
zG?O=R3|vfLwwOqhM1(B*f`Vuhv#=lt1UJzKk>H|5J0UQLa8b~r1S?u3l=Q)5)JRYf
zR8|A#py<L(NW~jEGtJ!lYtab?x%YkV``-7?>i*$!;okS0_kaH9Jpbo85A@MTAC(}w
zoj|Ptn}99AMqnK<1k3=Jfywmw0r(>#8jH3%HPjLHY4uC>g4(b>uByMO`_ygfb&ElA
zP<=}MQJu3m&a1DfxAc<ai28O?s2eoYpVUXxB^8rwj;iB1TU-=p)hE?~YDhMlBQ_i3
zYSZd*P90ODTO|k8cPdu$T1=^1x{dB#9iGXiT31i1$I^Gbz%Cq8SCu7tb9!kW&Zv9U
zdsDy-r?K}XOFG}d99PxH%MyK7ozGG63w3L&fKXSePpGFlRQ27$9;?>WiJXbQQ8%<0
zyF}fr9!T5YDJImxqC~f=mog^3s6O0c+*)-{Qn9E@9BilP(hRP50JV(&KLaKf5L^yC
z1ndUx28yQ1Y2f3CnCqBm^0eDCik2pDBqC<hv!lQZzz*QX65%inya{|#blX>`hcmY5
zN{Z;!>T~MvC6hrz{Z-wm4rOs#n(=!rXFc}-F9G)h%Sx#D7jOW012`2Cma(NF^=OVQ
z&6LbSv+AengGH>UouYH8=*=p)mls_>Z~}N8_#h%K78%@*=s&>e3X88xz<a=c;6#~i
zZb>vER40=P-BdMmz)|2;;H!w3?M0D%SB~N56(}dw7uB`BzH-!Z0;(M@t8b|rtE}F$
zGE*Hm1Z)R7slexfZ-IR&8B8x&^f2%!uq~bcap3EP&vdKmdUdixC4W{QNSD6>b(wmT
z`j~no+0y^0tFNdlE4kOF^!Q8)hCDlJ0_T7!;4E+hupZa|T;JmPzkwYQ@p)CMu2SFc
z(S2!er#x~GdqmWMm(%&H8UvLPO=PFi5%@lNYZaIQzU!4`jjA7B6BuP15C>D=s%QSX
zT75p1c8wB=;7p46bv^Iq{pSYW3NZ$Z0k@?NUbHDj>cDZ}Fz^v@JR;^7t?iiXYZ$l_
z+zhb^Sd;AN3h-xYIsO7111^-RJNxLPkLvI*_U$@XE?&Zb00000NkvXXu0mjfXv}n`

literal 0
HcmV?d00001

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 328b85d40..e21bb21ab 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -7,7 +7,28 @@
 
       <template #cell(status)="row">
         <div @click="rowToogleDetails(row, 0)" class="text-right">
-          <b-table-simple fixed-width small>
+          <b-avatar
+            v-if="!row.item.emailChecked"
+            href="#baz"
+            icon="envelope"
+            class="align-center mr-3"
+            variant="danger"
+          ></b-avatar>
+
+          <b-avatar
+            v-if="!row.item.hasElopage"
+            variant="danger"
+            class="mr-3"
+            src="img/elopage_favicon_w.png"
+          ></b-avatar>
+
+          <b-icon
+            variant="dark"
+            :icon="row.detailsShowing ? 'caret-up-fill' : 'caret-down'"
+            :title="row.item.enabled ? $t('enabled') : $t('deleted')"
+          ></b-icon>
+
+          <!--<b-table-simple fixed-width small>
             <b-tr>
               <b-td>
                 <b-badge v-if="!row.item.emailChecked" variant="danger" class="mr-2">
@@ -28,6 +49,7 @@
               </b-td>
             </b-tr>
           </b-table-simple>
+          -->
         </div>
       </template>
 

From f19aaa5806ce018c151d5100af96e6445302103b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 10:06:06 +0100
Subject: [PATCH 13/45] change elopage img in greyscale, remove unused code

---
 admin/public/img/elopage_favicon.png          | Bin 0 -> 1040 bytes
 admin/public/img/elopage_favicon_w.png        | Bin 1341 -> 0 bytes
 .../src/components/Tables/SearchUserTable.vue |  25 +-----------------
 3 files changed, 1 insertion(+), 24 deletions(-)
 create mode 100644 admin/public/img/elopage_favicon.png
 delete mode 100644 admin/public/img/elopage_favicon_w.png

diff --git a/admin/public/img/elopage_favicon.png b/admin/public/img/elopage_favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2da7efbc0bb6fa7fd4dd38ddda53647dd62484f1
GIT binary patch
literal 1040
zcmV+r1n>KaP)<h;3K|Lk000e1NJLTq001fg001fo1ONa4Z^{AC0003ZX+uL$Nkc;*
zaB^>EX>4Tx04R~2kiAO8P!NT`MDY);lr6*}h3$%ssccq-ASlGRf~!?F$>L%XLy~3j
z4SW-Qm@NdsNALj@tUWhcSeV9vVLpbLbLL*Koixg-`CZ8Jy7YqH;Bs)~EWTmWVHt~^
zFsh24@1M{bpRbxzymXCL``n+g5GPfnI#cFRQPyDXi`{8m7*?`z+Yb)K4`L_I@>u*N
z-j1`_u-Of=bQ1k&nrl{*{Nmj7m0NfmbBd3{kO^Z_YPzbqI!Czdsd|)z+*1*$rX=c3
zHB)mVs-)y`AnJ>BO^e@V<LAp|D2=hSjKdw7G>sqTf4|p0&YDfDGb_R}Y+7?ldo+Ug
zM_3!c`ZKItw|Fi6ep}0o+syp)jbF;0P*$xbhOGbq00Lr5M??TQ^@yuF00009a7bBm
z000XU000XU0RWnu7ytkO2XskIMF-{r76}3-?2*;%0007WNkl<ZNXPA#Pe>I}6vn?%
z>t%`$=^40qLP=ntSQ0`ml3IjO3u#e75C|;{tVIi32<-&HD8f~=s6dMr2@wRDVMd@4
zR9bJLp(ONALd^l6`t;4Og=NoqGxKI#75J@Y?mhRr=bm%!cdoR7{{luP1H!6MmC9AD
zd@X2JF~#&+UybCt_QN2`Ii4{^l2pX`Ks(iJ3Qn2F8Q!pj8z#BN&R~>LZV|^DN#1gV
zEWeax^w^H<hA*5Z+Xtl;wR*7di*Fpq$Q;YtKE3>dk5pyK_*sWoT9}M6#2BXI8M-O(
zA}wJkZOH_!93V=B5^8B@GR-2+NiWhSmTf*hW#8Xakjp8?9enL_ty;qL+l*gQx;mRh
zC3i3#<JwQ28)*$QYfPs(ygFAzGvlsR(dq7Kqis<aAxR>{G5Scj=0DB}_sn<LZcKxO
z!ESEYPGG0J>VEhwJX&KsM=gb%XT;+wBzaE*`R<v|=Y@^5g(oa}`1pe>lzQH$G*XKN
z55h$rbI3V8IVs;unzadd$Zda(>bmY5)6UbWqzQfUC1NwWs}7AC_>;WGjOvu2mpVd0
zq<Oz*=~#?$k)oh2By3AnDrUJ!xj&uHS@UPATQy2o@?{OEUA@M<BoWb3RV$$$Jzp8g
z<m(P%4qm?FAbDi7neEim`@42c+Q{|SmYW=^Gs$QA=;R^8%%zN*)cK2R0rvuQs8%PA
zw7?stE^EMdZnOPY!5#*Ec{@*ikm4%ifv1$LM7oo3u$nF80wb=?+G2t>ir4c%+r=eb
z+1j$jPX=kBoSbz&B{3AyURA0>+q6}4`mUIUHKZw@a<YMc8NUE@UZgufru57J0000<
KMNUMnLSTaX`sMNf

literal 0
HcmV?d00001

diff --git a/admin/public/img/elopage_favicon_w.png b/admin/public/img/elopage_favicon_w.png
deleted file mode 100644
index 9d4ef93b4782790ee7e6d832653a3205928a20f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1341
zcmV-D1;YA?P)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*40004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>8^(94sQ@kfFM0K~%(1t5AdrrB-Ow!Q|2}Xws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;qmz@Oi<J1kq|hS9gX4a@yZ5+z2MCP{Q_Ze%K-DZG
zorsIs+^QIOg@Aqp5yq&*OnokuO2Tt|-NVP%yBN>%KKJJcD|wRvK9P8q>4rtTK|H-_
z>74h8BdjDT#OK6g23?T&k?XR{Z=8z`3p_JoWYY7*5n{2}!Ey()lA#h$5l0nOqkJLj
zvch?bvs$UK);;+PLwRjwnd>x%kia6Akb(#qHIz|-g&3_GDJIgiANTMNI{p;7WO9|k
z$gzMbR7j2={11M2YZfLa+@w$(=zg*7k6|FN3pDGt{e5iP%@e@?3|wh#f3*S3e3D*o
zYtbX1cN@64Zfo)$aJd5vJn51lIg+2IP$&TJXY@@upzjvwS#x`9?c?+T$WT|w8{ps&
z7%5Wry2rbNoxS~grq$mMO7n7;nleoD00006VoOIv0RI30001*5eDeSR010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<^mQ7I3ZS^^Z@_>13F1WK~z}7?U+r7l~owWe~)8+
zG?O=R3|vfLwwOqhM1(B*f`Vuhv#=lt1UJzKk>H|5J0UQLa8b~r1S?u3l=Q)5)JRYf
zR8|A#py<L(NW~jEGtJ!lYtab?x%YkV``-7?>i*$!;okS0_kaH9Jpbo85A@MTAC(}w
zoj|Ptn}99AMqnK<1k3=Jfywmw0r(>#8jH3%HPjLHY4uC>g4(b>uByMO`_ygfb&ElA
zP<=}MQJu3m&a1DfxAc<ai28O?s2eoYpVUXxB^8rwj;iB1TU-=p)hE?~YDhMlBQ_i3
zYSZd*P90ODTO|k8cPdu$T1=^1x{dB#9iGXiT31i1$I^Gbz%Cq8SCu7tb9!kW&Zv9U
zdsDy-r?K}XOFG}d99PxH%MyK7ozGG63w3L&fKXSePpGFlRQ27$9;?>WiJXbQQ8%<0
zyF}fr9!T5YDJImxqC~f=mog^3s6O0c+*)-{Qn9E@9BilP(hRP50JV(&KLaKf5L^yC
z1ndUx28yQ1Y2f3CnCqBm^0eDCik2pDBqC<hv!lQZzz*QX65%inya{|#blX>`hcmY5
zN{Z;!>T~MvC6hrz{Z-wm4rOs#n(=!rXFc}-F9G)h%Sx#D7jOW012`2Cma(NF^=OVQ
z&6LbSv+AengGH>UouYH8=*=p)mls_>Z~}N8_#h%K78%@*=s&>e3X88xz<a=c;6#~i
zZb>vER40=P-BdMmz)|2;;H!w3?M0D%SB~N56(}dw7uB`BzH-!Z0;(M@t8b|rtE}F$
zGE*Hm1Z)R7slexfZ-IR&8B8x&^f2%!uq~bcap3EP&vdKmdUdixC4W{QNSD6>b(wmT
z`j~no+0y^0tFNdlE4kOF^!Q8)hCDlJ0_T7!;4E+hupZa|T;JmPzkwYQ@p)CMu2SFc
z(S2!er#x~GdqmWMm(%&H8UvLPO=PFi5%@lNYZaIQzU!4`jjA7B6BuP15C>D=s%QSX
zT75p1c8wB=;7p46bv^Iq{pSYW3NZ$Z0k@?NUbHDj>cDZ}Fz^v@JR;^7t?iiXYZ$l_
z+zhb^Sd;AN3h-xYIsO7111^-RJNxLPkLvI*_U$@XE?&Zb00000NkvXXu0mjfXv}n`

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index e21bb21ab..807eb2be9 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -19,7 +19,7 @@
             v-if="!row.item.hasElopage"
             variant="danger"
             class="mr-3"
-            src="img/elopage_favicon_w.png"
+            src="img/elopage_favicon.png"
           ></b-avatar>
 
           <b-icon
@@ -27,29 +27,6 @@
             :icon="row.detailsShowing ? 'caret-up-fill' : 'caret-down'"
             :title="row.item.enabled ? $t('enabled') : $t('deleted')"
           ></b-icon>
-
-          <!--<b-table-simple fixed-width small>
-            <b-tr>
-              <b-td>
-                <b-badge v-if="!row.item.emailChecked" variant="danger" class="mr-2">
-                  <b-icon class="h4" icon="envelope" aria-label="Help"></b-icon>
-                </b-badge>
-              </b-td>
-              <b-td>
-                <b-badge v-if="!row.item.hasElopage" variant="danger" class="mr-2">
-                  <b-icon class="h4" icon="x-circle"></b-icon>
-                </b-badge>
-              </b-td>
-              <b-td>
-                <b-icon
-                  variant="dark"
-                  :icon="row.detailsShowing ? 'caret-up-fill' : 'caret-down'"
-                  :title="row.item.enabled ? $t('enabled') : $t('deleted')"
-                ></b-icon>
-              </b-td>
-            </b-tr>
-          </b-table-simple>
-          -->
         </div>
       </template>
 

From f23b9431e8ce286efd2810faeab63f5390b8328d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 10:48:58 +0100
Subject: [PATCH 14/45] add avatar icon for deleted user, all other icons are
 hidden

---
 admin/src/components/DeletedUserFormular.vue  |  1 -
 .../src/components/Tables/SearchUserTable.vue | 35 +++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 75f630fcc..ea7d615d8 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    {{ item }}
     <div v-if="item.userId === $store.state.moderator.id" class="mt-5 mb-5">
       Als Admin / Moderator kannst du dich nicht selber löschen.
     </div>
diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 807eb2be9..7a9701410 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -7,21 +7,28 @@
 
       <template #cell(status)="row">
         <div @click="rowToogleDetails(row, 0)" class="text-right">
-          <b-avatar
-            v-if="!row.item.emailChecked"
-            href="#baz"
-            icon="envelope"
-            class="align-center mr-3"
-            variant="danger"
-          ></b-avatar>
-
-          <b-avatar
-            v-if="!row.item.hasElopage"
-            variant="danger"
-            class="mr-3"
-            src="img/elopage_favicon.png"
-          ></b-avatar>
+          <b-avatar v-if="row.item.deletedAt" class="mr-3" variant="light">
+            <b-iconstack font-scale="2">
+              <b-icon stacked icon="person" variant="info" scale="0.75"></b-icon>
+              <b-icon stacked icon="slash-circle" variant="danger"></b-icon>
+            </b-iconstack>
+          </b-avatar>
+          <span v-if="!row.item.deletedAt">
+            <b-avatar
+              v-if="!row.item.emailChecked"
+              href="#baz"
+              icon="envelope"
+              class="align-center mr-3"
+              variant="danger"
+            ></b-avatar>
 
+            <b-avatar
+              v-if="!row.item.hasElopage"
+              variant="danger"
+              class="mr-3"
+              src="img/elopage_favicon.png"
+            ></b-avatar>
+          </span>
           <b-icon
             variant="dark"
             :icon="row.detailsShowing ? 'caret-up-fill' : 'caret-down'"

From 539752b7ec27baadeee99a60f5da7bcb673f5480 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 11:16:35 +0100
Subject: [PATCH 15/45] all admin functions disabled for a deleted user.
 creation not possible for deleted users. viewing of creations not possible.
 sending email not possible.

---
 admin/src/components/DeletedUserFormular.vue    | 7 +++----
 admin/src/components/Tables/SearchUserTable.vue | 8 +++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index ea7d615d8..df91d6d5d 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -4,12 +4,11 @@
       Als Admin / Moderator kannst du dich nicht selber löschen.
     </div>
     <div v-else class="mt-5">
-      <b-form-checkbox switch size="lg" v-model="checked" value="xxsxsx">
-        <div v-if="item.deletedAt === null">delete user</div>
-        <div v-if="item.deletedAt !== null">unDelete user</div>
+      <b-form-checkbox switch size="lg" v-model="checked">
+        <div v-if="item.deletedAt === null">Delete user</div>
+        <div v-if="item.deletedAt !== null">Undelete user</div>
       </b-form-checkbox>
 
-      <div class="mt-3">GDD Stand: 20 GDD</div>
       <div class="mt-3 mb-5">
         <b-button v-if="checked && item.deletedAt === null" variant="danger" @click="deleteUser">
           Delete User
diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 7a9701410..9ca123e29 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -46,7 +46,7 @@
           @row-toogle-details="rowToogleDetails"
         >
           <template #show-collaps>
-            <creation-formular
+            <creation-formular v-if="!row.item.deletedAt"
               type="singleCreation"
               pagetype="singleCreation"
               :creation="row.item.creation"
@@ -54,7 +54,9 @@
               :creationUserData="creationUserData"
               @update-user-data="updateUserData"
             />
-            <confirm-register-mail-formular
+            <div v-else>Der Nutzer ist gelöscht. Es können keine GDD mehr geschöpft werden. </div>
+
+            <confirm-register-mail-formular v-if="!row.item.deletedAt"
               :checked="row.item.emailChecked"
               :email="row.item.email"
               :dateLastSend="
@@ -63,7 +65,7 @@
                   : ''
               "
             />
-            <creation-transaction-list-formular :userId="row.item.userId" />
+            <creation-transaction-list-formular v-if="!row.item.deletedAt" :userId="row.item.userId" />
             <deleted-user-formular :item="row.item" />
           </template>
         </row-details>

From 0c1dabde3177b8158c53145544b54cd01e7398b6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 11:26:56 +0100
Subject: [PATCH 16/45] yarn lint --fix

---
 admin/src/components/Tables/SearchUserTable.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 9ca123e29..ce144bb29 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -46,7 +46,8 @@
           @row-toogle-details="rowToogleDetails"
         >
           <template #show-collaps>
-            <creation-formular v-if="!row.item.deletedAt"
+            <creation-formular
+              v-if="!row.item.deletedAt"
               type="singleCreation"
               pagetype="singleCreation"
               :creation="row.item.creation"
@@ -54,9 +55,10 @@
               :creationUserData="creationUserData"
               @update-user-data="updateUserData"
             />
-            <div v-else>Der Nutzer ist gelöscht. Es können keine GDD mehr geschöpft werden. </div>
+            <div v-else>Der Nutzer ist gelöscht. Es können keine GDD mehr geschöpft werden.</div>
 
-            <confirm-register-mail-formular v-if="!row.item.deletedAt"
+            <confirm-register-mail-formular
+              v-if="!row.item.deletedAt"
               :checked="row.item.emailChecked"
               :email="row.item.email"
               :dateLastSend="
@@ -65,7 +67,10 @@
                   : ''
               "
             />
-            <creation-transaction-list-formular v-if="!row.item.deletedAt" :userId="row.item.userId" />
+            <creation-transaction-list-formular
+              v-if="!row.item.deletedAt"
+              :userId="row.item.userId"
+            />
             <deleted-user-formular :item="row.item" />
           </template>
         </row-details>

From 0c9f522dc0c00988941899ff50ac20311e1b5515 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 12:46:18 +0100
Subject: [PATCH 17/45] clean error message when sending to a deleted user
 account

---
 frontend/src/locales/de.json                                | 1 +
 frontend/src/locales/en.json                                | 1 +
 .../views/Pages/SendOverview/GddSend/TransactionResult.vue  | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 5e2ad7246..91f96be3d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -216,6 +216,7 @@
     "more": "mehr",
     "nullTransactions": "Du hast noch keine Transaktionen auf deinem Konto.",
     "receiverNotFound": "Empfänger nicht gefunden",
+    "receiverDeleted":"Das Empfängerkonto wurde gelöscht",
     "show_all": "Alle <strong>{count}</strong> Transaktionen ansehen"
   },
   "transactions": "Transaktionen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 75c70b258..ad75aa91c 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -216,6 +216,7 @@
     "more": "more",
     "nullTransactions": "You don't have any transactions on your account yet.",
     "receiverNotFound": "Recipient not found",
+    "receiverDeleted":"The recipient account was deleted",
     "show_all": "View all <strong>{count}</strong> transactions."
   },
   "transactions": "Transactions",
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionResult.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionResult.vue
index d447fa771..1253f17cf 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionResult.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionResult.vue
@@ -13,6 +13,12 @@
             <div class="test-receiver-not-found" v-if="errorResult === 'recipient not known'">
               {{ $t('transaction.receiverNotFound') }}
             </div>
+            <div
+              class="test-receiver-not-found"
+              v-if="errorResult === 'GraphQL error: The recipient account was deleted'"
+            >
+             {{ $t('transaction.receiverDeleted') }}
+            </div>
             <div v-else>({{ errorResult }})</div>
           </div>
           <p class="text-center mt-3">

From ea91e75c93e9bb2ed26f8e1c0912cd852c1d7ecc Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 12:47:36 +0100
Subject: [PATCH 18/45] yarn lint fix && locales fix

---
 frontend/src/locales/de.json                                    | 2 +-
 frontend/src/locales/en.json                                    | 2 +-
 .../src/views/Pages/SendOverview/GddSend/TransactionResult.vue  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 91f96be3d..0fdac973f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -215,8 +215,8 @@
     "gdt-text": "GradidoTransform Transaktionen",
     "more": "mehr",
     "nullTransactions": "Du hast noch keine Transaktionen auf deinem Konto.",
+    "receiverDeleted": "Das Empfängerkonto wurde gelöscht",
     "receiverNotFound": "Empfänger nicht gefunden",
-    "receiverDeleted":"Das Empfängerkonto wurde gelöscht",
     "show_all": "Alle <strong>{count}</strong> Transaktionen ansehen"
   },
   "transactions": "Transaktionen",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index ad75aa91c..fdbf37bd7 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -215,8 +215,8 @@
     "gdt-text": "GradidoTransform Transactions",
     "more": "more",
     "nullTransactions": "You don't have any transactions on your account yet.",
+    "receiverDeleted": "The recipient account was deleted",
     "receiverNotFound": "Recipient not found",
-    "receiverDeleted":"The recipient account was deleted",
     "show_all": "View all <strong>{count}</strong> transactions."
   },
   "transactions": "Transactions",
diff --git a/frontend/src/views/Pages/SendOverview/GddSend/TransactionResult.vue b/frontend/src/views/Pages/SendOverview/GddSend/TransactionResult.vue
index 1253f17cf..6489574c9 100644
--- a/frontend/src/views/Pages/SendOverview/GddSend/TransactionResult.vue
+++ b/frontend/src/views/Pages/SendOverview/GddSend/TransactionResult.vue
@@ -17,7 +17,7 @@
               class="test-receiver-not-found"
               v-if="errorResult === 'GraphQL error: The recipient account was deleted'"
             >
-             {{ $t('transaction.receiverDeleted') }}
+              {{ $t('transaction.receiverDeleted') }}
             </div>
             <div v-else>({{ errorResult }})</div>
           </div>

From 99c2636772c6a5e42ce3ed8f85df39e42152aa93 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 22 Feb 2022 13:05:05 +0100
Subject: [PATCH 19/45] fixed missing deletedAt field in search query

---
 backend/src/graphql/resolver/AdminResolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 0e1002382..78a35f308 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -43,7 +43,7 @@ export class AdminResolver {
     // prevent overfetching data from db, select only needed columns
     // prevent reading and transmitting data from db at least 300 Bytes
     // one of my example dataset shrink down from 342 Bytes to 42 Bytes, that's ~88% saved db bandwith
-    const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked']
+    const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt']
     const [users, count] = await userRepository.findBySearchCriteriaPagedFiltered(
       userFields.map((fieldName) => {
         return 'user.' + fieldName

From 3b656898e153afb48c9b9cf19e7bb04a5b7408d6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 14:45:43 +0100
Subject: [PATCH 20/45] add isDeleted in backend, delete and undelete is activ
 by return

---
 admin/src/components/DeletedUserFormular.vue  |  4 ++++
 admin/src/graphql/searchUsers.js              |  9 ++++++++-
 admin/src/pages/UserSearch.vue                |  3 +--
 backend/src/graphql/arg/SearchUsersArgs.ts    |  3 +++
 backend/src/graphql/resolver/AdminResolver.ts | 14 ++++++++++++--
 backend/src/typeorm/repository/User.ts        |  7 +++++--
 6 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index df91d6d5d..b9661486f 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -47,6 +47,8 @@ export default {
         })
         .then(() => {
           this.$toasted.success('user is deleted')
+          this.item.deletedAt = Date.now()
+          this.checked = false
         })
         .catch((error) => {
           this.$toasted.error('user deleted error', error)
@@ -62,6 +64,8 @@ export default {
         })
         .then(() => {
           this.$toasted.success('user is undeleted')
+          this.item.deletedAt = null
+          this.checked = false
         })
         .catch((error) => {
           this.$toasted.error('user undeleted error', error)
diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js
index 4ef9f23bc..e28508d1b 100644
--- a/admin/src/graphql/searchUsers.js
+++ b/admin/src/graphql/searchUsers.js
@@ -1,12 +1,19 @@
 import gql from 'graphql-tag'
 
 export const searchUsers = gql`
-  query ($searchText: String!, $currentPage: Int, $pageSize: Int, $notActivated: Boolean) {
+  query (
+    $searchText: String!
+    $currentPage: Int
+    $pageSize: Int
+    $notActivated: Boolean
+    $isDeleted: Boolean
+  ) {
     searchUsers(
       searchText: $searchText
       currentPage: $currentPage
       pageSize: $pageSize
       notActivated: $notActivated
+      isDeleted: $isDeleted
     ) {
       userCount
       userList {
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index f80654efa..c49e45431 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -71,7 +71,6 @@ export default {
     deletedUserSearch() {
       this.filterDeletedUser = !this.filterDeletedUser
       this.getUsers()
-      alert('TODO: deleted user filter in search and check in backend ')
     },
     getUsers() {
       this.$apollo
@@ -82,7 +81,7 @@ export default {
             currentPage: this.currentPage,
             pageSize: this.perPage,
             notActivated: this.filterCheckedEmails,
-            deletedUser: this.filterDeletedUser,
+            isDeleted: this.filterDeletedUser,
           },
         })
         .then((result) => {
diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts
index 5b40fd9ca..52da77852 100644
--- a/backend/src/graphql/arg/SearchUsersArgs.ts
+++ b/backend/src/graphql/arg/SearchUsersArgs.ts
@@ -13,4 +13,7 @@ export default class SearchUsersArgs {
 
   @Field(() => Boolean, { nullable: true })
   notActivated?: boolean
+
+  @Field(() => Boolean, { nullable: true })
+  isDeleted?: boolean
 }
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 78a35f308..6a9eff47c 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Query, Arg, Args, Authorized, Mutation, Ctx } from 'type-graphql'
-import { getCustomRepository, ObjectLiteral, Raw } from '@dbTools/typeorm'
+import { getCustomRepository, IsNull, Not, ObjectLiteral, Raw } from '@dbTools/typeorm'
 import { UserAdmin, SearchUsersResult } from '../model/UserAdmin'
 import { PendingCreation } from '../model/PendingCreation'
 import { CreatePendingCreations } from '../model/CreatePendingCreations'
@@ -32,7 +32,14 @@ export class AdminResolver {
   @Authorized([RIGHTS.SEARCH_USERS])
   @Query(() => SearchUsersResult)
   async searchUsers(
-    @Args() { searchText, currentPage = 1, pageSize = 25, notActivated = false }: SearchUsersArgs,
+    @Args()
+    {
+      searchText,
+      currentPage = 1,
+      pageSize = 25,
+      notActivated = false,
+      isDeleted = false,
+    }: SearchUsersArgs,
   ): Promise<SearchUsersResult> {
     const userRepository = getCustomRepository(UserRepository)
 
@@ -40,6 +47,9 @@ export class AdminResolver {
     if (notActivated) {
       filterCriteria.push({ emailChecked: false })
     }
+    if (isDeleted) {
+      filterCriteria.push({ deletedAt: Not(IsNull()) })
+    }
     // prevent overfetching data from db, select only needed columns
     // prevent reading and transmitting data from db at least 300 Bytes
     // one of my example dataset shrink down from 342 Bytes to 42 Bytes, that's ~88% saved db bandwith
diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 66f285978..92b1b4738 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -24,7 +24,7 @@ export class UserRepository extends Repository<User> {
     currentPage: number,
     pageSize: number,
   ): Promise<[User[], number]> {
-    return await this.createQueryBuilder('user')
+    const query = await this.createQueryBuilder('user')
       .select(select)
       .withDeleted()
       .where(
@@ -39,7 +39,10 @@ export class UserRepository extends Repository<User> {
           )
         }),
       )
-      .andWhere(filterCriteria)
+    filterCriteria.forEach((filter) => {
+      query.andWhere(filter)
+    })
+    return query
       .take(pageSize)
       .skip((currentPage - 1) * pageSize)
       .getManyAndCount()

From 9cbaaa73022c56bf7ddac1086fc3d9859509eb6b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 20:00:51 +0100
Subject: [PATCH 21/45] Dynamic switching when user is deleted or restored

---
 admin/src/components/DeletedUserFormular.vue  | 25 ++++++++++++-------
 .../src/components/Tables/SearchUserTable.vue |  7 ++++--
 admin/src/locales/de.json                     |  4 +++
 admin/src/locales/en.json                     |  4 +++
 admin/src/pages/UserSearch.vue                | 10 +++++++-
 5 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index b9661486f..dc51431ec 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
     <div v-if="item.userId === $store.state.moderator.id" class="mt-5 mb-5">
-      Als Admin / Moderator kannst du dich nicht selber löschen.
+      {{ $t('removeNotSelf') }}
     </div>
     <div v-else class="mt-5">
       <b-form-checkbox switch size="lg" v-model="checked">
-        <div v-if="item.deletedAt === null">Delete user</div>
-        <div v-if="item.deletedAt !== null">Undelete user</div>
+        <div v-if="item.deletedAt === null">{{ $t('delete_user') }}</div>
+        <div v-if="item.deletedAt !== null">{{ $t('undelete_user') }}</div>
       </b-form-checkbox>
 
       <div class="mt-3 mb-5">
         <b-button v-if="checked && item.deletedAt === null" variant="danger" @click="deleteUser">
-          Delete User
+          {{ $t('delete_user') }}
         </b-button>
         <b-button v-if="checked && item.deletedAt !== null" variant="success" @click="unDeleteUser">
-          Undelete User
+          {{ $t('undelete_user') }}
         </b-button>
       </div>
     </div>
@@ -45,9 +45,12 @@ export default {
             userId: this.item.userId,
           },
         })
-        .then(() => {
+        .then((result) => {
           this.$toasted.success('user is deleted')
-          this.item.deletedAt = Date.now()
+          this.$emit('updateDeletedAt', {
+            userId: this.item.userId,
+            deletedAt: result.data.deleteUser,
+          })
           this.checked = false
         })
         .catch((error) => {
@@ -62,9 +65,13 @@ export default {
             userId: this.item.userId,
           },
         })
-        .then(() => {
+        .then((result) => {
           this.$toasted.success('user is undeleted')
-          this.item.deletedAt = null
+          this.$emit('updateDeletedAt', {
+            userId: this.item.userId,
+            deletedAt: result.data.unDeleteUser,
+          })
+          // this.item.deletedAt = null
           this.checked = false
         })
         .catch((error) => {
diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index ce144bb29..c3e94d638 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -55,7 +55,7 @@
               :creationUserData="creationUserData"
               @update-user-data="updateUserData"
             />
-            <div v-else>Der Nutzer ist gelöscht. Es können keine GDD mehr geschöpft werden.</div>
+            <div v-else>{{ $t('userIsDeleted') }}</div>
 
             <confirm-register-mail-formular
               v-if="!row.item.deletedAt"
@@ -71,7 +71,7 @@
               v-if="!row.item.deletedAt"
               :userId="row.item.userId"
             />
-            <deleted-user-formular :item="row.item" />
+            <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
           </template>
         </row-details>
       </template>
@@ -117,6 +117,9 @@ export default {
     updateUserData(rowItem, newCreation) {
       rowItem.creation = newCreation
     },
+    updateDeletedAt({ userId, deletedAt }) {
+      this.$emit('updateDeletedAt', userId, deletedAt)
+    },
   },
   computed: {
     slotName() {
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 784768c02..55e2eab97 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -63,6 +63,10 @@
   },
   "remove": "Entfernen",
   "remove_all": "alle Nutzer entfernen",
+  "removeNotSelf":"Als Admin / Moderator kannst du dich nicht selber löschen.",
+  "delete_user":"Nutzer löschen",
+  "undelete_user":"Nutzer wiederherstellen",
+  "userIsDeleted":"Der Nutzer ist gelöscht. Es können keine GDD mehr geschöpft werden.",
   "save": "Speichern",
   "text": "Text",
   "transaction": "Transaktion",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 44a0bf65d..b4a376f05 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -63,6 +63,10 @@
   },
   "remove": "Remove",
   "remove_all": "Remove all users",
+  "removeNotSelf":"As an admin / moderator you cannot delete yourself.",
+  "delete_user":"Delete user",
+  "undelete_user":"Undelete User",
+  "userIsDeleted":"The user is deleted. No more GDD can be created.",
   "save": "Speichern",
   "text": "Text",
   "transaction": "Transaction",
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index c49e45431..edd64445c 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -26,7 +26,12 @@
         </b-input-group-append>
       </b-input-group>
     </div>
-    <search-user-table type="PageUserSearch" :items="searchResult" :fields="fields" />
+    <search-user-table
+      type="PageUserSearch"
+      :items="searchResult"
+      :fields="fields"
+      @updateDeletedAt="updateDeletedAt"
+    />
     <b-pagination
       pills
       size="lg"
@@ -92,6 +97,9 @@ export default {
           this.$toasted.error(error.message)
         })
     },
+    updateDeletedAt(userId, deletedAt) {
+      this.searchResult.find((obj) => obj.userId === userId).deletedAt = deletedAt
+    },
   },
   watch: {
     currentPage() {

From 1b4f0d4b60f78c6f09013aac2e38646350396a13 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 20:09:27 +0100
Subject: [PATCH 22/45] change Mutation in Date, nullable: true in DELETE_USER,
 UNDELETE_USER

---
 backend/src/graphql/model/UserAdmin.ts        | 13 +++++++
 backend/src/graphql/resolver/AdminResolver.ts | 35 ++++++++++---------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts
index 7a2c2f65a..1d418c66c 100644
--- a/backend/src/graphql/model/UserAdmin.ts
+++ b/backend/src/graphql/model/UserAdmin.ts
@@ -1,7 +1,20 @@
+import { User } from '@entity/User'
 import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class UserAdmin {
+  constructor(user: User, creation: number[], hasElopage: boolean, emailConfirmationSend: string) {
+    this.userId = user.id
+    this.email = user.email
+    this.firstName = user.firstName
+    this.lastName = user.lastName
+    this.creation = creation
+    this.emailChecked = user.emailChecked
+    this.hasElopage = hasElopage
+    this.deletedAt = user.deletedAt
+    this.emailConfirmationSend = emailConfirmationSend
+  }
+
   @Field(() => Number)
   userId: number
 
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 6a9eff47c..26791541a 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -23,6 +23,7 @@ import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User } from '@entity/User'
 import { TransactionTypeId } from '../enum/TransactionTypeId'
 import { Balance } from '@entity/Balance'
+// import { isNullableType } from 'graphql'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?
@@ -66,15 +67,7 @@ export class AdminResolver {
 
     const adminUsers = await Promise.all(
       users.map(async (user) => {
-        const adminUser = new UserAdmin()
-        adminUser.userId = user.id
-        adminUser.firstName = user.firstName
-        adminUser.lastName = user.lastName
-        adminUser.email = user.email
-        adminUser.creation = await getUserCreations(user.id)
-        adminUser.emailChecked = user.emailChecked
-        adminUser.hasElopage = await hasElopageBuys(user.email)
-        adminUser.deletedAt = user.deletedAt
+        let emailConfirmationSend = ''
         if (!user.emailChecked) {
           const emailOptIn = await LoginEmailOptIn.findOne(
             {
@@ -90,12 +83,18 @@ export class AdminResolver {
           )
           if (emailOptIn) {
             if (emailOptIn.updatedAt) {
-              adminUser.emailConfirmationSend = emailOptIn.updatedAt.toISOString()
+              emailConfirmationSend = emailOptIn.updatedAt.toISOString()
             } else {
-              adminUser.emailConfirmationSend = emailOptIn.createdAt.toISOString()
+              emailConfirmationSend = emailOptIn.createdAt.toISOString()
             }
           }
         }
+        const adminUser = new UserAdmin(
+          user,
+          await getUserCreations(user.id),
+          await hasElopageBuys(user.email),
+          emailConfirmationSend,
+        )
         return adminUser
       }),
     )
@@ -106,8 +105,8 @@ export class AdminResolver {
   }
 
   @Authorized([RIGHTS.DELETE_USER])
-  @Mutation(() => Boolean)
-  async deleteUser(@Arg('userId') userId: number, @Ctx() context: any): Promise<boolean> {
+  @Mutation(() => Date, { nullable: true })
+  async deleteUser(@Arg('userId') userId: number, @Ctx() context: any): Promise<Date | null> {
     const user = await User.findOne({ id: userId })
     // user exists ?
     if (!user) {
@@ -121,12 +120,13 @@ export class AdminResolver {
     }
     // soft-delete user
     await user.softRemove()
-    return true
+    const newUser = await User.findOne({ id: userId }, { withDeleted: true })
+    return newUser ? newUser.deletedAt : null
   }
 
   @Authorized([RIGHTS.UNDELETE_USER])
-  @Mutation(() => Boolean)
-  async unDeleteUser(@Arg('userId') userId: number): Promise<boolean> {
+  @Mutation(() => Date, { nullable: true })
+  async unDeleteUser(@Arg('userId') userId: number): Promise<Date | null> {
     const user = await User.findOne({ id: userId }, { withDeleted: true })
     // user exists ?
     if (!user) {
@@ -134,7 +134,8 @@ export class AdminResolver {
     }
     // recover user account
     await user.recover()
-    return true
+    return null
+
   }
 
   @Authorized([RIGHTS.CREATE_PENDING_CREATION])

From 2d1dedf5ecdc7648dd143bcb4bf6e333b0ce6daa Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 20:11:55 +0100
Subject: [PATCH 23/45] change in database, no idea how this was changed

---
 .../entity/0016-transaction_signatures/Transaction.ts    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/database/entity/0016-transaction_signatures/Transaction.ts b/database/entity/0016-transaction_signatures/Transaction.ts
index 5410d010b..a68a7a519 100644
--- a/database/entity/0016-transaction_signatures/Transaction.ts
+++ b/database/entity/0016-transaction_signatures/Transaction.ts
@@ -4,6 +4,12 @@ import { TransactionSendCoin } from '../0001-init_db/TransactionSendCoin'
 
 @Entity('transactions')
 export class Transaction extends BaseEntity {
+  userId(userId: any) {
+    throw new Error('Method not implemented.')
+  }
+  amount(amount: any): number {
+    throw new Error('Method not implemented.')
+  }
   // TODO the id is defined as bigint(20) - there might be problems with that: https://github.com/typeorm/typeorm/issues/2400
   @PrimaryGeneratedColumn('increment', { unsigned: true })
   id: number
@@ -31,4 +37,7 @@ export class Transaction extends BaseEntity {
 
   @OneToOne(() => TransactionCreation, (transactionCreation) => transactionCreation.transaction)
   transactionCreation: TransactionCreation
+  sendReceiverUserId: number
+  sendReceiverPublicKey: Buffer
+  sendSenderFinalBalance: bigint
 }

From 510ee8a8df9baccdaee2df864ffed3659aa123a8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 20:23:57 +0100
Subject: [PATCH 24/45] yarn lint --fix

---
 backend/src/graphql/resolver/AdminResolver.ts       | 1 -
 backend/src/graphql/resolver/TransactionResolver.ts | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 26791541a..e55e64edb 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -135,7 +135,6 @@ export class AdminResolver {
     // recover user account
     await user.recover()
     return null
-
   }
 
   @Authorized([RIGHTS.CREATE_PENDING_CREATION])
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 7227f9621..b90396bc7 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -1,6 +1,7 @@
 /* eslint-disable new-cap */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 
 import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
 import { getCustomRepository, getConnection, QueryRunner, In } from '@dbTools/typeorm'

From c5ea5a8b40de4ac29f84905a195bbcb4f9884901 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 20:24:15 +0100
Subject: [PATCH 25/45] yarn lint --fix

---
 database/entity/0016-transaction_signatures/Transaction.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/database/entity/0016-transaction_signatures/Transaction.ts b/database/entity/0016-transaction_signatures/Transaction.ts
index a68a7a519..b2b29d1c2 100644
--- a/database/entity/0016-transaction_signatures/Transaction.ts
+++ b/database/entity/0016-transaction_signatures/Transaction.ts
@@ -7,9 +7,11 @@ export class Transaction extends BaseEntity {
   userId(userId: any) {
     throw new Error('Method not implemented.')
   }
+
   amount(amount: any): number {
     throw new Error('Method not implemented.')
   }
+
   // TODO the id is defined as bigint(20) - there might be problems with that: https://github.com/typeorm/typeorm/issues/2400
   @PrimaryGeneratedColumn('increment', { unsigned: true })
   id: number
@@ -37,6 +39,7 @@ export class Transaction extends BaseEntity {
 
   @OneToOne(() => TransactionCreation, (transactionCreation) => transactionCreation.transaction)
   transactionCreation: TransactionCreation
+
   sendReceiverUserId: number
   sendReceiverPublicKey: Buffer
   sendSenderFinalBalance: bigint

From 2c320e31136f2c3e52bfaca062ed10713758b92a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 22 Feb 2022 20:25:43 +0100
Subject: [PATCH 26/45] yarn locales --fix

---
 admin/src/locales/de.json | 10 +++++-----
 admin/src/locales/en.json | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 55e2eab97..168941c5d 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -24,9 +24,9 @@
   "delete": "Löschen",
   "deleted": "gelöscht",
   "deleted_user": "alle gelöschten Nutzer",
+  "delete_user": "Nutzer löschen",
   "details": "Details",
   "edit": "Bearbeiten",
-  "status": "Status",
   "e_mail": "E-Mail",
   "firstname": "Vorname",
   "gradido_admin_footer": "Gradido Akademie Adminkonsole",
@@ -62,12 +62,10 @@
     }
   },
   "remove": "Entfernen",
+  "removeNotSelf": "Als Admin / Moderator kannst du dich nicht selber löschen.",
   "remove_all": "alle Nutzer entfernen",
-  "removeNotSelf":"Als Admin / Moderator kannst du dich nicht selber löschen.",
-  "delete_user":"Nutzer löschen",
-  "undelete_user":"Nutzer wiederherstellen",
-  "userIsDeleted":"Der Nutzer ist gelöscht. Es können keine GDD mehr geschöpft werden.",
   "save": "Speichern",
+  "status": "Status",
   "text": "Text",
   "transaction": "Transaktion",
   "transactionlist": {
@@ -78,6 +76,7 @@
     "memo": "Nachricht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
+  "undelete_user": "Nutzer wiederherstellen",
   "unregistered_emails": "Nur unregistrierte Nutzer",
   "unregister_mail": {
     "button": "Registrierungs-Email bestätigen, jetzt senden",
@@ -88,5 +87,6 @@
     "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({email}) gesendet.",
     "text_true": " Die Email wurde bestätigt."
   },
+  "userIsDeleted": "Der Nutzer ist gelöscht. Es können keine GDD mehr geschöpft werden.",
   "user_search": "Nutzer-Suche"
 }
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index b4a376f05..964ec5eea 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -24,9 +24,9 @@
   "delete": "Delete",
   "deleted": "deleted",
   "deleted_user": "all deleted user",
+  "delete_user": "Delete user",
   "details": "Details",
   "edit": "Edit",
-  "status": "Status",
   "e_mail": "E-mail",
   "firstname": "Firstname",
   "gradido_admin_footer": "Gradido Academy Admin Console",
@@ -62,12 +62,10 @@
     }
   },
   "remove": "Remove",
+  "removeNotSelf": "As an admin / moderator you cannot delete yourself.",
   "remove_all": "Remove all users",
-  "removeNotSelf":"As an admin / moderator you cannot delete yourself.",
-  "delete_user":"Delete user",
-  "undelete_user":"Undelete User",
-  "userIsDeleted":"The user is deleted. No more GDD can be created.",
   "save": "Speichern",
+  "status": "Status",
   "text": "Text",
   "transaction": "Transaction",
   "transactionlist": {
@@ -78,6 +76,7 @@
     "memo": "Message",
     "title": "All creation-transactions for the user"
   },
+  "undelete_user": "Undelete User",
   "unregistered_emails": "Only unregistered users",
   "unregister_mail": {
     "button": "Confirm registration email, send now",
@@ -88,5 +87,6 @@
     "text_false": "The last email was sent to the member ({email}) on {date}.",
     "text_true": "The email was confirmed."
   },
+  "userIsDeleted": "The user is deleted. No more GDD can be created.",
   "user_search": "User search"
 }

From 9c4d418384d4268e95de0fbd9a90cbdb565793d0 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Feb 2022 08:34:59 +0100
Subject: [PATCH 27/45] fix merging problems

---
 backend/src/graphql/resolver/AdminResolver.ts | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index eab052bbc..f16347efa 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -2,7 +2,14 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { Resolver, Query, Arg, Args, Authorized, Mutation, Ctx } from 'type-graphql'
-import { getCustomRepository, IsNull, Not, ObjectLiteral, Raw } from '@dbTools/typeorm'
+import {
+  getCustomRepository,
+  IsNull,
+  Not,
+  ObjectLiteral,
+  getConnection,
+  In,
+} from '@dbTools/typeorm'
 import { UserAdmin, SearchUsersResult } from '../model/UserAdmin'
 import { PendingCreation } from '../model/PendingCreation'
 import { CreatePendingCreations } from '../model/CreatePendingCreations'
@@ -51,9 +58,7 @@ export class AdminResolver {
     if (isDeleted) {
       filterCriteria.push({ deletedAt: Not(IsNull()) })
     }
-    // prevent overfetching data from db, select only needed columns
-    // prevent reading and transmitting data from db at least 300 Bytes
-    // one of my example dataset shrink down from 342 Bytes to 42 Bytes, that's ~88% saved db bandwith
+
     const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt']
     const [users, count] = await userRepository.findBySearchCriteriaPagedFiltered(
       userFields.map((fieldName) => {
@@ -91,9 +96,10 @@ export class AdminResolver {
             }
           }
         }
+        const userCreations = creations.find((c) => c.id === user.id)
         const adminUser = new UserAdmin(
           user,
-          await getUserCreations(user.id),
+          userCreations ? userCreations.creations : [1000, 1000, 1000],
           await hasElopageBuys(user.email),
           emailConfirmationSend,
         )

From 1b35da31ace54de0248bf02843e03d579188586c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Feb 2022 09:14:10 +0100
Subject: [PATCH 28/45] fix tests

---
 admin/src/pages/UserSearch.spec.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index 616052a26..eb44e72b0 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -84,7 +84,7 @@ describe('UserSearch', () => {
             currentPage: 1,
             pageSize: 25,
             notActivated: false,
-            deletedUser: false,
+            isDeleted: false,
           },
         }),
       )
@@ -103,7 +103,7 @@ describe('UserSearch', () => {
               currentPage: 1,
               pageSize: 25,
               notActivated: true,
-              deletedUser: false,
+              isDeleted: false,
             },
           }),
         )
@@ -123,7 +123,7 @@ describe('UserSearch', () => {
               currentPage: 1,
               pageSize: 25,
               notActivated: false,
-              deletedUser: true,
+              isDeleted: true,
             },
           }),
         )
@@ -143,7 +143,7 @@ describe('UserSearch', () => {
               currentPage: 2,
               pageSize: 25,
               notActivated: false,
-              deletedUser: false,
+              isDeleted: false,
             },
           }),
         )
@@ -163,7 +163,7 @@ describe('UserSearch', () => {
               currentPage: 1,
               pageSize: 25,
               notActivated: false,
-              deletedUser: false,
+              isDeleted: false,
             },
           }),
         )
@@ -180,7 +180,7 @@ describe('UserSearch', () => {
                 currentPage: 1,
                 pageSize: 25,
                 notActivated: false,
-                deletedUser: false,
+                isDeleted: false,
               },
             }),
           )

From c9cf12ae8bb2f9793a91895ee1bfca03a2a3c68f Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 23 Feb 2022 09:22:37 +0100
Subject: [PATCH 29/45] Update admin/src/components/DeletedUserFormular.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/components/DeletedUserFormular.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index dc51431ec..4e9871cfd 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -6,7 +6,7 @@
     <div v-else class="mt-5">
       <b-form-checkbox switch size="lg" v-model="checked">
         <div v-if="item.deletedAt === null">{{ $t('delete_user') }}</div>
-        <div v-if="item.deletedAt !== null">{{ $t('undelete_user') }}</div>
+        <div>{{ item.deletedAt ? $t('undelete_user') :  $t('delete_user') }}</div>
       </b-form-checkbox>
 
       <div class="mt-3 mb-5">

From d5a630f3433319ca458eafe260f61d63717da2dc Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 23 Feb 2022 09:23:24 +0100
Subject: [PATCH 30/45] Update admin/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 964ec5eea..f230b4716 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -23,7 +23,7 @@
   "date": "Date",
   "delete": "Delete",
   "deleted": "deleted",
-  "deleted_user": "all deleted user",
+  "deleted_user": "All deleted user",
   "delete_user": "Delete user",
   "details": "Details",
   "edit": "Edit",

From 8cbe2507efd96112ac81b1a172311f949c1ecca2 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 23 Feb 2022 09:23:38 +0100
Subject: [PATCH 31/45] Update admin/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index f230b4716..b58fbbbab 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -62,7 +62,7 @@
     }
   },
   "remove": "Remove",
-  "removeNotSelf": "As an admin / moderator you cannot delete yourself.",
+  "removeNotSelf": "As admin / moderator you cannot delete yourself.",
   "remove_all": "Remove all users",
   "save": "Speichern",
   "status": "Status",

From 937ccfbb9d665764998d1f409d78688e2af7b038 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 23 Feb 2022 09:24:58 +0100
Subject: [PATCH 32/45] Update backend/src/graphql/resolver/AdminResolver.ts

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 backend/src/graphql/resolver/AdminResolver.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index f16347efa..480143179 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -29,7 +29,6 @@ import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User } from '@entity/User'
 import { TransactionTypeId } from '../enum/TransactionTypeId'
 import { Balance } from '@entity/Balance'
-// import { isNullableType } from 'graphql'
 
 // const EMAIL_OPT_IN_REGISTER = 1
 // const EMAIL_OPT_UNKNOWN = 3 // elopage?

From dda0c9b113111616cc8b139292bd565fa285c941 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 23 Feb 2022 09:30:49 +0100
Subject: [PATCH 33/45] Update admin/src/components/Tables/SearchUserTable.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/components/Tables/SearchUserTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index c3e94d638..23dfedd62 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -45,7 +45,7 @@
           :index="slotIndex"
           @row-toogle-details="rowToogleDetails"
         >
-          <template #show-collaps>
+          <template #show-collapse>
             <creation-formular
               v-if="!row.item.deletedAt"
               type="singleCreation"

From 6ebaae53bc5eec3cf3ead18013630d3271efc5bc Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 23 Feb 2022 09:31:19 +0100
Subject: [PATCH 34/45] Update admin/src/components/Tables/SearchUserTable.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/components/Tables/SearchUserTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 23dfedd62..84643b59b 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -86,7 +86,7 @@ import CreationTransactionListFormular from '../CreationTransactionListFormular.
 import DeletedUserFormular from '../DeletedUserFormular.vue'
 import { toggleRowDetails } from '../../mixins/toggleRowDetails'
 
-const slotNames = ['show-collaps']
+const slotNames = ['show-collapse']
 
 export default {
   name: 'SearchUserTable',

From 67cd731b0180b618b8927407702278c9dfef89ec Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Wed, 23 Feb 2022 09:31:45 +0100
Subject: [PATCH 35/45] Update admin/src/locales/de.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 168941c5d..6202a8594 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -23,7 +23,7 @@
   "date": "Datum",
   "delete": "Löschen",
   "deleted": "gelöscht",
-  "deleted_user": "alle gelöschten Nutzer",
+  "deleted_user": "Alle gelöschten Nutzer",
   "delete_user": "Nutzer löschen",
   "details": "Details",
   "edit": "Bearbeiten",

From 4d04731569cabfd4fd9635efb1d468760ad9e05d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 23 Feb 2022 10:12:06 +0100
Subject: [PATCH 36/45] Code review by moriz, changes made

---
 admin/src/components/DeletedUserFormular.vue    | 11 +++++------
 admin/src/components/RowDetails.vue             | 16 ++++++----------
 admin/src/components/Tables/SearchUserTable.vue |  2 +-
 admin/src/locales/de.json                       |  4 +++-
 admin/src/locales/en.json                       |  4 +++-
 admin/src/pages/UserSearch.spec.js              |  1 -
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 4e9871cfd..28c85654c 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -6,7 +6,7 @@
     <div v-else class="mt-5">
       <b-form-checkbox switch size="lg" v-model="checked">
         <div v-if="item.deletedAt === null">{{ $t('delete_user') }}</div>
-        <div>{{ item.deletedAt ? $t('undelete_user') :  $t('delete_user') }}</div>
+        <div>{{ item.deletedAt ? $t('undelete_user') : $t('delete_user') }}</div>
       </b-form-checkbox>
 
       <div class="mt-3 mb-5">
@@ -46,7 +46,7 @@ export default {
           },
         })
         .then((result) => {
-          this.$toasted.success('user is deleted')
+          this.$toasted.success(this.$t('user_deleted'))
           this.$emit('updateDeletedAt', {
             userId: this.item.userId,
             deletedAt: result.data.deleteUser,
@@ -54,7 +54,7 @@ export default {
           this.checked = false
         })
         .catch((error) => {
-          this.$toasted.error('user deleted error', error)
+          this.$toasted.error('error', error)
         })
     },
     unDeleteUser() {
@@ -66,16 +66,15 @@ export default {
           },
         })
         .then((result) => {
-          this.$toasted.success('user is undeleted')
+          this.$toasted.success(this.$t('user_recovered'))
           this.$emit('updateDeletedAt', {
             userId: this.item.userId,
             deletedAt: result.data.unDeleteUser,
           })
-          // this.item.deletedAt = null
           this.checked = false
         })
         .catch((error) => {
-          this.$toasted.error('user undeleted error', error)
+          this.$toasted.error('error', error)
         })
     },
   },
diff --git a/admin/src/components/RowDetails.vue b/admin/src/components/RowDetails.vue
index 319936a70..708588a63 100644
--- a/admin/src/components/RowDetails.vue
+++ b/admin/src/components/RowDetails.vue
@@ -1,16 +1,12 @@
 <template>
   <b-card class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
-    <b-row class="mb-2">
-      <b-col></b-col>
-    </b-row>
     <slot :name="slotName" />
-    <b-button size="sm" @click="$emit('row-toogle-details', row, index)">
-      <b-icon
-        :icon="type === 'PageCreationConfirm' ? 'x' : 'eye-slash-fill'"
-        aria-label="Help"
-      ></b-icon>
-      {{ $t('hide_details') }} {{ row.item.firstName }} {{ row.item.lastName }}
-    </b-button>
+    <div class="text-center">
+      <b-button size="sm" @click="$emit('row-toogle-details', row, index)">
+        <b-icon icon="x-circle" aria-label="Help"></b-icon>
+        {{ $t('hide_details') }}
+      </b-button>
+    </div>
   </b-card>
 </template>
 
diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 84643b59b..8928c2a93 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -2,7 +2,7 @@
   <div class="search-user-table">
     <b-table-lite :items="items" :fields="fields" caption-top striped hover stacked="md">
       <template #cell(creation)="data">
-        <div v-html="data.value" @click="rowToogleDetails(row, 0)"></div>
+        <div v-html="data.value"></div>
       </template>
 
       <template #cell(status)="row">
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index cb67f0966..f301d18bd 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -31,7 +31,7 @@
   "e_mail": "E-Mail",
   "firstname": "Vorname",
   "gradido_admin_footer": "Gradido Akademie Adminkonsole",
-  "hide_details": "Details verbergen von",
+  "hide_details": "Details verbergen",
   "lastname": "Nachname",
   "moderator": "Moderator",
   "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.",
@@ -90,5 +90,7 @@
     "text_true": " Die Email wurde bestätigt."
   },
   "userIsDeleted": "Der Nutzer ist gelöscht. Es können keine GDD mehr geschöpft werden.",
+  "user_deleted": "Nutzer ist gelöscht.",
+  "user_recovered.": "Nutzer ist wiederhergestellt.",
   "user_search": "Nutzer-Suche"
 }
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index d9fd2182d..4eb1fc975 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -31,7 +31,7 @@
   "e_mail": "E-mail",
   "firstname": "Firstname",
   "gradido_admin_footer": "Gradido Academy Admin Console",
-  "hide_details": "Hide details from",
+  "hide_details": "Hide details",
   "lastname": "Lastname",
   "moderator": "Moderator",
   "multiple_creation_text": "Please select one or more members for which you would like to perform creations.",
@@ -90,5 +90,7 @@
     "text_true": "The email was confirmed."
   },
   "userIsDeleted": "The user is deleted. No more GDD can be created.",
+  "user_deleted": "User is deleted.",
+  "user_recovered.": "User is recovered.",
   "user_search": "User search"
 }
diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index eb44e72b0..ab2bd722f 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -2,7 +2,6 @@ import { mount } from '@vue/test-utils'
 import UserSearch from './UserSearch.vue'
 
 const localVue = global.localVue
-jest.spyOn(window, 'alert').mockImplementation(() => {})
 
 const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {

From 08a7e2d00b5128bc5780bd3f23934d0286b1dfa2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 23 Feb 2022 11:14:51 +0100
Subject: [PATCH 37/45] Duplicate entry 'delete user' removed

---
 admin/src/components/DeletedUserFormular.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 28c85654c..cb4f0711b 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -5,7 +5,6 @@
     </div>
     <div v-else class="mt-5">
       <b-form-checkbox switch size="lg" v-model="checked">
-        <div v-if="item.deletedAt === null">{{ $t('delete_user') }}</div>
         <div>{{ item.deletedAt ? $t('undelete_user') : $t('delete_user') }}</div>
       </b-form-checkbox>
 

From b8265924c84dbacd1ccec39d769f10ccffd5f91e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Feb 2022 11:15:05 +0100
Subject: [PATCH 38/45] make whole table row clickable

---
 admin/src/components/DeletedUserFormular.vue  |   2 +-
 admin/src/components/RowDetails.vue           |   2 +-
 .../components/Tables/OpenCreationsTable.vue  |   4 +-
 .../src/components/Tables/SearchUserTable.vue | 104 +++++++++---------
 admin/src/mixins/toggleRowDetails.js          |   2 +-
 admin/src/mixins/toggleRowDetails.test.js     |   8 +-
 6 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 4e9871cfd..ead23829b 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -6,7 +6,7 @@
     <div v-else class="mt-5">
       <b-form-checkbox switch size="lg" v-model="checked">
         <div v-if="item.deletedAt === null">{{ $t('delete_user') }}</div>
-        <div>{{ item.deletedAt ? $t('undelete_user') :  $t('delete_user') }}</div>
+        <div>{{ item.deletedAt ? $t('undelete_user') : $t('delete_user') }}</div>
       </b-form-checkbox>
 
       <div class="mt-3 mb-5">
diff --git a/admin/src/components/RowDetails.vue b/admin/src/components/RowDetails.vue
index 319936a70..034114baa 100644
--- a/admin/src/components/RowDetails.vue
+++ b/admin/src/components/RowDetails.vue
@@ -4,7 +4,7 @@
       <b-col></b-col>
     </b-row>
     <slot :name="slotName" />
-    <b-button size="sm" @click="$emit('row-toogle-details', row, index)">
+    <b-button size="sm" @click="$emit('row-toggle-details', row, index)">
       <b-icon
         :icon="type === 'PageCreationConfirm' ? 'x' : 'eye-slash-fill'"
         aria-label="Help"
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index d46515fe1..c3e908868 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -12,7 +12,7 @@
         </b-button>
       </template>
       <template #cell(edit_creation)="row">
-        <b-button variant="info" size="md" @click="rowToogleDetails(row, 0)" class="mr-2">
+        <b-button variant="info" size="md" @click="rowToggleDetails(row, 0)" class="mr-2">
           <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
         </b-button>
       </template>
@@ -27,7 +27,7 @@
           type="show-creation"
           slotName="show-creation"
           :index="0"
-          @row-toogle-details="rowToogleDetails"
+          @row-toggle-details="rowToggleDetails"
         >
           <template #show-creation>
             <div>
diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 84643b59b..ddd89a793 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -1,12 +1,22 @@
 <template>
   <div class="search-user-table">
-    <b-table-lite :items="items" :fields="fields" caption-top striped hover stacked="md">
+    <b-table
+      :items="myItems"
+      :fields="fields"
+      caption-top
+      striped
+      hover
+      stacked="md"
+      select-mode="single"
+      selectableonRowSelected
+      @row-clicked="onRowClicked"
+    >
       <template #cell(creation)="data">
-        <div v-html="data.value" @click="rowToogleDetails(row, 0)"></div>
+        <div v-html="data.value"></div>
       </template>
 
       <template #cell(status)="row">
-        <div @click="rowToogleDetails(row, 0)" class="text-right">
+        <div class="text-right">
           <b-avatar v-if="row.item.deletedAt" class="mr-3" variant="light">
             <b-iconstack font-scale="2">
               <b-icon stacked icon="person" variant="info" scale="0.75"></b-icon>
@@ -16,7 +26,6 @@
           <span v-if="!row.item.deletedAt">
             <b-avatar
               v-if="!row.item.emailChecked"
-              href="#baz"
               icon="envelope"
               class="align-center mr-3"
               variant="danger"
@@ -38,65 +47,50 @@
       </template>
 
       <template #row-details="row">
-        <row-details
-          :row="row"
-          type="singleCreation"
-          :slotName="slotName"
-          :index="slotIndex"
-          @row-toogle-details="rowToogleDetails"
-        >
-          <template #show-collapse>
-            <creation-formular
-              v-if="!row.item.deletedAt"
-              type="singleCreation"
-              pagetype="singleCreation"
-              :creation="row.item.creation"
-              :item="row.item"
-              :creationUserData="creationUserData"
-              @update-user-data="updateUserData"
-            />
-            <div v-else>{{ $t('userIsDeleted') }}</div>
-
-            <confirm-register-mail-formular
-              v-if="!row.item.deletedAt"
-              :checked="row.item.emailChecked"
-              :email="row.item.email"
-              :dateLastSend="
-                row.item.emailConfirmationSend
-                  ? $d(new Date(row.item.emailConfirmationSend), 'long')
-                  : ''
-              "
-            />
-            <creation-transaction-list-formular
-              v-if="!row.item.deletedAt"
-              :userId="row.item.userId"
-            />
-            <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
-          </template>
-        </row-details>
+        <b-card class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
+          <creation-formular
+            v-if="!row.item.deletedAt"
+            type="singleCreation"
+            pagetype="singleCreation"
+            :creation="row.item.creation"
+            :item="row.item"
+            :creationUserData="creationUserData"
+            @update-user-data="updateUserData"
+          />
+          <div v-else>{{ $t('userIsDeleted') }}</div>
+          <confirm-register-mail-formular
+            v-if="!row.item.deletedAt"
+            :checked="row.item.emailChecked"
+            :email="row.item.email"
+            :dateLastSend="
+              row.item.emailConfirmationSend
+                ? $d(new Date(row.item.emailConfirmationSend), 'long')
+                : ''
+            "
+          />
+          <creation-transaction-list-formular
+            v-if="!row.item.deletedAt"
+            :userId="row.item.userId"
+          />
+          <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
+        </b-card>
       </template>
-    </b-table-lite>
+    </b-table>
   </div>
 </template>
 <script>
 import CreationFormular from '../CreationFormular.vue'
 import ConfirmRegisterMailFormular from '../ConfirmRegisterMailFormular.vue'
-import RowDetails from '../RowDetails.vue'
 import CreationTransactionListFormular from '../CreationTransactionListFormular.vue'
 import DeletedUserFormular from '../DeletedUserFormular.vue'
-import { toggleRowDetails } from '../../mixins/toggleRowDetails'
-
-const slotNames = ['show-collapse']
 
 export default {
   name: 'SearchUserTable',
-  mixins: [toggleRowDetails],
   components: {
     CreationFormular,
     ConfirmRegisterMailFormular,
     CreationTransactionListFormular,
     DeletedUserFormular,
-    RowDetails,
   },
   props: {
     items: {
@@ -120,10 +114,22 @@ export default {
     updateDeletedAt({ userId, deletedAt }) {
       this.$emit('updateDeletedAt', userId, deletedAt)
     },
+    onRowClicked(item) {
+      const status = this.myItems.find((obj) => obj === item)._showDetails
+      this.myItems.forEach((obj) => {
+        if (obj === item) {
+          obj._showDetails = !status
+        } else {
+          obj._showDetails = false
+        }
+      })
+    },
   },
   computed: {
-    slotName() {
-      return slotNames[this.slotIndex]
+    myItems() {
+      return this.items.map((item) => {
+        return { ...item, _showDetails: false }
+      })
     },
   },
 }
diff --git a/admin/src/mixins/toggleRowDetails.js b/admin/src/mixins/toggleRowDetails.js
index d73810ae7..cdfca1334 100644
--- a/admin/src/mixins/toggleRowDetails.js
+++ b/admin/src/mixins/toggleRowDetails.js
@@ -7,7 +7,7 @@ export const toggleRowDetails = {
     }
   },
   methods: {
-    rowToogleDetails(row, index) {
+    rowToggleDetails(row, index) {
       if (this.openRow) {
         if (this.openRow.index === row.index) {
           if (index === this.slotIndex) {
diff --git a/admin/src/mixins/toggleRowDetails.test.js b/admin/src/mixins/toggleRowDetails.test.js
index b365bf613..22bf7b925 100644
--- a/admin/src/mixins/toggleRowDetails.test.js
+++ b/admin/src/mixins/toggleRowDetails.test.js
@@ -35,7 +35,7 @@ describe('toggleRowDetails', () => {
 
   describe('no open row', () => {
     beforeEach(() => {
-      wrapper.vm.rowToogleDetails(row, 2)
+      wrapper.vm.rowToggleDetails(row, 2)
     })
 
     it('calls toggleDetails', () => {
@@ -70,7 +70,7 @@ describe('toggleRowDetails', () => {
     describe('row index is open row index', () => {
       describe('index is slot index', () => {
         beforeEach(() => {
-          wrapper.vm.rowToogleDetails(row, 0)
+          wrapper.vm.rowToggleDetails(row, 0)
         })
 
         it('calls toggleDetails', () => {
@@ -84,7 +84,7 @@ describe('toggleRowDetails', () => {
 
       describe('index is not slot index', () => {
         beforeEach(() => {
-          wrapper.vm.rowToogleDetails(row, 2)
+          wrapper.vm.rowToggleDetails(row, 2)
         })
 
         it('does not call toggleDetails', () => {
@@ -99,7 +99,7 @@ describe('toggleRowDetails', () => {
 
     describe('row index is not open row index', () => {
       beforeEach(() => {
-        wrapper.vm.rowToogleDetails(
+        wrapper.vm.rowToggleDetails(
           {
             toggleDetails: secondToggleDetailsMock,
             index: 2,

From bb3da3b088d42ec155944353c6561448cfb7c9fd Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 23 Feb 2022 11:48:27 +0100
Subject: [PATCH 39/45] class pointer on row and  scroll to ref by click in
 table row

---
 admin/src/components/Tables/SearchUserTable.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index ddd89a793..c71f79aa3 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="search-user-table">
     <b-table
+      tbody-tr-class="pointer"
       :items="myItems"
       :fields="fields"
       caption-top
@@ -47,7 +48,7 @@
       </template>
 
       <template #row-details="row">
-        <b-card class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
+        <b-card ref="rowDetails" class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
           <creation-formular
             v-if="!row.item.deletedAt"
             type="singleCreation"
@@ -114,7 +115,7 @@ export default {
     updateDeletedAt({ userId, deletedAt }) {
       this.$emit('updateDeletedAt', userId, deletedAt)
     },
-    onRowClicked(item) {
+    async onRowClicked(item) {
       const status = this.myItems.find((obj) => obj === item)._showDetails
       this.myItems.forEach((obj) => {
         if (obj === item) {
@@ -123,6 +124,10 @@ export default {
           obj._showDetails = false
         }
       })
+      await this.$nextTick()
+      if (!status && this.$refs.rowDetails) {
+        this.$refs.rowDetails.focus()
+      }
     },
   },
   computed: {

From ff63706f5197ff27b49994b393dfa4df643bd42b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 23 Feb 2022 13:14:10 +0100
Subject: [PATCH 40/45] Removing code where no one knows where it comes from

---
 .../entity/0016-transaction_signatures/Transaction.ts     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/database/entity/0016-transaction_signatures/Transaction.ts b/database/entity/0016-transaction_signatures/Transaction.ts
index b2b29d1c2..5e31355db 100644
--- a/database/entity/0016-transaction_signatures/Transaction.ts
+++ b/database/entity/0016-transaction_signatures/Transaction.ts
@@ -4,14 +4,6 @@ import { TransactionSendCoin } from '../0001-init_db/TransactionSendCoin'
 
 @Entity('transactions')
 export class Transaction extends BaseEntity {
-  userId(userId: any) {
-    throw new Error('Method not implemented.')
-  }
-
-  amount(amount: any): number {
-    throw new Error('Method not implemented.')
-  }
-
   // TODO the id is defined as bigint(20) - there might be problems with that: https://github.com/typeorm/typeorm/issues/2400
   @PrimaryGeneratedColumn('increment', { unsigned: true })
   id: number

From cd4a326ab70b3a8f4ca73b5e671da121bd6dbda4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 23 Feb 2022 13:32:38 +0100
Subject: [PATCH 41/45] Removing another code where no one knows where it comes
 from

---
 database/entity/0016-transaction_signatures/Transaction.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/database/entity/0016-transaction_signatures/Transaction.ts b/database/entity/0016-transaction_signatures/Transaction.ts
index 5e31355db..5410d010b 100644
--- a/database/entity/0016-transaction_signatures/Transaction.ts
+++ b/database/entity/0016-transaction_signatures/Transaction.ts
@@ -31,8 +31,4 @@ export class Transaction extends BaseEntity {
 
   @OneToOne(() => TransactionCreation, (transactionCreation) => transactionCreation.transaction)
   transactionCreation: TransactionCreation
-
-  sendReceiverUserId: number
-  sendReceiverPublicKey: Buffer
-  sendSenderFinalBalance: bigint
 }

From 15b2bc30f79d979537609ea64319b02cf62263f4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 23 Feb 2022 14:12:10 +0100
Subject: [PATCH 42/45] add DeletedUserFormular.spec.js for tests

---
 .../components/DeletedUserFormular.spec.js    | 56 +++++++++++++++++++
 admin/src/components/DeletedUserFormular.vue  |  2 +-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 admin/src/components/DeletedUserFormular.spec.js

diff --git a/admin/src/components/DeletedUserFormular.spec.js b/admin/src/components/DeletedUserFormular.spec.js
new file mode 100644
index 000000000..de824f6d5
--- /dev/null
+++ b/admin/src/components/DeletedUserFormular.spec.js
@@ -0,0 +1,56 @@
+import { mount } from '@vue/test-utils'
+import DeletedUserFormular from './DeletedUserFormular.vue'
+import { deleteUser } from '../graphql/deleteUser'
+import { unDeleteUser } from '../graphql/unDeleteUser'
+
+const localVue = global.localVue
+
+const apolloMutateMock = jest.fn().mockResolvedValue({
+  data: {
+    deleteUser: { userId: 1, deletedAt: new Date() },
+    unDeleteUser: { userId: 1, deletedAt: null },
+  },
+})
+const toastedErrorMock = jest.fn()
+const toastedSuccessMock = jest.fn()
+
+const mocks = {
+  $t: jest.fn(),
+  $apollo: {
+    mutate: apolloMutateMock,
+  },
+  $store: {
+    state: {
+      moderator: {
+        id: 0,
+        name: 'test moderator',
+      },
+    },
+  },
+  $toasted: {
+    error: toastedErrorMock,
+    success: toastedSuccessMock,
+  },
+}
+
+const propsData = {
+  item: {},
+}
+
+describe('DeletedUserFormular', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(DeletedUserFormular, { localVue, mocks, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV element with the class.delete-user-formular', () => {
+      expect(wrapper.find('.deleted-user-formular').exists()).toBeTruthy()
+    })
+  })
+})
diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index cb4f0711b..52c63fe57 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="deleted-user-formular">
     <div v-if="item.userId === $store.state.moderator.id" class="mt-5 mb-5">
       {{ $t('removeNotSelf') }}
     </div>

From 980d3cf96a5215466551f2f1e8d805ed8090bcb6 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Feb 2022 17:24:24 +0100
Subject: [PATCH 43/45] test delete user component

---
 .../components/DeletedUserFormular.spec.js    | 212 +++++++++++++++++-
 admin/src/components/DeletedUserFormular.vue  |   4 +-
 2 files changed, 211 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.spec.js b/admin/src/components/DeletedUserFormular.spec.js
index de824f6d5..bad97c1d7 100644
--- a/admin/src/components/DeletedUserFormular.spec.js
+++ b/admin/src/components/DeletedUserFormular.spec.js
@@ -5,17 +5,19 @@ import { unDeleteUser } from '../graphql/unDeleteUser'
 
 const localVue = global.localVue
 
+const date = new Date()
+
 const apolloMutateMock = jest.fn().mockResolvedValue({
   data: {
-    deleteUser: { userId: 1, deletedAt: new Date() },
-    unDeleteUser: { userId: 1, deletedAt: null },
+    deleteUser: date,
   },
 })
+
 const toastedErrorMock = jest.fn()
 const toastedSuccessMock = jest.fn()
 
 const mocks = {
-  $t: jest.fn(),
+  $t: jest.fn((t) => t),
   $apollo: {
     mutate: apolloMutateMock,
   },
@@ -46,6 +48,7 @@ describe('DeletedUserFormular', () => {
 
   describe('mount', () => {
     beforeEach(() => {
+      jest.clearAllMocks()
       wrapper = Wrapper()
     })
 
@@ -53,4 +56,207 @@ describe('DeletedUserFormular', () => {
       expect(wrapper.find('.deleted-user-formular').exists()).toBeTruthy()
     })
   })
+
+  describe('delete self', () => {
+    beforeEach(() => {
+      wrapper.setProps({
+        item: {
+          userId: 0,
+        },
+      })
+    })
+
+    it('shows a text that you cannot delete yourself', () => {
+      expect(wrapper.text()).toBe('removeNotSelf')
+    })
+  })
+
+  describe('delete other user', () => {
+    beforeEach(() => {
+      wrapper.setProps({
+        item: {
+          userId: 1,
+          deletedAt: null,
+        },
+      })
+    })
+
+    it('has a checkbox', () => {
+      expect(wrapper.find('input[type="checkbox"]').exists()).toBeTruthy()
+    })
+
+    it('shows the text "delete_user"', () => {
+      expect(wrapper.text()).toBe('delete_user')
+    })
+
+    describe('click on checkbox', () => {
+      beforeEach(async () => {
+        await wrapper.find('input[type="checkbox"]').setChecked()
+      })
+
+      it('has a confirmation button', () => {
+        expect(wrapper.find('button').exists()).toBeTruthy()
+      })
+
+      it('has the button text "delete_user"', () => {
+        expect(wrapper.find('button').text()).toBe('delete_user')
+      })
+
+      describe('confirm delete with success', () => {
+        beforeEach(async () => {
+          await wrapper.find('button').trigger('click')
+        })
+
+        it('calls the API', () => {
+          expect(apolloMutateMock).toBeCalledWith(
+            expect.objectContaining({
+              mutation: deleteUser,
+              variables: {
+                userId: 1,
+              },
+            }),
+          )
+        })
+
+        it('toasts a success message', () => {
+          expect(toastedSuccessMock).toBeCalledWith('user_deleted')
+        })
+
+        it('emits update deleted At', () => {
+          expect(wrapper.emitted('updateDeletedAt')).toEqual(
+            expect.arrayContaining([
+              expect.arrayContaining([
+                {
+                  userId: 1,
+                  deletedAt: date,
+                },
+              ]),
+            ]),
+          )
+        })
+
+        it('unchecks the checkbox', () => {
+          expect(wrapper.find('input').attributes('checked')).toBe(undefined)
+        })
+      })
+
+      describe('confirm delete with error', () => {
+        beforeEach(async () => {
+          apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+          await wrapper.find('button').trigger('click')
+        })
+
+        it('toasts an error message', () => {
+          expect(toastedErrorMock).toBeCalledWith('Oh no!')
+        })
+      })
+
+      describe('click on checkbox again', () => {
+        beforeEach(async () => {
+          await wrapper.find('input[type="checkbox"]').setChecked(false)
+        })
+
+        it('has no confirmation button anymore', () => {
+          expect(wrapper.find('button').exists()).toBeFalsy()
+        })
+      })
+    })
+  })
+
+  describe('recover user', () => {
+    beforeEach(() => {
+      wrapper.setProps({
+        item: {
+          userId: 1,
+          deletedAt: date,
+        },
+      })
+    })
+
+    it('has a checkbox', () => {
+      expect(wrapper.find('input[type="checkbox"]').exists()).toBeTruthy()
+    })
+
+    it('shows the text "undelete_user"', () => {
+      expect(wrapper.text()).toBe('undelete_user')
+    })
+
+    describe('click on checkbox', () => {
+      beforeEach(async () => {
+        apolloMutateMock.mockResolvedValue({
+          data: {
+            unDeleteUser: null,
+          },
+        })
+        await wrapper.find('input[type="checkbox"]').setChecked()
+      })
+
+      it('has a confirmation button', () => {
+        expect(wrapper.find('button').exists()).toBeTruthy()
+      })
+
+      it('has the button text "undelete_user"', () => {
+        expect(wrapper.find('button').text()).toBe('undelete_user')
+      })
+
+      describe('confirm recover with success', () => {
+        beforeEach(async () => {
+          await wrapper.find('button').trigger('click')
+        })
+
+        it('calls the API', () => {
+          expect(apolloMutateMock).toBeCalledWith(
+            expect.objectContaining({
+              mutation: unDeleteUser,
+              variables: {
+                userId: 1,
+              },
+            }),
+          )
+        })
+
+        it('toasts a success message', () => {
+          expect(toastedSuccessMock).toBeCalledWith('user_recovered')
+        })
+
+        it('emits update deleted At', () => {
+          expect(wrapper.emitted('updateDeletedAt')).toEqual(
+            expect.arrayContaining([
+              expect.arrayContaining([
+                {
+                  userId: 1,
+                  deletedAt: null,
+                },
+              ]),
+            ]),
+          )
+        })
+
+        it('unchecks the checkbox', () => {
+          expect(wrapper.find('input').attributes('checked')).toBe(undefined)
+        })
+      })
+
+      describe('confirm recover with error', () => {
+        beforeEach(async () => {
+          apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+          await wrapper.find('button').trigger('click')
+        })
+
+        it('toasts an error message', () => {
+          expect(toastedErrorMock).toBeCalledWith('Oh no!')
+        })
+      })
+
+      describe('click on checkbox again', () => {
+        beforeEach(async () => {
+          await wrapper.find('input[type="checkbox"]').setChecked(false)
+        })
+
+        it('has no confirmation button anymore', () => {
+          expect(wrapper.find('button').exists()).toBeFalsy()
+        })
+      })
+    })
+  })
 })
diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 52c63fe57..b840fdb23 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -53,7 +53,7 @@ export default {
           this.checked = false
         })
         .catch((error) => {
-          this.$toasted.error('error', error)
+          this.$toasted.error(error.message)
         })
     },
     unDeleteUser() {
@@ -73,7 +73,7 @@ export default {
           this.checked = false
         })
         .catch((error) => {
-          this.$toasted.error('error', error)
+          this.$toasted.error(error.message)
         })
     },
   },

From 993b896da8384dd6113cc5b7d9122628f680977f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Feb 2022 18:04:50 +0100
Subject: [PATCH 44/45] test new Search User Table

---
 .../components/Tables/SearchUserTable.spec.js | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 admin/src/components/Tables/SearchUserTable.spec.js

diff --git a/admin/src/components/Tables/SearchUserTable.spec.js b/admin/src/components/Tables/SearchUserTable.spec.js
new file mode 100644
index 000000000..9e1ce5e52
--- /dev/null
+++ b/admin/src/components/Tables/SearchUserTable.spec.js
@@ -0,0 +1,129 @@
+import { mount } from '@vue/test-utils'
+import SearchUserTable from './SearchUserTable.vue'
+
+const date = new Date()
+
+const localVue = global.localVue
+
+const apolloMutateMock = jest.fn().mockResolvedValue({})
+const apolloQueryMock = jest.fn().mockResolvedValue({})
+
+const propsData = {
+  items: [
+    {
+      userId: 1,
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      email: 'bibi@bloxberg.de',
+      creation: [200, 400, 600],
+      emailChecked: true,
+    },
+    {
+      userId: 2,
+      firstName: 'Benjamin',
+      lastName: 'Blümchen',
+      email: 'benjamin@bluemchen.de',
+      creation: [1000, 1000, 1000],
+      emailChecked: true,
+    },
+    {
+      userId: 3,
+      firstName: 'Peter',
+      lastName: 'Lustig',
+      email: 'peter@lustig.de',
+      creation: [0, 0, 0],
+      emailChecked: true,
+    },
+    {
+      userId: 4,
+      firstName: 'New',
+      lastName: 'User',
+      email: 'new@user.ch',
+      creation: [1000, 1000, 1000],
+      emailChecked: false,
+    },
+  ],
+  fields: [
+    { key: 'email', label: 'e_mail' },
+    { key: 'firstName', label: 'firstname' },
+    { key: 'lastName', label: 'lastname' },
+    {
+      key: 'creation',
+      label: 'creationLabel',
+      formatter: (value, key, item) => {
+        return value.join(' | ')
+      },
+    },
+    { key: 'status', label: 'status' },
+  ],
+}
+
+const mocks = {
+  $t: jest.fn((t) => t),
+  $d: jest.fn((d) => d),
+  $apollo: {
+    mutate: apolloMutateMock,
+    query: apolloQueryMock,
+  },
+  $store: {
+    state: {
+      moderator: {
+        id: 0,
+        name: 'test moderator',
+      },
+    },
+  },
+  $toasted: {
+    error: jest.fn(),
+    success: jest.fn(),
+  },
+}
+
+describe('SearchUserTable', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(SearchUserTable, { localVue, mocks, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a table with four rows', () => {
+      expect(wrapper.findAll('tbody > tr')).toHaveLength(4)
+    })
+
+    describe('show row details', () => {
+      beforeEach(async () => {
+        await wrapper.findAll('tbody > tr').at(1).trigger('click')
+      })
+
+      describe('deleted at', () => {
+        beforeEach(async () => {
+          await wrapper.find('div.deleted-user-formular').vm.$emit('updateDeletedAt', {
+            userId: 1,
+            deletedAt: date,
+          })
+        })
+
+        it('emits updateDeletedAt', () => {
+          expect(wrapper.emitted('updateDeletedAt')).toEqual([[1, date]])
+        })
+      })
+
+      describe('updateUserData', () => {
+        beforeEach(async () => {
+          await wrapper
+            .find('div.component-creation-formular')
+            .vm.$emit('update-user-data', propsData.items[1], [250, 500, 750])
+        })
+
+        it('updates the item', () => {
+          expect(wrapper.vm.items[1].creation).toEqual([250, 500, 750])
+        })
+      })
+    })
+  })
+})

From 567cde0c8a1aa824cfb0ddf77e8250fd925bda6a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Feb 2022 18:05:44 +0100
Subject: [PATCH 45/45] coverage admin interface to 95%

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c1e363b52..b3c097993 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -422,7 +422,7 @@ jobs:
           report_name: Coverage Admin Interface
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 94
+          min_coverage: 95
           token: ${{ github.token }}
 
   ##############################################################################