From b8a11fc62fa5288aa6df66c560c2ce67e1ef2766 Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@users.noreply.github.com>
Date: Wed, 30 Apr 2025 15:13:19 +0200
Subject: [PATCH] Merge pull request #25008 from
 overleaf/msm-missing-close-handler-modal

[web] Fix `cancel` button in `UnlinkUserModal`.

GitOrigin-RevId: 5b84c9593ce59c6da9aae9cf4f8e763151202d34
---
 .../components/members-table/unlink-user-modal.tsx       | 6 +++++-
 .../components/members-table/unlink-user-modal.test.tsx  | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/js/features/group-management/components/members-table/unlink-user-modal.tsx b/services/web/frontend/js/features/group-management/components/members-table/unlink-user-modal.tsx
index f63bda765e..67e63db370 100644
--- a/services/web/frontend/js/features/group-management/components/members-table/unlink-user-modal.tsx
+++ b/services/web/frontend/js/features/group-management/components/members-table/unlink-user-modal.tsx
@@ -108,7 +108,11 @@ export default function UnlinkUserModal({
         </p>
       </OLModalBody>
       <OLModalFooter>
-        <OLButton variant="secondary" disabled={unlinkInFlight}>
+        <OLButton
+          variant="secondary"
+          disabled={unlinkInFlight}
+          onClick={onClose}
+        >
           {t('cancel')}
         </OLButton>
         <OLButton
diff --git a/services/web/test/frontend/features/group-management/components/members-table/unlink-user-modal.test.tsx b/services/web/test/frontend/features/group-management/components/members-table/unlink-user-modal.test.tsx
index c52e83a00e..bb0c946674 100644
--- a/services/web/test/frontend/features/group-management/components/members-table/unlink-user-modal.test.tsx
+++ b/services/web/test/frontend/features/group-management/components/members-table/unlink-user-modal.test.tsx
@@ -58,6 +58,15 @@ describe('<UnlinkUserModal />', function () {
     await waitFor(() => expect(defaultProps.onClose).to.have.been.called)
   })
 
+  it('closes the modal on cancelling', async function () {
+    renderWithContext(<UnlinkUserModal {...defaultProps} />)
+
+    const cancelButton = screen.getByRole('button', { name: 'Cancel' })
+    fireEvent.click(cancelButton)
+
+    await waitFor(() => expect(defaultProps.onClose).to.have.been.called)
+  })
+
   it('handles errors', async function () {
     fetchMock.post(`/manage/groups/${groupId}/unlink-user/${userId}`, 500)