Implemented correct user roles Fixes #3106

src/App.tsx

@@ -30,7 +30,7 @@
 import OrganizationVenues from 'screens/OrganizationVenues/OrganizationVenues';
 import Leaderboard from 'screens/Leaderboard/Leaderboard';
 
-import React from 'react';
+import React, { useEffect } from 'react';
 // User Portal Components
 import Donate from 'screens/UserPortal/Donate/Donate';
 import Events from 'screens/UserPortal/Events/Events';
@@ -38,16 +38,21 @@
 import Organizations from 'screens/UserPortal/Organizations/Organizations';
 import People from 'screens/UserPortal/People/People';
 import Settings from 'screens/UserPortal/Settings/Settings';
 import Chat from 'screens/UserPortal/Chat/Chat';
+import { useQuery } from '@apollo/client';
+import { CHECK_AUTH } from 'GraphQl/Queries/Queries';
 import Advertisements from 'components/Advertisements/Advertisements';
 import SecuredRouteForUser from 'components/UserPortal/SecuredRouteForUser/SecuredRouteForUser';
+
+import useLocalStorage from 'utils/useLocalstorage';
 import UserScreen from 'screens/UserPortal/UserScreen/UserScreen';
 import EventDashboardScreen from 'components/EventDashboardScreen/EventDashboardScreen';
 import Campaigns from 'screens/UserPortal/Campaigns/Campaigns';
 import Pledges from 'screens/UserPortal/Pledges/Pledges';
 import VolunteerManagement from 'screens/UserPortal/Volunteer/VolunteerManagement';
+import LeaveOrganization from 'screens/UserPortal/LeaveOrganization/LeaveOrganization';
 
-// const { setItem } = useLocalStorage();
+const { setItem } = useLocalStorage();
 
 /**
  * This is the main function for our application. It sets up all the routes and components,
@@ -92,20 +97,20 @@
 
   // TODO: Fetch Installed plugin extras and store for use within MainContent and Side Panel Components.
 
-  // const { data, loading } = useQuery(CHECK_AUTH);
+  const { data, loading } = useQuery(CHECK_AUTH);
 
-  // useEffect(() => {
-  //   if (data) {
-  //     setItem('name', `${data.checkAuth.firstName} ${data.checkAuth.lastName}`);
-  //     setItem('id', data.checkAuth._id);
-  //     setItem('email', data.checkAuth.email);
-  //     setItem('IsLoggedIn', 'TRUE');
-  //     setItem('FirstName', data.checkAuth.firstName);
-  //     setItem('LastName', data.checkAuth.lastName);
-  //     setItem('UserImage', data.checkAuth.image);
-  //     setItem('Email', data.checkAuth.email);
-  //   }
-  // }, [data, loading]);
+  useEffect(() => {
+    if (data) {
+      setItem('name', `${data.checkAuth.firstName} ${data.checkAuth.lastName}`);
+      setItem('id', data.checkAuth._id);
+      setItem('email', data.checkAuth.email);
+      setItem('IsLoggedIn', 'TRUE');
+      setItem('FirstName', data.checkAuth.firstName);
+      setItem('LastName', data.checkAuth.lastName);
+      setItem('UserImage', data.checkAuth.image);
+      setItem('Email', data.checkAuth.email);
+    }
+  }, [data, loading]);
 
   const extraRoutes = Object.entries(installedPlugins).map(
     (
@@ -192,9 +197,12 @@
             <Route path="/user/people/:orgId" element={<People />} />
             <Route path="/user/donate/:orgId" element={<Donate />} />
             <Route path="/user/events/:orgId" element={<Events />} />
-            <Route path="/user/chat/:orgId" element={<Chat />} />
             <Route path="/user/campaigns/:orgId" element={<Campaigns />} />
             <Route path="/user/pledges/:orgId" element={<Pledges />} />
+            <Route
+              path="/user/leaveOrg/:orgId"
+              element={<LeaveOrganization />}
+            />
             <Route
               path="/user/volunteer/:orgId"
               element={<VolunteerManagement />}
@@ -207,6 +215,7 @@
             </Route>
           </Route>
         </Route>
+        {/* <SecuredRouteForUser path="/user/chat" component={Chat} /> */}
         <Route path="*" element={<PageNotFound />} />
       </Routes>
     </>

src/screens/UserPortal/People/People.spec.tsx

@@ -11,7 +11,7 @@ import { Provider } from 'react-redux';
 import { store } from 'state/store';
 import i18nForTest from 'utils/i18nForTest';
 import { StaticMockLink } from 'utils/StaticMockLink';
-import type { InterfaceMember } from './People';
+// import type { InterfaceMember } from './People';
 import People from './People';
 import userEvent from '@testing-library/user-event';
 import { vi } from 'vitest';
@@ -168,62 +168,6 @@ describe('Testing People Screen [User Portal]', () => {
     expect(screen.queryAllByText('Noble Mittal')).not.toBe([]);
   });
 
