From 270a38e27f586485a36b70719cb2051d098e1c12 Mon Sep 17 00:00:00 2001 From: Felipe <84182706+felipe-rod123@users.noreply.github.com> Date: Wed, 27 Sep 2023 17:21:36 -0300 Subject: [PATCH] fix table rows --- .../admin/users/UsersTable/UsersTable.tsx | 42 +++++++++++-------- .../admin/users/UsersTable/UsersTableRow.tsx | 7 ++-- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx index c287819237d3..f2e8a468f66e 100644 --- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx +++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx @@ -86,26 +86,32 @@ const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement | const headers = useMemo( () => [ - - {t('Name')} - , + mediaQuery && ( + + {t('Name')} + + ), {t('Username')} , - - {t('Email')} - , + mediaQuery && ( + + {t('Email')} + + ), - - {t('Roles')} - , + mediaQuery && ( + + {t('Roles')} + + ), tab === 'all' && ( + {t('Pending_action')} ), - , + , ], - [setSort, sortBy, sortDirection, t, tab], + [mediaQuery, setSort, sortBy, sortDirection, t, tab], ); return ( diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx index 64dba94645b9..81e821e8121c 100644 --- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx +++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx @@ -88,15 +88,16 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab onClick={(e): void => { e.stopPropagation(); }} + w='fit-content' > {active ? t('User_first_log_in') : t('Activation')} {active ? ( - ) : ( - )} @@ -104,7 +105,7 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab )} - +