fix: fixed issue to update email cadence for account notification type

openedx · Nov 22, 2024 · 42342c2 · 42342c2
1 parent 5a5de29
commit 42342c2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/notification-preferences/NotificationPreferenceColumn.jsx b/src/notification-preferences/NotificationPreferenceColumn.jsx
@@ -28,17 +28,20 @@ const NotificationPreferenceColumn = ({ appId, channel, appPreference }) => {
 
   const onToggle = useCallback((event, notificationType) => {
     const { name: notificationChannel } = event.target;
-    const value = notificationChannel === 'email_cadence' ? event.target.innerText : event.target.checked;
+    const appNotificationPreference = appPreferences.find(x => x.id === notificationType);
+    const value = notificationChannel === 'email_cadence' && courseId ? event.target.innerText : event.target.checked;
+    const emailCadence = notificationChannel === 'email_cadence' ? event.target.innerText : appNotificationPreference.emailCadence;
 
     dispatch(updatePreferenceToggle(
       courseId,
       appId,
       notificationType,
       notificationChannel,
       value,
+      emailCadence,
     ));
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [appId]);
+  }, [appId, appPreferences]);
 
   const renderPreference = (preference) => (
     (preference?.coreNotificationTypes?.length > 0 || preference.id !== 'core') && (

diff --git a/src/notification-preferences/data/service.js b/src/notification-preferences/data/service.js
@@ -38,12 +38,14 @@ export const postPreferenceToggle = async (
   notificationType,
   notificationChannel,
   value,
+  emailCadence,
 ) => {
   const patchData = snakeCaseObject({
     notificationApp,
     notificationType: snakeCase(notificationType),
     notificationChannel,
     value,
+    emailCadence,
   });
   const url = `${getConfig().LMS_BASE_URL}/api/notifications/preferences/update-all/`;
   const { data } = await getAuthenticatedHttpClient().post(url, patchData);

diff --git a/src/notification-preferences/data/thunks.js b/src/notification-preferences/data/thunks.js
@@ -48,7 +48,7 @@ export const normalizeAccountPreferences = (originalData, updateInfo) => {
   );
 
   if (preferenceToUpdate) {
-    preferenceToUpdate[channel] = updatedValue;
+    preferenceToUpdate[camelCase(channel)] = updatedValue;
   }
 
   return originalData;
@@ -135,6 +135,7 @@ export const updatePreferenceToggle = (
   notificationType,
   notificationChannel,
   value,
+  emailCadence,
 ) => (
   async (dispatch) => {
     try {
@@ -161,6 +162,7 @@ export const updatePreferenceToggle = (
           notificationType,
           notificationChannel,
           value,
+          emailCadence,
         );
         dispatch(fetchNotificationPreferenceSuccess(courseId, camelCaseObject(data), true));
       }