fix: Get membership type for group

techmatters · Dec 1, 2023 · fa8e5d5 · fa8e5d5
1 parent c982ac8
commit fa8e5d5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/group/components/GroupForm.js b/src/group/components/GroupForm.js
@@ -95,7 +95,7 @@ const FIELDS = [
     type: 'url',
   },
   {
-    name: 'membershipType',
+    name: 'membershipsInfo.membershipType',
     label: 'group.form_membershipType_label',
     defaultValue: MEMBERSHIP_OPEN,
     props: {
@@ -218,7 +218,10 @@ const GroupForm = () => {
   const onSave = group => {
     dispatch(
       saveGroup({
-        group,
+        group: {
+          ..._.omit(['membershipsInfo.membershipType'], group),
+          membershipType: group.membershipsInfo.membershipType,
+        },
         user,
       })
     ).then(() => {

diff --git a/src/group/groupFragments.ts b/src/group/groupFragments.ts
@@ -54,6 +54,7 @@ export const groupDataEntries = /* GraphQL */ `
 export const groupMembershipList = /* GraphQL */ `
   fragment groupMembershipList on GroupNode {
     membershipList {
+      membershipType
       membershipsCount
       ...accountCollaborationMembership
     }
@@ -63,6 +64,7 @@ export const groupMembershipList = /* GraphQL */ `
 export const groupMembershipListWithMembersSample = /* GraphQL */ `
   fragment groupMembershipListWithMembersSample on GroupNode {
     membershipList {
+      membershipType
       membershipsCount
       ...accountCollaborationMembership
       ...collaborationMembershipsPending

diff --git a/src/group/groupService.ts b/src/group/groupService.ts
@@ -37,16 +37,16 @@ export const fetchGroupToUpdate = (slug: string) => {
         edges {
           node {
             ...groupFields
+            ...groupMembershipList
           }
         }
       }
     }
   `);
   return terrasoApi
     .requestGraphQL(query, { slug })
-    .then(
-      resp => resp.groups?.edges.at(0)?.node || Promise.reject('not_found')
-    );
+    .then(resp => resp.groups?.edges.at(0)?.node || Promise.reject('not_found'))
+    .then(extractGroup);
 };
 
 export const fetchGroupToView = async (slug: string, user: User | null) => {
@@ -197,7 +197,12 @@ const updateGroup = (group: Group) => {
     }
   `);
   return terrasoApi
-    .requestGraphQL(query, { input: _.omit('slug', group) })
+    .requestGraphQL(query, {
+      input: {
+        ..._.omit(['slug', 'membershipsInfo', 'membershipList'], group),
+        id: group.id || '',
+      },
+    })
     .then(response => ({
       new: false,
       ...response.updateGroup.group!,