From 54bd3e77862d2040641188d37d3948a5723c4b49 Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Wed, 30 Oct 2024 15:45:21 +0530
Subject: [PATCH 01/12] leftDrawerOrg:Fixed the org not found error on viewing
 admin profile.

---
 .../LeftDrawerOrg/LeftDrawerOrg.test.tsx      |  6 ++-
 .../LeftDrawerOrg/LeftDrawerOrg.tsx           | 44 +++++++++++++------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index 2a0ef3815d..c73d3c36f2 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -291,8 +291,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
   test('Testing Profile Page & Organization Detail Modal', async () => {
     setItem('UserImage', '');
     setItem('SuperAdmin', true);
-    setItem('FirstName', 'John');
-    setItem('LastName', 'Doe');
+    setItem('id', '1234');
     render(
       <MockedProvider addTypename={false} link={link}>
         <BrowserRouter>
@@ -306,6 +305,9 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     );
     await wait();
     expect(screen.getByTestId(/orgBtn/i)).toBeInTheDocument();
+    expect(
+      screen.queryByText(/Error occured while loading Organization data/i),
+    ).not.toBeInTheDocument();
   });
 
   test('Testing Menu Buttons', async () => {
diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index 3a3ba378cf..dd43248c74 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -6,13 +6,14 @@ import IconComponent from 'components/IconComponent/IconComponent';
 import React, { useEffect, useState } from 'react';
 import Button from 'react-bootstrap/Button';
 import { useTranslation } from 'react-i18next';
-import { NavLink } from 'react-router-dom';
+import { NavLink, useLocation } from 'react-router-dom';
 import type { TargetsType } from 'state/reducers/routesReducer';
 import type { InterfaceQueryOrganizationsListObject } from 'utils/interfaces';
 import AngleRightIcon from 'assets/svgs/angleRight.svg?react';
 import TalawaLogo from 'assets/svgs/talawa.svg?react';
 import styles from './LeftDrawerOrg.module.css';
 import Avatar from 'components/Avatar/Avatar';
+import useLocalStorage from 'utils/useLocalstorage';
 
 export interface InterfaceLeftDrawerProps {
   orgId: string;
@@ -38,8 +39,13 @@ const leftDrawerOrg = ({
 }: InterfaceLeftDrawerProps): JSX.Element => {
   const { t: tCommon } = useTranslation('common');
   const { t: tErrors } = useTranslation('errors');
+  const location = useLocation();
+  const { getItem } = useLocalStorage();
+  const userId = getItem('id');
+  const id = location.pathname.split('/')[2] || '';
+  // if param id is equal to userId, then it is a profile page
+  const [isProfilePage, setIsProfilePage] = useState(id === userId);
   const [showDropdown, setShowDropdown] = useState(false);
-
   const [organization, setOrganization] =
     useState<InterfaceQueryOrganizationsListObject>();
   const {
@@ -54,16 +60,24 @@ const leftDrawerOrg = ({
     variables: { id: orgId },
   });
 
+  // Check if the current page is admin profile page
+  useEffect(() => {
+    const newId = location.pathname.split('/')[2] || '';
+    setIsProfilePage(newId === userId);
+  }, [location]);
+
   // Set organization data when query data is available
   useEffect(() => {
     let isMounted = true;
     if (data && isMounted) {
       setOrganization(data?.organizations[0]);
+    } else {
+      setOrganization(undefined);
     }
     return () => {
       isMounted = false;
     };
-  }, [data]);
+  }, [data, location]);
 
   /**
    * Handles link click to hide the drawer on smaller screens.
@@ -104,17 +118,19 @@ const leftDrawerOrg = ({
               />
             </>
           ) : organization == undefined ? (
-            <>
-              <button
-                className={`${styles.profileContainer} bg-danger text-start text-white`}
-                disabled
-              >
-                <div className="px-3">
-                  <WarningAmberOutlined />
-                </div>
-                {tErrors('errorLoading', { entity: 'Organization' })}
-              </button>
-            </>
+            !isProfilePage && (
+              <>
+                <button
+                  className={`${styles.profileContainer} bg-danger text-start text-white`}
+                  disabled
+                >
+                  <div className="px-3">
+                    <WarningAmberOutlined />
+                  </div>
+                  {tErrors('errorLoading', { entity: 'Organization' })}
+                </button>
+              </>
+            )
           ) : (
             <button className={styles.profileContainer} data-testid="OrgBtn">
               <div className={styles.imageContainer}>

From 4543884159616d7d02c457346fa46211ae350ea8 Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Wed, 30 Oct 2024 16:17:15 +0530
Subject: [PATCH 02/12] created getIdfromPath utitily function

---
 src/components/LeftDrawerOrg/LeftDrawerOrg.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index dd43248c74..3d67408168 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -42,7 +42,13 @@ const leftDrawerOrg = ({
   const location = useLocation();
   const { getItem } = useLocalStorage();
   const userId = getItem('id');
-  const id = location.pathname.split('/')[2] || '';
+  const getIdFromPath = (pathname: string): string => {
+    const segments = pathname.split('/');
+    // Index 2 represents the ID in paths like /member/{userId}
+    return segments.length > 2 ? segments[2] : '';
+  };
+
+  const id = getIdFromPath(location.pathname);
   // if param id is equal to userId, then it is a profile page
   const [isProfilePage, setIsProfilePage] = useState(id === userId);
   const [showDropdown, setShowDropdown] = useState(false);
@@ -62,9 +68,9 @@ const leftDrawerOrg = ({
 
   // Check if the current page is admin profile page
   useEffect(() => {
-    const newId = location.pathname.split('/')[2] || '';
+    const newId = getIdFromPath(location.pathname);
     setIsProfilePage(newId === userId);
-  }, [location]);
+  }, [location, userId]);
 
   // Set organization data when query data is available
   useEffect(() => {

From d1dddd0aacc62c19668bd9f72ca74510dc51cb3d Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Wed, 30 Oct 2024 18:21:19 +0530
Subject: [PATCH 03/12] corrected test code

---
 .../LeftDrawerOrg/LeftDrawerOrg.test.tsx      | 44 ++++++++++++++++++-
 .../LeftDrawerOrg/LeftDrawerOrg.tsx           | 20 ++++-----
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index c73d3c36f2..71f3593499 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -3,7 +3,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import 'jest-localstorage-mock';
 import { I18nextProvider } from 'react-i18next';
-import { BrowserRouter } from 'react-router-dom';
+import { BrowserRouter, MemoryRouter } from 'react-router-dom';
 
 import i18nForTest from 'utils/i18nForTest';
 import type { InterfaceLeftDrawerProps } from './LeftDrawerOrg';
@@ -21,6 +21,10 @@ const { setItem } = useLocalStorage();
 const props: InterfaceLeftDrawerProps = {
   orgId: '123',
   targets: [
+    {
+      name: 'Admin Profile',
+      url: '/member/123',
+    },
     {
       name: 'Dashboard',
       url: '/orgdash/123',
@@ -215,6 +219,20 @@ const MOCKS_EMPTY = [
   },
 ];
 
+const MOCKS_EMPTY_ORGID = [
+  {
+    request: {
+      query: ORGANIZATIONS_LIST,
+      variables: { id: '' },
+    },
+    result: {
+      data: {
+        organizations: [],
+      },
+    },
+  },
+];
+
 const defaultScreens = [
   'Dashboard',
   'People',
@@ -264,6 +282,7 @@ afterEach(() => {
 const link = new StaticMockLink(MOCKS, true);
 const linkImage = new StaticMockLink(MOCKS_WITH_IMAGE, true);
 const linkEmpty = new StaticMockLink(MOCKS_EMPTY, true);
+const linkEmptyOrgId = new StaticMockLink(MOCKS_EMPTY_ORGID, true);
 
 describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
   test('Component should be rendered properly', async () => {
@@ -291,7 +310,8 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
   test('Testing Profile Page & Organization Detail Modal', async () => {
     setItem('UserImage', '');
     setItem('SuperAdmin', true);
-    setItem('id', '1234');
+    setItem('FirstName', 'John');
+    setItem('LastName', 'Doe');
     render(
       <MockedProvider addTypename={false} link={link}>
         <BrowserRouter>
@@ -305,6 +325,26 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     );
     await wait();
     expect(screen.getByTestId(/orgBtn/i)).toBeInTheDocument();
+  });
+
+  test('Should not show org not found error when viewing admin profile', async () => {
+    setItem('UserImage', '');
+    setItem('SuperAdmin', true);
+    setItem('FirstName', 'John');
+    setItem('LastName', 'Doe');
+    setItem('id', '123');
+    render(
+      <MockedProvider addTypename={false} link={linkEmptyOrgId}>
+        <MemoryRouter initialEntries={['/member/123']}>
+          <Provider store={store}>
+            <I18nextProvider i18n={i18nForTest}>
+              <LeftDrawerOrg {...props} hideDrawer={null} />
+            </I18nextProvider>
+          </Provider>
+        </MemoryRouter>
+      </MockedProvider>,
+    );
+    await wait();
     expect(
       screen.queryByText(/Error occured while loading Organization data/i),
     ).not.toBeInTheDocument();
diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index 3d67408168..741a83f50c 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -125,17 +125,15 @@ const leftDrawerOrg = ({
             </>
           ) : organization == undefined ? (
             !isProfilePage && (
-              <>
-                <button
-                  className={`${styles.profileContainer} bg-danger text-start text-white`}
-                  disabled
-                >
-                  <div className="px-3">
-                    <WarningAmberOutlined />
-                  </div>
-                  {tErrors('errorLoading', { entity: 'Organization' })}
-                </button>
-              </>
+              <button
+                className={`${styles.profileContainer} bg-danger text-start text-white`}
+                disabled
+              >
+                <div className="px-3">
+                  <WarningAmberOutlined />
+                </div>
+                {tErrors('errorLoading', { entity: 'Organization' })}
+              </button>
             )
           ) : (
             <button className={styles.profileContainer} data-testid="OrgBtn">

From aa46b0ddd7b1abd413788cb8398665ef2e3fbaba Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Thu, 31 Oct 2024 04:31:04 +0530
Subject: [PATCH 04/12] removed unwanted newId variable

---
 src/components/LeftDrawerOrg/LeftDrawerOrg.tsx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index 741a83f50c..8b55947d84 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -47,10 +47,8 @@ const leftDrawerOrg = ({
     // Index 2 represents the ID in paths like /member/{userId}
     return segments.length > 2 ? segments[2] : '';
   };
-
-  const id = getIdFromPath(location.pathname);
   // if param id is equal to userId, then it is a profile page
-  const [isProfilePage, setIsProfilePage] = useState(id === userId);
+  const [isProfilePage, setIsProfilePage] = useState(false);
   const [showDropdown, setShowDropdown] = useState(false);
   const [organization, setOrganization] =
     useState<InterfaceQueryOrganizationsListObject>();
@@ -68,8 +66,9 @@ const leftDrawerOrg = ({
 
   // Check if the current page is admin profile page
   useEffect(() => {
-    const newId = getIdFromPath(location.pathname);
-    setIsProfilePage(newId === userId);
+    // id could be userId or orgId
+    const id = getIdFromPath(location.pathname);
+    setIsProfilePage(id === userId);
   }, [location, userId]);
 
   // Set organization data when query data is available

From 23306e79ce61de1ea157e32a39dffbc4e058087e Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Thu, 31 Oct 2024 04:37:16 +0530
Subject: [PATCH 05/12] added a comment for isProfilePage

---
 src/components/LeftDrawerOrg/LeftDrawerOrg.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index 8b55947d84..0c1d118e76 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -47,7 +47,6 @@ const leftDrawerOrg = ({
     // Index 2 represents the ID in paths like /member/{userId}
     return segments.length > 2 ? segments[2] : '';
   };
-  // if param id is equal to userId, then it is a profile page
   const [isProfilePage, setIsProfilePage] = useState(false);
   const [showDropdown, setShowDropdown] = useState(false);
   const [organization, setOrganization] =
@@ -68,6 +67,7 @@ const leftDrawerOrg = ({
   useEffect(() => {
     // id could be userId or orgId
     const id = getIdFromPath(location.pathname);
+    // if param id is equal to userId, then it is a profile page
     setIsProfilePage(id === userId);
   }, [location, userId]);
 

From e1e86e324193bf6c6b75269c5b34528fad742652 Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Thu, 31 Oct 2024 13:33:41 +0530
Subject: [PATCH 06/12] removed unwanted check in getIdFromPath func

---
 src/components/LeftDrawerOrg/LeftDrawerOrg.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index 0c1d118e76..26e1f70ecb 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -44,8 +44,8 @@ const leftDrawerOrg = ({
   const userId = getItem('id');
   const getIdFromPath = (pathname: string): string => {
     const segments = pathname.split('/');
-    // Index 2 represents the ID in paths like /member/{userId}
-    return segments.length > 2 ? segments[2] : '';
+    // Index 2 represents the ID in paths like /member/{userId}, /orgdash/{orgId}
+    return segments[2];
   };
   const [isProfilePage, setIsProfilePage] = useState(false);
   const [showDropdown, setShowDropdown] = useState(false);

From bfa475e8cae5d9981ae8b67548af08e079879181 Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Thu, 31 Oct 2024 14:55:26 +0530
Subject: [PATCH 07/12] Revert "removed unwanted check in getIdFromPath func"

This reverts commit e1e86e324193bf6c6b75269c5b34528fad742652.
---
 src/components/LeftDrawerOrg/LeftDrawerOrg.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index 26e1f70ecb..0c1d118e76 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -44,8 +44,8 @@ const leftDrawerOrg = ({
   const userId = getItem('id');
   const getIdFromPath = (pathname: string): string => {
     const segments = pathname.split('/');
-    // Index 2 represents the ID in paths like /member/{userId}, /orgdash/{orgId}
-    return segments[2];
+    // Index 2 represents the ID in paths like /member/{userId}
+    return segments.length > 2 ? segments[2] : '';
   };
   const [isProfilePage, setIsProfilePage] = useState(false);
   const [showDropdown, setShowDropdown] = useState(false);

From becd2d1a51360e1e96834afa25cf759e41aeb9a5 Mon Sep 17 00:00:00 2001
From: Anshul Kahar <anshulkahar2211@gmail.com>
Date: Thu, 31 Oct 2024 17:26:54 +0530
Subject: [PATCH 08/12] Feat : Write Unittests for
 `src/components/UserPortal/OrganizationCard/OrganizationCard.tsx` (#2393)

* improve testcase for org card

* act function warning
---
 .../OrganizationCard.test.tsx                 | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx b/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
index ba13fe346d..3ea0c3230e 100644
--- a/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
+++ b/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
@@ -1,4 +1,5 @@
-import React, { act } from 'react';
+import React from 'react';
+import { act } from '@testing-library/react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { MockedProvider } from '@apollo/react-testing';
 import { I18nextProvider } from 'react-i18next';
@@ -225,6 +226,38 @@ describe('Testing OrganizationCard Component [User Portal]', () => {
     await wait();
   });
 
+  test('Visit organization', async () => {
+    const cardProps = {
+      ...props,
+      id: '3',
+      image: 'organizationImage',
+      userRegistrationRequired: true,
+      membershipRequestStatus: 'accepted',
+    };
+
+    render(
+      <MockedProvider addTypename={false} link={link}>
+        <BrowserRouter>
+          <Provider store={store}>
+            <I18nextProvider i18n={i18nForTest}>
+              <OrganizationCard {...cardProps} />
+            </I18nextProvider>
+          </Provider>
+        </BrowserRouter>
+      </MockedProvider>,
+    );
+
+    await wait();
+
+    expect(screen.getByTestId('manageBtn')).toBeInTheDocument();
+
+    fireEvent.click(screen.getByTestId('manageBtn'));
+
+    await wait();
+
+    expect(window.location.pathname).toBe(`/user/organization/${cardProps.id}`);
+  });
+
   test('Send membership request', async () => {
     props = {
       ...props,

From 385eef774fc0ba14f275d021e9ad109911b3305e Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Fri, 1 Nov 2024 02:45:26 +0530
Subject: [PATCH 09/12] Added no pathname condition on getIdFromPath

---
 src/components/LeftDrawerOrg/LeftDrawerOrg.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index 0c1d118e76..91d52c179b 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -43,6 +43,7 @@ const leftDrawerOrg = ({
   const { getItem } = useLocalStorage();
   const userId = getItem('id');
   const getIdFromPath = (pathname: string): string => {
+    if (!pathname) return '';
     const segments = pathname.split('/');
     // Index 2 represents the ID in paths like /member/{userId}
     return segments.length > 2 ? segments[2] : '';
@@ -82,7 +83,7 @@ const leftDrawerOrg = ({
     return () => {
       isMounted = false;
     };
-  }, [data, location]);
+  }, [data]);
 
   /**
    * Handles link click to hide the drawer on smaller screens.

From 31027a7ad54f51eca9cd1ba379b6d2b3bb9de0a8 Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Fri, 1 Nov 2024 23:14:27 +0530
Subject: [PATCH 10/12] added useMemo hook

---
 src/components/LeftDrawerOrg/LeftDrawerOrg.tsx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index 91d52c179b..53cf635f04 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -3,7 +3,7 @@ import { WarningAmberOutlined } from '@mui/icons-material';
 import { ORGANIZATIONS_LIST } from 'GraphQl/Queries/Queries';
 import CollapsibleDropdown from 'components/CollapsibleDropdown/CollapsibleDropdown';
 import IconComponent from 'components/IconComponent/IconComponent';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import Button from 'react-bootstrap/Button';
 import { useTranslation } from 'react-i18next';
 import { NavLink, useLocation } from 'react-router-dom';
@@ -50,8 +50,9 @@ const leftDrawerOrg = ({
   };
   const [isProfilePage, setIsProfilePage] = useState(false);
   const [showDropdown, setShowDropdown] = useState(false);
-  const [organization, setOrganization] =
-    useState<InterfaceQueryOrganizationsListObject>();
+  const [organization, setOrganization] = useState<
+    InterfaceQueryOrganizationsListObject | undefined
+  >(undefined);
   const {
     data,
     loading,
@@ -64,12 +65,15 @@ const leftDrawerOrg = ({
     variables: { id: orgId },
   });
 
+  // Get the ID from the current path
+  const pathId = useMemo(
+    () => getIdFromPath(location.pathname),
+    [location.pathname],
+  );
   // Check if the current page is admin profile page
   useEffect(() => {
-    // id could be userId or orgId
-    const id = getIdFromPath(location.pathname);
     // if param id is equal to userId, then it is a profile page
-    setIsProfilePage(id === userId);
+    setIsProfilePage(pathId === userId);
   }, [location, userId]);
 
   // Set organization data when query data is available

From f34555647ffaf6a84ed700a9cfe45ecf356f71a3 Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Sat, 2 Nov 2024 14:49:37 +0530
Subject: [PATCH 11/12] Revert "Feat : Write Unittests for
 `src/components/UserPortal/OrganizationCard/OrganizationCard.tsx` (#2393)"

This reverts commit becd2d1a51360e1e96834afa25cf759e41aeb9a5.
---
 .../OrganizationCard.test.tsx                 | 35 +------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx b/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
index 3ea0c3230e..ba13fe346d 100644
--- a/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
+++ b/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-import { act } from '@testing-library/react';
+import React, { act } from 'react';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { MockedProvider } from '@apollo/react-testing';
 import { I18nextProvider } from 'react-i18next';
@@ -226,38 +225,6 @@ describe('Testing OrganizationCard Component [User Portal]', () => {
     await wait();
   });
 
-  test('Visit organization', async () => {
-    const cardProps = {
-      ...props,
-      id: '3',
-      image: 'organizationImage',
-      userRegistrationRequired: true,
-      membershipRequestStatus: 'accepted',
-    };
-
-    render(
-      <MockedProvider addTypename={false} link={link}>
-        <BrowserRouter>
-          <Provider store={store}>
-            <I18nextProvider i18n={i18nForTest}>
-              <OrganizationCard {...cardProps} />
-            </I18nextProvider>
-          </Provider>
-        </BrowserRouter>
-      </MockedProvider>,
-    );
-
-    await wait();
-
-    expect(screen.getByTestId('manageBtn')).toBeInTheDocument();
-
-    fireEvent.click(screen.getByTestId('manageBtn'));
-
-    await wait();
-
-    expect(window.location.pathname).toBe(`/user/organization/${cardProps.id}`);
-  });
-
   test('Send membership request', async () => {
     props = {
       ...props,

From c8ef93defea1caaefd4acc00b836ab48a4dab2ab Mon Sep 17 00:00:00 2001
From: Divyansh Seth <divyanshseth08@gmail.com>
Date: Sat, 2 Nov 2024 15:34:43 +0530
Subject: [PATCH 12/12] Updated comment to accurately reflect array indexing.

---
 src/components/LeftDrawerOrg/LeftDrawerOrg.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index 53cf635f04..a71c44afba 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -45,7 +45,7 @@ const leftDrawerOrg = ({
   const getIdFromPath = (pathname: string): string => {
     if (!pathname) return '';
     const segments = pathname.split('/');
-    // Index 2 represents the ID in paths like /member/{userId}
+    // Index 2 (third segment) represents the ID in paths like /member/{userId}
     return segments.length > 2 ? segments[2] : '';
   };
   const [isProfilePage, setIsProfilePage] = useState(false);