From 406fdb68d4534607590075e311fe5959815b9e95 Mon Sep 17 00:00:00 2001
From: chrystalquek <chrystalquek@yahoo.com.sg>
Date: Wed, 8 Apr 2020 00:00:09 +0800
Subject: [PATCH 1/8] Added Dropdown to change Default Source version

---
 src/actions/actionTypes.ts                |  3 +
 src/actions/workspaces.ts                 | 11 ++++
 src/components/Playground.tsx             |  2 +
 src/components/__tests__/Playground.tsx   |  3 +-
 src/components/academy/DefaultChapter.tsx | 70 +++++++++++++++++++++++
 src/components/academy/NavigationBar.tsx  |  5 ++
 src/containers/DefaultChapterContainer.ts | 31 ++++++++++
 src/containers/PlaygroundContainer.ts     |  4 +-
 src/reducers/workspaces.ts                | 15 ++++-
 src/sagas/backend.ts                      | 44 ++++++++++++++
 src/sagas/requests.ts                     | 34 +++++++++++
 11 files changed, 219 insertions(+), 3 deletions(-)
 create mode 100644 src/components/academy/DefaultChapter.tsx
 create mode 100644 src/containers/DefaultChapterContainer.ts

diff --git a/src/actions/actionTypes.ts b/src/actions/actionTypes.ts
index 1329731088..fe4dba8281 100755
--- a/src/actions/actionTypes.ts
+++ b/src/actions/actionTypes.ts
@@ -58,6 +58,9 @@ export const UPDATE_EDITOR_BREAKPOINTS = 'UPDATE_EDITOR_BREAKPOINTS';
 export const UPDATE_HAS_UNSAVED_CHANGES = 'UPDATE_HAS_UNSAVED_CHANGES';
 export const UPDATE_REPL_VALUE = 'UPDATE_REPL_VALUE';
 export const UPDATE_WORKSPACE = 'UPDATE_WORKSPACE';
+export const FETCH_CHAPTER = 'FETCH_CHAPTER';
+export const UPDATE_CHAPTER = 'UPDATE_CHAPTER';
+export const CHANGE_CHAPTER = 'CHANGE_CHAPTER';
 
 /** Collab Editing */
 export const INIT_INVITE = 'INIT_INVITE';
diff --git a/src/actions/workspaces.ts b/src/actions/workspaces.ts
index b97f179ffd..c1759023b7 100755
--- a/src/actions/workspaces.ts
+++ b/src/actions/workspaces.ts
@@ -209,3 +209,14 @@ export const updateHasUnsavedChanges = (
     workspaceLocation,
     hasUnsavedChanges
   });
