Regression: Users Table loading state (#26079)

RocketChat · Jun 30, 2022 · cb7c9a9 · cb7c9a9
1 parent b03d848
commit cb7c9a9
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 67 deletions.
diff --git a/apps/meteor/client/components/GenericModal.tsx b/apps/meteor/client/components/GenericModal.tsx
@@ -31,7 +31,7 @@ const getButtonProps = (variant: VariantType): ComponentProps<typeof Button> =>
 		case 'danger':
 			return { danger: true };
 		case 'warning':
-			return { warning: true };
+			return { primary: true };
 		default:
 			return {};
 	}

diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -70,90 +70,84 @@ const UsersTable = ({ reload }: UsersTableProps): ReactElement | null => {
 		}),
 	);
 
+	const headers = useMemo(
+		() => [
+			<GenericTableHeaderCell w='x200' key='name' direction={sortDirection} active={sortBy === 'name'} onClick={setSort} sort='name'>
+				{t('Name')}
+			</GenericTableHeaderCell>,
+			mediaQuery && (
+				<GenericTableHeaderCell
+					w='x140'
+					key='username'
+					direction={sortDirection}
+					active={sortBy === 'username'}
+					onClick={setSort}
+					sort='username'
+				>
+					{t('Username')}
+				</GenericTableHeaderCell>
+			),
+			<GenericTableHeaderCell
+				w='x120'
+				key='email'
+				direction={sortDirection}
+				active={sortBy === 'emails.address'}
+				onClick={setSort}
+				sort='emails.address'
+			>
+				{t('Email')}
+			</GenericTableHeaderCell>,
+			mediaQuery && (
+				<GenericTableHeaderCell w='x120' key='roles' onClick={setSort}>
+					{t('Roles')}
+				</GenericTableHeaderCell>
+			),
+			<GenericTableHeaderCell w='x100' key='status' direction={sortDirection} active={sortBy === 'status'} onClick={setSort} sort='status'>
+				{t('Status')}
+			</GenericTableHeaderCell>,
+		],
+		[mediaQuery, setSort, sortBy, sortDirection, t],
+	);
+
 	if (phase === AsyncStatePhase.REJECTED) {
 		return null;
 	}
 
 	return (
 		<>
 			<FilterByText placeholder={t('Search_Users')} onChange={({ text }): void => setText(text)} />
-			{value?.users.length === 0 && (
-				<States>
-					<StatesIcon name='magnifier' />
-					<StatesTitle>{t('No_results_found')}</StatesTitle>
-				</States>
+			{phase === AsyncStatePhase.LOADING && (
+				<GenericTable>
+					<GenericTableHeader>{headers}</GenericTableHeader>
+					<GenericTableBody>{phase === AsyncStatePhase.LOADING && <GenericTableLoadingTable headerCells={5} />}</GenericTableBody>
+				</GenericTable>
 			)}
-			{value?.users && value.users.length > 0 && (
+			{value?.users && value.users.length > 0 && phase === AsyncStatePhase.RESOLVED && (
 				<>
 					<GenericTable>
-						<GenericTableHeader>
-							<GenericTableHeaderCell
-								w='x200'
-								key='name'
-								direction={sortDirection}
-								active={sortBy === 'name'}
-								onClick={setSort}
-								sort='name'
-							>
-								{t('Name')}
-							</GenericTableHeaderCell>
-							{mediaQuery && (
-								<GenericTableHeaderCell
-									w='x140'
-									key='username'
-									direction={sortDirection}
-									active={sortBy === 'username'}
-									onClick={setSort}
-									sort='username'
-								>
-									{t('Username')}
-								</GenericTableHeaderCell>
-							)}
-							<GenericTableHeaderCell
-								w='x120'
-								key='email'
-								direction={sortDirection}
-								active={sortBy === 'emails.address'}
-								onClick={setSort}
-								sort='emails.address'
-							>
-								{t('Email')}
-							</GenericTableHeaderCell>
-							{mediaQuery && (
-								<GenericTableHeaderCell w='x120' key='roles' onClick={setSort}>
-									{t('Roles')}
-								</GenericTableHeaderCell>
-							)}
-							<GenericTableHeaderCell
-								w='x100'
-								key='status'
-								direction={sortDirection}
-								active={sortBy === 'status'}
-								onClick={setSort}
-								sort='status'
-							>
-								{t('Status')}
-							</GenericTableHeaderCell>
-						</GenericTableHeader>
+						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
-							{phase === AsyncStatePhase.LOADING && <GenericTableLoadingTable headerCells={5} />}
 							{value?.users.map((user) => (
 								<UsersTableRow key={user._id} onClick={handleClick} mediaQuery={mediaQuery} user={user} />
 							))}
 						</GenericTableBody>
 					</GenericTable>
-					{phase === AsyncStatePhase.RESOLVED && (
-						<Pagination
-							current={current}
-							itemsPerPage={itemsPerPage}
-							count={value?.total || 0}
-							onSetItemsPerPage={onSetItemsPerPage}
-							onSetCurrent={onSetCurrent}
-							{...paginationProps}
-						/>
-					)}
+					<Pagination
+						current={current}
+						itemsPerPage={itemsPerPage}
+						count={value?.total || 0}
+						onSetItemsPerPage={onSetItemsPerPage}
+						onSetCurrent={onSetCurrent}
+						{...paginationProps}
+					/>
 				</>
 			)}
+			{phase === AsyncStatePhase.RESOLVED && value?.users.length === 0 && (
+				<States>
+					<StatesIcon name='magnifier' />
+					<StatesTitle>{t('No_results_found')}</StatesTitle>
+				</States>
+			)}
 		</>
 	);
 };