setup result reducer & component

ShMcK · ShMcK · commit fcc873a661df · 2016-06-27T19:10:31.000-07:00
diff --git a/lib/actions.js b/lib/actions.js
@@ -8,6 +8,8 @@ exports.pageSet = page_position_1.pageSet;
 var package_json_1 = require('./modules/package-json');
 exports.pjSave = package_json_1.pjSave;
 exports.pjLoad = package_json_1.pjLoad;
+var result_1 = require('./modules/result');
+exports.testResult = result_1.testResult;
 var runner_1 = require('./modules/runner');
 exports.runnerSet = runner_1.runnerSet;
 exports.runnerRun = runner_1.runnerRun;
diff --git a/lib/components/Page/TaskActions/index.js b/lib/components/Page/TaskActions/index.js
@@ -20,6 +20,9 @@ var index_1 = require('../../index');
 var task_object_1 = require('./task-object');
 var actions_1 = require('../../../actions');
 var styles = {
+    stepper: {
+        paddingBottom: '20px',
+    },
     form: {
         margin: '10px 15px',
         display: 'inline-block',
@@ -64,7 +67,7 @@ var TaskActions = (function (_super) {
         var stepIndex = this.state.stepIndex;
         var actionList = actions.map(function (a) { return task_object_1.default(a); });
         return (React.createElement("section", null, 
-            React.createElement(Stepper_1.Stepper, {activeStep: stepIndex, linear: false, orientation: 'vertical'}, actionList.map(function (a, index) { return (React.createElement(Stepper_1.Step, {key: index}, 
+            React.createElement(Stepper_1.Stepper, {activeStep: stepIndex, linear: false, orientation: 'vertical', style: styles.stepper}, actionList.map(function (a, index) { return (React.createElement(Stepper_1.Step, {key: index}, 
                 React.createElement(Stepper_1.StepButton, {onClick: function () { return _this.setState({
                     stepIndex: index, as: _this.state.as }); }}, a.action + (a.singleLine ? ' ' + a.content : '')), 
                 React.createElement(Stepper_1.StepContent, null, a.singleLine ? ''
diff --git a/lib/components/Test/Result.js b/lib/components/Test/Result.js
@@ -0,0 +1,46 @@
+"use strict";
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var React = require('react');
+var react_redux_1 = require('react-redux');
+var Card_1 = require('material-ui/Card');
+var styles = {
+    card: {
+        margin: '5px',
+    },
+};
+var Result = (function (_super) {
+    __extends(Result, _super);
+    function Result() {
+        _super.apply(this, arguments);
+    }
+    Result.prototype.render = function () {
+        var result = this.props.result;
+        return (React.createElement(Card_1.Card, {style: styles.card, initiallyExpanded: true}, 
+            React.createElement(Card_1.CardText, {expandable: true}, 
+                React.createElement("p", null, result.msg)
+            )
+        ));
+    };
+    Result = __decorate([
+        react_redux_1.connect(function (state) { return ({
+            result: state.result,
+        }); }), 
+        __metadata('design:paramtypes', [])
+    ], Result);
+    return Result;
+}(React.Component));
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = Result;
diff --git a/lib/components/Test/Solution.js b/lib/components/Test/Solution.js
@@ -20,6 +20,7 @@ var RaisedButton_1 = require('material-ui/RaisedButton');
 var index_1 = require('../index');
 var actions_1 = require('../../actions');
 var core_coderoad_1 = require('core-coderoad');
+var Result_1 = require('./Result');
 var styles = {
     card: {
         margin: '5px',
@@ -52,7 +53,8 @@ var Solution = (function (_super) {
                 React.createElement("br", null), 
                 React.createElement("div", {style: styles.buttons}, 
                     React.createElement(RaisedButton_1.default, {label: 'Run Test', primary: true, onTouchTap: this.runTest.bind(this)})
-                ))));
+                ), 
+                React.createElement(Result_1.default, null))));
     };
     Solution = __decorate([
         react_redux_1.connect(function (state) { return ({
diff --git a/lib/modules/result/index.js b/lib/modules/result/index.js
@@ -0,0 +1,18 @@
+"use strict";
+var TEST_RESULT = 'TEST_RESULT';
+function testResult(result) {
+    console.log('action', result);
+    return { type: TEST_RESULT, payload: { result: result } };
+}
+exports.testResult = testResult;
+function reducer(res, action) {
+    if (res === void 0) { res = {}; }
+    switch (action.type) {
+        case TEST_RESULT:
+            console.log(action.payload.result);
+            return action.payload.result;
+        default:
+            return res;
+    }
+}
+exports.reducer = reducer;
diff --git a/lib/modules/runner/handleResult.js b/lib/modules/runner/handleResult.js
@@ -0,0 +1,9 @@
+"use strict";
+var store_1 = require('../../store');
+var actions_1 = require('../../actions');
+function handleResult(result) {
+    console.log('handleResult', result);
+    return store_1.default.dispatch(actions_1.testResult(result));
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = handleResult;
diff --git a/lib/modules/runner/index.js b/lib/modules/runner/index.js
@@ -15,7 +15,7 @@ exports.runnerSet = runnerSet;
 function runnerRun(content) {
     return function (dispatch, getState) {
         var _a = getState(), dir = _a.dir, tutorial = _a.tutorial;
-        var config = Object.assign({}, dir, tutorial.config);
+        var config = Object.assign({}, dir, { taskPosition: 0 }, tutorial.config);
         dispatch({ type: RUNNER_RUN, payload: { content: content, config: config } });
     };
 }
@@ -24,6 +24,9 @@ var r = function (content) {
     console.log(content);
     alert('Runner not yet implemented.');
 };
+function handleResult(result) {
+    console.log('handleResult', result);
+}
 function reducer(runner, action) {
     if (runner === void 0) { runner = r; }
     switch (action.type) {
@@ -32,7 +35,7 @@ function reducer(runner, action) {
             return loadRunner_1.default(dir, name_2);
         case RUNNER_RUN:
             var _b = action.payload, content = _b.content, config = _b.config;
-            r(content);
+            runner(content, config, handleResult);
             return runner;
         default:
             return runner;
diff --git a/lib/reducers.js b/lib/reducers.js
@@ -4,6 +4,7 @@ var redux_form_1 = require('redux-form');
 var page_position_1 = require('./modules/page-position');
 var setup_1 = require('./modules/setup');
 var package_json_1 = require('./modules/package-json');
+var result_1 = require('./modules/result');
 var runner_1 = require('./modules/runner');
 var tutorial_1 = require('./modules/tutorial');
 var window_1 = require('./modules/window');
@@ -13,7 +14,7 @@ var core_coderoad_1 = require('core-coderoad');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
     alert: core_coderoad_1.alertReducer, checks: setup_1.reducer, editor: core_coderoad_1.editorReducer, dir: core_coderoad_1.dirReducer, form: redux_form_1.reducer,
-    packageJson: package_json_1.reducer, pagePosition: page_position_1.reducer, route: core_coderoad_1.routeReducer,
+    packageJson: package_json_1.reducer, pagePosition: page_position_1.reducer, result: result_1.reducer, route: core_coderoad_1.routeReducer,
     tutorial: tutorial_1.reducer, updated: updated_1.reducer, validation: validate_tutorial_1.reducer, windowToggle: window_1.reducer,
     runner: runner_1.reducer,
 });
diff --git a/src/actions.ts b/src/actions.ts
@@ -1,6 +1,7 @@
 export {editorMarkdownOpen, editorTestOpen, editorPjOpen} from './modules/editor-paths';
 export {pageSet} from './modules/page-position';
 export {pjSave, pjLoad} from './modules/package-json';
+export {testResult} from './modules/result';
 export {runnerSet, runnerRun} from './modules/runner';
 export {setupVerify, setupPackage} from './modules/setup';
 export {
diff --git a/src/components/Page/TaskActions/index.tsx b/src/components/Page/TaskActions/index.tsx
@@ -12,6 +12,9 @@ import SelectField from 'material-ui/SelectField';
 import MenuItem from 'material-ui/MenuItem';
 
 const styles = {
+  stepper: {
+    paddingBottom: '20px',
+  },
   form: {
     margin: '10px 15px',
     display: 'inline-block',
@@ -68,6 +71,7 @@ export default class TaskActions extends React.Component<{
         activeStep={stepIndex}
         linear={false}
         orientation='vertical'
+        style={styles.stepper}
         >
         {actionList.map((a, index) => (
           <Step key={index}>
diff --git a/src/components/Test/Result.tsx b/src/components/Test/Result.tsx
@@ -0,0 +1,31 @@
+import * as React from 'react';
+import {connect} from 'react-redux';
+import {Card, CardText, CardTitle} from 'material-ui/Card';
+import RaisedButton from 'material-ui/RaisedButton';
+
+const styles = {
+  card: {
+    margin: '5px',
+  },
+};
+
+@connect(state => ({
+  result: state.result,
+}))
+export default class Result extends React.Component <{
+  result?: Object
+}, {}> {
+  render() {
+    const {result} = this.props;
+    return (
+      <Card
+        style={styles.card}
+        initiallyExpanded={true}
+      >
+        <CardText expandable={true}>
+          <p>{result.msg}</p>
+        </CardText>
+      </Card>
+    );
+  }
+}
diff --git a/src/components/Test/Solution.tsx b/src/components/Test/Solution.tsx
@@ -5,6 +5,7 @@ import RaisedButton from 'material-ui/RaisedButton';
 import {TextEditor} from '../index';
 import {runnerRun, runnerSet} from '../../actions';
 import {languageSuffixSelector} from 'core-coderoad';
+import Result from './Result';
 
 const styles = {
   card: {
@@ -68,6 +69,8 @@ ${atom.workspace.getActiveTextEditor().getText()}
               onTouchTap={this.runTest.bind(this)}
             />
           </div>
+
+          <Result />
         </CardText>
       </Card>
     );
diff --git a/src/modules/result/index.ts b/src/modules/result/index.ts
@@ -0,0 +1,18 @@
+const TEST_RESULT = 'TEST_RESULT';
+
+export function testResult(result: Object) {
+  console.log('action', result);
+  return {type: TEST_RESULT, payload: { result } };
+}
+
+export function reducer(res = {}, action: Action) {
+  switch (action.type) {
+
+    case TEST_RESULT:
+      console.log(action.payload.result);
+      return action.payload.result;
+
+    default:
+      return res;
+  }
+}
diff --git a/src/modules/runner/handleResult.ts b/src/modules/runner/handleResult.ts
@@ -0,0 +1,7 @@
+import store from '../../store';
+import {testResult} from '../../actions';
+
+export default function handleResult(result) {
+  console.log('handleResult', result);
+  return store.dispatch(testResult(result));
+}
diff --git a/src/modules/runner/index.ts b/src/modules/runner/index.ts
@@ -1,4 +1,7 @@
 import loadRunner from './loadRunner';
+// import handleResult from './handleResult';
+import store from '../../store';
+import {testResult} from '../../actions';
 
 const RUNNER_SET = 'RUNNER_SET';
 const RUNNER_RUN = 'RUNNER_RUN';
@@ -16,7 +19,7 @@ export function runnerSet() {
 export function runnerRun(content: string) {
   return (dispatch, getState) => {
     const {dir, tutorial} = getState();
-    let config = Object.assign({}, dir, tutorial.config);
+    let config = Object.assign({}, dir, {taskPosition: 0}, tutorial.config);
     dispatch({ type: RUNNER_RUN, payload: { content, config } });
   };
 }
@@ -27,6 +30,10 @@ const r = (content: string) => {
   alert('Runner not yet implemented.');
 };
 
+function handleResult(result) {
+  console.log('handleResult', result);
+  // return store.dispatch(testResult(result));
+}
 
 export function reducer(runner = r, action: Action) {
   switch (action.type) {
@@ -38,8 +45,7 @@ export function reducer(runner = r, action: Action) {
     case RUNNER_RUN:
       let {content, config} = action.payload;
       // call runner
-      r(content);
-      // runner(content, config, function() {});
+      runner(content, config, handleResult);
       return runner;
 
     default:
diff --git a/src/reducers.ts b/src/reducers.ts
@@ -5,6 +5,7 @@ import {reducer as form} from 'redux-form';
 import {reducer as pagePosition} from './modules/page-position';
 import {reducer as checks} from './modules/setup';
 import {reducer as packageJson} from './modules/package-json';
+import {reducer as result} from './modules/result';
 import {reducer as runner} from './modules/runner';
 import {reducer as tutorial} from './modules/tutorial';
 import {reducer as windowToggle} from './modules/window';
@@ -21,7 +22,7 @@ import {
 
 export default combineReducers({
   alert, checks, editor, dir, form,
-  packageJson, pagePosition, route,
+  packageJson, pagePosition, result, route,
   tutorial, updated, validation, windowToggle,
   runner,
 });
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,26 +1,26 @@
 {
-	"compileOnSave": false,
-	"buildOnSave": false,
-	"compilerOptions": {
-		"target": "ES5",
-		"module": "commonjs",
-		"declaration": false,
-		"noImplicitAny": false,
-		"removeComments": true,
-		"noLib": false,
-		"jsx": "react",
-		"experimentalDecorators": true,
-		"emitDecoratorMetadata": true,
-		"outDir": "lib"
-	},
-	"filesGlob": [
+ "compileOnSave": false,
+ "buildOnSave": false,
+ "compilerOptions": {
+  "target": "ES5",
+  "module": "commonjs",
+  "declaration": false,
+  "noImplicitAny": false,
+  "removeComments": true,
+  "noLib": false,
+  "jsx": "react",
+  "experimentalDecorators": true,
+  "emitDecoratorMetadata": true,
+  "outDir": "lib"
+ },
+ "filesGlob": [
   "src/typings/**/*.d.ts",
   "src/**/*.ts",
   "src/**/*.tsx",
   "!src/**/*.spec.ts",
   "!src/**/*.spec.tsx"
  ],
-	"files": [
+ "files": [
   "src/typings/builder.d.ts",
   "src/typings/typings.d.ts",
   "src/actions.ts",
@@ -43,6 +43,8 @@
   "src/modules/page-position/index.ts",
   "src/modules/page-position/reducer.ts",
   "src/modules/page-position/types.ts",
+  "src/modules/result/index.ts",
+  "src/modules/runner/handleResult.ts",
   "src/modules/runner/index.ts",
   "src/modules/runner/loadRunner.ts",
   "src/modules/setup/actions.ts",
@@ -114,15 +116,16 @@
   "src/components/Start/index.tsx",
   "src/components/Start/Welcome/index.tsx",
   "src/components/Test/index.tsx",
+  "src/components/Test/Result.tsx",
   "src/components/Test/Solution.tsx",
   "src/components/Test/TestMenu.tsx",
   "src/components/TopPanel/TopPanel.tsx",
   "src/components/TopPanel/TopRoot.tsx"
  ],
-	"exclude": [
+ "exclude": [
   "node_modules"
  ],
-	"atom": {
-		"rewriteTsconfig": true
-	}
+ "atom": {
+  "rewriteTsconfig": true
+ }
 }
