Config and Publish form improvements

Author: ShMcK

lib/actions.js

@@ -21,6 +21,7 @@ exports.quit = window_1.quit;
 var editor_paths_1 = require('./modules/editor-paths');
 exports.editorMarkdownOpen = editor_paths_1.editorMarkdownOpen;
 exports.editorTestOpen = editor_paths_1.editorTestOpen;
+exports.editorPjOpen = editor_paths_1.editorPjOpen;
 var core_coderoad_1 = require('core-coderoad');
 exports.alertOpen = core_coderoad_1.alertOpen;
 exports.alertClose = core_coderoad_1.alertClose;

lib/components/Config/index.js

@@ -42,6 +42,7 @@ var TutorialConfig = (function (_super) {
     }
     TutorialConfig.prototype.componentWillMount = function () {
         this.props.pjLoad();
+        this.props.editorPjOpen();
     };
     TutorialConfig.prototype.componentDidMount = function () {
         var _this = this;
@@ -99,7 +100,7 @@ var TutorialConfig = (function (_super) {
     TutorialConfig = __decorate([
         react_redux_1.connect(function (state) { return ({
             packageJson: state.packageJson,
-        }); }, { pjSave: actions_1.pjSave, pjLoad: actions_1.pjLoad, tutorialInit: actions_1.tutorialInit, routeSet: actions_1.routeSet }), 
+        }); }, { pjSave: actions_1.pjSave, pjLoad: actions_1.pjLoad, tutorialInit: actions_1.tutorialInit, routeSet: actions_1.routeSet, editorPjOpen: actions_1.editorPjOpen }), 
         __metadata('design:paramtypes', [])
     ], TutorialConfig);
     return TutorialConfig;

lib/components/Publish/index.js

@@ -39,7 +39,7 @@ var TutorialPublish = (function (_super) {
     }
     TutorialPublish.prototype.componentWillMount = function () {
         this.props.pjLoad();
-        this.props.open;
+        this.props.editorPjOpen();
     };
     TutorialPublish.prototype.componentDidMount = function () {
         var _this = this;
@@ -90,7 +90,7 @@ var TutorialPublish = (function (_super) {
     TutorialPublish = __decorate([
         react_redux_1.connect(function (state) { return ({
             packageJson: state.packageJson,
-        }); }, { pjLoad: actions_1.pjLoad, pjSave: actions_1.pjSave }), 
+        }); }, { pjLoad: actions_1.pjLoad, pjSave: actions_1.pjSave, editorPjOpen: actions_1.editorPjOpen }), 
         __metadata('design:paramtypes', [])
     ], TutorialPublish);
     return TutorialPublish;

lib/modules/editor-paths/index.js

@@ -22,3 +22,10 @@ function editorTestOpen(pageIndex, testIndex) {
     };
 }
 exports.editorTestOpen = editorTestOpen;
+function editorPjOpen() {
+    return function (dispatch, getState) {
+        var dir = getState().dir;
+        dispatch(actions_1.editorOpen('package.json'));
+    };
+}
+exports.editorPjOpen = editorPjOpen;

src/actions.ts

@@ -6,7 +6,7 @@ export {
   tutorialTaskAdd, tutorialHintAdd, tutorialActionAdd
 } from './modules/tutorial';
 export {windowToggle, quit} from './modules/window';
-export {editorMarkdownOpen, editorTestOpen} from './modules/editor-paths';
+export {editorMarkdownOpen, editorTestOpen, editorPjOpen} from './modules/editor-paths';
 
 export {
   alertOpen, alertClose, alertReplay,

src/components/Config/index.tsx

@@ -4,7 +4,7 @@ import {Field, reduxForm, formValueSelector} from 'redux-form';
 import MenuItem from 'material-ui/MenuItem';
 import {Card, CardHeader} from 'material-ui/Card';
 import RaisedButton from 'material-ui/RaisedButton';
-import {pjSave, pjLoad, tutorialInit, routeSet} from '../../actions';
+import {pjSave, pjLoad, tutorialInit, routeSet, editorPjOpen} from '../../actions';
 import languageItems from './languageItems';
 import runnerItems from './runnerItems';
 import {topElement} from '../TopPanel';
@@ -25,22 +25,24 @@ const styles = {
 
 @connect(state => ({
   packageJson: state.packageJson,
-}), {pjSave, pjLoad, tutorialInit, routeSet })
+}), {pjSave, pjLoad, tutorialInit, routeSet, editorPjOpen })
 class TutorialConfig extends React.Component <{
   packageJson?: PackageJson,
   pjSave?: (pj: Tutorial.PJ) => Redux.ActionCreator,
   pjLoad?: () => Redux.ActionCreator,
   tutorialInit?: () => Redux.ActionCreator,
   routeSet?: (route: string) => Redux.ActionCreator,
   pristine?: boolean, submitting?: boolean, handleSubmit?: any,
-  language?: string, invalid?: boolean, initialize?: any
+  language?: string, invalid?: boolean, initialize?: any,
+  editorPjOpen?: () => Redux.ActionCreator,
 }, {}> {
   refs: {
     [key: string]: (Element);
     name: HTMLInputElement;
   };
   componentWillMount() {
     this.props.pjLoad();
+    this.props.editorPjOpen();
   }
   componentDidMount() {
     topElement.toggle(false);

src/components/Publish/index.tsx

@@ -4,7 +4,7 @@ import {Field, reduxForm} from 'redux-form';
 import MenuItem from 'material-ui/MenuItem';
 import {Card, CardHeader} from 'material-ui/Card';
 import RaisedButton from 'material-ui/RaisedButton';
-import {pjSave, pjLoad, routeSet} from '../../actions';
+import {pjSave, pjLoad, routeSet, editorPjOpen} from '../../actions';
 import {topElement} from '../TopPanel';
 import textField from '../Form/textField';
 import validate from './validate';
@@ -22,16 +22,17 @@ const styles = {
 
 @connect(state => ({
   packageJson: state.packageJson,
-}), {pjLoad, pjSave})
+}), {pjLoad, pjSave, editorPjOpen})
 class TutorialPublish extends React.Component<{
   packageJson?: any, pjSave?: (pj: PackageJson) => any,
   pristine?: boolean, submitting?: boolean, handleSubmit?: any,
   invalid?: boolean, initialize?: (values: Object) => any,
-  pjLoad?: () => any
+  pjLoad?: () => Redux.ActionCreator,
+  editorPjOpen?: () => Redux.ActionCreator,
 }, {}> {
   componentWillMount() {
     this.props.pjLoad();
-    this.props.open
+    this.props.editorPjOpen();
   }
   componentDidMount() {
     topElement.toggle(false);

src/modules/editor-paths/index.ts

@@ -30,3 +30,10 @@ export function editorTestOpen(pageIndex: number, testIndex: number) {
     dispatch(editorOpen(filePath));
   };
 }
+
+export function editorPjOpen() {
+  return (dispatch, getState) => {
+    const {dir} = getState();
+    dispatch(editorOpen('package.json'));
+  };
+}