+
+export const fetchChapter = () => 
+  action(actionTypes.FETCH_CHAPTER);
+
+// update database
+export const changeChapter = (chapterno: number) =>
+  action(actionTypes.CHANGE_CHAPTER, { chapterno });
+
+// update state
+export const updateChapter = (chapterno: number) =>
+  action(actionTypes.UPDATE_CHAPTER, chapterno);
diff --git a/src/components/Playground.tsx b/src/components/Playground.tsx
index 21442dc84f..5384b7ecc8 100755
--- a/src/components/Playground.tsx
+++ b/src/components/Playground.tsx
@@ -104,6 +104,7 @@ export interface IDispatchProps {
   handleDebuggerResume: () => void;
   handleDebuggerReset: () => void;
   handleToggleEditorAutorun: () => void;
+  handleFetchChapter: () => void;
 }
 
 type PlaygroundState = {
@@ -125,6 +126,7 @@ class Playground extends React.Component<IPlaygroundProps, PlaygroundState> {
     };
     this.handlers.goGreen = this.toggleIsGreen.bind(this);
     (window as any).thePlayground = this;
+    this.props.handleFetchChapter();
   }
 
   public render() {
diff --git a/src/components/__tests__/Playground.tsx b/src/components/__tests__/Playground.tsx
index 05897cd15e..941673bbbe 100755
--- a/src/components/__tests__/Playground.tsx
+++ b/src/components/__tests__/Playground.tsx
@@ -54,7 +54,8 @@ const baseProps = {
   handleUsingSubst: (usingSubst: boolean) => {},
   handleDebuggerPause: () => {},
   handleDebuggerResume: () => {},
-  handleDebuggerReset: () => {}
+  handleDebuggerReset: () => {},
+  handleFetchChapter: () => {}
 };
 
 const testValueProps: IPlaygroundProps = {
diff --git a/src/components/academy/DefaultChapter.tsx b/src/components/academy/DefaultChapter.tsx
new file mode 100644
index 0000000000..7630447f81
--- /dev/null
+++ b/src/components/academy/DefaultChapter.tsx
@@ -0,0 +1,70 @@
+import { Button, Classes, MenuItem } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import { ItemRenderer , Select} from '@blueprintjs/select';
+// 
+import * as React from 'react';
+
+import { RouteComponentProps } from 'react-router';
+
+import { sourceChapters } from '../../reducers/states';
+
+export interface IChapterProps extends IDispatchProps, IStateProps, RouteComponentProps<{}> {}
+
+export type IDispatchProps = {
+  handleFetchChapter: () => void;
+  handleUpdateChapter: (chapter: IChapter) => void;
+  handleChapterSelect?: (i: IChapter, e: React.ChangeEvent<HTMLSelectElement>) => void;
+};
+
+export interface IStateProps {
+  sourceChapter: number;
+}
+
+export interface IChapter {
+  chapter: number;
+  displayName: string;
+}
+
+// class DefaultChapter extends React.Component<IChapterProps, {}> {
+export function DefaultChapter(props: IChapterProps) {
+  props.handleFetchChapter();
+  const styliseChapter = (chap: number) => `Source \xa7${chap}`;
+  const chapters = sourceChapters.map(chap => ({
+    displayName: styliseChapter(chap),
+    chapter: chap
+  }));
+
+  const chapterRenderer: ItemRenderer<IChapter> = (chap, { handleClick }) => (
+    <MenuItem
+      active={false}
+      key={chap.chapter}
+      onClick={handleClick}
+      text={chap.displayName}
+    />
+  );
+
+  const ChapterSelectComponent = Select.ofType<IChapter>();
+
+  const chapSelect = (
+    currentChap: number,
+    handleSelect = (i: IChapter) => {}
+  ) => (
+    <ChapterSelectComponent
+      className={Classes.MINIMAL}
+      items={chapters}
+      onItemSelect={handleSelect}
+      itemRenderer={chapterRenderer}
+      filterable={false}
+    >
+      <Button
+        className={Classes.MINIMAL}
+        text={styliseChapter(currentChap)}
+        rightIcon={IconNames.DOUBLE_CARET_VERTICAL}
+      />
+     </ChapterSelectComponent>
+  );
+  
+    return <div> {chapSelect(props.sourceChapter, props.handleUpdateChapter)} </div>;
+
+  
+}
diff --git a/src/components/academy/NavigationBar.tsx b/src/components/academy/NavigationBar.tsx
index cbd9b8b740..1afe91aa00 100644
--- a/src/components/academy/NavigationBar.tsx
+++ b/src/components/academy/NavigationBar.tsx
@@ -11,6 +11,8 @@ import { AssessmentCategories } from '../assessment/assessmentShape';
 import NotificationBadge from '../../containers/notification/NotificationBadge';
 import { filterNotificationsByType } from '../notification/NotificationHelpers';
 
+import DefaultChapter from '../../containers/DefaultChapterContainer';
+
 type OwnProps = {
   role: Role;
 };
@@ -81,6 +83,9 @@ const NavigationBar: React.SFC<OwnProps> = props => (
     </NavbarGroup>
     {props.role === Role.Admin || props.role === Role.Staff ? (
       <NavbarGroup align={Alignment.RIGHT}>
+
+        <DefaultChapter/>
+
         <NavLink
           to={'/academy/sourcereel'}
           activeClassName={Classes.ACTIVE}
diff --git a/src/containers/DefaultChapterContainer.ts b/src/containers/DefaultChapterContainer.ts
new file mode 100644
index 0000000000..5bd5a6ce66
--- /dev/null
+++ b/src/containers/DefaultChapterContainer.ts
@@ -0,0 +1,31 @@
+import { connect, MapDispatchToProps, MapStateToProps } from 'react-redux';
+import { withRouter } from 'react-router';
+import { bindActionCreators, Dispatch } from 'redux';
+
+import { changeChapter, fetchChapter } from '../actions';
+
+import { DefaultChapter, IDispatchProps, IStateProps } from '../components/academy/DefaultChapter';
+import { IChapter } from '../components/workspace/controlBar';
+import { IState } from '../reducers/states';
+
+
+const mapStateToProps: MapStateToProps<IStateProps, {}, IState> = state => ({
+  sourceChapter: state.workspaces.playground.context.chapter
+});
+
+const mapDispatchToProps: MapDispatchToProps<IDispatchProps, {}> = (dispatch: Dispatch<any>) =>
+  bindActionCreators(
+    {
+      handleFetchChapter: () => fetchChapter(),
+      handleUpdateChapter: (chapter: IChapter) => changeChapter(chapter.chapter),
+     
+    },
+    dispatch
+  );
+
+export default withRouter(
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(DefaultChapter)
+);
diff --git a/src/containers/PlaygroundContainer.ts b/src/containers/PlaygroundContainer.ts
index 5d2826db87..f3d831710f 100755
--- a/src/containers/PlaygroundContainer.ts
+++ b/src/containers/PlaygroundContainer.ts
@@ -18,6 +18,7 @@ import {
   evalEditor,
   evalRepl,
   externalLibrarySelect,
+  fetchChapter,
   finishInvite,
   generateLzString,
   initInvite,
@@ -104,7 +105,8 @@ const mapDispatchToProps: MapDispatchToProps<IDispatchProps, {}> = (dispatch: Di
       handleUsingSubst: (usingSubst: boolean) => toggleUsingSubst(usingSubst),
       handleDebuggerPause: () => beginDebuggerPause(workspaceLocation),
       handleDebuggerResume: () => debuggerResume(workspaceLocation),
-      handleDebuggerReset: () => debuggerReset(workspaceLocation)
+      handleDebuggerReset: () => debuggerReset(workspaceLocation),
+      handleFetchChapter: () => fetchChapter()
     },
     dispatch
   );
diff --git a/src/reducers/workspaces.ts b/src/reducers/workspaces.ts
index bf70d94b96..078cfdbeca 100755
--- a/src/reducers/workspaces.ts
+++ b/src/reducers/workspaces.ts
@@ -38,12 +38,13 @@ import {
   SET_WEBSOCKET_STATUS,
   TOGGLE_EDITOR_AUTORUN,
   UPDATE_ACTIVE_TAB,
+  UPDATE_CHAPTER,
   UPDATE_CURRENT_ASSESSMENT_ID,
   UPDATE_CURRENT_SUBMISSION_ID,
   UPDATE_EDITOR_VALUE,
   UPDATE_HAS_UNSAVED_CHANGES,
   UPDATE_REPL_VALUE,
-  UPDATE_WORKSPACE
+  UPDATE_WORKSPACE,
 } from '../actions/actionTypes';
 import * as collabActions from '../actions/collabEditing';
 import { logOut } from '../actions/commons';
@@ -655,6 +656,18 @@ export const reducer: Reducer<IWorkspaceManagerState> = (
           hasUnsavedChanges: action.payload.hasUnsavedChanges
         }
       };
+    case UPDATE_CHAPTER:
+      return {
+        ...state,
+        playground: {
+          ...state.playground,
+          context: {
+            ...state.playground.context,
+            chapter: action.payload
+          }
+        }
+      };
+  
     default:
       return state;
   }
diff --git a/src/sagas/backend.ts b/src/sagas/backend.ts
index f7df616127..5882676a7e 100644
--- a/src/sagas/backend.ts
+++ b/src/sagas/backend.ts
@@ -555,6 +555,50 @@ function* backendSaga(): SagaIterator {
     yield put(actions.fetchMaterialIndex(parentId));
     yield call(showSuccessMessage, 'Deleted successfully!', 1000);
   });
+
+
+  yield takeEvery(actionTypes.FETCH_CHAPTER, function*() {
+    const tokens = yield select((state: IState) => ({
+      accessToken: state.session.accessToken,
+      refreshToken: state.session.refreshToken
+    }));
+
+    if (!tokens.accessToken) {
+      return;
+    }
+
+    const chapter = yield call(request.fetchChapter, tokens);
+    const chap = chapter.chapter.chapterno;
+
+    if (chap) {
+      yield put(actions.updateChapter(chap));
+    }
+  });
+
+  yield takeEvery(actionTypes.CHANGE_CHAPTER, function*(
+    action: ReturnType<typeof actions.changeChapter>
+  ) {
+    const tokens = yield select((state: IState) => ({
+      accessToken: state.session.accessToken,
+      refreshToken: state.session.refreshToken
+    }));
+
+    const chap = action.payload.chapterno;
+    const resp: Response = yield request.changeChapter(chap, tokens);
+
+    if (!resp || !resp.ok) {
+      yield request.handleResponseError(resp);
+      return;
+    }
+
+    yield put(actions.updateChapter(chap));
+    yield call(showSuccessMessage, 'Updated successfully!', 1000);
+  });
+
 }
 
+
+
+
+
 export default backendSaga;
diff --git a/src/sagas/requests.ts b/src/sagas/requests.ts
index 9899982ab6..cc8ad08280 100644
--- a/src/sagas/requests.ts
+++ b/src/sagas/requests.ts
@@ -593,6 +593,40 @@ export const postMaterialFolder = async (title: string, parentId: number, tokens
   return resp;
 };
 
+/**
+ * GET /chapter
+ */
+export async function fetchChapter(tokens: Tokens): Promise<number | null> {
+  const resp = await request('chapter', 'GET', {
+    accessToken: tokens.accessToken,
+    refreshToken: tokens.refreshToken,
+    noHeaderAccept: true,
+    shouldAutoLogout: false,
+    shouldRefresh: true
+  });
+
+  if (!resp || !resp.ok) {
+    return null;
+  }
+
+  return await resp.json();
+}
+
+/**
+ * POST /chapter/update/1
+ */
+export async function changeChapter(chapterno: number, tokens: Tokens) {
+  const resp = await request(`chapter/update/1`, 'POST', {
+    accessToken: tokens.accessToken,
+    body: { chapterno },
+    noHeaderAccept: true,
+    refreshToken: tokens.refreshToken,
+    shouldAutoLogout: false,
+    shouldRefresh: true
+  });
+  return resp;
+}
+
 /**
  * @returns {(Response|null)} Response if successful, otherwise null.
  *

From 0135ee9a593d0a20b2955cf618d1ec725752cd94 Mon Sep 17 00:00:00 2001
From: chrystalquek <chrystalquek@yahoo.com.sg>
Date: Wed, 15 Apr 2020 20:27:52 +0800
Subject: [PATCH 2/8] Added some tests

---
 src/actions/__tests__/workspaces.ts           | 33 +++++++++++++++++++
 src/actions/workspaces.ts                     | 14 ++++----
 src/components/academy/NavigationBar.tsx      |  6 ++--
 .../__snapshots__/NavigationBar.tsx.snap      |  2 ++
 src/containers/DefaultChapterContainer.ts     |  4 +--
 src/reducers/workspaces.ts                    |  6 ++--
 src/sagas/__tests__/backend.ts                | 19 +++++++++++
 src/sagas/backend.ts                          | 17 +++-------
 8 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/src/actions/__tests__/workspaces.ts b/src/actions/__tests__/workspaces.ts
index d9f9545400..ee3056fa96 100755
--- a/src/actions/__tests__/workspaces.ts
+++ b/src/actions/__tests__/workspaces.ts
@@ -6,6 +6,7 @@ import {
   beginClearContext,
   browseReplHistoryDown,
   browseReplHistoryUp,
+  changeChapter,
   changeEditorHeight,
   changeEditorWidth,
   changeExternalLibrary,
@@ -20,6 +21,7 @@ import {
   evalRepl,
   evalTestcase,
   externalLibrarySelect,
+  fetchChapter,
   highlightEditorLine,
   moveCursor,
   navigateToDeclaration,
@@ -29,6 +31,7 @@ import {
   setEditorBreakpoint,
   toggleEditorAutorun,
   updateActiveTab,
+  updateChapter,
   updateCurrentAssessmentId,
   updateCurrentSubmissionId,
   updateEditorValue,
@@ -415,3 +418,33 @@ test('moveCursor generates correct action object', () => {
     }
   });
 });
+
+
+test('fetchChapter generates correct action object', () => {
+  const action = fetchChapter();
+  expect(action).toEqual({
+    type: actionTypes.FETCH_CHAPTER,
+  });
+});
+
+test('changeChapter generates correct action object', () => {
+  const chapter = 1;
+  const action = changeChapter(chapter);
+  expect(action).toEqual({
+    type: actionTypes.CHANGE_CHAPTER,
+    payload: {
+      chapter
+    },
+  });
+});
+
+test('updateChapter generates correct action object', () => {
+  const chapter = 1;
+  const action = updateChapter(chapter);
+  expect(action).toEqual({
+    type: actionTypes.UPDATE_CHAPTER,
+    payload: {
+      chapter
+    },
+  });
+});
diff --git a/src/actions/workspaces.ts b/src/actions/workspaces.ts
index c1759023b7..7732e58cfb 100755
--- a/src/actions/workspaces.ts
+++ b/src/actions/workspaces.ts
@@ -4,6 +4,7 @@ import { ExternalLibraryName, Library } from '../components/assessment/assessmen
 import { IPosition } from '../components/workspace/Editor';
 import { IWorkspaceState, SideContentType } from '../reducers/states';
 import * as actionTypes from './actionTypes';
+// import { IChapter } from 'src/components/academy/DefaultChapter';
 
 /**
  * Used to differenciate between the sources of actions, as
@@ -210,13 +211,10 @@ export const updateHasUnsavedChanges = (
     hasUnsavedChanges
   });
 
-export const fetchChapter = () => 
-  action(actionTypes.FETCH_CHAPTER);
+export const fetchChapter = () => action(actionTypes.FETCH_CHAPTER);
 
-// update database
-export const changeChapter = (chapterno: number) =>
-  action(actionTypes.CHANGE_CHAPTER, { chapterno });
+export const changeChapter = (chapter: number) =>
+  action(actionTypes.CHANGE_CHAPTER, { chapter });
 
-// update state
-export const updateChapter = (chapterno: number) =>
-  action(actionTypes.UPDATE_CHAPTER, chapterno);
+export const updateChapter = (chapter: number) => 
+  action(actionTypes.UPDATE_CHAPTER, { chapter });
diff --git a/src/components/academy/NavigationBar.tsx b/src/components/academy/NavigationBar.tsx
index 1afe91aa00..1b59632f90 100644
--- a/src/components/academy/NavigationBar.tsx
+++ b/src/components/academy/NavigationBar.tsx
@@ -83,9 +83,6 @@ const NavigationBar: React.SFC<OwnProps> = props => (
     </NavbarGroup>
     {props.role === Role.Admin || props.role === Role.Staff ? (
       <NavbarGroup align={Alignment.RIGHT}>
-
-        <DefaultChapter/>
-
         <NavLink
           to={'/academy/sourcereel'}
           activeClassName={Classes.ACTIVE}
@@ -116,6 +113,9 @@ const NavigationBar: React.SFC<OwnProps> = props => (
             disableHover={true}
           />
         </NavLink>
+
+        <DefaultChapter/>
+        
       </NavbarGroup>
     ) : null}
   </Navbar>
diff --git a/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap b/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap
index 7538039059..482d90b0f1 100644
--- a/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap
+++ b/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap
@@ -99,6 +99,7 @@ exports[`Grading NavLink renders for Role.Admin 1`] = `
       </div>
       <Connect(NotificationBadge) notificationFilter={[Function]} disableHover={true} />
     </NavLink>
+    <withRouter(Connect(DefaultChapter)) />
   </Blueprint3.NavbarGroup>
 </Blueprint3.Navbar>"
 `;
@@ -161,6 +162,7 @@ exports[`Grading NavLink renders for Role.Staff 1`] = `
       </div>
       <Connect(NotificationBadge) notificationFilter={[Function]} disableHover={true} />
     </NavLink>
+    <withRouter(Connect(DefaultChapter)) />
   </Blueprint3.NavbarGroup>
 </Blueprint3.Navbar>"
 `;
diff --git a/src/containers/DefaultChapterContainer.ts b/src/containers/DefaultChapterContainer.ts
index 5bd5a6ce66..99fa1f7042 100644
--- a/src/containers/DefaultChapterContainer.ts
+++ b/src/containers/DefaultChapterContainer.ts
@@ -8,7 +8,6 @@ import { DefaultChapter, IDispatchProps, IStateProps } from '../components/acade
 import { IChapter } from '../components/workspace/controlBar';
 import { IState } from '../reducers/states';
 
-
 const mapStateToProps: MapStateToProps<IStateProps, {}, IState> = state => ({
   sourceChapter: state.workspaces.playground.context.chapter
 });
@@ -17,8 +16,7 @@ const mapDispatchToProps: MapDispatchToProps<IDispatchProps, {}> = (dispatch: Di
   bindActionCreators(
     {
       handleFetchChapter: () => fetchChapter(),
-      handleUpdateChapter: (chapter: IChapter) => changeChapter(chapter.chapter),
-     
+      handleUpdateChapter: (chapterNo: IChapter) => changeChapter(chapterNo.chapter)
     },
     dispatch
   );
diff --git a/src/reducers/workspaces.ts b/src/reducers/workspaces.ts
index 078cfdbeca..dd4c3b0b9b 100755
--- a/src/reducers/workspaces.ts
+++ b/src/reducers/workspaces.ts
@@ -44,7 +44,7 @@ import {
   UPDATE_EDITOR_VALUE,
   UPDATE_HAS_UNSAVED_CHANGES,
   UPDATE_REPL_VALUE,
-  UPDATE_WORKSPACE,
+  UPDATE_WORKSPACE
 } from '../actions/actionTypes';
 import * as collabActions from '../actions/collabEditing';
 import { logOut } from '../actions/commons';
@@ -663,11 +663,11 @@ export const reducer: Reducer<IWorkspaceManagerState> = (
           ...state.playground,
           context: {
             ...state.playground.context,
-            chapter: action.payload
+            chapter: action.payload.chapter
           }
         }
       };
-  
+
     default:
       return state;
   }
diff --git a/src/sagas/__tests__/backend.ts b/src/sagas/__tests__/backend.ts
index 3fd42c1d30..bc4d2ba63d 100644
--- a/src/sagas/__tests__/backend.ts
+++ b/src/sagas/__tests__/backend.ts
@@ -381,3 +381,22 @@ describe('Test NOTIFY_CHATKIT_USERS Action', () => {
       .silentRun();
   });
 });
+
+describe('Test FETCH_CHAPTER Action', () => {
+  test('when chapter is obtained', () => {
+    return expectSaga(backendSaga)
+    .withState({ session: { role: Role.Staff } })
+      .dispatch({ type: actionTypes.FETCH_CHAPTER })
+      .silentRun();
+  });
+});
+
+describe('Test CHANGE_CHAPTER Action', () => {
+  test('when chapter is changed', () => {
+    return expectSaga(backendSaga)
+    .withState({ session: { role: Role.Staff } })
+      .dispatch({ type: actionTypes.CHANGE_CHAPTER, payload: { chapterNo: 1 } })
+      .silentRun();
+  });
+});
+
diff --git a/src/sagas/backend.ts b/src/sagas/backend.ts
index 5882676a7e..34dd300233 100644
--- a/src/sagas/backend.ts
+++ b/src/sagas/backend.ts
@@ -556,7 +556,6 @@ function* backendSaga(): SagaIterator {
     yield call(showSuccessMessage, 'Deleted successfully!', 1000);
   });
 
-
   yield takeEvery(actionTypes.FETCH_CHAPTER, function*() {
     const tokens = yield select((state: IState) => ({
       accessToken: state.session.accessToken,
@@ -568,10 +567,9 @@ function* backendSaga(): SagaIterator {
     }
 
     const chapter = yield call(request.fetchChapter, tokens);
-    const chap = chapter.chapter.chapterno;
 
-    if (chap) {
-      yield put(actions.updateChapter(chap));
+    if (chapter) {
+      yield put(actions.updateChapter(chapter.chapter.chapterno));
     }
   });
 
@@ -583,22 +581,17 @@ function* backendSaga(): SagaIterator {
       refreshToken: state.session.refreshToken
     }));
 
-    const chap = action.payload.chapterno;
-    const resp: Response = yield request.changeChapter(chap, tokens);
+    const chapter = action.payload.chapter;
+    const resp: Response = yield request.changeChapter(chapter, tokens);
 
     if (!resp || !resp.ok) {
       yield request.handleResponseError(resp);
       return;
     }
 
-    yield put(actions.updateChapter(chap));
+    yield put(actions.updateChapter(chapter));
     yield call(showSuccessMessage, 'Updated successfully!', 1000);
   });
-
 }
 
-
-
-
-
 export default backendSaga;

From bb7700ca02ede3136aa4cb0cbe74a620e18bb8af Mon Sep 17 00:00:00 2001
From: chrystalquek <chrystalquek@yahoo.com.sg>
Date: Wed, 15 Apr 2020 21:29:47 +0800
Subject: [PATCH 3/8] Run check format

---
 src/actions/__tests__/workspaces.ts       |  7 +++----
 src/actions/workspaces.ts                 |  6 ++----
 src/components/academy/DefaultChapter.tsx | 22 ++++++----------------
 src/components/academy/NavigationBar.tsx  |  3 +--
 src/sagas/__tests__/backend.ts            |  5 ++---
 5 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/actions/__tests__/workspaces.ts b/src/actions/__tests__/workspaces.ts
index ee3056fa96..a7cfb246cc 100755
--- a/src/actions/__tests__/workspaces.ts
+++ b/src/actions/__tests__/workspaces.ts
@@ -419,11 +419,10 @@ test('moveCursor generates correct action object', () => {
   });
 });
 
-
 test('fetchChapter generates correct action object', () => {
   const action = fetchChapter();
   expect(action).toEqual({
-    type: actionTypes.FETCH_CHAPTER,
+    type: actionTypes.FETCH_CHAPTER
   });
 });
 
@@ -434,7 +433,7 @@ test('changeChapter generates correct action object', () => {
     type: actionTypes.CHANGE_CHAPTER,
     payload: {
       chapter
-    },
+    }
   });
 });
 
@@ -445,6 +444,6 @@ test('updateChapter generates correct action object', () => {
     type: actionTypes.UPDATE_CHAPTER,
     payload: {
       chapter
-    },
+    }
   });
 });
diff --git a/src/actions/workspaces.ts b/src/actions/workspaces.ts
index 7732e58cfb..16613c7aa5 100755
--- a/src/actions/workspaces.ts
+++ b/src/actions/workspaces.ts
@@ -213,8 +213,6 @@ export const updateHasUnsavedChanges = (
 
 export const fetchChapter = () => action(actionTypes.FETCH_CHAPTER);
 
-export const changeChapter = (chapter: number) =>
-  action(actionTypes.CHANGE_CHAPTER, { chapter });
+export const changeChapter = (chapter: number) => action(actionTypes.CHANGE_CHAPTER, { chapter });
 
-export const updateChapter = (chapter: number) => 
-  action(actionTypes.UPDATE_CHAPTER, { chapter });
+export const updateChapter = (chapter: number) => action(actionTypes.UPDATE_CHAPTER, { chapter });
diff --git a/src/components/academy/DefaultChapter.tsx b/src/components/academy/DefaultChapter.tsx
index 7630447f81..1d43271715 100644
--- a/src/components/academy/DefaultChapter.tsx
+++ b/src/components/academy/DefaultChapter.tsx
@@ -1,7 +1,7 @@
 import { Button, Classes, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { ItemRenderer , Select} from '@blueprintjs/select';
-// 
+import { ItemRenderer, Select } from '@blueprintjs/select';
+//
 import * as React from 'react';
 
 import { RouteComponentProps } from 'react-router';
@@ -35,20 +35,12 @@ export function DefaultChapter(props: IChapterProps) {
   }));
 
   const chapterRenderer: ItemRenderer<IChapter> = (chap, { handleClick }) => (
-    <MenuItem
-      active={false}
-      key={chap.chapter}
-      onClick={handleClick}
-      text={chap.displayName}
-    />
+    <MenuItem active={false} key={chap.chapter} onClick={handleClick} text={chap.displayName} />
   );
 
   const ChapterSelectComponent = Select.ofType<IChapter>();
 
-  const chapSelect = (
-    currentChap: number,
-    handleSelect = (i: IChapter) => {}
-  ) => (
+  const chapSelect = (currentChap: number, handleSelect = (i: IChapter) => {}) => (
     <ChapterSelectComponent
       className={Classes.MINIMAL}
       items={chapters}
@@ -61,10 +53,8 @@ export function DefaultChapter(props: IChapterProps) {
         text={styliseChapter(currentChap)}
         rightIcon={IconNames.DOUBLE_CARET_VERTICAL}
       />
-     </ChapterSelectComponent>
+    </ChapterSelectComponent>
   );
-  
-    return <div> {chapSelect(props.sourceChapter, props.handleUpdateChapter)} </div>;
 
-  
+  return <div> {chapSelect(props.sourceChapter, props.handleUpdateChapter)} </div>;
 }
diff --git a/src/components/academy/NavigationBar.tsx b/src/components/academy/NavigationBar.tsx
index 1b59632f90..a80bc97a0e 100644
--- a/src/components/academy/NavigationBar.tsx
+++ b/src/components/academy/NavigationBar.tsx
@@ -114,8 +114,7 @@ const NavigationBar: React.SFC<OwnProps> = props => (
           />
         </NavLink>
 
-        <DefaultChapter/>
-        
+        <DefaultChapter />
       </NavbarGroup>
     ) : null}
   </Navbar>
diff --git a/src/sagas/__tests__/backend.ts b/src/sagas/__tests__/backend.ts
index bc4d2ba63d..3fca16a964 100644
--- a/src/sagas/__tests__/backend.ts
+++ b/src/sagas/__tests__/backend.ts
@@ -385,7 +385,7 @@ describe('Test NOTIFY_CHATKIT_USERS Action', () => {
 describe('Test FETCH_CHAPTER Action', () => {
   test('when chapter is obtained', () => {
     return expectSaga(backendSaga)
-    .withState({ session: { role: Role.Staff } })
+      .withState({ session: { role: Role.Staff } })
       .dispatch({ type: actionTypes.FETCH_CHAPTER })
       .silentRun();
   });
@@ -394,9 +394,8 @@ describe('Test FETCH_CHAPTER Action', () => {
 describe('Test CHANGE_CHAPTER Action', () => {
   test('when chapter is changed', () => {
     return expectSaga(backendSaga)
-    .withState({ session: { role: Role.Staff } })
+      .withState({ session: { role: Role.Staff } })
       .dispatch({ type: actionTypes.CHANGE_CHAPTER, payload: { chapterNo: 1 } })
       .silentRun();
   });
 });
-

From eafca721a8ed23a4b3360c75b5866da4c06814ed Mon Sep 17 00:00:00 2001
From: chrystalquek <chrystalquek@yahoo.com.sg>
Date: Wed, 15 Apr 2020 22:02:19 +0800
Subject: [PATCH 4/8] Changed position of dropdown

---
 src/actions/workspaces.ts                                     | 1 -
 src/components/academy/NavigationBar.tsx                      | 4 ++--
 .../academy/__tests__/__snapshots__/NavigationBar.tsx.snap    | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/actions/workspaces.ts b/src/actions/workspaces.ts
index 16613c7aa5..17fb4c384e 100755
--- a/src/actions/workspaces.ts
+++ b/src/actions/workspaces.ts
@@ -4,7 +4,6 @@ import { ExternalLibraryName, Library } from '../components/assessment/assessmen
 import { IPosition } from '../components/workspace/Editor';
 import { IWorkspaceState, SideContentType } from '../reducers/states';
 import * as actionTypes from './actionTypes';
-// import { IChapter } from 'src/components/academy/DefaultChapter';
 
 /**
  * Used to differenciate between the sources of actions, as
diff --git a/src/components/academy/NavigationBar.tsx b/src/components/academy/NavigationBar.tsx
index a80bc97a0e..62175200d5 100644
--- a/src/components/academy/NavigationBar.tsx
+++ b/src/components/academy/NavigationBar.tsx
@@ -83,6 +83,8 @@ const NavigationBar: React.SFC<OwnProps> = props => (
     </NavbarGroup>
     {props.role === Role.Admin || props.role === Role.Staff ? (
       <NavbarGroup align={Alignment.RIGHT}>
+        <DefaultChapter />
+
         <NavLink
           to={'/academy/sourcereel'}
           activeClassName={Classes.ACTIVE}
@@ -113,8 +115,6 @@ const NavigationBar: React.SFC<OwnProps> = props => (
             disableHover={true}
           />
         </NavLink>
-
-        <DefaultChapter />
       </NavbarGroup>
     ) : null}
   </Navbar>
diff --git a/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap b/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap
index 482d90b0f1..da4369ee66 100644
--- a/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap
+++ b/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap
@@ -80,6 +80,7 @@ exports[`Grading NavLink renders for Role.Admin 1`] = `
     </NavLink>
   </Blueprint3.NavbarGroup>
   <Blueprint3.NavbarGroup align=\\"right\\">
+    <withRouter(Connect(DefaultChapter)) />
     <NavLink to=\\"/academy/sourcereel\\" activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link bp3-button bp3-minimal\\" aria-current=\\"page\\">
       <Blueprint3.Icon icon=\\"mobile-video\\" />
       <div className=\\"navbar-button-text hidden-xs\\">
@@ -99,7 +100,6 @@ exports[`Grading NavLink renders for Role.Admin 1`] = `
       </div>
       <Connect(NotificationBadge) notificationFilter={[Function]} disableHover={true} />
     </NavLink>
-    <withRouter(Connect(DefaultChapter)) />
   </Blueprint3.NavbarGroup>
 </Blueprint3.Navbar>"
 `;
@@ -143,6 +143,7 @@ exports[`Grading NavLink renders for Role.Staff 1`] = `
     </NavLink>
   </Blueprint3.NavbarGroup>
   <Blueprint3.NavbarGroup align=\\"right\\">
+    <withRouter(Connect(DefaultChapter)) />
     <NavLink to=\\"/academy/sourcereel\\" activeClassName=\\"bp3-active\\" className=\\"NavigationBar__link bp3-button bp3-minimal\\" aria-current=\\"page\\">
       <Blueprint3.Icon icon=\\"mobile-video\\" />
       <div className=\\"navbar-button-text hidden-xs\\">
@@ -162,7 +163,6 @@ exports[`Grading NavLink renders for Role.Staff 1`] = `
       </div>
       <Connect(NotificationBadge) notificationFilter={[Function]} disableHover={true} />
     </NavLink>
-    <withRouter(Connect(DefaultChapter)) />
   </Blueprint3.NavbarGroup>
 </Blueprint3.Navbar>"
 `;

From e4c0e11b6fae3f460e94e1a6d665ee2eee23b457 Mon Sep 17 00:00:00 2001
From: chrystalquek <54176678+chrystalquek@users.noreply.github.com>
Date: Thu, 23 Apr 2020 15:54:13 +0800
Subject: [PATCH 5/8] Fixed syntax error

---
 src/components/__tests__/Playground.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/__tests__/Playground.tsx b/src/components/__tests__/Playground.tsx
index 93c8f0e883..c0bbf8df90 100755
--- a/src/components/__tests__/Playground.tsx
+++ b/src/components/__tests__/Playground.tsx
@@ -57,7 +57,7 @@ const baseProps = {
   handleDebuggerPause: () => {},
   handleDebuggerResume: () => {},
   handleDebuggerReset: () => {},
-  handleFetchChapter: () => {}
+  handleFetchChapter: () => {},
   handlePromptAutocomplete: (row: number, col: number, callback: any) => {}
 };
 

From 2687f4b9abb47aa1c27e0eef95c1c01e9ca4985e Mon Sep 17 00:00:00 2001
From: chrystalquek <54176678+chrystalquek@users.noreply.github.com>
Date: Thu, 23 Apr 2020 15:58:13 +0800
Subject: [PATCH 6/8] Fixed syntax error

---
 src/containers/PlaygroundContainer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/containers/PlaygroundContainer.ts b/src/containers/PlaygroundContainer.ts
index 3060e6edfe..89a748d150 100755
--- a/src/containers/PlaygroundContainer.ts
+++ b/src/containers/PlaygroundContainer.ts
@@ -110,7 +110,7 @@ const mapDispatchToProps: MapDispatchToProps<IDispatchProps, {}> = (dispatch: Di
       handleDebuggerPause: () => beginDebuggerPause(workspaceLocation),
       handleDebuggerResume: () => debuggerResume(workspaceLocation),
       handleDebuggerReset: () => debuggerReset(workspaceLocation),
-      handleFetchChapter: () => fetchChapter()
+      handleFetchChapter: () => fetchChapter(),
       handlePromptAutocomplete: (row: number, col: number, callback: any) =>
         promptAutocomplete(workspaceLocation, row, col, callback)
     },

From a59cd1f1820189ac3ac994973826e0a6c0dce198 Mon Sep 17 00:00:00 2001
From: chrystalquek <chrystalquek@yahoo.com.sg>
Date: Fri, 24 Apr 2020 01:00:58 +0800
Subject: [PATCH 7/8] Modified variant state

---
 src/actions/__tests__/workspaces.ts       | 12 ++++---
 src/actions/workspaces.ts                 |  8 ++---
 src/components/academy/DefaultChapter.tsx | 44 +++++++++++++++--------
 src/containers/DefaultChapterContainer.ts |  5 +--
 src/reducers/workspaces.ts                |  3 +-
 src/sagas/__tests__/backend.ts            |  2 +-
 src/sagas/backend.ts                      |  8 ++---
 src/sagas/requests.ts                     |  6 ++--
 8 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/src/actions/__tests__/workspaces.ts b/src/actions/__tests__/workspaces.ts
index ea6b4ecc2b..c655281ba9 100755
--- a/src/actions/__tests__/workspaces.ts
+++ b/src/actions/__tests__/workspaces.ts
@@ -430,22 +430,26 @@ test('fetchChapter generates correct action object', () => {
 
 test('changeChapter generates correct action object', () => {
   const chapter = 1;
-  const action = changeChapter(chapter);
+  const variant = 'default';
+  const action = changeChapter(chapter, variant);
   expect(action).toEqual({
     type: actionTypes.CHANGE_CHAPTER,
     payload: {
-      chapter
+      chapter,
+      variant
     }
   });
 });
 
 test('updateChapter generates correct action object', () => {
   const chapter = 1;
-  const action = updateChapter(chapter);
+  const variant = 'default';
+  const action = updateChapter(chapter, variant);
   expect(action).toEqual({
     type: actionTypes.UPDATE_CHAPTER,
     payload: {
-      chapter
+      chapter,
+      variant
     }
   });
 });
diff --git a/src/actions/workspaces.ts b/src/actions/workspaces.ts
index 4138172db7..9ee2e291ca 100755
--- a/src/actions/workspaces.ts
+++ b/src/actions/workspaces.ts
@@ -216,12 +216,13 @@ export const updateHasUnsavedChanges = (
     hasUnsavedChanges
   });
 
-
 export const fetchChapter = () => action(actionTypes.FETCH_CHAPTER);
 
-export const changeChapter = (chapter: number) => action(actionTypes.CHANGE_CHAPTER, { chapter });
+export const changeChapter = (chapter: number, variant: Variant) =>
+  action(actionTypes.CHANGE_CHAPTER, { chapter, variant });
 
-export const updateChapter = (chapter: number) => action(actionTypes.UPDATE_CHAPTER, { chapter });
+export const updateChapter = (chapter: number, variant: Variant) =>
+  action(actionTypes.UPDATE_CHAPTER, { chapter, variant });
 
 export const promptAutocomplete = (
   workspaceLocation: WorkspaceLocation,
@@ -235,4 +236,3 @@ export const promptAutocomplete = (
     column,
     callback
   });
-
diff --git a/src/components/academy/DefaultChapter.tsx b/src/components/academy/DefaultChapter.tsx
index 1d43271715..cdf5e689e0 100644
--- a/src/components/academy/DefaultChapter.tsx
+++ b/src/components/academy/DefaultChapter.tsx
@@ -1,12 +1,13 @@
 import { Button, Classes, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import { ItemRenderer, Select } from '@blueprintjs/select';
-//
+
 import * as React from 'react';
 
 import { RouteComponentProps } from 'react-router';
 
-import { sourceChapters } from '../../reducers/states';
+import { Variant } from 'js-slang/dist/types';
+import { ISourceLanguage, sourceLanguages, styliseChapter } from '../../reducers/states';
 
 export interface IChapterProps extends IDispatchProps, IStateProps, RouteComponentProps<{}> {}
 
@@ -18,29 +19,42 @@ export type IDispatchProps = {
 
 export interface IStateProps {
   sourceChapter: number;
+  sourceVariant: Variant;
 }
 
 export interface IChapter {
   chapter: number;
+  variant: Variant;
   displayName: string;
 }
 
-// class DefaultChapter extends React.Component<IChapterProps, {}> {
 export function DefaultChapter(props: IChapterProps) {
   props.handleFetchChapter();
-  const styliseChapter = (chap: number) => `Source \xa7${chap}`;
-  const chapters = sourceChapters.map(chap => ({
-    displayName: styliseChapter(chap),
-    chapter: chap
-  }));
-
-  const chapterRenderer: ItemRenderer<IChapter> = (chap, { handleClick }) => (
-    <MenuItem active={false} key={chap.chapter} onClick={handleClick} text={chap.displayName} />
+
+  const chapters = sourceLanguages.map((lang: ISourceLanguage) => {
+    return {
+      chapter: lang.chapter,
+      variant: lang.variant,
+      displayName: styliseChapter(lang.chapter, lang.variant)
+    };
+  });
+
+  const chapterRenderer: ItemRenderer<IChapter> = (lang, { handleClick }) => (
+    <MenuItem
+      active={false}
+      key={lang.chapter + lang.variant}
+      onClick={handleClick}
+      text={lang.displayName}
+    />
   );
 
   const ChapterSelectComponent = Select.ofType<IChapter>();
 
-  const chapSelect = (currentChap: number, handleSelect = (i: IChapter) => {}) => (
+  const chapSelect = (
+    currentChap: number,
+    currentVariant: Variant,
+    handleSelect = (i: IChapter) => {}
+  ) => (
     <ChapterSelectComponent
       className={Classes.MINIMAL}
       items={chapters}
@@ -50,11 +64,13 @@ export function DefaultChapter(props: IChapterProps) {
     >
       <Button
         className={Classes.MINIMAL}
-        text={styliseChapter(currentChap)}
+        text={styliseChapter(currentChap, currentVariant)}
         rightIcon={IconNames.DOUBLE_CARET_VERTICAL}
       />
     </ChapterSelectComponent>
   );
 
-  return <div> {chapSelect(props.sourceChapter, props.handleUpdateChapter)} </div>;
+  return (
+    <div> {chapSelect(props.sourceChapter, props.sourceVariant, props.handleUpdateChapter)} </div>
+  );
 }
diff --git a/src/containers/DefaultChapterContainer.ts b/src/containers/DefaultChapterContainer.ts
index 99fa1f7042..fdebc991d5 100644
--- a/src/containers/DefaultChapterContainer.ts
+++ b/src/containers/DefaultChapterContainer.ts
@@ -9,14 +9,15 @@ import { IChapter } from '../components/workspace/controlBar';
 import { IState } from '../reducers/states';
 
 const mapStateToProps: MapStateToProps<IStateProps, {}, IState> = state => ({
-  sourceChapter: state.workspaces.playground.context.chapter
+  sourceChapter: state.workspaces.playground.context.chapter,
+  sourceVariant: state.workspaces.playground.context.variant
 });
 
 const mapDispatchToProps: MapDispatchToProps<IDispatchProps, {}> = (dispatch: Dispatch<any>) =>
   bindActionCreators(
     {
       handleFetchChapter: () => fetchChapter(),
-      handleUpdateChapter: (chapterNo: IChapter) => changeChapter(chapterNo.chapter)
+      handleUpdateChapter: (chapter: IChapter) => changeChapter(chapter.chapter, chapter.variant)
     },
     dispatch
   );
diff --git a/src/reducers/workspaces.ts b/src/reducers/workspaces.ts
index e6f86e6504..9e02f17763 100755
--- a/src/reducers/workspaces.ts
+++ b/src/reducers/workspaces.ts
@@ -664,7 +664,8 @@ export const reducer: Reducer<IWorkspaceManagerState> = (
           ...state.playground,
           context: {
             ...state.playground.context,
-            chapter: action.payload.chapter
+            chapter: action.payload.chapter,
+            variant: action.payload.variant
           }
         }
       };
diff --git a/src/sagas/__tests__/backend.ts b/src/sagas/__tests__/backend.ts
index 3fca16a964..5e64142b9f 100644
--- a/src/sagas/__tests__/backend.ts
+++ b/src/sagas/__tests__/backend.ts
@@ -395,7 +395,7 @@ describe('Test CHANGE_CHAPTER Action', () => {
   test('when chapter is changed', () => {
     return expectSaga(backendSaga)
       .withState({ session: { role: Role.Staff } })
-      .dispatch({ type: actionTypes.CHANGE_CHAPTER, payload: { chapterNo: 1 } })
+      .dispatch({ type: actionTypes.CHANGE_CHAPTER, payload: { chapterNo: 1, variant: 'default' } })
       .silentRun();
   });
 });
diff --git a/src/sagas/backend.ts b/src/sagas/backend.ts
index 34dd300233..b011e0ee3c 100644
--- a/src/sagas/backend.ts
+++ b/src/sagas/backend.ts
@@ -569,7 +569,7 @@ function* backendSaga(): SagaIterator {
     const chapter = yield call(request.fetchChapter, tokens);
 
     if (chapter) {
-      yield put(actions.updateChapter(chapter.chapter.chapterno));
+      yield put(actions.updateChapter(chapter.chapter.chapterno, chapter.chapter.variant));
     }
   });
 
@@ -581,15 +581,15 @@ function* backendSaga(): SagaIterator {
       refreshToken: state.session.refreshToken
     }));
 
-    const chapter = action.payload.chapter;
-    const resp: Response = yield request.changeChapter(chapter, tokens);
+    const chapter = action.payload;
+    const resp: Response = yield request.changeChapter(chapter.chapter, chapter.variant, tokens);
 
     if (!resp || !resp.ok) {
       yield request.handleResponseError(resp);
       return;
     }
 
-    yield put(actions.updateChapter(chapter));
+    yield put(actions.updateChapter(chapter.chapter, chapter.variant));
     yield call(showSuccessMessage, 'Updated successfully!', 1000);
   });
 }
diff --git a/src/sagas/requests.ts b/src/sagas/requests.ts
index cc8ad08280..a0ce3357bb 100644
--- a/src/sagas/requests.ts
+++ b/src/sagas/requests.ts
@@ -596,7 +596,7 @@ export const postMaterialFolder = async (title: string, parentId: number, tokens
 /**
  * GET /chapter
  */
-export async function fetchChapter(tokens: Tokens): Promise<number | null> {
+export async function fetchChapter(tokens: Tokens): Promise<Response | null> {
   const resp = await request('chapter', 'GET', {
     accessToken: tokens.accessToken,
     refreshToken: tokens.refreshToken,
@@ -615,10 +615,10 @@ export async function fetchChapter(tokens: Tokens): Promise<number | null> {
 /**
  * POST /chapter/update/1
  */
-export async function changeChapter(chapterno: number, tokens: Tokens) {
+export async function changeChapter(chapterno: number, variant: string, tokens: Tokens) {
   const resp = await request(`chapter/update/1`, 'POST', {
     accessToken: tokens.accessToken,
-    body: { chapterno },
+    body: { chapterno, variant },
     noHeaderAccept: true,
     refreshToken: tokens.refreshToken,
     shouldAutoLogout: false,

From cee3655151e5a90f98b752d05171c3fa7037c951 Mon Sep 17 00:00:00 2001
From: chrystalquek <chrystalquek@yahoo.com.sg>
Date: Fri, 24 Apr 2020 22:57:40 +0800
Subject: [PATCH 8/8] Modified fetchChapter

---
 src/sagas/__tests__/backend.ts |  1 -
 src/sagas/backend.ts           | 11 +----------
 src/sagas/requests.ts          |  4 +---
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/sagas/__tests__/backend.ts b/src/sagas/__tests__/backend.ts
index 5e64142b9f..5f7d031d22 100644
--- a/src/sagas/__tests__/backend.ts
+++ b/src/sagas/__tests__/backend.ts
@@ -385,7 +385,6 @@ describe('Test NOTIFY_CHATKIT_USERS Action', () => {
 describe('Test FETCH_CHAPTER Action', () => {
   test('when chapter is obtained', () => {
     return expectSaga(backendSaga)
-      .withState({ session: { role: Role.Staff } })
       .dispatch({ type: actionTypes.FETCH_CHAPTER })
       .silentRun();
   });
diff --git a/src/sagas/backend.ts b/src/sagas/backend.ts
index b011e0ee3c..3d183cae3e 100644
--- a/src/sagas/backend.ts
+++ b/src/sagas/backend.ts
@@ -557,16 +557,7 @@ function* backendSaga(): SagaIterator {
   });
 
   yield takeEvery(actionTypes.FETCH_CHAPTER, function*() {
-    const tokens = yield select((state: IState) => ({
-      accessToken: state.session.accessToken,
-      refreshToken: state.session.refreshToken
-    }));
-
-    if (!tokens.accessToken) {
-      return;
-    }
-
-    const chapter = yield call(request.fetchChapter, tokens);
+    const chapter = yield call(request.fetchChapter);
 
     if (chapter) {
       yield put(actions.updateChapter(chapter.chapter.chapterno, chapter.chapter.variant));
diff --git a/src/sagas/requests.ts b/src/sagas/requests.ts
index a0ce3357bb..a96e4d77c9 100644
--- a/src/sagas/requests.ts
+++ b/src/sagas/requests.ts
@@ -596,10 +596,8 @@ export const postMaterialFolder = async (title: string, parentId: number, tokens
 /**
  * GET /chapter
  */
-export async function fetchChapter(tokens: Tokens): Promise<Response | null> {
+export async function fetchChapter(): Promise<Response | null> {
   const resp = await request('chapter', 'GET', {
-    accessToken: tokens.accessToken,
-    refreshToken: tokens.refreshToken,
     noHeaderAccept: true,
     shouldAutoLogout: false,
     shouldRefresh: true