From 0e988b149152dee36fd734c7bb8be610f22fde9d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 6 Apr 2022 10:43:10 +0200
Subject: [PATCH 1/6] add tab system from bootstrap

---
 .../src/components/Tables/SearchUserTable.vue | 59 +++++++++++--------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 024001193..0cb56f2cb 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -49,30 +49,41 @@
 
       <template #row-details="row">
         <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"
-            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 v-if="!row.item.deletedAt" :userId="row.item.userId" />
-          <transaction-link-list :userId="row.item.userId" />
-
-          <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
+          <b-tabs content-class="mt-3">
+            <b-tab title="Creations" active :disabled="row.item.deletedAt">
+              <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>
+            </b-tab>
+            <b-tab title="Email" :disabled="row.item.deletedAt">
+              <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')
+                    : ''
+                "
+              />
+            </b-tab>
+            <b-tab title="ListCreations" :disabled="row.item.deletedAt">
+              <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
+            </b-tab>
+            <b-tab title="ListLinks" :disabled="row.item.deletedAt">
+              <transaction-link-list :userId="row.item.userId" />
+            </b-tab>
+            <b-tab title="Delete">
+              <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
+            </b-tab>
+          </b-tabs>
         </b-card>
       </template>
     </b-table>

From be2bf87b84e28503c33f10f7b9753c76a8848fb3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 10 Apr 2022 15:30:52 +0200
Subject: [PATCH 2/6] add b-tab :disabled='row.item.deletedAt !== null'

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

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 0cb56f2cb..0778b3528 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -50,7 +50,7 @@
       <template #row-details="row">
         <b-card ref="rowDetails" class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
           <b-tabs content-class="mt-3">
-            <b-tab title="Creations" active :disabled="row.item.deletedAt">
+            <b-tab title="Creations" active :disabled="row.item.deletedAt !== null">
               <creation-formular
                 v-if="!row.item.deletedAt"
                 type="singleCreation"
@@ -62,7 +62,7 @@
               />
               <div v-else>{{ $t('userIsDeleted') }}</div>
             </b-tab>
-            <b-tab title="Email" :disabled="row.item.deletedAt">
+            <b-tab title="Email" :disabled="row.item.deletedAt !== null">
               <confirm-register-mail-formular
                 v-if="!row.item.deletedAt"
                 :checked="row.item.emailChecked"
@@ -74,10 +74,10 @@
                 "
               />
             </b-tab>
-            <b-tab title="ListCreations" :disabled="row.item.deletedAt">
+            <b-tab title="ListCreations" :disabled="row.item.deletedAt !== null">
               <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
-            <b-tab title="ListLinks" :disabled="row.item.deletedAt">
+            <b-tab title="ListLinks" :disabled="row.item.deletedAt !== null">
               <transaction-link-list :userId="row.item.userId" />
             </b-tab>
             <b-tab title="Delete">

From b1ccf1bf14fcd32af3c82f0fc516734cbbd4a716 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 14 Apr 2022 12:37:21 +0200
Subject: [PATCH 3/6] add locales for tabs in userdatas  adminarea

---
 admin/src/components/Tables/SearchUserTable.vue | 13 ++++++++-----
 admin/src/locales/de.json                       |  1 +
 admin/src/locales/en.json                       |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 0778b3528..7d93103f0 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -50,7 +50,7 @@
       <template #row-details="row">
         <b-card ref="rowDetails" class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
           <b-tabs content-class="mt-3">
-            <b-tab title="Creations" active :disabled="row.item.deletedAt !== null">
+            <b-tab :title="$t('creation')" active :disabled="row.item.deletedAt !== null">
               <creation-formular
                 v-if="!row.item.deletedAt"
                 type="singleCreation"
@@ -62,7 +62,7 @@
               />
               <div v-else>{{ $t('userIsDeleted') }}</div>
             </b-tab>
-            <b-tab title="Email" :disabled="row.item.deletedAt !== null">
+            <b-tab :title="$t('e_mail')" :disabled="row.item.deletedAt !== null">
               <confirm-register-mail-formular
                 v-if="!row.item.deletedAt"
                 :checked="row.item.emailChecked"
@@ -74,13 +74,16 @@
                 "
               />
             </b-tab>
-            <b-tab title="ListCreations" :disabled="row.item.deletedAt !== null">
+            <b-tab :title="$t('creationList')" :disabled="row.item.deletedAt !== null">
               <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
-            <b-tab title="ListLinks" :disabled="row.item.deletedAt !== null">
+            <b-tab
+              :title="$t('transactionlink.form_header')"
+              :disabled="row.item.deletedAt !== null"
+            >
               <transaction-link-list :userId="row.item.userId" />
             </b-tab>
