Merge branch 'develop-postgres' into FigmaActionItem#3174

.github/workflows/pull-request.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Count number of lines
         run: |
           chmod +x ./.github/workflows/scripts/countline.py
-          ./.github/workflows/scripts/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx src/components/TagActions/TagActionsMocks.ts src/utils/interfaces.ts src/screens/MemberDetail/MemberDetail.tsx src/components/OrgPostCard/OrgPostCard.tsx /src/components/UsersTableItem/UsersTableItem.tsx
+          ./.github/workflows/scripts/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx src/components/TagActions/TagActionsMocks.ts src/utils/interfaces.ts src/screens/MemberDetail/MemberDetail.tsx src/components/OrgPostCard/OrgPostCard.tsx src/components/UsersTableItem/UsersTableItem.tsx
 
       - name: Get changed TypeScript files
         id: changed-files
@@ -65,9 +65,7 @@ jobs:
         run: npm run check-tsdoc # Run the TSDoc check script
 
       - name: Check for localStorage Usage
-        run: |
-          chmod +x scripts/githooks/check-localstorage-usage.js
-          node scripts/githooks/check-localstorage-usage.js --scan-entire-repo
+        run: npx tsx scripts/githooks/check-localstorage-usage.ts --scan-entire-repo
 
       - name: Compare translation files
         run: |

.lintstagedrc.json

@@ -1,5 +1,5 @@
 {
   "**/*.{ts,tsx,yml}": "eslint --fix",
   "**/*.{ts,tsx,json,scss,css,yml}": "prettier --write",
-  "**/*.{ts,tsx}": "node scripts/githooks/check-localstorage-usage.js"
+  "**/*.{ts,tsx}": "npx tsx scripts/githooks/check-localstorage-usage.ts"
 }

docs/docs/auto-docs/components/LeftDrawer/LeftDrawer/functions/default.md

@@ -6,7 +6,7 @@
 
 > **default**(`__namedParameters`): `Element`
 
