create filter for pending users (work in progress)

RocketChat · Sep 6, 2023 · a98e659 · a98e659
1 parent 444c930
commit a98e659
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -25,7 +25,7 @@ const UsersPage = (): ReactElement => {
 	const canCreateUser = usePermission('create-user');
 	const canBulkCreateUser = usePermission('bulk-register-user');
 
-	const [tab, setTab] = useState<'all' | 'invited' | 'new' | 'active' | 'deactivated'>('all');
+	const [tab, setTab] = useState<'all' | 'invited' | 'pending' | 'active' | 'deactivated'>('all');
 
 	useEffect(() => {
 		if (!context || !seatsCap) {
@@ -51,7 +51,7 @@ const UsersPage = (): ReactElement => {
 					) : (
 						<ButtonGroup>
 							{canCreateUser && (
-								<Button icon='user-plus' onClick={() => router.navigate('/admin/users/new')}>
+								<Button icon='user-plus' onClick={() => router.navigate('/admin/users/pending')}>
 									{t('New')}
 								</Button>
 							)}
@@ -68,18 +68,18 @@ const UsersPage = (): ReactElement => {
 						<Tabs.Item selected={!tab || tab === 'all'} onClick={() => setTab('all')}>
 							{t('All')}
 						</Tabs.Item>
-						<Tabs.Item selected={tab === 'invited'} onClick={() => setTab('invited')}>
-							{t('Invited')}
-						</Tabs.Item>
-						<Tabs.Item selected={tab === 'new'} onClick={() => setTab('new')}>
-							{t('New_users')}
+						<Tabs.Item selected={tab === 'pending'} onClick={() => setTab('pending')}>
+							{t('Pending')}
 						</Tabs.Item>
 						<Tabs.Item selected={tab === 'active'} onClick={() => setTab('active')}>
 							{t('Active')}
 						</Tabs.Item>
 						<Tabs.Item selected={tab === 'deactivated'} onClick={() => setTab('deactivated')}>
 							{t('Deactivated')}
 						</Tabs.Item>
+						<Tabs.Item selected={tab === 'invited'} onClick={() => setTab('invited')}>
+							{t('Invited')}
+						</Tabs.Item>
 					</Tabs>
 					<UsersTable reload={reload} tab={tab} />
 				</Page.Content>
@@ -90,14 +90,14 @@ const UsersPage = (): ReactElement => {
 						<ContextualbarTitle>
 							{context === 'info' && t('User_Info')}
 							{context === 'edit' && t('Edit_User')}
-							{context === 'new' && t('Add_User')}
+							{context === 'pending' && t('Add_User')}
 							{context === 'invite' && t('Invite_Users')}
 						</ContextualbarTitle>
 						<ContextualbarClose onClick={() => router.navigate('/admin/users')} />
 					</ContextualbarHeader>
 					{context === 'info' && id && <AdminUserInfoWithData uid={id} onReload={handleReload} />}
 					{context === 'edit' && id && <AdminUserFormWithData uid={id} onReload={handleReload} />}
-					{context === 'new' && <AdminUserForm onReload={handleReload} />}
+					{context === 'pending' && <AdminUserForm onReload={handleReload} />}
 					{context === 'invite' && <AdminInviteUsers />}
 				</Contextualbar>
 			)}

diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -19,6 +19,7 @@ import {
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import { useFilterActiveUsers } from '../hooks/useFilterActiveUsers';
+import { useFilterPendingUsers } from '../hooks/useFilterPendingUsers';
 import { useFilterUsersByRole } from '../hooks/useFilterUsersByrole';
 import { useListUsers } from '../hooks/useListUsers';
 import UsersTableRow from './UsersTableRow';
@@ -80,7 +81,7 @@ const UsersTable = ({ reload, tab }: UsersTableProps): ReactElement | null => {
 
 	const useAllUsers = () => (tab === 'all' && isSuccess ? data?.users : []);
 
-	const currentTabUsers = [...useAllUsers(), ...useFilterActiveUsers(data?.users, tab)];
+	const currentTabUsers = [...useAllUsers(), ...useFilterActiveUsers(data?.users, tab), ...useFilterPendingUsers(data?.users, tab)];
 	const filteredUsers = useFilterUsersByRole(
 		currentTabUsers,
 		roleFilterSelectedOptions.map((currentRole) => currentRole.id),

diff --git a/apps/meteor/client/views/admin/users/hooks/useFilterPendingUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilterPendingUsers.ts
@@ -0,0 +1,7 @@
+import type { IUser } from '@rocket.chat/core-typings';
+
+export const useFilterPendingUsers = (users: Partial<IUser>[] | undefined, tab: string) => {
+	if (!users || tab !== 'pending') return [];
+
+	return users.filter((currentUser) => currentUser.active === false || !currentUser.lastLogin);
+};