From 4073eab201bf2e7f08927e60fe5f3ebad8a47e21 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 22 Nov 2022 12:17:52 +0100
Subject: [PATCH] Fix approving/rejecting group members

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/views/Group/GroupMembers.vue | 39 +++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/js/src/views/Group/GroupMembers.vue b/js/src/views/Group/GroupMembers.vue
index 7308ede27..ce7018365 100644
--- a/js/src/views/Group/GroupMembers.vue
+++ b/js/src/views/Group/GroupMembers.vue
@@ -184,7 +184,7 @@
             <o-button
               variant="success"
               v-if="props.row.role === MemberRole.NOT_APPROVED"
-              @click="approveMember(props.row.id)"
+              @click="approveMember({ memberId: props.row.id })"
               icon-left="check"
               >{{ t("Approve member") }}</o-button
             >
@@ -238,7 +238,6 @@
 </template>
 
 <script lang="ts" setup>
-import { FETCH_GROUP } from "@/graphql/group";
 import { MemberRole } from "@/types/enums";
 import { IMember } from "@/types/actor/member.model";
 import RouteName from "@/router/name";
@@ -312,6 +311,12 @@ const {
   refetchQueries: [
     {
       query: GROUP_MEMBERS,
+      variables: {
+        groupName: props.preferredUsername,
+        page: page.value,
+        limit: MEMBERS_PER_PAGE,
+        roles: roles.value,
+      },
     },
   ],
 }));
@@ -363,6 +368,12 @@ const {
   refetchQueries: [
     {
       query: GROUP_MEMBERS,
+      variables: {
+        groupName: props.preferredUsername,
+        page: page.value,
+        limit: MEMBERS_PER_PAGE,
+        roles: roles.value,
+      },
     },
   ],
 }));
@@ -423,7 +434,20 @@ const {
   onDone: onApproveMemberDone,
   onError: onApproveMemberError,
 } = useMutation<{ approveMember: IMember }, { memberId: string }>(
-  APPROVE_MEMBER
+  APPROVE_MEMBER,
+  {
+    refetchQueries: [
+      {
+        query: GROUP_MEMBERS,
+        variables: {
+          groupName: props.preferredUsername,
+          page: page.value,
+          limit: MEMBERS_PER_PAGE,
+          roles: roles.value,
+        },
+      },
+    ],
+  }
 );
 
 onApproveMemberDone(() => {
@@ -452,8 +476,13 @@ const {
 >(UPDATE_MEMBER, () => ({
   refetchQueries: [
     {
-      query: FETCH_GROUP,
-      variables: { name: props.preferredUsername },
+      query: GROUP_MEMBERS,
+      variables: {
+        groupName: props.preferredUsername,
+        page: page.value,
+        limit: MEMBERS_PER_PAGE,
+        roles: roles.value,
+      },
     },
   ],
 }));