load page position progress

Author: ShMcK

lib/modules/page/page-position/index.js

@@ -5,6 +5,10 @@ function pagePosition(pagePosition, action) {
     switch (action.type) {
         case types_1.PAGE_SET:
             return action.payload.pagePosition;
+        case 'PROGRESS_PAGE_POSITION':
+            var pages = action.payload.progress.pages;
+            var firstFail = pages.indexOf(false);
+            return firstFail < 0 ? pages.length - 1 : firstFail;
         default:
             return pagePosition;
     }

lib/modules/progress/actions.js

@@ -5,10 +5,17 @@ function progressLoad() {
     return function (dispatch, getState) {
         var tutorial = getState().tutorial;
         dispatch({ type: types_1.PROGRESS_LOAD, payload: { tutorial: tutorial } });
+        dispatch(_progressPagePosition());
         dispatch(actions_1.testRun());
     };
 }
 exports.progressLoad = progressLoad;
+function _progressPagePosition() {
+    return function (dispatch, getState) {
+        var progress = getState().progress;
+        dispatch({ type: types_1.PROGRESS_PAGE_POSITION, payload: { progress: progress } });
+    };
+}
 function progressCompletePage(completed) {
     if (completed === void 0) { completed = true; }
     return function (dispatch, getState) {

lib/modules/progress/types.js

@@ -1,4 +1,5 @@
 "use strict";
-exports.PROGRESS_LOAD = 'PROGRESS_LOAD';
 exports.PROGRESS_COMPLETE_PAGE = 'PROGRESS_COMPLETE_PAGE';
 exports.PROGRESS_COMPLETE_TUTORIAL = 'PROGRESS_COMPLETE_TUTORIAL';
+exports.PROGRESS_LOAD = 'PROGRESS_LOAD';
+exports.PROGRESS_PAGE_POSITION = 'PROGRESS_PAGE_POSITION';

src/modules/page/page-position/index.ts

@@ -8,6 +8,12 @@ export default function pagePosition(
     case PAGE_SET:
       return action.payload.pagePosition;
 
+    // allow access until before first incomplete tutorial
+    case 'PROGRESS_PAGE_POSITION':
+      const pages = action.payload.progress.pages;
+      const firstFail = pages.indexOf(false);
+      return firstFail < 0 ? pages.length - 1 : firstFail;
+
     default:
       return pagePosition;
   }

src/modules/progress/actions.ts

@@ -1,5 +1,5 @@
 import {
-  PROGRESS_LOAD, PROGRESS_COMPLETE_PAGE, PROGRESS_COMPLETE_TUTORIAL
+  PROGRESS_LOAD, PROGRESS_COMPLETE_PAGE, PROGRESS_PAGE_POSITION, PROGRESS_COMPLETE_TUTORIAL
 } from './types';
 import {alertOpen, testRun} from '../../actions';
 
@@ -8,10 +8,18 @@ export function progressLoad(): ReduxThunk.ThunkInterface {
   return (dispatch, getState) => {
     const {tutorial} = getState();
     dispatch({ type: PROGRESS_LOAD, payload: { tutorial } });
+    dispatch(_progressPagePosition());
     dispatch(testRun());
   };
 }
 
+function _progressPagePosition() {
+  return function(dispatch, getState) {
+    const {progress} = getState();
+    dispatch({ type: PROGRESS_PAGE_POSITION, payload: { progress } });
+  };
+}
+
 export function progressCompletePage(completed = true): ReduxThunk.ThunkInterface {
   return (dispatch, getState) => {
     const {pagePosition, progress, tutorial} = getState();

src/modules/progress/types.ts

@@ -1,3 +1,4 @@
-export const PROGRESS_LOAD = 'PROGRESS_LOAD';
 export const PROGRESS_COMPLETE_PAGE = 'PROGRESS_COMPLETE_PAGE';
 export const PROGRESS_COMPLETE_TUTORIAL = 'PROGRESS_COMPLETE_TUTORIAL';
+export const PROGRESS_LOAD = 'PROGRESS_LOAD';
+export const PROGRESS_PAGE_POSITION = 'PROGRESS_PAGE_POSITION';