Procházet zdrojové kódy

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

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

GitOrigin-RevId: d344b199be70d4661f25088962bd8158b443aed9
Alexandre Bourdin před 3 roky
rodič
revize
796a92841f

+ 1 - 1
services/web/frontend/js/features/group-management/components/managed-users/managed-user-dropdown-button.tsx

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

+ 2 - 2
services/web/test/frontend/features/group-management/components/managed-users/managed-user-dropdown-button.spec.tsx

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

+ 2 - 2
services/web/types/group-management/user.ts

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