fix tutorials: load versions

Author: ShMcK

lib/components/tutorials/tutorials.js

@@ -5,7 +5,7 @@ var buttons_1 = require('./buttons');
 exports.Tutorials = function (_a) {
     var tutorials = _a.tutorials;
     return (React.createElement("div", {className: 'cr-tutorials'}, React.createElement(Table_1.Table, null, React.createElement(Table_1.TableHeader, {displaySelectAll: false, adjustForCheckbox: false}, React.createElement(Table_1.TableRow, null, React.createElement(Table_1.TableHeaderColumn, null, "Tutorial"), React.createElement(Table_1.TableHeaderColumn, null, "Version"))), React.createElement(Table_1.TableBody, {displayRowCheckbox: false}, tutorials.map(function (tutorial, index) {
-        return (React.createElement(Table_1.TableRow, {key: index}, React.createElement(Table_1.TableRowColumn, null, React.createElement(buttons_1.SelectTutorial, {tutorial: tutorial})), !!tutorial.latest
+        return (React.createElement(Table_1.TableRow, {key: index}, React.createElement(Table_1.TableRowColumn, null, React.createElement(buttons_1.SelectTutorial, {tutorial: tutorial})), tutorial.latest
             ? React.createElement(Table_1.TableRowColumn, null, tutorial.version, " ", React.createElement(buttons_1.UpdateTutorial, {name: tutorial.name}))
             : React.createElement(Table_1.TableRowColumn, null, tutorial.version)));
     }))), React.createElement("br", null), React.createElement(buttons_1.LoadTutorials, null)));

lib/reducers/tutorials/check-tutorials.js

@@ -2,7 +2,6 @@
 var path_1 = require('path');
 var fs_1 = require('fs');
 var exists_1 = require('../../services/exists');
-var root_package_1 = require('../../services/root-package');
 var tutorialError = 'This is an error with the tutorial itself';
 function _isTutorial(name) {
     var pathToTutorialPackageJson = path_1.join(window.coderoad.dir, 'node_modules', name, 'package.json');
@@ -40,10 +39,10 @@ function searchForTutorials(deps) {
                     version: 'NOT INSTALLED'
                 };
             }
-            var packageJson = root_package_1.default.get();
+            var tutorialPackageJson = JSON.parse(fs_1.readFileSync(pathToTutorialPackageJson, 'utf8'));
+            var version = tutorialPackageJson.version;
             return {
-                name: name,
-                version: packageJson.version
+                name: name, version: version
             };
         }));
     }

src/components/tutorials/tutorials.tsx

@@ -27,7 +27,7 @@ export const Tutorials : React.StatelessComponent<{
             <TableRowColumn>
             <SelectTutorial tutorial={tutorial} />
             </TableRowColumn>
-            {!!tutorial.latest
+            {tutorial.latest
               ? <TableRowColumn>
                 {tutorial.version} <UpdateTutorial name={tutorial.name} />
                 </TableRowColumn>

src/reducers/tutorials/check-tutorials.ts

@@ -2,7 +2,7 @@ import {store} from '../../store/store';
 import {join} from 'path';
 import {readFileSync} from 'fs';
 import {fileExists} from '../../services/exists';
-// import {canUpdateTutorial} from './update-tutorial';
+import {canUpdateTutorial} from './update-tutorial';
 import RootPackage from '../../services/root-package';
 
 let tutorialError = 'This is an error with the tutorial itself';
@@ -58,12 +58,12 @@ export function searchForTutorials(deps: Object): CR.Tutorial[] {
           };
         }
 
-        let packageJson = RootPackage.get();
+        let tutorialPackageJson = JSON.parse(readFileSync(pathToTutorialPackageJson, 'utf8'));
+        const version  = tutorialPackageJson.version;
 
       return {
-        name,
-        version: packageJson.version
-        // latest: canUpdateTutorial(name, packageJson.version)
+        name, version
+        // latest: !!canUpdateTutorial(name, version)
       };
     }));
   } else {

src/reducers/tutorials/update-tutorial.ts

@@ -2,23 +2,26 @@ import commandLine from '../../services/command-line';
 import {store} from '../../store/store';
 import {tutorialsFind} from '../../actions/_actions';
 
+export function tutorialUpdate(name: string): void {
+  commandLine('npm', `install --save-dev ${name}`)
+  .then(() => {
+    store.dispatch(tutorialsFind());
+  });
+}
+
 // export function canUpdateTutorial(name: string,
-//   currentVersion: string): string {
+//   currentVersion: string): Promise<boolean> {
+//     console.log(name, currentVersion);
 //   return (commandLine('npm', `outdated ${name}`)
 //     .then((res: string) => {
+//       console.log(res);
 //     if (res.length > 0) {
 //       let match = res.match(/[0-9\.]+\s+[0-9\.]+\s+([0-9\.]+)/);
 //       if (match.length >= 2) {
-//         return match[1];
+//         // return match[1];
+//         return true;
 //       }
 //     }
-//     return null;
+//     return false;
 //   }));
 // }
-
-export function tutorialUpdate(name: string): void {
-  commandLine('npm', `install --save-dev ${name}`)
-  .then(() => {
-    store.dispatch(tutorialsFind());
-  });
-}

src/typings/cr/cr.d.ts

@@ -112,7 +112,7 @@ declare namespace CR {
   interface Tutorial {
     name: string;
     version: string;
-    latest?: string;
+    latest?: boolean;
   }
 
   interface Log {