diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx index 718f5bbc7c..e42652588d 100644 --- a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx +++ b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx @@ -17,12 +17,14 @@ import useProjectRolesApi from '../../../../../hooks/api/actions/useProjectRoles import useToast from '../../../../../hooks/useToast'; import ProjectRoleDeleteConfirm from '../ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm'; import { formatUnknownError } from '../../../../../utils/format-unknown-error'; +import { useStyles } from './ProjectRoleListItem/ProjectRoleListItem.styles'; const ROOTROLE = 'root'; const ProjectRoleList = () => { const { hasAccess } = useContext(AccessContext); const { roles } = useProjectRoles(); + const styles = useStyles(); const paginationFilter = (role: IRole) => role?.type !== ROOTROLE; @@ -76,9 +78,11 @@ const ProjectRoleList = () => { - + Project Role - Description + + Description + {hasAccess(ADMIN) ? 'Action' : ''} diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.styles.ts b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.styles.ts index d30f963c27..86fc731a35 100644 --- a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.styles.ts +++ b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.styles.ts @@ -13,4 +13,21 @@ export const useStyles = makeStyles(theme => ({ icon: { color: theme.palette.grey[600], }, + description: { + textAlign: 'left', + maxWidth: '300px', + [theme.breakpoints.down('sm')]: { + display: 'none', + }, + }, + hideSM: { + [theme.breakpoints.down('sm')]: { + display: 'none', + }, + }, + hideXS: { + [theme.breakpoints.down('xs')]: { + display: 'none', + }, + }, })); diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx index 36fcfa8fec..9fc2d17bac 100644 --- a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx +++ b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx @@ -33,7 +33,7 @@ const RoleListItem = ({ return ( <> - + @@ -41,7 +41,7 @@ const RoleListItem = ({ {name} - + {description} diff --git a/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.styles.ts b/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.styles.ts index f4f0ba9d07..f94324a4f2 100644 --- a/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.styles.ts +++ b/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.styles.ts @@ -9,4 +9,14 @@ export const useStyles = makeStyles(theme => ({ leftTableCell: { textAlign: 'left', }, + hideSM: { + [theme.breakpoints.down('sm')]: { + display: 'none', + }, + }, + hideXS: { + [theme.breakpoints.down('xs')]: { + display: 'none', + }, + }, })); diff --git a/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.tsx b/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.tsx index a29f506b60..4ccd1e89eb 100644 --- a/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.tsx +++ b/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.tsx @@ -37,7 +37,7 @@ const UserListItem = ({ return ( - + - + {formatDateYMD(user.createdAt, locationSettings.locale)} @@ -57,12 +57,12 @@ const UserListItem = ({ {user.name} - + {user.username || user.email} - + {renderRole(user.rootRole)} diff --git a/frontend/src/component/admin/users/UsersList/UsersList.tsx b/frontend/src/component/admin/users/UsersList/UsersList.tsx index ed28ea807a..4e651eb3a4 100644 --- a/frontend/src/component/admin/users/UsersList/UsersList.tsx +++ b/frontend/src/component/admin/users/UsersList/UsersList.tsx @@ -25,8 +25,10 @@ import IRole from '../../../../interfaces/role'; import useToast from '../../../../hooks/useToast'; import { useLocationSettings } from '../../../../hooks/useLocationSettings'; import { formatUnknownError } from '../../../../utils/format-unknown-error'; +import { useStyles } from './UserListItem/UserListItem.styles'; const UsersList = () => { + const styles = useStyles(); const { users, roles, refetch, loading } = useUsers(); const { setToastData, setToastApiError } = useToast(); const { @@ -133,13 +135,17 @@ const UsersList = () => {
- - Created + + Created Name - Username - Role + + Username + + + Role + - {hasAccess(ADMIN) ? 'Action' : ''} + {hasAccess(ADMIN) ? 'Actions' : ''}