refactor SET_PACKAGE & PAGE_POSITION_LOAD

ShMcK · ShMcK · commit 87f8460f2e53 · 2016-05-08T20:10:35.000-07:00
diff --git a/lib/actions/_types.js b/lib/actions/_types.js
@@ -6,14 +6,14 @@ exports.COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
 exports.DEVTOOLS_TOGGLE = 'DEVTOOLS_TOGGLE';
 exports.HINT_POSITION_SET = 'HINT_POSITION_SET';
 exports.HINT_SHOW = 'HINT_SHOW';
-exports.PACKAGE_SET = 'PACKAGE_SET';
 exports.PAGE_SET = 'PAGE_SET';
-exports.PAGE_POSITION_LOAD = 'POSITION_LOAD';
 exports.PAGE_POSITION_SET = 'POSITION_SET';
 exports.PROGRESS_LOAD = 'PROGRESS_LOAD';
+exports.PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';
 exports.QUIT = 'QUIT';
 exports.ROUTE_SET = 'ROUTE_SET';
 exports.TEST_SAVE = 'TEST_SAVE';
+exports.SETUP_PACKAGE = 'SETUP_PACKAGE';
 exports.SETUP_VERIFY = 'SETUP_VERIFY';
 exports.TEST_COMPLETE = 'TEST_COMPLETE';
 exports.TEST_RESULT = 'TEST_RESULT';
diff --git a/lib/actions/index.js b/lib/actions/index.js
@@ -6,18 +6,19 @@ var progress_1 = require('./progress');
 exports.progressLoad = progress_1.progressLoad;
 exports.completePage = progress_1.completePage;
 exports.completeTutorial = progress_1.completeTutorial;
+exports.progressPagePositionLoad = progress_1.progressPagePositionLoad;
 var hint_1 = require('./hint');
 exports.hintShow = hint_1.hintShow;
 exports.hintPositionSet = hint_1.hintPositionSet;
 var page_1 = require('./page');
 exports.pageSet = page_1.pageSet;
 exports.pageNext = page_1.pageNext;
-exports.pagePositionLoad = page_1.pagePositionLoad;
 exports.pagePositionSet = page_1.pagePositionSet;
 var route_1 = require('./route');
 exports.routeSet = route_1.routeSet;
 var setup_1 = require('./setup');
 exports.setupVerify = setup_1.setupVerify;
+exports.setupPackage = setup_1.setupPackage;
 var test_1 = require('./test');
 exports.testRun = test_1.testRun;
 exports.testComplete = test_1.testComplete;
diff --git a/lib/actions/page.js b/lib/actions/page.js
@@ -29,13 +29,6 @@ function pageSet(pagePosition) {
     };
 }
 exports.pageSet = pageSet;
-function pagePositionLoad() {
-    return function (dispatch, getState) {
-        var progress = getState().progress;
-        dispatch({ type: _types_1.PAGE_POSITION_LOAD, payload: { progress: progress } });
-    };
-}
-exports.pagePositionLoad = pagePositionLoad;
 function pagePositionSet(pagePosition) {
     return { type: _types_1.PAGE_POSITION_SET, payload: { pagePosition: pagePosition } };
 }
diff --git a/lib/actions/progress.js b/lib/actions/progress.js
@@ -1,11 +1,17 @@
 "use strict";
 var _types_1 = require('./_types');
-var page_1 = require('./page');
+function progressPagePositionLoad() {
+    return function (dispatch, getState) {
+        var progress = getState().progress;
+        dispatch({ type: _types_1.PROGRESS_PAGE_POSITION_LOAD, payload: { progress: progress } });
+    };
+}
+exports.progressPagePositionLoad = progressPagePositionLoad;
 function progressLoad() {
     return function (dispatch, getState) {
         var tutorial = getState().tutorial;
         dispatch({ type: _types_1.PROGRESS_LOAD, payload: { tutorial: tutorial } });
-        dispatch(page_1.pagePositionLoad());
+        dispatch(progressPagePositionLoad());
     };
 }
 exports.progressLoad = progressLoad;
diff --git a/lib/actions/setup.js b/lib/actions/setup.js
@@ -1,11 +1,17 @@
 "use strict";
 var _types_1 = require('./_types');
-var package_1 = require('./package');
 function setupVerify() {
     return function (dispatch, getState) {
-        dispatch(package_1.packageSet());
+        dispatch(setupPackage());
         var _a = getState(), dir = _a.dir, packageJson = _a.packageJson;
         dispatch({ type: _types_1.SETUP_VERIFY, payload: { dir: dir, packageJson: packageJson } });
     };
 }
 exports.setupVerify = setupVerify;
