-
-
- );
-}
-export {};
-export default landingPage;
diff --git a/src/components/LeftDrawer/LeftDrawer.tsx b/src/components/LeftDrawer/LeftDrawer.tsx
index b5244b2df7..57eacce0a7 100644
--- a/src/components/LeftDrawer/LeftDrawer.tsx
+++ b/src/components/LeftDrawer/LeftDrawer.tsx
@@ -139,7 +139,7 @@ const leftDrawer = ({
}}
>
- 
-
- -
{t('fromPalisadoes')}
- -
- {userImage && userImage ? (
+ {userImage && userImage !== 'null' ? (
) : (
![]()
- {userImage && userImage ? (
+ {userImage && userImage !== 'null' ? (
) : (
![]()
{
+ console.error = jest.fn();
+});
describe('Testing Loader component', () => {
- test('Component should be rendered properly', () => {
+ test('Component should be rendered properly only headerTitles is provided', () => {
+ const props: InterfaceTableLoader = {
+ noOfRows: 10,
+ headerTitles: ['header1', 'header2', 'header3'],
+ };
render(
);
// Check if header titles are rendered properly
- props.headerTitles.forEach((title) => {
+ const data = props.headerTitles as string[];
+ data.forEach((title) => {
expect(screen.getByText(title)).toBeInTheDocument();
});
@@ -26,11 +31,48 @@ describe('Testing Loader component', () => {
expect(
screen.getByTestId(`row-${rowIndex}-tableLoading`)
).toBeInTheDocument();
- for (let colIndex = 0; colIndex < props.headerTitles.length; colIndex++) {
+ for (let colIndex = 0; colIndex < data.length; colIndex++) {
+ expect(
+ screen.getByTestId(`row-${rowIndex}-col-${colIndex}-tableLoading`)
+ ).toBeInTheDocument();
+ }
+ }
+ });
+ test('Component should be rendered properly only noCols is provided', () => {
+ const props: InterfaceTableLoader = {
+ noOfRows: 10,
+ noOfCols: 3,
+ };
+ render(
+
+
+ );
+ // Check if header titles are rendered properly
+ const data = [...Array(props.noOfCols)];
+
+ // Check if elements are rendered properly
+ for (let rowIndex = 0; rowIndex < props.noOfRows; rowIndex++) {
+ expect(
+ screen.getByTestId(`row-${rowIndex}-tableLoading`)
+ ).toBeInTheDocument();
+ for (let colIndex = 0; colIndex < data.length; colIndex++) {
expect(
screen.getByTestId(`row-${rowIndex}-col-${colIndex}-tableLoading`)
).toBeInTheDocument();
}
}
});
+ test('Component should be throw error when noOfCols and headerTitles are undefined', () => {
+ const props = {
+ noOfRows: 10,
+ };
+ expect(() => {
+ render(
+
+
+ );
+ }).toThrowError();
+ });
});
diff --git a/src/components/TableLoader/TableLoader.tsx b/src/components/TableLoader/TableLoader.tsx
index 49d317b292..2da4b1d172 100644
--- a/src/components/TableLoader/TableLoader.tsx
+++ b/src/components/TableLoader/TableLoader.tsx
@@ -1,25 +1,40 @@
-import React from 'react';
+import React, { useEffect } from 'react';
import styles from './TableLoader.module.css';
import { Table } from 'react-bootstrap';
-interface InterfaceTableLoader {
+export interface InterfaceTableLoader {
noOfRows: number;
- headerTitles: string[];
+ headerTitles?: string[];
+ noOfCols?: number;
}
const tableLoader = (props: InterfaceTableLoader): JSX.Element => {
- const { noOfRows, headerTitles } = props;
+ const { noOfRows, headerTitles, noOfCols } = props;
+
+ useEffect(() => {
+ if (headerTitles == undefined && noOfCols == undefined) {
+ throw new Error(
+ 'TableLoader error Either headerTitles or noOfCols is required !'
+ );
+ }
+ }, []);
return (
<>
-
+
| {title} | ; - })} + {headerTitles + ? headerTitles.map((title, index) => { + return{title} | ; + }) + : noOfCols && + [...Array(noOfCols)].map((_, index) => { + return; + })} | - - | - ); - })} + {[...Array(headerTitles ? headerTitles?.length : noOfCols)].map( + (_, colIndex) => { + return ( ++ + | + ); + } + )} ); })} diff --git a/src/components/UsersTableItem/UserTableItem.test.tsx b/src/components/UsersTableItem/UserTableItem.test.tsx new file mode 100644 index 0000000000..0e67a02022 --- /dev/null +++ b/src/components/UsersTableItem/UserTableItem.test.tsx @@ -0,0 +1,1054 @@ +import React from 'react'; +import { MockedProvider } from '@apollo/react-testing'; +import { act, fireEvent, render, screen } from '@testing-library/react'; +import { I18nextProvider } from 'react-i18next'; +import { toast } from 'react-toastify'; +import { StaticMockLink } from 'utils/StaticMockLink'; +import i18nForTest from 'utils/i18nForTest'; +import type { InterfaceQueryUserListItem } from 'utils/interfaces'; +import { MOCKS } from './UserTableItemMocks'; +import UsersTableItem from './UsersTableItem'; + +const link = new StaticMockLink(MOCKS, true); + +async function wait(ms = 100): Promise||
|---|---|---|---|---|---|---|
| {index + 1} | +{`${user.firstName} ${user.lastName}`} | +{user.email} | +
+ |
+ + + | + ++ + | +
| Name | +Location | +Created on | +Created By | +Users Role | +Change Role | +Action | +
|---|---|---|---|---|---|---|
| + + | +{org.location} | +{dayjs(org.createdAt).format('DD-MM-YYYY')} | ++ + | +{isAdmin ? 'ADMIN' : 'USER'} | +
+ |
+ + + | +
+
+ )}
+
+
+ ) : orgsBlockedBy.length == 0 ? (
+ <>
+ + {user.firstName} {user.lastName} {t('isNotBlockedByAnyOrg')} +
+
+
+
+ ) : (
+ + {t('noResultsFoundFor')} "{searchByNameOrgsBlockedBy} + " +
+| Name | +Location | +Created on | +Created By | +Users Role | +Change Role | +Action | +
|---|---|---|---|---|---|---|
| + + | +{org.location} | +{dayjs(org.createdAt).format('DD-MM-YYYY')} | ++ + | +{isAdmin ? 'ADMIN' : 'USER'} | +
+ |
+ + + | +
+ Are you sure you want to remove{' '} + + “{user.firstName} {user.lastName}” + {' '} + from organization{' '} + + “ + {removeUserProps.orgName}” + {' '} + ? +
+
-
- ) : loadingUsers == false && usersData.length === 0 ? (
+ ) : isLoading == false && usersData?.users.length === 0 ? (
+ ) : isLoading ? (
+
+
+
+
)}
diff --git a/src/screens/Requests/RequestsMocks.ts b/src/screens/Requests/RequestsMocks.ts
new file mode 100644
index 0000000000..a57bff7c83
--- /dev/null
+++ b/src/screens/Requests/RequestsMocks.ts
@@ -0,0 +1,220 @@
+import {
+ ACCEPT_ADMIN_MUTATION,
+ REJECT_ADMIN_MUTATION,
+} from 'GraphQl/Mutations/mutations';
+import {
+ ORGANIZATION_CONNECTION_LIST,
+ USER_LIST_REQUEST,
+ USER_ORGANIZATION_LIST,
+} from 'GraphQl/Queries/Queries';
+
+export const MOCKS = [
+ {
+ request: {
+ query: USER_ORGANIZATION_LIST,
+ variables: { id: localStorage.getItem('id') },
+ },
+ result: {
+ data: {
+ user: {
+ _id: '123',
+ userType: 'SUPERADMIN',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: '',
+ email: 'John_Does_Palasidoes@gmail.com',
+ adminFor: {
+ _id: 1,
+ name: 'Akatsuki',
+ image: '',
+ },
+ },
+ },
+ },
+ },
+ {
+ request: {
+ query: USER_LIST_REQUEST,
+ variables: {
+ adminApproved: false,
+ first: 12,
+ firstName_contains: '',
+ lastName_contains: '',
+ skip: 0,
+ userType: 'ADMIN',
+ },
+ notifyOnNetworkStatusChange: true,
+ },
+ result: {
+ data: {
+ users: [
+ {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: 'dummyImage',
+ email: 'johndoe@gmail.com',
+ userType: 'SUPERADMIN',
+ adminApproved: true,
+ createdAt: '20/06/2022',
+ organizationsBlockedBy: [
+ {
+ _id: '256',
+ name: 'ABC',
+ },
+ ],
+ joinedOrganizations: [
+ {
+ __typename: 'Organization',
+ _id: '6401ff65ce8e8406b8f07af1',
+ },
+ ],
+ },
+ {
+ _id: '456',
+ firstName: 'Sam',
+ lastName: 'Smith',
+ image: 'dummyImage',
+ email: 'samsmith@gmail.com',
+ userType: 'ADMIN',
+ adminApproved: false,
+ createdAt: '20/06/2022',
+ organizationsBlockedBy: [
+ {
+ _id: '256',
+ name: 'ABC',
+ },
+ ],
+ joinedOrganizations: [
+ {
+ __typename: 'Organization',
+ _id: '6401ff65ce8e8406b8f07af2',
+ },
+ ],
+ },
+ {
+ _id: '789',
+ firstName: 'Peter',
+ lastName: 'Parker',
+ image: 'dummyImage',
+ email: 'peterparker@gmail.com',
+ userType: 'USER',
+ adminApproved: true,
+ createdAt: '20/06/2022',
+ organizationsBlockedBy: [
+ {
+ _id: '256',
+ name: 'ABC',
+ },
+ ],
+ joinedOrganizations: [
+ {
+ __typename: 'Organization',
+ _id: '6401ff65ce8e8406b8f07af3',
+ },
+ ],
+ },
+ ],
+ },
+ },
+ },
+ {
+ request: {
+ query: ACCEPT_ADMIN_MUTATION,
+ variables: {
+ id: '123',
+ userType: 'ADMIN',
+ },
+ },
+ result: {
+ data: {
+ acceptAdmin: true,
+ },
+ },
+ },
+ {
+ request: {
+ query: REJECT_ADMIN_MUTATION,
+ variables: {
+ id: '123',
+ userType: 'ADMIN',
+ },
+ },
+ result: {
+ data: {
+ rejectAdmin: true,
+ },
+ },
+ },
+];
+
+export const EMPTY_ORG_MOCKS = [
+ {
+ request: {
+ query: ACCEPT_ADMIN_MUTATION,
+ variables: {
+ id: '123',
+ userType: 'ADMIN',
+ },
+ },
+ result: {
+ data: undefined,
+ },
+ },
+ {
+ request: {
+ query: REJECT_ADMIN_MUTATION,
+ variables: {
+ id: '123',
+ userType: 'ADMIN',
+ },
+ },
+ result: {
+ data: undefined,
+ },
+ },
+ {
+ request: {
+ query: ORGANIZATION_CONNECTION_LIST,
+ },
+ result: {
+ data: {
+ organizationsConnection: [],
+ },
+ },
+ },
+];
+
+export const ORG_LIST_MOCK = [
+ ...MOCKS,
+ {
+ request: {
+ query: ORGANIZATION_CONNECTION_LIST,
+ },
+ result: {
+ data: {
+ organizationsConnection: [
+ {
+ _id: 1,
+ image: '',
+ name: 'Akatsuki',
+ creator: {
+ firstName: 'John',
+ lastName: 'Doe',
+ },
+ admins: [
+ {
+ _id: '123',
+ },
+ ],
+ members: {
+ _id: '234',
+ },
+ createdAt: '02/02/2022',
+ location: 'Washington DC',
+ },
+ ],
+ },
+ },
+ },
+];
diff --git a/src/screens/Users/Users.test.tsx b/src/screens/Users/Users.test.tsx
index bc375bcc3d..03a65c49fd 100644
--- a/src/screens/Users/Users.test.tsx
+++ b/src/screens/Users/Users.test.tsx
@@ -9,199 +9,11 @@ import { BrowserRouter } from 'react-router-dom';
import { ToastContainer } from 'react-toastify';
import userEvent from '@testing-library/user-event';
-import { UPDATE_USERTYPE_MUTATION } from 'GraphQl/Mutations/mutations';
-import {
- ORGANIZATION_CONNECTION_LIST,
- USER_LIST,
- USER_ORGANIZATION_LIST,
-} from 'GraphQl/Queries/Queries';
import { store } from 'state/store';
import { StaticMockLink } from 'utils/StaticMockLink';
import i18nForTest from 'utils/i18nForTest';
import Users from './Users';
-
-const MOCKS = [
- {
- request: {
- query: USER_ORGANIZATION_LIST,
- variables: { id: 'SUPERADMIN' },
- },
- result: {
- data: {
- user: {
- userType: 'SUPERADMIN',
- firstName: 'John',
- lastName: 'Doe',
- image: '',
- email: 'John_Does_Palasidoes@gmail.com',
- adminFor: {
- _id: 1,
- name: 'Palisadoes',
- image: '',
- },
- },
- },
- },
- },
- {
- request: {
- query: USER_LIST,
- },
- result: {
- data: {
- users: [
- {
- _id: '123',
- firstName: 'John',
- lastName: 'Doe',
- image: 'dummyImage',
- email: 'johndoe@gmail.com',
- userType: 'SUPERADMIN',
- adminApproved: true,
- createdAt: '20/06/2022',
- organizationsBlockedBy: [
- {
- _id: '256',
- name: 'ABC',
- },
- ],
- joinedOrganizations: [
- {
- __typename: 'Organization',
- _id: '6401ff65ce8e8406b8f07af1',
- },
- ],
- },
- {
- _id: '456',
- firstName: 'Sam',
- lastName: 'Smith',
- image: 'dummyImage',
- email: 'samsmith@gmail.com',
- userType: 'ADMIN',
- adminApproved: true,
- createdAt: '20/06/2022',
- organizationsBlockedBy: [
- {
- _id: '256',
- name: 'ABC',
- },
- ],
- joinedOrganizations: [
- {
- __typename: 'Organization',
- _id: '6401ff65ce8e8406b8f07af2',
- },
- ],
- },
- {
- _id: '789',
- firstName: 'Peter',
- lastName: 'Parker',
- image: 'dummyImage',
- email: 'peterparker@gmail.com',
- userType: 'USER',
- adminApproved: true,
- createdAt: '20/06/2022',
- organizationsBlockedBy: [
- {
- _id: '256',
- name: 'ABC',
- },
- ],
- joinedOrganizations: [
- {
- __typename: 'Organization',
- _id: '6401ff65ce8e8406b8f07af3',
- },
- ],
- },
- ],
- },
- },
- },
- {
- request: {
- query: UPDATE_USERTYPE_MUTATION,
- variables: {
- id: '123',
- userType: 'ADMIN',
- },
- },
- result: {
- data: {
- updateUserType: true,
- },
- },
- },
- {
- request: {
- query: ORGANIZATION_CONNECTION_LIST,
- },
- result: {
- data: {
- organizationsConnection: [
- {
- _id: 1,
- image: '',
- name: 'Akatsuki',
- creator: {
- firstName: 'John',
- lastName: 'Doe',
- },
- admins: [
- {
- _id: '123',
- },
- ],
- members: {
- _id: '234',
- },
- createdAt: '02/02/2022',
- location: 'Washington DC',
- },
- ],
- },
- },
- },
-];
-
-const EMPTY_MOCKS = [
- {
- request: {
- query: USER_LIST,
- },
- result: {
- data: {
- users: [],
- },
- },
- },
- {
- request: {
- query: UPDATE_USERTYPE_MUTATION,
- variables: {
- id: '123',
- userType: 'ADMIN',
- },
- },
- result: {
- data: {
- updateUserType: false,
- },
- },
- },
- {
- request: {
- query: ORGANIZATION_CONNECTION_LIST,
- },
- result: {
- data: {
- organizationsConnection: [],
- },
- },
- },
-];
+import { EMPTY_MOCKS, MOCKS } from './UsersMocks';
const link = new StaticMockLink(MOCKS, true);
const link2 = new StaticMockLink(EMPTY_MOCKS, true);
@@ -213,11 +25,19 @@ async function wait(ms = 100): Promise {
});
});
}
+beforeEach(() => {
+ localStorage.setItem('id', '123');
+ localStorage.setItem('UserType', 'SUPERADMIN');
+ localStorage.setItem('FirstName', 'John');
+ localStorage.setItem('LastName', 'Doe');
+});
+
+afterEach(() => {
+ localStorage.clear();
+});
describe('Testing Users screen', () => {
test('Component should be rendered properly', async () => {
- window.location.assign('/orglist');
-
render(
@@ -232,19 +52,12 @@ describe('Testing Users screen', () => {
await wait();
expect(screen.getAllByText(/Users/i)).toBeTruthy();
- expect(window.location).toBeAt('/orglist');
});
- test('Component should be rendered properly when user is not superAdmin', async () => {
- const localStorageMock = {
- getItem: jest.fn(() => 'ADMIN'),
- };
-
- Object.defineProperty(window, 'localStorage', {
- value: localStorageMock,
- writable: true,
- });
-
+ test(`Component should be rendered properly when user is not superAdmin
+ and or userId does not exists in localstorage`, async () => {
+ localStorage.setItem('UserType', 'ADMIN');
+ localStorage.setItem('id', '');
render(
@@ -258,22 +71,11 @@ describe('Testing Users screen', () => {
);
await wait();
-
- expect(window.location.assign).toHaveBeenCalled();
});
test('Component should be rendered properly when user is superAdmin', async () => {
- const localStorageMock = {
- getItem: jest.fn(() => 'SUPERADMIN'),
- };
-
- Object.defineProperty(window, 'localStorage', {
- value: localStorageMock,
- writable: true,
- });
-
render(
-
+
@@ -285,8 +87,6 @@ describe('Testing Users screen', () => {
);
await wait();
-
- expect(window.location.assign).not.toHaveBeenCalled();
});
test('Testing seach by name functionality', async () => {
@@ -319,24 +119,7 @@ describe('Testing Users screen', () => {
const search5 = 'Xe';
userEvent.type(screen.getByTestId(/searchByName/i), search5);
- });
-
- test('Testing change role functionality', async () => {
- render(
-
-
-
-
-
-
-
-
- );
-
- await wait();
-
- userEvent.selectOptions(screen.getByTestId(/changeRole123/i), 'ADMIN');
+ userEvent.type(screen.getByTestId(/searchByName/i), '');
});
test('Testing User data is not present', async () => {
@@ -396,79 +179,4 @@ describe('Testing Users screen', () => {
'Organizations not found, please create an organization through dashboard'
);
});
-
- test('Should disable select when user is self', async () => {
- const localStorageMock = (function (): any {
- const store: any = {
- UserType: 'SUPERADMIN',
- id: '123',
- };
-
- return {
- getItem: jest.fn((key: string) => store[key]),
- };
- })();
-
- Object.defineProperty(window, 'localStorage', { value: localStorageMock });
-
- render(
-
-
-
-
-
-
-
-
- );
-
- await wait();
-
- expect(screen.getByTestId('changeRole123')).toHaveProperty(
- 'disabled',
- true
- );
- });
-
- test('Should not disable select when user is not self', async () => {
- const localStorageMock = (function (): any {
- const store: any = {
- UserType: 'SUPERADMIN',
- id: '123',
- };
-
- return {
- getItem: jest.fn((key: string) => store[key]),
- };
- })();
-
- Object.defineProperty(window, 'localStorage', { value: localStorageMock });
-
- render(
-
-
-
-
-
-
-
-
- );
-
- await wait();
-
- expect(screen.getByTestId('changeRole456')).toHaveProperty(
- 'disabled',
- false
- );
-
- expect(screen.getByTestId('changeRole789')).toHaveProperty(
- 'disabled',
- false
- );
- });
});
diff --git a/src/screens/Users/Users.tsx b/src/screens/Users/Users.tsx
index ccf70cb712..e7b1e0c1af 100644
--- a/src/screens/Users/Users.tsx
+++ b/src/screens/Users/Users.tsx
@@ -1,4 +1,5 @@
-import { useMutation, useQuery } from '@apollo/client';
+import type { ApolloError } from '@apollo/client';
+import { useQuery } from '@apollo/client';
import React, { useEffect, useState } from 'react';
import { Dropdown, Form, Table } from 'react-bootstrap';
import Button from 'react-bootstrap/Button';
@@ -11,45 +12,62 @@ import SortIcon from '@mui/icons-material/Sort';
import {
ORGANIZATION_CONNECTION_LIST,
USER_LIST,
- USER_ORGANIZATION_LIST,
} from 'GraphQl/Queries/Queries';
import SuperAdminScreen from 'components/SuperAdminScreen/SuperAdminScreen';
-import { errorHandler } from 'utils/errorHandler';
-import styles from './Users.module.css';
-import type { InterfaceUserType } from 'utils/interfaces';
-import { UPDATE_USERTYPE_MUTATION } from 'GraphQl/Mutations/mutations';
-import debounce from 'utils/debounce';
import TableLoader from 'components/TableLoader/TableLoader';
+import UsersTableItem from 'components/UsersTableItem/UsersTableItem';
+import InfiniteScroll from 'react-infinite-scroll-component';
+import debounce from 'utils/debounce';
+import type { InterfaceQueryUserListItem } from 'utils/interfaces';
+import styles from './Users.module.css';
const Users = (): JSX.Element => {
const { t } = useTranslation('translation', { keyPrefix: 'users' });
document.title = t('title');
+ const perPageResult = 12;
+ const [isLoading, setIsLoading] = useState(true);
+ const [hasMore, setHasMore] = useState(true);
+ const [isLoadingMore, setIsLoadingMore] = useState(false);
const [searchByName, setSearchByName] = useState('');
const userType = localStorage.getItem('UserType');
- const userId = localStorage.getItem('id');
+ const loggedInUserId = localStorage.getItem('id');
+
const {
- data: currentUserData,
+ data: usersData,
+ loading: loading,
+ fetchMore,
+ refetch: refetchUsers,
}: {
- data: InterfaceUserType | undefined;
+ data?: { users: InterfaceQueryUserListItem[] };
loading: boolean;
- error?: Error | undefined;
- } = useQuery(USER_ORGANIZATION_LIST, {
- variables: { id: localStorage.getItem('id') },
- });
- const {
- data: dataUsers,
- loading: loadingUsers,
- refetch: refetchUsers,
+ fetchMore: any;
+ refetch: any;
+ error?: ApolloError;
} = useQuery(USER_LIST, {
+ variables: {
+ first: perPageResult,
+ skip: 0,
+ firstName_contains: '',
+ lastName_contains: '',
+ },
notifyOnNetworkStatusChange: true,
});
- const [updateUserType] = useMutation(UPDATE_USERTYPE_MUTATION);
const { data: dataOrgs } = useQuery(ORGANIZATION_CONNECTION_LIST);
+ // Manage loading more state
+ useEffect(() => {
+ if (!usersData) {
+ return;
+ }
+ if (usersData.users.length < perPageResult) {
+ setHasMore(false);
+ }
+ }, [usersData]);
+
// To clear the search when the component is unmounted
useEffect(() => {
return () => {
@@ -75,40 +93,67 @@ const Users = (): JSX.Element => {
}
}, []);
- 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],
- },
- });
-
- /* istanbul ignore next */
- if (data) {
- toast.success(t('roleUpdated'));
- refetchUsers();
- }
- } catch (error: any) {
- /* istanbul ignore next */
- errorHandler(t, error);
+ // Manage the loading state
+ useEffect(() => {
+ if (loading && isLoadingMore == false) {
+ setIsLoading(true);
+ } else {
+ setIsLoading(false);
}
- };
+ }, [loading]);
const handleSearchByName = (e: any): void => {
const { value } = e.target;
setSearchByName(value);
+ /* istanbul ignore next */
+ if (value.length === 0) {
+ resetAndRefetch();
+ return;
+ }
refetchUsers({
firstName_contains: value,
lastName_contains: '',
// Later on we can add several search and filter options
});
};
-
+ /* istanbul ignore next */
+ const resetAndRefetch = (): void => {
+ refetchUsers({
+ first: perPageResult,
+ skip: 0,
+ firstName_contains: '',
+ lastName_contains: '',
+ });
+ setHasMore(true);
+ };
+ /* istanbul ignore next */
+ const loadMoreUsers = (): void => {
+ setIsLoadingMore(true);
+ fetchMore({
+ variables: {
+ skip: usersData?.users.length || 0,
+ userType: 'ADMIN',
+ filter: searchByName,
+ },
+ updateQuery: (
+ prev: { users: InterfaceQueryUserListItem[] } | undefined,
+ {
+ fetchMoreResult,
+ }: {
+ fetchMoreResult: { users: InterfaceQueryUserListItem[] } | undefined;
+ }
+ ): { users: InterfaceQueryUserListItem[] } | undefined => {
+ setIsLoadingMore(false);
+ if (!fetchMoreResult) return prev;
+ if (fetchMoreResult.users.length < perPageResult) {
+ setHasMore(false);
+ }
+ return {
+ users: [...(prev?.users || []), ...(fetchMoreResult.users || [])],
+ };
+ },
+ });
+ };
const debouncedHandleSearchByName = debounce(handleSearchByName);
const headerTitles: string[] = [
@@ -116,6 +161,8 @@ const Users = (): JSX.Element => {
t('name'),
t('email'),
t('roles_userType'),
+ t('joined_organizations'),
+ t('blocked_organizations'),
];
return (
@@ -127,11 +174,7 @@ const Users = (): JSX.Element => {
{
-
- {loadingUsers == false &&
- dataUsers &&
- dataUsers.users.length === 0 &&
+ {isLoading == false &&
+ usersData &&
+ usersData.users.length === 0 &&
searchByName.length > 0 ? (
-
- {loadingUsers == false &&
- usersData.length === 0 &&
+ {isLoading == false &&
+ usersData?.users.length === 0 &&
searchByName.length > 0 ? (
-
-
- {t('forgotPassword')}
-
-
{t('noResultsFoundFor')} "{searchByName}"
{t('noRequestFound')}
- {loadingUsers ? (
-
-
-
- )}
-
+ | - {title} - | - ); - })} -||||
|---|---|---|---|---|
| {index + 1} | -{`${user.firstName} ${user.lastName}`} | -{user.email} | -- - | -- - | -
+
+ }
+ >
+ {t('endOfResults')}
+| + {title} + | + ); + })} +||||
|---|---|---|---|---|
| {index + 1} | +{`${user.firstName} ${user.lastName}`} | +{user.email} | ++ + | ++ + | +
{t('noResultsFoundFor')} "{searchByName}"
{t('noUserFound')}
- {loadingUsers ? (
-
-
-
+
+
+ })}
+
+
+
)}
)}
diff --git a/src/screens/Users/UsersMocks.ts b/src/screens/Users/UsersMocks.ts
new file mode 100644
index 0000000000..2ee589fd2f
--- /dev/null
+++ b/src/screens/Users/UsersMocks.ts
@@ -0,0 +1,216 @@
+import {
+ ORGANIZATION_CONNECTION_LIST,
+ USER_LIST,
+ USER_ORGANIZATION_LIST,
+} from 'GraphQl/Queries/Queries';
+
+export const MOCKS = [
+ {
+ request: {
+ query: USER_ORGANIZATION_LIST,
+ variables: { id: 'user1' },
+ },
+ result: {
+ data: {
+ user: {
+ _id: 'user1',
+ userType: 'SUPERADMIN',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: '',
+ email: 'John_Does_Palasidoes@gmail.com',
+ adminFor: [
+ {
+ _id: 1,
+ name: 'Palisadoes',
+ image: '',
+ },
+ ],
+ },
+ },
+ },
+ },
+ {
+ request: {
+ query: USER_LIST,
+ variables: {
+ first: 12,
+ skip: 0,
+ firstName_contains: '',
+ lastName_contains: '',
+ },
+ },
+ result: {
+ data: {
+ users: [
+ {
+ _id: 'user1',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ userType: 'SUPERADMIN',
+ adminApproved: true,
+ adminFor: [
+ {
+ _id: '123',
+ },
+ ],
+ createdAt: '20/06/2022',
+ organizationsBlockedBy: [
+ {
+ _id: 'xyz',
+ name: 'ABC',
+ image: null,
+ location: 'Jamaica',
+ createdAt: '20/06/2022',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ createdAt: '20/06/2022',
+ },
+ },
+ ],
+ joinedOrganizations: [
+ {
+ _id: 'abc',
+ name: 'Joined Organization 1',
+ image: null,
+ location: 'Jamaica',
+ createdAt: '20/06/2022',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ createdAt: '20/06/2022',
+ },
+ },
+ ],
+ },
+ {
+ _id: 'user2',
+ firstName: 'Jane',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ userType: 'SUPERADMIN',
+ adminApproved: true,
+ adminFor: [
+ {
+ _id: '123',
+ },
+ ],
+ createdAt: '20/06/2022',
+ organizationsBlockedBy: [
+ {
+ _id: '456',
+ name: 'ABC',
+ image: null,
+ location: 'Jamaica',
+ createdAt: '20/06/2022',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ createdAt: '20/06/2022',
+ },
+ },
+ ],
+ joinedOrganizations: [
+ {
+ _id: '123',
+ name: 'Palisadoes',
+ image: null,
+ location: 'Jamaica',
+ createdAt: '20/06/2022',
+ creator: {
+ _id: '123',
+ firstName: 'John',
+ lastName: 'Doe',
+ image: null,
+ email: 'john@example.com',
+ createdAt: '20/06/2022',
+ },
+ },
+ ],
+ },
+ ],
+ },
+ },
+ },
+ {
+ request: {
+ query: ORGANIZATION_CONNECTION_LIST,
+ },
+ result: {
+ data: {
+ organizationsConnection: [
+ {
+ _id: 123,
+ image: null,
+ creator: {
+ firstName: 'John',
+ lastName: 'Doe',
+ },
+ name: 'Palisadoes',
+ members: [
+ {
+ _id: 'user1',
+ },
+ {
+ _id: 'user2',
+ },
+ ],
+ admins: [
+ {
+ _id: 'user1',
+ },
+ {
+ _id: 'user2',
+ },
+ ],
+ createdAt: '09/11/2001',
+ location: 'Twin Tower',
+ },
+ ],
+ },
+ },
+ },
+];
+
+export const EMPTY_MOCKS = [
+ {
+ request: {
+ query: USER_LIST,
+
+ variables: {
+ first: 12,
+ skip: 0,
+ firstName_contains: '',
+ lastName_contains: '',
+ },
+ },
+ result: {
+ data: {
+ users: [],
+ },
+ },
+ },
+ {
+ request: {
+ query: ORGANIZATION_CONNECTION_LIST,
+ },
+ result: {
+ data: {
+ organizationsConnection: [],
+ },
+ },
+ },
+];
diff --git a/src/utils/interfaces.ts b/src/utils/interfaces.ts
index 304fc36715..1a41e91dfb 100644
--- a/src/utils/interfaces.ts
+++ b/src/utils/interfaces.ts
@@ -113,3 +113,54 @@ export interface InterfaceQueryBlockPageMemberListItem {
_id: string;
}[];
}
+
+export interface InterfaceQueryUserListItem {
+ _id: string;
+ firstName: string;
+ lastName: string;
+ image: string | null;
+ email: string;
+ userType: string;
+ adminFor: { _id: string }[];
+ adminApproved: boolean;
+ organizationsBlockedBy: {
+ _id: string;
+ name: string;
+ location: string;
+ image: string | null;
+ createdAt: string;
+ creator: {
+ _id: string;
+ firstName: string;
+ lastName: string;
+ email: string;
+ image: string | null;
+ };
+ }[];
+ joinedOrganizations: {
+ _id: string;
+ name: string;
+ location: string;
+ image: string | null;
+ createdAt: string;
+ creator: {
+ _id: string;
+ firstName: string;
+ lastName: string;
+ email: string;
+ image: string | null;
+ };
+ }[];
+ createdAt: string;
+}
+
+export interface InterfaceQueryRequestListItem {
+ _id: string;
+ firstName: string;
+ lastName: string;
+ image: string;
+ email: string;
+ userType: string;
+ adminApproved: boolean;
+ createdAt: string;
+}
From 40efb0f2b6a2883b94eb63d66d0f7bc5324616cb Mon Sep 17 00:00:00 2001
From: Sandeep Kumar Bhagat | - {title} - | - ); - })} -
|---|
| + {title} + | + ); + })} +|||
|---|---|---|---|
| {index + 1} | -{`${user.firstName} ${user.lastName}`} | -{user.email} | -- - | -