Merge pull request #1049 from openedx/sundas/INF-1360

fix: fixed environment variable issue for email cadence
openedx · May 16, 2024 · 90da117 · 90da117
2 parents 16fb3a1 + 82c9e07
commit 90da117
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 14 deletions.
diff --git a/src/notification-preferences/EmailCadences.jsx b/src/notification-preferences/EmailCadences.jsx
@@ -9,7 +9,7 @@ import {
 } from '@openedx/paragon';
 
 import messages from './messages';
-import { EMAIL_CADENCE } from './data/constants';
+import EMAIL_CADENCE from './data/constants';
 
 const EmailCadences = ({
   email, onToggle, emailCadence, notificationType,

diff --git a/src/notification-preferences/NotificationPreferenceApp.jsx b/src/notification-preferences/NotificationPreferenceApp.jsx
@@ -12,7 +12,7 @@ import { useIsOnMobile } from '../hooks';
 import ToggleSwitch from './ToggleSwitch';
 import { LOADING_STATUS } from '../constants';
 import NotificationTypes from './NotificationTypes';
-import { NOTIFICATION_CHANNELS } from './data/constants';
+import { notificationChannels } from './data/utils';
 import { updateAppPreferenceToggle } from './data/thunks';
 import NotificationPreferenceColumn from './NotificationPreferenceColumn';
 import { selectPreferenceAppToggleValue, selectSelectedCourseId, selectUpdatePreferencesStatus } from './data/selectors';
@@ -24,6 +24,7 @@ const NotificationPreferenceApp = ({ appId }) => {
   const appToggle = useSelector(selectPreferenceAppToggleValue(appId));
   const updatePreferencesStatus = useSelector(selectUpdatePreferencesStatus());
   const mobileView = useIsOnMobile();
+  const NOTIFICATION_CHANNELS = notificationChannels();
 
   const onChangeAppSettings = useCallback((event) => {
     dispatch(updateAppPreferenceToggle(courseId, appId, event.target.checked));

diff --git a/src/notification-preferences/NotificationPreferenceColumn.jsx b/src/notification-preferences/NotificationPreferenceColumn.jsx
@@ -16,6 +16,7 @@ import { updateChannelPreferenceToggle, updatePreferenceToggle } from './data/th
 import {
   selectNonEditablePreferences, selectPreferencesOfApp, selectSelectedCourseId, selectUpdatePreferencesStatus,
 } from './data/selectors';
+import { notificationChannels, shouldHideAppPreferences } from './data/utils';
 
 const NotificationPreferenceColumn = ({ appId, channel, appPreference }) => {
   const dispatch = useDispatch();
@@ -25,6 +26,8 @@ const NotificationPreferenceColumn = ({ appId, channel, appPreference }) => {
   const nonEditable = useSelector(selectNonEditablePreferences(appId));
   const updatePreferencesStatus = useSelector(selectUpdatePreferencesStatus());
   const mobileView = useIsOnMobile();
+  const NOTIFICATION_CHANNELS = Object.values(notificationChannels());
+  const hideAppPreferences = shouldHideAppPreferences(appPreferences, appId) || false;
 
   const onChannelToggle = useCallback((event) => {
     const { id: notificationChannel } = event.target;
@@ -59,7 +62,7 @@ const NotificationPreferenceColumn = ({ appId, channel, appPreference }) => {
       className={classNames(
         'd-flex align-items-center justify-content-center mb-2 h-4.5 column-padding',
         {
-          'pr-0': channel === 'email',
+          'pr-0': channel === NOTIFICATION_CHANNELS[NOTIFICATION_CHANNELS.length - 1],
           'pl-0': channel === 'web' && mobileView,
         },
       )}
@@ -86,18 +89,20 @@ const NotificationPreferenceColumn = ({ appId, channel, appPreference }) => {
 
   return (
     <div className={classNames('d-flex flex-column border-right channel-column')}>
+      {!hideAppPreferences && (
       <NavItem
         id={channel}
         key={channel}
         role="button"
         onClick={onChannelToggle}
         className={classNames('mb-3 header-label column-padding', {
-          'pr-0': channel === 'email',
+          'pr-0': channel === NOTIFICATION_CHANNELS[NOTIFICATION_CHANNELS.length - 1],
           'pl-0': channel === 'web' && mobileView,
         })}
       >
         {intl.formatMessage(messages.notificationChannel, { text: channel })}
       </NavItem>
+      )}
       {appPreference
         ? renderPreference(appPreference)
         : appPreferences.map((preference) => (renderPreference(preference)))}

diff --git a/src/notification-preferences/NotificationTypes.jsx b/src/notification-preferences/NotificationTypes.jsx
@@ -9,18 +9,21 @@ import { Icon, OverlayTrigger, Tooltip } from '@openedx/paragon';
 
 import messages from './messages';
 import { useIsOnMobile } from '../hooks';
-import { NOTIFICATION_CHANNELS } from './data/constants';
+import { notificationChannels, shouldHideAppPreferences } from './data/utils';
+
 import { selectPreferencesOfApp } from './data/selectors';
 import NotificationPreferenceColumn from './NotificationPreferenceColumn';
 
 const NotificationTypes = ({ appId }) => {
   const intl = useIntl();
   const preferences = useSelector(selectPreferencesOfApp(appId));
   const mobileView = useIsOnMobile();
+  const NOTIFICATION_CHANNELS = notificationChannels();
+  const hideAppPreferences = shouldHideAppPreferences(preferences, appId) || false;
 
   return (
     <div className="d-flex flex-column mr-auto px-0">
-      {!mobileView && <span className="mb-3 header-label">{intl.formatMessage(messages.typeLabel)}</span>}
+      {!mobileView && !hideAppPreferences && <span className="mb-3 header-label">{intl.formatMessage(messages.typeLabel)}</span>}
       {preferences.map(preference => (
         (preference?.coreNotificationTypes?.length > 0 || preference.id !== 'core') && (
         <>

diff --git a/src/notification-preferences/data/constants.js b/src/notification-preferences/data/constants.js
@@ -1,10 +1,8 @@
-import showEmailChannel from './utils';
-
-export const NOTIFICATION_CHANNELS = showEmailChannel();
-
-export const EMAIL_CADENCE = {
+const EMAIL_CADENCE = {
   DAILY: 'Daily',
   WEEKLY: 'Weekly',
   IMMEDIATELY: 'Immediately',
   NEVER: 'Never',
 };
+
+export default EMAIL_CADENCE;
diff --git a/src/notification-preferences/data/thunks.js b/src/notification-preferences/data/thunks.js
@@ -1,5 +1,5 @@
 import { camelCaseObject } from '@edx/frontend-platform';
-import { EMAIL_CADENCE } from './constants';
+import EMAIL_CADENCE from './constants';
 import {
   fetchCourseListSuccess,
   fetchCourseListFetching,

diff --git a/src/notification-preferences/data/utils.js b/src/notification-preferences/data/utils.js
@@ -1,5 +1,15 @@
 import { getConfig } from '@edx/frontend-platform';
 
-const showEmailChannel = () => ({ WEB: 'web', ...(getConfig().SHOW_EMAIL_CHANNEL === 'true' && { EMAIL: 'email' }) });
+export const notificationChannels = () => ({ WEB: 'web', ...(getConfig().SHOW_EMAIL_CHANNEL === 'true' && { EMAIL: 'email' }) });
 
-export default showEmailChannel;
+export const shouldHideAppPreferences = (preferences, appId) => {
+  const appPreferences = preferences.filter(pref => pref.appId === appId);
+
+  if (appPreferences.length !== 1) {
+    return false;
+  }
+
+  const firstPreference = appPreferences[0];
+
+  return firstPreference?.id === 'core' && (!firstPreference.coreNotificationTypes?.length);
+};