Skip to content

Commit 6defdf2

Browse files
committed
fixes after refactor
1 parent c184608 commit 6defdf2

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

lib/components/tutorials/tutorials.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var TutorialList = (function (_super) {
3737
var _this = this;
3838
var _a = this.props, tutorials = _a.tutorials, loadTutorials = _a.loadTutorials, selectTutorial = _a.selectTutorial, toggleAlert = _a.toggleAlert, updateTutorial = _a.updateTutorial;
3939
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) {
40-
return (React.createElement(Table_1.TableRow, null, React.createElement(Table_1.TableRowColumn, null, React.createElement(FlatButton_1.default, {label: _this.trim(tutorial.name), primary: true, onTouchTap: selectTutorial.bind(_this, tutorial)})), !!tutorial.latest
40+
return (React.createElement(Table_1.TableRow, {key: index}, React.createElement(Table_1.TableRowColumn, null, React.createElement(FlatButton_1.default, {label: _this.trim(tutorial.name), primary: true, onTouchTap: selectTutorial.bind(_this, tutorial)})), !!tutorial.latest
4141
? React.createElement(Table_1.TableRowColumn, null, tutorial.version, " ", React.createElement(file_upload_1.default, {onClick: updateTutorial(tutorial.name)}))
4242
: React.createElement(Table_1.TableRowColumn, null, tutorial.version)));
4343
}))), React.createElement("br", null), React.createElement(FlatButton_1.default, {style: { margin: '0 90px' }, label: 'Check for Tutorials', secondary: true, onTouchTap: loadTutorials})));

lib/reducers/editor-actions/actions.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ var Editor = require('../../atom/editor');
33
var actions_1 = require('../../atom/actions');
44
var action_helpers_1 = require('./action-helpers');
55
var Type = {
6-
OPEN: 'OPEN',
7-
SET: 'SET',
8-
INSERT: 'INSERT',
9-
OPEN_CONSOLE: 'OPEN_CONSOLE'
6+
OPEN: 'open',
7+
SET: 'set',
8+
INSERT: 'insert',
9+
OPEN_CONSOLE: 'openConsole'
1010
};
1111
function editorActions(actionString) {
1212
return new Promise(function (resolve, reject) {

lib/reducers/route/route.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22
var actionTypes_1 = require('../../actions/actionTypes');
3-
var defaultRoute = 'start';
3+
var defaultRoute = 'tutorials';
44
function routeReducer(route, action) {
55
if (route === void 0) { route = defaultRoute; }
66
switch (action.type) {

lib/reducers/tutorials/check-tutorials.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
var path_1 = require('path');
33
var fs_1 = require('fs');
44
var exists_1 = require('../../services/exists');
5-
var update_tutorial_1 = require('./update-tutorial');
65
var tutorialError = 'This is an error with the tutorial itself';
76
function packageJsonExists() {
87
var pathToPackageJson = path_1.join(window.coderoad.dir, 'package.json');
@@ -56,8 +55,7 @@ function searchForTutorials(deps) {
5655
var packageJson = JSON.parse(fs_1.readFileSync(pathToTutorialPackageJson, 'utf8'));
5756
return {
5857
name: name,
59-
version: packageJson.version,
60-
latest: update_tutorial_1.canUpdateTutorial(name, packageJson.version)
58+
version: packageJson.version
6159
};
6260
}));
6361
}

lib/reducers/tutorials/update-tutorial.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ var command_line_1 = require('../../services/command-line');
33
var store_1 = require('../../store/store');
44
var actions_1 = require('../../actions/actions');
55
function canUpdateTutorial(name, currentVersion) {
6-
return command_line_1.default('npm', "outdated " + name).then(function (res) {
6+
return (command_line_1.default('npm', "outdated " + name)
7+
.then(function (res) {
78
if (res.length > 0) {
89
var match = res.match(/[0-9\.]+\s+[0-9\.]+\s+([0-9\.]+)/);
910
if (match.length >= 2) {
1011
return match[1];
1112
}
1213
}
1314
return null;
14-
});
15+
}));
1516
}
1617
exports.canUpdateTutorial = canUpdateTutorial;
1718
function updateTutorial(name) {

src/components/tutorials/tutorials.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class TutorialList extends React.Component<{
5959

6060
{tutorials.map((tutorial: CR.Tutorial, index) => {
6161
return (
62-
<TableRow>
62+
<TableRow key={index}>
6363
<TableRowColumn>
6464
<FlatButton label={this.trim(tutorial.name)} primary={true} onTouchTap={selectTutorial.bind(this, tutorial)} />
6565
</TableRowColumn>

src/reducers/editor-actions/actions.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import {openDevTools} from '../../atom/actions';
33
import {getCommand, getParams, getOptions} from './action-helpers';
44

55
const Type = {
6-
OPEN: 'OPEN',
7-
SET: 'SET',
8-
INSERT: 'INSERT',
9-
OPEN_CONSOLE: 'OPEN_CONSOLE'
6+
OPEN: 'open',
7+
SET: 'set',
8+
INSERT: 'insert',
9+
OPEN_CONSOLE: 'openConsole'
1010
};
1111

1212
export function editorActions(actionString: string): Promise<void> {

src/reducers/route/route.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {SET_ROUTE} from '../../actions/actionTypes';
22
import {store} from '../../store/store';
33

4-
const defaultRoute: string = 'start';
4+
const defaultRoute: string = 'tutorials';
55

66
export default function routeReducer(route = defaultRoute, action: CR.Action): string {
77
switch (action.type) {

src/reducers/tutorials/check-tutorials.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ export function searchForTutorials(deps: Object): CR.Tutorial[] {
7474

7575
return {
7676
name,
77-
version: packageJson.version,
78-
latest: canUpdateTutorial(name, packageJson.version)
77+
version: packageJson.version
78+
// latest: canUpdateTutorial(name, packageJson.version)
7979
};
8080
}));
8181
} else {

src/reducers/tutorials/update-tutorial.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ import {store} from '../../store/store';
33
import {loadTutorials} from '../../actions/actions';
44

55
export function canUpdateTutorial(name: string, currentVersion: string): string {
6-
return commandLine('npm', `outdated ${name}`).then((res: string) => {
6+
return (commandLine('npm', `outdated ${name}`)
7+
.then((res: string) => {
78
if (res.length > 0) {
89
let match = res.match(/[0-9\.]+\s+[0-9\.]+\s+([0-9\.]+)/);
910
if (match.length >= 2) {
1011
return match[1];
1112
}
1213
}
1314
return null;
14-
});
15+
}));
1516
}
1617

1718
export function updateTutorial(name: string): void {

0 commit comments

Comments
 (0)