updated reducer, disable publish buttons unless changed

ShMcK · ShMcK · commit baa8e284d42d · 2016-06-24T15:27:51.000-07:00
diff --git a/lib/actions.js b/lib/actions.js
@@ -20,6 +20,8 @@ exports.tutorialTaskAdd = tutorial_1.tutorialTaskAdd;
 exports.tutorialHintAdd = tutorial_1.tutorialHintAdd;
 exports.tutorialActionAdd = tutorial_1.tutorialActionAdd;
 exports.tutorialPublish = tutorial_1.tutorialPublish;
+var updated_1 = require('./modules/updated');
+exports.tutorialUpdated = updated_1.tutorialUpdated;
 var window_1 = require('./modules/window');
 exports.windowToggle = window_1.windowToggle;
 exports.quit = window_1.quit;
diff --git a/lib/components/Publish/PublishOptions.js b/lib/components/Publish/PublishOptions.js
@@ -31,20 +31,26 @@ var PublishOptionsModal = (function (_super) {
     }
     PublishOptionsModal.prototype.publish = function (type) {
         this.props.tutorialPublish(type);
+        this.props.handleClose();
     };
     PublishOptionsModal.prototype.render = function () {
+        var _a = this.props, open = _a.open, handleClose = _a.handleClose, version = _a.version, updated = _a.updated;
         return (React.createElement("div", null, 
-            React.createElement(Dialog_1.default, {title: 'Dialog With Actions', modal: true, open: this.props.open, onRequestClose: this.props.handleClose}, 
-                "Select version change:", 
-                React.createElement(FlatButton_1.default, {label: 'Patch', primary: true, disabled: false, onTouchTap: this.publish.bind(this, 'patch')}), 
-                React.createElement(FlatButton_1.default, {label: 'Minor', disabled: false, onTouchTap: this.publish.bind(this, 'minor')}), 
-                React.createElement(FlatButton_1.default, {label: 'Major', disabled: false, onTouchTap: this.publish.bind(this, 'major')}), 
+            React.createElement(Dialog_1.default, {title: "Current Version: " + version, modal: true, open: open, onRequestClose: handleClose}, 
+                !updated ? React.createElement("p", null, "Tutorial has not changed.") : null, 
+                "Select next version change:", 
+                React.createElement(FlatButton_1.default, {label: 'Patch', primary: true, disabled: !updated, onTouchTap: this.publish.bind(this, 'patch')}), 
+                React.createElement(FlatButton_1.default, {label: 'Minor', disabled: !updated, onTouchTap: this.publish.bind(this, 'minor')}), 
+                React.createElement(FlatButton_1.default, {label: 'Major', disabled: !updated, onTouchTap: this.publish.bind(this, 'major')}), 
                 React.createElement("br", null), 
-                React.createElement(RaisedButton_1.default, {style: styles.cancel, label: 'Cancel', secondary: true, onTouchTap: this.props.handleClose}))
+                React.createElement(RaisedButton_1.default, {style: styles.cancel, label: 'Cancel', secondary: true, onTouchTap: handleClose}))
         ));
     };
     PublishOptionsModal = __decorate([
-        react_redux_1.connect(null, { tutorialPublish: actions_1.tutorialPublish }), 
+        react_redux_1.connect(function (state) { return ({
+            version: state.packageJson.version || 'ERROR',
+            updated: state.updated,
+        }); }, { tutorialPublish: actions_1.tutorialPublish }), 
         __metadata('design:paramtypes', [])
     ], PublishOptionsModal);
     return PublishOptionsModal;
diff --git a/lib/components/Publish/index.js b/lib/components/Publish/index.js
@@ -66,7 +66,6 @@ var TutorialPublish = (function (_super) {
         });
     };
     TutorialPublish.prototype.handleDialog = function (open) {
-        console.log('onClose', open);
         this.setState({
             stepIndex: this.state.stepIndex,
             modalOpen: open,
diff --git a/lib/modules/tutorial/actions.js b/lib/modules/tutorial/actions.js
@@ -1,5 +1,6 @@
 "use strict";
 var types_1 = require('./types');
+var actions_1 = require('../../actions');
 function tutorialInit() {
     return function (dispatch, getState) {
         var _a = getState(), dir = _a.dir, packageJson = _a.packageJson;
@@ -20,6 +21,9 @@ function tutorialBuild() {
     return function (dispatch, getState) {
         var dir = getState().dir;
         dispatch({ type: types_1.TUTORIAL_BUILD, payload: { dir: dir } });
+        if (!getState().updated) {
+            dispatch(actions_1.tutorialUpdated(true));
+        }
     };
 }
 exports.tutorialBuild = tutorialBuild;
@@ -52,6 +56,7 @@ exports.tutorialHintAdd = tutorialHintAdd;
 function tutorialPublish(type) {
     return function (dispatch, getState) {
         dispatch({ type: types_1.TUTORIAL_PUBLISH, payload: { type: type } });
+        dispatch(actions_1.tutorialUpdated(false));
     };
 }
 exports.tutorialPublish = tutorialPublish;
diff --git a/lib/modules/tutorial/reducer.js b/lib/modules/tutorial/reducer.js
@@ -46,7 +46,7 @@ function tutorial(t, action) {
             return taskUpdate_1.default(t, action.payload.pagePosition, action.payload.taskPosition, 'hints', action.payload.hint);
         case types_1.TUTORIAL_PUBLISH:
             var type = action.payload.type;
-            console.log('publish: ', type);
+            alert("Currently not implemented. Run '>apm publish " + type + "' from terminal");
             return t;
         default:
             return t;
diff --git a/lib/modules/updated/index.js b/lib/modules/updated/index.js
@@ -0,0 +1,17 @@
+"use strict";
+var TUTORIAL_UPDATED = 'TUTORIAL_UPDATED';
+function tutorialUpdated(isUpdated) {
+    if (isUpdated === void 0) { isUpdated = false; }
+    return { type: TUTORIAL_UPDATED, payload: { isUpdated: isUpdated } };
+}
+exports.tutorialUpdated = tutorialUpdated;
+function reducer(isUpdated, action) {
+    if (isUpdated === void 0) { isUpdated = false; }
+    switch (action.type) {
+        case TUTORIAL_UPDATED:
+            return action.payload.isUpdated;
+        default:
+            return isUpdated;
+    }
+}
+exports.reducer = reducer;
diff --git a/lib/reducers.js b/lib/reducers.js
@@ -7,10 +7,11 @@ var package_json_1 = require('./modules/package-json');
 var tutorial_1 = require('./modules/tutorial');
 var window_1 = require('./modules/window');
 var validate_tutorial_1 = require('./modules/validate-tutorial');
+var updated_1 = require('./modules/updated');
 var core_coderoad_1 = require('core-coderoad');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
-    alert: core_coderoad_1.alertReducer, checks: setup_1.reducer, editor: core_coderoad_1.editorReducer, dir: core_coderoad_1.dirReducer,
+    alert: core_coderoad_1.alertReducer, checks: setup_1.reducer, editor: core_coderoad_1.editorReducer, dir: core_coderoad_1.dirReducer, form: redux_form_1.reducer,
     packageJson: package_json_1.reducer, pagePosition: page_position_1.reducer, route: core_coderoad_1.routeReducer,
-    tutorial: tutorial_1.reducer, windowToggle: window_1.reducer, form: redux_form_1.reducer, validation: validate_tutorial_1.reducer,
+    tutorial: tutorial_1.reducer, updated: updated_1.reducer, validation: validate_tutorial_1.reducer, windowToggle: window_1.reducer,
 });
diff --git a/src/actions.ts b/src/actions.ts
@@ -6,6 +6,7 @@ export {
   tutorialInit, tutorialLoad, tutorialBuild, tutorialPageAdd,
   tutorialTaskAdd, tutorialHintAdd, tutorialActionAdd, tutorialPublish
 } from './modules/tutorial';
+export {tutorialUpdated} from './modules/updated';
 export {windowToggle, quit} from './modules/window';
 export {validateTutorial} from './modules/validate-tutorial';
 
diff --git a/src/components/Publish/PublishOptions.tsx b/src/components/Publish/PublishOptions.tsx
@@ -11,46 +11,55 @@ const styles = {
   },
 };
 
-@connect(null, {tutorialPublish})
+@connect(state => ({
+  version: state.packageJson.version || 'ERROR',
+  updated: state.updated,
+}), {tutorialPublish})
 export default class PublishOptionsModal extends React.Component<{
-  open: boolean, handleClose: () => any,
-  tutorialPublish: (type: string) => Redux.ActionCreator,
+  open: boolean, handleClose: () => any, version?: string,
+  tutorialPublish?: (type: string) => Redux.ActionCreator,
+  updated?: boolean,
 }, {}> {
   publish(type: string) {
     this.props.tutorialPublish(type);
+    this.props.handleClose();
   }
   render() {
+    const {open, handleClose, version, updated} = this.props;
     return (
       <div>
         <Dialog
-          title='Dialog With Actions'
+          title={`Current Version: ${version}`}
           modal={true}
-          open={this.props.open}
-          onRequestClose={this.props.handleClose}
+          open={open}
+          onRequestClose={handleClose}
         >
-          Select version change:
+          {/* Note if tutorial has not changed */}
+          {!updated ? <p>Tutorial has not changed.</p> : null}
+
+          Select next version change:
           <FlatButton
             label='Patch'
             primary={true}
-            disabled={false}
+            disabled={!updated}
             onTouchTap={this.publish.bind(this, 'patch')}
           />
           <FlatButton
             label='Minor'
-            disabled={false}
+            disabled={!updated}
             onTouchTap={this.publish.bind(this, 'minor')}
           />
           <FlatButton
             label='Major'
-            disabled={false}
+            disabled={!updated}
             onTouchTap={this.publish.bind(this, 'major')}
           />
           <br/>
           <RaisedButton
             style={styles.cancel}
             label='Cancel'
             secondary={true}
-            onTouchTap={this.props.handleClose}
+            onTouchTap={handleClose}
           />
         </Dialog>
       </div>
diff --git a/src/components/Publish/index.tsx b/src/components/Publish/index.tsx
@@ -64,7 +64,6 @@ export default class TutorialPublish extends React.Component<{
     });
   }
   handleDialog(open: boolean) {
-    console.log('onClose', open);
     this.setState({
       stepIndex: this.state.stepIndex,
       modalOpen: open,
diff --git a/src/modules/tutorial/actions.ts b/src/modules/tutorial/actions.ts
@@ -2,6 +2,7 @@ import {
   TUTORIAL_INIT, TUTORIAL_LOAD, TUTORIAL_BUILD, TUTORIAL_PUBLISH,
   TUTORIAL_PAGE_ADD, TUTORIAL_TASK_ADD, TUTORIAL_HINT_ADD, TUTORIAL_ACTION_ADD
 } from './types';
+import {tutorialUpdated} from '../../actions';
 
 export function tutorialInit() {
   return function(dispatch, getState) {
@@ -23,6 +24,9 @@ export function tutorialBuild() {
   return (dispatch, getState) => {
     const {dir} = getState();
     dispatch({ type: TUTORIAL_BUILD, payload: { dir } });
+    if (!getState().updated) {
+      dispatch(tutorialUpdated(true));
+    }
   };
 }
 
@@ -48,12 +52,13 @@ export function tutorialActionAdd(taskPosition: number, tutorialAction: Object)
 export function tutorialHintAdd(taskPosition: number, hint: string) {
   return (dispatch, getState) => {
     const {pagePosition} = getState();
-    dispatch({ type: TUTORIAL_HINT_ADD, payload: { pagePosition, taskPosition, hint }});
+    dispatch({ type: TUTORIAL_HINT_ADD, payload: { pagePosition, taskPosition, hint } });
   };
 }
 
 export function tutorialPublish(type: string) {
   return (dispatch, getState) => {
     dispatch({ type: TUTORIAL_PUBLISH, payload: { type } });
+    dispatch(tutorialUpdated(false));
   };
 }
diff --git a/src/modules/tutorial/reducer.ts b/src/modules/tutorial/reducer.ts
@@ -67,7 +67,7 @@ export default function tutorial(t = _tutorial, action: Action): Tutorial.Output
 
     case TUTORIAL_PUBLISH:
       const {type} = action.payload;
-      console.log('publish: ', type);
+      alert(`Currently not implemented. Run '>apm publish ${type}' from terminal`);
       return t;
 
     default:
diff --git a/src/modules/updated/index.ts b/src/modules/updated/index.ts
@@ -0,0 +1,14 @@
+const TUTORIAL_UPDATED = 'TUTORIAL_UPDATED';
+
+export function tutorialUpdated(isUpdated = false) {
+  return { type: TUTORIAL_UPDATED, payload: { isUpdated } };
+}
+
+export function reducer(isUpdated = false, action: Action): boolean {
+  switch (action.type) {
+    case TUTORIAL_UPDATED:
+      return action.payload.isUpdated;
+    default:
+      return isUpdated;
+  }
+}
diff --git a/src/reducers.ts b/src/reducers.ts
@@ -8,6 +8,7 @@ import {reducer as packageJson} from './modules/package-json';
 import {reducer as tutorial} from './modules/tutorial';
 import {reducer as windowToggle} from './modules/window';
 import {reducer as validation} from './modules/validate-tutorial';
+import {reducer as updated} from './modules/updated';
 
 // core reducers
 import {
@@ -18,7 +19,7 @@ import {
 } from 'core-coderoad';
 
 export default combineReducers({
-  alert, checks, editor, dir,
+  alert, checks, editor, dir, form,
   packageJson, pagePosition, route,
-  tutorial, windowToggle, form, validation,
+  tutorial, updated, validation, windowToggle,
 });
diff --git a/tsconfig.json b/tsconfig.json
@@ -57,6 +57,7 @@
   "src/modules/tutorial/utils/pageGet.ts",
   "src/modules/tutorial/utils/taskGet.ts",
   "src/modules/tutorial/utils/taskUpdate.ts",
+  "src/modules/updated/index.ts",
   "src/modules/utils/readFile.ts",
   "src/modules/utils/writeFile.ts",
   "src/modules/validate-tutorial/actions.ts",

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@ export default class TutorialPublish extends React.Component<{`
`64`	`64`	`});`
`65`	`65`	`}`
`66`	`66`	`handleDialog(open: boolean) {`
`67`		`- console.log('onClose', open);`
`68`	`67`	`this.setState({`
`69`	`68`	`stepIndex: this.state.stepIndex,`
`70`	`69`	`modalOpen: open,`