allow "open" actions on completed tutorials

ShMcK · ShMcK · commit a0237fe5e7e8 · 2016-05-03T15:32:06.000-07:00
diff --git a/lib/reducers/task-actions/index.js b/lib/reducers/task-actions/index.js
@@ -16,11 +16,18 @@ function taskActionsReducer(taskActions, action) {
     var actions = null;
     switch (action.type) {
         case _types_1.TESTS_LOAD:
-            if (store_1.default.getState().progress.pages[store_1.default.getState().pagePosition]) {
-                return [];
+            var tasks = store_1.default.getState().tasks || [];
+            var pagePosition = store_1.default.getState().pagePosition;
+            var isCompleted = store_1.default.getState().progress.pages[pagePosition];
+            if (!isCompleted) {
+                actions = tasks.map(function (task) { return task.actions || []; });
+            }
+            else {
+                actions = tasks.map(function (task) {
+                    return task.actions.filter(function (a) { return !!a.match(/^open/); });
+                });
             }
             taskTracker = 0;
-            actions = store_1.default.getState().tasks.map(function (task) { return task.actions || []; });
             handleTaskActions(actions);
             return actions;
         case _types_1.TEST_RESULT:
diff --git a/lib/reducers/task-tests/config-task-tests.js b/lib/reducers/task-tests/config-task-tests.js
@@ -34,4 +34,5 @@ function configTaskTests(tasks) {
         return task;
     });
 }
-exports.configTaskTests = configTaskTests;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = configTaskTests;
diff --git a/lib/reducers/tasks/index.js b/lib/reducers/tasks/index.js
@@ -14,7 +14,7 @@ function tasksReducer(tasks, action) {
     switch (action.type) {
         case _types_1.PAGE_SET:
             var pagePosition = action.payload.pagePosition;
-            return config_task_tests_1.configTaskTests(store_1.default.getState().tutorial.pages[pagePosition].tasks || []);
+            return config_task_tests_1.default(store_1.default.getState().tutorial.pages[pagePosition].tasks || []);
         default:
             return tasks;
     }
diff --git a/src/reducers/task-actions/index.ts b/src/reducers/task-actions/index.ts
@@ -22,12 +22,18 @@ export default function taskActionsReducer(
   switch (action.type) {
 
     case TESTS_LOAD:
-
-      if (store.getState().progress.pages[store.getState().pagePosition]) {
-        return [];
+      let tasks = store.getState().tasks || [];
+      const pagePosition = store.getState().pagePosition;
+      const isCompleted = store.getState().progress.pages[pagePosition];
+      if (!isCompleted) {
+        actions = tasks.map(task => task.actions || []);
+      } else {
+        // filter to only 'open' actions
+        actions = tasks.map(task => {
+          return task.actions.filter(a => !!a.match(/^open/));
+        });
       }
       taskTracker = 0;
-      actions = store.getState().tasks.map(task => task.actions || []);
       handleTaskActions(actions); // run first action
       return actions;
 
diff --git a/src/reducers/task-tests/config-task-tests.ts b/src/reducers/task-tests/config-task-tests.ts
@@ -21,7 +21,7 @@ function configTestString(config: Tutorial.Config, name: string, testPath: strin
   return testPath;
 }
 
-export function configTaskTests(tasks: CR.Task[]): CR.Task[] {
+export default function configTaskTests(tasks: CR.Task[]): CR.Task[] {
   const {config, name} = store.getState().tutorial;
   return !tasks ? [] : tasks.map((task: CR.Task) => {
     if (task.tests) {
diff --git a/src/reducers/tasks/index.ts b/src/reducers/tasks/index.ts
@@ -1,6 +1,6 @@
 import {PAGE_SET} from '../../actions/_types';
 import store from '../../store';
-import {configTaskTests} from '../task-tests/config-task-tests';
+import configTaskTests from '../task-tests/config-task-tests';
 
 const _tasks: CR.Task[] = [{
   actions: [],

Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,5 @@ function configTaskTests(tasks) {`
`34`	`34`	`return task;`
`35`	`35`	`});`
`36`	`36`	`}`
`37`		`-exports.configTaskTests = configTaskTests;`
	`37`	`+Object.defineProperty(exports, "__esModule", { value: true });`
	`38`	`+exports.default = configTaskTests;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function tasksReducer(tasks, action) {`
`14`	`14`	`switch (action.type) {`
`15`	`15`	`case _types_1.PAGE_SET:`
`16`	`16`	`var pagePosition = action.payload.pagePosition;`
`17`		`- return config_task_tests_1.configTaskTests(store_1.default.getState().tutorial.pages[pagePosition].tasks \|\| []);`
	`17`	`+ return config_task_tests_1.default(store_1.default.getState().tutorial.pages[pagePosition].tasks \|\| []);`
`18`	`18`	`default:`
`19`	`19`	`return tasks;`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ function configTestString(config: Tutorial.Config, name: string, testPath: strin`
`21`	`21`	`return testPath;`
`22`	`22`	`}`
`23`	`23`
`24`		`-export function configTaskTests(tasks: CR.Task[]): CR.Task[] {`
	`24`	`+export default function configTaskTests(tasks: CR.Task[]): CR.Task[] {`
`25`	`25`	`const {config, name} = store.getState().tutorial;`
`26`	`26`	`return !tasks ? [] : tasks.map((task: CR.Task) => {`
`27`	`27`	`if (task.tests) {`