feat: implement showPreferences flag in notification preferences

openedx · Jul 13, 2023 · a499aa4 · a499aa4
1 parent e720787
commit a499aa4
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/src/account-settings/AccountSettingsPage.jsx b/src/account-settings/AccountSettingsPage.jsx
@@ -50,6 +50,7 @@ import {
 import { fetchSiteLanguages } from './site-language';
 import CoachingToggle from './coaching/CoachingToggle';
 import DemographicsSection from './demographics/DemographicsSection';
+import { fetchCourseList } from '../notification-preferences/data/thunks';
 
 class AccountSettingsPage extends React.Component {
   constructor(props, context) {
@@ -79,6 +80,7 @@ class AccountSettingsPage extends React.Component {
   }
 
   componentDidMount() {
+    this.props.fetchCourseList();
     this.props.fetchSettings();
     this.props.fetchSiteLanguages();
     sendTrackingLogEvent('edx.user.settings.viewed', {
@@ -908,6 +910,7 @@ AccountSettingsPage.propTypes = {
   saveSettings: PropTypes.func.isRequired,
   fetchSettings: PropTypes.func.isRequired,
   beginNameChange: PropTypes.func.isRequired,
+  fetchCourseList: PropTypes.func.isRequired,
   tpaProviders: PropTypes.arrayOf(PropTypes.shape({
     connected: PropTypes.bool,
   })),
@@ -959,6 +962,7 @@ AccountSettingsPage.defaultProps = {
 };
 
 export default connect(accountSettingsPageSelector, {
+  fetchCourseList,
   fetchSettings,
   saveSettings,
   saveMultipleSettings,

diff --git a/src/account-settings/JumpNav.jsx b/src/account-settings/JumpNav.jsx
@@ -5,17 +5,20 @@ import { OpenInNew } from '@edx/paragon/icons';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';
+import { useSelector } from 'react-redux';
 import { NavHashLink } from 'react-router-hash-link';
 import Scrollspy from 'react-scrollspy';
 import { Link } from 'react-router-dom';
 import messages from './AccountSettingsPage.messages';
+import { selectShowPreferences } from '../notification-preferences/data/selectors';
 
 const JumpNav = ({
   intl,
   displayDemographicsLink,
 }) => {
   const stickToTop = useWindowSize().width > breakpoints.small.minWidth;
-  const showNotificationMenu = false;
+  const showPreferences = useSelector(selectShowPreferences());
+
   return (
     <div className={classNames('jump-nav px-2.25', { 'jump-nav-sm position-sticky pt-3': stickToTop })}>
       <Scrollspy
@@ -70,8 +73,7 @@ const JumpNav = ({
           </NavHashLink>
         </li>
       </Scrollspy>
-      {showNotificationMenu
-        && (
+      {showPreferences && (
         <>
           <hr />
           <Scrollspy
@@ -85,7 +87,7 @@ const JumpNav = ({
             </li>
           </Scrollspy>
         </>
-        )}
+      )}
     </div>
   );
 };

diff --git a/src/index.jsx b/src/index.jsx
@@ -25,7 +25,6 @@ import NotificationCourses from './notification-preferences/NotificationCourses'
 import NotificationPreferences from './notification-preferences/NotificationPreferences';
 
 subscribe(APP_READY, () => {
-  const allowNotificationRoutes = false;
   ReactDOM.render(
     <AppProvider store={configureStore()}>
       <Head />
@@ -35,8 +34,8 @@ subscribe(APP_READY, () => {
           <Header />
           <main className="flex-grow-1">
             <Switch>
-              {allowNotificationRoutes && (<Route path="/notifications/:courseId" component={NotificationPreferences} />)}
-              {allowNotificationRoutes && (<Route path="/notifications" component={NotificationCourses} />)}
+              <Route path="/notifications/:courseId" component={NotificationPreferences} />
+              <Route path="/notifications" component={NotificationCourses} />
               <Route path="/id-verification" component={IdVerificationPage} />
               <Route exact path="/" component={AccountSettingsPage} />
               <Route path="/notfound" component={NotFoundPage} />

diff --git a/src/notification-preferences/data/reducers.js b/src/notification-preferences/data/reducers.js
@@ -7,6 +7,7 @@ import {
 } from '../../constants';
 
 export const defaultState = {
+  showPreferences: false,
   courses: {
     status: IDLE_STATUS,
     courses: [],
@@ -42,6 +43,7 @@ const notificationPreferencesReducer = (state = defaultState, action = {}) => {
           courses: [...state.courses.courses, ...action.payload.courseList],
           pagination: action.payload.pagination,
         },
+        showPreferences: action.payload.showPreferences,
       };
     case Actions.FAILED_COURSE_LIST:
       return {

diff --git a/src/notification-preferences/data/selectors.js b/src/notification-preferences/data/selectors.js
@@ -57,3 +57,7 @@ export const selectSelectedCourseId = () => state => (
 export const selectPagination = () => state => (
   state.notificationPreferences.courses.pagination
 );
+
+export const selectShowPreferences = () => state => (
+  state.notificationPreferences.showPreferences
+);
diff --git a/src/notification-preferences/data/thunks.js b/src/notification-preferences/data/thunks.js
@@ -33,6 +33,7 @@ const normalizeCourses = (responseData) => {
   return {
     courseList,
     pagination,
+    showPreferences: responseData.showPreferences,
   };
 };