Local storage

Missions are now loaded in local storage

Author: gerhean

src/actions/actionTypes.ts

@@ -59,7 +59,6 @@ export const SUBMIT_ANSWER = 'SUBMIT_ANSWER'
 export const SUBMIT_ASSESSMENT = 'SUBMIT_ASSESSMENT'
 export const SUBMIT_GRADING = 'SUBMIT_GRADING'
 export const UPDATE_HISTORY_HELPERS = 'UPDATE_HISTORY_HELPERS'
-export const UPDATE_ASSESSMENT_OVERVIEW = 'UPDATE_ASSESSMENT_OVERVIEW'
 export const UPDATE_ASSESSMENT_OVERVIEWS = 'UPDATE_ASSESSMENT_OVERVIEWS'
 export const UPDATE_ASSESSMENT = 'UPDATE_ASSESSMENT'
 export const UPDATE_GRADING_OVERVIEWS = 'UPDATE_GRADING_OVERVIEWS'

src/actions/session.ts

@@ -99,11 +99,6 @@ export const updateHistoryHelpers: ActionCreator<actionTypes.IAction> = (loc: st
   payload: loc
 })
 
-export const updateAssessmentOverview = (overview: IAssessmentOverview) => ({
-  type: actionTypes.UPDATE_ASSESSMENT_OVERVIEW,
-  payload: overview
-})
-
 export const updateAssessmentOverviews = (overviews: IAssessmentOverview[]) => ({
   type: actionTypes.UPDATE_ASSESSMENT_OVERVIEWS,
   payload: overviews

src/components/academy/index.tsx

@@ -26,7 +26,7 @@ const assessmentRenderFactory = (cat: AssessmentCategory) => (
   routerProps: RouteComponentProps<any>
 ) => <AssessmentContainer assessmentCategory={cat} />
 
-const assessmentRegExp = ':assessmentId(\\d+)?/:questionId(\\d+)?'
+const assessmentRegExp = ':assessmentId(-?\\d+)?/:questionId(\\d+)?'
 const gradingRegExp = ':submissionId(\\d+)?/:questionId(\\d+)?'
 
 export const Academy: React.SFC<IAcademyProps> = props => (

src/components/assessment/index.tsx

@@ -87,7 +87,20 @@ class Assessment extends React.Component<IAssessmentProps, State> {
   public render() {
     const assessmentId: number | null = stringParamToInt(this.props.match.params.assessmentId)
     const questionId: number =
-      stringParamToInt(this.props.match.params.questionId) || DEFAULT_QUESTION_ID
+      stringParamToInt(this.props.match.params.questionId) || DEFAULT_QUESTION_ID;
+
+    // If mission for testing is to render, create workspace
+    const editingOverview = localStorage.getItem("MissionEditingOverviewSA"); 
+    if (assessmentId === -1 && editingOverview) {
+      const overview = JSON.parse(editingOverview)
+      const assessmentProps: AssessmentProps = {
+        assessmentId,
+        questionId,
+        notAttempted: overview.status === AssessmentStatuses.not_attempted,
+        closeDate: overview.closeAt
+      }
+      return <AssessmentWorkspaceContainer {...assessmentProps} />
+    }
 
     // If there is an assessment to render, create a workspace. The assessment
     // overviews must still be loaded for this, to send the due date.
@@ -136,6 +149,17 @@ class Assessment extends React.Component<IAssessmentProps, State> {
           makeOverviewCard(overview, index, this.setBetchaAssessment, true, true)
         )
 
+      /** Mission editing card, stored in local storage and have index of -1. */
+      const missionEditingCard = editingOverview ? 
+        makeOverviewCard(
+          JSON.parse(editingOverview),
+          -1,
+          this.setBetchaAssessment,
+          true,
+          false
+        ) :
+        null;
+
       /** Render cards */
       const upcomingCardsCollapsible =
         upcomingCards.length > 0 ? (
@@ -168,10 +192,11 @@ class Assessment extends React.Component<IAssessmentProps, State> {
         ) : null
       display = (
         <>
+          <ImportFromFileComponent />
+          {missionEditingCard}
           {upcomingCardsCollapsible}
           {openedCardsCollapsible}
           {closedCardsCollapsible}
-          <ImportFromFileComponent />
         </>
       )
     }

src/components/commons/ImportFromFileComponent.tsx

@@ -2,17 +2,15 @@ import * as React from 'react'
 import { connect, MapDispatchToProps, MapStateToProps } from 'react-redux'
 import { bindActionCreators, Dispatch } from 'redux'
 import { parseString } from 'xml2js'
-import { updateAssessment, updateAssessmentOverview } from '../../actions/session'
+import { updateAssessment } from '../../actions/session'
 import {
   IAssessment,
   IAssessmentOverview,
 } from '../../components/assessment/assessmentShape'
 import { makeAssessment, makeAssessmentOverview } from '../../utils/xmlParser'
-// import { IDispatchProps } from '../../components/assessment'
 
 export interface IDispatchProps {
   newAssessment: (assessment: IAssessment) => void
-  newAssessmentOverview: (overview: IAssessmentOverview) => void
 }
 
 const mapStateToProps: MapStateToProps<{}, any, {}> = (_, ownProps) => ownProps
@@ -21,7 +19,6 @@ const mapDispatchToProps: MapDispatchToProps<IDispatchProps, {}> = (dispatch: Di
   bindActionCreators(
     {
       newAssessment: updateAssessment,
-      newAssessmentOverview: updateAssessmentOverview
     },
     dispatch
   )
@@ -34,6 +31,13 @@ export class ImportFromFileComponent extends React.Component<any, any> {
     this.handleChangeFile = this.handleChangeFile.bind(this)
   }
 
+  public componentDidMount(){
+  	const assessment = localStorage.getItem("MissionEditingAssessmentSA");
+  	if (assessment) {
+  		this.props.newAssessment(JSON.parse(assessment));
+  	}
+  }
+
   public render() {
     return (
       <div>
@@ -50,8 +54,10 @@ export class ImportFromFileComponent extends React.Component<any, any> {
         // tslint:disable-next-line:no-console
         console.dir(task)
         const overview: IAssessmentOverview = makeAssessmentOverview(result)
-        this.props.newAssessmentOverview(overview)
+        localStorage.setItem("MissionEditingOverviewSA", JSON.stringify(overview));
+
         const assessment: IAssessment = makeAssessment(result)
+        localStorage.setItem("MissionEditingAssessmentSA", JSON.stringify(assessment));
         this.props.newAssessment(assessment)
       })
     }

src/reducers/session.ts

@@ -6,7 +6,6 @@ import {
   SET_TOKENS,
   SET_USER,
   UPDATE_ASSESSMENT,
-  UPDATE_ASSESSMENT_OVERVIEW,
   UPDATE_ASSESSMENT_OVERVIEWS,
   UPDATE_GRADING,
   UPDATE_GRADING_OVERVIEWS,
@@ -50,29 +49,11 @@ export const reducer: Reducer<ISessionState> = (state = defaultSession, action:
         ...state,
         assessments: newAssessments
       }
-    case UPDATE_ASSESSMENT_OVERVIEW:
-      const newOverviews = Object.assign([], state.assessmentOverviews)
-      newOverviews.push(action.payload)
-      return {
-        ...state,
-        assessmentOverviews: newOverviews
-      }
     case UPDATE_ASSESSMENT_OVERVIEWS:
-      // if (state.assessmentOverviews){
-      //   const updatedOverviews = Object.assign([], action.payload);
-      //   const usedIDs = new Set();
-      //   action.payload.forEach((x: any) => {usedIDs.add(x.id)});
-      //   state.assessmentOverviews.forEach((x: any) => {if (!usedIDs.has(x.id)) {updatedOverviews.push(x)}})
-      //   return {
-      //     ...state,
-      //     assessmentOverviews: updatedOverviews
-      //   }
-      // } else{
       return {
         ...state,
         assessmentOverviews: action.payload
       }
-    // }
     case UPDATE_GRADING:
       const newGradings = new Map(state.gradings)
       newGradings.set(action.payload.submissionId, action.payload.grading)

src/utils/xmlParser.ts

@@ -19,6 +19,7 @@ import {
   IXmlParseStrTask
 } from '../utils/xmlParseStrShapes'; 
 
+const editingId = -1;
 
 const capitalizeFirstLetter = (str: string) => {
   return str.charAt(0).toUpperCase() + str.slice(1)
@@ -32,7 +33,7 @@ export const makeAssessmentOverview = (result: any) : IAssessmentOverview => {
     closeAt: rawOverview.duedate,
     coverImage: rawOverview.coverimage,
     grade: 1,
-    id: 7,
+    id: editingId,
     maxGrade: 3000,
     maxXp: 1000,
     openAt: rawOverview.startdate,
@@ -50,7 +51,7 @@ export const makeAssessment = (result: any) : IAssessment => {
   const rawOverview : IXmlParseStrOverview = task.$;
   return {
     category: capitalizeFirstLetter(rawOverview.kind) as AssessmentCategories,
-    id: 7,
+    id: editingId,
     longSummary: task.TEXT[0],
     missionPDF: 'google.com',
     questions: makeQuestions(task),
@@ -63,27 +64,36 @@ const altEval = (str: string) : any => {
 }
 
 const makeLibrary = (task: IXmlParseStrTask) : Library => {
-  const symbolsVal : string[]  = task.DEPLOYMENT[0].EXTERNAL[0].SYMBOL || [];
-  const globalsVal = task.GLOBAL.map((x) => [x.IDENTIFIER[0], altEval(x.VALUE[0])]) as Array<[string, any]>;
+  const external = task.DEPLOYMENT[0].EXTERNAL;
+  const nameVal = external ? 
+    external[0].$.name
+    : "NONE";
+  const symbolsVal : string[]  = external ? 
+    external[0].SYMBOL 
+    : [];
+  const globalsVal = task.GLOBAL ? 
+    task.GLOBAL.map((x) => [x.IDENTIFIER[0], altEval(x.VALUE[0])]) as Array<[string, any]>
+    : [];
   return {
     chapter: parseInt(task.DEPLOYMENT[0].$.interpreter, 10),
     external: {
-      name: task.DEPLOYMENT[0].EXTERNAL[0].$.name,
+      name: nameVal,
       symbols: symbolsVal
     },
     globals: globalsVal,
   }
 }
 
 const makeQuestions = (task: IXmlParseStrTask) : IQuestion[] => {
+  const libraryVal = makeLibrary(task);
   const questions: Array<IProgrammingQuestion | IMCQQuestion> = []
   task.PROBLEMS[0].PROBLEM.forEach((problem: IXmlParseStrProblem, curId: number) => {
     const question: IQuestion = {
       answer: null,
       comment: null,
       content: problem.TEXT[0],
       id: curId,
-      library: makeLibrary(task),
+      library: libraryVal,
       type: problem.$.type,
       grader: {
         name: 'fake person',