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] 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: {