refactor: Landscape/Group membership list

package.json

@@ -11,7 +11,7 @@
     "lodash": "^4.17.21",
     "react": "^18.2.0",
     "react-redux": "^8.1.3",
-    "terraso-backend": "github:techmatters/terraso-backend#2162f0e",
+    "terraso-backend": "github:techmatters/terraso-backend#abd145f",
     "uuid": "^9.0.1"
   },
   "scripts": {

src/collaboration/membershipsFragments.ts

@@ -39,6 +39,7 @@ export const collaborationMembershipsInfo = /* GraphQL */ `
   fragment collaborationMembershipsInfo on CollaborationMembershipListNode {
     membershipType
     membershipsCount
+    enrollMethod
     memberships(first: 5, membershipStatus: APPROVED) {
       totalCount
       edges {
@@ -71,6 +72,9 @@ export const accountCollaborationMembership = /* GraphQL */ `
       id
       userRole
       membershipStatus
+      user {
+        ...userFields
+      }
     }
   }
 `;

src/collaboration/membershipsUtils.ts

@@ -15,6 +15,7 @@
  * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 import _ from 'lodash/fp';
+import { User } from 'terraso-client-shared/account/accountSlice';
 import type {
   AccountCollaborationMembershipFragment,
   CollaborationMembershipFieldsFragment,
@@ -29,26 +30,54 @@ type MembershipQuery = Partial<
     CollaborationMembershipsPendingFragment
 >;
 
+export type MembershipsInfo = {
+  totalCount?: number;
+  pendingCount?: number;
+  accountMembership?: Membership;
+  membershipsSample?: Membership[];
+  enrollMethod?: string;
+  membershipType?: string;
+};
+
+export type MembershipList = {
+  // TODO: massage membershipsUtils/Service so more of these can be required
+  membershipsInfo?: MembershipsInfo;
+  id: string;
+  slug: string;
+  membershipType: 'CLOSED' | 'OPEN';
+};
+
+export type Membership = {
+  membershipId: string;
+  userId?: string;
+  userRole?: string;
+  membershipStatus?: 'APPROVED' | 'PENDING';
+  user?: User;
+};
+
 export const extractMembershipsInfo = (
   membershipList?: MembershipQuery | null,
-) => ({
+): MembershipsInfo => ({
   totalCount:
     membershipList?.membershipsCount ?? membershipList?.memberships?.totalCount,
   pendingCount: membershipList?.pending?.totalCount,
   accountMembership: extractAccountMembership(membershipList),
   membershipsSample: extractMemberships(membershipList),
+  enrollMethod: membershipList?.enrollMethod,
+  membershipType: membershipList?.membershipType,
 });
 
 export const extractMembership = (
   membership: Partial<CollaborationMembershipFieldsFragment>,
 ) => ({
-  ...membership.user,
-  ..._.omit('user', membership),
+  ...membership,
   membershipId: membership.id,
   userId: membership.user?.id,
 });
 
-export const extractMemberships = (membershipList?: MembershipQuery | null) =>
+export const extractMemberships = (
+  membershipList?: MembershipQuery | null,
+): Membership[] =>
   (
     (
       membershipList as
@@ -57,14 +86,16 @@ export const extractMemberships = (membershipList?: MembershipQuery | null) =>
         | null
         | undefined
     )?.memberships?.edges || []
-  ).map(edge => extractMembership(edge.node));
+  ).map(edge => extractMembership(edge.node) as Membership);
 
 export const extractAccountMembership = (
   membershipList?: AccountCollaborationMembershipFragment | null,
-) =>
+): Membership | undefined =>
   membershipList?.accountMembership
     ? {
         ..._.omit('id', membershipList.accountMembership),
         membershipId: membershipList.accountMembership.id,
+        userId: membershipList.accountMembership.user?.id,
+        user: membershipList.accountMembership.user as User,
       }
     : undefined;