refactor redux actions (noun + verb), minor fixes

Author: ShMcK

lib/actions/_actions.js

@@ -0,0 +1,30 @@
+"use strict";
+var alert_1 = require('./alert');
+exports.alertToggle = alert_1.alertToggle;
+exports.alertReplay = alert_1.alertReplay;
+var complete_1 = require('./complete');
+exports.completePage = complete_1.completePage;
+exports.completeChapter = complete_1.completeChapter;
+exports.completeTutorial = complete_1.completeTutorial;
+var globals_1 = require('./globals');
+exports.globalsSet = globals_1.globalsSet;
+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;
+var position_1 = require('./position');
+exports.positionSet = position_1.positionSet;
+var route_1 = require('./route');
+exports.setRoute = route_1.setRoute;
+var setup_1 = require('./setup');
+exports.setupVerify = setup_1.setupVerify;
+var test_1 = require('./test');
+exports.testRun = test_1.testRun;
+exports.testComplete = test_1.testComplete;
+exports.testResult = test_1.testResult;
+var tutorial_1 = require('./tutorial');
+exports.tutorialsFind = tutorial_1.tutorialsFind;
+exports.tutorialUpdate = tutorial_1.tutorialUpdate;
+exports.tutorialSet = tutorial_1.tutorialSet;

lib/actions/_types.js

@@ -0,0 +1,20 @@
+"use strict";
+exports.ALERT_REPLAY = 'ALERT_REPLAY';
+exports.ALERT_TOGGLE = 'ALERT_TOGGLE';
+exports.COMPLETE_CHAPTER = 'COMPLETE_CHAPTER';
+exports.COMPLETE_PAGE = 'COMPLETE_PAGE';
+exports.COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
+exports.GLOBALS_SET = 'GLOBALS_SET';
+exports.HINT_POSITION_SET = 'HINT_POSITION_SET';
+exports.HINT_SHOW = 'HINT_SHOW';
+exports.PAGE_NEXT = 'PAGE_NEXT';
+exports.PAGE_SET = 'PAGE_SET';
+exports.POSITION_SET = 'POSITION_SET';
+exports.ROUTE_SET = 'ROUTE_SET';
+exports.SETUP_VERIFY = 'SETUP_VERIFY';
+exports.TEST_COMPLETE = 'TEST_COMPLETE';
+exports.TEST_RESULT = 'TEST_RESULT';
+exports.TEST_RUN = 'TEST_RUN';
+exports.TUTORIAL_SET = 'TUTORIAL_SET';
+exports.TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';
+exports.TUTORIALS_FIND = 'TUTORIALS_FIND';

lib/actions/actionTypes.js

@@ -1,24 +1,22 @@
 "use strict";
-exports.VERIFY_SETUP = 'VERIFY_SETUP';
-exports.SET_GLOBALS = 'SET_GLOBALS';
-exports.SET_TUTORIAL_INFO = 'SET_TUTORIAL_INFO';
-exports.LOAD_TUTORIALS = 'LOAD_TUTORIALS';
-exports.UPDATE_TUTORIAL = 'UPDATE_TUTORIAL';
-exports.SET_ROUTE = 'SET_ROUTE';
-exports.SET_PAGE = 'SET_PAGE';
-exports.NEXT_PAGE = 'NEXT_PAGE';
-exports.SET_POSITION = 'SET_POSITION';
-exports.SET_PROGRESS = 'SET_PROGRESS';
-exports.PAGE_COMPLETE = 'PAGE_COMPLETE';
-exports.CHAPTER_COMPLETE = 'CHAPTER_COMPLETE';
-exports.PROJECT_COMPLETE = 'PROJECT_COMPLETE';
+exports.ALERT_REPLAY = 'ALERT_REPLAY';
+exports.ALERT_TOGGLE = 'ALERT_TOGGLE';
+exports.COMPLETE_CHAPTER = 'COMPLETE_CHAPTER';
+exports.COMPLETE_PAGE = 'COMPLETE_PAGE';
+exports.COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
 exports.EDITOR_ACTIONS = 'EDITOR_ACTIONS';