+function setupPackage() {
+    return function (dispatch, getState) {
+        var dir = getState().dir;
+        dispatch({ type: _types_1.SETUP_PACKAGE, payload: { dir: dir } });
+    };
+}
+exports.setupPackage = setupPackage;
diff --git a/lib/reducers/package-json/index.js b/lib/reducers/package-json/index.js
@@ -6,7 +6,7 @@ var exists_1 = require('../../services/exists');
 function packageJsonReducer(pj, action) {
     if (pj === void 0) { pj = null; }
     switch (action.type) {
-        case _types_1.PACKAGE_SET:
+        case _types_1.SETUP_PACKAGE:
             var dir = action.payload.dir;
             var pathToPackageJson = path_1.join(dir, 'package.json');
             if (exists_1.fileExists(pathToPackageJson)) {
diff --git a/lib/reducers/page-position/index.js b/lib/reducers/page-position/index.js
@@ -3,7 +3,7 @@ var _types_1 = require('../../actions/_types');
 function pagePositionReducer(pagePosition, action) {
     if (pagePosition === void 0) { pagePosition = 0; }
     switch (action.type) {
-        case _types_1.PAGE_POSITION_LOAD:
+        case _types_1.PROGRESS_PAGE_POSITION_LOAD:
             var pages = action.payload.progress.pages;
             var firstFail = pages.indexOf(false);
             return firstFail < 0 ? pages.length - 1 : firstFail;
diff --git a/src/actions/_types.ts b/src/actions/_types.ts
@@ -5,14 +5,14 @@ export const COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
 export const DEVTOOLS_TOGGLE = 'DEVTOOLS_TOGGLE';
 export const HINT_POSITION_SET = 'HINT_POSITION_SET';
 export const HINT_SHOW = 'HINT_SHOW';
-export const PACKAGE_SET = 'PACKAGE_SET';
 export const PAGE_SET = 'PAGE_SET';
-export const PAGE_POSITION_LOAD = 'POSITION_LOAD';
 export const PAGE_POSITION_SET = 'POSITION_SET';
 export const PROGRESS_LOAD = 'PROGRESS_LOAD';
+export const PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';
 export const QUIT = 'QUIT';
 export const ROUTE_SET = 'ROUTE_SET';
 export const TEST_SAVE = 'TEST_SAVE';
+export const SETUP_PACKAGE = 'SETUP_PACKAGE';
 export const SETUP_VERIFY = 'SETUP_VERIFY';
 export const TEST_COMPLETE = 'TEST_COMPLETE';
 export const TEST_RESULT = 'TEST_RESULT';
diff --git a/src/actions/index.ts b/src/actions/index.ts
@@ -1,11 +1,12 @@
 export {alertToggle, alertReplay} from './alert';
 export {
-  progressLoad, completePage, completeTutorial
+  progressLoad, completePage, completeTutorial,
+  progressPagePositionLoad
 } from './progress';
 export {hintShow, hintPositionSet} from './hint';
-export {pageSet, pageNext, pagePositionLoad, pagePositionSet} from './page';
+export {pageSet, pageNext, pagePositionSet} from './page';
 export {routeSet} from './route';
-export {setupVerify} from './setup';
+export {setupVerify, setupPackage} from './setup';
 export {
   testRun, testComplete, testResult, testSave
 } from './test';
diff --git a/src/actions/package.ts b/src/actions/package.ts
diff --git a/src/actions/page.ts b/src/actions/page.ts
@@ -1,5 +1,5 @@
 import {
-  ROUTE_SET, PAGE_SET, PAGE_POSITION_SET, PAGE_POSITION_LOAD
+  ROUTE_SET, PAGE_SET, PAGE_POSITION_SET
 } from './_types';
 import configTaskTests from './config-task-tests';
 
@@ -32,13 +32,6 @@ export function pageSet(pagePosition = 0): ReduxThunk.ThunkInterface {
   };
 }
 
-export function pagePositionLoad(): ReduxThunk.ThunkInterface {
-  return (dispatch, getState): void => {
-    const {progress} = getState();
-    dispatch({ type: PAGE_POSITION_LOAD, payload: { progress } });
-  };
-}
-
 export function pagePositionSet(pagePosition: CR.PagePosition): Action {
   return { type: PAGE_POSITION_SET, payload: { pagePosition } };
 }
diff --git a/src/actions/progress.ts b/src/actions/progress.ts
@@ -1,14 +1,20 @@
 import {
-  PROGRESS_LOAD, COMPLETE_PAGE, COMPLETE_TUTORIAL
+  PROGRESS_PAGE_POSITION_LOAD, PROGRESS_LOAD, COMPLETE_PAGE, COMPLETE_TUTORIAL
 } from './_types';
-import {pagePositionLoad} from './page';
+
+export function progressPagePositionLoad(): ReduxThunk.ThunkInterface {
+  return (dispatch, getState): void => {
+    const {progress} = getState();
+    dispatch({ type: PROGRESS_PAGE_POSITION_LOAD, payload: { progress } });
+  };
+}
 
 export function progressLoad(): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
     const {tutorial} = getState();
     dispatch({ type: PROGRESS_LOAD, payload: { tutorial } });
     // call pagePositionLoad after progress loads
-    dispatch(pagePositionLoad());
+    dispatch(progressPagePositionLoad());
   };
 }
 
diff --git a/src/actions/setup.ts b/src/actions/setup.ts
@@ -1,10 +1,16 @@
-import {SETUP_VERIFY} from './_types';
-import {packageSet} from './package';
+import {SETUP_VERIFY, SETUP_PACKAGE} from './_types';
 
 export function setupVerify(): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
-    dispatch(packageSet());
+    dispatch(setupPackage());
     const {dir, packageJson} = getState();
     dispatch({ type: SETUP_VERIFY, payload: { dir, packageJson } });
   };
 }
