From 6d18fce4e8d2991744a837c1ed09b3142a940a80 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 23 Mar 2023 15:41:13 +0100
Subject: [PATCH 01/18] remove toggle and add confirm modal to user
 (un)deletion in admin interface

---
 admin/src/components/DeletedUserFormular.vue | 54 +++++++++++++++++---
 admin/src/locales/de.json                    | 10 ++++
 admin/src/locales/en.json                    | 10 ++++
 3 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 576ac9f93..bdffc2e54 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -4,19 +4,36 @@
       {{ $t('removeNotSelf') }}
     </div>
     <div v-else class="mt-5">
-      <b-form-checkbox switch size="lg" v-model="checked">
-        <div>{{ item.deletedAt ? $t('undelete_user') : $t('delete_user') }}</div>
-      </b-form-checkbox>
-
       <div class="mt-3 mb-5">
-        <b-button v-if="checked && item.deletedAt === null" variant="danger" @click="deleteUser">
+        <b-button
+          v-if="item.deletedAt === null"
+          variant="danger"
+          v-b-modal.delete-user-modal
+          @click="showModal('deleteUser')"
+        >
           {{ $t('delete_user') }}
         </b-button>
-        <b-button v-if="checked && item.deletedAt !== null" variant="success" @click="unDeleteUser">
+        <b-button
+          v-if="item.deletedAt !== null"
+          variant="success"
+          v-b-modal.delete-user-modal
+          @click="showModal('undeleteUser')"
+        >
           {{ $t('undelete_user') }}
         </b-button>
       </div>
     </div>
+    <b-modal
+      id="delete-user-modal"
+      hide-header-close
+      :title="modalTitle"
+      :cancel-title="$t('overlay.cancel')"
+      :ok-title="modalOkTitle"
+      :ok-variant="variant"
+      @ok="modalEvent"
+    >
+      <p class="my-4">{{ modalQuestion }}</p>
+    </b-modal>
   </div>
 </template>
 <script>
