setup load task action and call

Author: ShMcK

lib/components/Tutorials/SelectTutorial/index.js

@@ -24,8 +24,9 @@ var SelectTutorial = (function (_super) {
     }
     SelectTutorial.prototype.render = function () {
         var _a = this.props, tutorial = _a.tutorial, tutorialSet = _a.tutorialSet;
-        var name = tutorial.name;
-        return (React.createElement(FlatButton_1.default, {label: this.displayName(name), primary: true, onTouchTap: tutorialSet.bind(this, name)}));
+        var name = tutorial.name, version = tutorial.version;
+        console.log(name, version);
+        return (React.createElement(FlatButton_1.default, {label: this.displayName(name), primary: true, onTouchTap: tutorialSet.bind(this, { name: name, version: version })}));
     };
     SelectTutorial.prototype.displayName = function (name) {
         switch (true) {

lib/modules/tests/actions.js

@@ -14,6 +14,22 @@ function testRun() {
     };
 }
 exports.testRun = testRun;
+function testLoad() {
+    return function (dispatch, getState) {
+        var _a = getState(), dir = _a.dir, pagePosition = _a.pagePosition, tutorial = _a.tutorial;
+        dispatch({
+            type: types_1.TEST_LOAD, payload: {
+                dir: dir,
+                pagePosition: pagePosition,
+                tutorial: {
+                    name: tutorial.name,
+                    version: tutorial.version
+                }
+            }
+        });
+    };
+}
+exports.testLoad = testLoad;
 function testResult(result) {
     return function (dispatch, getState) {
         var _a = getState(), taskActions = _a.taskActions, progress = _a.progress, pagePosition = _a.pagePosition;

lib/modules/tests/test-run/index.js

@@ -1,5 +1,6 @@
 "use strict";
 var types_1 = require('../types');
+var load_1 = require('./load');
 var run_1 = require('./run');
 var pageSetTimeout = 1200;
 var testCompleteTimeout = 800;
@@ -22,6 +23,7 @@ function runTest(testRun, action) {
                 time: performance.now() + testCompleteTimeout,
             };
         case 'PAGE_SET':
+            load_1.default();
             return {
                 running: false,
                 time: performance.now() + pageSetTimeout,

lib/modules/tests/test-run/load.js

@@ -0,0 +1,6 @@
+"use strict";
+function loadTaskTests() {
+    console.log('load');
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = loadTaskTests;

lib/modules/tests/types.js

@@ -1,4 +1,5 @@
 "use strict";
 exports.TEST_COMPLETE = 'TEST_COMPLETE';
+exports.TEST_LOAD = 'TEST_LOAD';
 exports.TEST_RESULT = 'TEST_RESULT';
 exports.TEST_RUN = 'TEST_RUN';

lib/modules/tutorial/actions.js

@@ -1,10 +1,11 @@
 "use strict";
 var types_1 = require('./types');
 var core_coderoad_1 = require('core-coderoad');
-function tutorialSet(name) {
+function tutorialSet(_a) {
+    var name = _a.name, version = _a.version;
     return function (dispatch, getState) {
         var dir = getState().dir;
-        dispatch({ type: types_1.TUTORIAL_SET, payload: { name: name, dir: dir } });
+        dispatch({ type: types_1.TUTORIAL_SET, payload: { name: name, dir: dir, version: version } });
         dispatch(core_coderoad_1.routeSet('progress'));
     };
 }

lib/modules/tutorial/reducer.js

@@ -5,6 +5,7 @@ var config_1 = require('./utils/config');
 var config_paths_1 = require('./utils/config-paths');
 var _tutorial = {
     name: null,
+    version: null,
     info: null,
     pages: [],
     packageJson: null,
@@ -15,7 +16,7 @@ function tutorialReducer(t, action) {
     if (t === void 0) { t = _tutorial; }
     switch (action.type) {
         case types_1.TUTORIAL_SET:
-            var _a = action.payload, name_1 = _a.name, dir = _a.dir;
+            var _a = action.payload, name_1 = _a.name, dir = _a.dir, version = _a.version;
             var packagePath = path_1.join(dir, 'node_modules', name_1);
             var packageJson = require(path_1.join(packagePath, 'package.json'));
             var config = config_1.tutorialConfig(packageJson, dir);
@@ -27,6 +28,7 @@ function tutorialReducer(t, action) {
             configured.push(name_1);
             return {
                 name: packageJson.name,
+                version: version,
                 info: info,
                 pages: pages,
                 packageJson: packageJson,

src/components/Tutorials/SelectTutorial/index.tsx

@@ -10,12 +10,13 @@ export default class SelectTutorial extends React.Component<{
 }, {}> {
   public render() {
     const {tutorial, tutorialSet} = this.props;
-    const {name} = tutorial;
+    const {name, version} = tutorial;
+    console.log(name, version);
     return (
       <FlatButton
         label={this.displayName(name)}
         primary={true}
-        onTouchTap={tutorialSet.bind(this, name)}
+        onTouchTap={tutorialSet.bind(this, {name, version})}
       />
     );
   }

src/modules/tests/actions.ts

@@ -1,5 +1,5 @@
 import {alertOpen, hintPositionSet, progressCompletePage} from '../../actions';
-import {TEST_COMPLETE, TEST_RESULT, TEST_RUN} from './types';
+import {TEST_COMPLETE, TEST_LOAD, TEST_RESULT, TEST_RUN} from './types';
 
 export function testRun(): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
@@ -15,6 +15,22 @@ export function testRun(): ReduxThunk.ThunkInterface {
   };
 }
 
+export function testLoad() {
+  return (dispatch, getState): void => {
+    const { dir, pagePosition, tutorial } = getState();
+    dispatch({
+      type: TEST_LOAD, payload: {
+        dir,
+        pagePosition,
+        tutorial: {
+          name: tutorial.name,
+          version: tutorial.version
+        }
+      }
+    });
+  };
+}
+
 export function testResult(result: Test.Result): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
     const {taskActions, progress, pagePosition} = getState();

src/modules/tests/test-run/index.ts

@@ -1,4 +1,5 @@
 import {TEST_COMPLETE, TEST_RUN} from '../types';
+import loadTaskTests from './load';
 import runTaskTests from './run';
 
 // timeouts = throttle test runs
@@ -35,6 +36,7 @@ export default function runTest(
       };
 
     case 'PAGE_SET':
+      loadTaskTests();
       // add extra time, as page loading takes longer
       return {
         running: false,

src/modules/tests/test-run/load.ts

@@ -0,0 +1,4 @@
+export default function loadTaskTests() {
+  console.log('load')
+  // tutorialConfig.run({});
+}

src/modules/tests/types.ts

@@ -1,3 +1,4 @@
 export const TEST_COMPLETE = 'TEST_COMPLETE';
+export const TEST_LOAD = 'TEST_LOAD';
 export const TEST_RESULT = 'TEST_RESULT';
 export const TEST_RUN = 'TEST_RUN';

src/modules/tutorial/actions.ts

@@ -1,10 +1,10 @@
 import {TUTORIAL_SET} from './types';
 import {routeSet} from 'core-coderoad';
 
-export function tutorialSet(name: string): ReduxThunk.ThunkInterface {
+export function tutorialSet({name, version}): ReduxThunk.ThunkInterface {
   return (dispatch, getState) => {
     const {dir} = getState();
-    dispatch({ type: TUTORIAL_SET, payload: {name, dir }});
+    dispatch({ type: TUTORIAL_SET, payload: {name, dir, version }});
     dispatch(routeSet('progress'));
   };
 }

src/modules/tutorial/reducer.ts

@@ -6,6 +6,7 @@ import configPaths from './utils/config-paths';
 
 const _tutorial: CR.Tutorial = {
   name: null,
+  version: null,
   info: null,
   pages: [],
   packageJson: null,
@@ -20,7 +21,7 @@ export default function tutorialReducer(
   switch (action.type) {
 
     case TUTORIAL_SET:
-      const {name, dir} = action.payload;
+      const {name, dir, version} = action.payload;
 
       // get tutorial package.json
       const packagePath: string = join(dir, 'node_modules', name);
@@ -39,6 +40,7 @@ export default function tutorialReducer(
       // return tutorial (info, pages) & tutorial package.json
       return {
         name: packageJson.name,
+        version,
         info,
         pages,
         packageJson,