resolve editor actions in sequence

Author: ShMcK

lib/reducers/editor-actions/index.js

@@ -2,9 +2,12 @@
 var _types_1 = require('../../actions/_types');
 var actions_1 = require('./actions');
 var store_1 = require('../../store');
-function handleEditorActions(actionArray) {
-    if (actionArray && actionArray.length) {
-        actionArray.map(function (actionString) { return actions_1.editorActions(actionString); });
+function handleEditorActions(actions) {
+    var next = actions.shift();
+    if (next && next.length) {
+        next.reduce(function (total, curr) {
+            return total.then(function () { return actions_1.editorActions(curr); });
+        }, Promise.resolve());
     }
 }
 var currentTaskPosition = 0;
@@ -14,15 +17,15 @@ function editorActionsReducer(editorActions, action) {
     switch (action.type) {
         case _types_1.TESTS_LOAD:
             actions = store_1.default.getState().tasks.map(function (task) { return task.actions || []; });
-            currentTaskPosition = 0;
-            handleEditorActions(actions.shift());
+            handleEditorActions(actions);
             return actions;
         case _types_1.TEST_RESULT:
             actions = action.payload.actions || [];
             var nextTaskPosition = action.payload.result.taskPosition;
-            if (nextTaskPosition > currentTaskPosition) {
-                for (var i = 0; i < nextTaskPosition - currentTaskPosition; i++) {
-                    handleEditorActions(actions.shift());
+            var times = nextTaskPosition - currentTaskPosition;
+            if (times > 0) {
+                for (var i = 0; i < times; i++) {
+                    handleEditorActions(actions);
                 }
                 currentTaskPosition = nextTaskPosition;
             }

src/reducers/editor-actions/index.ts

@@ -2,37 +2,37 @@ import {TESTS_LOAD, TEST_RESULT} from '../../actions/_types';
 import {editorActions} from './actions';
 import store from '../../store';
 
-// TODO: optimize editorActions to string[]
-
-function handleEditorActions(actionArray: string[]): void {
-  if (actionArray && actionArray.length) {
-    // TODO: What is this???
-    actionArray.map((actionString) => editorActions(actionString));
+function handleEditorActions(actions: string[][]): void {
+  const next = actions.shift();
+  if (next && next.length) {
+    // resolve promises in order
+    next.reduce((total: Promise<any>, curr: string) => {
+      return total.then(() => editorActions(curr));
+    }, Promise.resolve());
   }
 }
 
+// trigger actions only once, moving fowards
 let currentTaskPosition = 0;
-/**
- * Test is running, return true, else false
- */
+
 export default function editorActionsReducer(
   editorActions = [], action: Action
 ): string[][] {
   let actions: string[][] = null;
   switch (action.type) {
     case TESTS_LOAD:
       actions = store.getState().tasks.map(task => task.actions || []);
-      currentTaskPosition = 0;
-      handleEditorActions(actions.shift()); // run first action
+      handleEditorActions(actions); // run first action
       return actions;
 
     case TEST_RESULT:
       actions = action.payload.actions || [];
-      const nextTaskPosition = action.payload.result.taskPosition;
-      if (nextTaskPosition > currentTaskPosition) {
+      const nextTaskPosition: number = action.payload.result.taskPosition;
+      const times: number = nextTaskPosition - currentTaskPosition;
+      if (times > 0) {
         // run actions for each task position passed
-        for (let i = 0; i < nextTaskPosition - currentTaskPosition; i++) {
-          handleEditorActions(actions.shift()); // run first action
+        for (let i = 0; i < times; i++) {
+          handleEditorActions(actions); // run first action
         }
         currentTaskPosition = nextTaskPosition;
       }