fix tutorial loading

ShMcK · ShMcK · commit 092c946f0717 · 2016-04-14T12:56:17.000+08:00
diff --git a/lib/reducers/checks/check-system.js b/lib/reducers/checks/check-system.js
@@ -4,7 +4,6 @@ function minVersion(command, minVersion) {
     return new Promise(function (resolve, reject) {
         var minOrLater = command_line_1.default(command, '-v')
             .then(function (res) {
-            console.log(res);
             if (parseInt(res, 10).toString() === 'NaN') {
                 return false;
             }
diff --git a/lib/reducers/tutorials/check-tutorials.js b/lib/reducers/tutorials/check-tutorials.js
@@ -41,7 +41,7 @@ function _isTutorial(name) {
 }
 function searchForTutorials(deps) {
     if (!!deps && Object.keys(deps).length > 0) {
-        return Object.keys(deps)
+        return (Object.keys(deps)
             .filter(function (name) { return _isTutorial(name); })
             .map(function (name) {
             var pathToTutorialPackageJson = path.join(window.coderoad.dir, 'node_modules', name, 'package.json');
@@ -58,7 +58,7 @@ function searchForTutorials(deps) {
                 version: packageJson.version,
                 latest: true
             };
-        });
+        }));
     }
     else {
         return [];
diff --git a/lib/reducers/tutorials/tutorials.js b/lib/reducers/tutorials/tutorials.js
@@ -5,13 +5,12 @@ function tutorialsReducer(tutorials, action) {
     if (tutorials === void 0) { tutorials = []; }
     switch (action.type) {
         case Type.LOAD_TUTORIALS:
-            var tut = [];
             var packageJson = check_tutorials_1.loadRootPackageJson();
-            if (window.coderoad.dir && !!packageJson) {
-                tut.concat(check_tutorials_1.searchForTutorials(packageJson.dependencies))
+            if (!!packageJson) {
+                return [].concat(check_tutorials_1.searchForTutorials(packageJson.dependencies))
                     .concat(check_tutorials_1.searchForTutorials(packageJson.devDependencies));
             }
-            return tut;
+            return [];
         default:
             return tutorials;
     }
diff --git a/src/reducers/checks/check-setup.ts b/src/reducers/checks/check-setup.ts
@@ -1,6 +1,6 @@
 import {fileExists} from '../../services/exists';
 import {packageJsonExists, loadRootPackageJson, searchForTutorials} from '../tutorials/check-tutorials';
-import {createPackageJson, openDirectory, installTutorial} from './setup-actions';
+import {createPackageJson, openDirectory, installTutorial} from './action-setup';
 import * as path from 'path';
 
 export function hasDirectory(): Promise<boolean> {
diff --git a/src/reducers/tutorials/check-tutorials.ts b/src/reducers/tutorials/check-tutorials.ts
@@ -56,10 +56,9 @@ function _isTutorial(name: string): boolean {
 
 export function searchForTutorials(deps: Object): CR.Tutorial[] {
   if (!!deps && Object.keys(deps).length > 0) {
-    return Object.keys(deps)
+    return (Object.keys(deps)
       .filter((name: string) => _isTutorial(name))
       .map(function(name: string) {
-
         const pathToTutorialPackageJson = path.join(window.coderoad.dir, 'node_modules', name, 'package.json');
         if (!fileExists(pathToTutorialPackageJson)) {
           console.log(`Error with ${name}: no package.json file found. ${tutorialError}`);
@@ -70,13 +69,12 @@ export function searchForTutorials(deps: Object): CR.Tutorial[] {
         }
 
         let packageJson = JSON.parse(fs.readFileSync(pathToTutorialPackageJson, 'utf8'));
-
       return {
         name,
         version: packageJson.version,
         latest: true
       };
-    });
+    }));
   } else {
     return [];
   }
diff --git a/src/reducers/tutorials/tutorials.ts b/src/reducers/tutorials/tutorials.ts
@@ -4,13 +4,12 @@ import {loadRootPackageJson, searchForTutorials} from './check-tutorials';
 export default function tutorialsReducer(tutorials = [], action: CR.Action): CR.Tutorial[] {
   switch (action.type) {
     case Type.LOAD_TUTORIALS:
-        let tut = [];
         let packageJson: PackageJson = loadRootPackageJson();
-        if (window.coderoad.dir && !!packageJson) {
-          tut.concat(searchForTutorials(packageJson.dependencies))
+        if (!!packageJson) {
+          return [].concat(searchForTutorials(packageJson.dependencies))
             .concat(searchForTutorials(packageJson.devDependencies));
         }
-        return tut;
+        return [];
     default:
       return tutorials;
   }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ function minVersion(command, minVersion) {`
`4`	`4`	`return new Promise(function (resolve, reject) {`
`5`	`5`	`var minOrLater = command_line_1.default(command, '-v')`
`6`	`6`	`.then(function (res) {`
`7`		`- console.log(res);`
`8`	`7`	`if (parseInt(res, 10).toString() === 'NaN') {`
`9`	`8`	`return false;`
`10`	`9`	`}`