-            <b-tab title="Delete">
+            <b-tab :title="$t('delete_user')">
               <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
             </b-tab>
           </b-tabs>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 5574e09ae..87ff963e4 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -2,6 +2,7 @@
   "all_emails": "Alle Nutzer",
   "back": "zurück",
   "creation": "Schöpfung",
+  "creationList":"Schöpfungsliste",
   "creation_form": {
     "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
     "creation_for": "Aktives Grundeinkommen für",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index f54af765a..286bb5e57 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -2,6 +2,7 @@
   "all_emails": "All users",
   "back": "back",
   "creation": "Creation",
+  "creationList":"Creation list",
   "creation_form": {
     "creation_failed": "Could not create pending creation for {email}",
     "creation_for": "Active Basic Income for",

From 8b8b28c188ba52b909e753f8048c7311607347d3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 14 Apr 2022 13:53:02 +0200
Subject: [PATCH 4/6] add deleteAt status on transaction-lik list

---
 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 7d93103f0..8170c6452 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -81,7 +81,7 @@
               :title="$t('transactionlink.form_header')"
               :disabled="row.item.deletedAt !== null"
             >
-              <transaction-link-list :userId="row.item.userId" />
+              <transaction-link-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
             <b-tab :title="$t('delete_user')">
               <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />

From 59cca07681b33973f46e197a040345894fd2d7ca Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 14 Apr 2022 14:26:29 +0200
Subject: [PATCH 5/6] fixed yarn lint

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 87ff963e4..bfc8063be 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -2,7 +2,7 @@
   "all_emails": "Alle Nutzer",
   "back": "zurück",
   "creation": "Schöpfung",
-  "creationList":"Schöpfungsliste",
+  "creationList": "Schöpfungsliste",
   "creation_form": {
     "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
     "creation_for": "Aktives Grundeinkommen für",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 286bb5e57..e7f48f42c 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -2,7 +2,7 @@
   "all_emails": "All users",
   "back": "back",
   "creation": "Creation",
-  "creationList":"Creation list",
+  "creationList": "Creation list",
   "creation_form": {
     "creation_failed": "Could not create pending creation for {email}",
     "creation_for": "Active Basic Income for",

From 119b8a84c9f023bc3864ca3f3032ade80f1922e9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 19 Apr 2022 13:51:54 +0200
Subject: [PATCH 6/6] fixed review requests

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

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index 8170c6452..0be24a099 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -60,7 +60,6 @@
                 :creationUserData="creationUserData"
                 @update-user-data="updateUserData"
               />
-              <div v-else>{{ $t('userIsDeleted') }}</div>
             </b-tab>
             <b-tab :title="$t('e_mail')" :disabled="row.item.deletedAt !== null">
               <confirm-register-mail-formular
@@ -77,10 +76,7 @@
             <b-tab :title="$t('creationList')" :disabled="row.item.deletedAt !== null">
               <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
-            <b-tab
-              :title="$t('transactionlink.form_header')"
-              :disabled="row.item.deletedAt !== null"
-            >
+            <b-tab :title="$t('transactionlink.name')" :disabled="row.item.deletedAt !== null">
               <transaction-link-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
             </b-tab>
             <b-tab :title="$t('delete_user')">
diff --git a/admin/src/components/TransactionLinkList.vue b/admin/src/components/TransactionLinkList.vue
index fa67c8797..0289792a2 100644
--- a/admin/src/components/TransactionLinkList.vue
+++ b/admin/src/components/TransactionLinkList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="transaction-link-list">
     <div v-if="items.length > 0">
-      <div class="h3">{{ $t('transactionlink.form_header') }}</div>
+      <div class="h3">{{ $t('transactionlink.name') }}</div>
       <b-table striped hover :fields="fields" :items="items"></b-table>
     </div>
     <b-pagination
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index bfc8063be..b667a1ada 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -79,7 +79,7 @@
   "text": "Text",
   "transactionlink": {
     "created": "Erstellt",
-    "form_header": "Transaktion-Links",
+    "name": "Transaktion-Links",
     "valid_until": "Gültig bis"
   },
   "transactionlist": {
@@ -101,7 +101,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_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 e7f48f42c..982c42d92 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -79,7 +79,7 @@
   "text": "Text",
   "transactionlink": {
     "created": "Created",
-    "form_header": "Transaction links",
+    "name": "Transaction links",
     "valid_until": "Valid until"
   },
   "transactionlist": {
@@ -101,7 +101,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_deleted": "User is deleted.",
   "user_recovered": "User is recovered.",
   "user_search": "User search"