fix task run styles, lower timeout values

ShMcK · ShMcK · commit 683b0f530d16 · 2016-04-30T13:13:55.000-07:00
diff --git a/lib/atom/actions/file.js b/lib/atom/actions/file.js
@@ -2,6 +2,7 @@
 var fs_1 = require('fs');
 var exists_1 = require('../../services/exists');
 var editor_1 = require('./editor');
+var openTimeout = 200;
 function openFolder() {
     atom.open();
 }
@@ -19,7 +20,7 @@ function open(filePath, options) {
         atom.workspace.open(filePath, options);
         setTimeout(function () {
             resolve();
-        }, 200);
+        }, openTimeout);
     });
 }
 exports.open = open;
diff --git a/lib/atom/actions/terminal.js b/lib/atom/actions/terminal.js
@@ -1,11 +1,5 @@
 "use strict";
 function openTerminal() {
-    if (atom.packages.isPackageActive('terminal-plus')) {
-        if (!document.getElementsByClassName('xterm')[0]) {
-            atom.commands.dispatch(document.getElementsByTagName('atom-workspace')[0], 'terminal-plus:toggle');
-        }
-        return true;
-    }
     return false;
 }
 exports.openTerminal = openTerminal;
diff --git a/lib/atom/actions/write.js b/lib/atom/actions/write.js
@@ -17,9 +17,6 @@ function set(text) {
 exports.set = set;
 function insert(text, options) {
     if (options === void 0) { options = {}; }
-    options = Object.assign(options, {
-        autoIndent: true,
-    });
     return write('insert', text, options);
 }
 exports.insert = insert;
diff --git a/lib/components/Page/Task/index.js b/lib/components/Page/Task/index.js
@@ -27,6 +27,6 @@ function getStatus(index, taskPosition, testRun) {
 exports.Task = function (_a) {
     var task = _a.task, taskPosition = _a.taskPosition, index = _a.index, testRun = _a.testRun;
     var backgroundColor = getStatus(index, taskPosition, testRun);
-    var currentTask = taskPosition === index;
-    return (React.createElement(List_1.ListItem, {key: index, style: Object.assign({}, styles, { backgroundColor: backgroundColor })}, taskCheckbox_1.taskCheckbox(task, testRun), React.createElement("span", {style: indexStyles}, index + 1, "."), React.createElement("div", {style: descriptionStyles}, React.createElement(index_1.Markdown, null, task.description))));
+    var isCurrentTask = taskPosition === index;
+    return (React.createElement(List_1.ListItem, {key: index, style: Object.assign({}, styles, { backgroundColor: backgroundColor })}, taskCheckbox_1.taskCheckbox(isCurrentTask, testRun), React.createElement("span", {style: indexStyles}, index + 1, "."), React.createElement("div", {style: descriptionStyles}, React.createElement(index_1.Markdown, null, task.description))));
 };
diff --git a/lib/components/Page/Task/taskCheckbox.js b/lib/components/Page/Task/taskCheckbox.js
@@ -6,8 +6,8 @@ var styles = {
     position: 'absolute',
     top: '15px'
 };
-function taskCheckbox(currentTask, testRun) {
-    if (!currentTask || !testRun) {
+function taskCheckbox(isCurrentTask, testRun) {
+    if (!isCurrentTask || !testRun) {
         return null;
     }
     return (React.createElement("span", {style: styles}, React.createElement(indeterminate_check_box_1.default, {color: colors_1.orange500})));
diff --git a/lib/reducers/editor-actions/actions.js b/lib/reducers/editor-actions/actions.js
@@ -13,11 +13,9 @@ function editorActions(actionString) {
         var params = action_helpers_1.getParams(actionString);
         switch (command) {
             case Type.OPEN:
-                var obj = action_helpers_1.getOptions(params[0]);
-                var file = obj.param;
-                var options = obj.options;
+                var _a = action_helpers_1.getOptions(params[0]), param = _a.param, options = _a.options;
                 if (params.length === 1) {
-                    editor_1.open(file, options);
+                    editor_1.open(param, options);
                     setTimeout(function () {
                         resolve();
                     }, 100);
diff --git a/lib/reducers/editor-actions/index.js b/lib/reducers/editor-actions/index.js
@@ -18,7 +18,7 @@ function editorActionsReducer(editorActions, action) {
             handleEditorActions(actions.shift());
             return actions;
         case _types_1.TEST_RESULT:
-            actions = action.payload.actions;
+            actions = action.payload.actions || [];
             var nextTaskPosition = action.payload.result.taskPosition;
             if (nextTaskPosition > currentTaskPosition) {
                 for (var i = 0; i < nextTaskPosition - currentTaskPosition; i++) {
diff --git a/lib/reducers/progress/index.js b/lib/reducers/progress/index.js
@@ -27,8 +27,8 @@ function progressReducer(progress, action) {
                     })
             };
         case _types_1.COMPLETE_PAGE:
-            var position = action.payload.position;
-            progress.chapters[position.chapter].pages[position.page] = true;
+            var _a = action.payload.position, chapter = _a.chapter, page = _a.page;
+            progress.chapters[chapter].pages[page] = true;
             local_storage_1.saveToLocalStorage(progress);
             return progress;
         case _types_1.COMPLETE_CHAPTER:
diff --git a/lib/reducers/route/index.js b/lib/reducers/route/index.js
@@ -5,7 +5,6 @@ function routeReducer(route, action) {
     if (route === void 0) { route = _route; }
     switch (action.type) {
         case _types_1.ROUTE_SET:
-            var next = action.payload.route;
             return action.payload.route;
         default:
             return route;
diff --git a/lib/reducers/task-tests/index.js b/lib/reducers/task-tests/index.js
@@ -6,19 +6,15 @@ function taskTestsReducer(taskTests, action) {
     if (taskTests === void 0) { taskTests = ''; }
     switch (action.type) {
         case _types_1.TESTS_LOAD:
-            var tasks = store_1.default.getState().tasks;
-            var tests = [].concat.apply([], tasks.map(function (task) { return task.tests || []; }));
-            var output_1 = '';
-            tests.forEach(function (file) {
+            return [].concat.apply([], store_1.default.getState().tasks.map(function (task) { return task.tests || []; })).reduce(function (output, file) {
                 try {
-                    var data = fs_1.readFileSync(file, 'utf8');
-                    output_1 += data + '\n';
+                    output += fs_1.readFileSync(file, 'utf8') + '\n';
                 }
                 catch (e) {
                     console.log('Error reading test file', e);
                 }
-            });
-            return output_1;
+                return output;
+            }, '');
         default:
             return taskTests;
     }
diff --git a/lib/reducers/tasks/config-task-tests.js b/lib/reducers/tasks/config-task-tests.js
@@ -11,8 +11,7 @@ function configTestString(config, name, testPath) {
         testPath = path_1.join(tutorial.config.dir, testPath);
     }
     else {
-        var dir = store_1.default.getState().dir;
-        testPath = path_1.join(dir, 'node_modules', name, testPath);
+        testPath = path_1.join(store_1.default.getState().dir, 'node_modules', name, testPath);
     }
     if (tutorial.config.testSuffix) {
         testPath += tutorial.config.testSuffix;
diff --git a/lib/reducers/test-run/index.js b/lib/reducers/test-run/index.js
@@ -1,7 +1,7 @@
 "use strict";
 var _types_1 = require('../../actions/_types');
 var run_1 = require('./run');
-var pageTimeout = 2000;
+var pageTimeout = 800;
 var previous = new Date().getTime();
 function runTestReducer(testRun, action) {
     if (testRun === void 0) { testRun = false; }
diff --git a/src/atom/actions/editor.ts b/src/atom/actions/editor.ts
@@ -4,7 +4,7 @@ export function getEditor(): Promise<AtomCore.IEditor> {
     let editor = atom.workspace.getActiveTextEditor();
     while (!editor) {
       getEditorCount += 1;
-      setTimeout(function() {
+      setTimeout(() => {
         editor = atom.workspace.getActiveTextEditor();
       }, 10);
       if (getEditorCount > 1000) {
diff --git a/src/atom/actions/file.ts b/src/atom/actions/file.ts
@@ -2,6 +2,9 @@ import {unlink} from 'fs';
 import {fileExists} from '../../services/exists';
 import {getEditor} from './editor';
 
+// delay necessary since opening a file is slow
+const openTimeout = 200;
+
 export function openFolder(): void {
   atom.open();
 }
@@ -19,6 +22,6 @@ export function open(filePath: string, options = {}): Promise<any> {
     atom.workspace.open(filePath, options);
     setTimeout(() => {
       resolve();
-    }, 200); // delay necessary since opening a file is slow
+    }, openTimeout);
   });
 }
diff --git a/src/atom/actions/terminal.ts b/src/atom/actions/terminal.ts
@@ -1,11 +1,12 @@
 export function openTerminal(): boolean {
-  if (atom.packages.isPackageActive('terminal-plus')) {
-    if (!document.getElementsByClassName('xterm')[0]) {
-      atom.commands.dispatch(
-        document.getElementsByTagName('atom-workspace')[0], 'terminal-plus:toggle'
-      );
-    }
-    return true;
-  }
+  // if (atom.packages.isPackageActive('terminal-plus')) {
+  //   if (!document.getElementsByClassName('xterm')[0]) {
+  //     atom.commands.dispatch(
+  //       document.getElementsByTagName('atom-workspace')[0], 'terminal-plus:toggle'
+  //     );
+  //   }
+  //   return true;
+  // }
+  // return false;
   return false;
 }
diff --git a/src/atom/actions/write.ts b/src/atom/actions/write.ts
@@ -2,13 +2,13 @@ import {getEditor} from './editor';
 
 function write(action: 'set' | 'insert', text: string, options = {}) {
   return getEditor().then((editor: AtomCore.IEditor) => {
-  editor.moveToBottom();
-  editor[`${action}Text`](text, options);
-  editor.insertNewline();
-  editor.moveToBottom();
-  setCursorPosition(editor);
-  editor.save();
-});
+    editor.moveToBottom();
+    editor[`${action}Text`](text, options);
+    editor.insertNewline();
+    editor.moveToBottom();
+    setCursorPosition(editor);
+    editor.save();
+  });
 }
 
 // Set text, removes any previous content in file
@@ -17,15 +17,12 @@ export function set(text: string) {
 }
 
 export function insert(text: string, options = {}) {
-  options = Object.assign(options, {
-    autoIndent: true,
-  });
   return write('insert', text, options);
 }
 
 const cursor: RegExp = /::>/g;
 function setCursorPosition(editor: AtomCore.IEditor) {
-  return editor.scan(cursor, function(scanned) {
+  return editor.scan(cursor, (scanned) => {
     editor.setCursorScreenPosition(scanned.range.start);
     scanned.replace('');
     scanned.stop();
diff --git a/src/components/Page/Task/index.tsx b/src/components/Page/Task/index.tsx
@@ -34,13 +34,13 @@ export const Task: React.StatelessComponent<{
   task: CR.Task, taskPosition: number, index: number, testRun: boolean
 }> = ({task, taskPosition, index, testRun}) => {
   const backgroundColor = getStatus(index, taskPosition, testRun);
-  const currentTask = taskPosition === index;
+  const isCurrentTask = taskPosition === index;
   return (
     <ListItem
       key={index}
       style={Object.assign({}, styles, {backgroundColor})}
     >
-      {taskCheckbox(task, testRun)}
+      {taskCheckbox(isCurrentTask, testRun)}
       <span style={indexStyles}>{index + 1}.</span>
       <div style={descriptionStyles}>
         <Markdown >{task.description}</Markdown>
diff --git a/src/components/Page/Task/taskCheckbox.tsx b/src/components/Page/Task/taskCheckbox.tsx
@@ -9,8 +9,8 @@ const styles = {
   top: '15px'
 };
 
-export function taskCheckbox(currentTask: number, testRun: boolean) {
-  if (!currentTask || !testRun) { return null; }
+export function taskCheckbox(isCurrentTask: boolean, testRun: boolean) {
+  if (!isCurrentTask || !testRun) { return null; }
   return (
     <span style={styles}>
       <IndeterminateCheckBox color={orange500} />
diff --git a/src/reducers/editor-actions/actions.ts b/src/reducers/editor-actions/actions.ts
@@ -14,21 +14,18 @@ export function editorActions(actionString: string): Promise<void> {
     let params: string[] = getParams(actionString);
     switch (command) {
       case Type.OPEN:
-        let obj = getOptions(params[0]);
-        let file = obj.param;
-        let options = obj.options;
+        const {param, options} = getOptions(params[0]);
         if (params.length === 1) {
-          open(file, options);
-          setTimeout(function() {
+          open(param, options);
+          setTimeout(() => {
             resolve();
           }, 100);
         }
         break;
       case Type.SET:
         if (params.length === 1) {
-          let content = params[0];
-
-          setTimeout(function() {
+          const content: string = params[0];
+          setTimeout(() => {
             set(content);
             resolve(true);
           });
@@ -37,17 +34,17 @@ export function editorActions(actionString: string): Promise<void> {
       case Type.INSERT:
         if (params.length === 1) {
           // let obj = getOptions(params[0]);
-          let content: string = params[0];
+          const content: string = params[0];
           // let options: object = obj.options;
-          setTimeout(function() {
+          setTimeout(() => {
             insert(content, {});
             resolve(true);
           });
         }
         break;
       case Type.OPEN_CONSOLE:
         if (params.length === 0) {
-          setTimeout(function() {
+          setTimeout(() => {
             openDevTools();
             resolve(true);
           });
diff --git a/src/reducers/editor-actions/index.ts b/src/reducers/editor-actions/index.ts
@@ -23,16 +23,16 @@ export default function editorActionsReducer(
     case TESTS_LOAD:
       actions = store.getState().tasks.map(task => task.actions || []);
       currentTaskPosition = 0;
-      handleEditorActions(actions.shift());
+      handleEditorActions(actions.shift()); // run first action
       return actions;
 
     case TEST_RESULT:
-      actions = action.payload.actions;
+      actions = action.payload.actions || [];
       const nextTaskPosition = action.payload.result.taskPosition;
       if (nextTaskPosition > currentTaskPosition) {
         // run actions for each task position passed
         for (let i = 0; i < nextTaskPosition - currentTaskPosition; i++) {
-          handleEditorActions(actions.shift());
+          handleEditorActions(actions.shift()); // run first action
         }
         currentTaskPosition = nextTaskPosition;
       }
diff --git a/src/reducers/progress/index.ts b/src/reducers/progress/index.ts
@@ -31,8 +31,8 @@ export default function progressReducer(
           })
       };
     case COMPLETE_PAGE:
-      const position = action.payload.position;
-      progress.chapters[position.chapter].pages[position.page] = true;
+      const {chapter, page} = action.payload.position;
+      progress.chapters[chapter].pages[page] = true;
       saveToLocalStorage(progress);
       return progress;
     case COMPLETE_CHAPTER:
diff --git a/src/reducers/route/index.ts b/src/reducers/route/index.ts
@@ -8,7 +8,6 @@ export default function routeReducer(
 ): string {
   switch (action.type) {
     case ROUTE_SET:
-      const next = action.payload.route;
       return action.payload.route;
     default:
       return route;
diff --git a/src/reducers/task-tests/index.ts b/src/reducers/task-tests/index.ts
@@ -7,20 +7,16 @@ export default function taskTestsReducer(
 ): string {
   switch (action.type) {
     case TESTS_LOAD:
-      const tasks = store.getState().tasks;
-      let tests: string[] = [].concat.apply([], tasks.map(
-          task => task.tests || [])
-      );
-      let output = '';
-      tests.forEach(function(file: string): void {
+      return [].concat.apply([], store.getState().tasks.map(
+        task => task.tests || [])
+      ).reduce((output: string, file: string): string => {
         try {
-          let data = readFileSync(file, 'utf8');
-          output += data + '\n';
+          output += readFileSync(file, 'utf8') + '\n';
         } catch (e) {
           console.log('Error reading test file', e);
         }
-      });
-      return output;
+        return output;
+      }, '');
     default:
       return taskTests;
   }
diff --git a/src/reducers/tasks/config-task-tests.ts b/src/reducers/tasks/config-task-tests.ts
@@ -12,8 +12,7 @@ function configTestString(config: Tutorial.Config, name: string, testPath: strin
   if (tutorial && tutorial.config.dir) {
     testPath = join(tutorial.config.dir, testPath);
   } else {
-    const dir = store.getState().dir;
-    testPath = join(dir, 'node_modules', name, testPath);
+    testPath = join(store.getState().dir, 'node_modules', name, testPath);
   }
 
   if (tutorial.config.testSuffix) {
diff --git a/src/reducers/test-run/index.ts b/src/reducers/test-run/index.ts
@@ -3,7 +3,7 @@ import {
 } from '../../actions/_types';
 import {runTaskTests} from './run';
 
-const pageTimeout = 2000;
+const pageTimeout = 800;
 
 let previous: number = new Date().getTime();
 
diff --git a/src/reducers/tutorials/update.ts b/src/reducers/tutorials/update.ts
