{t('assignee')}
- {t('preCompletionNotes')}
+ {t('preCompletionNotes')}
+
{actionItem.postCompletionNotes?.length > 25
? `${actionItem.postCompletionNotes.substring(0, 25)}...`
diff --git a/src/components/ActionItems/ActionItemsModal.test.tsx b/src/components/ActionItems/ActionItemsModal.test.tsx
index 3e4b3b0dfa..01a15ee6aa 100644
--- a/src/components/ActionItems/ActionItemsModal.test.tsx
+++ b/src/components/ActionItems/ActionItemsModal.test.tsx
@@ -96,7 +96,7 @@ describe('Testing Check In Attendees Modal', () => {
);
await waitFor(() =>
- expect(screen.queryByText('Event Action Items')).toBeInTheDocument(),
+ expect(screen.queryByTestId('modal-title')).toBeInTheDocument(),
);
await waitFor(() => {
diff --git a/src/components/ActionItems/ActionItemsModalBody.tsx b/src/components/ActionItems/ActionItemsModalBody.tsx
index e7c505a9a4..59de3b1681 100644
--- a/src/components/ActionItems/ActionItemsModalBody.tsx
+++ b/src/components/ActionItems/ActionItemsModalBody.tsx
@@ -118,9 +118,11 @@ export const ActionItemsModalBody = ({
actionItemsRefetch();
hideCreateModal();
toast.success(t('successfulCreation'));
- } catch (error: any) {
- toast.error(error.message);
- console.log(error);
+ } catch (error: unknown) {
+ if (error instanceof Error) {
+ toast.error(error.message);
+ console.log(error.message);
+ }
}
};
diff --git a/src/components/AddOn/core/AddOnStore/AddOnStore.tsx b/src/components/AddOn/core/AddOnStore/AddOnStore.tsx
index e79ca9c24e..9eb65f9241 100644
--- a/src/components/AddOn/core/AddOnStore/AddOnStore.tsx
+++ b/src/components/AddOn/core/AddOnStore/AddOnStore.tsx
@@ -135,28 +135,6 @@ function addOnStore(): JSX.Element {
onSelect={updateSelectedTab}
>
- {console.log(
- data.getPlugins.filter(
- (val: {
- _id: string;
- pluginName: string | undefined;
- pluginDesc: string | undefined;
- pluginCreatedBy: string;
- pluginInstallStatus: boolean | undefined;
- getInstalledPlugins: () => any;
- }) => {
- if (searchText == '') {
- return val;
- } else if (
- val.pluginName
- ?.toLowerCase()
- .includes(searchText.toLowerCase())
- ) {
- return val;
- }
- },
- ),
- )}
{data.getPlugins.filter(
(val: {
_id: string;
diff --git a/src/components/Advertisements/Advertisements.test.tsx b/src/components/Advertisements/Advertisements.test.tsx
index b771c1d37b..5c32e2e73e 100644
--- a/src/components/Advertisements/Advertisements.test.tsx
+++ b/src/components/Advertisements/Advertisements.test.tsx
@@ -57,7 +57,7 @@ jest.mock('components/AddOn/support/services/Plugin.helper', () => ({
fetchStore: jest.fn().mockResolvedValue([]),
})),
}));
-let mockID: any = undefined;
+let mockID: string | undefined = undefined;
jest.mock('react-router-dom', () => ({
...jest.requireActual('react-router-dom'),
useParams: () => ({ orgId: mockID }),
@@ -193,7 +193,9 @@ describe('Testing Advertisement Component', () => {
},
result: {
data: {
- advertisementsConnection: [],
+ advertisementsConnection: {
+ edges: [],
+ },
},
loading: false,
},
@@ -257,30 +259,36 @@ describe('Testing Advertisement Component', () => {
},
result: {
data: {
- advertisementsConnection: [
- {
- _id: '1',
- name: 'Advertisement1',
- type: 'POPUP',
- organization: {
- _id: 'undefined',
+ advertisementsConnection: {
+ edges: [
+ {
+ node: {
+ _id: '1',
+ name: 'Advertisement1',
+ type: 'POPUP',
+ organization: {
+ _id: 'undefined',
+ },
+ mediaUrl: 'http://example1.com',
+ endDate: '2023-01-01',
+ startDate: '2022-01-01',
+ },
},
- mediaUrl: 'http://example1.com',
- endDate: '2023-01-01',
- startDate: '2022-01-01',
- },
- {
- _id: '2',
- name: 'Advertisement2',
- type: 'POPUP',
- organization: {
- _id: 'undefined',
+ {
+ node: {
+ _id: '2',
+ name: 'Advertisement2',
+ type: 'POPUP',
+ organization: {
+ _id: 'undefined',
+ },
+ mediaUrl: 'http://example2.com',
+ endDate: '2025-02-01',
+ startDate: '2024-02-01',
+ },
},
- mediaUrl: 'http://example2.com',
- endDate: '2025-02-01',
- startDate: '2024-02-01',
- },
- ],
+ ],
+ },
},
loading: false,
},
@@ -335,30 +343,36 @@ describe('Testing Advertisement Component', () => {
},
result: {
data: {
- advertisementsConnection: [
- {
- _id: '1',
- name: 'Advertisement1',
- type: 'POPUP',
- organization: {
- _id: '65844efc814dd4003db811c4',
+ advertisementsConnection: {
+ edges: [
+ {
+ node: {
+ _id: '1',
+ name: 'Advertisement1',
+ type: 'POPUP',
+ organization: {
+ _id: 'undefined',
+ },
+ mediaUrl: 'http://example1.com',
+ endDate: '2023-01-01',
+ startDate: '2022-01-01',
+ },
},
- mediaUrl: 'http://example1.com',
- endDate: '2023-01-01',
- startDate: '2022-01-01',
- },
- {
- _id: '2',
- name: 'Advertisement2',
- type: 'BANNER',
- organization: {
- _id: '65844efc814dd4003db811c4',
+ {
+ node: {
+ _id: '2',
+ name: 'Advertisement2',
+ type: 'POPUP',
+ organization: {
+ _id: 'undefined',
+ },
+ mediaUrl: 'http://example2.com',
+ endDate: '2025-02-01',
+ startDate: '2024-02-01',
+ },
},
- mediaUrl: 'http://example2.com',
- endDate: tomorrow,
- startDate: today,
- },
- ],
+ ],
+ },
},
loading: false,
},
diff --git a/src/components/Advertisements/Advertisements.tsx b/src/components/Advertisements/Advertisements.tsx
index 1257363eca..ab19d41815 100644
--- a/src/components/Advertisements/Advertisements.tsx
+++ b/src/components/Advertisements/Advertisements.tsx
@@ -11,11 +11,23 @@ import { useParams } from 'react-router-dom';
export default function advertisements(): JSX.Element {
const { data: advertisementsData, loading: loadingAdvertisements } =
useQuery(ADVERTISEMENTS_GET);
-
+ /* eslint-disable */
const { orgId: currentOrgId } = useParams();
const { t } = useTranslation('translation', { keyPrefix: 'advertisement' });
document.title = t('title');
+ type Ad = {
+ _id: string;
+ name: string;
+ type: 'BANNER' | 'MENU' | 'POPUP';
+ organization: {
+ _id: string | undefined;
+ };
+ mediaUrl: string;
+ endDate: string; // Assuming it's a string in the format 'yyyy-MM-dd'
+ startDate: string; // Assuming it's a string in the format 'yyyy-MM-dd'
+ };
+
if (loadingAdvertisements) {
return (
<>
@@ -29,7 +41,6 @@ export default function advertisements(): JSX.Element {
+ ,
+ );
+
+ expect(getByTestId('searchEvent')).toBeInTheDocument();
+ expect(getByTestId('createEventModalBtn')).toBeInTheDocument();
+ });
+
+ it('calls handleChangeView with selected view type', async () => {
+ // Add async keyword
+ const { getByTestId } = render(
+
+ ,
+ );
+
+ fireEvent.click(getByTestId('selectViewType'));
+
+ await act(async () => {
+ fireEvent.click(getByTestId('selectDay'));
+ });
+
+ // Expect handleChangeView to be called with the new view type
+ expect(handleChangeView).toHaveBeenCalledTimes(1);
+ });
+ it('calls handleChangeView with selected event type', async () => {
+ const { getByTestId } = render(
+
+ ,
+ );
+
+ fireEvent.click(getByTestId('eventType'));
+
+ await act(async () => {
+ fireEvent.click(getByTestId('events'));
+ });
+
+ expect(handleChangeView).toHaveBeenCalledTimes(1);
+ });
+
+ it('calls showInviteModal when create event button is clicked', () => {
+ const { getByTestId } = render(
+
+ ,
+ );
+
+ fireEvent.click(getByTestId('createEventModalBtn'));
+ expect(showInviteModal).toHaveBeenCalled();
+ });
+ it('updates the input value when changed', () => {
+ const { getByTestId } = render(
+
+ ,
+ );
+
+ const input = getByTestId('searchEvent') as HTMLInputElement;
+ fireEvent.change(input, { target: { value: 'test event' } });
+
+ expect(input.value).toBe('test event');
+ });
+});
diff --git a/src/components/EventCalendar/EventHeader.tsx b/src/components/EventCalendar/EventHeader.tsx
new file mode 100644
index 0000000000..0ccc8fd600
--- /dev/null
+++ b/src/components/EventCalendar/EventHeader.tsx
@@ -0,0 +1,104 @@
+import React, { useState } from 'react';
+import { Button, Dropdown, Form } from 'react-bootstrap';
+import { Search } from '@mui/icons-material';
+import styles from './EventCalendar.module.css';
+import { ViewType } from '../../screens/OrganizationEvents/OrganizationEvents';
+import { useTranslation } from 'react-i18next';
+
+interface InterfaceEventHeaderProps {
+ viewType: ViewType;
+ handleChangeView: (item: string | null) => void;
+ showInviteModal: () => void;
+}
+
+function eventHeader({
+ viewType,
+ handleChangeView,
+ showInviteModal,
+}: InterfaceEventHeaderProps): JSX.Element {
+ const [eventName, setEventName] = useState('');
+ const { t } = useTranslation('translation', {
+ keyPrefix: 'organizationEvents',
+ });
+
+ return (
+ {
await act(() => {
return new Promise((resolve) => {
@@ -65,8 +106,29 @@ async function wait(ms = 100): Promise {
});
}
-describe('Testing Event List Card', () => {
- const props = {
+const translations = JSON.parse(
+ JSON.stringify(
+ i18nForTest.getDataByLanguage('en')?.translation.eventListCard,
+ ),
+);
+
+const props: InterfaceEventListCardProps[] = [
+ {
+ key: '',
+ id: '',
+ eventLocation: '',
+ eventName: '',
+ eventDescription: '',
+ regDate: '',
+ regEndDate: '',
+ startTime: '',
+ endTime: '',
+ allDay: false,
+ recurring: false,
+ isPublic: false,
+ isRegisterable: false,
+ },
+ {
key: '123',
id: '1',
eventLocation: 'India',
@@ -80,45 +142,67 @@ describe('Testing Event List Card', () => {
recurring: false,
isPublic: true,
isRegisterable: false,
- };
+ },
+ {
+ key: '123',
+ id: '1',
+ eventLocation: 'India',
+ eventName: 'Shelter for Cats',
+ eventDescription: 'This is shelter for cat event',
+ regDate: '19/03/2022',
+ regEndDate: '26/03/2022',
+ startTime: '2:00',
+ endTime: '6:00',
+ allDay: false,
+ recurring: true,
+ isPublic: true,
+ isRegisterable: false,
+ },
+];
- global.alert = jest.fn();
- test('Testing for modal', async () => {
- render(
-
-
-
-
- {
+ return render(
+
+
+
+
+
+
-
-
- ,
- );
+
-
-
-
-
-
-
- ,
- );
-
- await wait();
+ renderEventListCard(props[1]);
userEvent.click(screen.getByTestId('card'));
userEvent.click(screen.getByTestId('editEventModalBtn'));
-
userEvent.click(screen.getByTestId('EventUpdateModalCloseBtn'));
userEvent.click(screen.getByTestId('createEventModalCloseBtn'));
-
- await wait();
});
test('Testing event update functionality', async () => {
- render(
-
-
-
-
-
- ,
- );
+ renderEventListCard(props[1]);
- await wait();
userEvent.click(screen.getByTestId('card'));
userEvent.click(screen.getByTestId('editEventModalBtn'));
- userEvent.type(screen.getByTestId('updateTitle'), props.eventName);
+ userEvent.type(screen.getByTestId('updateTitle'), props[1].eventName);
userEvent.type(
screen.getByTestId('updateDescription'),
- props.eventDescription,
+ props[1].eventDescription,
+ );
+ userEvent.type(
+ screen.getByTestId('updateLocation'),
+ props[1].eventLocation,
);
- userEvent.type(screen.getByTestId('updateLocation'), props.eventLocation);
userEvent.click(screen.getByTestId('updateAllDay'));
userEvent.click(screen.getByTestId('updateRecurring'));
userEvent.click(screen.getByTestId('updateIsPublic'));
@@ -204,159 +266,153 @@ describe('Testing Event List Card', () => {
userEvent.click(screen.getByTestId('updatePostBtn'));
});
+
test('should render props and text elements test for the screen', async () => {
- const { container } = render(
-
-
-
-
-
- ,
- );
+ const { container } = renderEventListCard(props[1]);
expect(container.textContent).not.toBe('Loading data...');
-
- await wait();
+ expect(screen.getByText(props[1].eventName)).toBeInTheDocument();
+ userEvent.click(screen.getByTestId('card'));
+ expect(await screen.findAllByText(props[1].eventName)).toBeTruthy();
+ expect(screen.getByText(props[1].eventDescription)).toBeInTheDocument();
+ expect(screen.getByText(props[1].eventLocation)).toBeInTheDocument();
});
test('Testing if the event is not for all day', async () => {
- render(
-
-
-
-
-
- ,
- );
+ renderEventListCard(props[1]);
- await wait();
userEvent.click(screen.getByTestId('card'));
userEvent.click(screen.getByTestId('editEventModalBtn'));
- userEvent.type(screen.getByTestId('updateTitle'), props.eventName);
+ userEvent.type(screen.getByTestId('updateTitle'), props[1].eventName);
userEvent.type(
screen.getByTestId('updateDescription'),
- props.eventDescription,
+ props[1].eventDescription,
+ );
+ userEvent.type(
+ screen.getByTestId('updateLocation'),
+ props[1].eventLocation,
);
- userEvent.type(screen.getByTestId('updateLocation'), props.eventLocation);
userEvent.click(screen.getByTestId('updateAllDay'));
- await wait();
-
- userEvent.type(screen.getByTestId('updateStartTime'), props.startTime);
- userEvent.type(screen.getByTestId('updateEndTime'), props.endTime);
+ userEvent.type(
+ screen.getByTestId('updateStartTime'),
+ props[1].startTime ?? '',
+ );
+ userEvent.type(screen.getByTestId('updateEndTime'), props[1].endTime ?? '');
userEvent.click(screen.getByTestId('updatePostBtn'));
});
+
test('Testing event preview modal', async () => {
+ renderEventListCard(props[1]);
+ expect(screen.getByText(props[1].eventName)).toBeInTheDocument();
+ });
+
+ test('should render the delete modal', async () => {
+ renderEventListCard(props[1]);
+
+ userEvent.click(screen.getByTestId('card'));
+ userEvent.click(screen.getByTestId('deleteEventModalBtn'));
+
+ userEvent.click(screen.getByTestId('EventDeleteModalCloseBtn'));
+ userEvent.click(screen.getByTestId('createEventModalCloseBtn'));
+ });
+
+ test('should call the delete event mutation when the "Yes" button is clicked', async () => {
+ renderEventListCard(props[1]);
+
+ userEvent.click(screen.getByTestId('card'));
+ userEvent.click(screen.getByTestId('deleteEventModalBtn'));
+ const deleteBtn = screen.getByTestId('deleteEventBtn');
+ fireEvent.click(deleteBtn);
+ });
+
+ test('should show an error toast when the delete event mutation fails', async () => {
render(
-
-
-
-
-
+
+
+
+
+
+
+
+
+
,
);
- await wait();
- expect(screen.getByText(props.eventName)).toBeInTheDocument();
+ userEvent.click(screen.getByTestId('card'));
+ userEvent.click(screen.getByTestId('deleteEventModalBtn'));
+ const deleteBtn = screen.getByTestId('deleteEventBtn');
+ fireEvent.click(deleteBtn);
});
- describe('EventListCard', () => {
- it('should render the delete modal', () => {
- render(
-
-
-
- ,
- );
- userEvent.click(screen.getByTestId('card'));
- userEvent.click(screen.getByTestId('deleteEventModalBtn'));
- userEvent.click(screen.getByTestId('EventDeleteModalCloseBtn'));
- userEvent.click(screen.getByTestId('createEventModalCloseBtn'));
- });
+ test('Should render truncated event name when length is more than 100', async () => {
+ const longEventName = 'a'.repeat(101);
+ renderEventListCard({ ...props[1], eventName: longEventName });
- it('should call the delete event mutation when the "Yes" button is clicked', async () => {
- render(
-
-
-
- ,
- );
- userEvent.click(screen.getByTestId('card'));
- userEvent.click(screen.getByTestId('deleteEventModalBtn'));
- const deleteBtn = screen.getByTestId('deleteEventBtn');
- fireEvent.click(deleteBtn);
+ userEvent.click(screen.getByTestId('card'));
+
+ expect(
+ screen.getByText(`${longEventName.substring(0, 100)}...`),
+ ).toBeInTheDocument();
+ });
+
+ test('Should render full event name when length is less than or equal to 100', async () => {
+ const shortEventName = 'a'.repeat(100);
+ renderEventListCard({ ...props[1], eventName: shortEventName });
+
+ userEvent.click(screen.getByTestId('card'));
+
+ expect(screen.findAllByText(shortEventName)).toBeTruthy();
+ });
+
+ test('Should render truncated event description when length is more than 256', async () => {
+ const longEventDescription = 'a'.repeat(257);
+ renderEventListCard({
+ ...props[1],
+ eventDescription: longEventDescription,
});
- it('should show an error toast when the delete event mutation fails', async () => {
- const errorMocks = [
- {
- request: {
- query: DELETE_EVENT_MUTATION,
- variables: {
- id: props.id,
- },
- },
- error: new Error('Something went wrong'),
- },
- ];
- const link2 = new StaticMockLink(errorMocks, true);
- render(
-
-
-
- ,
- );
- userEvent.click(screen.getByTestId('card'));
- userEvent.click(screen.getByTestId('deleteEventModalBtn'));
- const deleteBtn = screen.getByTestId('deleteEventBtn');
- fireEvent.click(deleteBtn);
+ userEvent.click(screen.getByTestId('card'));
+
+ expect(
+ screen.getByText(`${longEventDescription.substring(0, 256)}...`),
+ ).toBeInTheDocument();
+ });
+
+ test('Should render full event description when length is less than or equal to 256', async () => {
+ const shortEventDescription = 'a'.repeat(256);
+ renderEventListCard({
+ ...props[1],
+ eventDescription: shortEventDescription,
});
+
+ userEvent.click(screen.getByTestId('card'));
+
+ expect(screen.getByText(shortEventDescription)).toBeInTheDocument();
});
- test('Should render truncated event details', async () => {
- const longEventName =
- 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. A very long event name that exceeds 150 characters and needs to be truncated';
- const longDescription =
- 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. A very long description that exceeds 150 characters and needs to be truncated';
- const longEventNameLength = longEventName.length;
- const longDescriptionLength = longDescription.length;
- const truncatedEventName = longEventName.substring(0, 150) + '...';
- const truncatedDescriptionName = longDescription.substring(0, 150) + '...';
- render(
-
-
-
-
-
- ,
- );
+ test('Select different delete options on recurring events & then delete the recurring event', async () => {
+ renderEventListCard(props[2]);
- await wait();
+ userEvent.click(screen.getByTestId('card'));
+ userEvent.click(screen.getByTestId('deleteEventModalBtn'));
- expect(longEventNameLength).toBeGreaterThan(100);
- expect(longDescriptionLength).toBeGreaterThan(256);
- expect(truncatedEventName).toContain('...');
- expect(truncatedDescriptionName).toContain('...');
- await wait();
+ userEvent.click(screen.getByTestId('ThisAndFollowingInstances'));
+ userEvent.click(screen.getByTestId('AllInstances'));
+ userEvent.click(screen.getByTestId('ThisInstance'));
+
+ userEvent.click(screen.getByTestId('deleteEventBtn'));
+
+ await waitFor(() => {
+ expect(toast.success).toBeCalledWith(translations.eventDeleted);
+ });
});
});
diff --git a/src/components/EventListCard/EventListCard.tsx b/src/components/EventListCard/EventListCard.tsx
index ebdb4eea9e..d8025d0f5f 100644
--- a/src/components/EventListCard/EventListCard.tsx
+++ b/src/components/EventListCard/EventListCard.tsx
@@ -12,9 +12,14 @@ import {
} from 'GraphQl/Mutations/mutations';
import { Form } from 'react-bootstrap';
import { errorHandler } from 'utils/errorHandler';
-import { useNavigate } from 'react-router-dom';
+import { Navigate, useNavigate, useParams } from 'react-router-dom';
+import { getItem } from 'utils/useLocalstorage';
+import {
+ RecurringEventMutationType,
+ recurringEventMutationOptions,
+} from 'utils/recurrenceUtils';
-interface InterfaceEventListCardProps {
+export interface InterfaceEventListCardProps {
key: string;
id: string;
eventLocation: string;
@@ -37,10 +42,15 @@ function eventListCard(props: InterfaceEventListCardProps): JSX.Element {
const [alldaychecked, setAllDayChecked] = useState(true);
const [recurringchecked, setRecurringChecked] = useState(false);
const [publicchecked, setPublicChecked] = useState(true);
- const [registrablechecked, setRegistrableChecked] = React.useState(false);
+ const [registrablechecked, setRegistrableChecked] = useState(false);
const [eventDeleteModalIsOpen, setEventDeleteModalIsOpen] = useState(false);
const [eventUpdateModalIsOpen, setEventUpdateModalIsOpen] = useState(false);
+ const { orgId } = useParams();
+ if (!orgId) {
+ return (
+ RecurringEventMutationType.ThisInstance,
+ );
- const deleteEvent = async (): Promise => {
+ const deleteEventHandler = async (): Promise => {
try {
- const { data } = await create({
+ const { data } = await deleteEvent({
variables: {
id: props.id,
+ recurringEventDeleteType: props.recurring
+ ? recurringEventDeleteType
+ : undefined,
},
});
@@ -96,7 +113,7 @@ function eventListCard(props: InterfaceEventListCardProps): JSX.Element {
window.location.reload();
}, 2000);
}
- } catch (error: any) {
+ } catch (error: unknown) {
/* istanbul ignore next */
errorHandler(t, error);
}
@@ -130,19 +147,26 @@ function eventListCard(props: InterfaceEventListCardProps): JSX.Element {
window.location.reload();
}, 2000);
}
- } catch (error: any) {
+ } catch (error: unknown) {
/* istanbul ignore next */
errorHandler(t, error);
}
};
const openEventDashboard = (): void => {
- navigate(`/event/${props.id}`);
+ navigate(`/event/${orgId}/${props.id}`);
};
return (
<>
- => {
try {
const { data } = await updateUserType({
@@ -56,35 +53,28 @@ function orgAdminListCard(props: InterfaceOrgPeopleListCardProps): JSX.Element {
window.location.reload();
}, 2000);
}
- } catch (error: any) {
+ } catch (error: unknown) {
/* istanbul ignore next */
errorHandler(t, error);
}
}
- } catch (error: any) {
+ } catch (error: unknown) {
/* istanbul ignore next */
errorHandler(t, error);
}
};
return (
<>
-
-
+
{t('removeAdminMsg')}
- ,
);
+ await wait();
expect(screen.getByAltText(/Dogs Care image/i)).toBeInTheDocument();
expect(screen.getByText(/Admins:/i)).toBeInTheDocument();
expect(screen.getByText(/Members:/i)).toBeInTheDocument();
expect(screen.getByText('Dogs Care')).toBeInTheDocument();
expect(screen.getByText(/Sample City/i)).toBeInTheDocument();
expect(screen.getByText(/123 Sample Street/i)).toBeInTheDocument();
+ expect(screen.getByTestId(/manageBtn/i)).toBeInTheDocument();
+ expect(screen.getByTestId(/flaskIcon/i)).toBeInTheDocument();
userEvent.click(screen.getByTestId(/manageBtn/i));
removeItem('id');
});
diff --git a/src/components/OrgListCard/OrgListCard.tsx b/src/components/OrgListCard/OrgListCard.tsx
index 854fa5e22a..ef1e5efeba 100644
--- a/src/components/OrgListCard/OrgListCard.tsx
+++ b/src/components/OrgListCard/OrgListCard.tsx
@@ -99,6 +99,7 @@ function orgListCard(props: InterfaceOrgListCardProps): JSX.Element {
width={12}
className={styles.flaskIcon}
title={t('sampleOrganization')}
+ data-testid="flaskIcon"
/>
)}
{' '}
diff --git a/src/components/OrgPeopleListCard/OrgPeopleListCard.module.css b/src/components/OrgPeopleListCard/OrgPeopleListCard.module.css
deleted file mode 100644
index 187757a531..0000000000
--- a/src/components/OrgPeopleListCard/OrgPeopleListCard.module.css
+++ /dev/null
@@ -1,74 +0,0 @@
-.memberlist {
- margin-top: -1px;
-}
-.memberimg {
- width: 200px;
- height: 100px;
- border-radius: 7px;
- margin-left: 20px;
-}
-.singledetails {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
-}
-.singledetails p {
- margin-bottom: -5px;
-}
-.singledetails_data_left {
- margin-top: 10px;
- margin-left: 10px;
- color: #707070;
-}
-.singledetails_data_right {
- justify-content: right;
- margin-top: 10px;
- text-align: right;
- color: #707070;
-}
-.membername {
- font-size: 16px;
- font-weight: bold;
-}
-.memberfont {
- margin-top: 3px;
-}
-.memberfont > span {
- width: 80%;
-}
-.memberfontcreated {
- margin-top: 18px;
-}
-.memberfontcreatedbtn {
- margin-top: 33px;
- border-radius: 7px;
- border-color: #31bb6b;
- background-color: #31bb6b;
- color: white;
- padding-right: 10px;
- padding-left: 10px;
- justify-content: flex-end;
- float: right;
- text-align: right;
- box-shadow: none;
-}
-#grid_wrapper {
- align-items: left;
-}
-.peoplelistdiv {
- margin-right: 50px;
-}
-@media only screen and (max-width: 600px) {
- .singledetails {
- margin-left: 20px;
- }
- .memberimg {
- margin: auto;
- }
- .singledetails_data_right {
- margin-right: -52px;
- }
- .singledetails_data_left {
- margin-left: 0px;
- }
-}
diff --git a/src/components/OrgPeopleListCard/OrgPeopleListCard.test.tsx b/src/components/OrgPeopleListCard/OrgPeopleListCard.test.tsx
index ed87a54b05..57a6e0265f 100644
--- a/src/components/OrgPeopleListCard/OrgPeopleListCard.test.tsx
+++ b/src/components/OrgPeopleListCard/OrgPeopleListCard.test.tsx
@@ -38,7 +38,7 @@ async function wait(ms = 100): Promise {
describe('Testing Organization People List Card', () => {
const props = {
- key: 123,
+ toggleRemoveModal: () => true,
id: '1',
};
global.alert = jest.fn();
@@ -58,18 +58,17 @@ describe('Testing Organization People List Card', () => {
await wait();
- userEvent.click(screen.getByTestId(/removeMemberModalBtn/i));
userEvent.click(screen.getByTestId(/removeMemberBtn/i));
});
- test('Should render text elements when props value is not passed', async () => {
+ test('Should not render modal when id is undefined', async () => {
global.confirm = (): boolean => false;
render(
- true} />
,
@@ -77,7 +76,6 @@ describe('Testing Organization People List Card', () => {
await wait();
- userEvent.click(screen.getByTestId(/removeMemberModalBtn/i));
- userEvent.click(screen.getByTestId(/removeMemberBtn/i));
+ expect(window.location.pathname).toEqual('/orglist');
});
});
diff --git a/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx b/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
index c962d92a9e..7e696e62db 100644
--- a/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
+++ b/src/components/OrgPeopleListCard/OrgPeopleListCard.tsx
@@ -1,28 +1,26 @@
import React from 'react';
-import styles from './OrgPeopleListCard.module.css';
import Button from 'react-bootstrap/Button';
import Modal from 'react-bootstrap/Modal';
import { useMutation } from '@apollo/client';
import { toast } from 'react-toastify';
import { useTranslation } from 'react-i18next';
import { REMOVE_MEMBER_MUTATION } from 'GraphQl/Mutations/mutations';
-import { useParams } from 'react-router-dom';
+import { useParams, Navigate } from 'react-router-dom';
import { errorHandler } from 'utils/errorHandler';
interface InterfaceOrgPeopleListCardProps {
- key: number;
- id: string;
+ id: string | undefined;
+ toggleRemoveModal: () => void;
}
function orgPeopleListCard(
props: InterfaceOrgPeopleListCardProps,
): JSX.Element {
const { orgId: currentUrl } = useParams();
+ if (!props.id) {
+ return
@@ -69,8 +71,13 @@ const superAdminScreen = (): JSX.Element => {
export default superAdminScreen;
-const map: any = {
+const map: Record<
+ string,
+ 'orgList' | 'requests' | 'users' | 'memberDetail' | 'communityProfile'
+> = {
orglist: 'orgList',
+ requests: 'requests',
users: 'users',
member: 'memberDetail',
+ communityProfile: 'communityProfile',
};
diff --git a/src/components/UserPortal/CommentCard/CommentCard.test.tsx b/src/components/UserPortal/CommentCard/CommentCard.test.tsx
index 53a6cf4e6f..35b81167fc 100644
--- a/src/components/UserPortal/CommentCard/CommentCard.test.tsx
+++ b/src/components/UserPortal/CommentCard/CommentCard.test.tsx
@@ -56,6 +56,8 @@ const MOCKS = [
},
];
+const handleLikeComment = jest.fn();
+const handleDislikeComment = jest.fn();
const link = new StaticMockLink(MOCKS, true);
describe('Testing CommentCard Component [User Portal]', () => {
@@ -81,6 +83,8 @@ describe('Testing CommentCard Component [User Portal]', () => {
},
],
text: 'testComment',
+ handleLikeComment: handleLikeComment,
+ handleDislikeComment: handleDislikeComment,
};
const beforeUserId = getItem('userId');
@@ -120,6 +124,8 @@ describe('Testing CommentCard Component [User Portal]', () => {
},
],
text: 'testComment',
+ handleLikeComment: handleLikeComment,
+ handleDislikeComment: handleDislikeComment,
};
const beforeUserId = getItem('userId');
@@ -159,6 +165,8 @@ describe('Testing CommentCard Component [User Portal]', () => {
},
],
text: 'testComment',
+ handleLikeComment: handleLikeComment,
+ handleDislikeComment: handleDislikeComment,
};
const beforeUserId = getItem('userId');
@@ -203,6 +211,8 @@ describe('Testing CommentCard Component [User Portal]', () => {
},
],
text: 'testComment',
+ handleLikeComment: handleLikeComment,
+ handleDislikeComment: handleDislikeComment,
};
const beforeUserId = getItem('userId');
diff --git a/src/components/UserPortal/CommentCard/CommentCard.tsx b/src/components/UserPortal/CommentCard/CommentCard.tsx
index 2cc95c0885..955f136cb5 100644
--- a/src/components/UserPortal/CommentCard/CommentCard.tsx
+++ b/src/components/UserPortal/CommentCard/CommentCard.tsx
@@ -22,6 +22,8 @@ interface InterfaceCommentCardProps {
id: string;
}[];
text: string;
+ handleLikeComment: (commentId: string) => void;
+ handleDislikeComment: (commentId: string) => void;
}
function commentCard(props: InterfaceCommentCardProps): JSX.Element {
@@ -49,6 +51,7 @@ function commentCard(props: InterfaceCommentCardProps): JSX.Element {
if (data) {
setLikes((likes) => likes - 1);
setIsLikedByUser(false);
+ props.handleDislikeComment(props.id);
}
} catch (error: any) {
/* istanbul ignore next */
@@ -65,6 +68,7 @@ function commentCard(props: InterfaceCommentCardProps): JSX.Element {
if (data) {
setLikes((likes) => likes + 1);
setIsLikedByUser(true);
+ props.handleLikeComment(props.id);
}
} catch (error: any) {
/* istanbul ignore next */
diff --git a/src/components/UserPortal/DonationCard/DonationCard.module.css b/src/components/UserPortal/DonationCard/DonationCard.module.css
index 76fcaf3b0c..3fa737ada2 100644
--- a/src/components/UserPortal/DonationCard/DonationCard.module.css
+++ b/src/components/UserPortal/DonationCard/DonationCard.module.css
@@ -1,19 +1,38 @@
.mainContainer {
- width: 100%;
+ width: 49%;
+ height: 8rem;
+ min-width: max-content;
display: flex;
- flex-direction: row;
- padding: 10px;
- cursor: pointer;
+ justify-content: space-between;
+ gap: 1rem;
+ padding: 1rem;
background-color: white;
+ border: 1px solid #dddddd;
border-radius: 10px;
- box-shadow: 2px 2px 8px 0px #c8c8c8;
overflow: hidden;
}
+.img {
+ height: 100%;
+ aspect-ratio: 1/1;
+ background-color: rgba(49, 187, 107, 12%);
+}
+
+.btn {
+ display: flex;
+ align-items: flex-end;
+}
+
+.btn button {
+ padding-inline: 2rem !important;
+ border-radius: 5px;
+}
+
.personDetails {
display: flex;
flex-direction: column;
justify-content: center;
+ min-width: max-content;
}
.personImage {
diff --git a/src/components/UserPortal/DonationCard/DonationCard.test.tsx b/src/components/UserPortal/DonationCard/DonationCard.test.tsx
new file mode 100644
index 0000000000..4e49ed8b26
--- /dev/null
+++ b/src/components/UserPortal/DonationCard/DonationCard.test.tsx
@@ -0,0 +1,49 @@
+import React from 'react';
+import { act, render } from '@testing-library/react';
+import { MockedProvider } from '@apollo/react-testing';
+import { I18nextProvider } from 'react-i18next';
+
+import { BrowserRouter } from 'react-router-dom';
+import { Provider } from 'react-redux';
+import { store } from 'state/store';
+import i18nForTest from 'utils/i18nForTest';
+import { StaticMockLink } from 'utils/StaticMockLink';
+import DonationCard from './DonationCard';
+import { type InterfaceDonationCardProps } from 'screens/UserPortal/Donate/Donate';
+
+const link = new StaticMockLink([], true);
+
+async function wait(ms = 100): Promise {
+ await act(() => {
+ return new Promise((resolve) => {
+ setTimeout(resolve, ms);
+ });
+ });
+}
+
+const props: InterfaceDonationCardProps = {
+ id: '1',
+ name: 'John Doe',
+ amount: '20',
+ userId: '1234',
+ payPalId: 'id',
+ updatedAt: String(new Date()),
+};
+
+describe('Testing ContactCard Component [User Portal]', () => {
+ test('Component should be rendered properly', async () => {
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+
+ await wait();
+ });
+});
diff --git a/src/components/UserPortal/DonationCard/DonationCard.tsx b/src/components/UserPortal/DonationCard/DonationCard.tsx
index 436e3049b8..696c5fb57b 100644
--- a/src/components/UserPortal/DonationCard/DonationCard.tsx
+++ b/src/components/UserPortal/DonationCard/DonationCard.tsx
@@ -1,21 +1,31 @@
import React from 'react';
import styles from './DonationCard.module.css';
-
-interface InterfaceDonationCardProps {
- id: string;
- name: string;
- amount: string;
- userId: string;
- payPalId: string;
-}
+import { type InterfaceDonationCardProps } from 'screens/UserPortal/Donate/Donate';
+import { Button } from 'react-bootstrap';
function donationCard(props: InterfaceDonationCardProps): JSX.Element {
+ const date = new Date(props.updatedAt);
+ const formattedDate = new Intl.DateTimeFormat('en-US', {
+ weekday: 'short',
+ year: 'numeric',
+ month: 'short',
+ day: 'numeric',
+ }).format(date);
+
return (
-
+ Organizations Component
+
+ }
+ />
+
+
+ ,
+ );
+
+ expect(
+ screen.getByText(/Oops! The Page you requested was not found!/i),
+ ).toBeTruthy();
+ });
});
diff --git a/src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.tsx b/src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.tsx
index 4fec891e0f..f21047579d 100644
--- a/src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.tsx
+++ b/src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.tsx
@@ -1,11 +1,17 @@
import React from 'react';
import { Navigate, Outlet } from 'react-router-dom';
+import PageNotFound from 'screens/PageNotFound/PageNotFound';
import useLocalStorage from 'utils/useLocalstorage';
const SecuredRouteForUser = (): JSX.Element => {
const { getItem } = useLocalStorage();
const isLoggedIn = getItem('IsLoggedIn');
- return isLoggedIn === 'TRUE' ?
-
- {advertisementsData?.advertisementsConnection
- .filter((ad: any) => ad.organization._id == currentOrgId)
- .filter((ad: any) => new Date(ad.endDate) > new Date())
- .length == 0 ? (
-
- {advertisementsData?.advertisementsConnection
- .filter((ad: any) => ad.organization._id == currentOrgId)
- .filter((ad: any) => new Date(ad.endDate) < new Date())
- .length == 0 ? (
- => {
diff --git a/src/components/Avatar/Avatar.module.css b/src/components/Avatar/Avatar.module.css
new file mode 100644
index 0000000000..14aa36e9ad
--- /dev/null
+++ b/src/components/Avatar/Avatar.module.css
@@ -0,0 +1,11 @@
+.imageContainer {
+ width: 56px;
+ height: 56px;
+ border-radius: 100%;
+}
+.imageContainer img {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ border-radius: 100%;
+}
diff --git a/src/components/Avatar/Avatar.tsx b/src/components/Avatar/Avatar.tsx
index 2cf5f7dda2..6d4cab405b 100644
--- a/src/components/Avatar/Avatar.tsx
+++ b/src/components/Avatar/Avatar.tsx
@@ -1,6 +1,7 @@
import React, { useMemo } from 'react';
import { createAvatar } from '@dicebear/core';
import { initials } from '@dicebear/collection';
+import styles from 'components/Avatar/Avatar.module.css';
interface InterfaceAvatarProps {
name: string;
@@ -8,6 +9,7 @@ interface InterfaceAvatarProps {
size?: number;
avatarStyle?: string;
dataTestId?: string;
+ radius?: number;
}
const Avatar = ({
@@ -16,23 +18,27 @@ const Avatar = ({
size,
avatarStyle,
dataTestId,
+ radius,
}: InterfaceAvatarProps): JSX.Element => {
const avatar = useMemo(() => {
return createAvatar(initials, {
size: size || 128,
seed: name,
+ radius: radius || 0,
}).toDataUriSync();
}, [name, size]);
const svg = avatar.toString();
return (
- 
+
{hours.map((hour, index) => {
- const timeEventsList: any = events
- ?.filter((datas) => {
- const currDate = new Date(currentYear, currentMonth, currentDate);
-
- if (
- datas.startTime?.slice(0, 2) == (index % 24).toString() &&
- datas.startDate == dayjs(currDate).format('YYYY-MM-DD')
- ) {
- return datas;
- }
- })
- .map((datas: InterfaceEvent) => {
- return (
- {t('pHeading')}
{t('pMessage')}
+ {advertisementsData?.advertisementsConnection?.edges + .map((edge: { node: Ad }) => edge.node) + .filter((ad: Ad) => ad.organization._id === currentOrgId) + .filter((ad: Ad) => new Date(ad.endDate) > new Date()) + .length === 0 ? ( +{t('pMessage')}
) : ( - advertisementsData?.advertisementsConnection - .filter((ad: any) => ad.organization._id == currentOrgId) - .filter((ad: any) => new Date(ad.endDate) > new Date()) + advertisementsData?.advertisementsConnection?.edges + .map((edge: { node: Ad }) => edge.node) + .filter((ad: Ad) => ad.organization._id === currentOrgId) + .filter((ad: Ad) => new Date(ad.endDate) > new Date()) .map( ( ad: { _id: string; name: string | undefined; type: string | undefined; - organization: any; + organization: { + _id: string; + }; mediaUrl: string; - endDate: Date; - startDate: Date; + endDate: string; + startDate: string; }, i: React.Key | null | undefined, ): JSX.Element => ( @@ -74,25 +89,29 @@ export default function advertisements(): JSX.Element { )}{t('pMessage')}
+ {advertisementsData?.advertisementsConnection?.edges + .map((edge: { node: Ad }) => edge.node) + .filter((ad: Ad) => ad.organization._id === currentOrgId) + .filter((ad: Ad) => new Date(ad.endDate) < new Date()) + .length === 0 ? ( +{t('pMessage')}
) : ( - advertisementsData?.advertisementsConnection - .filter((ad: any) => ad.organization._id == currentOrgId) - .filter((ad: any) => new Date(ad.endDate) < new Date()) + advertisementsData?.advertisementsConnection?.edges + .map((edge: { node: Ad }) => edge.node) + .filter((ad: Ad) => ad.organization._id === currentOrgId) + .filter((ad: Ad) => new Date(ad.endDate) < new Date()) .map( ( ad: { _id: string; name: string | undefined; type: string | undefined; - organization: any; + organization: { + _id: string; + }; mediaUrl: string; - endDate: Date; - startDate: Date; + endDate: string; + startDate: string; }, i: React.Key | null | undefined, ): JSX.Element => ( diff --git a/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx b/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx index 44216c8761..8dbeee9f33 100644 --- a/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx +++ b/src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx @@ -117,9 +117,11 @@ function advertisementRegister({ }); handleClose(); } - } catch (error) { - toast.error('An error occured, could not create new advertisement'); - console.log('error occured', error); + } catch (error: unknown) { + if (error instanceof Error) { + toast.error('An error occured, could not create new advertisement'); + console.log('error occured', error.message); + } } }; const handleUpdate = async (): Promise
+
+
);
};
diff --git a/src/components/CollapsibleDropdown/CollapsibleDropdown.tsx b/src/components/CollapsibleDropdown/CollapsibleDropdown.tsx
index 854f9dc598..03f08b044f 100644
--- a/src/components/CollapsibleDropdown/CollapsibleDropdown.tsx
+++ b/src/components/CollapsibleDropdown/CollapsibleDropdown.tsx
@@ -30,7 +30,7 @@ const collapsibleDropdown = ({
return (
<>
@@ -365,7 +334,7 @@ const Calendar: React.FC = ({
= ({
-
-
0
+ timeEventsList?.length > 0
? styles.event_list_parent_current
: styles.event_list_parent
}
@@ -389,6 +358,7 @@ const Calendar: React.FC = ({
: styles.event_list
}
>
+ {/*istanbul ignore next*/}
{expanded === index
? timeEventsList
: timeEventsList?.slice(0, 1)}
@@ -439,6 +409,7 @@ const Calendar: React.FC = ({
return days.map((date, index) => {
const className = [
+ date.getDay() === 0 || date.getDay() === 6 ? styles.day_weekends : '',
date.toLocaleDateString() === today.toLocaleDateString() //Styling for today day cell
? styles.day__today
: '',
@@ -446,39 +417,48 @@ const Calendar: React.FC = ({
selectedDate?.getTime() === date.getTime() ? styles.day__selected : '',
styles.day,
].join(' ');
-
const toggleExpand = (index: number): void => {
+ /*istanbul ignore next*/
if (expanded === index) {
setExpanded(-1);
} else {
setExpanded(index);
}
};
+ /*istanbul ignore next*/
+ const allEventsList: JSX.Element[] =
+ events
+ ?.filter((datas) => {
+ if (datas.startDate == dayjs(date).format('YYYY-MM-DD'))
+ return datas;
+ })
+ .map((datas: InterfaceEvent) => {
+ return (
+
);
});
@@ -521,6 +518,7 @@ const Calendar: React.FC = ({
data-testid="day"
>
{date.getDate()}
-
+ )}
+ {date.getMonth() !== currentMonth ? null : (
+ {(allEventsList?.length > 2 ||
+ (windowWidth <= 700 && allEventsList?.length > 0)) && (
+ /*istanbul ignore next*/
+
+ )}
+
- {expanded === index ? allEventsList : allEventsList?.slice(0, 2)}
-
- {(allEventsList?.length > 2 ||
- (windowWidth <= 700 && allEventsList?.length > 0)) && (
-
-
-
- {viewType || ViewType.MONTH}
-
-
-
- {ViewType.MONTH}
-
-
- {ViewType.DAY}
-
-
-
-
{viewType == ViewType.MONTH ? (
@@ -584,6 +564,7 @@ const Calendar: React.FC = ({
) : (
+ /*istanbul ignore next*/
{renderDays()}
{renderHours()}
)}
+
+ );
+}
+
+export default eventHeader;
diff --git a/src/components/EventCalendar/constants.js b/src/components/EventCalendar/constants.js
new file mode 100644
index 0000000000..f2b770426c
--- /dev/null
+++ b/src/components/EventCalendar/constants.js
@@ -0,0 +1,56 @@
+export const holidays = [
+ { name: 'May Day / Labour Day', date: '05-01', month: 'May' }, // May 1st
+ { name: "Mother's Day", date: '05-08', month: 'May' }, // Second Sunday in May
+ { name: "Father's Day", date: '06-19', month: 'June' }, // Third Sunday in June
+ { name: 'Independence Day (US)', date: '07-04', month: 'July' }, // July 4th
+ { name: 'Oktoberfest', date: '09-21', month: 'September' }, // September 21st (starts in September, ends in October)
+ { name: 'Halloween', date: '10-31', month: 'October' }, // October 31st
+ { name: 'Diwali', date: '11-04', month: 'November' },
+ {
+ name: 'Remembrance Day / Veterans Day',
+ date: '11-11',
+ month: 'November',
+ },
+ { name: 'Christmas Day', date: '12-25', month: 'December' }, // December 25th
+];
+export const weekdays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+export const months = [
+ 'January',
+ 'February',
+ 'March',
+ 'April',
+ 'May',
+ 'June',
+ 'July',
+ 'August',
+ 'September',
+ 'October',
+ 'November',
+ 'December',
+];
+export const hours = [
+ '12 AM',
+ '01 AM',
+ '02 AM',
+ '03 AM',
+ '04 AM',
+ '05 AM',
+ '06 AM',
+ '07 AM',
+ '08 AM',
+ '09 AM',
+ '10 AM',
+ '11 AM',
+ '12 PM',
+ '01 PM',
+ '02 PM',
+ '03 PM',
+ '04 PM',
+ '05 PM',
+ '06 PM',
+ '07 PM',
+ '08 PM',
+ '09 PM',
+ '10 PM',
+ '11 PM',
+];
diff --git a/src/components/EventListCard/EventListCard.module.css b/src/components/EventListCard/EventListCard.module.css
index 2f81518a1b..15f00e6c26 100644
--- a/src/components/EventListCard/EventListCard.module.css
+++ b/src/components/EventListCard/EventListCard.module.css
@@ -1,6 +1,7 @@
.cards h2 {
font-size: 15px;
- color: #fff;
+ color: #4e4c4c;
+ font-weight: 500;
}
.cards > h3 {
font-size: 17px;
@@ -45,11 +46,11 @@
.cards {
width: 100%;
- background: #31bb6b;
+ background: #5cacf7 !important;
padding: 2px 3px;
border-radius: 5px;
border: 1px solid #e8e8e8;
- box-shadow: 0 3px 5px #c9c9c9;
+ box-shadow: 0 3px 2px #e8e8e8;
color: #737373;
box-sizing: border-box;
}
diff --git a/src/components/EventListCard/EventListCard.test.tsx b/src/components/EventListCard/EventListCard.test.tsx
index 17a9f4bc96..1d5d246a13 100644
--- a/src/components/EventListCard/EventListCard.test.tsx
+++ b/src/components/EventListCard/EventListCard.test.tsx
@@ -1,9 +1,16 @@
import React from 'react';
-import { act, render, screen, fireEvent } from '@testing-library/react';
+import type { RenderResult } from '@testing-library/react';
+import {
+ act,
+ render,
+ screen,
+ fireEvent,
+ waitFor,
+} from '@testing-library/react';
import { MockedProvider } from '@apollo/react-testing';
import userEvent from '@testing-library/user-event';
import { I18nextProvider } from 'react-i18next';
-
+import type { InterfaceEventListCardProps } from './EventListCard';
import EventListCard from './EventListCard';
import {
DELETE_EVENT_MUTATION,
@@ -11,15 +18,29 @@ import {
} from 'GraphQl/Mutations/mutations';
import i18nForTest from 'utils/i18nForTest';
import { StaticMockLink } from 'utils/StaticMockLink';
-import { BrowserRouter } from 'react-router-dom';
+import { BrowserRouter, MemoryRouter, Route, Routes } from 'react-router-dom';
import { Provider } from 'react-redux';
import { store } from 'state/store';
+import { toast } from 'react-toastify';
const MOCKS = [
{
request: {
query: DELETE_EVENT_MUTATION,
- variable: { id: '123' },
+ variables: { id: '1' },
+ },
+ result: {
+ data: {
+ removeEvent: {
+ _id: '1',
+ },
+ },
+ },
+ },
+ {
+ request: {
+ query: DELETE_EVENT_MUTATION,
+ variables: { id: '1', recurringEventDeleteType: 'ThisInstance' },
},
result: {
data: {
@@ -55,8 +76,28 @@ const MOCKS = [
},
];
+const ERROR_MOCKS = [
+ {
+ request: {
+ query: DELETE_EVENT_MUTATION,
+ variables: {
+ id: '1',
+ },
+ },
+ error: new Error('Something went wrong'),
+ },
+];
+const link2 = new StaticMockLink(ERROR_MOCKS, true);
+
const link = new StaticMockLink(MOCKS, true);
+jest.mock('react-toastify', () => ({
+ toast: {
+ success: jest.fn(),
+ error: jest.fn(),
+ },
+}));
+
async function wait(ms = 100): Promise
+
+
+ setEventName(e.target.value)}
+ />
+
+
+
+
+
+
+
+
+ {viewType}
+
+
+
+ {ViewType.MONTH}
+
+
+ {ViewType.DAY}
+
+
+
+
+
+
+
+ {t('eventType')}
+
+
+
+ Events
+
+
+ Workshops
+
+
+
+
+
+
+
{/* preview modal */}
-
+
{/* Options List */}
{props.eventName ? <>{props.eventName} : <>Dogs Care} @@ -150,7 +174,7 @@ function eventListCard(props: InterfaceEventListCardProps): JSX.Element {
{t('eventDetails')}
-
{({ isActive }) => (
);
diff --git a/src/components/OrgActionItemCategories/OrgActionItemCategories.tsx b/src/components/OrgActionItemCategories/OrgActionItemCategories.tsx
index 2148255909..5f4c356af6 100644
--- a/src/components/OrgActionItemCategories/OrgActionItemCategories.tsx
+++ b/src/components/OrgActionItemCategories/OrgActionItemCategories.tsx
@@ -75,9 +75,11 @@ const OrgActionItemCategories = (): any => {
setModalIsOpen(false);
toast.success(t('successfulCreation'));
- } catch (error: any) {
- toast.error(error.message);
- console.log(error);
+ } catch (error: unknown) {
+ if (error instanceof Error) {
+ toast.error(error.message);
+ console.log(error.message);
+ }
}
};
@@ -101,9 +103,11 @@ const OrgActionItemCategories = (): any => {
setModalIsOpen(false);
toast.success(t('successfulUpdation'));
- } catch (error: any) {
- toast.error(error.message);
- console.log(error);
+ } catch (error: unknown) {
+ if (error instanceof Error) {
+ toast.error(error.message);
+ console.log(error.message);
+ }
}
}
};
@@ -125,9 +129,11 @@ const OrgActionItemCategories = (): any => {
toast.success(
disabledStatus ? t('categoryEnabled') : t('categoryDisabled'),
);
- } catch (error: any) {
- toast.error(error.message);
- console.log(error);
+ } catch (error: unknown) {
+ if (error instanceof Error) {
+ toast.error(error.message);
+ console.log(error.message);
+ }
}
};
diff --git a/src/components/OrgAdminListCard/OrgAdminListCard.module.css b/src/components/OrgAdminListCard/OrgAdminListCard.module.css
deleted file mode 100644
index 187757a531..0000000000
--- a/src/components/OrgAdminListCard/OrgAdminListCard.module.css
+++ /dev/null
@@ -1,74 +0,0 @@
-.memberlist {
- margin-top: -1px;
-}
-.memberimg {
- width: 200px;
- height: 100px;
- border-radius: 7px;
- margin-left: 20px;
-}
-.singledetails {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
-}
-.singledetails p {
- margin-bottom: -5px;
-}
-.singledetails_data_left {
- margin-top: 10px;
- margin-left: 10px;
- color: #707070;
-}
-.singledetails_data_right {
- justify-content: right;
- margin-top: 10px;
- text-align: right;
- color: #707070;
-}
-.membername {
- font-size: 16px;
- font-weight: bold;
-}
-.memberfont {
- margin-top: 3px;
-}
-.memberfont > span {
- width: 80%;
-}
-.memberfontcreated {
- margin-top: 18px;
-}
-.memberfontcreatedbtn {
- margin-top: 33px;
- border-radius: 7px;
- border-color: #31bb6b;
- background-color: #31bb6b;
- color: white;
- padding-right: 10px;
- padding-left: 10px;
- justify-content: flex-end;
- float: right;
- text-align: right;
- box-shadow: none;
-}
-#grid_wrapper {
- align-items: left;
-}
-.peoplelistdiv {
- margin-right: 50px;
-}
-@media only screen and (max-width: 600px) {
- .singledetails {
- margin-left: 20px;
- }
- .memberimg {
- margin: auto;
- }
- .singledetails_data_right {
- margin-right: -52px;
- }
- .singledetails_data_left {
- margin-left: 0px;
- }
-}
diff --git a/src/components/OrgAdminListCard/OrgAdminListCard.test.tsx b/src/components/OrgAdminListCard/OrgAdminListCard.test.tsx
index a8d7eb8e9a..cf36fcb0c5 100644
--- a/src/components/OrgAdminListCard/OrgAdminListCard.test.tsx
+++ b/src/components/OrgAdminListCard/OrgAdminListCard.test.tsx
@@ -41,7 +41,7 @@ describe('Testing Organization Admin List Card', () => {
test('should render props and text elements test for the page component', async () => {
const props = {
- key: 123,
+ toggleRemoveModal: () => true,
id: '456',
};
@@ -57,14 +57,13 @@ describe('Testing Organization Admin List Card', () => {
await wait();
- userEvent.click(screen.getByTestId(/removeAdminModalBtn/i));
userEvent.click(screen.getByTestId(/removeAdminBtn/i));
});
- test('Should render text elements when props value is not passed', async () => {
+ test('Should not render text elements when props value is not passed', async () => {
const props = {
- key: 123,
- id: '456',
+ toggleRemoveModal: () => true,
+ id: undefined,
};
render(
@@ -79,7 +78,6 @@ describe('Testing Organization Admin List Card', () => {
await wait();
- userEvent.click(screen.getByTestId(/removeAdminModalBtn/i));
- userEvent.click(screen.getByTestId(/removeAdminBtn/i));
+ expect(window.location.pathname).toEqual('/orglist');
});
});
diff --git a/src/components/OrgAdminListCard/OrgAdminListCard.tsx b/src/components/OrgAdminListCard/OrgAdminListCard.tsx
index 5b945354c9..251bbc12da 100644
--- a/src/components/OrgAdminListCard/OrgAdminListCard.tsx
+++ b/src/components/OrgAdminListCard/OrgAdminListCard.tsx
@@ -4,34 +4,31 @@ import Modal from 'react-bootstrap/Modal';
import { useMutation } from '@apollo/client';
import { toast } from 'react-toastify';
-import styles from './OrgAdminListCard.module.css';
import {
REMOVE_ADMIN_MUTATION,
UPDATE_USERTYPE_MUTATION,
} from 'GraphQl/Mutations/mutations';
import { useTranslation } from 'react-i18next';
-import { useParams } from 'react-router-dom';
+import { Navigate, useParams } from 'react-router-dom';
import { errorHandler } from 'utils/errorHandler';
interface InterfaceOrgPeopleListCardProps {
- key: number;
- id: string;
+ id: string | undefined;
+ toggleRemoveModal: () => void;
}
function orgAdminListCard(props: InterfaceOrgPeopleListCardProps): JSX.Element {
+ if (!props.id) {
+ return {t('menu')}
++ {t('menu')} +
{targets.map(({ name, url }, index) => { return url ? ({t('removeAdmin')}
-
-
-
-
+
{t('removeMemberMsg')}
-
-
{t('removeMember')}
-
+ >;
diff --git a/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx b/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
index b1fbb1cc81..dba4286290 100644
--- a/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
+++ b/src/components/UserPortal/OrganizationCard/OrganizationCard.test.tsx
@@ -250,9 +250,7 @@ describe('Testing OrganizationCard Component [User Portal]', () => {
fireEvent.click(screen.getByTestId('joinBtn'));
await wait();
- expect(toast.success).toHaveBeenCalledWith(
- 'Membership request sent successfully',
- );
+ expect(toast.success).toHaveBeenCalledWith('users.MembershipRequestSent');
});
test('send membership request to public org', async () => {
@@ -282,9 +280,7 @@ describe('Testing OrganizationCard Component [User Portal]', () => {
fireEvent.click(screen.getByTestId('joinBtn'));
await wait();
- expect(toast.success).toHaveBeenCalledWith(
- 'Joined organization successfully',
- );
+ expect(toast.success).toHaveBeenCalledTimes(2);
});
test('withdraw membership request', async () => {
diff --git a/src/components/UserPortal/PeopleCard/PeopleCard.module.css b/src/components/UserPortal/PeopleCard/PeopleCard.module.css
index 76fcaf3b0c..fe9fc3bcbd 100644
--- a/src/components/UserPortal/PeopleCard/PeopleCard.module.css
+++ b/src/components/UserPortal/PeopleCard/PeopleCard.module.css
@@ -19,4 +19,15 @@
.personImage {
border-radius: 50%;
margin-right: 20px;
+ max-width: 70px;
+}
+
+.borderBox {
+ border: 1px solid #dddddd;
+ box-shadow: 5px 5px 4px 0px #31bb6b1f;
+ border-radius: 4px;
+}
+
+.greenText {
+ color: #31bb6b;
}
diff --git a/src/components/UserPortal/PeopleCard/PeopleCard.test.tsx b/src/components/UserPortal/PeopleCard/PeopleCard.test.tsx
index 6824a37191..5cadfa923b 100644
--- a/src/components/UserPortal/PeopleCard/PeopleCard.test.tsx
+++ b/src/components/UserPortal/PeopleCard/PeopleCard.test.tsx
@@ -25,6 +25,8 @@ let props = {
name: 'First Last',
image: '',
email: 'first@last.com',
+ role: 'Admin',
+ sno: '1',
};
describe('Testing PeopleCard Component [User Portal]', () => {
diff --git a/src/components/UserPortal/PeopleCard/PeopleCard.tsx b/src/components/UserPortal/PeopleCard/PeopleCard.tsx
index 578cf31194..ec06122359 100644
--- a/src/components/UserPortal/PeopleCard/PeopleCard.tsx
+++ b/src/components/UserPortal/PeopleCard/PeopleCard.tsx
@@ -7,22 +7,38 @@ interface InterfaceOrganizationCardProps {
name: string;
image: string;
email: string;
+ role: string;
+ sno: string;
}
function peopleCard(props: InterfaceOrganizationCardProps): JSX.Element {
const imageUrl = props.image ? props.image : aboutImg;
return (
-
Organizations Component
@@ -60,4 +57,40 @@ describe('SecuredRouteForUser', () => {
expect(screen.getByText('User Login Page')).toBeInTheDocument();
});
});
+
+ test('renders the route when the user is logged in and user is ADMIN', () => {
+ // Set the 'IsLoggedIn' value to 'TRUE' in localStorage to simulate a logged-in user and set 'AdminFor' to simulate ADMIN of some Organization.
+ setItem('IsLoggedIn', 'TRUE');
+ setItem('AdminFor', [
+ {
+ _id: '6537904485008f171cf29924',
+ __typename: 'Organization',
+ },
+ ]);
+
+ render(
+
+
+ Oops! The Page you requested was not found!
}
+ />
+
+
);
diff --git a/src/components/UserPortal/Login/Login.test.tsx b/src/components/UserPortal/Login/Login.test.tsx
index fcd7f7cbda..a59d9d9063 100644
--- a/src/components/UserPortal/Login/Login.test.tsx
+++ b/src/components/UserPortal/Login/Login.test.tsx
@@ -28,8 +28,6 @@ const MOCKS = [
login: {
user: {
_id: '1',
- userType: 'ADMIN',
- adminApproved: true,
firstName: 'firstname',
lastName: 'secondname',
email: 'tempemail@example.com',
@@ -37,6 +35,14 @@ const MOCKS = [
},
accessToken: 'accessToken',
refreshToken: 'refreshToken',
+ appUserProfile: {
+ adminFor: [
+ {
+ _id: 'id',
+ },
+ ],
+ isSuperAdmin: true,
+ },
},
},
},
@@ -54,13 +60,15 @@ const MOCKS = [
login: {
user: {
_id: '1',
- userType: 'ADMIN',
- adminApproved: false,
firstName: 'firstname',
lastName: 'secondname',
email: 'tempemail@example.com',
image: 'image',
},
+ appUserProfile: {
+ adminFor: {},
+ isSuperAdmin: false,
+ },
accessToken: 'accessToken',
refreshToken: 'refreshToken',
},
diff --git a/src/components/UserPortal/Login/Login.tsx b/src/components/UserPortal/Login/Login.tsx
index ca3dff4e7f..9fd40c3615 100644
--- a/src/components/UserPortal/Login/Login.tsx
+++ b/src/components/UserPortal/Login/Login.tsx
@@ -1,17 +1,17 @@
+import { useMutation } from '@apollo/client';
+import { LockOutlined } from '@mui/icons-material';
+import EmailOutlinedIcon from '@mui/icons-material/EmailOutlined';
import type { ChangeEvent, SetStateAction } from 'react';
import React from 'react';
import { Button, Form, InputGroup } from 'react-bootstrap';
import { useTranslation } from 'react-i18next';
-import EmailOutlinedIcon from '@mui/icons-material/EmailOutlined';
-import { LockOutlined } from '@mui/icons-material';
import { Link, useNavigate } from 'react-router-dom';
-import { useMutation } from '@apollo/client';
import { toast } from 'react-toastify';
import { LOGIN_MUTATION } from 'GraphQl/Mutations/mutations';
-import styles from './Login.module.css';
import { errorHandler } from 'utils/errorHandler';
import useLocalStorage from 'utils/useLocalstorage';
+import styles from './Login.module.css';
interface InterfaceLoginProps {
setCurrentMode: React.Dispatch
- {props.name}
+
+ {props.name}
+
Amount: {props.amount}
- PayPal Id: {props.payPalId}
+ Date: {formattedDate}
+
+
+
- 
- User Login Page
} />
- {props.name}
- {props.email}
+ {
@@ -107,7 +139,7 @@ describe('Testing PostCard Component [User Portal]', () => {
commentCount: 1,
comments: [
{
- _id: '64eb13beca85de60ebe0ed0e',
+ id: '64eb13beca85de60ebe0ed0e',
creator: {
_id: '63d6064458fce20ee25c3bf7',
firstName: 'Noble',
@@ -377,6 +409,145 @@ describe('Testing PostCard Component [User Portal]', () => {
await wait();
});
+ test(`Comment should be liked when like button is clicked`, async () => {
+ const cardProps = {
+ id: '1',
+ creator: {
+ firstName: 'test',
+ lastName: 'user',
+ email: 'test@user.com',
+ id: '1',
+ },
+ image: 'testImage',
+ video: '',
+ text: 'This is post test text',
+ title: 'This is post test title',
+ likeCount: 1,
+ commentCount: 1,
+ comments: [
+ {
+ id: '1',
+ creator: {
+ _id: '1',
+ id: '1',
+ firstName: 'test',
+ lastName: 'user',
+ email: 'test@user.com',
+ },
+ likeCount: 1,
+ likedBy: [
+ {
+ id: '1',
+ },
+ ],
+ text: 'testComment',
+ },
+ ],
+ likedBy: [
+ {
+ firstName: 'test',
+ lastName: 'user',
+ id: '1',
+ },
+ ],
+ };
+ const beforeUserId = getItem('userId');
+ setItem('userId', '2');
+
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+
+ const showCommentsButton = screen.getByTestId('showCommentsBtn');
+
+ userEvent.click(showCommentsButton);
+
+ userEvent.click(screen.getByTestId('likeCommentBtn'));
+
+ await wait();
+
+ if (beforeUserId) {
+ setItem('userId', beforeUserId);
+ }
+ });
+
+ test(`Comment should be unliked when like button is clicked, if already liked`, async () => {
+ const cardProps = {
+ id: '1',
+ creator: {
+ firstName: 'test',
+ lastName: 'user',
+ email: 'test@user.com',
+ id: '1',
+ },
+ image: 'testImage',
+ video: '',
+ text: 'This is post test text',
+ title: 'This is post test title',
+ likeCount: 1,
+ commentCount: 1,
+ comments: [
+ {
+ id: '1',
+ creator: {
+ _id: '1',
+ id: '1',
+ firstName: 'test',
+ lastName: 'user',
+ email: 'test@user.com',
+ },
+ likeCount: 1,
+ likedBy: [
+ {
+ id: '1',
+ },
+ ],
+ text: 'testComment',
+ },
+ ],
+ likedBy: [
+ {
+ firstName: 'test',
+ lastName: 'user',
+ id: '1',
+ },
+ ],
+ };
+ const beforeUserId = getItem('userId');
+ setItem('userId', '1');
+
+ render(
+
+
+
+
+
+
+
+ ,
+ );
+
+ const showCommentsButton = screen.getByTestId('showCommentsBtn');
+
+ userEvent.click(showCommentsButton);
+
+ userEvent.click(screen.getByTestId('likeCommentBtn'));
+
+ await wait();
+
+ if (beforeUserId) {
+ setItem('userId', beforeUserId);
+ }
+ });
test('Comment modal pops when show comments button is clicked.', async () => {
const cardProps = {
id: '',
diff --git a/src/components/UserPortal/PostCard/PostCard.tsx b/src/components/UserPortal/PostCard/PostCard.tsx
index 32c83db62d..2574505a81 100644
--- a/src/components/UserPortal/PostCard/PostCard.tsx
+++ b/src/components/UserPortal/PostCard/PostCard.tsx
@@ -33,6 +33,8 @@ interface InterfaceCommentCardProps {
id: string;
}[];
text: string;
+ handleLikeComment: (commentId: string) => void;
+ handleDislikeComment: (commentId: string) => void;
}
export default function postCard(props: InterfacePostCard): JSX.Element {
@@ -104,6 +106,41 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
setCommentInput(comment);
};
+ const handleDislikeComment = (commentId: string): void => {
+ const updatedComments = comments.map((comment) => {
+ let updatedComment = { ...comment };
+ if (
+ comment.id === commentId &&
+ comment.likedBy.some((user) => user.id === userId)
+ ) {
+ updatedComment = {
+ ...comment,
+ likedBy: comment.likedBy.filter((user) => user.id !== userId),
+ likeCount: comment.likeCount - 1,
+ };
+ }
+ return updatedComment;
+ });
+ setComments(updatedComments);
+ };
+ const handleLikeComment = (commentId: string): void => {
+ const updatedComments = comments.map((comment) => {
+ let updatedComment = { ...comment };
+ if (
+ comment.id === commentId &&
+ !comment.likedBy.some((user) => user.id === userId)
+ ) {
+ updatedComment = {
+ ...comment,
+ likedBy: [...comment.likedBy, { id: userId }],
+ likeCount: comment.likeCount + 1,
+ };
+ }
+ return updatedComment;
+ });
+ setComments(updatedComments);
+ };
+
const createComment = async (): Promise => {
try {
const { data: createEventData } = await create({
@@ -129,6 +166,8 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
likeCount: createEventData.createComment.likeCount,
likedBy: createEventData.createComment.likedBy,
text: createEventData.createComment.text,
+ handleLikeComment: handleLikeComment,
+ handleDislikeComment: handleDislikeComment,
};
setComments([...comments, newComment]);
@@ -225,6 +264,8 @@ export default function postCard(props: InterfacePostCard): JSX.Element {
likeCount: comment.likeCount,
likedBy: comment.likedBy,
text: comment.text,
+ handleLikeComment: handleLikeComment,
+ handleDislikeComment: handleDislikeComment,
};
return {
let props = {
id: '1',
- media: '',
+ image: '',
title: 'Test Post',
};
@@ -46,10 +46,10 @@ describe('Testing PromotedPost Test', () => {
test('Component should be rendered properly if prop image is not undefined', async () => {
props = {
...props,
- media: 'data:image/png;base64,bWVkaWEgY29udGVudA==',
+ image: 'promotedPostImage',
};
- const { queryByRole } = render(
+ render(
@@ -61,13 +61,7 @@ describe('Testing PromotedPost Test', () => {
,
);
- await waitFor(() => {
- const image = queryByRole('img');
- expect(image).toHaveAttribute(
- 'src',
- 'data:image/png;base64,bWVkaWEgY29udGVudA==',
- );
- });
+ await wait();
});
});
@@ -109,12 +103,12 @@ test('Component should display the text correctly', async () => {
});
});
-test('Component should display the media correctly', async () => {
+test('Component should display the image correctly', async () => {
props = {
...props,
- media: 'data:videos',
+ image: 'promotedPostImage',
};
- render(
+ const { queryByRole } = render(
@@ -126,8 +120,8 @@ test('Component should display the media correctly', async () => {
,
);
- await waitFor(async () => {
- const media = await screen.findByTestId('media');
- expect(media).toBeInTheDocument();
+ await waitFor(() => {
+ const image = queryByRole('img');
+ expect(image).toHaveAttribute('src', 'promotedPostImage');
});
});
diff --git a/src/components/UserPortal/PromotedPost/PromotedPost.tsx b/src/components/UserPortal/PromotedPost/PromotedPost.tsx
index a5e0e2a8ed..72ee107217 100644
--- a/src/components/UserPortal/PromotedPost/PromotedPost.tsx
+++ b/src/components/UserPortal/PromotedPost/PromotedPost.tsx
@@ -4,7 +4,7 @@ import styles from './PromotedPost.module.css';
import StarPurple500Icon from '@mui/icons-material/StarPurple500';
interface InterfacePostCardProps {
id: string;
- media: string;
+ image: string;
title: string;
}
export default function promotedPost(
@@ -22,24 +22,8 @@ export default function promotedPost(
{props.title}
{props.title}
- {props.media?.includes('videos') ? (
-
- ) : (
- 
)}
diff --git a/src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.test.tsx b/src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.test.tsx
index 026b34435a..93b71b14f1 100644
--- a/src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.test.tsx
+++ b/src/components/UserPortal/SecuredRouteForUser/SecuredRouteForUser.test.tsx
@@ -8,7 +8,7 @@ const { setItem } = useLocalStorage();
describe('SecuredRouteForUser', () => {
test('renders the route when the user is logged in', () => {
- // Set the 'IsLoggedIn' value to 'TRUE' in localStorage to simulate a logged-in user
+ // Set the 'IsLoggedIn' value to 'TRUE' in localStorage to simulate a logged-in user and do not set 'AdminFor' so that it remains undefined.
setItem('IsLoggedIn', 'TRUE');
render(
@@ -38,13 +38,10 @@ describe('SecuredRouteForUser', () => {
render(
- User Login Page
}
- />
+
+
+
+ {props.sno}
+
+
+
+
+
+
+ {props.name}
+
+
+ {props.email}
+
+
);
diff --git a/src/components/UserPortal/PostCard/PostCard.test.tsx b/src/components/UserPortal/PostCard/PostCard.test.tsx
index 525ad245a9..aa170f63a8 100644
--- a/src/components/UserPortal/PostCard/PostCard.test.tsx
+++ b/src/components/UserPortal/PostCard/PostCard.test.tsx
@@ -14,6 +14,8 @@ import {
CREATE_COMMENT_POST,
LIKE_POST,
UNLIKE_POST,
+ LIKE_COMMENT,
+ UNLIKE_COMMENT,
} from 'GraphQl/Mutations/mutations';
import useLocalStorage from 'utils/useLocalstorage';
@@ -77,6 +79,36 @@ const MOCKS = [
},
},
},
+ {
+ request: {
+ query: LIKE_COMMENT,
+ variables: {
+ commentId: '1',
+ },
+ },
+ result: {
+ data: {
+ likeComment: {
+ _id: '1',
+ },
+ },
+ },
+ },
+ {
+ request: {
+ query: UNLIKE_COMMENT,
+ variables: {
+ commentId: '1',
+ },
+ },
+ result: {
+ data: {
+ unlikeComment: {
+ _id: '1',
+ },
+ },
+ },
+ },
];
async function wait(ms = 100): Promise
+
+ {props.role}
+
- {loadingJoinedOrganizations || loadingUserDetails ? (
+ {loadingOrgs || loadingUser ? (
<>
{organizations.length ? (
- organizations.map((organization: any, index) => {
- const organizationUrl = `/user/organization/id=${organization._id}`;
+ organizations.map(
+ (organization: InterfaceOrganization, index: number) => {
+ const organizationUrl = `/user/organization/${organization._id}`;
- return (
-
-
-
- {`${details.firstName} ${details.lastName}`} + {`${userDetails.firstName} ${userDetails.lastName}`}
-{details.email}
+{userDetails.email}
@@ -77,33 +81,37 @@ function userSidebar(): JSX.Element {
- 
-
+
+
+
+
+ ,
+ );
+
+ expect(
+ getByText(
+ 'By clicking on Delete User button your user will be permanently deleted along with its events, tags and all related data.',
+ ),
+ ).toBeInTheDocument();
+ expect(getAllByText('Delete User')[0]).toBeInTheDocument();
+ });
+});
diff --git a/src/components/UserProfileSettings/DeleteUser.tsx b/src/components/UserProfileSettings/DeleteUser.tsx
new file mode 100644
index 0000000000..3a90542883
--- /dev/null
+++ b/src/components/UserProfileSettings/DeleteUser.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { Button, Card } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+import styles from './UserProfileSettings.module.css';
+
+const DeleteUser: React.FC = () => {
+ const { t } = useTranslation('translation', {
+ keyPrefix: 'settings',
+ });
+ return (
+ <>
+
+
+
+
+
+ );
+};
+
+export default DeleteUser;
diff --git a/src/components/UserProfileSettings/OtherSettings.test.tsx b/src/components/UserProfileSettings/OtherSettings.test.tsx
new file mode 100644
index 0000000000..990a430931
--- /dev/null
+++ b/src/components/UserProfileSettings/OtherSettings.test.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { MockedProvider } from '@apollo/react-testing';
+import { BrowserRouter } from 'react-router-dom';
+import { I18nextProvider } from 'react-i18next';
+import i18nForTest from 'utils/i18nForTest';
+import OtherSettings from './OtherSettings';
+
+describe('Delete User component', () => {
+ test('renders delete user correctly', () => {
+ const { getByText } = render(
+
+
+
+
+
+ ,
+ );
+
+ expect(getByText('Other Settings')).toBeInTheDocument();
+ expect(getByText('Change Language')).toBeInTheDocument();
+ });
+});
diff --git a/src/components/UserProfileSettings/OtherSettings.tsx b/src/components/UserProfileSettings/OtherSettings.tsx
new file mode 100644
index 0000000000..1e9723c2d6
--- /dev/null
+++ b/src/components/UserProfileSettings/OtherSettings.tsx
@@ -0,0 +1,26 @@
+import ChangeLanguageDropDown from 'components/ChangeLanguageDropdown/ChangeLanguageDropDown';
+import React from 'react';
+import { Card, Form } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+import styles from './UserProfileSettings.module.css';
+
+const OtherSettings: React.FC = () => {
+ const { t } = useTranslation('translation', {
+ keyPrefix: 'settings',
+ });
+ return (
+
+
+
+ {t('changeLanguage')}
+
+
+
+ );
+};
+
+export default OtherSettings;
diff --git a/src/components/UserProfileSettings/UserProfile.test.tsx b/src/components/UserProfileSettings/UserProfile.test.tsx
new file mode 100644
index 0000000000..979310685f
--- /dev/null
+++ b/src/components/UserProfileSettings/UserProfile.test.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import UserProfile from './UserProfile';
+import { MockedProvider } from '@apollo/react-testing';
+import { BrowserRouter } from 'react-router-dom';
+import { I18nextProvider } from 'react-i18next';
+import i18nForTest from 'utils/i18nForTest';
+
+describe('UserProfile component', () => {
+ test('renders user profile details correctly', () => {
+ const userDetails = {
+ firstName: 'John',
+ lastName: 'Doe',
+ email: 'john.doe@example.com',
+ image: 'profile-image-url',
+ };
+ const { getByText, getByAltText } = render(
+
+
+
+
+
+ ,
+ );
+
+ expect(getByText('John')).toBeInTheDocument();
+ expect(getByText('john.doe@example.com')).toBeInTheDocument();
+
+ const profileImage = getByAltText('profile picture');
+ expect(profileImage).toBeInTheDocument();
+ expect(profileImage).toHaveAttribute('src', 'profile-image-url');
+
+ expect(getByText('Joined 1st May, 2021')).toBeInTheDocument();
+
+ expect(getByText('Copy Profile Link')).toBeInTheDocument();
+ });
+});
diff --git a/src/components/UserProfileSettings/UserProfile.tsx b/src/components/UserProfileSettings/UserProfile.tsx
new file mode 100644
index 0000000000..4c77d4ccef
--- /dev/null
+++ b/src/components/UserProfileSettings/UserProfile.tsx
@@ -0,0 +1,65 @@
+import Avatar from 'components/Avatar/Avatar';
+import React from 'react';
+import { Button, Card } from 'react-bootstrap';
+import CalendarMonthOutlinedIcon from '@mui/icons-material/CalendarMonthOutlined';
+import { useTranslation } from 'react-i18next';
+import styles from './UserProfileSettings.module.css';
+
+interface InterfaceUserProfile {
+ firstName: string;
+ lastName: string;
+ email: string;
+ image: string;
+}
+
+const UserProfile: React.FC = ({
+ firstName,
+ lastName,
+ email,
+ image,
+}): JSX.Element => {
+ const { t } = useTranslation('translation', {
+ keyPrefix: 'settings',
+ });
+ return (
+ <>
+
+
+
+
+
+ );
+};
+
+export default UserProfile;
diff --git a/src/components/UserProfileSettings/UserProfileSettings.module.css b/src/components/UserProfileSettings/UserProfileSettings.module.css
new file mode 100644
index 0000000000..603c5a677d
--- /dev/null
+++ b/src/components/UserProfileSettings/UserProfileSettings.module.css
@@ -0,0 +1,76 @@
+.cardHeader {
+ padding: 1.25rem 1rem 1rem 1rem;
+ border-bottom: 1px solid var(--bs-gray-200);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.cardHeader .cardTitle {
+ font-size: 1.2rem;
+ font-weight: 600;
+}
+
+.cardBody {
+ padding: 1.25rem 1rem 1.5rem 1rem;
+ display: flex;
+ flex-direction: column;
+}
+
+.cardLabel {
+ font-weight: bold;
+ padding-bottom: 1px;
+ font-size: 14px;
+ color: #707070;
+ margin-bottom: 10px;
+}
+
+.cardControl {
+ margin-bottom: 20px;
+}
+
+.cardButton {
+ width: fit-content;
+}
+
+.imgContianer {
+ margin: 0 2rem 0 0;
+}
+
+.imgContianer img {
+ height: 120px;
+ width: 120px;
+ border-radius: 50%;
+}
+
+.profileDetails {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-evenly;
+}
+
+@media screen and (max-width: 1280px) and (min-width: 992px) {
+ .imgContianer {
+ margin: 1rem auto;
+ }
+ .profileContainer {
+ flex-direction: column;
+ }
+}
+
+@media screen and (max-width: 992px) {
+ .profileContainer {
+ align-items: center;
+ justify-content: center;
+ }
+}
+
+@media screen and (max-width: 420px) {
+ .imgContianer {
+ margin: 1rem auto;
+ }
+ .profileContainer {
+ flex-direction: column;
+ }
+}
diff --git a/src/components/UserUpdate/UserUpdate.module.css b/src/components/UserUpdate/UserUpdate.module.css
deleted file mode 100644
index fb9b781dcb..0000000000
--- a/src/components/UserUpdate/UserUpdate.module.css
+++ /dev/null
@@ -1,97 +0,0 @@
-/* .userupdatediv{
- border: 1px solid #e8e5e5;
- box-shadow: 2px 1px #e8e5e5;
- padding:25px 16px;
- border-radius: 5px;
- background:#fdfdfd;
-} */
-.settingstitle {
- color: #707070;
- font-size: 20px;
- margin-bottom: 30px;
- text-align: center;
- margin-top: -10px;
-}
-.dispflex {
- display: flex;
- flex-direction: column;
- justify-content: flex-start;
- margin: 0 8rem;
-}
-
-.dispflex > div {
- width: 100%;
- margin-right: 50px;
-}
-
-.radio_buttons > input {
- margin-bottom: 20px;
- border: none;
- box-shadow: none;
- padding: 0 0;
- border-radius: 5px;
- background: none;
- width: 50%;
-}
-
-.dispbtnflex {
- margin-top: 20px;
- display: flex;
- justify-content: center;
-}
-
-.whitebtn {
- margin: 1rem 0 0;
- margin-top: 10px;
- border: 1px solid #e8e5e5;
- box-shadow: 0 2px 2px #e8e5e5;
- padding: 10px 20px;
- border-radius: 5px;
- background: none;
- font-size: 16px;
- color: #31bb6b;
- outline: none;
- font-weight: 600;
- cursor: pointer;
- float: left;
- transition:
- transform 0.2s,
- box-shadow 0.2s;
-}
-.greenregbtn {
- margin: 1rem 0 0;
- margin-top: 10px;
- margin-right: 30px;
- border: 1px solid #e8e5e5;
- box-shadow: 0 2px 2px #e8e5e5;
- padding: 10px 10px;
- border-radius: 5px;
- background-color: #31bb6b;
- font-size: 16px;
- color: white;
- outline: none;
- font-weight: 600;
- cursor: pointer;
- transition:
- transform 0.2s,
- box-shadow 0.2s;
-}
-.radio_buttons {
- width: 55%;
- margin-top: 10px;
- display: flex;
- color: #707070;
- font-weight: 600;
- font-size: 14px;
-}
-.radio_buttons > input {
- transform: scale(1.2);
-}
-.radio_buttons > label {
- margin-top: -4px;
- margin-left: 0px;
- margin-right: 7px;
-}
-.idtitle {
- width: 88%;
-}
diff --git a/src/components/UserUpdate/UserUpdate.test.tsx b/src/components/UserUpdate/UserUpdate.test.tsx
deleted file mode 100644
index c9dd5d2472..0000000000
--- a/src/components/UserUpdate/UserUpdate.test.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import React from 'react';
-import { act, render, screen } from '@testing-library/react';
-import { MockedProvider } from '@apollo/react-testing';
-import userEvent from '@testing-library/user-event';
-import { I18nextProvider } from 'react-i18next';
-import { BrowserRouter as Router } from 'react-router-dom';
-import UserUpdate from './UserUpdate';
-import { UPDATE_USER_MUTATION } from 'GraphQl/Mutations/mutations';
-import i18nForTest from 'utils/i18nForTest';
-import { USER_DETAILS } from 'GraphQl/Queries/Queries';
-import { StaticMockLink } from 'utils/StaticMockLink';
-import { toast } from 'react-toastify';
-
-const MOCKS = [
- {
- request: {
- query: USER_DETAILS,
- variables: {
- id: '1',
- },
- },
- result: {
- data: {
- user: {
- __typename: 'User',
- image: null,
- firstName: '',
- lastName: '',
- email: '',
- role: 'SUPERADMIN',
- appLanguageCode: 'en',
- userType: 'SUPERADMIN',
- pluginCreationAllowed: true,
- adminApproved: true,
- createdAt: '2023-02-18T09:22:27.969Z',
- adminFor: [],
- createdOrganizations: [],
- joinedOrganizations: [],
- organizationsBlockedBy: [],
- createdEvents: [],
- registeredEvents: [],
- eventAdmin: [],
- membershipRequests: [],
- },
- },
- },
- },
- {
- request: {
- query: UPDATE_USER_MUTATION,
- variable: {
- firstName: '',
- lastName: '',
- email: '',
- },
- },
- result: {
- data: {
- users: [
- {
- _id: '1',
- },
- ],
- },
- },
- },
-];
-
-const link = new StaticMockLink(MOCKS, true);
-
-async function wait(ms = 5): Promise {
- await act(() => {
- return new Promise((resolve) => {
- setTimeout(resolve, ms);
- });
- });
-}
-
-describe('Testing User Update', () => {
- const props = {
- key: '123',
- id: '1',
- toggleStateValue: jest.fn(),
- };
-
- const formData = {
- firstName: 'Ansh',
- lastName: 'Goyal',
- email: 'ansh@gmail.com',
- image: new File(['hello'], 'hello.png', { type: 'image/png' }),
- };
-
- global.alert = jest.fn();
-
- test('should render props and text elements test for the page component', async () => {
- render(
-
-
-
-
-
- ,
- );
-
- await wait();
-
- userEvent.type(
- screen.getByPlaceholderText(/First Name/i),
- formData.firstName,
- );
- userEvent.type(
- screen.getByPlaceholderText(/Last Name/i),
- formData.lastName,
- );
- userEvent.type(screen.getByPlaceholderText(/Email/i), formData.email);
- userEvent.selectOptions(screen.getByTestId('applangcode'), 'Français');
- userEvent.upload(screen.getByLabelText(/Display Image:/i), formData.image);
- await wait();
-
- userEvent.click(screen.getByText(/Save Changes/i));
-
- expect(screen.getByPlaceholderText(/First Name/i)).toHaveValue(
- formData.firstName,
- );
- expect(screen.getByPlaceholderText(/Last Name/i)).toHaveValue(
- formData.lastName,
- );
- expect(screen.getByPlaceholderText(/Email/i)).toHaveValue(formData.email);
-
- expect(screen.getByText(/Cancel/i)).toBeTruthy();
- expect(screen.getByPlaceholderText(/First Name/i)).toBeInTheDocument();
- expect(screen.getByPlaceholderText(/Last Name/i)).toBeInTheDocument();
- expect(screen.getByPlaceholderText(/Email/i)).toBeInTheDocument();
- expect(screen.getByText(/Display Image/i)).toBeInTheDocument();
- });
- test('should display warnings for blank form submission', async () => {
- jest.spyOn(toast, 'warning');
-
- render(
-
-
-
-
-
- ,
- );
-
- await wait();
-
- userEvent.click(screen.getByText(/Save Changes/i));
-
- expect(toast.warning).toHaveBeenCalledWith('First Name cannot be blank!');
- expect(toast.warning).toHaveBeenCalledWith('Last Name cannot be blank!');
- expect(toast.warning).toHaveBeenCalledWith('Email cannot be blank!');
- });
-});
diff --git a/src/components/UserUpdate/UserUpdate.tsx b/src/components/UserUpdate/UserUpdate.tsx
deleted file mode 100644
index 143e47616d..0000000000
--- a/src/components/UserUpdate/UserUpdate.tsx
+++ /dev/null
@@ -1,268 +0,0 @@
-import React from 'react';
-import { useMutation, useQuery } from '@apollo/client';
-import { UPDATE_USER_MUTATION } from 'GraphQl/Mutations/mutations';
-import { useTranslation } from 'react-i18next';
-import Button from 'react-bootstrap/Button';
-import styles from './UserUpdate.module.css';
-import convertToBase64 from 'utils/convertToBase64';
-import { USER_DETAILS } from 'GraphQl/Queries/Queries';
-import { useLocation, useNavigate } from 'react-router-dom';
-
-import { languages } from 'utils/languages';
-import { toast } from 'react-toastify';
-import { errorHandler } from 'utils/errorHandler';
-import { Form } from 'react-bootstrap';
-import Loader from 'components/Loader/Loader';
-import useLocalStorage from 'utils/useLocalstorage';
-
-interface InterfaceUserUpdateProps {
- id: string;
- toggleStateValue: () => void;
-}
-
-const UserUpdate: React.FC = ({
- id,
- toggleStateValue,
-}): JSX.Element => {
- const location = useLocation();
- const navigate = useNavigate();
- const { getItem, setItem } = useLocalStorage();
- const currentUrl = location.state?.id || getItem('id') || id;
- const { t } = useTranslation('translation', {
- keyPrefix: 'userUpdate',
- });
- const [formState, setFormState] = React.useState({
- firstName: '',
- lastName: '',
- email: '',
- password: '',
- applangcode: '',
- file: '',
- });
-
- const [updateUser] = useMutation(UPDATE_USER_MUTATION);
-
- const {
- data: data,
- loading: loading,
- error: error,
- } = useQuery(USER_DETAILS, {
- variables: { id: currentUrl }, // For testing we are sending the id as a prop
- });
- React.useEffect(() => {
- if (data) {
- setFormState({
- ...formState,
- firstName: data?.user?.firstName,
- lastName: data?.user?.lastName,
- email: data?.user?.email,
- applangcode: data?.user?.applangcode,
- });
- }
- }, [data]);
-
- if (loading) {
- return => {
- try {
- const firstName = formState.firstName;
- const lastName = formState.lastName;
- const email = formState.email;
- const applangcode = formState.applangcode;
- const file = formState.file;
- let toSubmit = true;
- if (firstName.trim().length == 0 || !firstName) {
- toast.warning('First Name cannot be blank!');
- toSubmit = false;
- }
- if (lastName.trim().length == 0 || !lastName) {
- toast.warning('Last Name cannot be blank!');
- toSubmit = false;
- }
- if (email.trim().length == 0 || !email) {
- toast.warning('Email cannot be blank!');
- toSubmit = false;
- }
- if (!toSubmit) return;
- const { data } = await updateUser({
- variables: {
- //Currently on these fields are supported by the api
- id: currentUrl,
- firstName,
- lastName,
- email,
- applangcode,
- file,
- },
- });
- /* istanbul ignore next */
- if (data) {
- setFormState({
- firstName: '',
- lastName: '',
- email: '',
- password: '',
- applangcode: '',
- file: '',
- });
-
- if (getItem('id') === currentUrl) {
- setItem('FirstName', firstName);
- setItem('LastName', lastName);
- setItem('Email', email);
- setItem('UserImage', file);
- }
- toast.success('Successful updated');
-
- navigate(0);
- }
- } catch (error: any) {
- /* istanbul ignore next */
- errorHandler(t, error);
- }
- };
-
- /* istanbul ignore next */
- const cancelUpdate = (): void => {
- toggleStateValue();
- };
-
- return (
- <>
-
-
-
-
-
- ,
- );
-
- await wait();
- fireEvent.select(screen.getByTestId(`changeRole123`), {
- target: { value: 'ADMIN?123' },
- });
- });
-
- test('Should be not able to change userType of self', async () => {
- const props: {
- user: InterfaceQueryUserListItem;
- index: number;
- loggedInUserId: string;
- resetAndRefetch: () => void;
- } = {
- user: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- userType: 'ADMIN',
- adminApproved: true,
- adminFor: [
- {
- _id: 'abc',
- },
- {
- _id: 'xyz',
- },
- ],
- createdAt: '2022-09-29T15:39:36.355Z',
- organizationsBlockedBy: [
- {
- _id: 'xyz',
- name: 'Blocked Organization 1',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=Blocked%20Organization%201',
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- },
- },
- {
- _id: 'mno',
- name: 'Blocked Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-09-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: null,
- email: 'john@example.com',
- },
- },
- ],
- joinedOrganizations: [
- {
- _id: 'abc',
- name: 'Joined Organization 1',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: null,
- email: 'john@example.com',
- },
- },
- {
- _id: 'def',
- name: 'Joined Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-09-19T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: null,
- email: 'john@example.com',
- },
- },
- ],
- },
- index: 0,
- loggedInUserId: '123',
- resetAndRefetch: resetAndRefetchMock,
- };
-
- render(
-
-
-
-
-
- ,
- );
-
- await wait();
- expect(screen.getByTestId(`changeRole123`)).toBeDisabled();
- expect(screen.getByTestId(`changeRole123`)).toHaveValue('ADMIN?123');
- });
});
diff --git a/src/components/UsersTableItem/UserTableItemMocks.ts b/src/components/UsersTableItem/UserTableItemMocks.ts
index 5f81c8cfe9..02c430f959 100644
--- a/src/components/UsersTableItem/UserTableItemMocks.ts
+++ b/src/components/UsersTableItem/UserTableItemMocks.ts
@@ -1,28 +1,9 @@
import {
REMOVE_MEMBER_MUTATION,
- UPDATE_USERTYPE_MUTATION,
UPDATE_USER_ROLE_IN_ORG_MUTATION,
} from 'GraphQl/Mutations/mutations';
export const MOCKS = [
- {
- request: {
- query: UPDATE_USERTYPE_MUTATION,
- variables: {
- id: '123',
- userType: 'ADMIN',
- },
- },
- result: {
- data: {
- updateUserType: {
- data: {
- id: '123',
- },
- },
- },
- },
- },
{
request: {
query: REMOVE_MEMBER_MUTATION,
diff --git a/src/components/UsersTableItem/UsersTableItem.tsx b/src/components/UsersTableItem/UsersTableItem.tsx
index 3ed4e7f5f7..507a85316d 100644
--- a/src/components/UsersTableItem/UsersTableItem.tsx
+++ b/src/components/UsersTableItem/UsersTableItem.tsx
@@ -2,7 +2,6 @@ import { useMutation } from '@apollo/client';
import { Search } from '@mui/icons-material';
import {
REMOVE_MEMBER_MUTATION,
- UPDATE_USERTYPE_MUTATION,
UPDATE_USER_ROLE_IN_ORG_MUTATION,
} from 'GraphQl/Mutations/mutations';
import dayjs from 'dayjs';
@@ -25,7 +24,7 @@ type Props = {
const UsersTableItem = (props: Props): JSX.Element => {
const { t } = useTranslation('translation', { keyPrefix: 'users' });
- const { user, index, loggedInUserId, resetAndRefetch } = props;
+ const { user, index, resetAndRefetch } = props;
const [showJoinedOrganizations, setShowJoinedOrganizations] = useState(false);
const [showBlockedOrganizations, setShowBlockedOrganizations] =
@@ -40,46 +39,22 @@ const UsersTableItem = (props: Props): JSX.Element => {
orgId: '',
setShowOnCancel: '',
});
- const [joinedOrgs, setJoinedOrgs] = useState(user.joinedOrganizations);
+ const [joinedOrgs, setJoinedOrgs] = useState(user.user.joinedOrganizations);
const [orgsBlockedBy, setOrgsBlockedBy] = useState(
- user.organizationsBlockedBy,
+ user.user.organizationsBlockedBy,
);
const [searchByNameJoinedOrgs, setSearchByNameJoinedOrgs] = useState('');
const [searchByNameOrgsBlockedBy, setSearchByNameOrgsBlockedBy] =
useState('');
- const [updateUserType] = useMutation(UPDATE_USERTYPE_MUTATION);
const [removeUser] = useMutation(REMOVE_MEMBER_MUTATION);
const [updateUserInOrgType] = useMutation(UPDATE_USER_ROLE_IN_ORG_MUTATION);
const navigate = useNavigate();
- /* istanbul ignore next */
- const changeRole = async (e: any): Promise => {
- const { value } = e.target;
-
- const inputData = value.split('?');
-
- try {
- const { data } = await updateUserType({
- variables: {
- id: inputData[1],
- userType: inputData[0],
- },
- });
- if (data) {
- toast.success(t('roleUpdated'));
- resetAndRefetch();
- }
- } catch (error: any) {
- /* istanbul ignore next */
- errorHandler(t, error);
- }
- };
-
const confirmRemoveUser = async (): Promise => {
try {
const { data } = await removeUser({
variables: {
- userid: user._id,
+ userid: user.user._id,
orgid: removeUserProps.orgId,
},
});
@@ -103,7 +78,7 @@ const UsersTableItem = (props: Props): JSX.Element => {
try {
const { data } = await updateUserInOrgType({
variables: {
- userId: user._id,
+ userId: user.user._id,
role: inputData[0],
organizationId: inputData[1],
},
@@ -131,9 +106,9 @@ const UsersTableItem = (props: Props): JSX.Element => {
const searchJoinedOrgs = (value: string): void => {
setSearchByNameJoinedOrgs(value);
if (value == '') {
- setJoinedOrgs(user.joinedOrganizations);
+ setJoinedOrgs(user.user.joinedOrganizations);
} else {
- const filteredOrgs = user.joinedOrganizations.filter((org) =>
+ const filteredOrgs = user.user.joinedOrganizations.filter((org) =>
org.name.toLowerCase().includes(value.toLowerCase()),
);
setJoinedOrgs(filteredOrgs);
@@ -142,9 +117,9 @@ const UsersTableItem = (props: Props): JSX.Element => {
const searchOrgsBlockedBy = (value: string): void => {
setSearchByNameOrgsBlockedBy(value);
if (value == '') {
- setOrgsBlockedBy(user.organizationsBlockedBy);
+ setOrgsBlockedBy(user.user.organizationsBlockedBy);
} else {
- const filteredOrgs = user.organizationsBlockedBy.filter((org) =>
+ const filteredOrgs = user.user.organizationsBlockedBy.filter((org) =>
org.name.toLowerCase().includes(value.toLowerCase()),
);
setOrgsBlockedBy(filteredOrgs);
@@ -185,42 +160,32 @@ const UsersTableItem = (props: Props): JSX.Element => {
setShowBlockedOrganizations(true);
}
}
+
+ const isSuperAdmin = user.appUserProfile.isSuperAdmin;
+
return (
<>
{/* Table Item */}
{index + 1}
- {`${user.firstName} ${user.lastName}`}
- {user.email}
-
-
-
-
-
-
-
+ {`${user.user.firstName} ${user.user.lastName}`}
+ {user.user.email}
@@ -229,17 +194,17 @@ const UsersTableItem = (props: Props): JSX.Element => {
show={showJoinedOrganizations}
key={`modal-joined-org-${index}`}
size="xl"
- data-testid={`modal-joined-org-${user._id}`}
+ data-testid={`modal-joined-org-${user.user._id}`}
onHide={() => setShowJoinedOrganizations(false)}
>
- {t('orgJoinedBy')} {`${user.firstName}`} {`${user.lastName}`} (
- {user.joinedOrganizations.length})
+ {t('orgJoinedBy')} {`${user.user.firstName}`}{' '}
+ {`${user.user.lastName}`} ({user.user.joinedOrganizations.length})
- {user.joinedOrganizations.length !== 0 && (
+ {user.user.joinedOrganizations.length !== 0 && (
{
)}
- {user.joinedOrganizations.length == 0 ? (
+ {user.user.joinedOrganizations.length == 0 ? (
) : joinedOrgs.length == 0 ? (
@@ -294,7 +260,7 @@ const UsersTableItem = (props: Props): JSX.Element => {
{joinedOrgs.map((org) => {
// Check user is admin for this organization or not
let isAdmin = false;
- user.adminFor.map((item) => {
+ user.appUserProfile.adminFor.map((item) => {
if (item._id == org._id) {
isAdmin = true;
}
@@ -335,14 +301,36 @@ const UsersTableItem = (props: Props): JSX.Element => {
{org.creator.firstName} {org.creator.lastName}
- {isAdmin ? 'ADMIN' : 'USER'}
+
+ {isSuperAdmin
+ ? 'SUPERADMIN'
+ : isAdmin
+ ? 'ADMIN'
+ : 'USER'}
+
- {isAdmin ? (
+ {isSuperAdmin ? (
+ <>
+
+
+
+
+ ) : isAdmin ? (
<>
- {organization.name}
+ return (
+
+
+
-
-
- );
- })
+
+
+ );
+ },
+ )
) : (
+
+
-
+ {organization.name}
+
{t('noOrganizations')}
)}
diff --git a/src/components/UserProfileSettings/DeleteUser.test.tsx b/src/components/UserProfileSettings/DeleteUser.test.tsx
new file mode 100644
index 0000000000..34ab44fbe5
--- /dev/null
+++ b/src/components/UserProfileSettings/DeleteUser.test.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { MockedProvider } from '@apollo/react-testing';
+import { BrowserRouter } from 'react-router-dom';
+import { I18nextProvider } from 'react-i18next';
+import i18nForTest from 'utils/i18nForTest';
+import DeleteUser from './DeleteUser';
+
+describe('Delete User component', () => {
+ test('renders delete user correctly', () => {
+ const { getByText, getAllByText } = render(
+
+
+ {t('deleteUser')}
+ {t('deleteUserMessage')}
+ +
+
+ {t('otherSettings')}
+
+
+ {t('profileDetails')}
+
+
+
+ {image && image !== 'null' ? (
+ 
+ ) : (
+
+
+
+ {`${firstName}`.charAt(0).toUpperCase() +
+ `${firstName}`.slice(1)}
+
+ {email}
+
+
+
+
+
+
-
-
-
- );
-};
-export default UserUpdate;
diff --git a/src/components/UsersTableItem/UserTableItem.test.tsx b/src/components/UsersTableItem/UserTableItem.test.tsx
index a60a5b22d1..e89288ff28 100644
--- a/src/components/UsersTableItem/UserTableItem.test.tsx
+++ b/src/components/UsersTableItem/UserTableItem.test.tsx
@@ -46,7 +46,7 @@ jest.mock('react-router-dom', () => ({
}));
beforeEach(() => {
- setItem('UserType', 'SUPERADMIN');
+ setItem('SuperAdmin', true);
setItem('id', '123');
});
@@ -71,115 +71,124 @@ describe('Testing User Table Item', () => {
resetAndRefetch: () => void;
} = {
user: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: null,
- email: 'john@example.com',
- userType: 'SUPERADMIN',
- adminApproved: true,
- adminFor: [
- {
- _id: 'abc',
- },
- ],
- createdAt: '2023-09-29T15:39:36.355Z',
- organizationsBlockedBy: [
- {
- _id: 'xyz',
- name: 'XYZ',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-01-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ user: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ createdAt: '2023-09-29T15:39:36.355Z',
+ organizationsBlockedBy: [
+ {
+ _id: 'xyz',
+ name: 'XYZ',
image: null,
- email: 'john@example.com',
- },
- },
- {
- _id: 'mno',
- name: 'MNO',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-01-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- createdAt: '2023-01-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ {
+ _id: 'mno',
+ name: 'MNO',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-01-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- },
- ],
- joinedOrganizations: [
- {
- _id: 'abc',
- name: 'Joined Organization 1',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-06-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ ],
+ joinedOrganizations: [
+ {
+ _id: 'abc',
+ name: 'Joined Organization 1',
image: null,
- email: 'john@example.com',
- },
- },
- {
- _id: 'def',
- name: 'Joined Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-06-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- createdAt: '2023-07-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ {
+ _id: 'def',
+ name: 'Joined Organization 2',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-07-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- },
- ],
+ ],
+ registeredEvents: [],
+ membershipRequests: [],
+ },
+ appUserProfile: {
+ _id: '123',
+ isSuperAdmin: true,
+ createdOrganizations: [],
+ createdEvents: [],
+ eventAdmin: [],
+ adminFor: [
+ {
+ _id: 'abc',
+ },
+ ],
+ },
},
index: 0,
loggedInUserId: '123',
@@ -200,10 +209,6 @@ describe('Testing User Table Item', () => {
expect(screen.getByText(/1/i)).toBeInTheDocument();
expect(screen.getByText(/John Doe/i)).toBeInTheDocument();
expect(screen.getByText(/john@example.com/i)).toBeInTheDocument();
- expect(screen.getByTestId(`changeRole${123}`)).toBeInTheDocument();
- expect(screen.getByTestId(`changeRole${123}`)).toHaveValue(
- `SUPERADMIN?${123}`,
- );
expect(screen.getByTestId(`showJoinedOrgsBtn${123}`)).toBeInTheDocument();
expect(
screen.getByTestId(`showBlockedByOrgsBtn${123}`),
@@ -218,21 +223,30 @@ describe('Testing User Table Item', () => {
resetAndRefetch: () => void;
} = {
user: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: null,
- email: 'john@example.com',
- userType: 'SUPERADMIN',
- adminApproved: true,
- adminFor: [
- {
- _id: 'abc',
- },
- ],
- createdAt: '2023-09-29T15:39:36.355Z',
- organizationsBlockedBy: [],
- joinedOrganizations: [],
+ user: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ createdAt: '2023-09-29T15:39:36.355Z',
+ organizationsBlockedBy: [],
+ joinedOrganizations: [],
+ registeredEvents: [],
+ membershipRequests: [],
+ },
+ appUserProfile: {
+ _id: '123',
+ isSuperAdmin: true,
+ createdOrganizations: [],
+ createdEvents: [],
+ eventAdmin: [],
+ adminFor: [
+ {
+ _id: 'abc',
+ },
+ ],
+ },
},
index: 0,
loggedInUserId: '123',
@@ -281,117 +295,124 @@ describe('Testing User Table Item', () => {
resetAndRefetch: () => void;
} = {
user: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: null,
- email: 'john@example.com',
- userType: 'SUPERADMIN',
- adminApproved: true,
- adminFor: [
- {
- _id: 'abc',
- },
- ],
- createdAt: '2022-09-29T15:39:36.355Z',
- organizationsBlockedBy: [
- {
- _id: 'xyz',
- name: 'Blocked Organization 1',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ user: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ createdAt: '2023-09-29T15:39:36.355Z',
+ organizationsBlockedBy: [
+ {
+ _id: 'xyz',
+ name: 'XYZ',
image: null,
- email: 'john@example.com',
- },
- },
- {
- _id: 'mno',
- name: 'Blocked Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-01-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- createdAt: '2023-09-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ {
+ _id: 'mno',
+ name: 'MNO',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-01-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- },
- ],
- joinedOrganizations: [
- {
- _id: 'abc',
- name: 'Joined Organization 1',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=Joined%20Organization%201',
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- },
- },
- {
- _id: 'def',
- name: 'Joined Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
+ ],
+ joinedOrganizations: [
+ {
+ _id: 'abc',
+ name: 'Joined Organization 1',
+ image: null,
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-06-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- createdAt: '2023-09-19T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ {
+ _id: 'def',
+ name: 'Joined Organization 2',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-07-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
+ },
+ ],
+ registeredEvents: [],
+ membershipRequests: [],
+ },
+ appUserProfile: {
+ _id: '123',
+ isSuperAdmin: true,
+ createdOrganizations: [],
+ createdEvents: [],
+ eventAdmin: [],
+ adminFor: [
+ {
+ _id: 'abc',
},
- },
- ],
+ ],
+ },
},
index: 0,
loggedInUserId: '123',
@@ -440,12 +461,10 @@ describe('Testing User Table Item', () => {
elementsWithKingston.forEach((element) => {
expect(element).toBeInTheDocument();
});
- expect(screen.getByText(/29-08-2023/i)).toBeInTheDocument();
- expect(screen.getByText(/19-09-2023/i)).toBeInTheDocument();
+ expect(screen.getByText(/29-06-2023/i)).toBeInTheDocument();
+ expect(screen.getByText(/29-07-2023/i)).toBeInTheDocument();
expect(screen.getByTestId('removeUserFromOrgBtnabc')).toBeInTheDocument();
expect(screen.getByTestId('removeUserFromOrgBtndef')).toBeInTheDocument();
- expect(screen.getByTestId(`changeRoleInOrgabc`)).toHaveValue('ADMIN?abc');
- expect(screen.getByTestId(`changeRoleInOrgdef`)).toHaveValue('USER?def');
// Search for Joined Organization 1
const searchBtn = screen.getByTestId(`searchBtnJoinedOrgs`);
@@ -490,120 +509,124 @@ describe('Testing User Table Item', () => {
resetAndRefetch: () => void;
} = {
user: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- userType: 'SUPERADMIN',
- adminApproved: true,
- adminFor: [
- {
- _id: 'abc',
- },
- {
- _id: 'xyz',
- },
- ],
- createdAt: '2022-09-29T15:39:36.355Z',
- organizationsBlockedBy: [
- {
- _id: 'xyz',
- name: 'Blocked Organization 1',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=Blocked%20Organization%201',
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- },
- },
- {
- _id: 'mno',
- name: 'Blocked Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-09-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ user: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ createdAt: '2023-09-29T15:39:36.355Z',
+ organizationsBlockedBy: [
+ {
+ _id: 'xyz',
+ name: 'XYZ',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-01-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- },
- ],
- joinedOrganizations: [
- {
- _id: 'abc',
- name: 'Joined Organization 1',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ {
+ _id: 'mno',
+ name: 'MNO',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-03-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- },
- {
- _id: 'def',
- name: 'Joined Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
+ ],
+ joinedOrganizations: [
+ {
+ _id: 'abc',
+ name: 'Joined Organization 1',
+ image: null,
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-06-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- createdAt: '2023-09-19T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ {
+ _id: 'def',
+ name: 'Joined Organization 2',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-07-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
+ },
+ ],
+ registeredEvents: [],
+ membershipRequests: [],
+ },
+ appUserProfile: {
+ _id: '123',
+ isSuperAdmin: true,
+ createdOrganizations: [],
+ createdEvents: [],
+ eventAdmin: [],
+ adminFor: [
+ {
+ _id: 'xyz',
},
- },
- ],
+ ],
+ },
},
index: 0,
loggedInUserId: '123',
@@ -651,18 +674,16 @@ describe('Testing User Table Item', () => {
const inputBox = screen.getByTestId(`searchByNameOrgsBlockedBy`);
expect(inputBox).toBeInTheDocument();
- expect(screen.getByText(/Blocked Organization 1/i)).toBeInTheDocument();
- expect(screen.getByText(/Blocked Organization 2/i)).toBeInTheDocument();
+ expect(screen.getByText(/XYZ/i)).toBeInTheDocument();
+ expect(screen.getByText(/MNO/i)).toBeInTheDocument();
const elementsWithKingston = screen.getAllByText(/Kingston/i);
elementsWithKingston.forEach((element) => {
expect(element).toBeInTheDocument();
});
- expect(screen.getByText(/29-08-2023/i)).toBeInTheDocument();
- expect(screen.getByText(/29-09-2023/i)).toBeInTheDocument();
+ expect(screen.getByText(/29-01-2023/i)).toBeInTheDocument();
+ expect(screen.getByText(/29-03-2023/i)).toBeInTheDocument();
expect(screen.getByTestId('removeUserFromOrgBtnxyz')).toBeInTheDocument();
expect(screen.getByTestId('removeUserFromOrgBtnmno')).toBeInTheDocument();
- expect(screen.getByTestId(`changeRoleInOrgxyz`)).toHaveValue('ADMIN?xyz');
- expect(screen.getByTestId(`changeRoleInOrgmno`)).toHaveValue('USER?mno');
// Click on Creator Link
fireEvent.click(screen.getByTestId(`creatorxyz`));
expect(toast.success).toBeCalledWith('Profile Page Coming Soon !');
@@ -670,13 +691,11 @@ describe('Testing User Table Item', () => {
// Search for Blocked Organization 1
const searchBtn = screen.getByTestId(`searchBtnOrgsBlockedBy`);
fireEvent.keyUp(inputBox, {
- target: { value: 'Blocked Organization 1' },
+ target: { value: 'XYZ' },
});
fireEvent.click(searchBtn);
- expect(screen.getByText(/Blocked Organization 1/i)).toBeInTheDocument();
- expect(
- screen.queryByText(/Blocked Organization 2/i),
- ).not.toBeInTheDocument();
+ expect(screen.getByText(/XYZ/i)).toBeInTheDocument();
+ expect(screen.queryByText(/MNO/i)).not.toBeInTheDocument();
// Search for an Organization which does not exist
fireEvent.keyUp(inputBox, {
@@ -693,7 +712,7 @@ describe('Testing User Table Item', () => {
fireEvent.click(searchBtn);
// Click on Organization Link
- fireEvent.click(screen.getByText(/Blocked Organization 1/i));
+ fireEvent.click(screen.getByText(/XYZ/i));
expect(window.location.replace).toBeCalledWith('/orgdash/xyz');
expect(mockNavgatePush).toBeCalledWith('/orgdash/xyz');
fireEvent.click(screen.getByTestId(`closeBlockedByOrgsBtn${123}`));
@@ -707,120 +726,124 @@ describe('Testing User Table Item', () => {
resetAndRefetch: () => void;
} = {
user: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- userType: 'SUPERADMIN',
- adminApproved: true,
- adminFor: [
- {
- _id: 'abc',
- },
- {
- _id: 'xyz',
- },
- ],
- createdAt: '2022-09-29T15:39:36.355Z',
- organizationsBlockedBy: [
- {
- _id: 'xyz',
- name: 'Blocked Organization 1',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=Blocked%20Organization%201',
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- },
- },
- {
- _id: 'mno',
- name: 'Blocked Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-09-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ user: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ createdAt: '2023-09-29T15:39:36.355Z',
+ organizationsBlockedBy: [
+ {
+ _id: 'xyz',
+ name: 'XYZ',
image: null,
- email: 'john@example.com',
- },
- },
- ],
- joinedOrganizations: [
- {
- _id: 'abc',
- name: 'Joined Organization 1',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-01-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ {
+ _id: 'mno',
+ name: 'MNO',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-01-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- },
- {
- _id: 'def',
- name: 'Joined Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
+ ],
+ joinedOrganizations: [
+ {
+ _id: 'abc',
+ name: 'Joined Organization 1',
+ image: null,
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-06-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- createdAt: '2023-09-19T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ {
+ _id: 'def',
+ name: 'Joined Organization 2',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-07-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
+ },
+ ],
+ registeredEvents: [],
+ membershipRequests: [],
+ },
+ appUserProfile: {
+ _id: '123',
+ isSuperAdmin: true,
+ createdOrganizations: [],
+ createdEvents: [],
+ eventAdmin: [],
+ adminFor: [
+ {
+ _id: 'abc',
},
- },
- ],
+ ],
+ },
},
index: 0,
loggedInUserId: '123',
@@ -883,120 +906,129 @@ describe('Testing User Table Item', () => {
resetAndRefetch: () => void;
} = {
user: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- userType: 'SUPERADMIN',
- adminApproved: true,
- adminFor: [
- {
- _id: 'abc',
- },
- {
- _id: 'xyz',
- },
- ],
- createdAt: '2022-09-29T15:39:36.355Z',
- organizationsBlockedBy: [
- {
- _id: 'xyz',
- name: 'Blocked Organization 1',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=Blocked%20Organization%201',
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ user: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
+ email: 'john@example.com',
+ createdAt: '2022-09-29T15:39:36.355Z',
+ organizationsBlockedBy: [
+ {
+ _id: 'xyz',
+ name: 'Blocked Organization 1',
image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- },
- },
- {
- _id: 'mno',
- name: 'Blocked Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
+ 'https://api.dicebear.com/5.x/initials/svg?seed=Blocked%20Organization%201',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-08-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image:
+ 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
+ email: 'john@example.com',
+ },
},
- createdAt: '2023-09-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ {
+ _id: 'mno',
+ name: 'Blocked Organization 2',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-09-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- },
- ],
- joinedOrganizations: [
- {
- _id: 'abc',
- name: 'Joined Organization 1',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
+ ],
+ joinedOrganizations: [
+ {
+ _id: 'abc',
+ name: 'Joined Organization 1',
+ image: null,
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-08-29T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
+ {
+ _id: 'def',
+ name: 'Joined Organization 2',
image: null,
- email: 'john@example.com',
+ address: {
+ city: 'Kingston',
+ countryCode: 'JM',
+ dependentLocality: 'Sample Dependent Locality',
+ line1: '123 Jamaica Street',
+ line2: 'Apartment 456',
+ postalCode: 'JM12345',
+ sortingCode: 'ABC-123',
+ state: 'Kingston Parish',
+ },
+ createdAt: '2023-09-19T15:39:36.355Z',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ },
},
- },
- {
- _id: 'def',
- name: 'Joined Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
+ ],
+ registeredEvents: [],
+ membershipRequests: [],
+ },
+ appUserProfile: {
+ _id: '123',
+ isSuperAdmin: true,
+ createdOrganizations: [],
+ createdEvents: [],
+ eventAdmin: [],
+ adminFor: [
+ {
+ _id: 'abc',
},
- createdAt: '2023-09-19T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: null,
- email: 'john@example.com',
+ {
+ _id: 'xyz',
},
- },
- ],
+ ],
+ },
},
index: 0,
loggedInUserId: '123',
@@ -1052,291 +1084,4 @@ describe('Testing User Table Item', () => {
fireEvent.click(confirmRemoveBtn);
});
-
- test('Should be able to change userType of a user if not self', async () => {
- const props: {
- user: InterfaceQueryUserListItem;
- index: number;
- loggedInUserId: string;
- resetAndRefetch: () => void;
- } = {
- user: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- userType: 'USER',
- adminApproved: true,
- adminFor: [
- {
- _id: 'abc',
- },
- {
- _id: 'xyz',
- },
- ],
- createdAt: '2022-09-29T15:39:36.355Z',
- organizationsBlockedBy: [
- {
- _id: 'xyz',
- name: 'Blocked Organization 1',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=Blocked%20Organization%201',
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image:
- 'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe',
- email: 'john@example.com',
- },
- },
- {
- _id: 'mno',
- name: 'Blocked Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-09-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: null,
- email: 'john@example.com',
- },
- },
- ],
- joinedOrganizations: [
- {
- _id: 'abc',
- name: 'Joined Organization 1',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-08-29T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: null,
- email: 'john@example.com',
- },
- },
- {
- _id: 'def',
- name: 'Joined Organization 2',
- image: null,
- address: {
- city: 'Kingston',
- countryCode: 'JM',
- dependentLocality: 'Sample Dependent Locality',
- line1: '123 Jamaica Street',
- line2: 'Apartment 456',
- postalCode: 'JM12345',
- sortingCode: 'ABC-123',
- state: 'Kingston Parish',
- },
- createdAt: '2023-09-19T15:39:36.355Z',
- creator: {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: null,
- email: 'john@example.com',
- },
- },
- ],
- },
- index: 0,
- loggedInUserId: '456',
- resetAndRefetch: resetAndRefetchMock,
- };
-
- render(
-