-exports.SHOW_HINT = 'SHOW_HINT';
-exports.SHOW_SOLUTION = 'SHOW_SOLUTION';
-exports.SET_HINT_POSITION = 'SET_HINT_POSITION';
-exports.RUN_TESTS = 'RUN_TESTS';
+exports.GLOBALS_SET = 'GLOBALS_SET';
+exports.HINT_POSITION_SET = 'HINT_POSITION_SET';
+exports.HINT_SHOW = 'HINT_SHOW';
+exports.LOG_TOGGLE = 'LOG_TOGGLE';
+exports.PAGE_SET = 'PAGE_SET';
+exports.POSITION_SET = 'POSITION_SET';
+exports.PROGRESS_SET = 'PROGRESS_SET';
+exports.ROUTE_SET = 'ROUTE_SET';
+exports.SETUP_VERIFY = 'SETUP_VERIFY';
 exports.TEST_COMPLETE = 'TEST_COMPLETE';
 exports.TEST_RESULT = 'TEST_RESULT';
-exports.TOGGLE_LOG = 'CHECK_LOG';
-exports.TOGGLE_ALERT = 'TOGGLE_ALERT';
-exports.REPLAY_ALERT = 'SHOW_ALERT';
+exports.TEST_RUN = 'TEST_RUN';
+exports.TUTORIAL_INFO_SET = 'TUTORIAL_INFO_SET';
+exports.TUTORIALS_LOAD = 'TUTORIALS_LOAD';
+exports.TUTORIAL_UPDATE = 'TUTORIAL_UPDATE';

lib/actions/actions.js

