From 287e5c29ea6cebe945bba38588e248a4ec714126 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Nov 2022 17:53:43 +0100
Subject: [PATCH] changes suggested by @tirokk

---
 webapp/components/Group/AddGroupMember.vue | 22 ++++++++++++--------
 webapp/components/Group/GroupMember.vue    | 24 ----------------------
 webapp/locales/de.json                     |  7 ++++---
 webapp/locales/en.json                     |  5 +++--
 4 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/webapp/components/Group/AddGroupMember.vue b/webapp/components/Group/AddGroupMember.vue
index 3bb6d6b13..024f81b25 100644
--- a/webapp/components/Group/AddGroupMember.vue
+++ b/webapp/components/Group/AddGroupMember.vue
@@ -87,19 +87,20 @@ export default {
   },
   methods: {
     cancelModal() {
-      this.user = {}
+      this.clear()
       this.isOpen = false
     },
     closeModal() {
+      this.clear()
       this.isOpen = false
     },
     confirmModal() {
       this.addMemberToGroup()
-      this.clear()
       this.isOpen = false
+      this.clear()
     },
-    onFocus(event) {},
-    onBlur(event) {
+    onFocus() {},
+    onBlur() {
       this.query = ''
     },
     handleInput(event) {
@@ -119,10 +120,10 @@ export default {
       this.users = []
     },
     onSelect(item) {
-      this.user = item
+      this.user = { ...item }
       if (this.groupMembers.find((member) => member.id === this.user.id)) {
-        this.$toast.error(this.$t('group.errors.userAlreadyMember', { slug: this.user.slug }))
-        this.user = {}
+        this.$toast.error(this.$t('group.errors.userAlreadyMember', { name: this.user.name }))
+        this.clear()
         return
       }
       this.isOpen = true
@@ -135,10 +136,13 @@ export default {
           mutation: changeGroupMemberRoleMutation(),
           variables: { groupId: this.groupId, userId: this.user.id, roleInGroup: newRole },
         })
-        this.$emit('loadGroupMembers')
         this.$toast.success(
-          this.$t('group.changeMemberRole', { role: this.$t(`group.roles.${newRole}`) }),
+          this.$t('group.addMemberToGroupSuccess', {
+            role: this.$t(`group.roles.${newRole}`),
+            name: this.user.name,
+          }),
         )
+        this.$emit('loadGroupMembers')
       } catch (error) {
         this.$toast.error(error.message)
       }
diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue
index b8ed09f5a..bacd0259d 100644
--- a/webapp/components/Group/GroupMember.vue
+++ b/webapp/components/Group/GroupMember.vue
@@ -139,30 +139,6 @@ export default {
         this.$toast.error(error.message)
       }
     },
-    async addMemberToGroup() {
-      const newRole = 'usual'
-      if (this.groupMembers.find((member) => member.id === this.user.id)) {
-        this.$toast.error(this.$t('group.errors.userAlreadyMember', { slug: this.user.slug }))
-        return
-      }
-      try {
-        await this.$apollo.mutate({
-          mutation: changeGroupMemberRoleMutation(),
-          variables: { groupId: this.groupId, userId: this.user.id, roleInGroup: newRole },
-        })
-        this.$emit('loadGroupMembers')
-        this.$toast.success(
-          this.$t('group.changeMemberRole', { role: this.$t(`group.roles.${newRole}`) }),
-        )
-      } catch (error) {
-        this.$toast.error(error.message)
-      }
-    },
   },
 }
 </script>
-<style scoped>
-.ds-select-dropdown {
-  position: unset;
-}
-</style>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a12abc2dd..2663f4982 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -405,9 +405,10 @@
     },
     "actionRadius": "Aktionsradius",
     "addMemberToGroup": "Zur Gruppe hinzufügen",
+    "addMemberToGroupSuccess": "„{name}“ wurde der Gruppe mit der Rolle „{role}“ hinzugefügt!",
     "addUser": "Benutzer hinzufügen",
     "addUserNoOptions": "Keine Nutzer gefunden!",
-    "addUserPlaceholder": "Benutzername oder Slug",
+    "addUserPlaceholder": "Benutzername",
     "allGroups": "Alle Gruppen",
     "categories": "Thema ::: Themen",
     "changeMemberRole": "Die Rolle wurde auf „{role}“ geändert!",
@@ -424,7 +425,7 @@
       "title": "Meine Gruppe ändern"
     },
     "errors": {
-      "userAlreadyMember": "Nutzer @{slug} ist bereits Mitglied"
+      "userAlreadyMember": "Nutzer „{name}“ ist bereits Mitglied"
     },
     "follow": "Folge",
     "foundation": "Gründung",
@@ -455,7 +456,7 @@
     "modal": {
       "cancel": "Abbrechen",
       "confirm": "Bestätigen",
-      "confirmAddGroupMemberText": "Nutzer “{name}” zur Gruppe hinzufügen?",
+      "confirmAddGroupMemberText": "Nutzer „{name}“ zur Gruppe hinzufügen?",
       "confirmAddGroupMemberTitle": "Bestätigen"
     },
     "myGroups": "Meine Gruppen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index f141c3635..4f1ee83f0 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -405,9 +405,10 @@
     },
     "actionRadius": "Action radius",
     "addMemberToGroup": "Add to group",
+    "addMemberToGroupSuccess": "“{name}” was added to the group with the role “{role}”!",
     "addUser": "Add User",
     "addUserNoOptions": "No users found!",
-    "addUserPlaceholder": " User name or slug",
+    "addUserPlaceholder": " Username",
     "allGroups": "All Groups",
     "categories": "Topic ::: Topics",
     "changeMemberRole": "The role has been changed to “{role}”!",
@@ -424,7 +425,7 @@
       "title": "Edit My Group"
     },
     "errors": {
-      "userAlreadyMember": "User @{slug} is already a member"
+      "userAlreadyMember": "User “{name}” is already a member"
     },
     "follow": "Follow",
     "foundation": "Foundation",