From c8dbf5993fad16ff351d8d17398cbca2bdab43ad Mon Sep 17 00:00:00 2001 From: Cyril Nxumalo <80963114+zwidekalanga@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:30:04 +0200 Subject: [PATCH] fix: Making sure email setting modal opens after being closed. (#1147) --- .../course-enrollments/course-cards/BaseCourseCard.jsx | 8 ++------ .../course-cards/tests/BaseCourseCard.test.jsx | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/components/dashboard/main-content/course-enrollments/course-cards/BaseCourseCard.jsx b/src/components/dashboard/main-content/course-enrollments/course-cards/BaseCourseCard.jsx index e18ea75a99..874803e4fd 100644 --- a/src/components/dashboard/main-content/course-enrollments/course-cards/BaseCourseCard.jsx +++ b/src/components/dashboard/main-content/course-enrollments/course-cards/BaseCourseCard.jsx @@ -121,7 +121,7 @@ export const getScreenReaderText = (str) => ( ); const BaseCourseCard = ({ - hasEmailsEnabled: defaultHasEmailsEnabled, + hasEmailsEnabled, title, dropdownMenuItems: customDropdownMenuItem, canUnenroll, @@ -148,7 +148,6 @@ const BaseCourseCard = ({ const intl = useIntl(); const { LEARNER_SUPPORT_PACED_COURSE_MODE_URL } = getConfig(); const { data: enterpriseCustomer } = useEnterpriseCustomer(); - const [hasEmailsEnabled, setHasEmailsEnabled] = useState(defaultHasEmailsEnabled); const [emailSettingsModal, setEmailSettingsModal] = useState({ open: false, options: {}, @@ -267,11 +266,8 @@ const BaseCourseCard = ({ })); }; - const handleEmailSettingsModalOnClose = (newValue) => { + const handleEmailSettingsModalOnClose = () => { resetModals(); - if (hasEmailsEnabled !== undefined) { - setHasEmailsEnabled(newValue); - } }; const handleUnenrollModalOnClose = () => { diff --git a/src/components/dashboard/main-content/course-enrollments/course-cards/tests/BaseCourseCard.test.jsx b/src/components/dashboard/main-content/course-enrollments/course-cards/tests/BaseCourseCard.test.jsx index 0500bf6707..bcc5a64a30 100644 --- a/src/components/dashboard/main-content/course-enrollments/course-cards/tests/BaseCourseCard.test.jsx +++ b/src/components/dashboard/main-content/course-enrollments/course-cards/tests/BaseCourseCard.test.jsx @@ -80,7 +80,8 @@ describe('', () => { it('handles email settings modal close/cancel', async () => { userEvent.click(screen.getByTestId('modal-footer-btn', { name: 'Close' })); await waitFor(() => { - expect(screen.queryByRole('dialog')).not.toBeInTheDocument(); + const dialogElement = screen.getByTestId('modal'); + expect(dialogElement).not.toHaveClass('show'); }); }); });