From a8cf6acd931040a0c0301d236a1eeadfbce274b3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 18 Oct 2022 13:38:05 +0200
Subject: [PATCH] add slug user to group member

---
 webapp/components/Group/GroupMember.vue | 55 +++++++++++++++++++++----
 webapp/graphql/User.js                  |  4 +-
 webapp/locales/de.json                  |  1 +
 webapp/locales/en.json                  |  1 +
 4 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue
index 525c95127..df3b899d2 100644
--- a/webapp/components/Group/GroupMember.vue
+++ b/webapp/components/Group/GroupMember.vue
@@ -18,6 +18,13 @@
           </ds-flex-item>
         </ds-flex>
       </ds-form>
+      <div v-if="noSlug">Kein User mit diesem Slug gefunden!</div>
+      <div v-if="slugUser.length > 0">
+        {{slugUser}}
+        <ds-button size="small" primary @click="addMemberToGroup(slugUser)">
+          {{ $t('group.addMemberToGroup') }}
+        </ds-button>
+      </div>
     </base-card>
     <ds-table :fields="tableFields" :data="groupMembers" condensed>
       <template #avatar="scope">
@@ -70,7 +77,7 @@
         </ds-chip>
       </template>
       <template #edit="scope">
-        <ds-button size="small" primary :disabled="true" @click="openModal(scope.row)">
+        <ds-button  v-if="scope.row.myRoleInGroup !== 'owner'" size="small" primary @click="deleteMember(scope.row.id)">
           <!-- TODO: implement removal of group members -->
           <!--           :disabled="scope.row.myRoleInGroup === 'owner'"
  -->
@@ -93,7 +100,7 @@
   </div>
 </template>
 <script>
-import { User } from '~/graphql/User'
+import { minimisedUserQuery } from '~/graphql/User'
 import { changeGroupMemberRoleMutation } from '~/graphql/groups.js'
 
 export default {
@@ -112,6 +119,8 @@ export default {
     return {
       isOpen: false,
       memberId: null,
+      noSlug: false,
+      slugUser: [],
       form: {
           query: '',
       },
@@ -159,17 +168,49 @@ export default {
         this.$toast.error(error.message)
       }
     },
+    async addMemberToGroup () {
+      const newRole = 'usual'
+      try {
+        await this.$apollo.mutate({
+          mutation: changeGroupMemberRoleMutation(),
+          variables: { groupId: this.groupId, userId: this.slugUser[0].id, roleInGroup: newRole },
+        })
+        this.$toast.success(
+          this.$t('group.changeMemberRole', { role: this.$t(`group.roles.${newRole}`) }),
+        )
+      } catch (error) {
+        this.$toast.error(error.message)
+      }
+    },
     async submit() {
-      console.log('submit', this.form.query)
-    }
+      try {
+        const {
+          data: { User },
+        } = await this.$apollo.query({
+          query: minimisedUserQuery(),
+          variables: {
+            slug: this.form.query,
+          },
+        })
+        if(User.length === 0)  { 
+          this.noSlug = true
+        } else {
+          this.noSlug = false
+          this.slugUser = User
+        }
+      } catch (error) {
+        this.noSlug = true
+      } finally {
+      }
+    },
     // TODO: implement removal of group members
     // openModal(row) {
     //   this.isOpen = true
     //   this.memberId = row.id
     // },
-    // deleteMember(id) {
-    //   alert('deleteMember: ' + id)
-    // },
+    deleteMember(id) {
+      alert('deleteMember: ' + id)
+    },
   },
 }
 </script>
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 5c29bc0b4..0d3a24d8b 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -49,8 +49,8 @@ export default (i18n) => {
 
 export const minimisedUserQuery = () => {
   return gql`
-    query {
-      User(orderBy: slug_asc) {
+    query ($slug: String) {
+      User(slug: $slug, orderBy: slug_asc) {
         id
         slug
         name
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6375ca48f..356c3ca3c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -440,6 +440,7 @@
       "roleInGroup": "Rolle",
       "slug": "Eindeutiger Name"
     },
+    "addMemberToGroup":"zur Gruppe hinzufügen",
     "membersCount": "Mitglied ::: Mitglieder",
     "membersListTitle": "Gruppenmitglieder",
     "membersListTitleNotAllowedSeeingGroupMembers": "Gruppenmitglieder unsichtbar",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index aab9c6f83..924f56f3a 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -441,6 +441,7 @@
       "slug": "Unique name"
     },
     "membersCount": "Member ::: Members",
+    "addMemberToGroup":"zur Gruppe hinzufügen",
     "membersListTitle": "Group Members",
     "membersListTitleNotAllowedSeeingGroupMembers": "Group Members invisible",
     "myGroups": "My Groups",