Typecheck

RocketChat · Mar 22, 2024 · 5b74149 · 5b74149
1 parent ed29479
commit 5b74149
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -30,6 +30,8 @@ export type UsersFilters = {
 	text: string;
 };
 
+export type UsersTableSortingOptions = 'name' | 'username' | 'emails.address' | 'status' | 'active';
+
 const AdminUsersPage = (): ReactElement => {
 	const t = useTranslation();
 

diff --git a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
@@ -1,21 +1,23 @@
 import type { IAdminUserTabs } from '@rocket.chat/core-typings';
+import type { UsersListStatusParamsGET } from '@rocket.chat/rest-typings';
 import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { MutableRefObject } from 'react';
 import { useMemo } from 'react';
 
 import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
+import type { UsersTableSortingOptions } from '../AdminUsersPage';
 
-type useFilteredUsersOptions = {
+type UseFilteredUsersOptions = {
 	searchTerm: string;
 	prevSearchTerm: MutableRefObject<string>;
 	tab: IAdminUserTabs;
 	paginationData: ReturnType<typeof usePagination>;
-	sortData: ReturnType<typeof useSort<'name' | 'username' | 'emails.address' | 'status'>>;
+	sortData: ReturnType<typeof useSort<UsersTableSortingOptions>>;
 };
 
-const useFilteredUsers = ({ searchTerm, prevSearchTerm, sortData, paginationData, tab }: useFilteredUsersOptions) => {
+const useFilteredUsers = ({ searchTerm, prevSearchTerm, sortData, paginationData, tab }: UseFilteredUsersOptions) => {
 	const { setCurrent, itemsPerPage, current } = paginationData;
 	const { sortBy, sortDirection } = sortData;
 
@@ -24,26 +26,37 @@ const useFilteredUsers = ({ searchTerm, prevSearchTerm, sortData, paginationData
 			setCurrent(0);
 		}
 
+		const listUsersPayload: Partial<Record<IAdminUserTabs, UsersListStatusParamsGET>> = {
+			all: {},
+			pending: {
+				hasLoggedIn: false,
+				type: 'user',
+			},
+			active: {
+				hasLoggedIn: true,
+				status: 'active',
+			},
+			deactivated: {
+				hasLoggedIn: true,
+				status: 'deactivated',
+			},
+		};
+
 		return {
-			status: tab,
+			...listUsersPayload[tab],
 			searchTerm,
 			sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
 			count: itemsPerPage,
 			offset: searchTerm === prevSearchTerm.current ? current : 0,
 		};
 	}, [current, itemsPerPage, prevSearchTerm, searchTerm, setCurrent, sortBy, sortDirection, tab]);
-
 	const getUsers = useEndpoint('GET', '/v1/users.listByStatus');
-
 	const dispatchToastMessage = useToastMessageDispatch();
-
 	const usersListQueryResult = useQuery(['users.list', payload, tab], async () => getUsers(payload), {
 		onError: (error) => {
 			dispatchToastMessage({ type: 'error', message: error });
 		},
 	});
-
 	return usersListQueryResult;
 };
-
 export default useFilteredUsers;