Mission editing update

src/components/incubator/EditingWorkspace.tsx

@@ -19,7 +19,7 @@ import { ControlBarProps } from '../workspace/ControlBar';
 import { SideContentProps } from '../workspace/side-content';
 import ToneMatrix from '../workspace/side-content/ToneMatrix';
 import {
-  GlobalDeploymentTab,
+  DeploymentTab,
   GradingTab,
   ManageQuestionTab,
   QuestionTemplateTab,
@@ -188,8 +188,8 @@ class AssessmentWorkspace extends React.Component<AssessmentWorkspaceProps, ISta
       const question = this.state.assessment!.questions[questionId];
       const library =
         question.library.chapter === -1
-          ? question.library
-          : this.state.assessment!.globalDeployment!;
+          ? this.state.assessment!.globalDeployment!
+          : question.library;
       const editorValue =
         question.type === QuestionTypes.programming
           ? question.answer !== null
@@ -293,11 +293,25 @@ class AssessmentWorkspace extends React.Component<AssessmentWorkspaceProps, ISta
       },
       {
         label: `Manage Global Deployment`,
-        icon: IconNames.TAG,
+        icon: IconNames.GLOBE,
         body: (
-          <GlobalDeploymentTab
+          <DeploymentTab
             assessment={assessment}
+            pathToLibrary={['globalDeployment']}
             updateAssessment={this.updateEditAssessmentState}
+            isGlobalDeployment={true}
+          />
+        )
+      },
+      {
+        label: `Manage Local Deployment`,
+        icon: IconNames.HOME,
+        body: (
+          <DeploymentTab
+            assessment={assessment}
+            pathToLibrary={['questions', questionId, 'library']}
+            updateAssessment={this.updateEditAssessmentState}
+            isGlobalDeployment={false}
           />
         )
       }

src/components/incubator/ImportFromFileComponent.tsx

@@ -1,23 +1,30 @@
+import { FileInput } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
 import * as React from 'react';
 import { parseString } from 'xml2js';
 import { IAssessment, IAssessmentOverview } from '../../components/assessment/assessmentShape';
 import { makeEntireAssessment, retrieveLocalAssessment } from '../../utils/xmlParser';
+import { controlButton } from '../commons';
 import { assessmentTemplate, overviewTemplate } from '../incubator/assessmentTemplates';
 
 type Props = {
   newAssessment: (assessment: IAssessment) => void;
   updateEditingOverview: (overview: IAssessmentOverview) => void;
 };
 
-export class ImportFromFileComponent extends React.Component<Props, { isInvalidXml: boolean }> {
+type State = {
+  fileInputText: string;
+};
+
+export class ImportFromFileComponent extends React.Component<Props, State> {
   private fileReader: FileReader;
   public constructor(props: any) {
     super(props);
     this.handleFileRead = this.handleFileRead.bind(this);
     this.handleChangeFile = this.handleChangeFile.bind(this);
     this.makeMission = this.makeMission.bind(this);
     this.state = {
-      isInvalidXml: false
+      fileInputText: 'Import XML'
     };
   }
 
@@ -32,13 +39,14 @@ export class ImportFromFileComponent extends React.Component<Props, { isInvalidX
     return (
       <div>
         <div>Please ensure that the xml uploaded is trustable.</div>
-        <input type="file" id="file" accept=".xml" onChange={this.handleChangeFile} />
-        <button onClick={this.makeMission}>Make New Mission</button>
-        {this.state.isInvalidXml ? (
-          <div>The xml uploaded is invalid.</div>
-        ) : (
-          <div>You can edit this card</div>
-        )}
+        <div>
+          <FileInput
+            text={this.state.fileInputText}
+            inputProps={{ accept: '.xml' }}
+            onChange={this.handleChangeFile}
+          />
+        </div>
+        <div>{controlButton('Make New Mission', IconNames.NEW_OBJECT, this.makeMission)}</div>
       </div>
     );
   }
@@ -57,13 +65,13 @@ export class ImportFromFileComponent extends React.Component<Props, { isInvalidX
           localStorage.setItem('MissionEditingAssessmentSA', JSON.stringify(entireAssessment[1]));
           this.props.newAssessment(entireAssessment[1]);
           this.setState({
-            isInvalidXml: false
+            fileInputText: 'Success!'
           });
         } catch (err) {
           // tslint:disable-next-line:no-console
           console.log(err);
           this.setState({
-            isInvalidXml: true
+            fileInputText: 'Invalid XML!'
           });
         }
       });
@@ -79,7 +87,7 @@ export class ImportFromFileComponent extends React.Component<Props, { isInvalidX
     }
   };
 
-  private makeMission = (e: any) => {
+  private makeMission = () => {
     localStorage.setItem('MissionEditingOverviewSA', JSON.stringify(overviewTemplate));
     this.props.updateEditingOverview(overviewTemplate);
 

src/components/incubator/assessmentTemplates.ts

@@ -9,7 +9,7 @@ import {
 } from '../../components/assessment/assessmentShape';
 import { mock2DRuneLibrary } from '../../mocks/assessmentAPI';
 
-const emptyLibrary: Library = {
+export const emptyLibrary: Library = {
   chapter: -1,
   external: {
     name: 'NONE',