create editor actions reducer

Author: ShMcK

lib/actions.js

@@ -5,6 +5,10 @@ exports.alertClose = actions_1.alertClose;
 exports.alertReplay = actions_1.alertReplay;
 var actions_2 = require('./modules/editor/actions');
 exports.editorDevToolsToggle = actions_2.editorDevToolsToggle;
+exports.editorOpen = actions_2.editorOpen;
+exports.editorInsert = actions_2.editorInsert;
+exports.editorSave = actions_2.editorSave;
+exports.editorSet = actions_2.editorSet;
 var actions_3 = require('./modules/hints/actions');
 exports.hintPositionSet = actions_3.hintPositionSet;
 var actions_4 = require('./modules/page/actions');

lib/components/Page/PageToolbar/index.js

@@ -2,7 +2,6 @@
 var React = require('react');
 var Toolbar_1 = require('material-ui/Toolbar');
 var index_1 = require('../../index');
-var Continue_1 = require('./Continue');
 var styles = {
     zIndex: '5',
     position: 'relative',
@@ -15,7 +14,7 @@ var styles = {
 exports.PageToolbar = function (_a) {
     var tasks = _a.tasks, taskPosition = _a.taskPosition, children = _a.children;
     return (React.createElement("section", {styles: styles}, children, React.createElement(Toolbar_1.Toolbar, null, React.createElement(Toolbar_1.ToolbarGroup, {float: 'left'}, React.createElement(index_1.ToggleDevTools, null)), React.createElement(Toolbar_1.ToolbarGroup, {float: 'right'}, taskPosition >= tasks.length ?
-        React.createElement(Continue_1.default, null) : React.createElement(index_1.Save, null)))));
+        React.createElement(index_1.Continue, null) : React.createElement(index_1.Save, null)))));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.PageToolbar;

lib/components/index.js

@@ -25,5 +25,6 @@ var tutorials_1 = require('../modules/tutorials');
 exports.Tutorials = tutorials_1.Tutorials;
 var editor_1 = require('../modules/editor');
 exports.ToggleDevTools = editor_1.ToggleDevTools;
-var editor_2 = require('../modules/editor');
-exports.Save = editor_2.Save;
+exports.Save = editor_1.Save;
+var page_1 = require('../modules/page');
+exports.Continue = page_1.Continue;

lib/modules/editor/actions.js

@@ -4,7 +4,19 @@ function editorDevToolsToggle() {
     return { type: types_1.EDITOR_DEVTOOLS_TOGGLE };
 }
 exports.editorDevToolsToggle = editorDevToolsToggle;
+function editorInsert(content) {
+    return { type: types_1.EDITOR_INSERT, payload: { content: content } };
+}
+exports.editorInsert = editorInsert;
+function editorOpen(file, options) {
+    return { type: types_1.EDITOR_OPEN, payload: { file: file, options: options } };
+}
+exports.editorOpen = editorOpen;
 function editorSave() {
     return { type: types_1.EDITOR_SAVE };
 }
 exports.editorSave = editorSave;
+function editorSet(content) {
+    return { type: types_1.EDITOR_SET, payload: { content: content } };
+}
+exports.editorSet = editorSet;

lib/modules/editor/actions/file.js

@@ -2,7 +2,6 @@
 var fs_1 = require('fs');
 var node_file_exists_1 = require('node-file-exists');
 var editor_1 = require('./editor');
-var openTimeout = 200;
 function openFolder() {
     atom.open();
 }
@@ -11,13 +10,14 @@ function save() {
     editor_1.getEditor().then(function (editor) { return editor.save(); });
 }
 exports.save = save;
