fix editor action issues

ShMcK · ShMcK · commit 27ad6eea23d7 · 2016-06-11T13:47:35.000-07:00
diff --git a/lib/components/Page/ProgressBar/index.js b/lib/components/Page/ProgressBar/index.js
@@ -7,12 +7,11 @@ var style = {
     margin: '0px',
 };
 var ProgressBar = function (_a) {
-    var taskPosition = _a.taskPosition, taskLength = _a.taskLength, completed = _a.completed;
-    var progress = (taskPosition / taskLength) * 100;
+    var taskProgress = _a.taskProgress, completed = _a.completed;
     if (completed) {
         return null;
     }
-    return (React.createElement(LinearProgress_1.default, {mode: 'determinate', value: progress, style: style}));
+    return (React.createElement(LinearProgress_1.default, {mode: 'determinate', value: taskProgress, style: style}));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = ProgressBar;
diff --git a/lib/components/Page/Tasks/index.js b/lib/components/Page/Tasks/index.js
@@ -21,14 +21,10 @@ var Tasks = (function (_super) {
     Tasks.prototype.componentDidUpdate = function () {
         ReactDOM.findDOMNode(this.refs.listEnd).scrollIntoView();
     };
-    Tasks.prototype.visibleTasks = function (tasks, taskPosition) {
-        return tasks.slice(0, taskPosition + 1);
-    };
     Tasks.prototype.render = function () {
         var _a = this.props, tasks = _a.tasks, taskPosition = _a.taskPosition, testRun = _a.testRun, completed = _a.completed, page = _a.page;
-        var visTasks = this.visibleTasks(tasks, taskPosition);
         var backgroundColor = completed ? colors_1.lightGreen200 : 'white';
-        return (React.createElement("div", null, React.createElement(Card_1.Card, {style: { backgroundColor: backgroundColor, margin: margin }}, React.createElement(List_1.List, null, React.createElement(Subheader_1.default, null, "Tasks"), visTasks.map(function (task, index) { return (React.createElement(Task_1.default, {key: index, index: index, task: task, taskPosition: taskPosition, testRun: testRun})); }))), React.createElement(TasksComplete_1.default, {page: page, completed: completed}), React.createElement("div", {ref: 'listEnd'})));
+        return (React.createElement("div", null, React.createElement(Card_1.Card, {style: { backgroundColor: backgroundColor, margin: margin }}, React.createElement(List_1.List, null, React.createElement(Subheader_1.default, null, "Tasks"), tasks.map(function (task, index) { return (React.createElement(Task_1.default, {key: index, index: index, task: task, taskPosition: taskPosition, testRun: testRun})); }))), React.createElement(TasksComplete_1.default, {page: page, completed: completed}), React.createElement("div", {ref: 'listEnd'})));
     };
     return Tasks;
 }(React.Component));
diff --git a/lib/components/Page/index.js b/lib/components/Page/index.js
@@ -31,10 +31,8 @@ var Page = (function (_super) {
         _super.apply(this, arguments);
     }
     Page.prototype.render = function () {
-        var _a = this.props, page = _a.page, tasks = _a.tasks, taskPosition = _a.taskPosition, hintPosition = _a.hintPosition, testRun = _a.testRun, progress = _a.progress, pagePosition = _a.pagePosition;
-        var task = taskPosition <= tasks.length ? tasks[taskPosition] : null;
-        var completed = progress.pages[pagePosition];
-        return (React.createElement("section", {style: styles, className: 'cr-page'}, React.createElement(index_1.ContentCard, {title: page.title, content: page.description}), React.createElement(Tasks_1.default, {tasks: tasks, taskPosition: taskPosition, testRun: testRun, completed: completed, page: page}), React.createElement(PageToolbar_1.default, {tasks: tasks, taskPosition: taskPosition}, React.createElement(Hints_1.default, {task: task, hintPosition: hintPosition}), React.createElement(ProgressBar_1.default, {taskLength: tasks.length, taskPosition: taskPosition, completed: completed}))));
+        var _a = this.props, page = _a.page, tasks = _a.tasks, taskPosition = _a.taskPosition, hintPosition = _a.hintPosition, testRun = _a.testRun, progress = _a.progress, pagePosition = _a.pagePosition, completed = _a.completed, task = _a.task, visibleTasks = _a.visibleTasks, taskProgress = _a.taskProgress;
+        return (React.createElement("section", {style: styles, className: 'cr-page'}, React.createElement(index_1.ContentCard, {title: page.title, content: page.description}), React.createElement(Tasks_1.default, {tasks: tasks.slice(0, taskPosition + 1), taskPosition: taskPosition, testRun: testRun, completed: completed, page: page}), React.createElement(PageToolbar_1.default, {tasks: tasks, taskPosition: taskPosition}, React.createElement(Hints_1.default, {task: task, hintPosition: hintPosition}), React.createElement(ProgressBar_1.default, {taskProgress: taskProgress, completed: completed}))));
     };
     Page = __decorate([
         react_redux_1.connect(function (state) { return ({
@@ -45,6 +43,9 @@ var Page = (function (_super) {
             taskPosition: state.taskPosition,
             hintPosition: state.hintPosition,
             pagePosition: state.pagePosition,
+            completed: selectors_1.pageCompletedSelector(state),
+            task: selectors_1.taskSelector(state),
+            taskProgress: selectors_1.taskProgressSelector(state),
         }); }), 
         __metadata('design:paramtypes', [])
     ], Page);
diff --git a/lib/modules/page/task-actions/index.js b/lib/modules/page/task-actions/index.js
@@ -21,16 +21,16 @@ function taskActionsReducer(t, action) {
             handle_actions_1.default(actions);
             return actions;
         case 'TEST_RESULT':
-            var _b = action.payload, taskActions = _b.taskActions, result = _b.result;
-            var nextTaskPosition = result.taskPosition;
+            actions = action.payload.taskActions || [];
+            var nextTaskPosition = action.payload.result.taskPosition;
             var times = nextTaskPosition - taskPositionTracker;
             if (times > 0) {
                 for (var i = 0; i < times; i++) {
                     handle_actions_1.default(actions);
                 }
                 taskPositionTracker = nextTaskPosition;
             }
-            return taskActions;
+            return actions;
         default:
             return t;
     }
diff --git a/lib/modules/tests/test-run/parse-loaders.js b/lib/modules/tests/test-run/parse-loaders.js
@@ -28,8 +28,7 @@ function parseLoaders(data, fileType, tutorial, dir) {
             }
             var pathToFile = null;
             if (loader[2]) {
-                var tutorialDir = tutorial.packageJson.config.dir || 'tutorial';
-                pathToFile = path_1.normalize(path_1.join(tutorialDir, fileToLoad));
+                pathToFile = path_1.normalize(path_1.join(tutorial.config.dir, fileToLoad));
             }
             else {
                 pathToFile = path_1.normalize(path_1.join(dir, fileToLoad));
diff --git a/lib/modules/tutorial/reducer.js b/lib/modules/tutorial/reducer.js
@@ -1,13 +1,14 @@
 "use strict";
 var path_1 = require('path');
-var config_1 = require('./utils/config');
 var types_1 = require('./types');
+var config_1 = require('./utils/config');
 var config_paths_1 = require('./utils/config-paths');
 var _tutorial = {
     name: null,
     info: null,
     pages: [],
     packageJson: null,
+    config: null,
 };
 function tutorialReducer(t, action) {
     if (t === void 0) { t = _tutorial; }
diff --git a/lib/selectors.js b/lib/selectors.js
@@ -2,4 +2,14 @@
 var reselect_1 = require('reselect');
 exports.pageSelector = function (state) { return state.tutorial.pages[state.pagePosition]; };
 exports.tasksSelector = reselect_1.createSelector(exports.pageSelector, function (page) { return page.tasks; });
+exports.taskPositionSelector = function (state) { return state.taskPosition; };
+exports.pageCompletedSelector = function (state) { return state.progress.pages[state.pagePosition]; };
+exports.taskSelector = function (state) { return reselect_1.createSelector(exports.tasksSelector, function (tasks) {
+    return (tasks.length <= tasks.length ? exports.tasksSelector(state)[state.taskPosition] : null);
+}); };
+exports.visibleTasksSelector = function (state) { return reselect_1.createSelector(exports.tasksSelector, function (tasks) {
+    console.log(tasks);
+    return tasks.slice(0, state.taskPosition + 1);
+}); };
+exports.taskProgressSelector = function (state) { return reselect_1.createSelector(exports.tasksSelector, function (tasks) { return (state.taskPosition / tasks.length) * 100; }); };
 exports.configSelector = function (state) { return state.packageJson.config; };
diff --git a/lib/store.js b/lib/store.js
@@ -7,7 +7,7 @@ var redux_thunk_1 = require('redux-thunk');
 var middlewares = [redux_thunk_1.default];
 var throttleTestRun = redux_throttle_actions_1.default(['TEST_RUN'], 800);
 middlewares.push(throttleTestRun);
-var devMode = true;
+var devMode = false;
 if (devMode) {
     var logger = createLogger();
     middlewares.push(logger);
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "react-tap-event-plugin": "1.0.0",
     "redux": "3.5.2",
     "redux-logger": "2.6.1",
-    "redux-throttle-actions": "1.0.1",
+    "redux-throttle-actions": "1.1.0",
     "redux-thunk": "2.1.0",
     "reselect": "^2.5.1"
   },
diff --git a/src/components/Page/ProgressBar/index.tsx b/src/components/Page/ProgressBar/index.tsx
@@ -8,16 +8,15 @@ const style = {
 };
 
 const ProgressBar: React.StatelessComponent<{
-  taskPosition: number, taskLength: number, completed: boolean
-}> = ({taskPosition, taskLength, completed}) => {
-  const progress: number = (taskPosition / taskLength) * 100;
+  taskProgress: number, completed: boolean
+}> = ({taskProgress, completed}) => {
   if (completed) {
     return null;
   }
   return (
     <LinearProgress
       mode='determinate'
-      value={progress}
+      value={taskProgress}
       style={style}
     />
   );
diff --git a/src/components/Page/Tasks/index.tsx b/src/components/Page/Tasks/index.tsx
@@ -20,20 +20,16 @@ export default class Tasks extends React.Component<{
   componentDidUpdate() {
     ReactDOM.findDOMNode<HTMLElement>(this.refs.listEnd).scrollIntoView();
   }
-  visibleTasks(tasks: CR.Task[], taskPosition: number): CR.Task[] {
-    return tasks.slice(0, taskPosition + 1);
-  }
   render() {
     const {tasks, taskPosition, testRun, completed, page} = this.props;
-    const visTasks = this.visibleTasks(tasks, taskPosition);
     const backgroundColor = completed ? lightGreen200 : 'white';
     return (
     <div>
       <Card style={{backgroundColor, margin}}>
         <List>
           <Subheader>Tasks</Subheader>
 
-          {visTasks.map((task: CR.Task, index: number) => (
+          {tasks.map((task: CR.Task, index: number) => (
             <Task
               key={index}
               index={index}
diff --git a/src/components/Page/index.tsx b/src/components/Page/index.tsx
@@ -7,7 +7,10 @@ import Tasks from './Tasks';
 import Hints from './Hints';
 import PageToolbar from './PageToolbar';
 import ProgressBar from './ProgressBar';
-import {pageSelector, tasksSelector} from '../../selectors';
+import {
+  pageSelector, tasksSelector, pageCompletedSelector, taskSelector,
+  taskProgressSelector
+} from '../../selectors';
 
 const styles = {
   width: '100%',
@@ -22,16 +25,18 @@ const styles = {
   taskPosition: state.taskPosition,
   hintPosition: state.hintPosition,
   pagePosition: state.pagePosition,
+  completed: pageCompletedSelector(state),
+  task: taskSelector(state),
+  taskProgress: taskProgressSelector(state),
 }))
 export default class Page extends React.Component<{
   page?: CR.Page, tasks?: CR.Task[], taskPosition?: number,
-  hintPosition?: number, testRun?: boolean,
-  progress?: CR.Progress, pagePosition?: number
+  hintPosition?: number, testRun?: boolean, task?: CR.Task
+  progress?: CR.Progress, pagePosition?: number, completed?: boolean,
+  taskProgress?: number
 }, {}> {
   render() {
-    const {page, tasks, taskPosition, hintPosition, testRun, progress, pagePosition} = this.props;
-    const task = taskPosition <= tasks.length ? tasks[taskPosition] : null;
-    const completed = progress.pages[pagePosition];
+    const {page, tasks, taskPosition, hintPosition, testRun, progress,pagePosition, completed, task, visibleTasks, taskProgress} = this.props;
     return (
       <section style={styles} className='cr-page'>
         <ContentCard
@@ -40,7 +45,7 @@ export default class Page extends React.Component<{
         />
 
         <Tasks
-          tasks={tasks}
+          tasks={tasks.slice(0, taskPosition + 1)}
           taskPosition={taskPosition}
           testRun={testRun}
           completed={completed}
@@ -56,8 +61,7 @@ export default class Page extends React.Component<{
             hintPosition={hintPosition}
             />
           <ProgressBar
-            taskLength={tasks.length}
-            taskPosition={taskPosition}
+            taskProgress={taskProgress}
             completed={completed}
           />
         </PageToolbar>
diff --git a/src/modules/package-json/actions.ts b/src/modules/package-json/actions.ts
diff --git a/src/modules/package-json/index.ts b/src/modules/package-json/index.ts
diff --git a/src/modules/package-json/reducer.ts b/src/modules/package-json/reducer.ts
diff --git a/src/modules/package-json/types.ts b/src/modules/package-json/types.ts
diff --git a/src/modules/package-json/utils/packageJson.ts b/src/modules/package-json/utils/packageJson.ts
diff --git a/src/modules/page/task-actions/handle-action-string.ts b/src/modules/page/task-actions/handle-action-string.ts
@@ -21,7 +21,7 @@ export default function handleActionString(
 
       case Type.OPEN:
         const obj = getOptions(params[0]);
-        const file = obj.param;
+        const file: string = obj.param;
         const options = obj.options;
         if (params.length === 1) {
           store.dispatch(editorOpen(file, options));
diff --git a/src/modules/page/task-actions/index.ts b/src/modules/page/task-actions/index.ts
@@ -31,22 +31,17 @@ export default function taskActionsReducer(
       return actions;
 
     case 'TEST_RESULT':
-      const {taskActions, result} = action.payload;
-      // task position from test result
-      const nextTaskPosition = result.taskPosition;
-      // calculate task position difference
+      actions = action.payload.taskActions || [];
+      const nextTaskPosition = action.payload.result.taskPosition;
       const times: number = nextTaskPosition - taskPositionTracker;
-      //
       if (times > 0) {
         // run actions for each task position passed
         for (let i = 0; i < times; i++) {
-          // run action
-          handleTaskActions(actions);
+          handleTaskActions(actions); // run first action
         }
-        // set current task position
         taskPositionTracker = nextTaskPosition;
       }
-      return taskActions;
+      return actions;
 
     default:
       return t;
diff --git a/src/modules/tutorial/reducer.ts b/src/modules/tutorial/reducer.ts
@@ -1,13 +1,14 @@
 import {join} from 'path';
-import {tutorialConfig} from './utils/config';
 import {TUTORIAL_SET} from './types';
+import {tutorialConfig} from './utils/config';
 import configPaths from './utils/config-paths';
 
 const _tutorial: CR.Tutorial = {
   name: null,
   info: null,
   pages: [],
   packageJson: null,
+  config: null,
 };
 
 export default function tutorialReducer(
diff --git a/src/selectors.ts b/src/selectors.ts
@@ -7,4 +7,30 @@ export const tasksSelector = createSelector(
   page => page.tasks
 );
 
+export const taskPositionSelector = state => state.taskPosition;
+
+export const pageCompletedSelector = state => state.progress.pages[state.pagePosition];
+
+export const taskSelector = state => createSelector(
+  tasksSelector,
+  tasks => {
+    return (
+      tasks.length <= tasks.length ? tasksSelector(state)[state.taskPosition] : null
+    );
+  }
+);
+
+export const visibleTasksSelector = state => createSelector(
+  tasksSelector,
+  tasks => {
+    console.log(tasks);
+    return tasks.slice(0, state.taskPosition + 1);
+  }
+);
+
+export const taskProgressSelector = state => createSelector(
+  tasksSelector,
+  tasks => (state.taskPosition / tasks.length) * 100
+);
+
 export const configSelector = state => state.packageJson.config;
diff --git a/tsconfig.json b/tsconfig.json
@@ -31,11 +31,6 @@
         "src/modules/hints/index.ts",
         "src/modules/hints/reducer.ts",
         "src/modules/hints/types.ts",
-        "src/modules/package-json/actions.ts",
-        "src/modules/package-json/index.ts",
-        "src/modules/package-json/reducer.ts",
-        "src/modules/package-json/types.ts",
-        "src/modules/package-json/utils/packageJson.ts",
         "src/modules/page/actions.ts",
         "src/modules/page/index.ts",
         "src/modules/page/page-position/index.ts",

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ function parseLoaders(data, fileType, tutorial, dir) {`
`28`	`28`	`}`
`29`	`29`	`var pathToFile = null;`
`30`	`30`	`if (loader[2]) {`
`31`		`- var tutorialDir = tutorial.packageJson.config.dir \|\| 'tutorial';`
`32`		`- pathToFile = path_1.normalize(path_1.join(tutorialDir, fileToLoad));`
	`31`	`+ pathToFile = path_1.normalize(path_1.join(tutorial.config.dir, fileToLoad));`
`33`	`32`	`}`
`34`	`33`	`else {`
`35`	`34`	`pathToFile = path_1.normalize(path_1.join(dir, fileToLoad));`