-  function compareProperties(
-    expectedProps: string[],
-    actualObject: object,
-  ): boolean {
-    const actualProps = Object.keys(actualObject);
-    return expectedProps.every((prop) => actualProps.includes(prop));
-  }
-
-  describe('InterfaceMember properties comparison', () => {
-    it('should have all required properties', () => {
-      const expectedProperties = [
-        'firstName',
-        'lastName',
-        'image',
-        '_id',
-        'email',
-        '__typename',
-      ];
-
-      const mockValidData: InterfaceMember = {
-        firstName: 'John',
-        lastName: 'Doe',
-        image: 'https://example.com/john.jpg',
-        _id: '1',
-        email: 'john.doe@example.com',
-        __typename: 'User',
-      };
-
-      const result = compareProperties(expectedProperties, mockValidData);
-      expect(result).toBe(true);
-    });
-
-    it('should fail if __typename is replaced with username', () => {
-      const expectedProperties = [
-        'firstName',
-        'lastName',
-        'image',
-        '_id',
-        'email',
-        '__typename', // Expect this property
-      ];
-
-      const mockInvalidData = {
-        firstName: 'John',
-        lastName: 'Doe',
-        image: 'https://example.com/john.jpg',
-        _id: '1',
-        email: 'john.doe@example.com',
-        username: 'Member', // Incorrect property
-      };
-
-      const result = compareProperties(expectedProperties, mockInvalidData);
-      expect(result).toBe(false);
-    });
-  });
-
   it('Search works properly by pressing enter', async () => {
     render(
       <MockedProvider addTypename={false} link={link}>

src/screens/UserPortal/People/People.tsx

@@ -22,13 +22,13 @@ interface InterfaceOrganizationCardProps {
   sno: string;
 }
 
-export interface InterfaceMember {
+interface InterfaceMember {
   firstName: string;
   lastName: string;
   image: string;
   _id: string;
   email: string;
-  __typename: string;
+  userType: string;
 }
 
 /**
@@ -50,7 +50,9 @@ export default function people(): JSX.Element {
 
   // State for managing the number of rows per page in pagination
   const [rowsPerPage, setRowsPerPage] = useState<number>(5);
-  const [members, setMembers] = useState([]);
+  const [members, setMembers] = useState<InterfaceMember[]>([]);
+  const [allMembers, setAllMembers] = useState<InterfaceMember[]>([]);
+  const [admins, setAdmins] = useState<InterfaceMember[]>([]);
   const [mode, setMode] = useState<number>(0);
 
   // Extracting organization ID from URL parameters
@@ -69,12 +71,10 @@ export default function people(): JSX.Element {
       },
     },
   );
-
   // Query to fetch list of admins of the organization
   const { data: data2 } = useQuery(ORGANIZATION_ADMINS_LIST, {
     variables: { id: organizationId },
   });
-
   /**
    * Handles page change in pagination.
    *
@@ -134,24 +134,58 @@ export default function people(): JSX.Element {
     handleSearch(inputValue);
   };
 
+  useEffect(() => {
+    if (data2) {
+      const admin = data2.organizations[0].admins[0];
+      const updatedAdmin: InterfaceMember = {
+        ...admin,
+        userType: 'Admin',
+      };
+      setAdmins([updatedAdmin]);
+    }
+  }, [data2]);
+
   useEffect(() => {
     if (data) {
-      setMembers(data.organizationsMemberConnection.edges);
+      // Add or update the `userType` property for each member
+      const updatedAdmins = data.organizationsMemberConnection.edges.map(
+        (memberData: InterfaceMember) => ({
+          ...memberData, // Spread the existing properties
+          userType: memberData.userType === 'Admin' ? 'Admin' : 'Member', // Add or override userType
+        }),
+      );
+
+      setAllMembers(updatedAdmins);
+      setMembers(updatedAdmins);
     }
   }, [data]);
 
+  // let adminId;
+  // if (admins[0]) {
+  //   adminId = admins[0]._id;
+  // }
+  if (admins && admins.length > 0) {
+    const adminIds = admins.map((adm) => adm._id);
+    for (let i = 0; i < allMembers.length; i++) {
+      if (adminIds.includes(allMembers[i]._id)) {
+        allMembers[i].userType = 'Admin';
+      } else {
+        allMembers[i].userType = 'Member';
+      }
+    }
+  }
   /**
    * Updates the list of members based on the selected filter mode.
    */
   /* istanbul ignore next */
   useEffect(() => {
     if (mode == 0) {
       if (data) {
-        setMembers(data.organizationsMemberConnection.edges);
+        setMembers(allMembers);
       }
     } else if (mode == 1) {
       if (data2) {
-        setMembers(data2.organizations[0].admins);
+        setMembers(admins);
       }
     }
   }, [mode]);
@@ -243,7 +277,7 @@ export default function people(): JSX.Element {
                         image: member.image,
                         id: member._id,
                         email: member.email,
-                        role: member.__typename,
+                        role: member.userType,
                         sno: (index + 1).toString(),
                       };
                       return <PeopleCard key={index} {...cardProps} />;