-function open(filePath, options) {
+function open(file, options) {
     if (options === void 0) { options = {}; }
     return new Promise(function (resolve, reject) {
-        if (node_file_exists_1.default(filePath)) {
-            fs_1.unlink(filePath);
+        if (node_file_exists_1.default(file)) {
+            fs_1.unlink(file);
         }
-        atom.workspace.open(filePath, options);
+        var openTimeout = 200;
+        atom.workspace.open(file, options);
         setTimeout(function () { return resolve(); }, openTimeout);
     });
 }

lib/modules/editor/index.js

@@ -1,6 +1,6 @@
 "use strict";
 var reducer_1 = require('./reducer');
-exports.reducer = reducer_1.default;
+exports.editor = reducer_1.default;
 var dir_1 = require('./dir');
 exports.dir = dir_1.default;
 var ToggleDevTools_1 = require('./ToggleDevTools');

lib/modules/editor/reducer.js

@@ -10,6 +10,16 @@ function editor(editor, action) {
         case types_1.EDITOR_SAVE:
             index_1.save();
             return editor;
+        case types_1.EDITOR_OPEN:
+            var _a = action.payload, file = _a.file, options = _a.options;
+            index_1.open(file, options);
+            return editor;
+        case types_1.EDITOR_INSERT:
+            index_1.insert(action.payload.content);
+            return editor;
+        case types_1.EDITOR_SET:
+            index_1.set(action.payload.content);
+            return editor;
         default:
             return editor;
     }

lib/modules/editor/types.js

@@ -1,3 +1,6 @@
 "use strict";
 exports.EDITOR_DEVTOOLS_TOGGLE = 'EDITOR_DEVTOOLS_TOGGLE';
+exports.EDITOR_INSERT = 'EDITOR_INSERT';
+exports.EDITOR_OPEN = 'EDITOR_OPEN';
 exports.EDITOR_SAVE = 'EDITOR_SAVE';
+exports.EDITOR_SET = 'EDITOR_SET';

lib/components/Page/PageToolbar/Continue/index.js renamed to lib/modules/page/Continue/index.js

@@ -16,7 +16,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var React = require('react');
 var react_redux_1 = require('react-redux');
 var RaisedButton_1 = require('material-ui/RaisedButton');
-var actions_1 = require('../../../../actions');
+var actions_1 = require('../actions');
 var styles = {
     zIndex: '10000',
     border: '0px',

lib/modules/page/actions.js

@@ -1,6 +1,11 @@
 "use strict";
 var types_1 = require('./types');
 var actions_1 = require('../../actions');
+var actions_2 = require('../../actions');
+exports.editorOpen = actions_2.editorOpen;
+exports.editorSave = actions_2.editorSave;
+exports.editorSet = actions_2.editorSet;
+exports.editorInsert = actions_2.editorInsert;
 function pageNext() {
     return function (dispatch, getState) {
         var pagePosition = getState().pagePosition;

lib/modules/page/index.js

@@ -9,3 +9,5 @@ var task_tests_1 = require('./task-tests');
 exports.taskTests = task_tests_1.default;
 var tasks_1 = require('./tasks');
 exports.tasks = tasks_1.default;
+var Continue_1 = require('./Continue');
+exports.Continue = Continue_1.default;

lib/modules/editor/editor.js renamed to lib/modules/page/task-actions/handle-action-string.js

@@ -1,13 +1,14 @@
 "use strict";
-var index_1 = require('./index');
+var store_1 = require('../../../store');
 var parser_1 = require('./parser');
+var actions_1 = require('../actions');
 var Type = {
     OPEN: 'open',
     SET: 'set',
     INSERT: 'insert',
     OPEN_CONSOLE: 'openConsole',
 };
-function editorActionReducer(actionString) {
+function handleActionString(actionString) {
     return new Promise(function (resolve, reject) {
         var command = parser_1.getCommand(actionString);
         var params = parser_1.getParams(actionString);
@@ -17,17 +18,15 @@ function editorActionReducer(actionString) {
                 var file = obj.param;
                 var options = obj.options;
                 if (params.length === 1) {
-                    index_1.open(file, options);
-                    setTimeout(function () {
-                        resolve();
-                    }, 100);
+                    store_1.default.dispatch(actions_1.editorOpen(file, options));
+                    setTimeout(function () { return resolve(); }, 100);
                 }
                 break;
             case Type.SET:
                 if (params.length === 1) {
                     var content_1 = params[0];
                     setTimeout(function () {
-                        index_1.set(content_1);
+                        store_1.default.dispatch(actions_1.editorSet(content_1));
                         resolve(true);
                     });
                 }
@@ -36,15 +35,7 @@ function editorActionReducer(actionString) {
                 if (params.length === 1) {
                     var content_2 = params[0];
                     setTimeout(function () {
-                        index_1.insert(content_2, {});
-                        resolve(true);
-                    });
-                }
-                break;
-            case Type.OPEN_CONSOLE:
-                if (params.length === 0) {
-                    setTimeout(function () {
-                        index_1.openDevTools();
+                        store_1.default.dispatch(actions_1.editorInsert(content_2));
                         resolve(true);
                     });
                 }
@@ -58,4 +49,4 @@ function editorActionReducer(actionString) {
     });
 }
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = editorActionReducer;
+exports.default = handleActionString;

lib/modules/page/task-actions/index.js

@@ -1,11 +1,11 @@
 "use strict";
 var types_1 = require('../types');
-var editor_1 = require('../../editor/editor');
+var handle_action_string_1 = require('./handle-action-string');
 function handleTaskActions(actions) {
     var next = actions.shift();
     if (next && next.length) {
         next.reduce(function (total, curr) {
-            return total.then(function () { return editor_1.default(curr); });
+            return total.then(function () { return handle_action_string_1.default(curr); });
         }, Promise.resolve());
     }
 }

lib/modules/editor/parser/params.js renamed to lib/modules/page/task-actions/parse-params.js

@@ -1,5 +1,5 @@
 "use strict";
-var params_1 = require('./params');
+var parse_params_1 = require('./parse-params');
 function getCommand(actionString) {
     var command = actionString.substring(0, actionString.indexOf('('));
     if (!command.length) {
@@ -11,7 +11,7 @@ function getCommand(actionString) {
 }
 exports.getCommand = getCommand;
 function getParams(actionString) {
-    var parser = new params_1.default();
+    var parser = new parse_params_1.default();
     var command = getCommand(actionString);
     var params = actionString.substring(command.length + 1, actionString.length - 1);
     if (!params.length) {

lib/modules/editor/parser/index.js renamed to lib/modules/page/task-actions/parser.js

@@ -1,6 +1,6 @@
 "use strict";
 var types_1 = require('../types');
-var run_1 = require('../utils/run');
+var run_1 = require('./run');
 var pageTimeout = 800;
 var previous = new Date().getTime();
 function runTest(testRun, action) {

lib/modules/tests/test-run/index.js

@@ -13,7 +13,7 @@ var window_1 = require('./modules/window');
 var editor_1 = require('./modules/editor');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
-    alert: alert_1.reducer, checks: setup_1.reducer, editor: editor_1.reducer, dir: editor_1.dir, hintPosition: hints_1.reducer,
+    alert: alert_1.reducer, checks: setup_1.reducer, editor: editor_1.editor, dir: editor_1.dir, hintPosition: hints_1.reducer,
     packageJson: setup_1.packageJson, page: page_1.page, pagePosition: page_1.pagePosition, progress: progress_1.reducer, route: route_1.reducer, tasks: page_1.tasks,
     tutorial: tutorial_1.reducer, tutorials: tutorials_1.reducer,
     taskActions: page_1.taskActions, taskPosition: tests_1.taskPosition, taskTests: page_1.taskTests, testRun: tests_1.testRun, windowToggle: window_1.reducer

lib/modules/tests/utils/parse-loaders.js renamed to lib/modules/tests/test-run/parse-loaders.js

@@ -1,12 +1,13 @@
 export {alertOpen, alertClose, alertReplay} from './modules/alert/actions';
-export {editorDevToolsToggle} from './modules/editor/actions';
+export {editorDevToolsToggle, editorOpen, editorInsert,
+editorSave, editorSet} from './modules/editor/actions';
 export {hintPositionSet} from './modules/hints/actions';
 export {pageSet, pageNext} from './modules/page/actions';
 export {
-  progressLoad, progressCompletePage
+progressLoad, progressCompletePage
 } from './modules/progress/actions';
 export {routeSet} from './modules/route/actions'
 export {setupVerify, setupPackage} from './modules/setup/actions';
-export {testRun, testResult, testSave, testComplete} from './modules/tests/actions';
+export {testRun, testResult, testComplete} from './modules/tests/actions';
 export {tutorialSet} from './modules/tutorial/actions';
 export {tutorialsFind, tutorialUpdate} from './modules/tutorials/actions';

lib/modules/tests/utils/run.js renamed to lib/modules/tests/test-run/run.js

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import {Toolbar, ToolbarGroup} from 'material-ui/Toolbar';
-import {ToggleDevTools, Save} from '../../index';
-import Continue from './Continue';
+import {ToggleDevTools, Save, Continue} from '../../index';
 
 const styles = {
     zIndex: '5',

lib/modules/tests/utils/test-result.js renamed to lib/modules/tests/test-run/test-result.js

@@ -11,5 +11,5 @@ export {Alert} from '../modules/alert';
 export {RouteButton} from '../modules/route';
 export {Checks} from '../modules/setup';
 export {Tutorials} from '../modules/tutorials';
-export {ToggleDevTools} from '../modules/editor';
-export {Save} from '../modules/editor';
+export {ToggleDevTools, Save} from '../modules/editor';
+export {Continue} from '../modules/page';

lib/reducers.js

@@ -1,9 +1,24 @@
-import {EDITOR_DEVTOOLS_TOGGLE, EDITOR_SAVE} from './types';
+import {
+  EDITOR_DEVTOOLS_TOGGLE, EDITOR_INSERT, EDITOR_OPEN,
+  EDITOR_SAVE, EDITOR_SET
+} from './types';
 
 export function editorDevToolsToggle(): Action {
   return { type: EDITOR_DEVTOOLS_TOGGLE };
 }
 
+export function editorInsert(content: string): Action {
+  return { type: EDITOR_INSERT, payload: { content } };
+}
+
+export function editorOpen(file: string, options: Object): Action {
+  return { type: EDITOR_OPEN, payload: { file, options } };
+}
+
 export function editorSave(): Action {
   return { type: EDITOR_SAVE };
 }
+
+export function editorSet(content: string): Action {
+  return { type: EDITOR_SET, payload: { content } };
+}

src/actions.ts

@@ -2,9 +2,6 @@ import {unlink} from 'fs';
 import fileExists from 'node-file-exists';
 import {getEditor} from './editor';
 
-// delay necessary since opening a file is slow
-const openTimeout = 200;
-
 export function openFolder(): void {
   atom.open();
 }
@@ -13,14 +10,15 @@ export function save() {
   getEditor().then(editor => editor.save());
 }
 
-export function open(filePath: string, options = {}): Promise<any> {
+export function open(file: string, options = {}): Promise<any> {
   return new Promise((resolve, reject) => {
     // delete file first, to avoid bug
-    if (fileExists(filePath)) {
-      unlink(filePath);
+    if (fileExists(file)) {
+      unlink(file);
     }
-
-    atom.workspace.open(filePath, options);
+    // delay necessary since opening a file is slow
+    const openTimeout = 200;
+    atom.workspace.open(file, options);
     setTimeout(() => resolve(), openTimeout);
   });
 }

src/components/Page/PageToolbar/index.tsx

@@ -1,4 +1,4 @@
-export {default as reducer} from './reducer';
+export {default as editor} from './reducer';
 export {default as dir} from './dir';
 
 export {default as ToggleDevTools} from './ToggleDevTools';

src/components/index.ts

@@ -1,5 +1,8 @@
-import {EDITOR_DEVTOOLS_TOGGLE, EDITOR_SAVE} from './types';
-import {toggleDevTools, save} from './index';
+import {
+  EDITOR_DEVTOOLS_TOGGLE, EDITOR_SAVE, EDITOR_OPEN,
+  EDITOR_SET, EDITOR_INSERT
+} from './types';
+import {toggleDevTools, save, set, insert, open} from './index';
 
 export default function editor(
   editor = 'atom', action: Action
@@ -14,6 +17,19 @@ export default function editor(
       save();
       return editor;
 
+    case EDITOR_OPEN:
+      const {file, options} = action.payload;
+      open(file, options);
+      return editor;
+
+    case EDITOR_INSERT:
+      insert(action.payload.content);
+      return editor;
+
+    case EDITOR_SET:
+      set(action.payload.content);
+      return editor;
+
     default:
       return editor;
   }

src/modules/editor/actions.ts

@@ -1,2 +1,5 @@
 export const EDITOR_DEVTOOLS_TOGGLE = 'EDITOR_DEVTOOLS_TOGGLE';
+export const EDITOR_INSERT = 'EDITOR_INSERT';
+export const EDITOR_OPEN = 'EDITOR_OPEN';
 export const EDITOR_SAVE = 'EDITOR_SAVE';
+export const EDITOR_SET = 'EDITOR_SET';

src/modules/editor/actions/file.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import RaisedButton from 'material-ui/RaisedButton';
-import {pageNext} from '../../../../actions';
+import {pageNext} from '../actions';
 
 const styles = {
   zIndex: '10000',