From 5381719477da2c50f3d75e10a47cbe1fcbe1b2cc Mon Sep 17 00:00:00 2001 From: sundasnoreen12 Date: Wed, 20 Nov 2024 23:52:19 +0500 Subject: [PATCH] fix: fixed test cases and label --- .../NotificationCoursesDropdown.jsx | 6 +++++- src/notification-preferences/data/reducers.test.js | 8 ++++---- src/notification-preferences/messages.js | 5 +++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/notification-preferences/NotificationCoursesDropdown.jsx b/src/notification-preferences/NotificationCoursesDropdown.jsx index e0eb575..22f3756 100644 --- a/src/notification-preferences/NotificationCoursesDropdown.jsx +++ b/src/notification-preferences/NotificationCoursesDropdown.jsx @@ -60,7 +60,11 @@ const NotificationCoursesDropdown = () => { ))} - {intl.formatMessage(messages.notificationDropdownApplies)} + + {selectedCourse?.name === 'Account' + ? intl.formatMessage(messages.notificationDropdownApplies) + : intl.formatMessage(messages.notificationCourseDropdownApplies)} + ) ); diff --git a/src/notification-preferences/data/reducers.test.js b/src/notification-preferences/data/reducers.test.js index 7340d38..697b7fe 100644 --- a/src/notification-preferences/data/reducers.test.js +++ b/src/notification-preferences/data/reducers.test.js @@ -44,7 +44,7 @@ describe('notification-preferences reducer', () => { ); expect(result.courses).toEqual({ status: SUCCESS_STATUS, - courses: [{ id: 'account', name: 'Account' }], + courses: [{ id: '', name: 'Account' }], pagination: data.pagination, }); }); @@ -60,7 +60,7 @@ describe('notification-preferences reducer', () => { expect(result.courses).toEqual({ status, courses: [{ - id: 'account', + id: '', name: 'Account', }], pagination: {}, @@ -83,7 +83,7 @@ describe('notification-preferences reducer', () => { expect(result.preferences).toEqual({ status: SUCCESS_STATUS, updatePreferenceStatus: SUCCESS_STATUS, - selectedCourse: 'account', + selectedCourse: '', ...preferenceData, }); }); @@ -98,7 +98,7 @@ describe('notification-preferences reducer', () => { ); expect(result.preferences).toEqual({ status, - selectedCourse: 'account', + selectedCourse: '', preferences: [], apps: [], nonEditable: {}, diff --git a/src/notification-preferences/messages.js b/src/notification-preferences/messages.js index e406a1e..1832faa 100644 --- a/src/notification-preferences/messages.js +++ b/src/notification-preferences/messages.js @@ -115,6 +115,11 @@ const messages = defineMessages({ defaultMessage: 'Applies to all courses', description: 'Dropdown applies to all courses', }, + notificationCourseDropdownApplies: { + id: 'notification.dropdown.course.applies', + defaultMessage: 'Overrides account-wide settings', + description: 'Dropdown applies to specific course', + }, }); export default messages;