From 796a92841f808fa94711b616ed8f2ee04771d84e Mon Sep 17 00:00:00 2001
From: Alexandre Bourdin <abourdin@users.noreply.github.com>
Date: Thu, 24 Aug 2023 12:29:37 +0200
Subject: [PATCH] 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
---
 .../components/managed-users/managed-user-dropdown-button.tsx | 2 +-
 .../managed-users/managed-user-dropdown-button.spec.tsx       | 4 ++--
 services/web/types/group-management/user.ts                   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/services/web/frontend/js/features/group-management/components/managed-users/managed-user-dropdown-button.tsx b/services/web/frontend/js/features/group-management/components/managed-users/managed-user-dropdown-button.tsx
index a0df4ab5eb..acbb9c50b1 100644
--- a/services/web/frontend/js/features/group-management/components/managed-users/managed-user-dropdown-button.tsx
+++ b/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"
diff --git a/services/web/test/frontend/features/group-management/components/managed-users/managed-user-dropdown-button.spec.tsx b/services/web/test/frontend/features/group-management/components/managed-users/managed-user-dropdown-button.spec.tsx
index 1b010ca137..ae13ffe73d 100644
--- a/services/web/test/frontend/features/group-management/components/managed-users/managed-user-dropdown-button.spec.tsx
+++ b/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,
     }
 
diff --git a/services/web/types/group-management/user.ts b/services/web/types/group-management/user.ts
index 07697c6f1a..501044b850 100644
--- a/services/web/types/group-management/user.ts
+++ b/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 = {