- {eventData.event.startTime !== null - ? `${formatTime(eventData.event.startTime)}` - : ``} + {eventData?.event?.startTime !== null + ? `${formatTime(eventData?.event?.startTime)}` + : ''} {' '} - {formatDate(eventData.event.startDate)}{' '} + {formatDate(eventData?.event?.startDate)}{' '}
{t('to')}
- {eventData.event.endTime !== null - ? `${formatTime(eventData.event.endTime)}` + {eventData?.event?.endTime !== null + ? `${formatTime(eventData?.event?.endTime)}` : ``} {' '} - {formatDate(eventData.event.endDate)}{' '} + {formatDate(eventData?.event?.endDate)}{' '}
{eventData.event.title}
+{eventData?.event?.title}
- {eventData.event.description} + {eventData?.event?.description}
- Location: {eventData.event.location} + Location: {eventData?.event?.location}
Registrants:{' '} - {eventData.event.attendees.length} + {eventData?.event?.attendees?.length}
diff --git a/src/components/EventManagement/EventActionItems/EventActionItems.test.tsx b/src/components/EventManagement/EventActionItems/EventActionItems.test.tsx index 9da0b5247a..3d1e5fa7bc 100644 --- a/src/components/EventManagement/EventActionItems/EventActionItems.test.tsx +++ b/src/components/EventManagement/EventActionItems/EventActionItems.test.tsx @@ -1,9 +1,8 @@ -import React from 'react'; +import React, { act } from 'react'; import { MockedProvider } from '@apollo/react-testing'; import { LocalizationProvider } from '@mui/x-date-pickers'; import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'; import { - act, fireEvent, render, screen, diff --git a/src/components/EventManagement/EventActionItems/EventActionItems.tsx b/src/components/EventManagement/EventActionItems/EventActionItems.tsx index cbe878fa07..0f9d723adc 100644 --- a/src/components/EventManagement/EventActionItems/EventActionItems.tsx +++ b/src/components/EventManagement/EventActionItems/EventActionItems.tsx @@ -8,7 +8,7 @@ import { useTranslation } from 'react-i18next'; import { toast } from 'react-toastify'; import styles from './EventActionItems.module.css'; import { DataGrid } from '@mui/x-data-grid'; -import type { GridCellParams } from '@mui/x-data-grid'; +// import type { GridCellParams } from '@mui/x-data-grid'; import { Stack } from '@mui/material'; import Modal from 'react-bootstrap/Modal'; import { @@ -156,7 +156,7 @@ function eventActionItems(props: { eventId: string }): JSX.Element { setDueDate(new Date()); actionItemsRefetch(); hideCreateModal(); - toast.success(t('successfulCreation')); + toast.success(t('successfulCreation') as string); } catch (error: unknown) { if (error instanceof Error) { toast.error(error.message); @@ -188,7 +188,7 @@ function eventActionItems(props: { eventId: string }): JSX.Element { actionItemsRefetch(); hideUpdateModal(); hideActionItemStatusModal(); - toast.success(t('successfulUpdation')); + toast.success(t('successfulUpdation') as string); } catch (error: unknown) { if (error instanceof Error) { toast.error(error.message); @@ -206,7 +206,7 @@ function eventActionItems(props: { eventId: string }): JSX.Element { actionItemsRefetch(); toggleDeleteModal(); hidePreviewModal(); - toast.success(t('successfulDeletion')); + toast.success(t('successfulDeletion') as string); } catch (error: unknown) { if (error instanceof Error) { toast.error(error.message); diff --git a/src/components/EventManagement/EventAgendaItems/EventAgendaItems.test.tsx b/src/components/EventManagement/EventAgendaItems/EventAgendaItems.test.tsx index b1b3ed6094..3bce7ad11e 100644 --- a/src/components/EventManagement/EventAgendaItems/EventAgendaItems.test.tsx +++ b/src/components/EventManagement/EventAgendaItems/EventAgendaItems.test.tsx @@ -14,7 +14,7 @@ import { I18nextProvider } from 'react-i18next'; import { Provider } from 'react-redux'; import { BrowserRouter } from 'react-router-dom'; import i18n from 'utils/i18nForTest'; -import { toast } from 'react-toastify'; +// import { toast } from 'react-toastify'; import { LocalizationProvider } from '@mui/x-date-pickers'; import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'; @@ -26,7 +26,7 @@ import EventAgendaItems from './EventAgendaItems'; import { MOCKS, MOCKS_ERROR_QUERY, - MOCKS_ERROR_MUTATION, + // MOCKS_ERROR_MUTATION, } from './EventAgendaItemsMocks'; jest.mock('react-toastify', () => ({ @@ -41,6 +41,15 @@ jest.mock('react-router-dom', () => ({ useParams: () => ({ eventId: '123' }), })); +//temporarily fixes react-beautiful-dnd droppable method's depreciation error +//needs to be fixed in React 19 +jest.spyOn(console, 'error').mockImplementation((message) => { + if (message.includes('Support for defaultProps will be removed')) { + return; + } + console.error(message); +}); + async function wait(ms = 100): Promise
Error occurred while loading{' '}
- {agendaCategoryError
- ? 'Agenda Categories'
- : agendaItemError && 'Agenda Items'}
- Data
+ {agendaCategoryError ? 'Agenda Categories' : 'Agenda Items'} Data
- {agendaCategoryError
- ? agendaCategoryError.message
- : agendaItemError && (agendaItemError as Error).message}
+ {errorMessage}
+
{
...customFieldData,
},
});
- toast.success(t('fieldSuccessMessage'));
+ toast.success(t('fieldSuccessMessage') as string);
setCustomFieldData({ type: '', name: '' });
refetch();
} catch (error) {
@@ -89,7 +89,7 @@ const OrgProfileFieldSettings = (): JSX.Element => {
},
});
- toast.success(t('fieldRemovalSuccess'));
+ toast.success(t('fieldRemovalSuccess') as string);
refetch();
} catch (error) {
toast.error((error as Error).message);
diff --git a/src/components/OrgUpdate/OrgUpdate.test.tsx b/src/components/OrgUpdate/OrgUpdate.test.tsx
index 9c56a61d78..6304bb3ec9 100644
--- a/src/components/OrgUpdate/OrgUpdate.test.tsx
+++ b/src/components/OrgUpdate/OrgUpdate.test.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { I18nextProvider } from 'react-i18next';
import { StaticMockLink } from 'utils/StaticMockLink';
diff --git a/src/components/OrgUpdate/OrgUpdate.tsx b/src/components/OrgUpdate/OrgUpdate.tsx
index f33c758acd..6e0be28a56 100644
--- a/src/components/OrgUpdate/OrgUpdate.tsx
+++ b/src/components/OrgUpdate/OrgUpdate.tsx
@@ -144,7 +144,7 @@ function orgUpdate(props: InterfaceOrgUpdateProps): JSX.Element {
// istanbul ignore next
if (data) {
refetch({ id: orgId });
- toast.success(t('successfulUpdated'));
+ toast.success(t('successfulUpdated') as string);
}
} catch (error: unknown) {
errorHandler(t, error);
diff --git a/src/components/OrganizationCard/OrganizationCard.test.tsx b/src/components/OrganizationCard/OrganizationCard.test.tsx
index e0095d20b2..e4abf3a1fd 100644
--- a/src/components/OrganizationCard/OrganizationCard.test.tsx
+++ b/src/components/OrganizationCard/OrganizationCard.test.tsx
@@ -6,7 +6,6 @@ describe('Testing the Organization Card', () => {
test('should render props and text elements test for the page component', () => {
const props = {
id: '123',
- key: '456',
image: 'https://via.placeholder.com/80',
firstName: 'John',
lastName: 'Doe',
@@ -24,7 +23,6 @@ describe('Testing the Organization Card', () => {
test('Should render text elements when props value is not passed', () => {
const props = {
id: '123',
- key: '456',
image: '',
firstName: 'John',
lastName: 'Doe',
diff --git a/src/components/OrganizationCard/OrganizationCard.tsx b/src/components/OrganizationCard/OrganizationCard.tsx
index 05f8712ec5..ae513eff5d 100644
--- a/src/components/OrganizationCard/OrganizationCard.tsx
+++ b/src/components/OrganizationCard/OrganizationCard.tsx
@@ -12,47 +12,45 @@ interface InterfaceOrganizationCardProps {
/**
* Component to display an organization's card with its image and owner details.
*
- * @param image - URL of the organization's image.
- * @param id - Unique identifier for the organization.
- * @param name - Name of the organization.
- * @param lastName - Last name of the owner's name.
- * @param firstName - First name of the owner's name.
+ * @param props - Properties for the organization card.
* @returns JSX element representing the organization card.
*/
-function organizationCard(props: InterfaceOrganizationCardProps): JSX.Element {
+function OrganizationCard(props: InterfaceOrganizationCardProps): JSX.Element {
const uri = '/superorghome/i=' + props.id;
return (
- <>
-
-
diff --git a/src/screens/CommunityProfile/CommunityProfile.test.tsx b/src/screens/CommunityProfile/CommunityProfile.test.tsx
index 033c48464f..d7e056caa4 100644
--- a/src/screens/CommunityProfile/CommunityProfile.test.tsx
+++ b/src/screens/CommunityProfile/CommunityProfile.test.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
-import { act, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import 'jest-localstorage-mock';
import 'jest-location-mock';
@@ -213,53 +213,53 @@ describe('Testing Community Profile Screen', () => {
,
);
- await wait();
+ });
+ await wait();
- const communityName = screen.getByPlaceholderText(/Community Name/i);
- const websiteLink = screen.getByPlaceholderText(/Website Link/i);
- const logo = screen.getByTestId(/fileInput/i);
- const facebook = screen.getByTestId(/facebook/i);
- const instagram = screen.getByTestId(/instagram/i);
- const X = screen.getByTestId(/X/i);
- const linkedIn = screen.getByTestId(/linkedIn/i);
- const github = screen.getByTestId(/github/i);
- const youtube = screen.getByTestId(/youtube/i);
- const reddit = screen.getByTestId(/reddit/i);
- const slack = screen.getByTestId(/slack/i);
- const saveChangesBtn = screen.getByTestId(/saveChangesBtn/i);
- const resetChangeBtn = screen.getByTestId(/resetChangesBtn/i);
+ const communityName = screen.getByPlaceholderText(/Community Name/i);
+ const websiteLink = screen.getByPlaceholderText(/Website Link/i);
+ const logo = screen.getByTestId(/fileInput/i);
+ const facebook = screen.getByTestId(/facebook/i);
+ const instagram = screen.getByTestId(/instagram/i);
+ const X = screen.getByTestId(/X/i);
+ const linkedIn = screen.getByTestId(/linkedIn/i);
+ const github = screen.getByTestId(/github/i);
+ const youtube = screen.getByTestId(/youtube/i);
+ const reddit = screen.getByTestId(/reddit/i);
+ const slack = screen.getByTestId(/slack/i);
+ const saveChangesBtn = screen.getByTestId(/saveChangesBtn/i);
+ const resetChangeBtn = screen.getByTestId(/resetChangesBtn/i);
- userEvent.type(communityName, profileVariables.name);
- userEvent.type(websiteLink, profileVariables.websiteLink);
- userEvent.type(facebook, profileVariables.socialUrl);
- userEvent.type(instagram, profileVariables.socialUrl);
- userEvent.type(X, profileVariables.socialUrl);
- userEvent.type(linkedIn, profileVariables.socialUrl);
- userEvent.type(github, profileVariables.socialUrl);
- userEvent.type(youtube, profileVariables.socialUrl);
- userEvent.type(reddit, profileVariables.socialUrl);
- userEvent.type(slack, profileVariables.socialUrl);
- userEvent.upload(logo, profileVariables.logo);
- await wait();
+ userEvent.type(communityName, profileVariables.name);
+ userEvent.type(websiteLink, profileVariables.websiteLink);
+ userEvent.type(facebook, profileVariables.socialUrl);
+ userEvent.type(instagram, profileVariables.socialUrl);
+ userEvent.type(X, profileVariables.socialUrl);
+ userEvent.type(linkedIn, profileVariables.socialUrl);
+ userEvent.type(github, profileVariables.socialUrl);
+ userEvent.type(youtube, profileVariables.socialUrl);
+ userEvent.type(reddit, profileVariables.socialUrl);
+ userEvent.type(slack, profileVariables.socialUrl);
+ userEvent.upload(logo, profileVariables.logo);
+ await wait();
- expect(communityName).toHaveValue(profileVariables.name);
- expect(websiteLink).toHaveValue(profileVariables.websiteLink);
- // expect(logo).toBeTruthy();
- expect(facebook).toHaveValue(profileVariables.socialUrl);
- expect(instagram).toHaveValue(profileVariables.socialUrl);
- expect(X).toHaveValue(profileVariables.socialUrl);
- expect(linkedIn).toHaveValue(profileVariables.socialUrl);
- expect(github).toHaveValue(profileVariables.socialUrl);
- expect(youtube).toHaveValue(profileVariables.socialUrl);
- expect(reddit).toHaveValue(profileVariables.socialUrl);
- expect(slack).toHaveValue(profileVariables.socialUrl);
- expect(saveChangesBtn).not.toBeDisabled();
- expect(resetChangeBtn).not.toBeDisabled();
- await wait();
+ expect(communityName).toHaveValue(profileVariables.name);
+ expect(websiteLink).toHaveValue(profileVariables.websiteLink);
+ // expect(logo).toBeTruthy();
+ expect(facebook).toHaveValue(profileVariables.socialUrl);
+ expect(instagram).toHaveValue(profileVariables.socialUrl);
+ expect(X).toHaveValue(profileVariables.socialUrl);
+ expect(linkedIn).toHaveValue(profileVariables.socialUrl);
+ expect(github).toHaveValue(profileVariables.socialUrl);
+ expect(youtube).toHaveValue(profileVariables.socialUrl);
+ expect(reddit).toHaveValue(profileVariables.socialUrl);
+ expect(slack).toHaveValue(profileVariables.socialUrl);
+ expect(saveChangesBtn).not.toBeDisabled();
+ expect(resetChangeBtn).not.toBeDisabled();
+ await wait();
- userEvent.click(saveChangesBtn);
- await wait();
- });
+ userEvent.click(saveChangesBtn);
+ await wait();
});
test('If the queried data has some fields null then the input field should be empty', async () => {
diff --git a/src/screens/CommunityProfile/CommunityProfile.tsx b/src/screens/CommunityProfile/CommunityProfile.tsx
index 2f2d956b55..02f8b8aca4 100644
--- a/src/screens/CommunityProfile/CommunityProfile.tsx
+++ b/src/screens/CommunityProfile/CommunityProfile.tsx
@@ -146,7 +146,7 @@ const CommunityProfile = (): JSX.Element => {
},
},
});
- toast.success(t('profileChangedMsg'));
+ toast.success(t('profileChangedMsg') as string);
} catch (error: unknown) {
/* istanbul ignore next */
errorHandler(t, error as Error);
@@ -179,7 +179,7 @@ const CommunityProfile = (): JSX.Element => {
resetPreLoginImageryId: preLoginData?._id,
},
});
- toast.success(t(`resetData`));
+ toast.success(t(`resetData`) as string);
} catch (error: unknown) {
/* istanbul ignore next */
errorHandler(t, error as Error);
diff --git a/src/screens/EventManagement/EventManagement.tsx b/src/screens/EventManagement/EventManagement.tsx
index adcc536a08..74dfc806ce 100644
--- a/src/screens/EventManagement/EventManagement.tsx
+++ b/src/screens/EventManagement/EventManagement.tsx
@@ -139,14 +139,13 @@ const EventManagement = (): JSX.Element => {
const props = {
variant,
className,
- key: value,
size: 'sm' as 'sm' | 'lg',
onClick: () => handleClick(value),
'data-testid': `${value}Btn`,
};
return (
-
-
{/* Table */}
- {loadingMembers == false &&
+ {loadingMembers === false &&
membersData.length === 0 &&
searchByName.length > 0 ? (
- {props.image ? (
- 
- ) : (
- 
- )}
- {
await act(() => {
return new Promise((resolve) => {
@@ -41,7 +42,6 @@ describe('Testing User List Card', () => {
test('Should render props and text elements test for the page component', async () => {
const props = {
- key: 123,
id: '456',
};
@@ -49,7 +49,7 @@ describe('Testing User List Card', () => {
-
,
@@ -62,7 +62,6 @@ describe('Testing User List Card', () => {
test('Should render text elements when props value is not passed', async () => {
const props = {
- key: 123,
id: '456',
};
@@ -70,7 +69,7 @@ describe('Testing User List Card', () => {
-
,
diff --git a/src/components/UserListCard/UserListCard.tsx b/src/components/UserListCard/UserListCard.tsx
index 193569424f..76ad110ea1 100644
--- a/src/components/UserListCard/UserListCard.tsx
+++ b/src/components/UserListCard/UserListCard.tsx
@@ -47,7 +47,7 @@ function userListCard(props: InterfaceUserListCardProps): JSX.Element {
/* istanbul ignore next */
if (data) {
- toast.success(t('addedAsAdmin'));
+ toast.success(t('addedAsAdmin') as string);
setTimeout(() => {
window.location.reload();
}, 2000);
diff --git a/src/components/UserPasswordUpdate/UserPasswordUpdate.test.tsx b/src/components/UserPasswordUpdate/UserPasswordUpdate.test.tsx
index 4fcbb18070..65f5e40f76 100644
--- a/src/components/UserPasswordUpdate/UserPasswordUpdate.test.tsx
+++ b/src/components/UserPasswordUpdate/UserPasswordUpdate.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, render, screen } from '@testing-library/react';
+import React, { act } from 'react';
+import { render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import userEvent from '@testing-library/user-event';
import { I18nextProvider } from 'react-i18next';
@@ -20,7 +20,7 @@ const MOCKS = [
{
request: {
query: UPDATE_USER_PASSWORD_MUTATION,
- variable: {
+ variables: {
previousPassword: 'anshgoyal',
newPassword: 'anshgoyalansh',
confirmNewPassword: 'anshgoyalansh',
@@ -49,15 +49,10 @@ async function wait(ms = 5): Promise {
}
describe('Testing User Password Update', () => {
- const props = {
- key: '123',
- id: '1',
- };
-
const formData = {
previousPassword: 'Palisadoes',
newPassword: 'ThePalisadoesFoundation',
- wrongPassword: 'This is wrong passoword',
+ wrongPassword: 'This is wrong password',
confirmNewPassword: 'ThePalisadoesFoundation',
};
@@ -67,7 +62,7 @@ describe('Testing User Password Update', () => {
render(
-
,
);
@@ -102,7 +97,7 @@ describe('Testing User Password Update', () => {
render(
-
,
);
@@ -117,7 +112,7 @@ describe('Testing User Password Update', () => {
render(
-
,
);
diff --git a/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx b/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx
index e1f8c64f0b..1ea75811c1 100644
--- a/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx
+++ b/src/components/UserPasswordUpdate/UserPasswordUpdate.tsx
@@ -45,12 +45,12 @@ const UserUpdate: React.FC<
!formState.newPassword ||
!formState.confirmNewPassword
) {
- toast.error(t('passCantBeEmpty'));
+ toast.error(t('passCantBeEmpty') as string);
return;
}
if (formState.newPassword !== formState.confirmNewPassword) {
- toast.error(t('passNoMatch'));
+ toast.error(t('passNoMatch') as string);
return;
}
@@ -64,7 +64,9 @@ const UserUpdate: React.FC<
});
/* istanbul ignore next */
if (data) {
- toast.success(tCommon('updatedSuccessfully', { item: 'Password' }));
+ toast.success(
+ tCommon('updatedSuccessfully', { item: 'Password' }) as string,
+ );
setTimeout(() => {
window.location.reload();
}, 2000);
diff --git a/src/components/UserPortal/CommentCard/CommentCard.test.tsx b/src/components/UserPortal/CommentCard/CommentCard.test.tsx
index 35b81167fc..f02e5a606a 100644
--- a/src/components/UserPortal/CommentCard/CommentCard.test.tsx
+++ b/src/components/UserPortal/CommentCard/CommentCard.test.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
-import { act, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
diff --git a/src/components/UserPortal/CommentCard/CommentCard.tsx b/src/components/UserPortal/CommentCard/CommentCard.tsx
index 026c2f1af3..9e8c46d241 100644
--- a/src/components/UserPortal/CommentCard/CommentCard.tsx
+++ b/src/components/UserPortal/CommentCard/CommentCard.tsx
@@ -92,7 +92,7 @@ function commentCard(props: InterfaceCommentCardProps): JSX.Element {
}
} catch (error: unknown) {
/* istanbul ignore next */
- toast.error(error);
+ toast.error(error as string);
}
} else {
try {
@@ -109,7 +109,7 @@ function commentCard(props: InterfaceCommentCardProps): JSX.Element {
}
} catch (error: unknown) {
/* istanbul ignore next */
- toast.error(error);
+ toast.error(error as string);
}
}
};
diff --git a/src/components/UserPortal/ContactCard/ContactCard.test.tsx b/src/components/UserPortal/ContactCard/ContactCard.test.tsx
index 7f55196bb0..03136387a7 100644
--- a/src/components/UserPortal/ContactCard/ContactCard.test.tsx
+++ b/src/components/UserPortal/ContactCard/ContactCard.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, render, screen } from '@testing-library/react';
+import React, { act } from 'react';
+import { render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
diff --git a/src/components/UserPortal/DonationCard/DonationCard.test.tsx b/src/components/UserPortal/DonationCard/DonationCard.test.tsx
index 4e49ed8b26..cddf62dd6c 100644
--- a/src/components/UserPortal/DonationCard/DonationCard.test.tsx
+++ b/src/components/UserPortal/DonationCard/DonationCard.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, render } from '@testing-library/react';
+import React, { act } from 'react';
+import { render } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
diff --git a/src/components/UserPortal/EventCard/EventCard.tsx b/src/components/UserPortal/EventCard/EventCard.tsx
index 3b9d328154..e93138ce42 100644
--- a/src/components/UserPortal/EventCard/EventCard.tsx
+++ b/src/components/UserPortal/EventCard/EventCard.tsx
@@ -103,7 +103,7 @@ function eventCard(props: InterfaceEventCardProps): JSX.Element {
}
} catch (error: unknown) {
/* istanbul ignore next */
- toast.error(error);
+ toast.error(error as string);
}
}
};
diff --git a/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx b/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
index dba4286290..5546166b9a 100644
--- a/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
+++ b/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import React, { act } from 'react';
+import { fireEvent, render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
diff --git a/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx b/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx
index b88e17ae95..e1c2c23beb 100644
--- a/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx
+++ b/src/components/UserPortal/OrganizationCard/OrganizationCard.tsx
@@ -110,23 +110,23 @@ function organizationCard(props: InterfaceOrganizationCardProps): JSX.Element {
organizationId: props.id,
},
});
- toast.success(t('MembershipRequestSent'));
+ toast.success(t('MembershipRequestSent') as string);
} else {
await joinPublicOrganization({
variables: {
organizationId: props.id,
},
});
- toast.success(t('orgJoined'));
+ toast.success(t('orgJoined') as string);
}
refetch();
} catch (error: unknown) {
/* istanbul ignore next */
if (error instanceof Error) {
if (error.message === 'User is already a member') {
- toast.error(t('AlreadyJoined'));
+ toast.error(t('AlreadyJoined') as string);
} else {
- toast.error(t('errorOccured'));
+ toast.error(t('errorOccured') as string);
}
}
}
diff --git a/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.test.tsx b/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.test.tsx
index 027234b641..038ff626df 100644
--- a/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.test.tsx
+++ b/src/components/UserPortal/OrganizationNavbar/OrganizationNavbar.test.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
import 'jest-localstorage-mock';
-import { act, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
import { Provider } from 'react-redux';
import { BrowserRouter, Router } from 'react-router-dom';
diff --git a/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.test.tsx b/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.test.tsx
index c5fbcf335e..c08240462a 100644
--- a/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.test.tsx
+++ b/src/components/UserPortal/OrganizationSidebar/OrganizationSidebar.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, render, screen } from '@testing-library/react';
+import React, { act } from 'react';
+import { render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
diff --git a/src/components/UserPortal/PeopleCard/PeopleCard.test.tsx b/src/components/UserPortal/PeopleCard/PeopleCard.test.tsx
index 5cadfa923b..fd5d6c7f93 100644
--- a/src/components/UserPortal/PeopleCard/PeopleCard.test.tsx
+++ b/src/components/UserPortal/PeopleCard/PeopleCard.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, render } from '@testing-library/react';
+import React, { act } from 'react';
+import { render } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
diff --git a/src/components/UserPortal/PostCard/PostCard.test.tsx b/src/components/UserPortal/PostCard/PostCard.test.tsx
index 64f6670223..f7d9217308 100644
--- a/src/components/UserPortal/PostCard/PostCard.test.tsx
+++ b/src/components/UserPortal/PostCard/PostCard.test.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
-import { act, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
diff --git a/src/components/UserPortal/PostCard/PostCard.tsx b/src/components/UserPortal/PostCard/PostCard.tsx
index 3eed167f65..f8fcdaebca 100644
--- a/src/components/UserPortal/PostCard/PostCard.tsx
+++ b/src/components/UserPortal/PostCard/PostCard.tsx
@@ -128,7 +128,7 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
}
} catch (error: unknown) {
/* istanbul ignore next */
- toast.error(error);
+ toast.error(error as string);
}
} else {
try {
@@ -144,7 +144,7 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
}
} catch (error: unknown) {
/* istanbul ignore next */
- toast.error(error);
+ toast.error(error as string);
}
}
};
@@ -245,7 +245,7 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
props.fetchPosts(); // Refresh the posts
toggleEditPost();
- toast.success(tCommon('updatedSuccessfully', { item: 'Post' }));
+ toast.success(tCommon('updatedSuccessfully', { item: 'Post' }) as string);
} catch (error: unknown) {
/* istanbul ignore next */
errorHandler(t, error);
diff --git a/src/components/UserPortal/PromotedPost/PromotedPost.test.tsx b/src/components/UserPortal/PromotedPost/PromotedPost.test.tsx
index b5d753551c..6ec8ec5de7 100644
--- a/src/components/UserPortal/PromotedPost/PromotedPost.test.tsx
+++ b/src/components/UserPortal/PromotedPost/PromotedPost.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, render, waitFor } from '@testing-library/react';
+import React, { act } from 'react';
+import { render, waitFor } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
diff --git a/src/components/UserPortal/Register/Register.test.tsx b/src/components/UserPortal/Register/Register.test.tsx
index cdcfb9ebc0..f9929a0588 100644
--- a/src/components/UserPortal/Register/Register.test.tsx
+++ b/src/components/UserPortal/Register/Register.test.tsx
@@ -1,6 +1,6 @@
import type { SetStateAction } from 'react';
-import React from 'react';
-import { act, render, screen } from '@testing-library/react';
+import React, { act } from 'react';
+import { render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import userEvent from '@testing-library/user-event';
import { I18nextProvider } from 'react-i18next';
diff --git a/src/components/UserPortal/Register/Register.tsx b/src/components/UserPortal/Register/Register.tsx
index 952acf7987..11a810c955 100644
--- a/src/components/UserPortal/Register/Register.tsx
+++ b/src/components/UserPortal/Register/Register.tsx
@@ -57,11 +57,11 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
registerVariables.lastName
)
) {
- toast.error(t('invalidDetailsMessage')); // Error if fields are missing
+ toast.error(t('invalidDetailsMessage') as string); // Error if fields are missing
} else if (
registerVariables.password !== registerVariables.confirmPassword
) {
- toast.error(t('passwordNotMatch')); // Error if passwords do not match
+ toast.error(t('passwordNotMatch') as string); // Error if passwords do not match
} else {
try {
await registerMutation({
@@ -73,7 +73,7 @@ export default function register(props: InterfaceRegisterProps): JSX.Element {
},
});
- toast.success(t('afterRegister')); // Success message
+ toast.success(t('afterRegister') as string); // Success message
// Reset form fields
/* istanbul ignore next */
diff --git a/src/components/UserPortal/StartPostModal/StartPostModal.test.tsx b/src/components/UserPortal/StartPostModal/StartPostModal.test.tsx
index 5a2e815af4..5c436705cd 100644
--- a/src/components/UserPortal/StartPostModal/StartPostModal.test.tsx
+++ b/src/components/UserPortal/StartPostModal/StartPostModal.test.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
import type { RenderResult } from '@testing-library/react';
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
import userEvent from '@testing-library/user-event';
import { CREATE_POST_MUTATION } from 'GraphQl/Mutations/mutations';
diff --git a/src/components/UserPortal/StartPostModal/StartPostModal.tsx b/src/components/UserPortal/StartPostModal/StartPostModal.tsx
index 060963865a..d48b8425fa 100644
--- a/src/components/UserPortal/StartPostModal/StartPostModal.tsx
+++ b/src/components/UserPortal/StartPostModal/StartPostModal.tsx
@@ -93,7 +93,7 @@ const startPostModal = ({
/* istanbul ignore next */
if (data) {
toast.dismiss();
- toast.success(t('postNowVisibleInFeed'));
+ toast.success(t('postNowVisibleInFeed') as string);
fetchPosts();
handleHide();
}
diff --git a/src/components/UserPortal/UserNavbar/UserNavbar.test.tsx b/src/components/UserPortal/UserNavbar/UserNavbar.test.tsx
index 59e3585aa0..8c3447f25a 100644
--- a/src/components/UserPortal/UserNavbar/UserNavbar.test.tsx
+++ b/src/components/UserPortal/UserNavbar/UserNavbar.test.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
-import { act, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
diff --git a/src/components/UserPortal/UserSidebar/UserSidebar.test.tsx b/src/components/UserPortal/UserSidebar/UserSidebar.test.tsx
index 2984604951..7218bc745c 100644
--- a/src/components/UserPortal/UserSidebar/UserSidebar.test.tsx
+++ b/src/components/UserPortal/UserSidebar/UserSidebar.test.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { act } from 'react';
import type { RenderResult } from '@testing-library/react';
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
@@ -19,14 +19,17 @@ import useLocalStorage from 'utils/useLocalstorage';
const { setItem } = useLocalStorage();
const resizeWindow = (width: number): void => {
- window.innerWidth = width;
- fireEvent(window, new Event('resize'));
+ act(() => {
+ window.innerWidth = width;
+ fireEvent(window, new Event('resize'));
+ });
};
const props = {
hideDrawer: true,
setHideDrawer: jest.fn(),
};
+
const MOCKS = [
{
request: {
@@ -366,38 +369,48 @@ describe('Testing UserSidebar Component [User Portal]', () => {
});
test('Component should be rendered properly', async () => {
- renderUserSidebar('properId', link);
- await wait();
+ await act(async () => {
+ renderUserSidebar('properId', link);
+ await wait();
+ });
});
test('Component should be rendered properly when userImage is present', async () => {
- renderUserSidebar('imagePresent', link);
- await wait();
+ await act(async () => {
+ renderUserSidebar('imagePresent', link);
+ await wait();
+ });
});
test('Component should be rendered properly when organizationImage is present', async () => {
- renderUserSidebar('imagePresent', link);
- await wait();
+ await act(async () => {
+ renderUserSidebar('imagePresent', link);
+ await wait();
+ });
});
test('Component should be rendered properly when joinedOrganizations list is empty', async () => {
- renderUserSidebar('orgEmpty', link);
- await wait();
+ await act(async () => {
+ renderUserSidebar('orgEmpty', link);
+ await wait();
+ });
});
- test('Testing Drawer when the screen size is less than or equal to 820px', () => {
- resizeWindow(800);
- render(
-
-
-
-
-
-
-
- ,
- );
+ test('Testing Drawer when the screen size is less than or equal to 820px', async () => {
+ await act(async () => {
+ resizeWindow(800);
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+ });
expect(screen.getByText('My Organizations')).toBeInTheDocument();
expect(screen.getByText('Settings')).toBeInTheDocument();
expect(screen.getByText('Talawa User Portal')).toBeInTheDocument();
@@ -405,13 +418,21 @@ describe('Testing UserSidebar Component [User Portal]', () => {
const orgsBtn = screen.getAllByTestId(/orgsBtn/i);
- orgsBtn[0].click();
- expect(
- orgsBtn[0].className.includes('text-white btn btn-success'),
- ).toBeTruthy();
- settingsBtn.click();
- expect(
- settingsBtn.className.includes('text-white btn btn-success'),
- ).toBeTruthy();
+ act(() => {
+ orgsBtn[0].click();
+ });
+ await waitFor(() =>
+ expect(
+ orgsBtn[0].className.includes('text-white btn btn-success'),
+ ).toBeTruthy(),
+ );
+ act(() => {
+ settingsBtn.click();
+ });
+ await waitFor(() =>
+ expect(
+ settingsBtn.className.includes('text-white btn btn-success'),
+ ).toBeTruthy(),
+ );
});
});
diff --git a/src/components/UserPortal/UserSidebarOrg/UserSidebarOrg.test.tsx b/src/components/UserPortal/UserSidebarOrg/UserSidebarOrg.test.tsx
index d9d70478b3..c187dabb55 100644
--- a/src/components/UserPortal/UserSidebarOrg/UserSidebarOrg.test.tsx
+++ b/src/components/UserPortal/UserSidebarOrg/UserSidebarOrg.test.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { act } from 'react';
import { fireEvent, render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import 'jest-localstorage-mock';
@@ -12,7 +12,6 @@ import { Provider } from 'react-redux';
import { MockedProvider } from '@apollo/react-testing';
import { store } from 'state/store';
import { ORGANIZATIONS_LIST } from 'GraphQl/Queries/Queries';
-import { act } from 'react-dom/test-utils';
import { StaticMockLink } from 'utils/StaticMockLink';
import { REVOKE_REFRESH_TOKEN } from 'GraphQl/Mutations/mutations';
import useLocalStorage from 'utils/useLocalstorage';
diff --git a/src/components/UsersTableItem/UserTableItem.test.tsx b/src/components/UsersTableItem/UserTableItem.test.tsx
index bfa0a31c86..e87b41f7f2 100644
--- a/src/components/UsersTableItem/UserTableItem.test.tsx
+++ b/src/components/UsersTableItem/UserTableItem.test.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
import { toast } from 'react-toastify';
import { StaticMockLink } from 'utils/StaticMockLink';
diff --git a/src/components/UsersTableItem/UsersTableItem.tsx b/src/components/UsersTableItem/UsersTableItem.tsx
index 9d6ec65187..9e94b8a9f5 100644
--- a/src/components/UsersTableItem/UsersTableItem.tsx
+++ b/src/components/UsersTableItem/UsersTableItem.tsx
@@ -56,7 +56,9 @@ const UsersTableItem = (props: Props): JSX.Element => {
},
});
if (data) {
- toast.success(tCommon('removedSuccessfully', { item: 'User' }));
+ toast.success(
+ tCommon('removedSuccessfully', { item: 'User' }) as string,
+ );
resetAndRefetch();
}
} catch (error: unknown) {
@@ -77,7 +79,7 @@ const UsersTableItem = (props: Props): JSX.Element => {
},
});
if (data) {
- toast.success(t('roleUpdated'));
+ toast.success(t('roleUpdated') as string);
resetAndRefetch();
}
} catch (error: unknown) {
diff --git a/src/components/Venues/VenueModal.test.tsx b/src/components/Venues/VenueModal.test.tsx
index 652816adaf..b299c8ff20 100644
--- a/src/components/Venues/VenueModal.test.tsx
+++ b/src/components/Venues/VenueModal.test.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
import type { RenderResult } from '@testing-library/react';
-import { act, render, screen, fireEvent } from '@testing-library/react';
+import { render, screen, fireEvent } from '@testing-library/react';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
import 'jest-location-mock';
diff --git a/src/components/Venues/VenueModal.tsx b/src/components/Venues/VenueModal.tsx
index fd672d4ea2..476964b910 100644
--- a/src/components/Venues/VenueModal.tsx
+++ b/src/components/Venues/VenueModal.tsx
@@ -77,13 +77,13 @@ const VenueModal = ({
*/
const handleSubmit = useCallback(async () => {
if (formState.name.trim().length === 0) {
- toast.error(t('venueTitleError'));
+ toast.error(t('venueTitleError') as string);
return;
}
const capacityNum = parseInt(formState.capacity);
if (isNaN(capacityNum) || capacityNum <= 0) {
- toast.error(t('venueCapacityError'));
+ toast.error(t('venueCapacityError') as string);
return;
}
@@ -100,7 +100,9 @@ const VenueModal = ({
});
/* istanbul ignore next */
if (data) {
- toast.success(edit ? t('venueUpdated') : t('venueAdded'));
+ toast.success(
+ edit ? (t('venueUpdated') as string) : (t('venueAdded') as string),
+ );
refetchVenues();
onHide();
setFormState({
diff --git a/src/components/plugins/DummyPlugin/DummyPlugin.test.jsx b/src/components/plugins/DummyPlugin/DummyPlugin.test.jsx
index ae792966fe..e1abb52a1e 100644
--- a/src/components/plugins/DummyPlugin/DummyPlugin.test.jsx
+++ b/src/components/plugins/DummyPlugin/DummyPlugin.test.jsx
@@ -1,15 +1,16 @@
+import React from 'react';
import { MockedProvider } from '@apollo/react-testing';
import { render } from '@testing-library/react';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
import { I18nextProvider } from 'react-i18next';
-import React from 'react';
-
import { store } from 'state/store';
import DummyPlugin from './DummyPlugin';
import i18nForTest from 'utils/i18nForTest';
import { StaticMockLink } from 'utils/StaticMockLink';
+
const link = new StaticMockLink([], true);
+
describe('Testing dummy plugin', () => {
test('should render props and text elements test for the page component', () => {
const { getByText } = render(
@@ -21,7 +22,7 @@ describe('Testing dummy plugin', () => {
-
+ ,
);
expect(getByText(/Welcome to the Dummy Plugin!/i)).toBeInTheDocument();
diff --git a/src/components/plugins/DummyPlugin/DummyPlugin.tsx b/src/components/plugins/DummyPlugin/DummyPlugin.tsx
index d3c8ed8d41..5b837ea076 100644
--- a/src/components/plugins/DummyPlugin/DummyPlugin.tsx
+++ b/src/components/plugins/DummyPlugin/DummyPlugin.tsx
@@ -9,7 +9,7 @@ import AddOn from 'components/AddOn/AddOn';
*
* @returns JSX.Element - Renders the `AddOn` component containing a welcome message.
*/
-function dummyPlugin(): JSX.Element {
+function DummyPlugin(): JSX.Element {
return (
-
+ ,
);
});
});
diff --git a/src/components/plugins/DummyPlugin2/DummyPlugin2.tsx b/src/components/plugins/DummyPlugin2/DummyPlugin2.tsx
index 9d7e5e4498..dca6d63ee3 100644
--- a/src/components/plugins/DummyPlugin2/DummyPlugin2.tsx
+++ b/src/components/plugins/DummyPlugin2/DummyPlugin2.tsx
@@ -7,12 +7,8 @@ import React from 'react';
* This component currently does not have any additional functionality
* or properties.
*/
-function dummyPlugin2(): JSX.Element {
+function DummyPlugin2(): JSX.Element {
return ;
}
-dummyPlugin2.defaultProps = {};
-
-dummyPlugin2.propTypes = {};
-
-export default dummyPlugin2;
+export default DummyPlugin2;
diff --git a/src/index.tsx b/src/index.tsx
index 44cb0578b6..7a1bbeba59 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,5 +1,5 @@
import React, { Suspense } from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
import { BrowserRouter } from 'react-router-dom';
import type { NormalizedCacheObject } from '@apollo/client';
import {
@@ -131,7 +131,10 @@ const client: ApolloClient = new ApolloClient({
});
const fallbackLoader = ;
-ReactDOM.render(
+const container = document.getElementById('root');
+const root = createRoot(container!); // Note the use of '!' is to assert the container is not null
+
+root.render(
@@ -146,5 +149,4 @@ ReactDOM.render(
,
- document.getElementById('root'),
);
diff --git a/src/screens/BlockUser/BlockUser.test.tsx b/src/screens/BlockUser/BlockUser.test.tsx
index bb490fbe3f..c851470d9b 100644
--- a/src/screens/BlockUser/BlockUser.test.tsx
+++ b/src/screens/BlockUser/BlockUser.test.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
-import { act, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import {
BLOCK_USER_MUTATION,
diff --git a/src/screens/BlockUser/BlockUser.tsx b/src/screens/BlockUser/BlockUser.tsx
index f32ffe6091..1f36257bb1 100644
--- a/src/screens/BlockUser/BlockUser.tsx
+++ b/src/screens/BlockUser/BlockUser.tsx
@@ -1,5 +1,5 @@
import { useMutation, useQuery } from '@apollo/client';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
import { Dropdown, Form, Table } from 'react-bootstrap';
import Button from 'react-bootstrap/Button';
import { toast } from 'react-toastify';
@@ -83,90 +83,99 @@ const Requests = (): JSX.Element => {
return;
}
- if (showBlockedMembers == false) {
- setMembersData(memberData?.organizationsMemberConnection.edges);
+ if (!showBlockedMembers) {
+ setMembersData(memberData?.organizationsMemberConnection.edges || []);
} else {
const blockUsers = memberData?.organizationsMemberConnection.edges.filter(
(user: InterfaceMember) =>
user.organizationsBlockedBy.some((org) => org._id === currentUrl),
);
- setMembersData(blockUsers);
+ setMembersData(blockUsers || []);
}
- }, [memberData, showBlockedMembers]);
+ }, [memberData, showBlockedMembers, currentUrl]);
// Handler for blocking a user
- const handleBlockUser = async (userId: string): Promise => {
- try {
- const { data } = await blockUser({
- variables: {
- userId,
- orgId: currentUrl,
- },
- });
- /* istanbul ignore next */
- if (data) {
- toast.success(t('blockedSuccessfully'));
- memberRefetch();
+ const handleBlockUser = useCallback(
+ async (userId: string): Promise => {
+ try {
+ const { data } = await blockUser({
+ variables: {
+ userId,
+ orgId: currentUrl,
+ },
+ });
+ /* istanbul ignore next */
+ if (data) {
+ toast.success(t('blockedSuccessfully') as string);
+ memberRefetch();
+ }
+ } catch (error: unknown) {
+ /* istanbul ignore next */
+ errorHandler(t, error);
}
- } catch (error: unknown) {
- /* istanbul ignore next */
- errorHandler(t, error);
- }
- };
+ },
+ [blockUser, currentUrl, memberRefetch, t],
+ );
// Handler for unblocking a user
- const handleUnBlockUser = async (userId: string): Promise => {
- try {
- const { data } = await unBlockUser({
- variables: {
- userId,
- orgId: currentUrl,
- },
- });
- /* istanbul ignore next */
- if (data) {
- toast.success(t('Un-BlockedSuccessfully'));
- memberRefetch();
+ const handleUnBlockUser = useCallback(
+ async (userId: string): Promise => {
+ try {
+ const { data } = await unBlockUser({
+ variables: {
+ userId,
+ orgId: currentUrl,
+ },
+ });
+ /* istanbul ignore next */
+ if (data) {
+ toast.success(t('Un-BlockedSuccessfully') as string);
+ memberRefetch();
+ }
+ } catch (error: unknown) {
+ /* istanbul ignore next */
+ errorHandler(t, error);
}
- } catch (error: unknown) {
- /* istanbul ignore next */
- errorHandler(t, error);
- }
- };
+ },
+ [unBlockUser, currentUrl, memberRefetch, t],
+ );
// Display error if member query fails
- /* istanbul ignore next */
- if (memberError) {
- toast.error(memberError.message);
- }
+ useEffect(() => {
+ if (memberError) {
+ toast.error(memberError.message);
+ }
+ }, [memberError]);
// Search handler
- const handleSearch = (value: string): void => {
- setSearchByName(value);
- memberRefetch({
- orgId: currentUrl,
- firstName_contains: searchByFirstName ? value : '',
- lastName_contains: searchByFirstName ? '' : value,
- });
- };
+ const handleSearch = useCallback(
+ (value: string): void => {
+ setSearchByName(value);
+ memberRefetch({
+ orgId: currentUrl,
+ firstName_contains: searchByFirstName ? value : '',
+ lastName_contains: searchByFirstName ? '' : value,
+ });
+ },
+ [searchByFirstName, memberRefetch, currentUrl],
+ );
// Search by Enter key
- const handleSearchByEnter = (
- e: React.KeyboardEvent,
- ): void => {
- if (e.key === 'Enter') {
- const { value } = e.currentTarget;
- handleSearch(value);
- }
- };
+ const handleSearchByEnter = useCallback(
+ (e: React.KeyboardEvent): void => {
+ if (e.key === 'Enter') {
+ const { value } = e.currentTarget;
+ handleSearch(value);
+ }
+ },
+ [handleSearch],
+ );
// Search button click handler
- const handleSearchByBtnClick = (): void => {
- const inputValue =
- (document.getElementById('searchBlockedUsers') as HTMLInputElement)
- ?.value || '';
+ const handleSearchByBtnClick = useCallback((): void => {
+ const inputValue = searchByName;
handleSearch(inputValue);
- };
+ }, [handleSearch, searchByName]);
// Header titles for the table
const headerTitles: string[] = [
@@ -195,6 +204,8 @@ const Requests = (): JSX.Element => {
data-testid="searchByName"
autoComplete="off"
required
+ value={searchByName}
+ onChange={(e) => setSearchByName(e.target.value)}
onKeyUp={handleSearchByEnter}
/>
-
+
+ {props.name}
-- Owner: - {props.firstName} - - - {props.lastName} - -
-
+
+
);
}
-export {};
-export default organizationCard;
+export default OrganizationCard;
diff --git a/src/components/OrganizationCardStart/OrganizationCardStart.test.tsx b/src/components/OrganizationCardStart/OrganizationCardStart.test.tsx
index 2a9f03a9be..dd65c8649e 100644
--- a/src/components/OrganizationCardStart/OrganizationCardStart.test.tsx
+++ b/src/components/OrganizationCardStart/OrganizationCardStart.test.tsx
@@ -6,12 +6,11 @@ describe('Testing the Organization Cards', () => {
test('should render props and text elements test for the page component', () => {
const props = {
id: '123',
- key: '456',
image: 'https://via.placeholder.com/80',
name: 'Sample',
};
- render(
+ {props.image ? (
+
+ ) : (
+
+ )}
+
-
-
+
+
+
-
{props.name}
++ Owner: + {props.firstName} + + + {props.lastName} + +
Welcome to the Dummy Plugin!
@@ -17,8 +17,4 @@ function dummyPlugin(): JSX.Element {
);
}
-dummyPlugin.defaultProps = {};
-
-dummyPlugin.propTypes = {};
-
-export default dummyPlugin;
+export default DummyPlugin;
diff --git a/src/components/plugins/DummyPlugin2/DummyPlugin2.test.jsx b/src/components/plugins/DummyPlugin2/DummyPlugin2.test.jsx
index bcec97367c..c2cfe03a1e 100644
--- a/src/components/plugins/DummyPlugin2/DummyPlugin2.test.jsx
+++ b/src/components/plugins/DummyPlugin2/DummyPlugin2.test.jsx
@@ -5,14 +5,14 @@ import { BrowserRouter } from 'react-router-dom';
import { store } from 'state/store';
import DummyPlugin2 from './DummyPlugin2';
-describe('Testing dummy plugin 2', () => {
- test('should render props and text elements test for the page component', () => {
+describe('Testing DummyPlugin2', () => {
+ test('should render DummyPlugin2 component', () => {
render(
@@ -269,7 +280,7 @@ const Requests = (): JSX.Element => {
{tCommon('noResultsFoundFor')} "{searchByName}"
- ) : loadingMembers == false && membersData.length === 0 ? (
+ ) : loadingMembers === false && membersData.length === 0 ? (
{t('noSpammerFound')}
diff --git a/src/screens/UserPortal/Campaigns/PledgeModal.tsx b/src/screens/UserPortal/Campaigns/PledgeModal.tsx
index 6ab2832c2f..d9076f52c8 100644
--- a/src/screens/UserPortal/Campaigns/PledgeModal.tsx
+++ b/src/screens/UserPortal/Campaigns/PledgeModal.tsx
@@ -166,7 +166,7 @@ const PledgeModal: React.FC = ({
...updatedFields,
},
});
- toast.success(t('pledgeUpdated'));
+ toast.success(t('pledgeUpdated') as string);
refetchPledge();
hide();
} catch (error: unknown) {
@@ -198,7 +198,7 @@ const PledgeModal: React.FC = ({
},
});
- toast.success(t('pledgeCreated'));
+ toast.success(t('pledgeCreated') as string);
refetchPledge();
setFormState({
pledgeUsers: [],
diff --git a/src/screens/UserPortal/Chat/Chat.test.tsx b/src/screens/UserPortal/Chat/Chat.test.tsx
index 66e6115ce7..4a0dfbcf4e 100644
--- a/src/screens/UserPortal/Chat/Chat.test.tsx
+++ b/src/screens/UserPortal/Chat/Chat.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import React, { act } from 'react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider, useTranslation } from 'react-i18next';
@@ -2259,15 +2259,26 @@ describe('Testing Chat Screen [User Portal]', () => {
,
);
+ screen.debug();
+ await waitFor(() => {
+ const closeMenuBtn = screen.queryByTestId('closeMenu');
+ expect(closeMenuBtn).toBeInTheDocument();
+ if (closeMenuBtn) {
+ closeMenuBtn.click();
+ } else {
+ throw new Error('Close menu button not found');
+ }
+ });
- await wait();
-
- const closeMenubtn = screen.getByTestId('closeMenu');
- expect(closeMenubtn).toBeInTheDocument();
- closeMenubtn.click();
- const openMenuBtn = screen.getByTestId('openMenu');
- expect(openMenuBtn).toBeInTheDocument();
- openMenuBtn.click();
+ await waitFor(() => {
+ const openMenuBtn = screen.queryByTestId('openMenu');
+ expect(openMenuBtn).toBeInTheDocument();
+ if (openMenuBtn) {
+ openMenuBtn.click();
+ } else {
+ throw new Error('Open menu button not found');
+ }
+ });
});
test('Testing sidebar when the screen size is less than or equal to 820px', async () => {
@@ -2293,12 +2304,16 @@ describe('Testing Chat Screen [User Portal]', () => {
,
);
- await wait();
- expect(screen.getByText('My Organizations')).toBeInTheDocument();
- expect(screen.getByText('Talawa User Portal')).toBeInTheDocument();
-
- const chatBtn = screen.getByTestId('chatBtn');
-
- chatBtn.click();
+ screen.debug();
+ await waitFor(() => {
+ expect(screen.getByText('My Organizations')).toBeInTheDocument();
+ expect(screen.getByText('Talawa User Portal')).toBeInTheDocument();
+ });
+ await waitFor(() => {
+ const chatBtn = screen.getByTestId('chatBtn');
+ act(() => {
+ chatBtn.click();
+ });
+ });
});
});
diff --git a/src/screens/UserPortal/Donate/Donate.test.tsx b/src/screens/UserPortal/Donate/Donate.test.tsx
index 63083bd297..c4d435415e 100644
--- a/src/screens/UserPortal/Donate/Donate.test.tsx
+++ b/src/screens/UserPortal/Donate/Donate.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, render, screen } from '@testing-library/react';
+import React, { act } from 'react';
+import { render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
diff --git a/src/screens/UserPortal/Donate/Donate.tsx b/src/screens/UserPortal/Donate/Donate.tsx
index 84ad62a06a..c6e6d918d5 100644
--- a/src/screens/UserPortal/Donate/Donate.tsx
+++ b/src/screens/UserPortal/Donate/Donate.tsx
@@ -162,7 +162,7 @@ export default function donate(): JSX.Element {
},
});
refetch();
- toast.success(t(`success`));
+ toast.success(t(`success`) as string);
} catch (error: unknown) {
/* istanbul ignore next */
errorHandler(t, error);
diff --git a/src/screens/UserPortal/Events/Events.test.tsx b/src/screens/UserPortal/Events/Events.test.tsx
index 6de04ee172..1e74c9fb95 100644
--- a/src/screens/UserPortal/Events/Events.test.tsx
+++ b/src/screens/UserPortal/Events/Events.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import React, { act } from 'react';
+import { fireEvent, render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
diff --git a/src/screens/UserPortal/Events/Events.tsx b/src/screens/UserPortal/Events/Events.tsx
index f39aae3cdd..072e8237be 100644
--- a/src/screens/UserPortal/Events/Events.tsx
+++ b/src/screens/UserPortal/Events/Events.tsx
@@ -122,7 +122,7 @@ export default function events(): JSX.Element {
/* istanbul ignore next */
if (createEventData) {
- toast.success(t('eventCreated'));
+ toast.success(t('eventCreated') as string);
refetch();
setEventTitle('');
setEventDescription('');
diff --git a/src/screens/UserPortal/Organizations/Organizations.test.tsx b/src/screens/UserPortal/Organizations/Organizations.test.tsx
index 87d0997409..163a755926 100644
--- a/src/screens/UserPortal/Organizations/Organizations.test.tsx
+++ b/src/screens/UserPortal/Organizations/Organizations.test.tsx
@@ -1,5 +1,5 @@
import { MockedProvider } from '@apollo/react-testing';
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
import userEvent from '@testing-library/user-event';
@@ -15,7 +15,7 @@ import { StaticMockLink } from 'utils/StaticMockLink';
import i18nForTest from 'utils/i18nForTest';
import useLocalStorage from 'utils/useLocalstorage';
import Organizations from './Organizations';
-import React from 'react';
+import React, { act } from 'react';
const { getItem } = useLocalStorage();
const MOCKS = [
@@ -440,7 +440,7 @@ describe('Testing Organizations Screen [User Portal]', () => {
expect(joinNowButtons.length).toBeGreaterThan(0);
});
- test('Mode is changed to created organizations', async () => {
+ test('Mode is changed to created organisations', async () => {
render(
@@ -476,14 +476,22 @@ describe('Testing Organizations Screen [User Portal]', () => {
,
);
- await wait();
-
- const closeMenubtn = screen.getByTestId('closeMenu');
- expect(closeMenubtn).toBeInTheDocument();
- closeMenubtn.click();
- const openMenuBtn = screen.getByTestId('openMenu');
- expect(openMenuBtn).toBeInTheDocument();
- openMenuBtn.click();
+ await waitFor(() => {
+ const closeMenuBtn = screen.getByTestId('closeMenu');
+ expect(closeMenuBtn).toBeInTheDocument();
+ });
+ await act(async () => {
+ const closeMenuBtn = screen.getByTestId('closeMenu');
+ closeMenuBtn.click();
+ });
+ await waitFor(() => {
+ const openMenuBtn = screen.getByTestId('openMenu');
+ expect(openMenuBtn).toBeInTheDocument();
+ });
+ await act(async () => {
+ const openMenuBtn = screen.getByTestId('openMenu');
+ openMenuBtn.click();
+ });
});
test('Testing sidebar when the screen size is less than or equal to 820px', async () => {
@@ -500,12 +508,15 @@ describe('Testing Organizations Screen [User Portal]', () => {
,
);
- await wait();
- expect(screen.getByText('My Organizations')).toBeInTheDocument();
- expect(screen.getByText('Talawa User Portal')).toBeInTheDocument();
+ await waitFor(() => {
+ expect(screen.getByText('My Organizations')).toBeInTheDocument();
+ expect(screen.getByText('Talawa User Portal')).toBeInTheDocument();
+ });
- const settingsBtn = screen.getByTestId('settingsBtn');
+ await act(async () => {
+ const settingsBtn = screen.getByTestId('settingsBtn');
- settingsBtn.click();
+ settingsBtn.click();
+ });
});
});
diff --git a/src/screens/UserPortal/People/People.test.tsx b/src/screens/UserPortal/People/People.test.tsx
index a233c20015..c978a0a5a3 100644
--- a/src/screens/UserPortal/People/People.test.tsx
+++ b/src/screens/UserPortal/People/People.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, render, screen } from '@testing-library/react';
+import React, { act } from 'react';
+import { render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
import {
diff --git a/src/screens/UserPortal/Pledges/Pledge.test.tsx b/src/screens/UserPortal/Pledges/Pledge.test.tsx
index c9ba28ab1b..ecdd25a1d3 100644
--- a/src/screens/UserPortal/Pledges/Pledge.test.tsx
+++ b/src/screens/UserPortal/Pledges/Pledge.test.tsx
@@ -296,9 +296,11 @@ describe('Testing User Pledge Screen', () => {
expect(screen.getByTestId('searchPledges')).toBeInTheDocument();
});
- expect(screen.getByText('Harve Lance')).toBeInTheDocument();
- expect(screen.queryByText('Jeramy Gracia')).toBeNull();
- expect(screen.queryByText('Praise Norris')).toBeNull();
+ await waitFor(() => {
+ expect(screen.getByText('Harve Lance')).toBeInTheDocument();
+ expect(screen.queryByText('Jeramy Gracia')).toBeNull();
+ expect(screen.queryByText('Praise Norris')).toBeNull();
+ });
const moreContainer = await screen.findAllByTestId('moreContainer');
userEvent.click(moreContainer[0]);
diff --git a/src/screens/UserPortal/Posts/Posts.test.tsx b/src/screens/UserPortal/Posts/Posts.test.tsx
index da499403ea..aa5f03fdcf 100644
--- a/src/screens/UserPortal/Posts/Posts.test.tsx
+++ b/src/screens/UserPortal/Posts/Posts.test.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import React, { act } from 'react';
import { MockedProvider } from '@apollo/react-testing';
import type { RenderResult } from '@testing-library/react';
-import { act, render, screen, waitFor, within } from '@testing-library/react';
+import { render, screen, waitFor, within } from '@testing-library/react';
import { I18nextProvider } from 'react-i18next';
import userEvent from '@testing-library/user-event';
import {
@@ -15,6 +15,7 @@ import { StaticMockLink } from 'utils/StaticMockLink';
import i18nForTest from 'utils/i18nForTest';
import Home from './Posts';
import useLocalStorage from 'utils/useLocalstorage';
+import { DELETE_POST_MUTATION } from 'GraphQl/Mutations/mutations';
const { setItem } = useLocalStorage();
@@ -217,6 +218,17 @@ const MOCKS = [
},
},
},
+ {
+ request: {
+ query: DELETE_POST_MUTATION,
+ variables: { id: '6411e54835d7ba2344a78e29' },
+ },
+ result: {
+ data: {
+ removePost: { _id: '6411e54835d7ba2344a78e29' },
+ },
+ },
+ },
];
const link = new StaticMockLink(MOCKS, true);
@@ -350,10 +362,11 @@ describe('Testing Home Screen: User Portal', () => {
test('Checking if refetch works after deleting this post', async () => {
setItem('userId', '640d98d9eb6a743d75341067');
renderHomeScreen();
- await wait();
-
- userEvent.click(screen.getAllByTestId('dropdown')[1]);
- userEvent.click(screen.getByTestId('deletePost'));
+ expect(screen.queryAllByTestId('dropdown')).not.toBeNull();
+ const dropdowns = await screen.findAllByTestId('dropdown');
+ userEvent.click(dropdowns[1]);
+ const deleteButton = await screen.findByTestId('deletePost');
+ userEvent.click(deleteButton);
});
});
@@ -380,11 +393,7 @@ describe('HomeScreen with invalid orgId', () => {
,
);
-
- // Wait for the navigation to occur
- await waitFor(() => {
- const homeEl = screen.getByTestId('homeEl');
- expect(homeEl).toBeInTheDocument();
- });
+ const homeEl = await screen.findByTestId('homeEl');
+ expect(homeEl).toBeInTheDocument();
});
});
diff --git a/src/screens/UserPortal/Settings/Settings.test.tsx b/src/screens/UserPortal/Settings/Settings.test.tsx
index eccf59aaab..34aa3711bd 100644
--- a/src/screens/UserPortal/Settings/Settings.test.tsx
+++ b/src/screens/UserPortal/Settings/Settings.test.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import React, { act } from 'react';
+import { fireEvent, render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import { I18nextProvider } from 'react-i18next';
import { UPDATE_USER_MUTATION } from 'GraphQl/Mutations/mutations';
@@ -144,7 +144,7 @@ const resizeWindow = (width: number): void => {
};
async function wait(ms = 100): Promise {
- await act(() => {
+ await act(async () => {
return new Promise((resolve) => {
setTimeout(resolve, ms);
});
@@ -152,32 +152,37 @@ async function wait(ms = 100): Promise {
}
describe('Testing Settings Screen [User Portal]', () => {
- Object.defineProperty(window, 'matchMedia', {
- writable: true,
- value: jest.fn().mockImplementation((query) => ({
- matches: false,
- media: query,
- onchange: null,
- addListener: jest.fn(), // Deprecated
- removeListener: jest.fn(), // Deprecated
- addEventListener: jest.fn(),
- removeEventListener: jest.fn(),
- dispatchEvent: jest.fn(),
- })),
+ // Mock implementation of matchMedia
+ beforeAll(() => {
+ Object.defineProperty(window, 'matchMedia', {
+ writable: true,
+ value: jest.fn().mockImplementation((query) => ({
+ matches: false,
+ media: query,
+ onchange: null,
+ addListener: jest.fn(), // Deprecated
+ removeListener: jest.fn(), // Deprecated
+ addEventListener: jest.fn(),
+ removeEventListener: jest.fn(),
+ dispatchEvent: jest.fn(),
+ })),
+ });
});
test('Screen should be rendered properly', async () => {
- render(
-
-
-
-
-
-
-
- ,
- );
+ await act(async () => {
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+ });
await wait();
@@ -185,17 +190,19 @@ describe('Testing Settings Screen [User Portal]', () => {
});
test('input works properly', async () => {
- render(
-
-
-
-
-
-
-
- ,
- );
+ await act(async () => {
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+ });
await wait();
@@ -240,17 +247,19 @@ describe('Testing Settings Screen [User Portal]', () => {
});
test('resetChangesBtn works properly', async () => {
- render(
-
-
-
-
-
-
-
- ,
- );
+ await act(async () => {
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+ });
await wait();
@@ -270,17 +279,19 @@ describe('Testing Settings Screen [User Portal]', () => {
});
test('resetChangesBtn works properly when the details are empty', async () => {
- render(
-
-
-
-
-
-
-
- ,
- );
+ await act(async () => {
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+ });
await wait();
@@ -300,210 +311,64 @@ describe('Testing Settings Screen [User Portal]', () => {
});
test('sidebar', async () => {
- render(
-
-
-
-
-
-
-
- ,
- );
+ await act(async () => {
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+ });
await wait();
const closeMenubtn = screen.getByTestId('closeMenu');
expect(closeMenubtn).toBeInTheDocument();
- closeMenubtn.click();
+ act(() => closeMenubtn.click());
const openMenuBtn = screen.getByTestId('openMenu');
expect(openMenuBtn).toBeInTheDocument();
- openMenuBtn.click();
+ act(() => openMenuBtn.click());
});
test('Testing sidebar when the screen size is less than or equal to 820px', async () => {
resizeWindow(800);
- render(
-
-
-
-
-
-
-
- ,
- );
- await wait();
- expect(screen.getByText('My Organizations')).toBeInTheDocument();
- expect(screen.getByText('Talawa User Portal')).toBeInTheDocument();
-
- const settingsBtn = screen.getByTestId('settingsBtn');
-
- settingsBtn.click();
- });
-
- test('updateUserDetails Mutation is triggered on button click', async () => {
- render(
-
-
-
-
-
-
-
- ,
- );
-
- await wait();
-
- userEvent.type(screen.getByTestId('inputFirstName'), 'Noble');
- await wait();
-
- userEvent.type(screen.getByTestId('inputLastName'), 'Mittal');
- await wait();
-
- userEvent.selectOptions(screen.getByTestId('inputGender'), 'OTHER');
- await wait();
-
- userEvent.type(screen.getByTestId('inputPhoneNumber'), '+174567890');
- await wait();
-
- fireEvent.change(screen.getByLabelText('Birth Date'), {
- target: { value: '2024-03-01' },
+ await act(async () => {
+ render(
+
+
+
+
+
+
+
+ ,
+ );
});
- await wait();
- userEvent.selectOptions(screen.getByTestId('inputGrade'), 'Graduate');
await wait();
- userEvent.selectOptions(screen.getByTestId('inputEmpStatus'), 'Unemployed');
- await wait();
+ screen.debug();
- userEvent.selectOptions(screen.getByTestId('inputMaritalStatus'), 'Single');
- await wait();
+ const openMenuBtn = screen.queryByTestId('openMenu');
+ console.log('Open Menu Button:', openMenuBtn);
+ expect(openMenuBtn).toBeInTheDocument();
- userEvent.type(screen.getByTestId('inputAddress'), 'random');
- await wait();
+ if (openMenuBtn) {
+ act(() => openMenuBtn.click());
+ }
- userEvent.type(screen.getByTestId('inputState'), 'random');
- await wait();
+ const closeMenuBtn = screen.queryByTestId('closeMenu');
+ console.log('Close Menu Button:', closeMenuBtn);
+ expect(closeMenuBtn).toBeInTheDocument();
- userEvent.click(screen.getByTestId('updateUserBtn'));
- await wait();
+ if (closeMenuBtn) {
+ act(() => closeMenuBtn.click());
+ }
});
-
- test('Marital Status dropdown value verification', async () => {
- render(
-
-
-
-
-
-
-
- ,
- );
-
- await wait();
-
- // SINGLE
- expect(
- screen.queryByRole('option', { name: mockMaritalStatusEnum[0].label }),
- ).toBeInTheDocument();
-
- userEvent.selectOptions(
- // Find the select element
- screen.getByTestId('inputMaritalStatus'),
- // Find and select the Single option
- screen.getByRole('option', { name: mockMaritalStatusEnum[0].label }),
- );
-
- expect(screen.getByTestId('inputMaritalStatus')).toHaveValue(
- mockMaritalStatusEnum[0].value,
- );
-
- // ENGAGED
- expect(
- screen.queryByRole('option', { name: mockMaritalStatusEnum[1].label }),
- ).toBeInTheDocument();
-
- userEvent.selectOptions(
- // Find the select element
- screen.getByTestId('inputMaritalStatus'),
- // Find and select the Engaged option
- screen.getByRole('option', { name: mockMaritalStatusEnum[1].label }),
- );
-
- expect(screen.getByTestId('inputMaritalStatus')).toHaveValue(
- mockMaritalStatusEnum[1].value,
- );
-
- // MARRIED
- expect(
- screen.queryByRole('option', { name: mockMaritalStatusEnum[2].label }),
- ).toBeInTheDocument();
-
- userEvent.selectOptions(
- // Find the select element
- screen.getByTestId('inputMaritalStatus'),
- // Find and select the Married option
- screen.getByRole('option', { name: mockMaritalStatusEnum[2].label }),
- );
-
- expect(screen.getByTestId('inputMaritalStatus')).toHaveValue(
- mockMaritalStatusEnum[2].value,
- );
-
- // DIVORCED
- expect(
- screen.queryByRole('option', { name: mockMaritalStatusEnum[3].label }),
- ).toBeInTheDocument();
-
- userEvent.selectOptions(
- // Find the select element
- screen.getByTestId('inputMaritalStatus'),
- // Find and select the Divorced option
- screen.getByRole('option', { name: mockMaritalStatusEnum[3].label }),
- );
-
- expect(screen.getByTestId('inputMaritalStatus')).toHaveValue(
- mockMaritalStatusEnum[3].value,
- );
-
- // WIDOWED
- expect(
- screen.queryByRole('option', { name: mockMaritalStatusEnum[4].label }),
- ).toBeInTheDocument();
-
- userEvent.selectOptions(
- // Find the select element
- screen.getByTestId('inputMaritalStatus'),
- // Find and select the Widowed option
- screen.getByRole('option', { name: mockMaritalStatusEnum[4].label }),
- );
-
- expect(screen.getByTestId('inputMaritalStatus')).toHaveValue(
- mockMaritalStatusEnum[4].value,
- );
-
- // SEPARATED
- expect(
- screen.queryByRole('option', { name: mockMaritalStatusEnum[5].label }),
- ).toBeInTheDocument();
-
- userEvent.selectOptions(
- // Find the select element
- screen.getByTestId('inputMaritalStatus'),
- // Find and select the Separated option
- screen.getByRole('option', { name: mockMaritalStatusEnum[5].label }),
- );
-
- expect(screen.getByTestId('inputMaritalStatus')).toHaveValue(
- mockMaritalStatusEnum[5].value,
- );
- }, 60000);
});
diff --git a/src/screens/UserPortal/Settings/Settings.tsx b/src/screens/UserPortal/Settings/Settings.tsx
index 31767d8bfb..8b80f8ea1d 100644
--- a/src/screens/UserPortal/Settings/Settings.tsx
+++ b/src/screens/UserPortal/Settings/Settings.tsx
@@ -99,7 +99,9 @@ export default function settings(): JSX.Element {
});
/* istanbul ignore next */
if (data) {
- toast.success(tCommon('updatedSuccessfully', { item: 'Profile' }));
+ toast.success(
+ tCommon('updatedSuccessfully', { item: 'Profile' }) as string,
+ );
setTimeout(() => {
window.location.reload();
}, 500);
diff --git a/src/screens/Users/Users.test.tsx b/src/screens/Users/Users.test.tsx
index f130ed1df9..65558e6ea7 100644
--- a/src/screens/Users/Users.test.tsx
+++ b/src/screens/Users/Users.test.tsx
@@ -428,22 +428,21 @@ describe('Testing Users screen', () => {
,
);
+ });
+ await wait();
- await wait();
-
- const searchBtn = screen.getByTestId('searchButton');
-
- const searchInput = screen.getByTestId(/searchByName/i);
+ const searchBtn = screen.getByTestId('searchButton');
+ const searchInput = screen.getByTestId(/searchByName/i);
+ await act(async () => {
// Clear the search input
userEvent.clear(searchInput);
-
// Search for a name that doesn't exist
userEvent.type(screen.getByTestId(/searchByName/i), 'NonexistentName');
userEvent.click(searchBtn);
-
- expect(screen.queryByText(/No User Found/i)).toBeInTheDocument();
});
+
+ expect(screen.queryByText(/No User Found/i)).toBeInTheDocument();
});
test('Testing User data is not present', async () => {
@@ -518,40 +517,63 @@ describe('Testing Users screen', () => {
,
);
+ });
+ await wait();
- await wait();
-
- const searchInput = screen.getByTestId('filter');
- expect(searchInput).toBeInTheDocument();
+ const searchInput = screen.getByTestId('filter');
+ expect(searchInput).toBeInTheDocument();
- const inputText = screen.getByTestId('filterUsers');
+ const inputText = screen.getByTestId('filterUsers');
+ await act(async () => {
fireEvent.click(inputText);
- const toggleText = screen.getByTestId('admin');
+ });
+
+ const toggleText = screen.getByTestId('admin');
+
+ await act(async () => {
fireEvent.click(toggleText);
+ });
- expect(searchInput).toBeInTheDocument();
+ expect(searchInput).toBeInTheDocument();
+ await act(async () => {
fireEvent.click(inputText);
- let toggleTite = screen.getByTestId('superAdmin');
+ });
+
+ let toggleTite = screen.getByTestId('superAdmin');
+
+ await act(async () => {
fireEvent.click(toggleTite);
+ });
- expect(searchInput).toBeInTheDocument();
+ expect(searchInput).toBeInTheDocument();
+ await act(async () => {
fireEvent.click(inputText);
- toggleTite = screen.getByTestId('user');
+ });
+
+ toggleTite = screen.getByTestId('user');
+
+ await act(async () => {
fireEvent.click(toggleTite);
+ });
- expect(searchInput).toBeInTheDocument();
+ expect(searchInput).toBeInTheDocument();
+ await act(async () => {
fireEvent.click(inputText);
- toggleTite = screen.getByTestId('cancel');
- fireEvent.click(toggleTite);
+ });
- await wait();
+ toggleTite = screen.getByTestId('cancel');
- expect(searchInput).toBeInTheDocument();
+ await act(async () => {
+ fireEvent.click(toggleTite);
});
+
+ await wait();
+
+ expect(searchInput).toBeInTheDocument();
});
test('check for rerendering', async () => {
@@ -620,37 +642,63 @@ describe('Testing Users screen', () => {
,
);
+ });
+ await wait();
- await wait();
+ const filterButton = screen.getByTestId('filterUsers');
- const filterButton = screen.getByTestId('filterUsers');
+ await act(async () => {
fireEvent.click(filterButton);
+ });
- const filterAdmin = screen.getByTestId('admin');
+ const filterAdmin = screen.getByTestId('admin');
+
+ await act(async () => {
fireEvent.click(filterAdmin);
- await wait();
- expect(screen.getByText('Jane Doe')).toBeInTheDocument();
+ });
+ await wait();
+ expect(screen.getByText('Jane Doe')).toBeInTheDocument();
+
+ await act(async () => {
fireEvent.click(filterButton);
- const filterSuperAdmin = screen.getByTestId('superAdmin');
+ });
+
+ const filterSuperAdmin = screen.getByTestId('superAdmin');
+
+ await act(async () => {
fireEvent.click(filterSuperAdmin);
- await wait();
- expect(screen.getByText('John Doe')).toBeInTheDocument();
+ });
+
+ await wait();
+ expect(screen.getByText('John Doe')).toBeInTheDocument();
+ await act(async () => {
fireEvent.click(filterButton);
- const filterUser = screen.getByTestId('user');
+ });
+
+ const filterUser = screen.getByTestId('user');
+ await act(async () => {
fireEvent.click(filterUser);
- await wait();
- expect(screen.getByText('Jack Smith')).toBeInTheDocument();
+ });
+ await wait();
+ expect(screen.getByText('Jack Smith')).toBeInTheDocument();
+
+ await act(async () => {
fireEvent.click(filterButton);
- const filterCancel = screen.getByTestId('cancel');
+ });
+
+ const filterCancel = screen.getByTestId('cancel');
+
+ await act(async () => {
fireEvent.click(filterCancel);
- await wait();
- expect(screen.getByText('John Doe')).toBeInTheDocument();
- expect(screen.getByText('Jane Doe')).toBeInTheDocument();
- expect(screen.getByText('Jack Smith')).toBeInTheDocument();
});
+
+ await wait();
+ expect(screen.getByText('John Doe')).toBeInTheDocument();
+ expect(screen.getByText('Jane Doe')).toBeInTheDocument();
+ expect(screen.getByText('Jack Smith')).toBeInTheDocument();
});
test('Users should be sorted and filtered correctly', async () => {
@@ -667,47 +715,63 @@ describe('Testing Users screen', () => {
,
);
+ });
+ await wait();
- await wait();
-
- // Check if the sorting and filtering logic was applied correctly
- const rows = screen.getAllByRole('row');
+ // Check if the sorting and filtering logic was applied correctly
+ const rows = screen.getAllByRole('row');
- const firstRow = rows[1];
- const secondRow = rows[2];
+ const firstRow = rows[1];
+ const secondRow = rows[2];
- expect(firstRow).toHaveTextContent('John Doe');
- expect(secondRow).toHaveTextContent('Jane Doe');
+ expect(firstRow).toHaveTextContent('John Doe');
+ expect(secondRow).toHaveTextContent('Jane Doe');
- await wait();
+ await wait();
- const inputText = screen.getByTestId('sortUsers');
+ const inputText = screen.getByTestId('sortUsers');
+ await act(async () => {
fireEvent.click(inputText);
- const toggleText = screen.getByTestId('oldest');
- fireEvent.click(toggleText);
+ });
+
+ const toggleText = screen.getByTestId('oldest');
+ await act(async () => {
+ fireEvent.click(toggleText);
fireEvent.click(inputText);
- const toggleTite = screen.getByTestId('newest');
+ });
+
+ const toggleTite = screen.getByTestId('newest');
+
+ await act(async () => {
fireEvent.click(toggleTite);
+ });
- // Verify the users are sorted by oldest
- await wait();
+ // Verify the users are sorted by oldest
+ await wait();
- const displayedUsers = screen.getAllByRole('row');
- expect(displayedUsers[1]).toHaveTextContent('John Doe'); // assuming User1 is the oldest
- expect(displayedUsers[displayedUsers.length - 1]).toHaveTextContent(
- 'Jack Smith',
- ); // assuming UserN is the newest
+ const displayedUsers = screen.getAllByRole('row');
+ expect(displayedUsers[1]).toHaveTextContent('John Doe'); // assuming User1 is the oldest
+ expect(displayedUsers[displayedUsers.length - 1]).toHaveTextContent(
+ 'Jack Smith',
+ ); // assuming UserN is the newest
- await wait();
+ await wait();
+ await act(async () => {
fireEvent.click(inputText);
- const toggleOld = screen.getByTestId('oldest');
- fireEvent.click(toggleOld);
+ });
+
+ const toggleOld = screen.getByTestId('oldest');
+ await act(async () => {
+ fireEvent.click(toggleOld);
fireEvent.click(inputText);
- const toggleNewest = screen.getByTestId('newest');
+ });
+
+ const toggleNewest = screen.getByTestId('newest');
+ await act(async () => {
fireEvent.click(toggleNewest);
});
});
diff --git a/src/screens/Users/Users.tsx b/src/screens/Users/Users.tsx
index 0e958e7bab..72acba5b5c 100644
--- a/src/screens/Users/Users.tsx
+++ b/src/screens/Users/Users.tsx
@@ -137,7 +137,7 @@ const Users = (): JSX.Element => {
}
if (dataOrgs.organizationsConnection.length === 0) {
- toast.warning(t('noOrgError'));
+ toast.warning(t('noOrgError') as string);
}
}, [dataOrgs]);
diff --git a/src/utils/errorHandler.tsx b/src/utils/errorHandler.tsx
index d65bb5f746..b7a22210a8 100644
--- a/src/utils/errorHandler.tsx
+++ b/src/utils/errorHandler.tsx
@@ -12,13 +12,13 @@ export const errorHandler = (a: unknown, error: unknown): void => {
if (error instanceof Error) {
switch (error.message) {
case 'Failed to fetch':
- toast.error(tErrors('talawaApiUnavailable'));
+ toast.error(tErrors('talawaApiUnavailable') as string);
break;
// Add more cases as needed
default:
toast.error(error.message);
}
} else {
- toast.error(tErrors('unknownError', { msg: error }));
+ toast.error(tErrors('unknownError', { msg: error }) as string);
}
};