-Defined in: [src/components/LeftDrawer/LeftDrawer.tsx:24](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/LeftDrawer/LeftDrawer.tsx#L24)
+Defined in: [src/components/LeftDrawer/LeftDrawer.tsx:25](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/LeftDrawer/LeftDrawer.tsx#L25)
 
 LeftDrawer component for displaying navigation options.
 

docs/docs/auto-docs/components/LeftDrawer/LeftDrawer/interfaces/InterfaceLeftDrawerProps.md

@@ -4,20 +4,20 @@
 
 # Interface: InterfaceLeftDrawerProps
 
-Defined in: [src/components/LeftDrawer/LeftDrawer.tsx:12](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/LeftDrawer/LeftDrawer.tsx#L12)
+Defined in: [src/components/LeftDrawer/LeftDrawer.tsx:13](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/LeftDrawer/LeftDrawer.tsx#L13)
 
 ## Properties
 
 ### hideDrawer
 
 > **hideDrawer**: `boolean`
 
-Defined in: [src/components/LeftDrawer/LeftDrawer.tsx:13](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/LeftDrawer/LeftDrawer.tsx#L13)
+Defined in: [src/components/LeftDrawer/LeftDrawer.tsx:14](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/LeftDrawer/LeftDrawer.tsx#L14)
 
 ***
 
 ### setHideDrawer
 
 > **setHideDrawer**: `Dispatch`\<`SetStateAction`\<`boolean`\>\>
 
-Defined in: [src/components/LeftDrawer/LeftDrawer.tsx:14](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/LeftDrawer/LeftDrawer.tsx#L14)
+Defined in: [src/components/LeftDrawer/LeftDrawer.tsx:15](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/LeftDrawer/LeftDrawer.tsx#L15)

docs/docs/auto-docs/components/SuperAdminScreen/SuperAdminScreen/functions/default.md

@@ -6,7 +6,7 @@
 
 > **default**(): `Element`
 
-Defined in: [src/components/SuperAdminScreen/SuperAdminScreen.tsx:15](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/SuperAdminScreen/SuperAdminScreen.tsx#L15)
+Defined in: [src/components/SuperAdminScreen/SuperAdminScreen.tsx:14](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/SuperAdminScreen/SuperAdminScreen.tsx#L14)
 
 The SuperAdminScreen component manages the layout for the Super Admin screen,
 including handling the sidebar visibility and page title based on the current route.

docs/docs/auto-docs/components/UserPortal/CreateDirectChat/CreateDirectChat/functions/default.md

@@ -6,7 +6,7 @@
 
 > **default**(`__namedParameters`): `JSX.Element`
 
-Defined in: [src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx:60](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx#L60)
+Defined in: [src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx:136](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx#L136)
 
 ## Parameters
 

docs/docs/auto-docs/components/UserPortal/CreateDirectChat/CreateDirectChat/functions/handleCreateDirectChat.md

@@ -0,0 +1,47 @@
+[Admin Docs](/)
+
+***
+
+# Function: handleCreateDirectChat()
+
+> **handleCreateDirectChat**(`id`, `chats`, `t`, `createChat`, `organizationId`, `userId`, `chatsListRefetch`, `toggleCreateDirectChatModal`): `Promise`\<`void`\>
+
+Defined in: [src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx:70](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/CreateDirectChat/CreateDirectChat.tsx#L70)
+
+## Parameters
+
+### id
+
+`string`
+
+### chats
+
+[`Chat`](../../../../../screens/UserPortal/Chat/Chat/type-aliases/Chat.md)[]
+
+### t
+
+`TFunction`\<`"userChat"`\>
+
+### createChat
+
+(`options`?) => `Promise`\<`FetchResult`\<`unknown`\>\>(`arg0`) => `unknown`
+
+### organizationId
+
+`string`
+
+### userId
+
+`string`
+
+### chatsListRefetch
+
+(`variables`?) => `Promise`\<`ApolloQueryResult`\<`unknown`\>\>() => `Promise`\<`ApolloQueryResult`\<`unknown`\>\>
+
+### toggleCreateDirectChatModal
+
+() => `void`() => `void`
+
+## Returns
+
+`Promise`\<`void`\>

docs/docs/auto-docs/components/UserPortal/UserSidebar/UserSidebar/functions/default.md

@@ -6,7 +6,7 @@
 
 > **default**(`__namedParameters`): `Element`
 
-Defined in: [src/components/UserPortal/UserSidebar/UserSidebar.tsx:28](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/UserSidebar/UserSidebar.tsx#L28)
+Defined in: [src/components/UserPortal/UserSidebar/UserSidebar.tsx:29](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/UserSidebar/UserSidebar.tsx#L29)
 
 Sidebar component for user navigation, including links to organizations and settings.
 

docs/docs/auto-docs/components/UserPortal/UserSidebar/UserSidebar/interfaces/InterfaceUserSidebarProps.md

@@ -4,20 +4,20 @@
 
 # Interface: InterfaceUserSidebarProps
 
-Defined in: [src/components/UserPortal/UserSidebar/UserSidebar.tsx:10](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/UserSidebar/UserSidebar.tsx#L10)
+Defined in: [src/components/UserPortal/UserSidebar/UserSidebar.tsx:11](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/UserSidebar/UserSidebar.tsx#L11)
 
 ## Properties
 
 ### hideDrawer
 
 > **hideDrawer**: `boolean`
 
-Defined in: [src/components/UserPortal/UserSidebar/UserSidebar.tsx:11](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/UserSidebar/UserSidebar.tsx#L11)
+Defined in: [src/components/UserPortal/UserSidebar/UserSidebar.tsx:12](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/UserSidebar/UserSidebar.tsx#L12)
 
 ***
 
 ### setHideDrawer
 
 > **setHideDrawer**: `Dispatch`\<`SetStateAction`\<`boolean`\>\>
 
-Defined in: [src/components/UserPortal/UserSidebar/UserSidebar.tsx:12](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/UserSidebar/UserSidebar.tsx#L12)
+Defined in: [src/components/UserPortal/UserSidebar/UserSidebar.tsx:13](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/components/UserPortal/UserSidebar/UserSidebar.tsx#L13)

docs/docs/auto-docs/screens/UserPortal/Chat/Chat/type-aliases/Chat.md

@@ -0,0 +1,39 @@
+[Admin Docs](/)
+
+***
+
+# Type Alias: Chat
+
+> **Chat**: `object`
+
+Defined in: [src/screens/UserPortal/Chat/Chat.tsx:87](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Chat/Chat.tsx#L87)
+
+## Type declaration
+
+### \_id
+
+> **\_id**: `string`
+
+### image
+
+> **image**: `string`
+
+### isGroup
+
+> **isGroup**: `boolean`
+
+### messages
+
+> **messages**: `DirectMessage`[]
+
+### name
+
+> **name**: `string`
+
+### unseenMessagesByUsers
+
+> **unseenMessagesByUsers**: `string`
+
+### users
+
+> **users**: `object`[]

docs/docs/auto-docs/screens/UserPortal/Organizations/Organizations/functions/default.md

@@ -6,7 +6,7 @@
 
 > **default**(): `JSX.Element`
 
-Defined in: [src/screens/UserPortal/Organizations/Organizations.tsx:78](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Organizations/Organizations.tsx#L78)
+Defined in: [src/screens/UserPortal/Organizations/Organizations.tsx:77](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/UserPortal/Organizations/Organizations.tsx#L77)
 
 Component for displaying and managing user organizations.
 

package.json

@@ -90,7 +90,7 @@
     "update:toc": "node scripts/githooks/update-toc.js",
     "lint-staged": "lint-staged --concurrent false",
     "setup": "tsx setup.ts",
-    "check-localstorage": "node scripts/githooks/check-localstorage-usage.js",
+    "check-localstorage": "tsx scripts/githooks/check-localstorage-usage.ts",
     "postgenerate-docs": "find docs/docs/auto-docs -name 'README.md' -delete && node fix-repo-url.js",
     "generate-docs": "typedoc && npm run postgenerate-docs && node fix-readme-links.js"
   },

scripts/githooks/check-localstorage-usage.js → scripts/githooks/check-localstorage-usage.ts

@@ -3,44 +3,49 @@
 import { readFileSync, existsSync } from 'fs';
 import path from 'path';
 import { execSync } from 'child_process';
+import type { ExecSyncOptionsWithStringEncoding } from 'child_process';
 
-const args = process.argv.slice(2);
-const scanEntireRepo = args.includes('--scan-entire-repo');
+const args: string[] = process.argv.slice(2);
+const scanEntireRepo: boolean = args.includes('--scan-entire-repo');
 
-const containsSkipComment = (file) => {
+const containsSkipComment = (file: string): boolean => {
   try {
     const content = readFileSync(file, 'utf-8');
     return content.includes('// SKIP_LOCALSTORAGE_CHECK');
   } catch (error) {
-    console.error(`Error reading file ${file}:`, error.message);
+    console.error(
+      `Error reading file ${file}:`,
+      error instanceof Error ? error.message : error,
+    );
     return false;
   }
 };
 
-const getModifiedFiles = () => {
+const getModifiedFiles = (): string[] => {
   try {
+    const options: ExecSyncOptionsWithStringEncoding = { encoding: 'utf-8' };
+
     if (scanEntireRepo) {
-      const result = execSync('git ls-files | grep ".tsx\\?$"', {
-        encoding: 'utf-8',
-      });
+      const result = execSync('git ls-files | grep ".tsx\\?$"', options);
       return result.trim().split('\n');
     }
 
-    const result = execSync('git diff --cached --name-only', {
-      encoding: 'utf-8',
-    });
+    const result = execSync('git diff --cached --name-only', options);
     return result.trim().split('\n');
   } catch (error) {
-    console.error('Error fetching modified files:', error.message);
+    console.error(
+      'Error fetching modified files:',
+      error instanceof Error ? error.message : error,
+    );
     process.exit(1);
   }
+  return [];
 };
 
-const files = getModifiedFiles();
-
-const filesWithLocalStorage = [];
+const files: string[] = getModifiedFiles();
+const filesWithLocalStorage: string[] = [];
 
-const checkLocalStorageUsage = (file) => {
+const checkLocalStorageUsage = (file: string): void => {
   if (!file) {
     return;
   }
@@ -49,7 +54,7 @@ const checkLocalStorageUsage = (file) => {
 
   // Skip files with specific names or containing a skip comment
   if (
-    fileName === 'check-localstorage-usage.js' ||
+    fileName === 'check-localstorage-usage.ts' || // Updated extension
     fileName === 'useLocalstorage.test.ts' ||
     fileName === 'useLocalstorage.ts' ||
     containsSkipComment(file)
@@ -73,7 +78,10 @@ const checkLocalStorageUsage = (file) => {
       console.log(`File ${file} does not exist.`);
     }
   } catch (error) {
-    console.error(`Error reading file ${file}:`, error.message);
+    console.error(
+      `Error reading file ${file}:`,
+      error instanceof Error ? error.message : error,
+    );
   }
 };
 
@@ -86,10 +94,10 @@ if (filesWithLocalStorage.length > 0) {
 
   console.info(
     '\x1b[34m%s\x1b[0m',
-    '\nInfo: Consider using custom hook functions.'
+    '\nInfo: Consider using custom hook functions.',
   );
   console.info(
-    'Please use the getItem, setItem, and removeItem functions provided by the custom hook useLocalStorage.\n'
+    'Please use the getItem, setItem, and removeItem functions provided by the custom hook useLocalStorage.\n',
   );
 
   process.exit(1);

src/components/LeftDrawer/LeftDrawer.spec.tsx

@@ -93,13 +93,9 @@ describe('Testing Left Drawer component for SUPERADMIN', () => {
       orgsBtn.click();
     });
 
-    expect(
-      orgsBtn.className.includes('text-black btn btn-success'),
-    ).toBeTruthy();
-    expect(rolesBtn.className.includes('text-secondary btn')).toBeTruthy();
-    expect(
-      communityProfileBtn.className.includes('text-secondary btn'),
-    ).toBeTruthy();
+    expect(orgsBtn.className.includes('btn btn-success')).toBeTruthy();
+    expect(rolesBtn.className.includes('btn')).toBeTruthy();
+    expect(communityProfileBtn.className.includes('btn')).toBeTruthy();
 
     await act(async () => {
       userEvent.click(rolesBtn);
@@ -171,14 +167,6 @@ describe('Testing Left Drawer component for SUPERADMIN', () => {
 
     expect(screen.getByText('My Organizations')).toBeInTheDocument();
     expect(screen.getByText('Talawa Admin Portal')).toBeInTheDocument();
-
-    const orgsBtn = screen.getByTestId(/orgsBtn/i);
-
-    await act(async () => {
-      orgsBtn.click();
-    });
-
-    expect(orgsBtn.className.includes('text-black')).toBeTruthy();
   });
 });
 
@@ -207,9 +195,7 @@ describe('Testing Left Drawer component for ADMIN', () => {
       orgsBtn.click();
     });
 
-    expect(
-      orgsBtn.className.includes('text-black btn btn-success'),
-    ).toBeTruthy();
+    expect(orgsBtn.className.includes('btn btn-success')).toBeTruthy();
 
     // These screens aren't meant for admins, so they should not be present
     expect(screen.queryByTestId(/rolesBtn/i)).toBeNull();