From d2d26885cefc24d8551fd863717cdf8c589a34cd Mon Sep 17 00:00:00 2001
From: prathamesh0 <42446521+prathamesh0@users.noreply.github.com>
Date: Fri, 19 Jan 2024 10:54:52 +0530
Subject: [PATCH] Use fetched project members data in members tab panel (#25)

* Use fetched project members data in members tab panel

* Handle review changes

---------

Co-authored-by: neeraj <neeraj.rtly@gmail.com>
---
 .../projects/project/settings/MemberCard.tsx  |  6 +--
 .../project/settings/MembersTabPanel.tsx      | 40 ++++++-------------
 packages/gql-client/src/gql-queries.ts        |  6 +++
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/packages/frontend/src/components/projects/project/settings/MemberCard.tsx b/packages/frontend/src/components/projects/project/settings/MemberCard.tsx
index 198a602..b6b9d14 100644
--- a/packages/frontend/src/components/projects/project/settings/MemberCard.tsx
+++ b/packages/frontend/src/components/projects/project/settings/MemberCard.tsx
@@ -9,17 +9,17 @@ import {
   IconButton,
 } from '@material-tailwind/react';
 
-import { Member } from '../../../../types/project';
 import ConfirmDialog from '../../../shared/ConfirmDialog';
+import { Member } from '../../../../types/project';
 
 const PERMISSION_OPTIONS = [
   {
     label: 'View only',
-    value: 'view',
+    value: 'View',
   },
   {
     label: 'View and edit',
-    value: 'view+edit',
+    value: 'View+Edit',
   },
 ];
 
diff --git a/packages/frontend/src/components/projects/project/settings/MembersTabPanel.tsx b/packages/frontend/src/components/projects/project/settings/MembersTabPanel.tsx
index 086cfc7..a7a05fe 100644
--- a/packages/frontend/src/components/projects/project/settings/MembersTabPanel.tsx
+++ b/packages/frontend/src/components/projects/project/settings/MembersTabPanel.tsx
@@ -1,12 +1,10 @@
 import React, { useCallback, useMemo, useState } from 'react';
-import { useParams } from 'react-router-dom';
+import { useOutletContext, useParams } from 'react-router-dom';
 import toast, { Toaster } from 'react-hot-toast';
 
 import { Chip, Button, Typography } from '@material-tailwind/react';
 
 import MemberCard from './MemberCard';
-import membersData from '../../../../assets/members.json';
-import projectData from '../../../../assets/projects.json';
 
 import { Member } from '../../../../types/project';
 import AddMemberDialog from './AddMemberDialog';
@@ -17,30 +15,16 @@ const MembersTabPanel = () => {
   const { id } = useParams();
   const [addmemberDialogOpen, setAddMemberDialogOpen] = useState(false);
 
+  // @ts-expect-error create context type for projects
+  const { projects } = useOutletContext();
+
   const currProject = useMemo(() => {
-    return projectData.find((data) => data.id === Number(id));
+    return projects.find((project: any) => project.id === id);
   }, [id]);
 
-  const members = useMemo(() => {
-    return membersData.filter(
-      (member) =>
-        currProject?.members.some(
-          (projectMember) => projectMember.id === member.id,
-        ),
-    );
-  }, [currProject]);
-
-  const [updatedMembers, setUpdatedMembers] = useState([...members]);
-
-  const getMemberPermissions = useCallback(
-    (id: number) => {
-      return (
-        currProject?.members.find((projectMember) => projectMember.id === id)
-          ?.permissions || []
-      );
-    },
-    [updatedMembers],
-  );
+  const [updatedMembers, setUpdatedMembers] = useState([
+    ...currProject?.members,
+  ]);
 
   const addMemberHandler = useCallback((member: Member) => {
     setUpdatedMembers((val) => [...val, member]);
@@ -69,15 +53,15 @@ const MembersTabPanel = () => {
           </Button>
         </div>
       </div>
-      {(updatedMembers as Member[]).map((member, index) => {
+      {updatedMembers.map((member, index) => {
         return (
           <MemberCard
-            member={member}
+            member={member.member}
             key={member.id}
             isFirstCard={index === FIRST_MEMBER_CARD}
-            isOwner={member.id === currProject?.ownerId}
+            isOwner={member.member.id === currProject?.owner.id}
             isPending={member.name === ''}
-            permissions={getMemberPermissions(member.id)}
+            permissions={member.permissions}
             handleDeletePendingMember={(id: number) => {
               setUpdatedMembers(
                 updatedMembers.filter((member) => member.id !== id),
diff --git a/packages/gql-client/src/gql-queries.ts b/packages/gql-client/src/gql-queries.ts
index 9422dbf..8b7babe 100644
--- a/packages/gql-client/src/gql-queries.ts
+++ b/packages/gql-client/src/gql-queries.ts
@@ -35,6 +35,12 @@ query {
       webhooks
       members {
         id
+        permissions
+        member{
+          id
+          name
+          email
+        }
       }
       environmentVariables {
         id