github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-05 01:26:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14500 from overleaf/ab-hide-checkbox-managed-users

Browse source 
[web] Hide checkbox on the row of managed group members

GitOrigin-RevId: cda1c2be6374f69b4de43f7730e7fba734d75f0a
This commit is contained in:
Alexandre Bourdin 2023-08-25 11:19:33 +02:00 committed by Copybot
parent f024f63d0f
commit 15f26eb622
4 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
services/web/frontend/js/features/group-management/components/managed-users/managed-user-row.tsx
View file

@ -43,17 +43,23 @@ export default function ManagedUserRow({
key={`user-${user.email}`}
className={`managed-user-row ${user.invite ? 'text-muted' : ''}`}
>
<td className="cell-checkbox">
{user.enrollment?.managedBy ? null : (
<>
<label htmlFor={`select-user-${user.email}`} className="sr-only">
{t('select_user')}
</label>
<input
className="select-item"
id={`select-user-${user.email}`}
type="checkbox"
checked={selected}
onChange={e => handleSelectUser(e, user)}
/>
</>
)}
</td>
<td className="cell-email">
<label htmlFor={`select-user-${user.email}`} className="sr-only">
{t('select_user')}
</label>
<input
className="select-item"
id={`select-user-${user.email}`}
type="checkbox"
checked={selected}
onChange={e => handleSelectUser(e, user)}
/>
<span>
{user.email}
{user.invite ? (

4
services/web/frontend/js/features/group-management/components/managed-users/managed-users-list.tsx
View file

@ -42,7 +42,7 @@ export default function ManagedUsersList({
<table className="managed-users-table">
<thead>
<tr>
<td className="cell-email">
<td className="cell-checkbox">
<label htmlFor="select-all" className="sr-only">
{t('select_all')}
</label>
@ -53,6 +53,8 @@ export default function ManagedUsersList({
onChange={handleSelectAllClick}
checked={selectedUsers.length === users.length}
/>
</td>
<td className="cell-email">
<span className="header">{t('email')}</span>
</td>
<td className="cell-name">

18
services/web/frontend/stylesheets/components/group-members.less
View file

@ -103,8 +103,12 @@
}
}
.cell-checkbox {
width: 5%;
}
.cell-email {
width: 50%;
width: 45%;
}
.cell-name {
@ -134,8 +138,12 @@
}
@media (min-width: @screen-xs) {
.cell-checkbox {
width: 5%;
}
.cell-email {
width: 40%;
width: 35%;
}
.cell-name {
@ -160,8 +168,12 @@
}
@media (min-width: @screen-lg) {
.cell-checkbox {
width: 5%;
}
.cell-email {
width: 50%;
width: 45%;
}
.cell-name {

29
services/web/test/frontend/features/group-management/components/managed-users/managed-group-members.spec.tsx
View file

@ -183,36 +183,11 @@ describe('group members, with managed users', function () {
})
cy.get('ul.managed-users-list table > tbody').within(() => {
// Select 'Claire Jennings', a managed user
// no checkbox should be shown for 'Claire Jennings', a managed user
cy.get('tr:nth-child(3)').within(() => {
cy.get('.select-item').check()
cy.get('.select-item').should('not.exist')
})
})
cy.get('.page-header').within(() => {
cy.findByRole('button', { name: 'Remove from group' }).should('not.exist')
})
})
it('does not show the remove-member button if any of the selected users are managed', function () {
cy.intercept('DELETE', `${PATHS.removeMember}/abc123def456`, {
statusCode: 200,
})
cy.get('ul.managed-users-list table > tbody').within(() => {
// Select 'Claire Jennings', a managed user
cy.get('tr:nth-child(3)').within(() => {
cy.get('.select-item').check()
})
// Select another user
cy.get('tr:nth-child(2)').within(() => {
cy.get('.select-item').check()
})
})
cy.get('.page-header').within(() => {
cy.findByRole('button', { name: 'Remove from group' }).should('not.exist')
})
})
it('tries to remove a user and displays the error', function () {