github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 00:13:43 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14483 from overleaf/ab-fix-delete-user-button-check

Browse source 
[web] Show remove from group button instead of delete user if enrollment is {}

GitOrigin-RevId: d344b199be70d4661f25088962bd8158b443aed9
This commit is contained in:
Alexandre Bourdin 2023-08-24 12:29:37 +02:00 committed by Copybot
parent 9787edcc8e
commit 796a92841f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,7 +173,7 @@ export default function ManagedUserDropdownButton({
) : null} ) : null}
</MenuItemButton> </MenuItemButton>
) : null} ) : null}
{user.enrollment ? ( {user.enrollment?.managedBy ? (
<MenuItemButton <MenuItemButton
className="delete-user-action" className="delete-user-action"
data-testid="delete-user-action" data-testid="delete-user-action"

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

@ -61,7 +61,7 @@ describe('ManagedUserDropdownButton', function () {
last_name: 'User', last_name: 'User',
invite: true, invite: true,
last_active_at: new Date(), last_active_at: new Date(),
enrollment: undefined, enrollment: {},
isEntityAdmin: undefined, isEntityAdmin: undefined,
} }
@ -106,7 +106,7 @@ describe('ManagedUserDropdownButton', function () {
last_name: 'User', last_name: 'User',
invite: false, invite: false,
last_active_at: new Date(), last_active_at: new Date(),
enrollment: undefined, enrollment: {},
isEntityAdmin: true, isEntityAdmin: true,
} }

4
services/web/types/group-management/user.ts
View file

@ -1,6 +1,6 @@
export type UserEnrollment = { export type UserEnrollment = {
managedBy: string managedBy?: string
enrolledAt: Date enrolledAt?: Date
} }
export type User = { export type User = {