github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14498 from overleaf/ab-fix-managed-user-admin

Browse source 
[web] Do not show Delete user button for managed group admin

GitOrigin-RevId: 4fcb120e6feec51c218cce7f381925eb12680afd
This commit is contained in:
Alexandre Bourdin 2023-08-25 11:24:58 +02:00 committed by Copybot
parent 15f26eb622
commit 0ae6adb4d6
2 changed files with 50 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/web/frontend/js/features/group-management/components/managed-users/managed-user-dropdown-button.tsx
View file

@ -173,7 +173,11 @@ export default function ManagedUserDropdownButton({
) : null}
</MenuItemButton>
) : null}
{user.enrollment?.managedBy ? (
{user.isEntityAdmin ? (
<MenuItem data-testid="no-actions-available">
<span className="text-muted">{t('no_actions')}</span>
</MenuItem>
) : user.enrollment?.managedBy ? (
<MenuItemButton
className="delete-user-action"
data-testid="delete-user-action"
@ -181,10 +185,6 @@ export default function ManagedUserDropdownButton({
>
{t('delete_user')}
</MenuItemButton>
) : user.isEntityAdmin ? (
<MenuItem data-testid="no-actions-available">
<span className="text-muted">{t('no_actions')}</span>
</MenuItem>
) : (
<MenuItemButton
onClick={onRemoveFromGroup}

45
services/web/test/frontend/features/group-management/components/managed-users/managed-user-dropdown-button.spec.tsx
View file

@ -139,4 +139,49 @@ describe('ManagedUserDropdownButton', function () {
cy.findByTestId('no-actions-available').should('exist')
})
})
describe('with managed group admin user', function () {
const user = {
_id: 'some-user',
email: 'some.user@example.com',
first_name: 'Some',
last_name: 'User',
invite: false,
last_active_at: new Date(),
enrollment: {
managedBy: 'some-group',
enrolledAt: new Date(),
},
isEntityAdmin: true,
}
beforeEach(function () {
cy.window().then(win => {
win.metaAttributesCache.set('ol-users', [user])
})
cy.mount(
<GroupMembersProvider>
<ManagedUserDropdownButton
user={user}
openOffboardingModalForUser={sinon.stub()}
groupId={subscriptionId}
setManagedUserAlert={sinon.stub()}
/>
</GroupMembersProvider>
)
})
it('should render the button', function () {
cy.get('#managed-user-dropdown-some\\.user\\@example\\.com').should(
'exist'
)
cy.get(`.action-btn`).should('exist')
})
it('should show the (empty) menu when the button is clicked', function () {
cy.get('.action-btn').click()
cy.findByTestId('no-actions-available').should('exist')
})
})
})