+
+ );
+ }
+
+ const columns: GridColDef[] = [
+ {
+ field: 'id',
+ headerName: '#',
+ minWidth: 100,
+ align: 'center',
+ headerAlign: 'center',
+ headerClassName: `${styles.tableHeader}`,
+ sortable: false,
+ renderCell: (params: GridCellParams) => {
+ return
+
+ {t('errorOccurredWhileLoadingMembers')}
+
+
+
+ {t('errorOccurredWhileLoadingMembers')}
+
+ {userTagsMembersToAssignToError.message}
+
+ {params.row.id}
;
+ },
+ },
+ {
+ field: 'userName',
+ headerName: t('userName'),
+ flex: 2,
+ minWidth: 100,
+ sortable: false,
+ headerClassName: `${styles.tableHeader}`,
+ renderCell: (params: GridCellParams) => {
+ return (
+
+ {params.row.firstName + ' ' + params.row.lastName}
+
+ );
+ },
+ },
+ {
+ field: 'actions',
+ headerName: t('actions'),
+ flex: 1,
+ align: 'center',
+ minWidth: 100,
+ headerAlign: 'center',
+ sortable: false,
+ headerClassName: `${styles.tableHeader}`,
+ renderCell: (params: GridCellParams) => {
+ const isToBeAssigned = assignToMembers.some(
+ (member) => member._id === params.row._id,
+ );
+
+ return (
+
+ );
+ },
+ },
+ ];
+
+ return (
+ <>
+
diff --git a/src/components/CheckIn/TableRow.test.tsx b/src/components/CheckIn/TableRow.test.tsx
index 9a206047d0..14c3d20c29 100644
--- a/src/components/CheckIn/TableRow.test.tsx
+++ b/src/components/CheckIn/TableRow.test.tsx
@@ -13,7 +13,11 @@ import { MockedProvider } from '@apollo/react-testing';
import { checkInMutationSuccess, checkInMutationUnsuccess } from './mocks';
describe('Testing Table Row for CheckIn Table', () => {
- test('If the user in not checked in, button to check in should be displayed, and the user should be able to check in succesfully', async () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
+ test('If the user is not checked in, button to check in should be displayed, and the user should be able to check in successfully', async () => {
const props = {
data: {
id: `123`,
@@ -25,7 +29,7 @@ describe('Testing Table Row for CheckIn Table', () => {
refetch: jest.fn(),
};
- const { queryByText } = render(
+ const { findByText } = render(
@@ -40,31 +44,29 @@ describe('Testing Table Row for CheckIn Table', () => {
,
);
- await waitFor(() => expect(queryByText('Check In')).toBeInTheDocument());
+ expect(await findByText('Check In')).toBeInTheDocument();
- fireEvent.click(queryByText('Check In') as Element);
+ fireEvent.click(await findByText('Check In'));
- await waitFor(() =>
- expect(queryByText('Checked in successfully')).toBeInTheDocument(),
- );
+ expect(await findByText('Checked in successfully')).toBeInTheDocument();
});
- test('If the user in checked in, option to download tag should be shown', async () => {
+ test('If the user is checked in, the option to download tag should be shown', async () => {
const props = {
data: {
- id: `123`,
- name: `John Doe`,
- userId: `user123`,
+ id: '123',
+ name: 'John Doe',
+ userId: 'user123',
checkIn: {
_id: '123',
time: '12:00:00',
},
- eventId: `event123`,
+ eventId: 'event123',
},
refetch: jest.fn(),
};
- const { queryByText } = render(
+ const { findByText } = render(
@@ -79,26 +81,22 @@ describe('Testing Table Row for CheckIn Table', () => {
,
);
- // Stubbing functions required by the @pdfme to show pdfs
- global.URL.createObjectURL = jest.fn();
+ global.URL.createObjectURL = jest.fn(() => 'mockURL');
global.window.open = jest.fn();
- await waitFor(() => expect(queryByText('Checked In')).toBeInTheDocument());
- await waitFor(() =>
- expect(queryByText('Download Tag')).toBeInTheDocument(),
- );
+ expect(await findByText('Checked In')).toBeInTheDocument();
+ expect(await findByText('Download Tag')).toBeInTheDocument();
- fireEvent.click(queryByText('Download Tag') as Element);
+ fireEvent.click(await findByText('Download Tag'));
- await waitFor(() =>
- expect(queryByText('Generating pdf...')).toBeInTheDocument(),
- );
- await waitFor(() => {
- expect(queryByText('PDF generated successfully!')).toBeInTheDocument();
- });
+ expect(await findByText('Generating pdf...')).toBeInTheDocument();
+ expect(await findByText('PDF generated successfully!')).toBeInTheDocument();
+
+ // Cleanup mocks
+ jest.clearAllMocks();
});
- test('Upon failing of check in mutation, the appropiate error message should be shown', async () => {
+ test('Upon failing of check in mutation, the appropriate error message should be shown', async () => {
const props = {
data: {
id: `123`,
@@ -110,7 +108,7 @@ describe('Testing Table Row for CheckIn Table', () => {
refetch: jest.fn(),
};
- const { queryByText } = render(
+ const { findByText } = render(
@@ -125,13 +123,11 @@ describe('Testing Table Row for CheckIn Table', () => {
,
);
- await waitFor(() => expect(queryByText('Check In')).toBeInTheDocument());
+ expect(await findByText('Check In')).toBeInTheDocument();
- fireEvent.click(queryByText('Check In') as Element);
+ fireEvent.click(await findByText('Check In'));
- await waitFor(() =>
- expect(queryByText('Error checking in')).toBeInTheDocument(),
- );
- await waitFor(() => expect(queryByText('Oops')).toBeInTheDocument());
+ expect(await findByText('Error checking in')).toBeInTheDocument();
+ expect(await findByText('Oops')).toBeInTheDocument();
});
});
diff --git a/src/components/CheckIn/TableRow.tsx b/src/components/CheckIn/TableRow.tsx
index b7b5318f84..38d1dda912 100644
--- a/src/components/CheckIn/TableRow.tsx
+++ b/src/components/CheckIn/TableRow.tsx
@@ -7,7 +7,6 @@ import { toast } from 'react-toastify';
import { generate } from '@pdfme/generator';
import { tagTemplate } from './tagTemplate';
import { useTranslation } from 'react-i18next';
-
/**
* Component that represents a single row in the check-in table.
* Allows users to mark themselves as checked in and download a tag if they are already checked in.
@@ -48,7 +47,6 @@ export const TableRow = ({
toast.error(err.message);
});
};
-
/**
* Triggers a notification while generating and downloading a PDF tag.
*
@@ -67,10 +65,22 @@ export const TableRow = ({
* @returns A promise that resolves when the PDF is successfully generated and opened.
*/
const generateTag = async (): Promise => {
- const inputs = [{ name: data.name }];
- const pdf = await generate({ template: tagTemplate, inputs });
- const blob = new Blob([pdf.buffer], { type: 'application/pdf' });
- window.open(URL.createObjectURL(blob));
+ try {
+ const inputs = [{ name: data.name }];
+ const pdf = await generate({ template: tagTemplate, inputs });
+ // istanbul ignore next
+ const blob = new Blob([pdf.buffer], { type: 'application/pdf' });
+ // istanbul ignore next
+ const url = URL.createObjectURL(blob);
+ // istanbul ignore next
+ window.open(url);
+ // istanbul ignore next
+ toast.success('PDF generated successfully!');
+ } catch (error: unknown) {
+ const errorMessage =
+ error instanceof Error ? error.message : 'Unknown error';
+ toast.error(`Error generating pdf: ${errorMessage}`);
+ }
};
return (
diff --git a/src/components/CheckIn/tagTemplate.ts b/src/components/CheckIn/tagTemplate.ts
index 0af9eeeb15..4aa4475e02 100644
--- a/src/components/CheckIn/tagTemplate.ts
+++ b/src/components/CheckIn/tagTemplate.ts
@@ -1,4 +1,4 @@
-import { Template } from '@pdfme/generator';
+import { Template } from '@pdfme/common';
export const tagTemplate: Template = {
schemas: [
diff --git a/src/components/EventDashboardScreen/EventDashboardScreen.tsx b/src/components/EventDashboardScreen/EventDashboardScreen.tsx
index a200e530e7..11b9ec936f 100644
--- a/src/components/EventDashboardScreen/EventDashboardScreen.tsx
+++ b/src/components/EventDashboardScreen/EventDashboardScreen.tsx
@@ -1,9 +1,10 @@
import LeftDrawerOrg from 'components/LeftDrawerOrg/LeftDrawerOrg';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
import { Navigate, Outlet, useLocation, useParams } from 'react-router-dom';
import { updateTargets } from 'state/action-creators';
+import { useAppDispatch } from 'state/hooks';
import type { RootState } from 'state/reducers';
import type { TargetsType } from 'state/reducers/routesReducer';
import styles from './EventDashboardScreen.module.css';
@@ -58,7 +59,7 @@ const EventDashboardScreen = (): JSX.Element => {
} = useSelector((state: RootState) => state.appRoutes);
const { targets } = appRoutes;
- const dispatch = useDispatch();
+ const dispatch = useAppDispatch();
// Update targets when orgId changes
useEffect(() => {
diff --git a/src/components/IconComponent/IconComponent.tsx b/src/components/IconComponent/IconComponent.tsx
index ec058a2e80..4708dc7966 100644
--- a/src/components/IconComponent/IconComponent.tsx
+++ b/src/components/IconComponent/IconComponent.tsx
@@ -3,22 +3,22 @@ import {
ContactPageOutlined,
NewspaperOutlined,
} from '@mui/icons-material';
-import { ReactComponent as ActionItemIcon } from 'assets/svgs/actionItem.svg';
-import { ReactComponent as BlockUserIcon } from 'assets/svgs/blockUser.svg';
-import { ReactComponent as CheckInRegistrantsIcon } from 'assets/svgs/checkInRegistrants.svg';
-import { ReactComponent as DashboardIcon } from 'assets/svgs/dashboard.svg';
-import { ReactComponent as EventsIcon } from 'assets/svgs/events.svg';
-import { ReactComponent as FundsIcon } from 'assets/svgs/funds.svg';
-import { ReactComponent as ListEventRegistrantsIcon } from 'assets/svgs/listEventRegistrants.svg';
-import { ReactComponent as OrganizationsIcon } from 'assets/svgs/organizations.svg';
-import { ReactComponent as PeopleIcon } from 'assets/svgs/people.svg';
-import { ReactComponent as TagsIcon } from 'assets/svgs/tags.svg';
-import { ReactComponent as TagIcon } from 'assets/svgs/tag.svg';
-import { ReactComponent as PluginsIcon } from 'assets/svgs/plugins.svg';
-import { ReactComponent as PostsIcon } from 'assets/svgs/posts.svg';
-import { ReactComponent as SettingsIcon } from 'assets/svgs/settings.svg';
-import { ReactComponent as VenueIcon } from 'assets/svgs/venues.svg';
-import { ReactComponent as RequestsIcon } from 'assets/svgs/requests.svg';
+import ActionItemIcon from 'assets/svgs/actionItem.svg?react';
+import BlockUserIcon from 'assets/svgs/blockUser.svg?react';
+import CheckInRegistrantsIcon from 'assets/svgs/checkInRegistrants.svg?react';
+import DashboardIcon from 'assets/svgs/dashboard.svg?react';
+import EventsIcon from 'assets/svgs/events.svg?react';
+import FundsIcon from 'assets/svgs/funds.svg?react';
+import ListEventRegistrantsIcon from 'assets/svgs/listEventRegistrants.svg?react';
+import OrganizationsIcon from 'assets/svgs/organizations.svg?react';
+import PeopleIcon from 'assets/svgs/people.svg?react';
+import TagsIcon from 'assets/svgs/tags.svg?react';
+import TagIcon from 'assets/svgs/tag.svg?react';
+import PluginsIcon from 'assets/svgs/plugins.svg?react';
+import PostsIcon from 'assets/svgs/posts.svg?react';
+import SettingsIcon from 'assets/svgs/settings.svg?react';
+import VenueIcon from 'assets/svgs/venues.svg?react';
+import RequestsIcon from 'assets/svgs/requests.svg?react';
import React from 'react';
diff --git a/src/components/LeftDrawer/LeftDrawer.tsx b/src/components/LeftDrawer/LeftDrawer.tsx
index 91e679b210..4628603ba1 100644
--- a/src/components/LeftDrawer/LeftDrawer.tsx
+++ b/src/components/LeftDrawer/LeftDrawer.tsx
@@ -2,10 +2,10 @@ import React from 'react';
import Button from 'react-bootstrap/Button';
import { useTranslation } from 'react-i18next';
import { NavLink } from 'react-router-dom';
-import { ReactComponent as OrganizationsIcon } from 'assets/svgs/organizations.svg';
-import { ReactComponent as RolesIcon } from 'assets/svgs/roles.svg';
-import { ReactComponent as SettingsIcon } from 'assets/svgs/settings.svg';
-import { ReactComponent as TalawaLogo } from 'assets/svgs/talawa.svg';
+import OrganizationsIcon from 'assets/svgs/organizations.svg?react';
+import RolesIcon from 'assets/svgs/roles.svg?react';
+import SettingsIcon from 'assets/svgs/settings.svg?react';
+import TalawaLogo from 'assets/svgs/talawa.svg?react';
import styles from './LeftDrawer.module.css';
import useLocalStorage from 'utils/useLocalstorage';
diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
index b75b289c31..2a0ef3815d 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx
@@ -344,8 +344,8 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
);
await wait();
resizeWindow(800);
- expect(screen.getByText(/Dashboard/i)).toBeInTheDocument();
- expect(screen.getByText(/People/i)).toBeInTheDocument();
+ expect(screen.getAllByText(/Dashboard/i)[0]).toBeInTheDocument();
+ expect(screen.getAllByText(/People/i)[0]).toBeInTheDocument();
const peopelBtn = screen.getByTestId(/People/i);
userEvent.click(peopelBtn);
diff --git a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
index b3f91aa7e8..3a3ba378cf 100644
--- a/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
+++ b/src/components/LeftDrawerOrg/LeftDrawerOrg.tsx
@@ -9,8 +9,8 @@ import { useTranslation } from 'react-i18next';
import { NavLink } from 'react-router-dom';
import type { TargetsType } from 'state/reducers/routesReducer';
import type { InterfaceQueryOrganizationsListObject } from 'utils/interfaces';
-import { ReactComponent as AngleRightIcon } from 'assets/svgs/angleRight.svg';
-import { ReactComponent as TalawaLogo } from 'assets/svgs/talawa.svg';
+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';
diff --git a/src/components/OrgListCard/OrgListCard.tsx b/src/components/OrgListCard/OrgListCard.tsx
index d1b06bafe0..10365d2364 100644
--- a/src/components/OrgListCard/OrgListCard.tsx
+++ b/src/components/OrgListCard/OrgListCard.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { ReactComponent as FlaskIcon } from 'assets/svgs/flask.svg';
+import FlaskIcon from 'assets/svgs/flask.svg?react';
import Button from 'react-bootstrap/Button';
import { useTranslation } from 'react-i18next';
import styles from './OrgListCard.module.css';
diff --git a/src/components/OrgPostCard/OrgPostCard.test.tsx b/src/components/OrgPostCard/OrgPostCard.test.tsx
index 2c1f0fd824..7105e5e8f2 100644
--- a/src/components/OrgPostCard/OrgPostCard.test.tsx
+++ b/src/components/OrgPostCard/OrgPostCard.test.tsx
@@ -113,6 +113,7 @@ describe('Testing Organization Post Card', () => {
const props = {
id: '12',
+ postID: '123',
postTitle: 'Event Info',
postInfo: 'Time change',
postAuthor: 'John Doe',
@@ -134,11 +135,25 @@ describe('Testing Organization Post Card', () => {
}));
global.alert = jest.fn();
+ test('Opens post on image click', () => {
+ const { getByTestId, getByAltText } = render(
+
+
+
+ ,
+ );
+ userEvent.click(screen.getByAltText('image'));
+
+ expect(getByTestId('card-text')).toBeInTheDocument();
+ expect(getByTestId('card-title')).toBeInTheDocument();
+ expect(getByAltText('image')).toBeInTheDocument();
+ });
test('renders with default props', () => {
const { getByAltText, getByTestId } = render(
-
,
);
@@ -146,12 +161,11 @@ describe('Testing Organization Post Card', () => {
expect(getByTestId('card-title')).toBeInTheDocument();
expect(getByAltText('image')).toBeInTheDocument();
});
-
test('toggles "Read more" button', () => {
const { getByTestId } = render(
-
,
);
@@ -168,7 +182,7 @@ describe('Testing Organization Post Card', () => {
render(
-
,
);
@@ -187,7 +201,7 @@ describe('Testing Organization Post Card', () => {
render(
-
,
);
@@ -199,7 +213,7 @@ describe('Testing Organization Post Card', () => {
const { getByTestId } = render(
-
,
);
@@ -264,11 +278,89 @@ describe('Testing Organization Post Card', () => {
{ timeout: 2500 },
);
});
+ test('Testing post updating functionality fail case', async () => {
+ const props2 = {
+ id: '',
+ postID: '123',
+ postTitle: 'Event Info',
+ postInfo: 'Time change',
+ postAuthor: 'John Doe',
+ postPhoto: 'test.png',
+ postVideo: 'test.mp4',
+ pinned: true,
+ };
+ const { getByTestId } = render(
+
+
+
+ ,
+ );
+
+ await wait();
+ userEvent.click(screen.getByAltText('image'));
+ userEvent.click(screen.getByTestId('moreiconbtn'));
+
+ userEvent.click(screen.getByTestId('editPostModalBtn'));
+ fireEvent.change(getByTestId('updateTitle'), {
+ target: { value: 'updated title' },
+ });
+ fireEvent.change(getByTestId('updateText'), {
+ target: { value: 'This is a updated text' },
+ });
+ const postVideoUrlInput = screen.queryByTestId('postVideoUrl');
+ if (postVideoUrlInput) {
+ fireEvent.change(getByTestId('postVideoUrl'), {
+ target: { value: 'This is a updated video' },
+ });
+ userEvent.click(screen.getByPlaceholderText(/video/i));
+ const input = getByTestId('postVideoUrl');
+ const file = new File(['test-video'], 'test.mp4', { type: 'video/mp4' });
+ Object.defineProperty(input, 'files', {
+ value: [file],
+ });
+ fireEvent.change(input);
+ await waitFor(() => {
+ convertToBase64(file);
+ });
+
+ userEvent.click(screen.getByTestId('closePreview'));
+ }
+ const imageUrlInput = screen.queryByTestId('postImageUrl');
+ if (imageUrlInput) {
+ fireEvent.change(getByTestId('postImageUrl'), {
+ target: { value: 'This is a updated image' },
+ });
+ userEvent.click(screen.getByPlaceholderText(/image/i));
+ const input = getByTestId('postImageUrl');
+ const file = new File(['test-image'], 'test.jpg', { type: 'image/jpeg' });
+ Object.defineProperty(input, 'files', {
+ value: [file],
+ });
+ fireEvent.change(input);
+
+ // Simulate the asynchronous base64 conversion function
+ await waitFor(() => {
+ convertToBase64(file); // Replace with the expected base64-encoded image
+ });
+ document.getElementById = jest.fn(() => input);
+ const clearImageButton = getByTestId('closeimage');
+ fireEvent.click(clearImageButton);
+ }
+ userEvent.click(screen.getByTestId('updatePostBtn'));
+
+ await waitFor(
+ () => {
+ expect(window.location.reload).toHaveBeenCalled();
+ },
+ { timeout: 2500 },
+ );
+ });
test('Testing pin post functionality', async () => {
render(
-
,
);
@@ -289,6 +381,7 @@ describe('Testing Organization Post Card', () => {
test('Testing pin post functionality fail case', async () => {
const props2 = {
id: '',
+ postID: '123',
postTitle: 'Event Info',
postInfo: 'Time change',
postAuthor: 'John Doe',
@@ -299,7 +392,7 @@ describe('Testing Organization Post Card', () => {
render(
-
,
);
@@ -315,7 +408,7 @@ describe('Testing Organization Post Card', () => {
-
,
@@ -339,6 +432,7 @@ describe('Testing Organization Post Card', () => {
test('Testing post delete functionality fail case', async () => {
const props2 = {
id: '',
+ postID: '123',
postTitle: 'Event Info',
postInfo: 'Time change',
postAuthor: 'John Doe',
@@ -350,7 +444,7 @@ describe('Testing Organization Post Card', () => {
-
,
@@ -368,7 +462,7 @@ describe('Testing Organization Post Card', () => {
render(
-
,
);
@@ -377,12 +471,15 @@ describe('Testing Organization Post Card', () => {
userEvent.click(screen.getByAltText('image'));
userEvent.click(screen.getByTestId('closeiconbtn'));
+
+ //Primary Modal is closed
+ expect(screen.queryByTestId('moreiconbtn')).not.toBeInTheDocument();
});
test('Testing close functionality of secondary modal', async () => {
render(
-
,
);
@@ -392,12 +489,30 @@ describe('Testing Organization Post Card', () => {
userEvent.click(screen.getByAltText('image'));
userEvent.click(screen.getByTestId('moreiconbtn'));
userEvent.click(screen.getByTestId('closebtn'));
+
+ //Secondary Modal is closed
+ expect(screen.queryByTestId('deletePostModalBtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('editPostModalBtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('pinpostBtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('closebtn')).not.toBeInTheDocument();
});
test('renders without "Read more" button when postInfo length is less than or equal to 43', () => {
+ render(
+
+
+
+ ,
+ );
+ expect(screen.queryByTestId('toggleBtn')).not.toBeInTheDocument();
+ });
+ test('renders with "Read more" button when postInfo length is more than 43', () => {
const props2 = {
id: '12',
+ postID: '123',
postTitle: 'Event Info',
- postInfo: 'Lorem ipsum dolor sit amet',
+ postInfo:
+ 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus lacinia odio vitae vestibulum.', // Length is greater than 43
postAuthor: 'John Doe',
postPhoto: 'photoLink',
postVideo: 'videoLink',
@@ -406,16 +521,19 @@ describe('Testing Organization Post Card', () => {
render(
-
,
);
+ userEvent.click(screen.getByAltText('image'));
+
+ expect(screen.getByTestId('toggleBtn')).toBeInTheDocument();
});
test('updates state variables correctly when handleEditModal is called', () => {
const link2 = new StaticMockLink(MOCKS, true);
render(
- ,
);
userEvent.click(screen.getByAltText('image'));
@@ -426,23 +544,48 @@ describe('Testing Organization Post Card', () => {
userEvent.click(screen.getByTestId('editPostModalBtn'));
- // expect(screen.queryByTestId('editPostModalBtn')).toBeInTheDocument();
- // expect(screen.queryByTestId('deletePostModalBtn')).not.toBeInTheDocument();
- // expect(screen.queryByTestId('closeiconbtn')).not.toBeInTheDocument();
+ //Primary Modal is closed
+ expect(screen.queryByTestId('closeiconbtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('moreiconbtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('toggleBtn')).not.toBeInTheDocument();
+
+ //Secondary Modal is closed
+ expect(screen.queryByTestId('deletePostModalBtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('editPostModalBtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('pinpostBtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('closebtn')).not.toBeInTheDocument();
+ });
+ test('updates state variables correctly when handleDeleteModal is called', () => {
+ const link2 = new StaticMockLink(MOCKS, true);
+ render(
+
+ ,
+ );
+ userEvent.click(screen.getByAltText('image'));
+
+ userEvent.click(screen.getByTestId('moreiconbtn'));
+
+ expect(screen.queryByTestId('deletePostModalBtn')).toBeInTheDocument();
+
+ userEvent.click(screen.getByTestId('deletePostModalBtn'));
- // expect(screen.getByTestId('editPostModal')).toHaveClass('show');
- // expect(screen.getByTestId('deletePostModal')).not.toHaveClass('show');
+ //Primary Modal is closed
+ expect(screen.queryByTestId('closeiconbtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('moreiconbtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('toggleBtn')).not.toBeInTheDocument();
- // expect(screen.getByTestId('modalVisible')).toBe('false');
- // expect(screen.getByTestId('menuVisible')).toBe('false');
- // expect(screen.getByTestId('showEditModal')).toBe('true');
- // expect(screen.getByTestId('showDeleteModal')).toBe('false');
+ //Secondary Modal is closed
+ expect(screen.queryByTestId('deletePostModalBtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('editPostModalBtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('pinpostBtn')).not.toBeInTheDocument();
+ expect(screen.queryByTestId('closebtn')).not.toBeInTheDocument();
});
test('clears postvideo state and resets file input value', async () => {
const { getByTestId } = render(
-
,
);
@@ -476,7 +619,7 @@ describe('Testing Organization Post Card', () => {
const { getByTestId } = render(
-
,
);
@@ -509,13 +652,63 @@ describe('Testing Organization Post Card', () => {
fireEvent.click(clearImageButton);
}
});
+ test('clears postitle state and resets file input value', async () => {
+ const { getByTestId } = render(
+
+
+
+ ,
+ );
+
+ await wait();
+
+ userEvent.click(screen.getByAltText('image'));
+ userEvent.click(screen.getByTestId('moreiconbtn'));
+ userEvent.click(screen.getByTestId('editPostModalBtn'));
+
+ fireEvent.change(getByTestId('updateTitle'), {
+ target: { value: '' },
+ });
+
+ userEvent.click(screen.getByTestId('updatePostBtn')); // Should not update post
+
+ expect(screen.getByTestId('updateTitle')).toHaveValue('');
+ expect(screen.getByTestId('closeOrganizationModal')).toBeInTheDocument();
+ expect(screen.getByTestId('updatePostBtn')).toBeInTheDocument();
+ });
+ test('clears postinfo state and resets file input value', async () => {
+ const { getByTestId } = render(
+
+
+
+ ,
+ );
+
+ await wait();
+
+ userEvent.click(screen.getByAltText('image'));
+ userEvent.click(screen.getByTestId('moreiconbtn'));
+ userEvent.click(screen.getByTestId('editPostModalBtn'));
+
+ fireEvent.change(getByTestId('updateText'), {
+ target: { value: '' },
+ });
+
+ userEvent.click(screen.getByTestId('updatePostBtn')); // Should not update post
+
+ expect(screen.getByTestId('updateText')).toHaveValue('');
+ expect(screen.getByTestId('closeOrganizationModal')).toBeInTheDocument();
+ expect(screen.getByTestId('updatePostBtn')).toBeInTheDocument();
+ });
test('Testing create organization modal', async () => {
setItem('id', '123');
render(
-
,
);
@@ -535,7 +728,7 @@ describe('Testing Organization Post Card', () => {
const { getByTestId } = render(
-
,
);
@@ -554,7 +747,7 @@ describe('Testing Organization Post Card', () => {
const { getByTestId } = render(
-
,
);
@@ -573,6 +766,7 @@ describe('Testing Organization Post Card', () => {
test('for rendering when no image and no video is available', async () => {
const props2 = {
id: '',
+ postID: '123',
postTitle: 'Event Info',
postInfo: 'Time change',
postAuthor: 'John Doe',
@@ -584,7 +778,7 @@ describe('Testing Organization Post Card', () => {
const { getByAltText } = render(
-
,
);
diff --git a/src/components/OrganizationDashCards/CardItem.tsx b/src/components/OrganizationDashCards/CardItem.tsx
index 8ad99194cf..a7cfaa0f57 100644
--- a/src/components/OrganizationDashCards/CardItem.tsx
+++ b/src/components/OrganizationDashCards/CardItem.tsx
@@ -1,9 +1,9 @@
import React from 'react';
-import { ReactComponent as EventsIcon } from 'assets/svgs/cardItemEvent.svg';
-import { ReactComponent as PostsIcon } from 'assets/svgs/post.svg';
-import { ReactComponent as MarkerIcon } from 'assets/svgs/cardItemLocation.svg';
-import { ReactComponent as DateIcon } from 'assets/svgs/cardItemDate.svg';
-import { ReactComponent as UserIcon } from 'assets/svgs/user.svg';
+import EventsIcon from 'assets/svgs/cardItemEvent.svg?react';
+import PostsIcon from 'assets/svgs/post.svg?react';
+import MarkerIcon from 'assets/svgs/cardItemLocation.svg?react';
+import DateIcon from 'assets/svgs/cardItemDate.svg?react';
+import UserIcon from 'assets/svgs/user.svg?react';
import dayjs from 'dayjs';
import styles from './CardItem.module.css';
import { PersonAddAlt1Rounded } from '@mui/icons-material';
diff --git a/src/components/OrganizationScreen/OrganizationScreen.tsx b/src/components/OrganizationScreen/OrganizationScreen.tsx
index e0781d996d..7bd2119a82 100644
--- a/src/components/OrganizationScreen/OrganizationScreen.tsx
+++ b/src/components/OrganizationScreen/OrganizationScreen.tsx
@@ -1,9 +1,10 @@
import LeftDrawerOrg from 'components/LeftDrawerOrg/LeftDrawerOrg';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
import { Navigate, Outlet, useLocation, useParams } from 'react-router-dom';
import { updateTargets } from 'state/action-creators';
+import { useAppDispatch } from 'state/hooks';
import type { RootState } from 'state/reducers';
import type { TargetsType } from 'state/reducers/routesReducer';
import styles from './OrganizationScreen.module.css';
@@ -44,7 +45,7 @@ const OrganizationScreen = (): JSX.Element => {
} = useSelector((state: RootState) => state.appRoutes);
const { targets } = appRoutes;
- const dispatch = useDispatch();
+ const dispatch = useAppDispatch();
// Update targets whenever the organization ID changes
useEffect(() => {
diff --git a/src/components/PaginationList/PaginationList.tsx b/src/components/PaginationList/PaginationList.tsx
index ca02db3b4c..430e8ba1aa 100644
--- a/src/components/PaginationList/PaginationList.tsx
+++ b/src/components/PaginationList/PaginationList.tsx
@@ -67,7 +67,6 @@ const PaginationList = ({
({
@@ -104,13 +118,16 @@ describe('ProfileDropdown Component', () => {
,
);
+
await act(async () => {
userEvent.click(screen.getByTestId('togDrop'));
});
userEvent.click(screen.getByTestId('logoutBtn'));
+
expect(global.window.location.pathname).toBe('/');
});
+
describe('Member screen routing testing', () => {
test('member screen', async () => {
render(
diff --git a/src/components/ProfileDropdown/ProfileDropdown.tsx b/src/components/ProfileDropdown/ProfileDropdown.tsx
index 27fb6951c7..059e5b910a 100644
--- a/src/components/ProfileDropdown/ProfileDropdown.tsx
+++ b/src/components/ProfileDropdown/ProfileDropdown.tsx
@@ -7,6 +7,7 @@ import styles from './ProfileDropdown.module.css';
import { REVOKE_REFRESH_TOKEN } from 'GraphQl/Mutations/mutations';
import { useMutation } from '@apollo/client';
import { useTranslation } from 'react-i18next';
+import useSession from 'utils/useSession';
/**
* Renders a profile dropdown menu for the user.
@@ -21,6 +22,7 @@ import { useTranslation } from 'react-i18next';
* @returns JSX.Element - The profile dropdown menu.
*/
const profileDropdown = (): JSX.Element => {
+ const { endSession } = useSession();
const { t: tCommon } = useTranslation('common');
const [revokeRefreshToken] = useMutation(REVOKE_REFRESH_TOKEN);
const { getItem } = useLocalStorage();
@@ -45,6 +47,7 @@ const profileDropdown = (): JSX.Element => {
console.error('Error revoking refresh token:', error);
}
localStorage.clear();
+ endSession();
navigate('/');
};
const MAX_NAME_LENGTH = 20;
diff --git a/src/components/TagActions/TagActions.module.css b/src/components/TagActions/TagActions.module.css
new file mode 100644
index 0000000000..e667adb96e
--- /dev/null
+++ b/src/components/TagActions/TagActions.module.css
@@ -0,0 +1,174 @@
+.btnsContainer {
+ display: flex;
+ margin: 2rem 0;
+}
+
+.btnsContainer .btnsBlock {
+ display: flex;
+ width: max-content;
+}
+
+.btnsContainer .btnsBlock button {
+ margin-left: 1rem;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.btnsContainer .input {
+ flex: 1;
+ position: relative;
+ max-width: 60%;
+ justify-content: space-between;
+}
+
+.btnsContainer input {
+ outline: 1px solid var(--bs-gray-400);
+}
+
+.btnsContainer .input button {
+ width: 52px;
+}
+
+@media (max-width: 1020px) {
+ .btnsContainer {
+ flex-direction: column;
+ margin: 1.5rem 0;
+ }
+
+ .btnsContainer .btnsBlock {
+ margin: 1.5rem 0 0 0;
+ justify-content: space-between;
+ }
+
+ .btnsContainer .btnsBlock button {
+ margin: 0;
+ }
+
+ .btnsContainer .btnsBlock div button {
+ margin-right: 1.5rem;
+ }
+}
+
+/* For mobile devices */
+
+@media (max-width: 520px) {
+ .btnsContainer {
+ margin-bottom: 0;
+ }
+
+ .btnsContainer .btnsBlock {
+ display: block;
+ margin-top: 1rem;
+ margin-right: 0;
+ }
+
+ .btnsContainer .btnsBlock div {
+ flex: 1;
+ }
+
+ .btnsContainer .btnsBlock div[title='Sort organizations'] {
+ margin-right: 0.5rem;
+ }
+
+ .btnsContainer .btnsBlock button {
+ margin-bottom: 1rem;
+ margin-right: 0;
+ width: 100%;
+ }
+}
+
+.errorContainer {
+ min-height: 100vh;
+}
+
+.errorMessage {
+ margin-top: 25%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
+}
+
+.errorIcon {
+ transform: scale(1.5);
+ color: var(--bs-danger);
+ margin-bottom: 1rem;
+}
+
+.tableHeader {
+ background-color: var(--bs-primary);
+ color: var(--bs-white);
+ font-size: 1rem;
+}
+
+.rowBackground {
+ background-color: var(--bs-white);
+ max-height: 120px;
+}
+
+.tagsBreadCrumbs {
+ color: var(--bs-gray);
+ cursor: pointer;
+}
+
+.tagsBreadCrumbs:hover {
+ color: var(--bs-blue);
+ font-weight: 600;
+ text-decoration: underline;
+}
+
+.scrollContainer {
+ max-height: 100px; /* Adjust as needed */
+ overflow-y: auto;
+ margin-bottom: 1rem;
+}
+
+.tagBadge {
+ display: flex;
+ align-items: center;
+ padding: 5px 10px;
+ border-radius: 12px;
+ background-color: #f8f9fa; /* Light background */
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+ max-width: calc(100% - 30px); /* Ensure it fits within the container */
+}
+
+.removeFilterIcon {
+ cursor: pointer;
+}
+
+.scrContainer {
+ max-height: 300px;
+ overflow: scroll;
+ /* padding-right: 8px; */
+}
+
+.allTagsHeading {
+ color: rgb(77, 76, 76);
+ font-weight: 600;
+}
+
+/* SimpleLoader.css */
+.simpleLoader {
+ display: flex;
+ justify-content: start;
+ align-items: center;
+ width: 100%;
+ height: 100%;
+}
+
+.spinner {
+ width: 40px;
+ height: 40px;
+ border: 4px solid var(--bs-gray);
+ border-top-color: var(--bs-gray);
+ border-radius: 50%;
+ animation: spin 0.6s linear infinite;
+}
+
+@keyframes spin {
+ to {
+ transform: rotate(360deg);
+ }
+}
diff --git a/src/components/TagActions/TagActions.test.tsx b/src/components/TagActions/TagActions.test.tsx
new file mode 100644
index 0000000000..39e287395b
--- /dev/null
+++ b/src/components/TagActions/TagActions.test.tsx
@@ -0,0 +1,320 @@
+import React from 'react';
+import { MockedProvider } from '@apollo/react-testing';
+import type { RenderResult } from '@testing-library/react';
+import {
+ render,
+ screen,
+ fireEvent,
+ cleanup,
+ waitFor,
+ act,
+} from '@testing-library/react';
+import { Provider } from 'react-redux';
+import { MemoryRouter, Route, Routes } from 'react-router-dom';
+import 'jest-location-mock';
+import { I18nextProvider } from 'react-i18next';
+
+import { store } from 'state/store';
+import userEvent from '@testing-library/user-event';
+import { StaticMockLink } from 'utils/StaticMockLink';
+import { toast } from 'react-toastify';
+import type { ApolloLink } from '@apollo/client';
+import type { InterfaceTagActionsProps } from './TagActions';
+import TagActions from './TagActions';
+import i18n from 'utils/i18nForTest';
+import {
+ MOCKS,
+ MOCKS_ERROR_ORGANIZATION_TAGS_QUERY,
+ MOCKS_ERROR_SUBTAGS_QUERY,
+} from './TagActionsMocks';
+
+const link = new StaticMockLink(MOCKS, true);
+const link2 = new StaticMockLink(MOCKS_ERROR_ORGANIZATION_TAGS_QUERY, true);
+const link3 = new StaticMockLink(MOCKS_ERROR_SUBTAGS_QUERY, true);
+
+async function wait(ms = 500): Promise {
+ await act(() => {
+ return new Promise((resolve) => {
+ setTimeout(resolve, ms);
+ });
+ });
+}
+
+jest.mock('react-toastify', () => ({
+ toast: {
+ success: jest.fn(),
+ error: jest.fn(),
+ },
+}));
+
+const translations = {
+ ...JSON.parse(
+ JSON.stringify(i18n.getDataByLanguage('en')?.translation.manageTag ?? {}),
+ ),
+ ...JSON.parse(JSON.stringify(i18n.getDataByLanguage('en')?.common ?? {})),
+ ...JSON.parse(JSON.stringify(i18n.getDataByLanguage('en')?.errors ?? {})),
+};
+
+const props: InterfaceTagActionsProps[] = [
+ {
+ assignToTagsModalIsOpen: true,
+ hideAssignToTagsModal: () => {},
+ tagActionType: 'assignToTags',
+ t: (key: string) => translations[key],
+ tCommon: (key: string) => translations[key],
+ },
+ {
+ assignToTagsModalIsOpen: true,
+ hideAssignToTagsModal: () => {},
+ tagActionType: 'removeFromTags',
+ t: (key: string) => translations[key],
+ tCommon: (key: string) => translations[key],
+ },
+];
+
+const renderTagActionsModal = (
+ props: InterfaceTagActionsProps,
+ link: ApolloLink,
+): RenderResult => {
+ return render(
+
+
+
+
+
+
+
+
+
+ ,
+ );
+};
+
+describe('Organisation Tags Page', () => {
+ beforeEach(() => {
+ jest.mock('react-router-dom', () => ({
+ ...jest.requireActual('react-router-dom'),
+ useParams: () => ({ orgId: 'orgId' }),
+ }));
+ });
+
+ afterEach(() => {
+ jest.clearAllMocks();
+ cleanup();
+ });
+
+ test('Component loads correctly and opens assignToTags modal', async () => {
+ const { getByText } = renderTagActionsModal(props[0], link);
+
+ await wait();
+
+ await waitFor(() => {
+ expect(getByText(translations.assign)).toBeInTheDocument();
+ });
+ });
+
+ test('Component loads correctly and opens removeFromTags modal', async () => {
+ const { getByText } = renderTagActionsModal(props[1], link);
+
+ await wait();
+
+ await waitFor(() => {
+ expect(getByText(translations.remove)).toBeInTheDocument();
+ });
+ });
+
+ test('Renders error component when when query is unsuccessful', async () => {
+ const { queryByText } = renderTagActionsModal(props[0], link2);
+
+ await wait();
+
+ await waitFor(() => {
+ expect(queryByText(translations.assign)).not.toBeInTheDocument();
+ });
+ });
+
+ test('Renders error component when when subTags query is unsuccessful', async () => {
+ const { getByText } = renderTagActionsModal(props[0], link3);
+
+ await wait();
+
+ // expand tag 1 to list its subtags
+ await waitFor(() => {
+ expect(screen.getByTestId('expandSubTags1')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('expandSubTags1'));
+
+ await waitFor(() => {
+ expect(
+ getByText(translations.errorOccurredWhileLoadingSubTags),
+ ).toBeInTheDocument();
+ });
+ });
+
+ test('Renders more members with infinite scroll', async () => {
+ const { getByText } = renderTagActionsModal(props[0], link);
+
+ await wait();
+
+ await waitFor(() => {
+ expect(getByText(translations.assign)).toBeInTheDocument();
+ });
+
+ // Find the infinite scroll div by test ID or another selector
+ const scrollableDiv = screen.getByTestId('scrollableDiv');
+
+ const initialTagsDataLength = screen.getAllByTestId('orgUserTag').length;
+
+ // Set scroll position to the bottom
+ fireEvent.scroll(scrollableDiv, {
+ target: { scrollY: scrollableDiv.scrollHeight },
+ });
+
+ await waitFor(() => {
+ const finalTagsDataLength = screen.getAllByTestId('orgUserTag').length;
+ expect(finalTagsDataLength).toBeGreaterThan(initialTagsDataLength);
+
+ expect(getByText(translations.assign)).toBeInTheDocument();
+ });
+ });
+
+ test('Selects and deselects tags', async () => {
+ renderTagActionsModal(props[0], link);
+
+ await wait();
+
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTag1')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTag1'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTag2')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTag2'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTag1')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTag1'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('clearSelectedTag2')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('clearSelectedTag2'));
+ });
+
+ test('fetches and lists the child tags and then selects and deselects them', async () => {
+ renderTagActionsModal(props[0], link);
+
+ await wait();
+
+ // expand tag 1 to list its subtags
+ await waitFor(() => {
+ expect(screen.getByTestId('expandSubTags1')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('expandSubTags1'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('subTagsScrollableDiv1')).toBeInTheDocument();
+ });
+ // Find the infinite scroll div for subtags by test ID or another selector
+ const subTagsScrollableDiv1 = screen.getByTestId('subTagsScrollableDiv1');
+
+ const initialTagsDataLength =
+ screen.getAllByTestId('orgUserSubTags').length;
+
+ // Set scroll position to the bottom
+ fireEvent.scroll(subTagsScrollableDiv1, {
+ target: { scrollY: subTagsScrollableDiv1.scrollHeight },
+ });
+
+ await waitFor(() => {
+ const finalTagsDataLength =
+ screen.getAllByTestId('orgUserSubTags').length;
+ expect(finalTagsDataLength).toBeGreaterThan(initialTagsDataLength);
+ });
+
+ // select subtags 1 & 2
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTagsubTag1')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTagsubTag1'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTagsubTag2')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTagsubTag2'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTag1')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTag1'));
+
+ // deselect subtags 1 & 2
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTagsubTag1')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTagsubTag1'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTagsubTag2')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTagsubTag2'));
+
+ // hide subtags of tag 1
+ await waitFor(() => {
+ expect(screen.getByTestId('expandSubTags1')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('expandSubTags1'));
+ });
+
+ test('Successfully assigns to tags', async () => {
+ renderTagActionsModal(props[0], link);
+
+ await wait();
+
+ // select userTags 2 & 3 and assign them
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTag2')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTag2'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTag3')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTag3'));
+
+ userEvent.click(screen.getByTestId('tagActionSubmitBtn'));
+
+ await waitFor(() => {
+ expect(toast.success).toHaveBeenCalledWith(
+ translations.successfullyAssignedToTags,
+ );
+ });
+ });
+
+ test('Successfully removes from tags', async () => {
+ renderTagActionsModal(props[1], link);
+
+ await wait();
+
+ // select userTag 2 and remove people from it
+ await waitFor(() => {
+ expect(screen.getByTestId('checkTag2')).toBeInTheDocument();
+ });
+ userEvent.click(screen.getByTestId('checkTag2'));
+
+ userEvent.click(screen.getByTestId('tagActionSubmitBtn'));
+
+ await waitFor(() => {
+ expect(toast.success).toHaveBeenCalledWith(
+ translations.successfullyRemovedFromTags,
+ );
+ });
+ });
+});
diff --git a/src/components/TagActions/TagActions.tsx b/src/components/TagActions/TagActions.tsx
new file mode 100644
index 0000000000..0c3246f16c
--- /dev/null
+++ b/src/components/TagActions/TagActions.tsx
@@ -0,0 +1,414 @@
+import type { ApolloError } from '@apollo/client';
+import { useMutation, useQuery } from '@apollo/client';
+import Loader from 'components/Loader/Loader';
+import { USER_TAG_ANCESTORS } from 'GraphQl/Queries/userTagQueries';
+import type { FormEvent } from 'react';
+import React, { useEffect, useState } from 'react';
+import { Modal, Form, Button } from 'react-bootstrap';
+import { useParams } from 'react-router-dom';
+import type {
+ InterfaceQueryOrganizationUserTags,
+ InterfaceTagData,
+} from 'utils/interfaces';
+import styles from './TagActions.module.css';
+import { ORGANIZATION_USER_TAGS_LIST } from 'GraphQl/Queries/OrganizationQueries';
+import {
+ ASSIGN_TO_TAGS,
+ REMOVE_FROM_TAGS,
+} from 'GraphQl/Mutations/TagMutations';
+import { toast } from 'react-toastify';
+import type { TagActionType } from 'utils/organizationTagsUtils';
+import { TAGS_QUERY_LIMIT } from 'utils/organizationTagsUtils';
+import InfiniteScroll from 'react-infinite-scroll-component';
+import { WarningAmberRounded } from '@mui/icons-material';
+import TagNode from './TagNode';
+
+interface InterfaceUserTagsAncestorData {
+ _id: string;
+ name: string;
+}
+
+/**
+ * Props for the `AssignToTags` component.
+ */
+export interface InterfaceTagActionsProps {
+ assignToTagsModalIsOpen: boolean;
+ hideAssignToTagsModal: () => void;
+ tagActionType: TagActionType;
+ t: (key: string) => string;
+ tCommon: (key: string) => string;
+}
+
+const TagActions: React.FC = ({
+ assignToTagsModalIsOpen,
+ hideAssignToTagsModal,
+ tagActionType,
+ t,
+ tCommon,
+}) => {
+ const { orgId, tagId: currentTagId } = useParams();
+
+ const {
+ data: orgUserTagsData,
+ loading: orgUserTagsLoading,
+ error: orgUserTagsError,
+ fetchMore: orgUserTagsFetchMore,
+ }: {
+ data?: {
+ organizations: InterfaceQueryOrganizationUserTags[];
+ };
+ loading: boolean;
+ error?: ApolloError;
+ refetch: () => void;
+ fetchMore: (options: {
+ variables: {
+ first: number;
+ after?: string;
+ };
+ updateQuery: (
+ previousResult: { organizations: InterfaceQueryOrganizationUserTags[] },
+ options: {
+ fetchMoreResult?: {
+ organizations: InterfaceQueryOrganizationUserTags[];
+ };
+ },
+ ) => { organizations: InterfaceQueryOrganizationUserTags[] };
+ }) => void;
+ } = useQuery(ORGANIZATION_USER_TAGS_LIST, {
+ variables: {
+ id: orgId,
+ first: TAGS_QUERY_LIMIT,
+ },
+ skip: !assignToTagsModalIsOpen,
+ });
+
+ const userTagsList = orgUserTagsData?.organizations[0]?.userTags.edges.map(
+ (edge) => edge.node,
+ );
+
+ const [checkedTagId, setCheckedTagId] = useState(null);
+ const [uncheckedTagId, setUncheckedTagId] = useState(null);
+
+ // tags that we have selected to assigned
+ const [selectedTags, setSelectedTags] = useState([]);
+
+ // tags that we have checked, it is there to differentiate between the selected tags and all the checked tags
+ // i.e. selected tags would only be the ones we select, but checked tags will also include the selected tag's ancestors
+ const [checkedTags, setCheckedTags] = useState>(new Set());
+
+ // next 3 states are there to keep track of the ancestor tags of the the tags that we have selected
+ // i.e. when we check a tag, all of it's ancestor tags will be checked too
+ // indicating that the users will be assigned all of the ancestor tags as well
+ const [addAncestorTagsData, setAddAncestorTagsData] = useState<
+ Set
+ >(new Set());
+ const [removeAncestorTagsData, setRemoveAncestorTagsData] = useState<
+ Set
+ >(new Set());
+ const [ancestorTagsDataMap, setAncestorTagsDataMap] = useState(new Map());
+
+ useEffect(() => {
+ const newCheckedTags = new Set(checkedTags);
+ const newAncestorTagsDataMap = new Map(ancestorTagsDataMap);
+ /* istanbul ignore next */
+ addAncestorTagsData.forEach(
+ (ancestorTag: InterfaceUserTagsAncestorData) => {
+ const prevAncestorTagValue = ancestorTagsDataMap.get(ancestorTag._id);
+ newAncestorTagsDataMap.set(
+ ancestorTag._id,
+ prevAncestorTagValue ? prevAncestorTagValue + 1 : 1,
+ );
+ newCheckedTags.add(ancestorTag._id);
+ },
+ );
+
+ setCheckedTags(newCheckedTags);
+ setAncestorTagsDataMap(newAncestorTagsDataMap);
+ }, [addAncestorTagsData]);
+
+ useEffect(() => {
+ const newCheckedTags = new Set(checkedTags);
+ const newAncestorTagsDataMap = new Map(ancestorTagsDataMap);
+ /* istanbul ignore next */
+ removeAncestorTagsData.forEach(
+ (ancestorTag: InterfaceUserTagsAncestorData) => {
+ const prevAncestorTagValue = ancestorTagsDataMap.get(ancestorTag._id);
+ if (prevAncestorTagValue === 1) {
+ newCheckedTags.delete(ancestorTag._id);
+ newAncestorTagsDataMap.delete(ancestorTag._id);
+ } else {
+ newAncestorTagsDataMap.set(ancestorTag._id, prevAncestorTagValue - 1);
+ }
+ },
+ );
+
+ setCheckedTags(newCheckedTags);
+ setAncestorTagsDataMap(newAncestorTagsDataMap);
+ }, [removeAncestorTagsData]);
+
+ const addAncestorTags = (tagId: string): void => {
+ setCheckedTagId(tagId);
+ setUncheckedTagId(null);
+ };
+
+ const removeAncestorTags = (tagId: string): void => {
+ setUncheckedTagId(tagId);
+ setCheckedTagId(null);
+ };
+
+ const selectTag = (tag: InterfaceTagData): void => {
+ const newCheckedTags = new Set(checkedTags);
+
+ setSelectedTags((selectedTags) => [...selectedTags, tag]);
+ newCheckedTags.add(tag._id);
+ addAncestorTags(tag._id);
+
+ setCheckedTags(newCheckedTags);
+ };
+
+ const deSelectTag = (tag: InterfaceTagData): void => {
+ if (!selectedTags.some((selectedTag) => selectedTag._id === tag._id)) {
+ /* istanbul ignore next */
+ return;
+ }
+
+ const newCheckedTags = new Set(checkedTags);
+
+ setSelectedTags(
+ selectedTags.filter((selectedTag) => selectedTag._id !== tag._id),
+ );
+ newCheckedTags.delete(tag._id);
+ removeAncestorTags(tag._id);
+
+ setCheckedTags(newCheckedTags);
+ };
+
+ const toggleTagSelection = (
+ tag: InterfaceTagData,
+ isSelected: boolean,
+ ): void => {
+ if (isSelected) {
+ selectTag(tag);
+ } else {
+ deSelectTag(tag);
+ }
+ };
+
+ useQuery(USER_TAG_ANCESTORS, {
+ variables: { id: checkedTagId },
+ onCompleted: /* istanbul ignore next */ (data) => {
+ setAddAncestorTagsData(data.getUserTagAncestors.slice(0, -1)); // Update the ancestor tags data, to check the ancestor tags
+ },
+ });
+
+ useQuery(USER_TAG_ANCESTORS, {
+ variables: { id: uncheckedTagId },
+ onCompleted: /* istanbul ignore next */ (data) => {
+ setRemoveAncestorTagsData(data.getUserTagAncestors.slice(0, -1)); // Update the ancestor tags data, to uncheck the ancestor tags
+ },
+ });
+
+ const loadMoreUserTags = (): void => {
+ orgUserTagsFetchMore({
+ variables: {
+ first: TAGS_QUERY_LIMIT,
+ after: orgUserTagsData?.organizations[0].userTags.pageInfo.endCursor,
+ },
+ updateQuery: (
+ prevResult: { organizations: InterfaceQueryOrganizationUserTags[] },
+ {
+ fetchMoreResult,
+ }: {
+ fetchMoreResult?: {
+ organizations: InterfaceQueryOrganizationUserTags[];
+ };
+ },
+ ) => {
+ if (!fetchMoreResult) return prevResult;
+
+ return {
+ organizations: [
+ {
+ ...prevResult.organizations[0],
+ userTags: {
+ ...prevResult.organizations[0].userTags,
+ edges: [
+ ...prevResult.organizations[0].userTags.edges,
+ ...fetchMoreResult.organizations[0].userTags.edges,
+ ],
+ pageInfo: fetchMoreResult.organizations[0].userTags.pageInfo,
+ },
+ },
+ ],
+ };
+ },
+ });
+ };
+
+ const [assignToTags] = useMutation(ASSIGN_TO_TAGS);
+ const [removeFromTags] = useMutation(REMOVE_FROM_TAGS);
+
+ const handleTagAction = async (
+ e: FormEvent,
+ ): Promise => {
+ e.preventDefault();
+
+ const mutationObject = {
+ variables: {
+ currentTagId,
+ selectedTagIds: selectedTags.map((selectedTag) => selectedTag._id),
+ },
+ };
+
+ try {
+ const { data } =
+ tagActionType === 'assignToTags'
+ ? await assignToTags(mutationObject)
+ : await removeFromTags(mutationObject);
+
+ if (data) {
+ if (tagActionType === 'assignToTags') {
+ toast.success(t('successfullyAssignedToTags'));
+ } else {
+ toast.success(t('successfullyRemovedFromTags'));
+ }
+ hideAssignToTagsModal();
+ }
+ } catch (error: unknown) {
+ /* istanbul ignore next */
+ if (error instanceof Error) {
+ toast.error(error.message);
+ }
+ }
+ };
+
+ if (orgUserTagsError) {
+ return (
+
+
+
+ {tagActionType === 'assignToTags'
+ ? t('assignToTags')
+ : t('removeFromTags')}
+
+
+
+
+ )}
+
+
+
+
+ );
+ }
+
+ return (
+ <>
+
+
+ + {t('errorOccurredWhileLoadingOrganizationUserTags')} +
+
+
+ );
+ }
+
+ const subTagsList = subTagsData?.getUserTag.childTags.edges.map(
+ (edge) => edge.node,
+ );
+
+ const handleTagClick = (): void => {
+ setExpanded(!expanded);
+ };
+
+ const handleCheckboxChange = (
+ e: React.ChangeEvent
+
+ + {t('errorOccurredWhileLoadingSubTags')} +
+
+
+ )}
+
+ );
+};
+
+export default TagNode;
diff --git a/src/components/UpdateSession/UpdateSession.css b/src/components/UpdateSession/UpdateSession.css
new file mode 100644
index 0000000000..073bbf973d
--- /dev/null
+++ b/src/components/UpdateSession/UpdateSession.css
@@ -0,0 +1,96 @@
+/* Card styles */
+.update-timeout-card {
+ width: 700px;
+ background: #ffffff;
+ border: none;
+ border-radius: 16px;
+ filter: drop-shadow(0px 4px 15.3px rgba(0, 0, 0, 0.08));
+ padding: 20px;
+}
+
+.update-timeout-card-header {
+ background: none;
+ padding: 16px;
+ border-bottom: none;
+}
+
+.update-timeout-card-title {
+ font-family: 'Lato', sans-serif;
+ font-weight: 600;
+ font-size: 24px;
+ color: #000000;
+}
+
+.update-timeout-card-body {
+ padding: 20px;
+}
+
+.update-timeout-current {
+ font-family: 'Lato', sans-serif;
+ font-weight: 400;
+ font-size: 16px;
+ color: #000000;
+ margin-bottom: 20px; /* Increased margin to create more space */
+}
+
+.update-timeout-label {
+ font-family: 'Lato', sans-serif;
+ font-weight: 400;
+ font-size: 16px;
+ color: #000000;
+ margin-bottom: 10px; /* Keep the same margin to maintain spacing with the slider */
+}
+
+.update-timeout-labels-container {
+ display: flex;
+ flex-direction: column;
+ align-items: start;
+}
+
+.update-timeout-value {
+ color: #14ae5c;
+ font-weight: bold;
+}
+
+.update-timeout-slider-labels {
+ display: flex;
+ justify-content: space-between;
+ font-size: 0.9rem;
+ color: #757575;
+}
+
+.update-timeout-button-container {
+ display: flex;
+ justify-content: right;
+ margin-top: 20px;
+}
+
+.update-timeout-button {
+ width: 112px;
+ height: 36px;
+ background: #31bb6b;
+ border-radius: 6px;
+ font-family: 'Lato', sans-serif;
+ font-weight: 500;
+ font-size: 16px;
+ color: #ffffff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: none;
+ box-shadow: none;
+}
+
+.update-timeout-button:hover {
+ background-color: #28a745;
+ border-color: #28a745;
+ box-shadow: none;
+}
+
+.update-timeout-button:active {
+ transform: scale(0.98);
+}
+
+.update-timeout-slider-container {
+ position: relative;
+}
diff --git a/src/components/UpdateSession/UpdateSession.test.tsx b/src/components/UpdateSession/UpdateSession.test.tsx
new file mode 100644
index 0000000000..ce0a868820
--- /dev/null
+++ b/src/components/UpdateSession/UpdateSession.test.tsx
@@ -0,0 +1,346 @@
+import React from 'react';
+import { MockedProvider } from '@apollo/client/testing';
+import {
+ render,
+ screen,
+ act,
+ within,
+ fireEvent,
+ waitFor,
+} from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import 'jest-localstorage-mock';
+import 'jest-location-mock';
+import { I18nextProvider } from 'react-i18next';
+import { BrowserRouter } from 'react-router-dom';
+import { toast } from 'react-toastify';
+import UpdateTimeout from './UpdateSession';
+import i18n from 'utils/i18nForTest';
+import { GET_COMMUNITY_SESSION_TIMEOUT_DATA } from 'GraphQl/Queries/Queries';
+import { UPDATE_SESSION_TIMEOUT } from 'GraphQl/Mutations/mutations';
+import { errorHandler } from 'utils/errorHandler';
+
+const MOCKS = [
+ {
+ request: {
+ query: GET_COMMUNITY_SESSION_TIMEOUT_DATA,
+ },
+ result: {
+ data: {
+ getCommunityData: {
+ timeout: 30,
+ },
+ },
+ },
+ },
+ {
+ request: {
+ query: GET_COMMUNITY_SESSION_TIMEOUT_DATA,
+ },
+ result: {
+ data: {
+ getCommunityData: null,
+ },
+ },
+ },
+ {
+ request: {
+ query: UPDATE_SESSION_TIMEOUT,
+ variables: {
+ timeout: 30,
+ },
+ },
+ result: {
+ data: {
+ updateSessionTimeout: true,
+ },
+ },
+ },
+];
+
+async function wait(ms = 100): Promise
+ {tag.childTags.totalCount ? (
+ <>
+
+ {expanded ? '▼' : '▶'}
+
+
+ {' '}
+
+ ) : (
+ <>
+ ●
+
+ {' '}
+
+ )}
+
+ {tag.name}
+
+
+ {expanded && subTagsLoading && (
+
+
+ )}
+ {expanded && subTagsList?.length && (
+
+
+
+
+
+
+
+
+
+ }
+ scrollableTarget={`subTagsScrollableDiv${tag._id}`}
+ >
+ {subTagsList.map((tag: InterfaceTagData) => (
+
+
+ ))}
+
+ Login Session Timeout
+ {chatTitle}
-- {chatSubtitle}{' '} - {props.selectedChatType == 'direct' ? '' : 'members'} -
+{chatSubtitle}
- {!!(
- directChat?.messages.length || groupChat?.messages.length
- ) && (
+ {!!chat?.messages.length && (
- {props.selectedChatType == 'direct'
- ? directChat?.messages.map(
- (message: DirectMessage, index: number) => {
- return (
-
)}
{
+ return (
+
+ );
+ })}
+ {chat.isGroup &&
+ message.sender._id !== userId &&
+ (message.sender?.image ? (
+ 
+ ) : (
+
-
- );
- },
- )
- : groupChat?.messages.map(
- (message: DirectMessage, index: number) => {
- return (
-
-
- {message.messageContent}
-
-
- {new Date(
- message?.createdAt,
- ).toLocaleTimeString('it-IT', {
- hour: '2-digit',
- minute: '2-digit',
- })}
-
-
-
- {message.sender._id !== userId ? (
- message.sender?.image ? (
-
- ) : (
-
+
- {message.sender._id !== userId && (
+ avatarStyle={styles.contactImage}
+ />
+ ))}
+
+
+ )}
+ {message.messageContent}
+
+
+
+ {chat.isGroup && message.sender._id !== userId && (
+
-
- );
- },
- )}
+ {message.replyTo.messageContent}
+ + {message.sender.firstName + + ' ' + + message.sender.lastName} +
+ )} + {message.replyTo && ( + +- {message.sender.firstName + + {message.replyTo.sender.firstName + ' ' + - message.sender.lastName} + message.replyTo.sender.lastName}
- )} - - {message.messageContent} - - - {new Date( - message?.createdAt, - ).toLocaleTimeString('it-IT', { - hour: '2-digit', - minute: '2-digit', - })} - -
+
+
+
+
+ {
+ setReplyToDirectMessage(message);
+ }}
+ data-testid="replyBtn"
+ >
+ Reply
+
+
+
+
+ {new Date(message?.createdAt).toLocaleTimeString(
+ 'it-IT',
+ {
+ hour: '2-digit',
+ minute: '2-digit',
+ },
+ )}
+
+
+
+ {!!replyToDirectMessage?._id && (
+
{
props = {
...props,
selectedContact: '1',
+ isGroup: true,
};
render(
diff --git a/src/components/UserPortal/ContactCard/ContactCard.tsx b/src/components/UserPortal/ContactCard/ContactCard.tsx
index cd135a9e01..ef6bf2c9d5 100644
--- a/src/components/UserPortal/ContactCard/ContactCard.tsx
+++ b/src/components/UserPortal/ContactCard/ContactCard.tsx
@@ -5,12 +5,10 @@ import Avatar from 'components/Avatar/Avatar';
interface InterfaceContactCardProps {
id: string;
title: string;
- subtitle: string;
image: string;
selectedContact: string;
setSelectedContact: React.Dispatch>;
- type: string;
- setSelectedChatType: React.Dispatch>;
+ isGroup: boolean;
}
/**
@@ -33,18 +31,9 @@ interface InterfaceContactCardProps {
* @returns The rendered contact card component.
*/
function contactCard(props: InterfaceContactCardProps): JSX.Element {
- // Full name of the contact
-
- /**
- * Updates the selected contact and its name when the card is clicked.
- */
-
const handleSelectedContactChange = (): void => {
props.setSelectedContact(props.id);
- props.setSelectedChatType(props.type);
};
-
- // State to track if the contact card is selected
const [isSelected, setIsSelected] = React.useState(
props.selectedContact === props.id,
);
@@ -78,7 +67,6 @@ function contactCard(props: InterfaceContactCardProps): JSX.Element {
)}
diff --git a/src/components/UserPortal/CreateDirectChat/CreateDirectChat.test.tsx b/src/components/UserPortal/CreateDirectChat/CreateDirectChat.test.tsx
index 338b890a2a..e3e2eae75c 100644
--- a/src/components/UserPortal/CreateDirectChat/CreateDirectChat.test.tsx
+++ b/src/components/UserPortal/CreateDirectChat/CreateDirectChat.test.tsx
@@ -8,908 +8,20 @@ import {
} from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider, useTranslation } from 'react-i18next';
-
-import {
- DIRECT_CHATS_LIST,
- USERS_CONNECTION_LIST,
-} from 'GraphQl/Queries/Queries';
+import { USERS_CONNECTION_LIST } from 'GraphQl/Queries/Queries';
import { BrowserRouter } from 'react-router-dom';
import { Provider } from 'react-redux';
import { store } from 'state/store';
-import i18nForTest from 'utils/i18nForTest';
-import Chat from '../../../screens/UserPortal/Chat/Chat';
-import {
- CREATE_DIRECT_CHAT,
- MESSAGE_SENT_TO_DIRECT_CHAT,
- MESSAGE_SENT_TO_GROUP_CHAT,
-} from 'GraphQl/Mutations/OrganizationMutations';
-import {
- DIRECT_CHAT_BY_ID,
- GROUP_CHAT_BY_ID,
- GROUP_CHAT_LIST,
-} from 'GraphQl/Queries/PlugInQueries';
-import useLocalStorage from 'utils/useLocalstorage';
-
-const { setItem } = useLocalStorage();
-
-const MOCKS = [
- {
- request: {
- query: GROUP_CHAT_LIST,
- variables: {
- id: null,
- },
- },
- result: {
- data: {
- groupChatsByUserId: [
- {
- _id: '1',
- creator: {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- },
- messages: {
- _id: '1',
- createdAt: '',
- messageContent: 'Hello',
- sender: {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@email.com',
- },
- },
- title: 'Test GroupChat',
- organization: {
- _id: '1',
- name: 'Test Org',
- },
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@email.com',
- image: 'img',
- },
- ],
- },
- {
- _id: '2',
- creator: {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- },
- messages: {
- _id: '1',
- createdAt: '',
- messageContent: 'Hello',
- sender: {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@email.com',
- },
- },
- title: 'Test GroupChat',
- organization: {
- _id: '1',
- name: 'Test Org',
- },
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@email.com',
- image: 'img',
- },
- ],
- },
- ],
- },
- },
- },
- {
- request: {
- query: GROUP_CHAT_LIST,
- variables: {
- id: '1',
- },
- },
- result: {
- data: {
- groupChatsByUserId: [
- {
- _id: '1',
- creator: {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- },
- messages: {
- _id: '1',
- createdAt: '',
- messageContent: 'Hello',
- sender: {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@email.com',
- },
- },
- title: 'Test GroupChat',
- organization: {
- _id: '1',
- name: 'Test Org',
- },
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@email.com',
- image: 'img',
- },
- ],
- },
- {
- _id: '2',
- creator: {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- },
- messages: {
- _id: '1',
- createdAt: '',
- messageContent: 'Hello',
- sender: {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@email.com',
- },
- },
- title: 'Test GroupChat',
- organization: {
- _id: '1',
- name: 'Test Org',
- },
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@email.com',
- image: 'img',
- },
- ],
- },
- ],
- },
- },
- },
- {
- request: {
- query: GROUP_CHAT_LIST,
- variables: {
- id: null,
- },
- },
- result: {
- data: {
- groupChatsByUserId: [
- {
- _id: '1',
- creator: {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- },
- messages: {
- _id: '1',
- createdAt: '',
- messageContent: 'Hello',
- sender: {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@email.com',
- },
- },
- title: 'Test GroupChat',
- organization: {
- _id: '1',
- name: 'Test Org',
- },
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@email.com',
- image: 'img',
- },
- ],
- },
- {
- _id: '1',
- creator: {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- },
- messages: {
- _id: '1',
- createdAt: '',
- messageContent: 'Hello',
- sender: {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@email.com',
- },
- },
- title: 'Test GroupChat',
- organization: {
- _id: '1',
- name: 'Test Org',
- },
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@email.com',
- image: 'img',
- },
- ],
- },
- ],
- },
- },
- },
- {
- request: {
- query: DIRECT_CHATS_LIST,
- variables: {
- id: null,
- },
- },
- result: {
- data: {
- directChatsByUserID: [
- {
- _id: '666c88dd92e995354d98527c',
- creator: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- __typename: 'User',
- },
- messages: [
- {
- _id: '668930bae43ce54e6e302cf1',
- createdAt: '2024-07-06T11:55:38.933Z',
- messageContent: 'hJnkank',
- receiver: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- __typename: 'User',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- __typename: 'User',
- },
- __typename: 'DirectChatMessage',
- },
- ],
- organization: {
- _id: '6737904485008f171cf29924',
- name: 'Unity Foundation',
- __typename: 'Organization',
- },
- users: [
- {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- image: null,
- __typename: 'User',
- },
- {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- image: null,
- __typename: 'User',
- },
- ],
- __typename: 'DirectChat',
- },
- {
- _id: '666f09c892e995354d98a5ee',
- creator: {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- __typename: 'User',
- },
- messages: [
- {
- _id: '6676932692e995354d98ab7f',
- createdAt: '2024-06-22T09:02:30.776Z',
- messageContent: 'hii',
- receiver: {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- __typename: 'User',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- __typename: 'User',
- },
- __typename: 'DirectChatMessage',
- },
- ],
- organization: {
- _id: '6737904485008f171cf29924',
- name: 'Unity Foundation',
- __typename: 'Organization',
- },
- users: [
- {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- image: null,
- __typename: 'User',
- },
- {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- image: null,
- __typename: 'User',
- },
- ],
- __typename: 'DirectChat',
- },
- ],
- },
- },
- },
- {
- request: {
- query: DIRECT_CHATS_LIST,
- variables: {
- id: '1',
- },
- },
- result: {
- data: {
- directChatsByUserID: [
- {
- _id: '666c88dd92e995354d98527c',
- creator: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- __typename: 'User',
- },
- messages: [
- {
- _id: '668930bae43ce54e6e302cf1',
- createdAt: '2024-07-06T11:55:38.933Z',
- messageContent: 'hJnkank',
- receiver: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- __typename: 'User',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- __typename: 'User',
- },
- __typename: 'DirectChatMessage',
- },
- ],
- organization: {
- _id: '6737904485008f171cf29924',
- name: 'Unity Foundation',
- __typename: 'Organization',
- },
- users: [
- {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- image: null,
- __typename: 'User',
- },
- {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- image: null,
- __typename: 'User',
- },
- ],
- __typename: 'DirectChat',
- },
- {
- _id: '666f09c892e995354d98a5ee',
- creator: {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- __typename: 'User',
- },
- messages: [
- {
- _id: '6676932692e995354d98ab7f',
- createdAt: '2024-06-22T09:02:30.776Z',
- messageContent: 'hii',
- receiver: {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- __typename: 'User',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- __typename: 'User',
- },
- __typename: 'DirectChatMessage',
- },
- ],
- organization: {
- _id: '6737904485008f171cf29924',
- name: 'Unity Foundation',
- __typename: 'Organization',
- },
- users: [
- {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- image: null,
- __typename: 'User',
- },
- {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- image: null,
- __typename: 'User',
- },
- ],
- __typename: 'DirectChat',
- },
- ],
- },
- },
- },
- {
- request: {
- query: DIRECT_CHATS_LIST,
- variables: {
- id: '1',
- },
- },
- result: {
- data: {
- directChatsByUserID: [
- {
- _id: '666c88dd92e995354d98527c',
- creator: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- __typename: 'User',
- },
- messages: [
- {
- _id: '668930bae43ce54e6e302cf1',
- createdAt: '2024-07-06T11:55:38.933Z',
- messageContent: 'hJnkank',
- receiver: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- __typename: 'User',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- __typename: 'User',
- },
- __typename: 'DirectChatMessage',
- },
- ],
- organization: {
- _id: '6737904485008f171cf29924',
- name: 'Unity Foundation',
- __typename: 'Organization',
- },
- users: [
- {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- image: null,
- __typename: 'User',
- },
- {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- image: null,
- __typename: 'User',
- },
- ],
- __typename: 'DirectChat',
- },
- {
- _id: '666f09c892e995354d98a5ee',
- creator: {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- __typename: 'User',
- },
- messages: [
- {
- _id: '6676932692e995354d98ab7f',
- createdAt: '2024-06-22T09:02:30.776Z',
- messageContent: 'hii',
- receiver: {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- __typename: 'User',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- __typename: 'User',
- },
- __typename: 'DirectChatMessage',
- },
- ],
- organization: {
- _id: '6737904485008f171cf29924',
- name: 'Unity Foundation',
- __typename: 'Organization',
- },
- users: [
- {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- image: null,
- __typename: 'User',
- },
- {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- image: null,
- __typename: 'User',
- },
- ],
- __typename: 'DirectChat',
- },
- ],
- },
- },
- },
- {
- request: {
- query: DIRECT_CHATS_LIST,
- variables: {
- id: '1',
- },
- },
- result: {
- data: {
- directChatsByUserID: [
- {
- _id: '666c88dd92e995354d98527c',
- creator: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- __typename: 'User',
- },
- messages: [
- {
- _id: '668930bae43ce54e6e302cf1',
- createdAt: '2024-07-06T11:55:38.933Z',
- messageContent: 'hJnkank',
- receiver: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- __typename: 'User',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- __typename: 'User',
- },
- __typename: 'DirectChatMessage',
- },
- ],
- organization: {
- _id: '6737904485008f171cf29924',
- name: 'Unity Foundation',
- __typename: 'Organization',
- },
- users: [
- {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- image: null,
- __typename: 'User',
- },
- {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- image: null,
- __typename: 'User',
- },
- ],
- __typename: 'DirectChat',
- },
- {
- _id: '666f09c892e995354d98a5ee',
- creator: {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- __typename: 'User',
- },
- messages: [
- {
- _id: '6676932692e995354d98ab7f',
- createdAt: '2024-06-22T09:02:30.776Z',
- messageContent: 'hii',
- receiver: {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- __typename: 'User',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- __typename: 'User',
- },
- __typename: 'DirectChatMessage',
- },
- ],
- organization: {
- _id: '6737904485008f171cf29924',
- name: 'Unity Foundation',
- __typename: 'Organization',
- },
- users: [
- {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- image: null,
- __typename: 'User',
- },
- {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- image: null,
- __typename: 'User',
- },
- ],
- __typename: 'DirectChat',
- },
- ],
- },
- },
- },
- {
- request: {
- query: DIRECT_CHATS_LIST,
- variables: {
- id: '',
- },
- },
- result: {
- data: {
- directChatsByUserID: [
- {
- _id: '666c88dd92e995354d98527c',
- creator: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- __typename: 'User',
- },
- messages: [
- {
- _id: '668930bae43ce54e6e302cf1',
- createdAt: '2024-07-06T11:55:38.933Z',
- messageContent: 'hJnkank',
- receiver: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- __typename: 'User',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- __typename: 'User',
- },
- __typename: 'DirectChatMessage',
- },
- ],
- organization: {
- _id: '6737904485008f171cf29924',
- name: 'Unity Foundation',
- __typename: 'Organization',
- },
- users: [
- {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- image: null,
- __typename: 'User',
- },
- {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- email: 'testadmin1@example.com',
- image: null,
- __typename: 'User',
- },
- ],
- __typename: 'DirectChat',
- },
- {
- _id: '666f09c892e995354d98a5ee',
- creator: {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- __typename: 'User',
- },
- messages: [
- {
- _id: '6676932692e995354d98ab7f',
- createdAt: '2024-06-22T09:02:30.776Z',
- messageContent: 'hii',
- receiver: {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- __typename: 'User',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- __typename: 'User',
- },
- __typename: 'DirectChatMessage',
- },
- ],
- organization: {
- _id: '6737904485008f171cf29924',
- name: 'Unity Foundation',
- __typename: 'Organization',
- },
- users: [
- {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- email: 'testsuperadmin@example.com',
- image: null,
- __typename: 'User',
- },
- {
- _id: '67378abd85008f171cf2990d',
- firstName: 'Darcy',
- lastName: 'Wilf',
- email: 'testadmin3@example.com',
- image: null,
- __typename: 'User',
- },
- ],
- __typename: 'DirectChat',
- },
- ],
- },
- },
- },
-];
+import i18nForTest from 'utils/i18nForTest';
+import Chat from '../../../screens/UserPortal/Chat/Chat';
+import {
+ CREATE_CHAT,
+ MESSAGE_SENT_TO_CHAT,
+} from 'GraphQl/Mutations/OrganizationMutations';
+import { CHATS_LIST, CHAT_BY_ID } from 'GraphQl/Queries/PlugInQueries';
+import useLocalStorage from 'utils/useLocalstorage';
+
+const { setItem } = useLocalStorage();
const UserConnectionListMock = [
{
@@ -1206,99 +318,24 @@ const UserConnectionListMock = [
},
},
},
- {
- request: {
- query: USERS_CONNECTION_LIST,
- variables: {
- firstName_contains: '',
- lastName_contains: '',
- },
- },
- result: {
- data: {
- users: {
- user: [
- {
- firstName: 'Disha',
- lastName: 'Talreja',
- image: 'img',
- _id: '1',
- email: 'disha@email.com',
- createdAt: '',
- appUserProfile: {
- _id: '12',
- isSuperAdmin: 'false',
- createdOrganizations: {
- _id: '345678',
- },
- createdEvents: {
- _id: '34567890',
- },
- },
- organizationsBlockedBy: [],
- joinedOrganizations: [],
- },
- {
- firstName: 'Disha',
- lastName: 'Talreja',
- image: 'img',
- _id: '1',
- email: 'disha@email.com',
- createdAt: '',
- appUserProfile: {
- _id: '12',
- isSuperAdmin: 'false',
- createdOrganizations: {
- _id: '345678',
- },
- createdEvents: {
- _id: '34567890',
- },
- },
- organizationsBlockedBy: [],
- joinedOrganizations: [],
- },
- {
- firstName: 'Disha',
- lastName: 'Talreja',
- image: 'img',
- _id: '1',
- email: 'disha@email.com',
- createdAt: '',
- appUserProfile: {
- _id: '12',
- isSuperAdmin: 'false',
- createdOrganizations: {
- _id: '345678',
- },
- createdEvents: {
- _id: '34567890',
- },
- },
- organizationsBlockedBy: [],
- joinedOrganizations: [],
- },
- ],
- },
- },
- },
- },
];
-const MESSAGE_SENT_TO_GROUP_CHAT_MOCK = [
+const MESSAGE_SENT_TO_CHAT_MOCK = [
{
request: {
- query: MESSAGE_SENT_TO_GROUP_CHAT,
+ query: MESSAGE_SENT_TO_CHAT,
variables: {
userId: null,
},
},
result: {
data: {
- messageSentToGroupChat: {
+ messageSentToChat: {
_id: '668ec1f1364e03ac47a151',
createdAt: '2024-07-10T17:16:33.248Z',
messageContent: 'Test ',
+ type: 'STRING',
+ replyTo: null,
sender: {
_id: '64378abd85008f171cf2990d',
firstName: 'Wilt',
@@ -1312,7 +349,7 @@ const MESSAGE_SENT_TO_GROUP_CHAT_MOCK = [
},
{
request: {
- query: MESSAGE_SENT_TO_GROUP_CHAT,
+ query: MESSAGE_SENT_TO_CHAT,
variables: {
userId: '2',
},
@@ -1323,6 +360,8 @@ const MESSAGE_SENT_TO_GROUP_CHAT_MOCK = [
_id: '668ec1f1df364e03ac47a151',
createdAt: '2024-07-10T17:16:33.248Z',
messageContent: 'Test ',
+ replyTo: null,
+ type: 'STRING',
sender: {
_id: '64378abd85008f171cf2990d',
firstName: 'Wilt',
@@ -1336,7 +375,7 @@ const MESSAGE_SENT_TO_GROUP_CHAT_MOCK = [
},
{
request: {
- query: MESSAGE_SENT_TO_GROUP_CHAT,
+ query: MESSAGE_SENT_TO_CHAT,
variables: {
userId: '1',
},
@@ -1347,6 +386,8 @@ const MESSAGE_SENT_TO_GROUP_CHAT_MOCK = [
_id: '668ec1f13603ac4697a151',
createdAt: '2024-07-10T17:16:33.248Z',
messageContent: 'Test ',
+ replyTo: null,
+ type: 'STRING',
sender: {
_id: '64378abd85008f171cf2990d',
firstName: 'Wilt',
@@ -1360,124 +401,98 @@ const MESSAGE_SENT_TO_GROUP_CHAT_MOCK = [
},
];
-const MESSAGE_SENT_TO_DIRECT_CHAT_MOCK = [
- {
- request: {
- query: MESSAGE_SENT_TO_DIRECT_CHAT,
- variables: {
- userId: '1',
- },
- },
- result: {
- data: {
- messageSentToDirectChat: {
- _id: '668ec1f1364e03ac4697a151',
- createdAt: '2024-07-10T17:16:33.248Z',
- messageContent: 'Test ',
- receiver: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- image: '',
- },
- sender: {
- _id: '64378abd85008f171cf2990d',
- firstName: 'Wilt',
- lastName: 'Shepherd',
- image: '',
- },
- updatedAt: '2024-07-10',
- },
- },
- },
- },
+const CHAT_BY_ID_QUERY_MOCK = [
{
request: {
- query: MESSAGE_SENT_TO_DIRECT_CHAT,
+ query: CHAT_BY_ID,
variables: {
- userId: '2',
+ id: '1',
},
},
result: {
data: {
- messageSentToDirectChat: {
- _id: '668ec1f1364e03ac4697vgfa151',
- createdAt: '2024-07-10T17:16:33.248Z',
- messageContent: 'Test ',
- receiver: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- image: '',
- },
- sender: {
+ chatById: {
+ _id: '1',
+ createdAt: '2345678903456',
+ isGroup: false,
+ creator: {
_id: '64378abd85008f171cf2990d',
firstName: 'Wilt',
lastName: 'Shepherd',
- image: '',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
},
- updatedAt: '2024-07-10',
+ organization: null,
+ name: '',
+ messages: [
+ {
+ _id: '345678',
+ createdAt: '345678908765',
+ messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
+ sender: {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ },
+ ],
+ users: [
+ {
+ _id: '1',
+ firstName: 'Disha',
+ lastName: 'Talreja',
+ email: 'disha@example.com',
+ image: '',
+ },
+ {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ ],
},
},
},
},
{
request: {
- query: MESSAGE_SENT_TO_DIRECT_CHAT,
+ query: CHAT_BY_ID,
variables: {
- userId: null,
+ id: '1',
},
},
result: {
data: {
- messageSentToDirectChat: {
- _id: '6ec1f1364e03ac4697a151',
- createdAt: '2024-07-10T17:16:33.248Z',
- messageContent: 'Test ',
- receiver: {
- _id: '65378abd85008f171cf2990d',
- firstName: 'Vyvyan',
- lastName: 'Kerry',
- image: '',
- },
- sender: {
+ chatById: {
+ _id: '1',
+ isGroup: false,
+ creator: {
_id: '64378abd85008f171cf2990d',
firstName: 'Wilt',
lastName: 'Shepherd',
- image: '',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
},
- updatedAt: '2024-07-10',
- },
- },
- },
- },
-];
-
-const DIRECT_CHAT_BY_ID_QUERY_MOCK = [
- {
- request: {
- query: DIRECT_CHAT_BY_ID,
- variables: {
- id: '1',
- },
- },
- result: {
- data: {
- directChatById: {
- _id: '1',
+ organization: null,
+ name: '',
createdAt: '2345678903456',
messages: [
{
_id: '345678',
createdAt: '345678908765',
messageContent: 'Hello',
- receiver: {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- image: '',
- },
+ replyTo: null,
+ type: 'STRING',
sender: {
_id: '2',
firstName: 'Test',
@@ -1509,28 +524,35 @@ const DIRECT_CHAT_BY_ID_QUERY_MOCK = [
},
{
request: {
- query: DIRECT_CHAT_BY_ID,
+ query: CHAT_BY_ID,
variables: {
- id: '1',
+ id: '',
},
},
result: {
data: {
- directChatById: {
+ chatById: {
_id: '1',
+ isGroup: false,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
+ },
+ organization: null,
+ name: '',
createdAt: '2345678903456',
messages: [
{
_id: '345678',
createdAt: '345678908765',
messageContent: 'Hello',
- receiver: {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- image: '',
- },
+ replyTo: null,
+ type: 'STRING',
sender: {
_id: '2',
firstName: 'Test',
@@ -1560,390 +582,678 @@ const DIRECT_CHAT_BY_ID_QUERY_MOCK = [
},
},
},
+];
+
+const CHATS_LIST_MOCK = [
+ {
+ request: {
+ query: CHATS_LIST,
+ variables: {
+ id: null,
+ },
+ },
+ result: {
+ data: {
+ chatsByUserId: [
+ {
+ _id: '65844efc814dd40fgh03db811c4',
+ isGroup: true,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
+ },
+ organization: {
+ _id: 'pw3ertyuiophgfre45678',
+ name: 'rtyu',
+ },
+ createdAt: '2345678903456',
+ name: 'Test Group Chat',
+ messages: [
+ {
+ _id: '345678',
+ createdAt: '345678908765',
+ messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
+ sender: {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ },
+ ],
+ users: [
+ {
+ _id: '1',
+ firstName: 'Disha',
+ lastName: 'Talreja',
+ email: 'disha@example.com',
+ image: '',
+ },
+ {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ {
+ _id: '3',
+ firstName: 'Test',
+ lastName: 'User1',
+ email: 'test1@example.com',
+ image: '',
+ },
+ {
+ _id: '4',
+ firstName: 'Test',
+ lastName: 'User2',
+ email: 'test2@example.com',
+ image: '',
+ },
+ {
+ _id: '5',
+ firstName: 'Test',
+ lastName: 'User4',
+ email: 'test4@example.com',
+ image: '',
+ },
+ ],
+ },
+ {
+ _id: '65844efc814ddgh4003db811c4',
+ isGroup: true,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
+ },
+ organization: {
+ _id: 'pw3ertyuiophgfre45678',
+ name: 'rtyu',
+ },
+ createdAt: '2345678903456',
+ name: 'Test Group Chat',
+ messages: [
+ {
+ _id: '345678',
+ createdAt: '345678908765',
+ messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
+ sender: {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ },
+ ],
+ users: [
+ {
+ _id: '1',
+ firstName: 'Disha',
+ lastName: 'Talreja',
+ email: 'disha@example.com',
+ image: '',
+ },
+ {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ {
+ _id: '3',
+ firstName: 'Test',
+ lastName: 'User1',
+ email: 'test1@example.com',
+ image: '',
+ },
+ {
+ _id: '4',
+ firstName: 'Test',
+ lastName: 'User2',
+ email: 'test2@example.com',
+ image: '',
+ },
+ {
+ _id: '5',
+ firstName: 'Test',
+ lastName: 'User4',
+ email: 'test4@example.com',
+ image: '',
+ },
+ ],
+ },
+ ],
+ },
+ },
+ },
{
request: {
- query: DIRECT_CHAT_BY_ID,
+ query: CHATS_LIST,
variables: {
id: '',
},
},
result: {
data: {
- directChatById: {
- _id: '1',
- createdAt: '2345678903456',
- messages: [
- {
- _id: '345678',
- createdAt: '345678908765',
- messageContent: 'Hello',
- receiver: {
+ chatsByUserId: [
+ {
+ _id: '65844ghjefc814dd4003db811c4',
+ isGroup: true,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
+ },
+ organization: {
+ _id: 'pw3ertyuiophgfre45678',
+ name: 'rtyu',
+ },
+ createdAt: '2345678903456',
+ name: 'Test Group Chat',
+ messages: [
+ {
+ _id: '345678',
+ createdAt: '345678908765',
+ messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
+ sender: {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ },
+ ],
+ users: [
+ {
_id: '1',
firstName: 'Disha',
lastName: 'Talreja',
email: 'disha@example.com',
image: '',
},
- sender: {
+ {
_id: '2',
firstName: 'Test',
lastName: 'User',
email: 'test@example.com',
image: '',
},
+ {
+ _id: '3',
+ firstName: 'Test',
+ lastName: 'User1',
+ email: 'test1@example.com',
+ image: '',
+ },
+ {
+ _id: '4',
+ firstName: 'Test',
+ lastName: 'User2',
+ email: 'test2@example.com',
+ image: '',
+ },
+ {
+ _id: '5',
+ firstName: 'Test',
+ lastName: 'User4',
+ email: 'test4@example.com',
+ image: '',
+ },
+ ],
+ },
+ {
+ _id: 'ujhgtrdtyuiop',
+ isGroup: true,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
},
- ],
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- image: '',
- },
- {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@example.com',
- image: '',
+ organization: {
+ _id: 'pw3ertyuiophgfre45678',
+ name: 'rtyu',
},
- ],
- },
- },
- },
- },
- {
- request: {
- query: DIRECT_CHAT_BY_ID,
- variables: {
- id: '2',
- },
- },
- result: {
- data: {
- directChatById: {
- _id: '65844efc814dd4003db811c4',
- createdAt: '2345678903456',
- messages: [
- {
- _id: '345678',
- createdAt: '345678908765',
- messageContent: 'Hello',
- receiver: {
+ createdAt: '2345678903456',
+ name: 'Test Group Chat',
+ messages: [
+ {
+ _id: '345678',
+ createdAt: '345678908765',
+ messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
+ sender: {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ },
+ ],
+ users: [
+ {
_id: '1',
firstName: 'Disha',
lastName: 'Talreja',
email: 'disha@example.com',
image: '',
},
- sender: {
+ {
_id: '2',
firstName: 'Test',
lastName: 'User',
email: 'test@example.com',
image: '',
},
- },
- ],
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- image: '',
- },
- {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@example.com',
- image: '',
- },
- ],
- },
+ {
+ _id: '3',
+ firstName: 'Test',
+ lastName: 'User1',
+ email: 'test1@example.com',
+ image: '',
+ },
+ {
+ _id: '4',
+ firstName: 'Test',
+ lastName: 'User2',
+ email: 'test2@example.com',
+ image: '',
+ },
+ {
+ _id: '5',
+ firstName: 'Test',
+ lastName: 'User4',
+ email: 'test4@example.com',
+ image: '',
+ },
+ ],
+ },
+ ],
},
},
},
{
request: {
- query: DIRECT_CHAT_BY_ID,
+ query: CHATS_LIST,
variables: {
- id: null,
+ id: '1',
},
},
result: {
data: {
- directChatById: {
- _id: '65844efc814dd4003db811c4',
- createdAt: '2345678903456',
- messages: [
- {
- _id: '345678',
- createdAt: '345678908765',
- messageContent: 'Hello',
- receiver: {
+ chatsByUserId: [
+ {
+ _id: '65844efc814dhjmkdftyd4003db811c4',
+ isGroup: true,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
+ },
+ organization: {
+ _id: 'pw3ertyuiophgfre45678',
+ name: 'rtyu',
+ },
+ createdAt: '2345678903456',
+ name: 'Test Group Chat',
+ messages: [
+ {
+ _id: '345678',
+ createdAt: '345678908765',
+ messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
+ sender: {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ },
+ ],
+ users: [
+ {
_id: '1',
firstName: 'Disha',
lastName: 'Talreja',
email: 'disha@example.com',
image: '',
},
- sender: {
+ {
_id: '2',
firstName: 'Test',
lastName: 'User',
email: 'test@example.com',
image: '',
},
- },
- ],
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- image: '',
- },
- {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@example.com',
- image: '',
- },
- ],
- },
- },
- },
- },
-];
-
-const GROUP_CHAT_BY_ID_QUERY_MOCK = [
- {
- request: {
- query: GROUP_CHAT_BY_ID,
- variables: {
- id: '1',
- },
- },
- result: {
- data: {
- groupChatById: {
- _id: '65844efc814dd4003db811c4',
- createdAt: '2345678903456',
- title: 'Test Group Chat',
- messages: [
- {
- _id: '345678',
- createdAt: '345678908765',
- messageContent: 'Hello',
- sender: {
- _id: '2',
+ {
+ _id: '3',
firstName: 'Test',
- lastName: 'User',
- email: 'test@example.com',
+ lastName: 'User1',
+ email: 'test1@example.com',
image: '',
},
+ {
+ _id: '4',
+ firstName: 'Test',
+ lastName: 'User2',
+ email: 'test2@example.com',
+ image: '',
+ },
+ {
+ _id: '5',
+ firstName: 'Test',
+ lastName: 'User4',
+ email: 'test4@example.com',
+ image: '',
+ },
+ ],
+ },
+ {
+ _id: '65844ewsedrffc814dd4003db811c4',
+ isGroup: true,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
},
- ],
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- image: '',
- },
- {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@example.com',
- image: '',
- },
- {
- _id: '3',
- firstName: 'Test',
- lastName: 'User1',
- email: 'test1@example.com',
- image: '',
- },
- {
- _id: '4',
- firstName: 'Test',
- lastName: 'User2',
- email: 'test2@example.com',
- image: '',
- },
- {
- _id: '5',
- firstName: 'Test',
- lastName: 'User4',
- email: 'test4@example.com',
- image: '',
+ organization: {
+ _id: 'pw3ertyuiophgfre45678',
+ name: 'rtyu',
},
- ],
- },
+ createdAt: '2345678903456',
+ name: 'Test Group Chat',
+ messages: [
+ {
+ _id: '345678',
+ createdAt: '345678908765',
+ messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
+ sender: {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ },
+ ],
+ users: [
+ {
+ _id: '1',
+ firstName: 'Disha',
+ lastName: 'Talreja',
+ email: 'disha@example.com',
+ image: '',
+ },
+ {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ {
+ _id: '3',
+ firstName: 'Test',
+ lastName: 'User1',
+ email: 'test1@example.com',
+ image: '',
+ },
+ {
+ _id: '4',
+ firstName: 'Test',
+ lastName: 'User2',
+ email: 'test2@example.com',
+ image: '',
+ },
+ {
+ _id: '5',
+ firstName: 'Test',
+ lastName: 'User4',
+ email: 'test4@example.com',
+ image: '',
+ },
+ ],
+ },
+ ],
},
},
},
{
request: {
- query: GROUP_CHAT_BY_ID,
+ query: CHATS_LIST,
variables: {
id: '1',
},
},
result: {
data: {
- groupChatById: {
- _id: '65844efc814dd4003db811c4',
- createdAt: '2345678903456',
- title: 'Test Group Chat',
- messages: [
- {
- _id: '345678',
- createdAt: '345678908765',
- messageContent: 'Hello',
- sender: {
+ chatsByUserId: [
+ {
+ _id: '65844efc814dhjmkdftyd4003db811c4',
+ isGroup: true,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
+ },
+ organization: {
+ _id: 'pw3ertyuiophgfre45678',
+ name: 'rtyu',
+ },
+ createdAt: '2345678903456',
+ name: 'Test Group Chat',
+ messages: [
+ {
+ _id: '345678',
+ createdAt: '345678908765',
+ messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
+ sender: {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ },
+ ],
+ users: [
+ {
+ _id: '1',
+ firstName: 'Disha',
+ lastName: 'Talreja',
+ email: 'disha@example.com',
+ image: '',
+ },
+ {
_id: '2',
firstName: 'Test',
lastName: 'User',
email: 'test@example.com',
image: '',
},
+ {
+ _id: '3',
+ firstName: 'Test',
+ lastName: 'User1',
+ email: 'test1@example.com',
+ image: '',
+ },
+ {
+ _id: '4',
+ firstName: 'Test',
+ lastName: 'User2',
+ email: 'test2@example.com',
+ image: '',
+ },
+ {
+ _id: '5',
+ firstName: 'Test',
+ lastName: 'User4',
+ email: 'test4@example.com',
+ image: '',
+ },
+ ],
+ },
+ {
+ _id: '65844ewsedrffc814dd4003db811c4',
+ isGroup: true,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
},
- ],
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- image: '',
- },
- {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@example.com',
- image: '',
- },
- {
- _id: '3',
- firstName: 'Test',
- lastName: 'User1',
- email: 'test1@example.com',
- image: '',
- },
- {
- _id: '4',
- firstName: 'Test',
- lastName: 'User2',
- email: 'test2@example.com',
- image: '',
- },
- {
- _id: '5',
- firstName: 'Test',
- lastName: 'User4',
- email: 'test4@example.com',
- image: '',
+ organization: {
+ _id: 'pw3ertyuiophgfre45678',
+ name: 'rtyu',
},
- ],
- },
- },
- },
- },
- {
- request: {
- query: GROUP_CHAT_BY_ID,
- variables: {
- id: '',
- },
- },
- result: {
- data: {
- groupChatById: {
- _id: '1',
- createdAt: '2345678903456',
- title: 'Test Group Chat',
- messages: [
- {
- _id: '345678',
- createdAt: '345678908765',
- messageContent: 'Hello',
- sender: {
+ createdAt: '2345678903456',
+ name: 'Test Group Chat',
+ messages: [
+ {
+ _id: '345678',
+ createdAt: '345678908765',
+ messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
+ sender: {
+ _id: '2',
+ firstName: 'Test',
+ lastName: 'User',
+ email: 'test@example.com',
+ image: '',
+ },
+ },
+ ],
+ users: [
+ {
+ _id: '1',
+ firstName: 'Disha',
+ lastName: 'Talreja',
+ email: 'disha@example.com',
+ image: '',
+ },
+ {
_id: '2',
firstName: 'Test',
lastName: 'User',
email: 'test@example.com',
image: '',
},
- },
- ],
- users: [
- {
- _id: '1',
- firstName: 'Disha',
- lastName: 'Talreja',
- email: 'disha@example.com',
- image: '',
- },
- {
- _id: '2',
- firstName: 'Test',
- lastName: 'User',
- email: 'test@example.com',
- image: '',
- },
- {
- _id: '3',
- firstName: 'Test',
- lastName: 'User1',
- email: 'test1@example.com',
- image: '',
- },
- {
- _id: '4',
- firstName: 'Test',
- lastName: 'User2',
- email: 'test2@example.com',
- image: '',
- },
- {
- _id: '5',
- firstName: 'Test',
- lastName: 'User4',
- email: 'test4@example.com',
- image: '',
- },
- ],
- },
+ {
+ _id: '3',
+ firstName: 'Test',
+ lastName: 'User1',
+ email: 'test1@example.com',
+ image: '',
+ },
+ {
+ _id: '4',
+ firstName: 'Test',
+ lastName: 'User2',
+ email: 'test2@example.com',
+ image: '',
+ },
+ {
+ _id: '5',
+ firstName: 'Test',
+ lastName: 'User4',
+ email: 'test4@example.com',
+ image: '',
+ },
+ ],
+ },
+ ],
},
},
},
+];
+
+const GROUP_CHAT_BY_ID_QUERY_MOCK = [
{
request: {
- query: GROUP_CHAT_BY_ID,
+ query: CHAT_BY_ID,
variables: {
- id: '2',
+ id: '',
},
},
result: {
data: {
- groupChatById: {
+ chatById: {
_id: '65844efc814dd4003db811c4',
+ isGroup: true,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
+ },
+ organization: {
+ _id: 'pw3ertyuiophgfre45678',
+ name: 'rtyu',
+ },
createdAt: '2345678903456',
- title: 'Test Group Chat',
+ name: 'Test Group Chat',
messages: [
{
_id: '345678',
createdAt: '345678908765',
messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
sender: {
_id: '2',
firstName: 'Test',
@@ -1994,24 +1304,42 @@ const GROUP_CHAT_BY_ID_QUERY_MOCK = [
},
},
},
+];
+
+const CREATE_CHAT_MUTATION_MOCK = [
{
request: {
- query: GROUP_CHAT_BY_ID,
+ query: CREATE_CHAT,
variables: {
- id: null,
+ organizationId: undefined,
+ userIds: ['1', '6589389d2caa9d8d69087487'],
+ isGroup: false,
},
},
result: {
data: {
- groupChatById: {
- _id: '65844efc814dd4003db811c4',
+ createChat: {
+ _id: '1',
createdAt: '2345678903456',
- title: 'Test Group Chat',
+ isGroup: false,
+ creator: {
+ _id: '64378abd85008f171cf2990d',
+ firstName: 'Wilt',
+ lastName: 'Shepherd',
+ image: null,
+ email: 'testsuperadmin@example.com',
+ createdAt: '2023-04-13T04:53:17.742Z',
+ __typename: 'User',
+ },
+ organization: null,
+ name: '',
messages: [
{
_id: '345678',
createdAt: '345678908765',
messageContent: 'Hello',
+ replyTo: null,
+ type: 'STRING',
sender: {
_id: '2',
firstName: 'Test',
@@ -2036,27 +1364,6 @@ const GROUP_CHAT_BY_ID_QUERY_MOCK = [
email: 'test@example.com',
image: '',
},
- {
- _id: '3',
- firstName: 'Test',
- lastName: 'User1',
- email: 'test1@example.com',
- image: '',
- },
- {
- _id: '4',
- firstName: 'Test',
- lastName: 'User2',
- email: 'test2@example.com',
- image: '',
- },
- {
- _id: '5',
- firstName: 'Test',
- lastName: 'User4',
- email: 'test4@example.com',
- image: '',
- },
],
},
},
@@ -2064,24 +1371,6 @@ const GROUP_CHAT_BY_ID_QUERY_MOCK = [
},
];
-const CREATE_DIRECT_CHAT_MOCK = {
- request: {
- query: CREATE_DIRECT_CHAT,
- variables: {
- userIds: ['1', '6589389d2caa9d8d69087487'],
- organizationId: undefined,
- },
- },
- result: {
- data: {
- createDirectChat: {
- _id: '669394c180e96b740ba1c0ce',
- __typename: 'DirectChat',
- },
- },
- },
-};
-
async function wait(ms = 100): Promise
+
+ )}
+
+
+
+
+
+ {replyToDirectMessage.messageContent}
+
{props.title}
- {props.subtitle}