Merge pull request #8 from gerhean/mission-edit-assess-edit

Mission edit assess edit

Author: gerhean

src/components/Application.tsx

@@ -4,6 +4,7 @@ import * as React from 'react'
 import { Redirect, Route, RouteComponentProps, Switch } from 'react-router'
 
 import Academy from '../containers/academy'
+import IncubatorContainer from '../containers/incubator'
 import Login from '../containers/LoginContainer'
 import Playground from '../containers/PlaygroundContainer'
 import { Role, sourceChapters } from '../reducers/states'
@@ -30,6 +31,12 @@ export interface IDispatchProps {
   handlePlaygroundExternalSelect: (external: ExternalLibraryName) => void
 }
 
+const assessmentRenderFactory = (cat: string) => (
+  routerProps: RouteComponentProps<any>
+) => <IncubatorContainer assessmentCategory={cat} />
+
+const assessmentRegExp = ':assessmentId(-?\\d+)?/:questionId(\\d+)?'
+
 class Application extends React.Component<IApplicationProps, {}> {
   public componentDidMount() {
     parsePlayground(this.props)
@@ -47,6 +54,10 @@ class Application extends React.Component<IApplicationProps, {}> {
         <div className="Application__main">
           <Switch>
             <Route path="/academy" component={toAcademy(this.props)} />
+            <Route
+              path={`/incubator/${assessmentRegExp}`}
+              render={assessmentRenderFactory("Missions")}
+            />
             <Route path="/playground" component={Playground} />
             <Route path="/login" render={toLogin(this.props)} />
             <Route exact={true} path="/" render={this.redirectToAcademy} />

src/components/NavigationBar.tsx

@@ -55,6 +55,15 @@ const NavigationBar: React.SFC<INavigationBarProps> = props => (
     </NavbarGroup>
 
     <NavbarGroup align={Alignment.RIGHT}>
+      <NavLink
+        activeClassName="pt-active"
+        className="NavigationBar__link pt-button pt-minimal"
+        to="/incubator"
+      >
+        <Icon icon={IconNames.CODE} />
+        <div className="navbar-button-text hidden-xs">Incubator</div>
+      </NavLink>
+
       <NavLink
         activeClassName="pt-active"
         className="NavigationBar__link pt-button pt-minimal"

src/components/Playground.tsx

@@ -101,7 +101,7 @@ class Playground extends React.Component<IPlaygroundProps, PlaygroundState> {
       editorProps: {
         editorValue: this.props.editorValue,
         handleEditorEval: this.props.handleEditorEval,
-        handleEditorValueChange: this.props.handleEditorValueChange
+        handleEditorValueChange: this.props.handleEditorValueChange,
       },
       editorWidth: this.props.editorWidth,
       handleEditorWidthChange: this.props.handleEditorWidthChange,

src/components/academy/grading/GradingWorkspace.tsx

@@ -107,15 +107,15 @@ class GradingWorkspace extends React.Component<GradingWorkspaceProps> {
           ? {
               editorValue: editorValue!,
               handleEditorEval: this.props.handleEditorEval,
-              handleEditorValueChange: this.props.handleEditorValueChange
+              handleEditorValueChange: this.props.handleEditorValueChange,
             }
           : undefined,
       editorWidth: this.props.editorWidth,
       handleEditorWidthChange: this.props.handleEditorWidthChange,
       handleSideContentHeightChange: this.props.handleSideContentHeightChange,
       mcqProps: {
         mcq: question as IMCQQuestion,
-        handleMCQSubmit: (i: number) => {}
+        handleMCQSubmit: (i: number) => {},
       },
       sideContentHeight: this.props.sideContentHeight,
       sideContentProps: this.sideContentProps(this.props, questionId),

src/components/assessment/EditingOverviewCard.tsx

@@ -24,6 +24,7 @@ import Markdown from '../commons/Markdown'
 const DEFAULT_QUESTION_ID: number = 0
 
 type Props = {
+  listingPath?: string,
 	overview: IAssessmentOverview,
 	updateEditingOverview: (overview: IAssessmentOverview) => void
 }
@@ -33,12 +34,6 @@ interface IState {
   fieldValue: any
 }
 
-const textareaStyle = {
-	"height": "100%",
-	"width": "100%",
-  "overflow": "hidden" as "hidden",
-  "resize": "none" as "none"
-}
 
 export class EditingOverviewCard extends React.Component<Props, IState> {
 	public constructor(props: Props) {
@@ -88,7 +83,7 @@ export class EditingOverviewCard extends React.Component<Props, IState> {
   private makeEditingOverviewTextarea = (field: keyof IAssessmentOverview) => 
     <Textarea
       autoFocus={true}
-      style={textareaStyle}
+      className={'editing-textarea'}
       onChange={this.handleEditOverview()}
       onBlur={this.saveEditOverview(field)}
       value={this.state.fieldValue}
@@ -155,7 +150,7 @@ export class EditingOverviewCard extends React.Component<Props, IState> {
                 : `${getPrettyDate(overview.closeAt)}`}
               </div>
             </Text>
-            {makeOverviewCardButton(overview)}
+            {makeOverviewCardButton(overview, this.props.listingPath)}
           </div>
         </div>
       </Card>
@@ -197,14 +192,13 @@ export class EditingOverviewCard extends React.Component<Props, IState> {
 
 }
 
-const makeOverviewCardButton = (overview: IAssessmentOverview) => {
+const makeOverviewCardButton = (overview: IAssessmentOverview, listingPath: string | undefined) => {
   const icon: IconName = IconNames.EDIT;
   const label: string = "Edit mission";
+  listingPath = listingPath || ('/academy/' + assessmentCategoryLink(overview.category));
   return (
     <NavLink
-      to={`/academy/${assessmentCategoryLink(
-        overview.category
-      )}/${overview.id.toString()}/${DEFAULT_QUESTION_ID}`}
+      to={listingPath + `/${overview.id.toString()}/${DEFAULT_QUESTION_ID}`}
     >
       {controlButton(label, icon)}
     </NavLink>