config paths earlier, refactor alert/progress reducers

ShMcK · ShMcK · commit a6f6a14f650c · 2016-05-10T07:37:02.000-07:00
diff --git a/lib/actions/alert.js b/lib/actions/alert.js
@@ -2,7 +2,7 @@
 var _types_1 = require('./_types');
 function alertToggle(alert, filter) {
     return function (dispatch, getState) {
-        dispatch({ type: _types_1.ALERT_TOGGLE, payload: { alert: alert } });
+        dispatch({ type: _types_1.ALERT_TOGGLE, payload: { alert: alert }, filter: filter });
     };
 }
 exports.alertToggle = alertToggle;
diff --git a/lib/actions/page.js b/lib/actions/page.js
@@ -1,6 +1,5 @@
 "use strict";
 var _types_1 = require('./_types');
-var config_task_tests_1 = require('./config-task-tests');
 var hint_1 = require('./hint');
 function pageNext() {
     return function (dispatch, getState) {
@@ -20,7 +19,7 @@ function pageSet(pagePosition) {
     if (pagePosition === void 0) { pagePosition = 0; }
     return function (dispatch, getState) {
         var _a = getState(), dir = _a.dir, progress = _a.progress, tutorial = _a.tutorial;
-        var tasks = config_task_tests_1.default(dir, tutorial, tutorial.pages[pagePosition].tasks || []);
+        var tasks = tutorial.pages[pagePosition].tasks || [];
         if (pagePosition >= progress.pages.length) {
             dispatch({ type: _types_1.ROUTE_SET, payload: { route: 'final' } });
         }
diff --git a/lib/actions/progress.js b/lib/actions/progress.js
@@ -1,6 +1,7 @@
 "use strict";
 var _types_1 = require('./_types');
 var alert_1 = require('./alert');
+var test_1 = require('./test');
 function progressPagePositionLoad() {
     return function (dispatch, getState) {
         var progress = getState().progress;
@@ -13,29 +14,37 @@ function progressLoad() {
         var tutorial = getState().tutorial;
         dispatch({ type: _types_1.PROGRESS_LOAD, payload: { tutorial: tutorial } });
         dispatch(progressPagePositionLoad());
+        dispatch(test_1.testRun());
     };
 }
 exports.progressLoad = progressLoad;
-function completePage() {
+function completePage(completed) {
+    if (completed === void 0) { completed = true; }
     return function (dispatch, getState) {
         var _a = getState(), pagePosition = _a.pagePosition, progress = _a.progress, tutorial = _a.tutorial;
-        dispatch({ type: _types_1.COMPLETE_PAGE, payload: { pagePosition: pagePosition, tutorial: tutorial } });
-        if (progress.pages.every(function (x) { return x.completed; })) {
-            dispatch(completeTutorial());
+        dispatch({ type: _types_1.COMPLETE_PAGE, payload: { pagePosition: pagePosition, tutorial: tutorial, completed: completed } });
+        if (completed) {
+            if (progress.pages.every(function (x) { return x.completed; })) {
+                dispatch(completeTutorial());
+            }
+            else {
+                dispatch(alert_1.alertToggle({
+                    message: "Page " + (pagePosition + 1) + " Complete",
+                    action: 'pass',
+                }));
+            }
         }
-        else {
-            dispatch(alert_1.alertToggle({
-                message: "Page " + (pagePosition + 1) + " Complete",
-                action: 'pass',
-            }));
+        else if (progress.completed) {
+            dispatch(completeTutorial(false));
         }
     };
 }
 exports.completePage = completePage;
-function completeTutorial() {
+function completeTutorial(completed) {
+    if (completed === void 0) { completed = true; }
     return function (dispatch, getState) {
         var tutorial = getState().tutorial;
-        dispatch({ type: _types_1.COMPLETE_TUTORIAL, payload: { tutorial: tutorial } });
+        dispatch({ type: _types_1.COMPLETE_TUTORIAL, payload: { tutorial: tutorial, completed: completed } });
         dispatch(alert_1.alertToggle({
             message: 'Tutorial Complete',
             action: 'pass',
diff --git a/lib/actions/test.js b/lib/actions/test.js
@@ -1,6 +1,7 @@
 "use strict";
 var _types_1 = require('./_types');
 var hint_1 = require('./hint');
+var progress_1 = require('./progress');
 function testRun() {
     return function (dispatch, getState) {
         var _a = getState(), taskTests = _a.taskTests, dir = _a.dir, tutorial = _a.tutorial, taskPosition = _a.taskPosition;
@@ -12,11 +13,14 @@ function testRun() {
 exports.testRun = testRun;
 function testResult(result) {
     return function (dispatch, getState) {
-        var taskActions = getState().taskActions;
+        var _a = getState(), taskActions = _a.taskActions, progress = _a.progress, pagePosition = _a.pagePosition;
         var filter = getTestFilter(result);
-        if (result.change !== 0) {
+        if (filter === 'PASS' || filter === 'FAIL') {
             dispatch(hint_1.hintPositionSet(0));
         }
+        if (filter === 'FAIL' && progress.pages[pagePosition]) {
+            dispatch(progress_1.completePage(false));
+        }
         dispatch({ type: _types_1.TEST_RESULT, payload: { result: result, taskActions: taskActions }, filter: filter });
     };
 }
diff --git a/lib/components/Page/Tasks/index.js b/lib/components/Page/Tasks/index.js
@@ -28,7 +28,7 @@ var Tasks = (function (_super) {
         var _a = this.props, tasks = _a.tasks, taskPosition = _a.taskPosition, testRun = _a.testRun, completed = _a.completed, page = _a.page;
         var visTasks = visibleTasks(tasks, taskPosition);
         var backgroundColor = completed ? colors_1.lightGreen200 : 'white';
-        return (React.createElement("div", null, React.createElement(Card_1.Card, {style: { backgroundColor: backgroundColor, margin: margin }}, React.createElement(List_1.List, null, React.createElement(Subheader_1.default, null, "Tasks"), visTasks.map(function (task, index) { return (React.createElement(Task_1.default, {key: index, index: index, task: task, taskPosition: taskPosition, testRun: testRun})); }))), React.createElement(TasksComplete_1.default, {page: page}), React.createElement("div", {ref: 'listEnd'})));
+        return (React.createElement("div", null, React.createElement(Card_1.Card, {style: { backgroundColor: backgroundColor, margin: margin }}, React.createElement(List_1.List, null, React.createElement(Subheader_1.default, null, "Tasks"), visTasks.map(function (task, index) { return (React.createElement(Task_1.default, {key: index, index: index, task: task, taskPosition: taskPosition, testRun: testRun})); }))), React.createElement(TasksComplete_1.default, {page: page, completed: completed}), React.createElement("div", {ref: 'listEnd'})));
     };
     return Tasks;
 }(React.Component));
diff --git a/lib/components/Page/TasksComplete/index.js b/lib/components/Page/TasksComplete/index.js
@@ -12,8 +12,8 @@ var textStyles = {
     fontSize: '1.1em'
 };
 var TasksComplete = function (_a) {
-    var page = _a.page;
-    if (!page.completed || !page.onPageComplete) {
+    var page = _a.page, completed = _a.completed;
+    if (!completed || !page.onPageComplete) {
         return null;
     }
     return (React.createElement(Card_1.Card, {style: styles}, React.createElement(Card_1.CardText, null, React.createElement(index_1.Markdown, {style: textStyles}, page.onPageComplete))));
diff --git a/lib/components/Page/index.js b/lib/components/Page/index.js
@@ -10,9 +10,9 @@ var styles = {
     overflowY: 'scroll',
 };
 var Page = function (_a) {
-    var page = _a.page, taskPosition = _a.taskPosition, hintPosition = _a.hintPosition, tasks = _a.tasks, testRun = _a.testRun;
+    var page = _a.page, taskPosition = _a.taskPosition, hintPosition = _a.hintPosition, tasks = _a.tasks, testRun = _a.testRun, progress = _a.progress, pagePosition = _a.pagePosition;
     var task = taskPosition <= tasks.length ? tasks[taskPosition] : null;
-    var completed = page.completed;
+    var completed = progress.pages[pagePosition];
     return (React.createElement("section", {style: styles, className: 'cr-page'}, React.createElement(index_1.ContentCard, {title: page.title, content: page.description}), React.createElement(Tasks_1.default, {tasks: tasks, taskPosition: taskPosition, testRun: testRun, completed: completed, page: page}), React.createElement(PageToolbar_1.default, {tasks: tasks, taskPosition: taskPosition}, React.createElement(Hints_1.default, {task: task, hintPosition: hintPosition}), React.createElement(ProgressBar_1.default, {taskLength: tasks.length, taskPosition: taskPosition, completed: completed}))));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/lib/reducers/alert/index.js b/lib/reducers/alert/index.js
@@ -34,7 +34,7 @@ function alertReducer(alert, action) {
             });
         case _types_1.TEST_RESULT:
             var result = action.payload.result;
-            switch (action.payload.filter) {
+            switch (action.filter) {
                 case 'PASS':
                     return setAlert({
                         message: result.msg,
diff --git a/lib/reducers/page/index.js b/lib/reducers/page/index.js
@@ -3,22 +3,18 @@ var _types_1 = require('../../actions/_types');
 var _page = {
     title: '',
     description: '',
-    completed: false,
 };
 function pageReducer(p, action) {
     if (p === void 0) { p = _page; }
     switch (action.type) {
         case _types_1.PAGE_SET:
             var _a = action.payload, pagePosition = _a.pagePosition, tutorial = _a.tutorial;
-            var _b = tutorial.pages[pagePosition], title = _b.title, description = _b.description, onPageComplete = _b.onPageComplete, completed = _b.completed;
+            var _b = tutorial.pages[pagePosition], title = _b.title, description = _b.description, onPageComplete = _b.onPageComplete;
             return {
                 title: title,
                 description: description,
                 onPageComplete: onPageComplete,
-                completed: completed || false
             };
-        case _types_1.COMPLETE_PAGE:
-            return Object.assign({}, p, { completed: true });
         default:
             return p;
     }
diff --git a/lib/reducers/progress/index.js b/lib/reducers/progress/index.js
@@ -19,13 +19,13 @@ function progressReducer(progress, action) {
                 pages: tutorial.pages.map(function () { return false; })
             };
         case _types_1.COMPLETE_PAGE:
-            var _a = action.payload, tutorial = _a.tutorial, pagePosition = _a.pagePosition;
-            progress.pages[pagePosition] = true;
+            var _a = action.payload, tutorial = _a.tutorial, pagePosition = _a.pagePosition, completed = _a.completed;
+            progress.pages[pagePosition] = completed;
             local_storage_1.saveToLocalStorage(tutorial, progress);
             return progress;
         case _types_1.COMPLETE_TUTORIAL:
-            var tutorial = action.payload.tutorial.tutorial;
-            progress.completed = true;
+            var _b = action.payload.tutorial, tutorial = _b.tutorial, completed = _b.completed;
+            progress.completed = completed;
             local_storage_1.saveToLocalStorage(tutorial, progress);
             return progress;
         default:
diff --git a/lib/reducers/tutorial/config-paths.js b/lib/reducers/tutorial/config-paths.js
@@ -0,0 +1,36 @@
+"use strict";
+var path_1 = require('path');
+var system_1 = require('../../services/system');
+function configTestString(dir, name, config, testPath) {
+    if (system_1.isWindows) {
+        testPath = testPath.split('/').join('\\');
+    }
+    if (config.dir) {
+        testPath = path_1.join(config.dir, testPath);
+    }
+    else {
+        testPath = path_1.join(dir, 'node_modules', name, testPath);
+    }
+    if (config.testSuffix) {
+        testPath += config.testSuffix;
+    }
+    return testPath;
+}
+function configPaths(dir, name, config, pages) {
+    return pages.map(function (page) {
+        page.tasks.map(function (task) {
+            task.tests = task.tests.map(function (testPath) {
+                if (typeof testPath === 'string') {
+                    return configTestString(dir, name, config, testPath);
+                }
+                else {
+                    console.error('Invalid task test', testPath);
+                }
+            });
+            return task;
+        });
+        return page;
+    });
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = configPaths;
diff --git a/lib/reducers/tutorial/index.js b/lib/reducers/tutorial/index.js
@@ -2,6 +2,7 @@
 var path_1 = require('path');
 var tutorial_config_1 = require('./tutorial-config');
 var _types_1 = require('../../actions/_types');
+var config_paths_1 = require('./config-paths');
 var _tutorial = {
     name: null,
     info: null,
@@ -18,6 +19,7 @@ function tutorialReducer(tutorial, action) {
             var packageJson = require(path_1.join(packagePath, 'package.json'));
             var config = tutorial_config_1.tutorialConfig(packageJson, dir);
             var _b = require(path_1.join(packagePath, packageJson.main)), info = _b.info, pages = _b.pages;
+            pages = config_paths_1.default(dir, name_1, config, pages || []);
             return {
                 name: packageJson.name,
                 info: info,
diff --git a/src/actions/alert.ts b/src/actions/alert.ts
@@ -2,7 +2,7 @@ import {ALERT_REPLAY, ALERT_TOGGLE} from './_types';
 
 export function alertToggle(alert: Object, filter?: string): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
-    dispatch({ type: ALERT_TOGGLE, payload: { alert } });
+    dispatch({ type: ALERT_TOGGLE, payload: { alert }, filter });
   };
 }
 
diff --git a/src/actions/page.ts b/src/actions/page.ts
@@ -1,7 +1,6 @@
 import {
   ROUTE_SET, PAGE_SET, PAGE_POSITION_SET
 } from './_types';
-import configTaskTests from './config-task-tests';
 import {hintPositionSet} from './hint';
 
 export function pageNext(): ReduxThunk.ThunkInterface | Action {
@@ -21,9 +20,7 @@ export function pageSet(pagePosition = 0): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
     const {dir, progress, tutorial} = getState();
     // create absolute paths for 'task-tests'
-    const tasks = configTaskTests(
-      dir, tutorial, tutorial.pages[pagePosition].tasks || []
-    );
+    const tasks = tutorial.pages[pagePosition].tasks || [];
     if (pagePosition >= progress.pages.length) {
       dispatch({ type: ROUTE_SET, payload: { route: 'final' } });
     }
diff --git a/src/actions/progress.ts b/src/actions/progress.ts
@@ -2,6 +2,7 @@ import {
   PROGRESS_PAGE_POSITION_LOAD, PROGRESS_LOAD, COMPLETE_PAGE, COMPLETE_TUTORIAL
 } from './_types';
 import {alertToggle} from './alert';
+import {testRun} from './test';
 
 export function progressPagePositionLoad(): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
@@ -16,29 +17,34 @@ export function progressLoad(): ReduxThunk.ThunkInterface {
     dispatch({ type: PROGRESS_LOAD, payload: { tutorial } });
     // call pagePositionLoad after progress loads
     dispatch(progressPagePositionLoad());
+    dispatch(testRun());
   };
 }
 
-export function completePage(): ReduxThunk.ThunkInterface {
+export function completePage(completed = true): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
     const {pagePosition, progress, tutorial} = getState();
     // all pages are true, tutorial complete
-    dispatch({ type: COMPLETE_PAGE, payload: { pagePosition, tutorial } });
-    if (progress.pages.every(x => x.completed)) {
-      dispatch(completeTutorial());
-    } else {
-      dispatch(alertToggle({
-        message: `Page ${pagePosition + 1} Complete`,
-        action: 'pass',
-      }));
+    dispatch({ type: COMPLETE_PAGE, payload: { pagePosition, tutorial, completed } });
+    if (completed) {
+      if (progress.pages.every(x => x.completed)) {
+        dispatch(completeTutorial());
+      } else {
+        dispatch(alertToggle({
+          message: `Page ${pagePosition + 1} Complete`,
+          action: 'pass',
+        }));
+      }
+    } else if (progress.completed) {
+      dispatch(completeTutorial(false));
     }
   };
 }
 
-export function completeTutorial(): ReduxThunk.ThunkInterface {
+export function completeTutorial(completed = true): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
     const {tutorial} = getState();
-    dispatch({ type: COMPLETE_TUTORIAL, payload: { tutorial } });
+    dispatch({ type: COMPLETE_TUTORIAL, payload: { tutorial, completed } });
     dispatch(alertToggle({
       message: 'Tutorial Complete',
       action: 'pass',
diff --git a/src/actions/test.ts b/src/actions/test.ts
@@ -2,6 +2,7 @@ import {
   TEST_RUN, TEST_RESULT, TEST_COMPLETE, TEST_SAVE
 } from './_types';
 import {hintPositionSet} from './hint';
+import {completePage} from './progress';
 
 export function testRun(): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
@@ -14,11 +15,14 @@ export function testRun(): ReduxThunk.ThunkInterface {
 
 export function testResult(result: Test.Result): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
-    const {taskActions} = getState();
+    const {taskActions, progress, pagePosition} = getState();
     const filter: string = getTestFilter(result);
-    if (result.change !== 0) {
+    if (filter === 'PASS' || filter === 'FAIL') {
       dispatch(hintPositionSet(0));
     }
+    if (filter === 'FAIL' && progress.pages[pagePosition]) {
+      dispatch(completePage(false));
+    }
     dispatch({ type: TEST_RESULT, payload: { result, taskActions }, filter });
   };
 }
diff --git a/src/components/Page/Tasks/index.tsx b/src/components/Page/Tasks/index.tsx
@@ -45,7 +45,10 @@ export default class Tasks extends React.Component<{
         </List>
       </Card>
 
-        <TasksComplete page={page} />
+        <TasksComplete
+          page={page}
+          completed={completed}
+        />
 
         <div ref='listEnd' />
     </div>
diff --git a/src/components/Page/TasksComplete/index.tsx b/src/components/Page/TasksComplete/index.tsx
@@ -14,9 +14,9 @@ const textStyles = {
 };
 
 const TasksComplete: React.StatelessComponent<{
-  page: CR.Page
-}> = ({page}) => {
-  if (!page.completed || !page.onPageComplete) { return null; }
+  page: CR.Page, completed: boolean
+}> = ({page, completed}) => {
+  if (!completed || !page.onPageComplete) { return null; }
   return (
     <Card style={styles}>
       <CardText>
diff --git a/src/components/Page/index.tsx b/src/components/Page/index.tsx
@@ -14,10 +14,11 @@ const styles = {
 
 const Page: React.StatelessComponent<{
   page: CR.Page, tasks: CR.Task[], taskPosition: number,
-  hintPosition: number, testRun: boolean
-}> = ({page, taskPosition, hintPosition, tasks, testRun}) => {
+  hintPosition: number, testRun: boolean,
+  progress: CR.Progress, pagePosition: number
+}> = ({page, taskPosition, hintPosition, tasks, testRun, progress, pagePosition}) => {
   const task = taskPosition <= tasks.length ? tasks[taskPosition] : null;
-  const completed = page.completed;
+  const completed = progress.pages[pagePosition];
   return (
     <section style={styles} className='cr-page'>
       <ContentCard
diff --git a/src/reducers/alert/index.ts b/src/reducers/alert/index.ts
@@ -46,7 +46,7 @@ export default function alertReducer(
     case TEST_RESULT:
       const result = action.payload.result;
 
-      switch (action.payload.filter) {
+      switch (action.filter) {
 
         case 'PASS':
           return setAlert({
diff --git a/src/reducers/page/index.ts b/src/reducers/page/index.ts
diff --git a/src/reducers/progress/index.ts b/src/reducers/progress/index.ts
diff --git a/src/reducers/tutorial/config-paths.ts b/src/reducers/tutorial/config-paths.ts
diff --git a/src/reducers/tutorial/index.ts b/src/reducers/tutorial/index.ts
diff --git a/src/typings/cr/globals.d.ts b/src/typings/cr/globals.d.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`var _types_1 = require('./_types');`
`3`	`3`	`function alertToggle(alert, filter) {`
`4`	`4`	`return function (dispatch, getState) {`
`5`		`- dispatch({ type: _types_1.ALERT_TOGGLE, payload: { alert: alert } });`
	`5`	`+ dispatch({ type: _types_1.ALERT_TOGGLE, payload: { alert: alert }, filter: filter });`
`6`	`6`	`};`
`7`	`7`	`}`
`8`	`8`	`exports.alertToggle = alertToggle;`