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