From 4e79a6fe7cb039128756ddd8a17a73f6679626f1 Mon Sep 17 00:00:00 2001
From: Aryan Shah <aryanashah11@gmail.com>
Date: Fri, 18 Oct 2024 23:09:09 +0530
Subject: [PATCH 01/14] fixed super admin profile

---
 src/GraphQl/Queries/Queries.ts                | 58 ++++++++++++++++++-
 .../LeftDrawerOrg/LeftDrawerOrg.test.tsx      |  7 +--
 .../LeftDrawerOrg/LeftDrawerOrg.tsx           |  8 +--
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
index c3999ba00e..c010b83c2c 100644
--- a/src/GraphQl/Queries/Queries.ts
+++ b/src/GraphQl/Queries/Queries.ts
@@ -335,6 +335,62 @@ export const EVENT_FEEDBACKS = gql`
   }
 `;
 
+// Query to take the Organization with data
+export const ORGANIZATIONS_LIST_BY_CREATOR_ID = gql`
+  query OrganizationsByCreator($creatorId: ID!) {
+    organizations(where: { creatorId: $creatorId }) {
+      _id
+      image
+      creator {
+        firstName
+        lastName
+        email
+      }
+      name
+      description
+      address {
+        city
+        countryCode
+        dependentLocality
+        line1
+        line2
+        postalCode
+        sortingCode
+        state
+      }
+      userRegistrationRequired
+      visibleInSearch
+      members {
+        _id
+        firstName
+        lastName
+        email
+      }
+      admins {
+        _id
+        firstName
+        lastName
+        email
+        createdAt
+      }
+      membershipRequests {
+        _id
+        user {
+          firstName
+          lastName
+          email
+        }
+      }
+      blockedUsers {
+        _id
+        firstName
+        lastName
+        email
+      }
+    }
+  }
+`;
+
 // Query to take the Organization with data
 export const ORGANIZATIONS_LIST = gql`
   query Organizations($id: ID!) {
@@ -818,4 +874,4 @@ export {
   USER_CREATED_ORGANIZATIONS,
   USER_JOINED_ORGANIZATIONS,
   USER_ORGANIZATION_CONNECTION,
-} from './OrganizationQueries';
+} from './OrganizationQueries';
\ No newline at end of file
diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index 76f112741c..bcdec1eff5 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -1,5 +1,5 @@
 import React, { act } from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen , waitFor} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import 'jest-localstorage-mock';
 import { I18nextProvider } from 'react-i18next';
@@ -304,8 +304,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
         </BrowserRouter>
       </MockedProvider>,
     );
-    await wait();
-    expect(screen.getByTestId(/orgBtn/i)).toBeInTheDocument();
+    await waitFor(() => expect(screen.getByTestId(/OrgBtn/i)).toBeInTheDocument());
   });
 
   test('Testing Menu Buttons', async () => {
@@ -429,4 +428,4 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
       </MockedProvider>,
     );
   });
-});
+});
\ No newline at end of file
diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index e9495187ee..39d06613ab 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -1,6 +1,6 @@
 import { useQuery } from '@apollo/client';
 import { WarningAmberOutlined } from '@mui/icons-material';
-import { ORGANIZATIONS_LIST } from 'GraphQl/Queries/Queries';
+import { ORGANIZATIONS_LIST_BY_CREATOR_ID } from 'GraphQl/Queries/Queries';
 import CollapsibleDropdown from 'components/CollapsibleDropdown/CollapsibleDropdown';
 import IconComponent from 'components/IconComponent/IconComponent';
 import React, { useEffect, useState } from 'react';
@@ -49,8 +49,8 @@ const leftDrawerOrg = ({
       | { organizations: InterfaceQueryOrganizationsListObject[] }
       | undefined;
     loading: boolean;
-  } = useQuery(ORGANIZATIONS_LIST, {
-    variables: { id: orgId },
+  } = useQuery(ORGANIZATIONS_LIST_BY_CREATOR_ID, {
+    variables: { creatorId: orgId },
   });
 
   // Set organization data when query data is available
@@ -183,4 +183,4 @@ const leftDrawerOrg = ({
   );
 };
 
-export default leftDrawerOrg;
+export default leftDrawerOrg;
\ No newline at end of file

From dc9617c60c6ebae6d4f600dd9997e6f5feb9003d Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Fri, 18 Oct 2024 23:13:18 +0530
Subject: [PATCH 02/14] Update LeftDrawerOrg.test.tsx

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

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index bcdec1eff5..446c80be80 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -1,5 +1,5 @@
 import React, { act } from 'react';
-import { fireEvent, render, screen , waitFor} from '@testing-library/react';
+import { fireEvent, render, screen, waitFor} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import 'jest-localstorage-mock';
 import { I18nextProvider } from 'react-i18next';
@@ -428,4 +428,4 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
       </MockedProvider>,
     );
   });
-});
\ No newline at end of file
+});

From 63e4334ba99b1de17fd6cd5ab87b9e0e2e187f58 Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Fri, 18 Oct 2024 23:21:10 +0530
Subject: [PATCH 03/14] Update Queries.ts

---
 src/GraphQl/Queries/Queries.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
index c010b83c2c..27597c4e54 100644
--- a/src/GraphQl/Queries/Queries.ts
+++ b/src/GraphQl/Queries/Queries.ts
@@ -874,4 +874,4 @@ export {
   USER_CREATED_ORGANIZATIONS,
   USER_JOINED_ORGANIZATIONS,
   USER_ORGANIZATION_CONNECTION,
-} from './OrganizationQueries';
\ No newline at end of file
+} from './OrganizationQueries';

From 755b97e2ffe9f7bde6eacd25150d0364afc64a2b Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Fri, 18 Oct 2024 23:21:40 +0530
Subject: [PATCH 04/14] Update LeftDrawerOrg.test.tsx

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

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index 446c80be80..566b863600 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -1,5 +1,5 @@
 import React, { act } from 'react';
-import { fireEvent, render, screen, waitFor} from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import 'jest-localstorage-mock';
 import { I18nextProvider } from 'react-i18next';
@@ -304,7 +304,9 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
         </BrowserRouter>
       </MockedProvider>,
     );
-    await waitFor(() => expect(screen.getByTestId(/OrgBtn/i)).toBeInTheDocument());
+    await waitFor(() =>
+      expect(screen.getByTestId(/OrgBtn/i)).toBeInTheDocument(),
+    );
   });
 
   test('Testing Menu Buttons', async () => {

From e09895dc8e9f2e3033db5846353e19fade54d3d4 Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Fri, 18 Oct 2024 23:22:03 +0530
Subject: [PATCH 05/14] Update LeftDrawerOrg.tsx

---
 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 39d06613ab..e14feb9cf0 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -183,4 +183,4 @@ const leftDrawerOrg = ({
   );
 };
 
-export default leftDrawerOrg;
\ No newline at end of file
+export default leftDrawerOrg;

From ebc8ac051cccadb3d51c63be63a2ad6da43e4832 Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Fri, 18 Oct 2024 23:42:47 +0530
Subject: [PATCH 06/14] Update LeftDrawerOrg.test.tsx

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

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index 566b863600..cf8921f574 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -11,7 +11,7 @@ import LeftDrawerOrg from './LeftDrawerOrg';
 import { Provider } from 'react-redux';
 import { MockedProvider } from '@apollo/react-testing';
 import { store } from 'state/store';
-import { ORGANIZATIONS_LIST } from 'GraphQl/Queries/Queries';
+import { ORGANIZATIONS_LIST_BY_CREATOR_ID } from 'GraphQl/Queries/Queries';
 import { StaticMockLink } from 'utils/StaticMockLink';
 import { REVOKE_REFRESH_TOKEN } from 'GraphQl/Mutations/mutations';
 import useLocalStorage from 'utils/useLocalstorage';
@@ -305,7 +305,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
       </MockedProvider>,
     );
     await waitFor(() =>
-      expect(screen.getByTestId(/OrgBtn/i)).toBeInTheDocument(),
+      expect(screen.getByTestId(/orgBtn/i)).toBeInTheDocument(),
     );
   });
 

From b97ec0316ebd7b8e01e8727a927745afc88a4d89 Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Sat, 19 Oct 2024 01:42:11 +0530
Subject: [PATCH 07/14] Update LeftDrawerOrg.test.tsx

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

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index cf8921f574..6e01bfc9e6 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -77,7 +77,7 @@ const MOCKS = [
   },
   {
     request: {
-      query: ORGANIZATIONS_LIST,
+      query: ORGANIZATIONS_LIST_BY_CREATOR_ID,
       variables: { id: '123' },
     },
     result: {
@@ -140,7 +140,7 @@ const MOCKS = [
 const MOCKS_WITH_IMAGE = [
   {
     request: {
-      query: ORGANIZATIONS_LIST,
+      query: ORGANIZATIONS_LIST_BY_CREATOR_ID,
       variables: { id: '123' },
     },
     result: {
@@ -204,7 +204,7 @@ const MOCKS_WITH_IMAGE = [
 const MOCKS_EMPTY = [
   {
     request: {
-      query: ORGANIZATIONS_LIST,
+      query: ORGANIZATIONS_LIST_BY_CREATOR_ID,
       variables: { id: '123' },
     },
     result: {

From 6f47f26ee5387ad84cb57550473a6dd754b2ef0e Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Sat, 19 Oct 2024 02:30:28 +0530
Subject: [PATCH 08/14] Update LeftDrawerOrg.test.tsx

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

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index 6e01bfc9e6..3e425a5c6c 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -1,5 +1,5 @@
 import React, { act } from 'react';
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import 'jest-localstorage-mock';
 import { I18nextProvider } from 'react-i18next';
@@ -304,9 +304,8 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
         </BrowserRouter>
       </MockedProvider>,
     );
-    await waitFor(() =>
-      expect(screen.getByTestId(/orgBtn/i)).toBeInTheDocument(),
-    );
+    await wait();
+    expect(screen.getByTestId(/orgBtn/i)).toBeInTheDocument();
   });
 
   test('Testing Menu Buttons', async () => {

From 6ca5501a3aa8e4d9e9594d5f886a50cb343246c9 Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Tue, 22 Oct 2024 19:08:47 +0530
Subject: [PATCH 09/14] Update LeftDrawerOrg.tsx

---
 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 e14feb9cf0..d8c58e89d8 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -116,7 +116,7 @@ const leftDrawerOrg = ({
               </button>
             </>
           ) : (
-            <button className={styles.profileContainer} data-testid="OrgBtn">
+            <button className={styles.profileContainer} data-testid="orgBtn">
               <div className={styles.imageContainer}>
                 {organization.image ? (
                   <img src={organization.image} alt={`profile picture`} />

From 04e782aa38e0e04a936d794b30e7d7a872237b81 Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:03:10 +0530
Subject: [PATCH 10/14] Update LeftDrawerOrg.test.tsx

---
 .../LeftDrawerOrg/LeftDrawerOrg.test.tsx      | 145 ++++++++----------
 1 file changed, 61 insertions(+), 84 deletions(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index a42d1c4d7c..92715797f3 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -19,45 +19,45 @@ import useLocalStorage from 'utils/useLocalstorage';
 const { setItem } = useLocalStorage();
 
 const props: InterfaceLeftDrawerProps = {
-  orgId: '123',
+  orgId: '64378abd85008f171cf2990d',
   targets: [
     {
       name: 'Dashboard',
-      url: '/orgdash/123',
+      url: '/orgdash/6437904485008f171cf29924',
     },
     {
       name: 'People',
-      url: '/orgpeople/123',
+      url: '/orgpeople/6437904485008f171cf29924',
     },
     {
       name: 'Events',
-      url: '/orgevents/123',
+      url: '/orgevents/6437904485008f171cf29924',
     },
     {
       name: 'Posts',
-      url: '/orgpost/123',
+      url: '/orgpost/6437904485008f171cf29924',
     },
     {
       name: 'Block/Unblock',
-      url: '/blockuser/123',
+      url: '/blockuser/6437904485008f171cf29924',
     },
     {
       name: 'Plugins',
       subTargets: [
         {
           name: 'Plugin Store',
-          url: '/orgstore/123',
+          url: '/orgstore/6437904485008f171cf29924',
           icon: 'fa-store',
         },
       ],
     },
     {
       name: 'Settings',
-      url: '/orgsetting/123',
+      url: '/orgsetting/6437904485008f171cf29924',
     },
     {
       name: 'All Organizations',
-      url: '/orglist/123',
+      url: '/orglist/6437904485008f171cf29924',
     },
   ],
   hideDrawer: false,
@@ -78,58 +78,47 @@ const MOCKS = [
   {
     request: {
       query: ORGANIZATIONS_LIST_BY_CREATOR_ID,
-      variables: { id: '123' },
+      variables: { id: '64378abd85008f171cf2990d' },
     },
     result: {
       data: {
         organizations: [
           {
-            _id: '123',
+            _id: '6437904485008f171cf29924',
             image: null,
-            creator: {
-              firstName: 'John',
-              lastName: 'Doe',
-              email: 'JohnDoe@example.com',
-            },
-            name: 'Test Organization',
-            description: 'Testing this organization',
+            name: 'Unity Foundation',
+            description: 'A foundation aimed at uniting the world and making it a better place for all.',
             address: {
-              city: 'Delhi',
-              countryCode: 'IN',
+              city: 'Bronx',
+              countryCode: 'US',
               dependentLocality: 'Some Dependent Locality',
               line1: '123 Random Street',
               line2: 'Apartment 456',
-              postalCode: '110001',
+              postalCode: '10451',
               sortingCode: 'ABC-123',
-              state: 'Delhi',
+              state: 'NYC',
             },
-            userRegistrationRequired: true,
+            userRegistrationRequired: false,
             visibleInSearch: true,
             members: [
-              {
-                _id: 'john123',
-                firstName: 'John',
-                lastName: 'Doe',
-                email: 'JohnDoe@example.com',
-              },
-              {
-                _id: 'jane123',
-                firstName: 'Jane',
-                lastName: 'Doe',
-                email: 'JaneDoe@example.com',
-              },
-            ],
-            admins: [
-              {
-                _id: 'john123',
-                firstName: 'John',
-                lastName: 'Doe',
-                email: 'JohnDoe@example.com',
-                createdAt: '12-03-2024',
-              },
+              '64378abd85008f171cf2990d',
+              '658930fd2caa9d8d6908745c',
+              '6589386a2caa9d8d69087484',
+              '6589387e2caa9d8d69087485',
+              '6589388b2caa9d8d69087486',
+              '6589389d2caa9d8d69087487',
+              '658938a62caa9d8d69087488',
+              '658938b02caa9d8d69087489',
+              '658938ba2caa9d8d6908748a',
             ],
+            admins: ['64378abd85008f171cf2990d'],
+            groupChats: [],
+            posts: [],
+            pinnedPosts: [],
             membershipRequests: [],
             blockedUsers: [],
+            creatorId: '64378abd85008f171cf2990d',
+            createdAt: '2023-04-13T05:16:52.827Z',
           },
         ],
       },
@@ -141,59 +130,47 @@ const MOCKS_WITH_IMAGE = [
   {
     request: {
       query: ORGANIZATIONS_LIST_BY_CREATOR_ID,
-      variables: { id: '123' },
+      variables: { id: '64378abd85008f171cf2990d' },
     },
     result: {
       data: {
         organizations: [
           {
-            _id: '123',
-            image:
-              'https://api.dicebear.com/5.x/initials/svg?seed=Test%20Organization',
-            creator: {
-              firstName: 'John',
-              lastName: 'Doe',
-              email: 'JohnDoe@example.com',
-            },
-            name: 'Test Organization',
-            description: 'Testing this organization',
+            _id: '6437904485008f171cf29924',
+            image: 'https://api.dicebear.com/5.x/initials/svg?seed=Unity%20Foundation', // Unity Foundation image
+            name: 'Unity Foundation',
+            description: 'A foundation aimed at uniting the world and making it a better place for all.',
             address: {
-              city: 'Delhi',
-              countryCode: 'IN',
+              city: 'Bronx',
+              countryCode: 'US',
               dependentLocality: 'Some Dependent Locality',
               line1: '123 Random Street',
               line2: 'Apartment 456',
-              postalCode: '110001',
+              postalCode: '10451',
               sortingCode: 'ABC-123',
-              state: 'Delhi',
+              state: 'NYC',
             },
-            userRegistrationRequired: true,
+            userRegistrationRequired: false,
             visibleInSearch: true,
             members: [
-              {
-                _id: 'john123',
-                firstName: 'John',
-                lastName: 'Doe',
-                email: 'JohnDoe@example.com',
-              },
-              {
-                _id: 'jane123',
-                firstName: 'Jane',
-                lastName: 'Doe',
-                email: 'JaneDoe@example.com',
-              },
-            ],
-            admins: [
-              {
-                _id: 'john123',
-                firstName: 'John',
-                lastName: 'Doe',
-                email: 'JohnDoe@example.com',
-                createdAt: '12-03-2024',
-              },
+              '64378abd85008f171cf2990d',
+              '658930fd2caa9d8d6908745c',
+              '6589386a2caa9d8d69087484',
+              '6589387e2caa9d8d69087485',
+              '6589388b2caa9d8d69087486',
+              '6589389d2caa9d8d69087487',
+              '658938a62caa9d8d69087488',
+              '658938b02caa9d8d69087489',
+              '658938ba2caa9d8d6908748a',
             ],
+            admins: ['64378abd85008f171cf2990d'],
+            groupChats: [],
+            posts: [],
+            pinnedPosts: [],
             membershipRequests: [],
             blockedUsers: [],
+            creatorId: '64378abd85008f171cf2990d',
+            createdAt: '2023-04-13T05:16:52.827Z',
           },
         ],
       },
@@ -205,7 +182,7 @@ const MOCKS_EMPTY = [
   {
     request: {
       query: ORGANIZATIONS_LIST_BY_CREATOR_ID,
-      variables: { id: '123' },
+      variables: { id: '64378abd85008f171cf2990d' },
     },
     result: {
       data: {
@@ -326,7 +303,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     );
     await wait();
     userEvent.click(screen.getByText('Dashboard'));
-    expect(global.window.location.pathname).toContain('/orgdash/123');
+    expect(global.window.location.pathname).toContain('/orgdash/6437904485008f171cf29924');
   });
 
   test('Testing when screen size is less than 820px', async () => {
@@ -350,7 +327,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     const peopelBtn = screen.getByTestId(/People/i);
     userEvent.click(peopelBtn);
     await wait();
-    expect(window.location.pathname).toContain('/orgpeople/123');
+    expect(window.location.pathname).toContain('/orgpeople/6437904485008f171cf29924');
   });
 
   test('Testing when image is present for Organization', async () => {

From 38be241b74ffb4b99008702110b31f5a2d33ff3d Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:07:34 +0530
Subject: [PATCH 11/14] Update LeftDrawerOrg.test.tsx

---
 .../LeftDrawerOrg/LeftDrawerOrg.test.tsx        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index 92715797f3..fad5f782e6 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -87,7 +87,8 @@ const MOCKS = [
             _id: '6437904485008f171cf29924',
             image: null,
             name: 'Unity Foundation',
-            description: 'A foundation aimed at uniting the world and making it a better place for all.',
+            description:
+              'A foundation aimed at uniting the world and making it a better place for all.',
             address: {
               city: 'Bronx',
               countryCode: 'US',
@@ -137,9 +138,11 @@ const MOCKS_WITH_IMAGE = [
         organizations: [
           {
             _id: '6437904485008f171cf29924',
-            image: 'https://api.dicebear.com/5.x/initials/svg?seed=Unity%20Foundation', // Unity Foundation image
+            image:
+              'https://api.dicebear.com/5.x/initials/svg?seed=Unity%20Foundation', // Unity Foundation image
             name: 'Unity Foundation',
-            description: 'A foundation aimed at uniting the world and making it a better place for all.',
+            description:
+              'A foundation aimed at uniting the world and making it a better place for all.',
             address: {
               city: 'Bronx',
               countryCode: 'US',
@@ -303,7 +306,9 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     );
     await wait();
     userEvent.click(screen.getByText('Dashboard'));
-    expect(global.window.location.pathname).toContain('/orgdash/6437904485008f171cf29924');
+    expect(global.window.location.pathname).toContain(
+      '/orgdash/6437904485008f171cf29924',
+    );
   });
 
   test('Testing when screen size is less than 820px', async () => {
@@ -327,7 +332,9 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     const peopelBtn = screen.getByTestId(/People/i);
     userEvent.click(peopelBtn);
     await wait();
-    expect(window.location.pathname).toContain('/orgpeople/6437904485008f171cf29924');
+    expect(window.location.pathname).toContain(
+      '/orgpeople/6437904485008f171cf29924',
+    );
   });
 
   test('Testing when image is present for Organization', async () => {

From 2015fd6f484a2ee64526145ccfa277043248fac0 Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:17:11 +0530
Subject: [PATCH 12/14] Update LeftDrawerOrg.test.tsx

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

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index fad5f782e6..89dfa64d6a 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -285,7 +285,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
       </MockedProvider>,
     );
     await wait();
-    expect(screen.getByTestId(/orgBtn/i)).toBeInTheDocument();
+    expect(await screen.findByTestId(/orgBtn/i)).toBeInTheDocument();
   });
 
   test('Testing Menu Buttons', async () => {

From 7c2f363d5f6a7333dba6a879a0bb9d3bea1b92f6 Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Tue, 22 Oct 2024 23:09:16 +0530
Subject: [PATCH 13/14] Update LeftDrawerOrg.test.tsx

---
 .../LeftDrawerOrg/LeftDrawerOrg.test.tsx      | 161 ++++++++++--------
 1 file changed, 89 insertions(+), 72 deletions(-)

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index 89dfa64d6a..9f1851d616 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -1,5 +1,5 @@
 import React, { act } from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import 'jest-localstorage-mock';
 import { I18nextProvider } from 'react-i18next';
@@ -8,7 +8,7 @@ import { BrowserRouter } from 'react-router-dom';
 import i18nForTest from 'utils/i18nForTest';
 import type { InterfaceLeftDrawerProps } from './LeftDrawerOrg';
 import LeftDrawerOrg from './LeftDrawerOrg';
-import { Provider } from 'react-redux';
+import { Provider } from 'react-redux'; 
 import { MockedProvider } from '@apollo/react-testing';
 import { store } from 'state/store';
 import { ORGANIZATIONS_LIST_BY_CREATOR_ID } from 'GraphQl/Queries/Queries';
@@ -19,45 +19,45 @@ import useLocalStorage from 'utils/useLocalstorage';
 const { setItem } = useLocalStorage();
 
 const props: InterfaceLeftDrawerProps = {
-  orgId: '64378abd85008f171cf2990d',
+  orgId: '123',
   targets: [
     {
       name: 'Dashboard',
-      url: '/orgdash/6437904485008f171cf29924',
+      url: '/orgdash/123',
     },
     {
       name: 'People',
-      url: '/orgpeople/6437904485008f171cf29924',
+      url: '/orgpeople/123',
     },
     {
       name: 'Events',
-      url: '/orgevents/6437904485008f171cf29924',
+      url: '/orgevents/123',
     },
     {
       name: 'Posts',
-      url: '/orgpost/6437904485008f171cf29924',
+      url: '/orgpost/123',
     },
     {
       name: 'Block/Unblock',
-      url: '/blockuser/6437904485008f171cf29924',
+      url: '/blockuser/123',
     },
     {
       name: 'Plugins',
       subTargets: [
         {
           name: 'Plugin Store',
-          url: '/orgstore/6437904485008f171cf29924',
+          url: '/orgstore/123',
           icon: 'fa-store',
         },
       ],
     },
     {
       name: 'Settings',
-      url: '/orgsetting/6437904485008f171cf29924',
+      url: '/orgsetting/123',
     },
     {
       name: 'All Organizations',
-      url: '/orglist/6437904485008f171cf29924',
+      url: '/orglist/123',
     },
   ],
   hideDrawer: false,
@@ -78,48 +78,58 @@ const MOCKS = [
   {
     request: {
       query: ORGANIZATIONS_LIST_BY_CREATOR_ID,
-      variables: { id: '64378abd85008f171cf2990d' },
+      variables: { id: '123' },
     },
     result: {
       data: {
         organizations: [
           {
-            _id: '6437904485008f171cf29924',
+            _id: '123',
             image: null,
-            name: 'Unity Foundation',
-            description:
-              'A foundation aimed at uniting the world and making it a better place for all.',
+            creator: {
+              firstName: 'John',
+              lastName: 'Doe',
+              email: 'JohnDoe@example.com',
+            },
+            name: 'Test Organization',
+            description: 'Testing this organization',
             address: {
-              city: 'Bronx',
-              countryCode: 'US',
+              city: 'Delhi',
+              countryCode: 'IN',
               dependentLocality: 'Some Dependent Locality',
               line1: '123 Random Street',
               line2: 'Apartment 456',
-              postalCode: '10451',
+              postalCode: '110001',
               sortingCode: 'ABC-123',
-              state: 'NYC',
+              state: 'Delhi',
             },
-            userRegistrationRequired: false,
+            userRegistrationRequired: true,
             visibleInSearch: true,
             members: [
-              '64378abd85008f171cf2990d',
-              '658930fd2caa9d8d6908745c',
-              '6589386a2caa9d8d69087484',
-              '6589387e2caa9d8d69087485',
-              '6589388b2caa9d8d69087486',
-              '6589389d2caa9d8d69087487',
-              '658938a62caa9d8d69087488',
-              '658938b02caa9d8d69087489',
-              '658938ba2caa9d8d6908748a',
+              {
+                _id: 'john123',
+                firstName: 'John',
+                lastName: 'Doe',
+                email: 'JohnDoe@example.com',
+              },
+              {
+                _id: 'jane123',
+                firstName: 'Jane',
+                lastName: 'Doe',
+                email: 'JaneDoe@example.com',
+              },
+            ],
+            admins: [
+              {
+                _id: 'john123',
+                firstName: 'John',
+                lastName: 'Doe',
+                email: 'JohnDoe@example.com',
+                createdAt: '12-03-2024',
+              },
             ],
-            admins: ['64378abd85008f171cf2990d'],
-            groupChats: [],
-            posts: [],
-            pinnedPosts: [],
             membershipRequests: [],
             blockedUsers: [],
-            creatorId: '64378abd85008f171cf2990d',
-            createdAt: '2023-04-13T05:16:52.827Z',
           },
         ],
       },
@@ -131,49 +141,59 @@ const MOCKS_WITH_IMAGE = [
   {
     request: {
       query: ORGANIZATIONS_LIST_BY_CREATOR_ID,
-      variables: { id: '64378abd85008f171cf2990d' },
+      variables: { id: '123' },
     },
     result: {
       data: {
         organizations: [
           {
-            _id: '6437904485008f171cf29924',
+            _id: '123',
             image:
-              'https://api.dicebear.com/5.x/initials/svg?seed=Unity%20Foundation', // Unity Foundation image
-            name: 'Unity Foundation',
-            description:
-              'A foundation aimed at uniting the world and making it a better place for all.',
+              'https://api.dicebear.com/5.x/initials/svg?seed=Test%20Organization',
+            creator: {
+              firstName: 'John',
+              lastName: 'Doe',
+              email: 'JohnDoe@example.com',
+            },
+            name: 'Test Organization',
+            description: 'Testing this organization',
             address: {
-              city: 'Bronx',
-              countryCode: 'US',
+              city: 'Delhi',
+              countryCode: 'IN',
               dependentLocality: 'Some Dependent Locality',
               line1: '123 Random Street',
               line2: 'Apartment 456',
-              postalCode: '10451',
+              postalCode: '110001',
               sortingCode: 'ABC-123',
-              state: 'NYC',
+              state: 'Delhi',
             },
-            userRegistrationRequired: false,
+            userRegistrationRequired: true,
             visibleInSearch: true,
             members: [
-              '64378abd85008f171cf2990d',
-              '658930fd2caa9d8d6908745c',
-              '6589386a2caa9d8d69087484',
-              '6589387e2caa9d8d69087485',
-              '6589388b2caa9d8d69087486',
-              '6589389d2caa9d8d69087487',
-              '658938a62caa9d8d69087488',
-              '658938b02caa9d8d69087489',
-              '658938ba2caa9d8d6908748a',
+              {
+                _id: 'john123',
+                firstName: 'John',
+                lastName: 'Doe',
+                email: 'JohnDoe@example.com',
+              },
+              {
+                _id: 'jane123',
+                firstName: 'Jane',
+                lastName: 'Doe',
+                email: 'JaneDoe@example.com',
+              },
+            ],
+            admins: [
+              {
+                _id: 'john123',
+                firstName: 'John',
+                lastName: 'Doe',
+                email: 'JohnDoe@example.com',
+                createdAt: '12-03-2024',
+              },
             ],
-            admins: ['64378abd85008f171cf2990d'],
-            groupChats: [],
-            posts: [],
-            pinnedPosts: [],
             membershipRequests: [],
             blockedUsers: [],
-            creatorId: '64378abd85008f171cf2990d',
-            createdAt: '2023-04-13T05:16:52.827Z',
           },
         ],
       },
@@ -185,7 +205,7 @@ const MOCKS_EMPTY = [
   {
     request: {
       query: ORGANIZATIONS_LIST_BY_CREATOR_ID,
-      variables: { id: '64378abd85008f171cf2990d' },
+      variables: { id: '123' },
     },
     result: {
       data: {
@@ -284,8 +304,9 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
         </BrowserRouter>
       </MockedProvider>,
     );
-    await wait();
-    expect(await screen.findByTestId(/orgBtn/i)).toBeInTheDocument();
+    await waitFor(() =>
+      expect(screen.getByTestId(/orgBtn/i)).toBeInTheDocument(),
+    );
   });
 
   test('Testing Menu Buttons', async () => {
@@ -306,9 +327,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     );
     await wait();
     userEvent.click(screen.getByText('Dashboard'));
-    expect(global.window.location.pathname).toContain(
-      '/orgdash/6437904485008f171cf29924',
-    );
+    expect(global.window.location.pathname).toContain('/orgdash/123');
   });
 
   test('Testing when screen size is less than 820px', async () => {
@@ -332,9 +351,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     const peopelBtn = screen.getByTestId(/People/i);
     userEvent.click(peopelBtn);
     await wait();
-    expect(window.location.pathname).toContain(
-      '/orgpeople/6437904485008f171cf29924',
-    );
+    expect(window.location.pathname).toContain('/orgpeople/123');
   });
 
   test('Testing when image is present for Organization', async () => {
@@ -374,7 +391,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     );
     await wait();
     expect(
-      screen.getByText(/Error occured while loading Organization data/i),
+      screen.getByText(/Error Occured while loading the Organization/i),
     ).toBeInTheDocument();
   });
 

From d78a465c69c60822669c6171ea39ed551daf35e0 Mon Sep 17 00:00:00 2001
From: Aryan Shah <149894557+ARYANSHAH1567@users.noreply.github.com>
Date: Tue, 22 Oct 2024 23:15:55 +0530
Subject: [PATCH 14/14] Update LeftDrawerOrg.test.tsx

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

diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index 9f1851d616..6e01bfc9e6 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -8,7 +8,7 @@ import { BrowserRouter } from 'react-router-dom';
 import i18nForTest from 'utils/i18nForTest';
 import type { InterfaceLeftDrawerProps } from './LeftDrawerOrg';
 import LeftDrawerOrg from './LeftDrawerOrg';
-import { Provider } from 'react-redux'; 
+import { Provider } from 'react-redux';
 import { MockedProvider } from '@apollo/react-testing';
 import { store } from 'state/store';
 import { ORGANIZATIONS_LIST_BY_CREATOR_ID } from 'GraphQl/Queries/Queries';