Fix stories spurious 404 errors, allow stories to be configurable per-course

src/commons/application/actions/__tests__/SessionActions.ts

@@ -228,6 +228,7 @@ test('setCourseConfiguration generates correct action object', () => {
     enableGame: true,
     enableAchievements: true,
     enableSourcecast: true,
+    enableStories: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
@@ -612,6 +613,7 @@ test('updateCourseConfig generates correct action object', () => {
     enableGame: true,
     enableAchievements: true,
     enableSourcecast: true,
+    enableStories: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',

src/commons/application/reducers/__tests__/SessionReducer.ts

@@ -96,6 +96,7 @@ test('SET_COURSE_CONFIGURATION works correctly', () => {
     enableGame: true,
     enableAchievements: true,
     enableSourcecast: true,
+    enableStories: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',

src/commons/application/types/SessionTypes.ts

@@ -103,6 +103,7 @@ export type SessionState = {
   readonly enableGame?: boolean;
   readonly enableAchievements?: boolean;
   readonly enableSourcecast?: boolean;
+  readonly enableStories?: boolean;
   readonly sourceChapter?: number;
   readonly sourceVariant?: Variant;
   readonly moduleHelpText?: string;
@@ -168,6 +169,7 @@ export type CourseConfiguration = {
   enableGame: boolean;
   enableAchievements: boolean;
   enableSourcecast: boolean;
+  enableStories: boolean;
   sourceChapter: Chapter;
   sourceVariant: Variant;
   moduleHelpText: string;

src/commons/dropdown/DropdownCreateCourse.tsx

@@ -38,6 +38,7 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
     enableGame: true,
     enableAchievements: true,
     enableSourcecast: true,
+    enableStories: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: ''
@@ -222,6 +223,18 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
                 })
               }
             />
+
+            <Switch
+              checked={courseConfig.enableStories}
+              inline
+              label="Enable Stories"
+              onChange={e =>
+                setCourseConfig({
+                  ...courseConfig,
+                  enableStories: (e.target as HTMLInputElement).checked
+                })
+              }
+            />
           </div>
         </div>
         <div>

src/commons/mocks/UserMocks.ts

@@ -130,6 +130,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     enableGame: false,
     enableAchievements: true,
     enableSourcecast: true,
+    enableStories: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: '',
@@ -142,6 +143,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     enableGame: false,
     enableAchievements: false,
     enableSourcecast: false,
+    enableStories: false,
     sourceChapter: Chapter.SOURCE_2,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help Text!',

src/commons/navigationBar/NavigationBar.tsx

@@ -55,6 +55,7 @@ const NavigationBar: React.FC = () => {
     courseShortName,
     enableAchievements,
     enableSourcecast,
+    enableStories,
     assessmentConfigurations
   } = useSession();
   const assessmentTypes = useMemo(
@@ -180,14 +181,21 @@ const NavigationBar: React.FC = () => {
         disabled: !(isEnrolledInACourse && enableAchievements)
       },
       {
-        to: '/stories',
+        to: `/courses/${courseId}/stories`,
         icon: IconNames.GIT_REPO,
         text: 'Stories',
-        // TODO: Enable when stories are implemented
-        disabled: true && !isLoggedIn
+        // TODO: Enable for public deployment
+        disabled: !(isEnrolledInACourse && enableStories)
       }
     ];
-  }, [isLoggedIn, isEnrolledInACourse, courseId, enableSourcecast, enableAchievements]);
+  }, [
+    courseId,
+    isEnrolledInACourse,
+    enableSourcecast,
+    enableStories,
+    isLoggedIn,
+    enableAchievements
+  ]);
 
   const fullAcademyMobileNavbarLeftAdditionalInfo = useMemo(
     () => getAcademyNavbarRightInfo({ isEnrolledInACourse, courseId, role }),
@@ -359,14 +367,14 @@ const playgroundOnlyNavbarLeftInfo: NavbarEntryInfo[] = [
     to: '/sicpjs',
     icon: IconNames.BOOK,
     text: 'SICP JS'
-  },
-  {
-    to: '/stories',
-    icon: IconNames.GIT_REPO,
-    text: 'Stories',
-    // TODO: Enable when stories are implemented
-    disabled: true
   }
+  // {
+  //   to: '/stories',
+  //   icon: IconNames.GIT_REPO,
+  //   text: 'Stories',
+  //   // TODO: Enable for public deployment
+  //   disabled: true
+  // }
 ];
 
 export const renderNavlinksFromInfo = (

src/commons/navigationBar/__tests__/__snapshots__/NavigationBar.tsx.snap

@@ -347,20 +347,6 @@ exports[`NavigationBar Renders correctly for student with course 1`] = `
           Achievements
         </div>
       </NavLink>
-      <NavLink
-        className={[Function]}
-        title="Stories"
-        to="/stories"
-      >
-        <Blueprint4.Icon
-          icon="git-repo"
-        />
-        <div
-          className=""
-        >
-          Stories
-        </div>
-      </NavLink>
     </Blueprint4.NavbarGroup>
     <Blueprint4.NavbarGroup
       align="right"
@@ -518,20 +504,6 @@ exports[`NavigationBar Renders correctly for student without course 1`] = `
           SICP JS
         </div>
       </NavLink>
-      <NavLink
-        className={[Function]}
-        title="Stories"
-        to="/stories"
-      >
-        <Blueprint4.Icon
-          icon="git-repo"
-        />
-        <div
-          className=""
-        >
-          Stories
-        </div>
-      </NavLink>
     </Blueprint4.NavbarGroup>
     <Blueprint4.NavbarGroup
       align="right"

src/commons/sagas/BackendSaga.ts

@@ -199,8 +199,12 @@ function* BackendSaga(): SagaIterator {
       yield put(actions.setCourseConfiguration(courseConfiguration));
       yield put(actions.setAssessmentConfigurations(assessmentConfigurations));
 
-      yield put(actions.getStoriesUser());
-      // TODO: Fetch associated stories group ID
+      if (courseConfiguration.enableStories) {
+        yield put(actions.getStoriesUser());
+        // TODO: Fetch associated stories group ID
+      } else {
+        yield put(actions.clearStoriesUserAndGroup());
+      }
     }
     /**
      * NOTE: Navigation logic is now handled in <Login /> component.
@@ -245,8 +249,12 @@ function* BackendSaga(): SagaIterator {
         yield put(actions.setCourseConfiguration(courseConfiguration));
         yield put(actions.setAssessmentConfigurations(assessmentConfigurations));
 
-        yield put(actions.getStoriesUser());
-        // TODO: Fetch associated stories group ID
+        if (courseConfiguration.enableStories) {
+          yield put(actions.getStoriesUser());
+          // TODO: Fetch associated stories group ID
+        } else {
+          yield put(actions.clearStoriesUserAndGroup());
+        }
       }
     }
   );
@@ -257,8 +265,12 @@ function* BackendSaga(): SagaIterator {
     if (config) {
       yield put(actions.setCourseConfiguration(config));
 
-      yield put(actions.getStoriesUser());
-      // TODO: Fetch associated stories group ID
+      if (config.enableStories) {
+        yield put(actions.getStoriesUser());
+        // TODO: Fetch associated stories group ID
+      } else {
+        yield put(actions.clearStoriesUserAndGroup());
+      }
     }
   });
 
@@ -724,8 +736,12 @@ function* BackendSaga(): SagaIterator {
       yield put(actions.setAssessmentConfigurations(assessmentConfigurations));
       yield put(actions.setCourseRegistration(courseRegistration));
 
-      yield put(actions.getStoriesUser());
-      // TODO: Fetch associated stories group ID
+      if (courseConfiguration.enableStories) {
+        yield put(actions.getStoriesUser());
+        // TODO: Fetch associated stories group ID
+      } else {
+        yield put(actions.clearStoriesUserAndGroup());
+      }
 
       yield call(showSuccessMessage, `Switched to ${courseConfiguration.courseName}!`, 5000);
     }
@@ -742,6 +758,13 @@ function* BackendSaga(): SagaIterator {
         return yield handleResponseError(resp);
       }
 
+      if (courseConfig.enableStories) {
+        yield put(actions.getStoriesUser());
+        // TODO: Fetch associated stories group ID
+      } else {
+        yield put(actions.clearStoriesUserAndGroup());
+      }
+
       yield put(actions.setCourseConfiguration(courseConfig));
       yield call(showSuccessMessage, 'Updated successfully!', 1000);
     }
@@ -945,6 +968,13 @@ function* BackendSaga(): SagaIterator {
     yield put(actions.setUser(user));
     yield put(actions.setCourseRegistration({ role: Role.Student }));
 
+    if (courseConfiguration.enableStories) {
+      yield put(actions.getStoriesUser());
+      // TODO: Fetch associated stories group ID
+    } else {
+      yield put(actions.clearStoriesUserAndGroup());
+    }
+
     const placeholderAssessmentConfig = [
       {
         type: 'Missions',

src/commons/sagas/__tests__/BackendSaga.ts

@@ -173,6 +173,7 @@ const mockCourseConfiguration1: CourseConfiguration = {
   enableGame: true,
   enableAchievements: true,
   enableSourcecast: true,
+  enableStories: false,
   sourceChapter: Chapter.SOURCE_1,
   sourceVariant: Variant.DEFAULT,
   moduleHelpText: 'Help text',
@@ -203,6 +204,7 @@ const mockCourseConfiguration2: CourseConfiguration = {
   enableGame: true,
   enableAchievements: true,
   enableSourcecast: true,
+  enableStories: false,
   sourceChapter: Chapter.SOURCE_4,
   sourceVariant: Variant.DEFAULT,
   moduleHelpText: 'Help text',
@@ -887,6 +889,7 @@ describe('Test UPDATE_COURSE_CONFIG action', () => {
     enableGame: false,
     enableAchievements: false,
     enableSourcecast: false,
+    enableStories: false,
     sourceChapter: Chapter.SOURCE_4,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help',
@@ -984,6 +987,7 @@ describe('Test CREATE_COURSE action', () => {
     enableGame: true,
     enableAchievements: true,
     enableSourcecast: true,
+    enableStories: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help Text'

src/features/academy/__tests__/AcademyActions.ts

@@ -31,6 +31,7 @@ test('createCourse generates correct action object', () => {
     enableGame: true,
     enableAchievements: true,
     enableSourcecast: true,
+    enableStories: false,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help Text'

src/features/stories/StoriesActions.ts

@@ -4,6 +4,7 @@ import { action } from 'typesafe-actions';
 
 import {
   ADD_STORY_ENV,
+  CLEAR_STORIES_USER_AND_GROUP,
   CLEAR_STORY_ENV,
   CREATE_STORY,
   DELETE_STORY,
@@ -78,3 +79,5 @@ export const setCurrentStoriesGroup = (
   name: string | undefined,
   role: StoriesRole | undefined
 ) => action(SET_CURRENT_STORIES_GROUP, { id, name, role });
+// Helper/wrapper actions
+export const clearStoriesUserAndGroup = () => action(CLEAR_STORIES_USER_AND_GROUP);

src/features/stories/StoriesReducer.ts

@@ -13,6 +13,7 @@ import { SourceActionType } from '../../commons/utils/ActionsHelper';
 import { DEFAULT_ENV } from './storiesComponents/UserBlogContent';
 import {
   ADD_STORY_ENV,
+  CLEAR_STORIES_USER_AND_GROUP,
   CLEAR_STORY_ENV,
   EVAL_STORY,
   EVAL_STORY_ERROR,
@@ -212,6 +213,15 @@ export const StoriesReducer: Reducer<StoriesState> = (
         ...state,
         currentStory: action.payload
       };
+    case CLEAR_STORIES_USER_AND_GROUP:
+      return {
+        ...state,
+        userId: undefined,
+        userName: undefined,
+        groupId: undefined,
+        groupName: undefined,
+        role: undefined
+      };
     case SET_CURRENT_STORIES_USER:
       return {
         ...state,

src/features/stories/StoriesTypes.ts

@@ -21,6 +21,7 @@ export const SAVE_STORY = 'SAVE_STORY';
 export const DELETE_STORY = 'DELETE_STORY';
 // Auth-related actions
 export const GET_STORIES_USER = 'GET_STORIES_USER';
+export const CLEAR_STORIES_USER_AND_GROUP = 'CLEAR_STORIES_USER_AND_GROUP';
 // TODO: Investigate possibility of combining the two actions
 export const SET_CURRENT_STORIES_USER = 'SET_CURRENT_STORIES_USER';
 export const SET_CURRENT_STORIES_GROUP = 'SET_CURRENT_STORIES_GROUP';

src/pages/__tests__/localStorage.test.ts

@@ -20,6 +20,7 @@ const mockShortDefaultState: SavedState = {
     enableGame: defaultState.session.enableGame,
     enableAchievements: defaultState.session.enableAchievements,
     enableSourcecast: defaultState.session.enableSourcecast,
+    enableStories: defaultState.session.enableStories,
     moduleHelpText: defaultState.session.moduleHelpText,
     assetsPrefix: defaultState.session.assetsPrefix,
     assessmentConfigurations: defaultState.session.assessmentConfigurations

src/pages/academy/adminPanel/AdminPanel.tsx

@@ -45,6 +45,7 @@ const AdminPanel: React.FC = () => {
     enableGame: true,
     enableAchievements: true,
     enableSourcecast: true,
+    enableStories: false,
     moduleHelpText: ''
   });
 
@@ -84,6 +85,7 @@ const AdminPanel: React.FC = () => {
       enableGame: session.enableGame,
       enableAchievements: session.enableAchievements,
       enableSourcecast: session.enableSourcecast,
+      enableStories: session.enableStories,
       moduleHelpText: session.moduleHelpText
     });