@@ -34,9 +51,34 @@ export default {
   data() {
     return {
       checked: false,
+      modalTitle: '',
+      modalQuestion: '',
+      modalOkTitle: '',
+      modalEvent: null,
+      username: '',
+      variant: 'danger',
     }
   },
   methods: {
+    showModal(type) {
+      this.username = `${this.item.firstName} ${this.item.lastName}`
+
+      if (type === 'deleteUser') {
+        this.variant = 'danger'
+        this.modalTitle = this.$t('overlay.deleteUser.title')
+        this.modalQuestion = this.$t('overlay.deleteUser.question', { username: this.username })
+        this.modalOkTitle = this.$t('overlay.deleteUser.yes')
+        this.modalEvent = this.deleteUser
+      }
+
+      if (type === 'undeleteUser') {
+        this.variant = 'success'
+        this.modalTitle = this.$t('overlay.undeleteUser.title')
+        this.modalQuestion = this.$t('overlay.undeleteUser.question', { username: this.username })
+        this.modalOkTitle = this.$t('overlay.undeleteUser.yes')
+        this.modalEvent = this.unDeleteUser
+      }
+    },
     deleteUser() {
       this.$apollo
         .mutate({
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 0d05eaa88..b981da5ef 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -126,11 +126,21 @@
       "title": "Gemeinwohl-Beitrag löschen!",
       "yes": "Ja, Beitrag löschen!"
     },
+    "deleteUser": {
+      "question": "Willst du {username} wirklich löschen?",
+      "title": "Nutzer löschen",
+      "yes": "Ja, Nutzer löschen"
+    },
     "deny": {
       "question": "Willst du diesen Gemeinwohl-Beitrag  wirklich ablehnen?",
       "text": "Nach dem Speichern ist der Datensatz nicht mehr änderbar und kann auch nicht mehr gelöscht werden. Bitte überprüfe genau, dass alles stimmt.",
       "title": "Gemeinwohl-Beitrag ablehnen!",
       "yes": "Ja, Beitrag ablehnen und speichern!"
+    },
+    "undeleteUser": {
+      "question": "Willst du wirklich {username} wiederherstellen?",
+      "title": "Nutzer wiederherstellen",
+      "yes": "Ja, Nutzer wiederherstellen"
     }
   },
   "redeemed": "eingelöst",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index f36944a63..7602aafb1 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -126,11 +126,21 @@
       "title": "Delete creation!",
       "yes": "Yes, delete and save creation!"
     },
+    "deleteUser": {
+      "question": "Do you really want to delete {username}?",
+      "title": "Delete user",
+      "yes": "Yes, delete user"
+    },
     "deny": {
       "question": "Do you really want to carry out and finally save this pre-stored creation?",
       "text": "After saving, the record can no longer be changed or deleted. Please check carefully that everything is correct.",
       "title": "Reject creation!",
       "yes": "Yes, reject and save creation!"
+    },
+    "undeleteUser": {
+      "question": "Do you really want to undelete {username}",
+      "title": "Undelete user",
+      "yes": "Yes,undelete user"
     }
   },
   "redeemed": "redeemed",

From 5e7520246be0abebaac57c35dcab09b1961b20f0 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 23 Mar 2023 20:26:35 +0100
Subject: [PATCH 02/18] add modal to user role change in admin interface

---
 .../src/components/ChangeUserRoleFormular.vue | 58 ++++++++++++++-----
 admin/src/locales/de.json                     |  6 ++
 admin/src/locales/en.json                     |  6 ++
 3 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/admin/src/components/ChangeUserRoleFormular.vue b/admin/src/components/ChangeUserRoleFormular.vue
index 1217ce7f0..42695256e 100644
--- a/admin/src/components/ChangeUserRoleFormular.vue
+++ b/admin/src/components/ChangeUserRoleFormular.vue
@@ -4,19 +4,35 @@
       <div v-if="item.userId === $store.state.moderator.id" class="m-3 mb-4">
         {{ $t('userRole.notChangeYourSelf') }}
       </div>
-      <div class="m-3">
+      <div v-else class="m-3">
         <label for="role" class="mr-3">{{ $t('userRole.selectLabel') }}</label>
-        <b-form-select
-          class="role-select"
-          v-model="roleSelected"
-          :options="roles"
-          :disabled="item.userId === $store.state.moderator.id"
-        />
+        <b-form-select class="role-select" v-model="roleSelected" :options="roles" />
+        <div class="mt-3 mb-5">
+          <b-button
+            variant="danger"
+            v-b-modal.user-role-modal
+            :disabled="currentRole === roleSelected"
+            @click="showModal('changeUserRole')"
+          >
+            {{ $t('change_user_role') }}
+          </b-button>
+        </div>
       </div>
     </div>
+
+    <b-modal
+      id="user-role-modal"
+      hide-header-close
+      ok-variant="danger"
+      :title="modalTitle"
+      :cancel-title="$t('overlay.cancel')"
+      :ok-title="modalOkTitle"
+      @ok="modalEvent"
+    >
+      <p class="my-4">{{ modalQuestion }}</p>
+    </b-modal>
   </div>
 </template>
-
 <script>
 import { setUserRole } from '../graphql/setUserRole'
 
@@ -35,21 +51,37 @@ export default {
   },
   data() {
     return {
+      currentRole: this.item.isAdmin ? rolesValues.admin : rolesValues.user,
       roleSelected: this.item.isAdmin ? rolesValues.admin : rolesValues.user,
       roles: [
         { value: rolesValues.user, text: this.$t('userRole.selectRoles.user') },
         { value: rolesValues.admin, text: this.$t('userRole.selectRoles.admin') },
       ],
+      modalTitle: '',
+      modalQuestion: '',
+      modalOkTitle: '',
+      modalEvent: null,
+      username: '',
     }
   },
   watch: {
-    roleSelected(newRole, oldRole) {
-      if (newRole !== oldRole) {
-        this.setUserRole(newRole, oldRole)
-      }
-    },
+    // roleSelected(newRole, oldRole) {
+    //   if (newRole !== oldRole) {
+    //     // this.setUserRole(newRole, oldRole)
+    //   }
+    // },
   },
   methods: {
+    showModal() {
+      this.username = `${this.item.firstName} ${this.item.lastName}`
+      this.modalTitle = this.$t('overlay.changeUserRole.title')
+      this.modalQuestion = this.$t('overlay.changeUserRole.question', {
+        username: this.username,
+        newRole: this.roleSelected, // TODO get the text:Administrator instead of admin
+      })
+      this.modalOkTitle = this.$t('overlay.changeUserRole.yes')
+      this.modalEvent = this.setUserRole(this.roleSelected, this.currentRole)
+    },
     setUserRole(newRole, oldRole) {
       this.$apollo
         .mutate({
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b981da5ef..ad754c456 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -2,6 +2,7 @@
   "all_emails": "Alle Nutzer",
   "back": "zurück",
   "chat": "Chat",
+  "change_user_role": "Nutzerrolle ändern",
   "contributionLink": {
     "amount": "Betrag",
     "changeSaved": "Änderungen gespeichert",
@@ -141,6 +142,11 @@
       "question": "Willst du wirklich {username} wiederherstellen?",
       "title": "Nutzer wiederherstellen",
       "yes": "Ja, Nutzer wiederherstellen"
+    },
+    "changeUserRole": {
+      "question": "Willst du die Rolle von {username} wirklich zu {newRole} ändern?",
+      "title": "Nutzerrolle ändern",
+      "yes": "Ja, Nutzerrolle ändern"
     }
   },
   "redeemed": "eingelöst",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 7602aafb1..888f93cf9 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -2,6 +2,7 @@
   "all_emails": "All users",
   "back": "back",
   "chat": "Chat",
+  "change_user_role": "Change user role",
   "contributionLink": {
     "amount": "Amount",
     "changeSaved": "Changes saved",
@@ -141,6 +142,11 @@
       "question": "Do you really want to undelete {username}",
       "title": "Undelete user",
       "yes": "Yes,undelete user"
+    },
+    "changeUserRole": {
+      "question": "Do you really want to change {username}'s role to {newRole}?",
+      "title": "Change user role",
+      "yes": "Yes, change user role"
     }
   },
   "redeemed": "redeemed",

From c08b5387c5a6df9f1a28d97974364be49a7b1f9f Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 24 Mar 2023 14:36:02 +0100
Subject: [PATCH 03/18] fix user role change modal

---
 admin/src/components/ChangeUserRoleFormular.vue | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/admin/src/components/ChangeUserRoleFormular.vue b/admin/src/components/ChangeUserRoleFormular.vue
index 42695256e..8690ba26c 100644
--- a/admin/src/components/ChangeUserRoleFormular.vue
+++ b/admin/src/components/ChangeUserRoleFormular.vue
@@ -27,7 +27,7 @@
       :title="modalTitle"
       :cancel-title="$t('overlay.cancel')"
       :ok-title="modalOkTitle"
-      @ok="modalEvent"
+      @ok="setUserRole(roleSelected, currentRole)"
     >
       <p class="my-4">{{ modalQuestion }}</p>
     </b-modal>
@@ -60,17 +60,9 @@ export default {
       modalTitle: '',
       modalQuestion: '',
       modalOkTitle: '',
-      modalEvent: null,
       username: '',
     }
   },
-  watch: {
-    // roleSelected(newRole, oldRole) {
-    //   if (newRole !== oldRole) {
-    //     // this.setUserRole(newRole, oldRole)
-    //   }
-    // },
-  },
   methods: {
     showModal() {
       this.username = `${this.item.firstName} ${this.item.lastName}`
@@ -80,7 +72,6 @@ export default {
         newRole: this.roleSelected, // TODO get the text:Administrator instead of admin
       })
       this.modalOkTitle = this.$t('overlay.changeUserRole.yes')
-      this.modalEvent = this.setUserRole(this.roleSelected, this.currentRole)
     },
     setUserRole(newRole, oldRole) {
       this.$apollo

From 44f57779b813f277f49832bb77307e154ef49dc6 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 28 Mar 2023 17:53:08 +0200
Subject: [PATCH 04/18] use msgBoxConfirm for user role change modal

---
 .../src/components/ChangeUserRoleFormular.vue | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/admin/src/components/ChangeUserRoleFormular.vue b/admin/src/components/ChangeUserRoleFormular.vue
index 8690ba26c..677a12f56 100644
--- a/admin/src/components/ChangeUserRoleFormular.vue
+++ b/admin/src/components/ChangeUserRoleFormular.vue
@@ -12,25 +12,13 @@
             variant="danger"
             v-b-modal.user-role-modal
             :disabled="currentRole === roleSelected"
-            @click="showModal('changeUserRole')"
+            @click="showModal()"
           >
             {{ $t('change_user_role') }}
           </b-button>
         </div>
       </div>
     </div>
-
-    <b-modal
-      id="user-role-modal"
-      hide-header-close
-      ok-variant="danger"
-      :title="modalTitle"
-      :cancel-title="$t('overlay.cancel')"
-      :ok-title="modalOkTitle"
-      @ok="setUserRole(roleSelected, currentRole)"
-    >
-      <p class="my-4">{{ modalQuestion }}</p>
-    </b-modal>
   </div>
 </template>
 <script>
@@ -57,21 +45,36 @@ export default {
         { value: rolesValues.user, text: this.$t('userRole.selectRoles.user') },
         { value: rolesValues.admin, text: this.$t('userRole.selectRoles.admin') },
       ],
-      modalTitle: '',
-      modalQuestion: '',
-      modalOkTitle: '',
-      username: '',
     }
   },
   methods: {
     showModal() {
-      this.username = `${this.item.firstName} ${this.item.lastName}`
-      this.modalTitle = this.$t('overlay.changeUserRole.title')
-      this.modalQuestion = this.$t('overlay.changeUserRole.question', {
-        username: this.username,
-        newRole: this.roleSelected, // TODO get the text:Administrator instead of admin
-      })
-      this.modalOkTitle = this.$t('overlay.changeUserRole.yes')
+      this.$bvModal
+        .msgBoxConfirm(
+          this.$t('overlay.changeUserRole.question', {
+            username: `${this.item.firstName} ${this.item.lastName}`,
+            newRole:
+              this.roleSelected === 'admin'
+                ? this.$t('userRole.selectRoles.admin')
+                : this.$t('userRole.selectRoles.user'),
+          }),
+          {
+            cancelTitle: this.$t('overlay.cancel'),
+            centered: true,
+            hideHeaderClose: true,
+            title: this.$t('overlay.changeUserRole.title'),
+            okTitle: this.$t('overlay.changeUserRole.yes'),
+            okVariant: 'danger',
+          },
+        )
+        .then((okClicked) => {
+          if (okClicked) {
+            this.setUserRole(this.roleSelected, this.currentRole)
+          }
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
     },
     setUserRole(newRole, oldRole) {
       this.$apollo

From 17f7e8adf0ce2928c5b4f3bb9a1c3c13c69066a7 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 28 Mar 2023 18:10:27 +0200
Subject: [PATCH 05/18] use msgBoxConfirm for user deletion modal

---
 admin/src/components/DeletedUserFormular.vue | 86 +++++++++++---------
 1 file changed, 49 insertions(+), 37 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index bdffc2e54..a24be3d72 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -9,7 +9,7 @@
           v-if="item.deletedAt === null"
           variant="danger"
           v-b-modal.delete-user-modal
-          @click="showModal('deleteUser')"
+          @click="showDeleteModal()"
         >
           {{ $t('delete_user') }}
         </b-button>
@@ -17,23 +17,12 @@
           v-if="item.deletedAt !== null"
           variant="success"
           v-b-modal.delete-user-modal
-          @click="showModal('undeleteUser')"
+          @click="showUndeleteModal()"
         >
           {{ $t('undelete_user') }}
         </b-button>
       </div>
     </div>
-    <b-modal
-      id="delete-user-modal"
-      hide-header-close
-      :title="modalTitle"
-      :cancel-title="$t('overlay.cancel')"
-      :ok-title="modalOkTitle"
-      :ok-variant="variant"
-      @ok="modalEvent"
-    >
-      <p class="my-4">{{ modalQuestion }}</p>
-    </b-modal>
   </div>
 </template>
 <script>
@@ -51,33 +40,56 @@ export default {
   data() {
     return {
       checked: false,
-      modalTitle: '',
-      modalQuestion: '',
-      modalOkTitle: '',
-      modalEvent: null,
-      username: '',
-      variant: 'danger',
     }
   },
   methods: {
-    showModal(type) {
-      this.username = `${this.item.firstName} ${this.item.lastName}`
-
-      if (type === 'deleteUser') {
-        this.variant = 'danger'
-        this.modalTitle = this.$t('overlay.deleteUser.title')
-        this.modalQuestion = this.$t('overlay.deleteUser.question', { username: this.username })
-        this.modalOkTitle = this.$t('overlay.deleteUser.yes')
-        this.modalEvent = this.deleteUser
-      }
-
-      if (type === 'undeleteUser') {
-        this.variant = 'success'
-        this.modalTitle = this.$t('overlay.undeleteUser.title')
-        this.modalQuestion = this.$t('overlay.undeleteUser.question', { username: this.username })
-        this.modalOkTitle = this.$t('overlay.undeleteUser.yes')
-        this.modalEvent = this.unDeleteUser
-      }
+    showDeleteModal() {
+      this.$bvModal
+        .msgBoxConfirm(
+          this.$t('overlay.deleteUser.question', {
+            username: `${this.item.firstName} ${this.item.lastName}`,
+          }),
+          {
+            cancelTitle: this.$t('overlay.cancel'),
+            centered: true,
+            hideHeaderClose: true,
+            title: this.$t('overlay.deleteUser.title'),
+            okTitle: this.$t('overlay.deleteUser.yes'),
+            okVariant: 'danger',
+          },
+        )
+        .then((okClicked) => {
+          if (okClicked) {
+            this.deleteUser()
+          }
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
+    },
+    showUndeleteModal() {
+      this.$bvModal
+        .msgBoxConfirm(
+          this.$t('overlay.undeleteUser.question', {
+            username: `${this.item.firstName} ${this.item.lastName}`,
+          }),
+          {
+            cancelTitle: this.$t('overlay.cancel'),
+            centered: true,
+            hideHeaderClose: true,
+            title: this.$t('overlay.undeleteUser.title'),
+            okTitle: this.$t('overlay.undeleteUser.yes'),
+            okVariant: 'success',
+          },
+        )
+        .then((okClicked) => {
+          if (okClicked) {
+            this.unDeleteUser()
+          }
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
     },
     deleteUser() {
       this.$apollo

From e106f85086035b62b4b95601b8e1f70090c71cdc Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 28 Mar 2023 20:01:52 +0200
Subject: [PATCH 06/18] fix locales sorting

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index ad754c456..f98dc90f3 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,8 +1,8 @@
 {
   "all_emails": "Alle Nutzer",
   "back": "zurück",
-  "chat": "Chat",
   "change_user_role": "Nutzerrolle ändern",
+  "chat": "Chat",
   "contributionLink": {
     "amount": "Betrag",
     "changeSaved": "Änderungen gespeichert",
@@ -115,6 +115,11 @@
   "open_creations": "Offene Schöpfungen",
   "overlay": {
     "cancel": "Abbrechen",
+    "changeUserRole": {
+      "question": "Willst du die Rolle von {username} wirklich zu {newRole} ändern?",
+      "title": "Nutzerrolle ändern",
+      "yes": "Ja, Nutzerrolle ändern"
+    },
     "confirm": {
       "question": "Willst du diesen Gemeinwohl-Beitrag wirklich bestätigen und gutschreiben?",
       "text": "Nach dem Speichern ist der Datensatz nicht mehr änderbar. Bitte überprüfe genau, dass alles stimmt.",
@@ -142,11 +147,6 @@
       "question": "Willst du wirklich {username} wiederherstellen?",
       "title": "Nutzer wiederherstellen",
       "yes": "Ja, Nutzer wiederherstellen"
-    },
-    "changeUserRole": {
-      "question": "Willst du die Rolle von {username} wirklich zu {newRole} ändern?",
-      "title": "Nutzerrolle ändern",
-      "yes": "Ja, Nutzerrolle ändern"
     }
   },
   "redeemed": "eingelöst",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 888f93cf9..358c62a15 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,8 +1,8 @@
 {
   "all_emails": "All users",
   "back": "back",
-  "chat": "Chat",
   "change_user_role": "Change user role",
+  "chat": "Chat",
   "contributionLink": {
     "amount": "Amount",
     "changeSaved": "Changes saved",
@@ -115,6 +115,11 @@
   "open_creations": "Open creations",
   "overlay": {
     "cancel": "Cancel",
+    "changeUserRole": {
+      "question": "Do you really want to change {username}'s role to {newRole}?",
+      "title": "Change user role",
+      "yes": "Yes, change user role"
+    },
     "confirm": {
       "question": "Do you really want to carry out and finally save this pre-stored creation?",
       "text": "After saving, the record can no longer be changed. Please check carefully that everything is correct.",
@@ -142,11 +147,6 @@
       "question": "Do you really want to undelete {username}",
       "title": "Undelete user",
       "yes": "Yes,undelete user"
-    },
-    "changeUserRole": {
-      "question": "Do you really want to change {username}'s role to {newRole}?",
-      "title": "Change user role",
-      "yes": "Yes, change user role"
     }
   },
   "redeemed": "redeemed",

From d801a8957f0092677397138802e7d14f3b2a724a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 29 Mar 2023 15:50:12 +0200
Subject: [PATCH 07/18] delete nodemoduels folders to prevent corruption,
 delete yarn tmp files

---
 deployment/bare_metal/start.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 6c3c07766..9363cedca 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -118,6 +118,18 @@ case "$NGINX_SSL" in
 esac
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/update-page.conf
 
+# Clean tmp folder - remove yarn files
+rm -R /tmp/yarn--*
+
+# Remove node_modules folders
+# we had problems with corrupted node_modules folder
+rm -R $PROJECT_ROOT/database/node_modules
+rm -R $PROJECT_ROOT/backend/node_modules
+rm -R $PROJECT_ROOT/frontend/node_modules
+rm -R $PROJECT_ROOT/admin/node_modules
+rm -R $PROJECT_ROOT/dht-node/node_modules
+rm -R $PROJECT_ROOT/federation/node_modules
+
 # Regenerate .env files
 cp -f $PROJECT_ROOT/database/.env $PROJECT_ROOT/database/.env.bak
 cp -f $PROJECT_ROOT/backend/.env $PROJECT_ROOT/backend/.env.bak

From c96ed73996862753718b39c5a7a36212d13cc99a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 29 Mar 2023 15:58:53 +0200
Subject: [PATCH 08/18] force delete node_modules

---
 deployment/bare_metal/start.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 9363cedca..f386fab2a 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -123,12 +123,12 @@ rm -R /tmp/yarn--*
 
 # Remove node_modules folders
 # we had problems with corrupted node_modules folder
-rm -R $PROJECT_ROOT/database/node_modules
-rm -R $PROJECT_ROOT/backend/node_modules
-rm -R $PROJECT_ROOT/frontend/node_modules
-rm -R $PROJECT_ROOT/admin/node_modules
-rm -R $PROJECT_ROOT/dht-node/node_modules
-rm -R $PROJECT_ROOT/federation/node_modules
+rm -Rf $PROJECT_ROOT/database/node_modules
+rm -Rf $PROJECT_ROOT/backend/node_modules
+rm -Rf $PROJECT_ROOT/frontend/node_modules
+rm -Rf $PROJECT_ROOT/admin/node_modules
+rm -Rf $PROJECT_ROOT/dht-node/node_modules
+rm -Rf $PROJECT_ROOT/federation/node_modules
 
 # Regenerate .env files
 cp -f $PROJECT_ROOT/database/.env $PROJECT_ROOT/database/.env.bak

From 8b15eba252ef01b079f9178c667be040e59d884d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 29 Mar 2023 16:01:35 +0200
Subject: [PATCH 09/18] replace delete command by find

---
 deployment/bare_metal/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index f386fab2a..45ae3451b 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -119,7 +119,7 @@ esac
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/update-page.conf
 
 # Clean tmp folder - remove yarn files
-rm -R /tmp/yarn--*
+find /tmp -name "yarn--*" -exec rm -r {} 
 
 # Remove node_modules folders
 # we had problems with corrupted node_modules folder

From c274b85bb3a60ed68d0283fc9bb66cedbc5fc29b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 29 Mar 2023 16:04:02 +0200
Subject: [PATCH 10/18] fix find

---
 deployment/bare_metal/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 45ae3451b..b30d90f19 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -119,7 +119,7 @@ esac
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/update-page.conf
 
 # Clean tmp folder - remove yarn files
-find /tmp -name "yarn--*" -exec rm -r {} 
+find /tmp -name "yarn--*" -exec rm -r {} \;
 
 # Remove node_modules folders
 # we had problems with corrupted node_modules folder

From d685a01742d1131e33df73cfc47c964a0b39f318 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 30 Mar 2023 17:34:00 +0200
Subject: [PATCH 11/18] remove check data from delete user formular

---
 admin/src/components/DeletedUserFormular.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index a24be3d72..93ec12d8d 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -37,11 +37,6 @@ export default {
       required: true,
     },
   },
-  data() {
-    return {
-      checked: false,
-    }
-  },
   methods: {
     showDeleteModal() {
       this.$bvModal
@@ -56,6 +51,7 @@ export default {
             title: this.$t('overlay.deleteUser.title'),
             okTitle: this.$t('overlay.deleteUser.yes'),
             okVariant: 'danger',
+            static: true,
           },
         )
         .then((okClicked) => {
@@ -104,7 +100,6 @@ export default {
             userId: this.item.userId,
             deletedAt: result.data.deleteUser,
           })
-          this.checked = false
         })
         .catch((error) => {
           this.toastError(error.message)
@@ -123,7 +118,6 @@ export default {
             userId: this.item.userId,
             deletedAt: result.data.unDeleteUser,
           })
-          this.checked = false
         })
         .catch((error) => {
           this.toastError(error.message)

From 941663af368e47f01a2b3648938527113dd40739 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 30 Mar 2023 17:35:55 +0200
Subject: [PATCH 12/18] adapt delete user formular unit tests to changes

---
 .../components/DeletedUserFormular.spec.js    | 94 +++++++------------
 1 file changed, 33 insertions(+), 61 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.spec.js b/admin/src/components/DeletedUserFormular.spec.js
index f4a9da39e..1711222bf 100644
--- a/admin/src/components/DeletedUserFormular.spec.js
+++ b/admin/src/components/DeletedUserFormular.spec.js
@@ -35,6 +35,7 @@ const propsData = {
 
 describe('DeletedUserFormular', () => {
   let wrapper
+  let spy
 
   const Wrapper = () => {
     return mount(DeletedUserFormular, { localVue, mocks, propsData })
@@ -62,6 +63,10 @@ describe('DeletedUserFormular', () => {
       it('shows a text that you cannot delete yourself', () => {
         expect(wrapper.text()).toBe('removeNotSelf')
       })
+
+      it('has no "delete_user" button', () => {
+        expect(wrapper.find('button').exists()).toBe(false)
+      })
     })
 
     describe('delete other user', () => {
@@ -71,35 +76,32 @@ describe('DeletedUserFormular', () => {
             userId: 1,
             deletedAt: null,
           },
+          static: true,
         })
       })
 
-      it('has a checkbox', () => {
-        expect(wrapper.find('input[type="checkbox"]').exists()).toBe(true)
-      })
-
       it('shows the text "delete_user"', () => {
         expect(wrapper.text()).toBe('delete_user')
       })
 
-      describe('click on checkbox', () => {
+      it('has a "delete_user" button', () => {
+        expect(wrapper.find('button').text()).toBe('delete_user')
+      })
+
+      describe('click on "delete_user" button', () => {
         beforeEach(async () => {
-          await wrapper.find('input[type="checkbox"]').setChecked()
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(true))
+          await wrapper.find('button').trigger('click')
+          await wrapper.vm.$nextTick()
         })
 
-        it('has a confirmation button', () => {
-          expect(wrapper.find('button').exists()).toBe(true)
-        })
-
-        it('has the button text "delete_user"', () => {
-          expect(wrapper.find('button').text()).toBe('delete_user')
+        it('calls the modal', () => {
+          expect(wrapper.emitted('showDeleteModal'))
+          expect(spy).toHaveBeenCalled()
         })
 
         describe('confirm delete with success', () => {
-          beforeEach(async () => {
-            await wrapper.find('button').trigger('click')
-          })
-
           it('calls the API', () => {
             expect(apolloMutateMock).toBeCalledWith(
               expect.objectContaining({
@@ -123,32 +125,20 @@ describe('DeletedUserFormular', () => {
               ]),
             )
           })
-
-          it('unchecks the checkbox', () => {
-            expect(wrapper.find('input').attributes('checked')).toBe(undefined)
-          })
         })
 
         describe('confirm delete with error', () => {
           beforeEach(async () => {
+            spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
             apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
             await wrapper.find('button').trigger('click')
+            await wrapper.vm.$nextTick()
           })
 
           it('toasts an error message', () => {
             expect(toastErrorSpy).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()).toBe(false)
-          })
-        })
       })
     })
 
@@ -162,37 +152,33 @@ describe('DeletedUserFormular', () => {
         })
       })
 
-      it('has a checkbox', () => {
-        expect(wrapper.find('input[type="checkbox"]').exists()).toBe(true)
-      })
-
       it('shows the text "undelete_user"', () => {
         expect(wrapper.text()).toBe('undelete_user')
       })
 
-      describe('click on checkbox', () => {
+      it('has a "undelete_user" button', () => {
+        expect(wrapper.find('button').text()).toBe('undelete_user')
+      })
+
+      describe('click on "undelete_user" button', () => {
         beforeEach(async () => {
           apolloMutateMock.mockResolvedValue({
             data: {
               unDeleteUser: null,
             },
           })
-          await wrapper.find('input[type="checkbox"]').setChecked()
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(true))
+          await wrapper.find('button').trigger('click')
+          await wrapper.vm.$nextTick()
         })
 
-        it('has a confirmation button', () => {
-          expect(wrapper.find('button').exists()).toBe(true)
-        })
-
-        it('has the button text "undelete_user"', () => {
-          expect(wrapper.find('button').text()).toBe('undelete_user')
+        it('calls the modal', () => {
+          expect(wrapper.emitted('showUndeleteModal'))
+          expect(spy).toHaveBeenCalled()
         })
 
         describe('confirm recover with success', () => {
-          beforeEach(async () => {
-            await wrapper.find('button').trigger('click')
-          })
-
           it('calls the API', () => {
             expect(apolloMutateMock).toBeCalledWith(
               expect.objectContaining({
@@ -205,7 +191,7 @@ describe('DeletedUserFormular', () => {
           })
 
           it('emits update deleted At', () => {
-            expect(wrapper.emitted('updateDeletedAt')).toEqual(
+            expect(wrapper.emitted('updateDeletedAt')).toMatchObject(
               expect.arrayContaining([
                 expect.arrayContaining([
                   {
@@ -216,10 +202,6 @@ describe('DeletedUserFormular', () => {
               ]),
             )
           })
-
-          it('unchecks the checkbox', () => {
-            expect(wrapper.find('input').attributes('checked')).toBe(undefined)
-          })
         })
 
         describe('confirm recover with error', () => {
@@ -232,16 +214,6 @@ describe('DeletedUserFormular', () => {
             expect(toastErrorSpy).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()).toBe(false)
-          })
-        })
       })
     })
   })

From f238a3ddb11ca486960d912baf4afc7ec1bc394c Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 09:30:15 +0200
Subject: [PATCH 13/18] adapt change user formular unit tests to changes

---
 .../components/ChangeUserRoleFormular.spec.js | 199 ++++++++++++------
 1 file changed, 137 insertions(+), 62 deletions(-)

diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js
index 7f2154ecc..4048a9fa3 100644
--- a/admin/src/components/ChangeUserRoleFormular.spec.js
+++ b/admin/src/components/ChangeUserRoleFormular.spec.js
@@ -2,6 +2,7 @@ import { mount } from '@vue/test-utils'
 import ChangeUserRoleFormular from './ChangeUserRoleFormular'
 import { setUserRole } from '../graphql/setUserRole'
 import { toastSuccessSpy, toastErrorSpy } from '../../test/testSetup'
+import { BIconFileEarmarkSpreadsheet } from 'bootstrap-vue'
 
 const localVue = global.localVue
 
@@ -28,6 +29,7 @@ const mocks = {
 
 let propsData
 let wrapper
+let spy
 
 describe('ChangeUserRoleFormular', () => {
   const Wrapper = () => {
@@ -70,12 +72,16 @@ describe('ChangeUserRoleFormular', () => {
         expect(wrapper.text()).toContain('userRole.notChangeYourSelf')
       })
 
-      it('has role select disabled', () => {
-        expect(wrapper.find('select[disabled="disabled"]').exists()).toBe(true)
+      it('has no role select', () => {
+        expect(wrapper.find('select.role-select').exists()).toBe(false)
+      })
+
+      it('has no button', () => {
+        expect(wrapper.find('button.btn.btn-dange').exists()).toBe(false)
       })
     })
 
-    describe('change others role', () => {
+    describe("change other user's role", () => {
       let rolesToSelect
 
       describe('general', () => {
@@ -106,19 +112,12 @@ describe('ChangeUserRoleFormular', () => {
           expect(wrapper.find('select.role-select[disabled="disabled"]').exists()).toBe(false)
         })
 
-        describe('on API error', () => {
-          beforeEach(() => {
-            apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
-            rolesToSelect.at(1).setSelected()
-          })
-
-          it('toasts an error message', () => {
-            expect(toastErrorSpy).toBeCalledWith('Oh no!')
-          })
+        it('has "change_user_role" button', () => {
+          expect(wrapper.find('button.btn.btn-danger').text()).toBe('change_user_role')
         })
       })
 
-      describe('user is usual user', () => {
+      describe('user has role "usual user"', () => {
         beforeEach(() => {
           apolloMutateMock.mockResolvedValue({
             data: {
@@ -141,6 +140,10 @@ describe('ChangeUserRoleFormular', () => {
 
         describe('change select to', () => {
           describe('same role', () => {
+            it('has "change_user_role" button disabled', () => {
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(true)
+            })
+
             it('does not call the API', () => {
               rolesToSelect.at(0).setSelected()
               expect(apolloMutateMock).not.toHaveBeenCalled()
@@ -152,39 +155,73 @@ describe('ChangeUserRoleFormular', () => {
               rolesToSelect.at(1).setSelected()
             })
 
-            it('calls the API', () => {
-              expect(apolloMutateMock).toBeCalledWith(
-                expect.objectContaining({
-                  mutation: setUserRole,
-                  variables: {
-                    userId: 1,
-                    isAdmin: true,
-                  },
-                }),
-              )
+            it('has "change_user_role" button enabled', () => {
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(false)
             })
 
-            it('emits "updateIsAdmin"', () => {
-              expect(wrapper.emitted('updateIsAdmin')).toEqual(
-                expect.arrayContaining([
-                  expect.arrayContaining([
-                    {
-                      userId: 1,
-                      isAdmin: expect.any(Date),
-                    },
-                  ]),
-                ]),
-              )
-            })
+            describe('clicking the "change_user_role" button', () => {
+              beforeEach(async () => {
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                spy.mockImplementation(() => Promise.resolve(true))
+                await wrapper.find('button').trigger('click')
+                await wrapper.vm.$nextTick()
+              })
 
-            it('toasts success message', () => {
-              expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+              it('calls the modal', () => {
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
+                it('calls the API', () => {
+                  expect(apolloMutateMock).toBeCalledWith(
+                    expect.objectContaining({
+                      mutation: setUserRole,
+                      variables: {
+                        userId: 1,
+                        isAdmin: true,
+                      },
+                    }),
+                  )
+                })
+
+                it('emits "updateIsAdmin"', () => {
+                  expect(wrapper.emitted('updateIsAdmin')).toEqual(
+                    expect.arrayContaining([
+                      expect.arrayContaining([
+                        {
+                          userId: 1,
+                          isAdmin: expect.any(Date),
+                        },
+                      ]),
+                    ]),
+                  )
+                })
+
+                it('toasts success message', () => {
+                  expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+                })
+              })
+
+              describe('confirm role change with error', () => {
+                beforeEach(async () => {
+                  spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                  apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+                  await wrapper.find('button').trigger('click')
+                  await wrapper.vm.$nextTick()
+                })
+
+                it('toasts an error message', () => {
+                  expect(toastErrorSpy).toBeCalledWith('Oh no!')
+                })
+              })
             })
           })
         })
       })
 
-      describe('user is admin', () => {
+      describe('user has role "admin"', () => {
         beforeEach(() => {
           apolloMutateMock.mockResolvedValue({
             data: {
@@ -207,6 +244,10 @@ describe('ChangeUserRoleFormular', () => {
 
         describe('change select to', () => {
           describe('same role', () => {
+            it('has "change_user_role" button disabled', () => {
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(true)
+            })
+
             it('does not call the API', () => {
               rolesToSelect.at(1).setSelected()
               expect(apolloMutateMock).not.toHaveBeenCalled()
@@ -218,33 +259,67 @@ describe('ChangeUserRoleFormular', () => {
               rolesToSelect.at(0).setSelected()
             })
 
-            it('calls the API', () => {
-              expect(apolloMutateMock).toBeCalledWith(
-                expect.objectContaining({
-                  mutation: setUserRole,
-                  variables: {
-                    userId: 1,
-                    isAdmin: false,
-                  },
-                }),
-              )
+            it('has "change_user_role" button enabled', () => {
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(false)
             })
 
-            it('emits "updateIsAdmin"', () => {
-              expect(wrapper.emitted('updateIsAdmin')).toEqual(
-                expect.arrayContaining([
-                  expect.arrayContaining([
-                    {
-                      userId: 1,
-                      isAdmin: null,
-                    },
-                  ]),
-                ]),
-              )
-            })
+            describe('clicking the "change_user_role" button', () => {
+              beforeEach(async () => {
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                spy.mockImplementation(() => Promise.resolve(true))
+                await wrapper.find('button').trigger('click')
+                await wrapper.vm.$nextTick()
+              })
 
-            it('toasts success message', () => {
-              expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+              it('calls the modal', () => {
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
+                it('calls the API', () => {
+                  expect(apolloMutateMock).toBeCalledWith(
+                    expect.objectContaining({
+                      mutation: setUserRole,
+                      variables: {
+                        userId: 1,
+                        isAdmin: false,
+                      },
+                    }),
+                  )
+                })
+
+                it('emits "updateIsAdmin"', () => {
+                  expect(wrapper.emitted('updateIsAdmin')).toEqual(
+                    expect.arrayContaining([
+                      expect.arrayContaining([
+                        {
+                          userId: 1,
+                          isAdmin: null,
+                        },
+                      ]),
+                    ]),
+                  )
+                })
+
+                it('toasts success message', () => {
+                  expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+                })
+              })
+
+              describe('confirm role change with error', () => {
+                beforeEach(async () => {
+                  spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                  apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+                  await wrapper.find('button').trigger('click')
+                  await wrapper.vm.$nextTick()
+                })
+
+                it('toasts an error message', () => {
+                  expect(toastErrorSpy).toBeCalledWith('Oh no!')
+                })
+              })
             })
           })
         })

From e70552b3fb636cbd165d6c71e8672faa1fe11e52 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 09:31:18 +0200
Subject: [PATCH 14/18] add user recovery tests to user search page

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

diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index 77e8a3559..0d145cb89 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -25,7 +25,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
           email: 'benjamin@bluemchen.de',
           creation: [1000, 1000, 1000],
           emailChecked: true,
-          deletedAt: null,
+          deletedAt: new Date(),
         },
         {
           userId: 3,
@@ -243,6 +243,17 @@ describe('UserSearch', () => {
       })
     })
 
+    describe('recover user', () => {
+      const userId = 2
+      beforeEach(() => {
+        wrapper.findComponent({ name: 'SearchUserTable' }).vm.$emit('updateDeletedAt', userId, null)
+      })
+
+      it('toasts a success message', () => {
+        expect(toastSuccessSpy).toBeCalledWith('user_recovered')
+      })
+    })
+
     describe('apollo returns error', () => {
       beforeEach(() => {
         apolloQueryMock.mockRejectedValue({

From cc91cd32dc65b9c1bdbe14a4bf3a82be29699b09 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 09:35:14 +0200
Subject: [PATCH 15/18] fix linting

---
 admin/src/components/ChangeUserRoleFormular.spec.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/ChangeUserRoleFormular.spec.js b/admin/src/components/ChangeUserRoleFormular.spec.js
index 4048a9fa3..381d2ce43 100644
--- a/admin/src/components/ChangeUserRoleFormular.spec.js
+++ b/admin/src/components/ChangeUserRoleFormular.spec.js
@@ -2,7 +2,6 @@ import { mount } from '@vue/test-utils'
 import ChangeUserRoleFormular from './ChangeUserRoleFormular'
 import { setUserRole } from '../graphql/setUserRole'
 import { toastSuccessSpy, toastErrorSpy } from '../../test/testSetup'
-import { BIconFileEarmarkSpreadsheet } from 'bootstrap-vue'
 
 const localVue = global.localVue
 
@@ -157,7 +156,9 @@ describe('ChangeUserRoleFormular', () => {
 
             it('has "change_user_role" button enabled', () => {
               expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
-              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(false)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
+                false,
+              )
             })
 
             describe('clicking the "change_user_role" button', () => {
@@ -261,7 +262,9 @@ describe('ChangeUserRoleFormular', () => {
 
             it('has "change_user_role" button enabled', () => {
               expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
-              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(false)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
+                false,
+              )
             })
 
             describe('clicking the "change_user_role" button', () => {

From 2f67f0634c0282e9314913bd53c9482007cac2f9 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 10:27:49 +0200
Subject: [PATCH 16/18] update admin/src/components/DeletedUserFormular.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 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 93ec12d8d..19d1a1dfe 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -6,7 +6,7 @@
     <div v-else class="mt-5">
       <div class="mt-3 mb-5">
         <b-button
-          v-if="item.deletedAt === null"
+          v-if="!item.deletedAt"
           variant="danger"
           v-b-modal.delete-user-modal
           @click="showDeleteModal()"

From 01afe6a068a76bea6bea42e451ed3c37e99beae3 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 10:32:45 +0200
Subject: [PATCH 17/18] update admin/src/components/DeletedUserFormular.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 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 19d1a1dfe..11c8041c3 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -14,7 +14,7 @@
           {{ $t('delete_user') }}
         </b-button>
         <b-button
-          v-if="item.deletedAt !== null"
+          v-else
           variant="success"
           v-b-modal.delete-user-modal
           @click="showUndeleteModal()"

From 8a505bb1baec5908dbaeb3b7dac0633976c0b8d2 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 31 Mar 2023 11:16:58 +0200
Subject: [PATCH 18/18] fix linting

---
 admin/src/components/DeletedUserFormular.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 11c8041c3..2160f82e1 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -13,12 +13,7 @@
         >
           {{ $t('delete_user') }}
         </b-button>
-        <b-button
-          v-else
-          variant="success"
-          v-b-modal.delete-user-modal
-          @click="showUndeleteModal()"
-        >
+        <b-button v-else variant="success" v-b-modal.delete-user-modal @click="showUndeleteModal()">
           {{ $t('undelete_user') }}
         </b-button>
       </div>