+
+export function setupPackage(): ReduxThunk.ThunkInterface {
+  return (dispatch, getState): void => {
+    const {dir} = getState();
+    dispatch({ type: SETUP_PACKAGE, payload: { dir } });
+  };
+}
diff --git a/src/reducers/package-json/index.ts b/src/reducers/package-json/index.ts
@@ -1,4 +1,4 @@
-import {PACKAGE_SET} from '../../actions/_types';
+import {SETUP_PACKAGE} from '../../actions/_types';
 import {join} from 'path';
 import {readFileSync} from 'fs';
 import {fileExists} from '../../services/exists';
@@ -8,7 +8,7 @@ export default function packageJsonReducer(
 ): PackageJson {
   switch (action.type) {
 
-    case PACKAGE_SET:
+    case SETUP_PACKAGE:
       const {dir} = action.payload;
       const pathToPackageJson = join(dir, 'package.json');
       if (fileExists(pathToPackageJson)) {
diff --git a/src/reducers/page-position/index.ts b/src/reducers/page-position/index.ts
@@ -1,13 +1,13 @@
 import {
-  PAGE_SET, PAGE_POSITION_SET, PAGE_POSITION_LOAD
+  PAGE_SET, PAGE_POSITION_SET, PROGRESS_PAGE_POSITION_LOAD
 } from '../../actions/_types';
 
 export default function pagePositionReducer(
   pagePosition = 0, action: Action
 ): CR.PagePosition {
   switch (action.type) {
 
-    case PAGE_POSITION_LOAD:
+    case PROGRESS_PAGE_POSITION_LOAD:
       const pages = action.payload.progress.pages;
       const firstFail = pages.indexOf(false);
       return firstFail < 0 ? pages.length - 1 : firstFail;
diff --git a/tsconfig.json b/tsconfig.json
@@ -56,7 +56,6 @@
         "src/actions/config-task-tests.ts",
         "src/actions/hint.ts",
         "src/actions/index.ts",
-        "src/actions/package.ts",
         "src/actions/page.ts",
         "src/actions/progress.ts",
         "src/actions/route.ts",

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,6 @@ function pageSet(pagePosition) {`
`29`	`29`	`};`
`30`	`30`	`}`
`31`	`31`	`exports.pageSet = pageSet;`
`32`		`-function pagePositionLoad() {`
`33`		`- return function (dispatch, getState) {`
`34`		`- var progress = getState().progress;`
`35`		`- dispatch({ type: _types_1.PAGE_POSITION_LOAD, payload: { progress: progress } });`
`36`		`- };`
`37`		`-}`
`38`		`-exports.pagePositionLoad = pagePositionLoad;`
`39`	`32`	`function pagePositionSet(pagePosition) {`
`40`	`33`	`return { type: _types_1.PAGE_POSITION_SET, payload: { pagePosition: pagePosition } };`
`41`	`34`	`}`