@@ -26,19 +26,19 @@ exports.replayAlert = alert_1.replayAlert;
 var routes_1 = require('./routes');
 exports.setRoute = routes_1.setRoute;
 function setGlobals(packageJson) {
-    return { type: actionTypes_1.SET_GLOBALS, payload: { packageJson: packageJson } };
+    return { type: actionTypes_1.GLOBALS_SET, payload: { packageJson: packageJson } };
 }
 exports.setGlobals = setGlobals;
 function verifySetup() {
-    return { type: actionTypes_1.VERIFY_SETUP };
+    return { type: actionTypes_1.SETUP_VERIFY };
 }
 exports.verifySetup = verifySetup;
 function setProgress() {
-    return { type: actionTypes_1.SET_PROGRESS };
+    return { type: actionTypes_1.PROGRESS_SET };
 }
 exports.setProgress = setProgress;
 function setPosition(position) {
-    return { type: actionTypes_1.SET_POSITION, payload: { position: position } };
+    return { type: actionTypes_1.POSITION_SET, payload: { position: position } };
 }
 exports.setPosition = setPosition;
 function loadTutorial(tutorial) {
@@ -50,6 +50,6 @@ function loadTutorial(tutorial) {
 exports.loadTutorial = loadTutorial;
 function toggleLog() {
     var open = !store_1.store.getState().log.open;
-    return { type: actionTypes_1.TOGGLE_LOG, payload: { open: open } };
+    return { type: actionTypes_1.LOG_TOGGLE, payload: { open: open } };
 }
 exports.toggleLog = toggleLog;

lib/actions/alert.js

@@ -1,18 +1,18 @@
 "use strict";
 var store_1 = require('../store/store');
-var actionTypes_1 = require('./actionTypes');
-function toggleAlert(alert) {
+var _types_1 = require('./_types');
+function alertToggle(alert) {
     var isOpen = store_1.store.getState().alert.open;
     if (!alert) {
         alert = { message: '', action: '', open: false };
     }
     else {
         alert = Object.assign({}, { open: !isOpen }, alert);
     }
-    return { type: actionTypes_1.TOGGLE_ALERT, payload: { alert: alert } };
+    return { type: _types_1.ALERT_TOGGLE, payload: { alert: alert } };
 }
-exports.toggleAlert = toggleAlert;
-function replayAlert() {
-    return { type: actionTypes_1.REPLAY_ALERT };
+exports.alertToggle = alertToggle;
+function alertReplay() {
+    return { type: _types_1.ALERT_REPLAY };
 }
-exports.replayAlert = replayAlert;
+exports.alertReplay = alertReplay;

lib/actions/complete.js

@@ -0,0 +1,25 @@
+"use strict";
+var _types_1 = require('./_types');
+var store_1 = require('../store/store');
+function completePage() {
+    var position = store_1.store.getState().position;
+    var pageLength = store_1.store.getState().progress.chapters[position.chapter].pages.length;
+    if (position.page >= pageLength - 1) {
+        return completeChapter();
+    }
+    return { type: _types_1.COMPLETE_PAGE, payload: { position: position } };
+}
+exports.completePage = completePage;
+function completeChapter() {
+    var chapter = store_1.store.getState().position.chapter;
+    var chapterLength = store_1.store.getState().progress.chapters.length;
+    if (chapter >= chapterLength - 1) {
+        return completeTutorial();
+    }
+    return { type: _types_1.COMPLETE_CHAPTER, payload: { chapter: chapter } };
+}
+exports.completeChapter = completeChapter;
+function completeTutorial() {
+    return { type: _types_1.COMPLETE_TUTORIAL };
+}
+exports.completeTutorial = completeTutorial;

lib/actions/globals.js

@@ -0,0 +1,6 @@
+"use strict";
+var _types_1 = require('./_types');
+function globalsSet(packageJson) {
+    return { type: _types_1.GLOBALS_SET, payload: { packageJson: packageJson } };
+}
+exports.globalsSet = globalsSet;

lib/actions/hint.js

@@ -0,0 +1,10 @@
+"use strict";
+var _types_1 = require('./_types');
+function hintPositionSet(hintPosition) {
+    return { type: _types_1.HINT_POSITION_SET, payload: { hintPosition: hintPosition } };
+}
+exports.hintPositionSet = hintPositionSet;
+function hintShow() {
+    return { type: _types_1.HINT_SHOW };
+}
+exports.hintShow = hintShow;

lib/actions/page-actions.js

@@ -5,13 +5,13 @@ var tutorial_package_1 = require('../services/tutorial-package');
 function setPage(selectedPosition) {
     if (selectedPosition === void 0) { selectedPosition = { chapter: 0, page: 0 }; }
     if (selectedPosition.completed) {
-        return { type: actionTypes_1.SET_ROUTE, payload: { route: 'final' } };
+        return { type: actionTypes_1.ROUTE_SET, payload: { route: 'final' } };
     }
     var page = tutorial_package_1.default.getPage(selectedPosition);
     var tasks = tutorial_package_1.default.getTasks(selectedPosition);
     var taskTests = [].concat.apply([], tasks.map(function (task) { return task.tests || []; }));
     var actions = tasks.map(function (task) { return task.actions || []; });
-    return { type: actionTypes_1.SET_PAGE, payload: { page: page, tasks: tasks, position: selectedPosition, taskTests: taskTests, actions: actions } };
+    return { type: actionTypes_1.PAGE_SET, payload: { page: page, tasks: tasks, position: selectedPosition, taskTests: taskTests, actions: actions } };
 }
 exports.setPage = setPage;
 function nextPage() {

lib/actions/page.js

@@ -0,0 +1,22 @@
+"use strict";
+var _types_1 = require('./_types');
+var store_1 = require('../store/store');
+var tutorial_package_1 = require('../services/tutorial-package');
+function pageNext() {
+    var position = store_1.store.getState().position;
+    var nextPosition = tutorial_package_1.default.getNextPosition(position);
+    return pageSet(nextPosition);
+}
+exports.pageNext = pageNext;
+function pageSet(selectedPosition) {
+    if (selectedPosition === void 0) { selectedPosition = { chapter: 0, page: 0 }; }
+    if (selectedPosition.completed) {
+        return { type: _types_1.ROUTE_SET, payload: { route: 'final' } };
+    }
+    var page = tutorial_package_1.default.getPage(selectedPosition);
+    var tasks = tutorial_package_1.default.getTasks(selectedPosition);
+    var taskTests = [].concat.apply([], tasks.map(function (task) { return task.tests || []; }));
+    var actions = tasks.map(function (task) { return task.actions || []; });
+    return { type: _types_1.PAGE_SET, payload: { page: page, tasks: tasks, position: selectedPosition, taskTests: taskTests, actions: actions } };
+}
+exports.pageSet = pageSet;