remove RAT, break ALERT_TOGGLE into OPEN & CLOSE

Author: ShMcK

lib/actions/_types.js

@@ -1,12 +1,12 @@
 "use strict";
 exports.ALERT_REPLAY = 'ALERT_REPLAY';
-exports.ALERT_TOGGLE = 'ALERT_TOGGLE';
+exports.ALERT_OPEN = 'ALERT_OPEN';
+exports.ALERT_CLOSE = 'ALERT_CLOSE';
 exports.COMPLETE_PAGE = 'COMPLETE_PAGE';
 exports.COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
 exports.DEVTOOLS_TOGGLE = 'DEVTOOLS_TOGGLE';
 exports.HINT_POSITION_SET = 'HINT_POSITION_SET';
 exports.PAGE_SET = 'PAGE_SET';
-exports.PAGE_POSITION_SET = 'POSITION_SET';
 exports.PROGRESS_LOAD = 'PROGRESS_LOAD';
 exports.PROGRESS_PAGE_POSITION_LOAD = 'PROGRESS_PAGE_POSITION_LOAD';
 exports.QUIT = 'QUIT';

lib/actions/alert.js

@@ -1,12 +1,16 @@
 "use strict";
 var _types_1 = require('./_types');
-function alertToggle(alert) {
+function alertOpen(alert) {
     return function (dispatch, getState) {
-        dispatch({ type: _types_1.ALERT_TOGGLE, payload: { alert: alert } });
+        dispatch({ type: _types_1.ALERT_OPEN, payload: { alert: alert } });
     };
 }
-exports.alertToggle = alertToggle;
+exports.alertOpen = alertOpen;
 function alertReplay() {
     return { type: _types_1.ALERT_REPLAY };
 }
 exports.alertReplay = alertReplay;
+function alertClose() {
+    return { type: _types_1.ALERT_CLOSE };
+}
+exports.alertClose = alertClose;

lib/actions/index.js

@@ -1,6 +1,7 @@
 "use strict";
 var alert_1 = require('./alert');
-exports.alertToggle = alert_1.alertToggle;
+exports.alertOpen = alert_1.alertOpen;
+exports.alertClose = alert_1.alertClose;
 exports.alertReplay = alert_1.alertReplay;
 var progress_1 = require('./progress');
 exports.progressLoad = progress_1.progressLoad;
@@ -12,7 +13,6 @@ exports.hintPositionSet = hint_1.hintPositionSet;
 var page_1 = require('./page');
 exports.pageSet = page_1.pageSet;
 exports.pageNext = page_1.pageNext;
-exports.pagePositionSet = page_1.pagePositionSet;
 var route_1 = require('./route');
 exports.routeSet = route_1.routeSet;
 var setup_1 = require('./setup');

lib/actions/page.js

@@ -30,7 +30,3 @@ function pageSet(pagePosition) {
     };
 }
 exports.pageSet = pageSet;
-function pagePositionSet(pagePosition) {
-    return { type: _types_1.PAGE_POSITION_SET, payload: { pagePosition: pagePosition } };
-}
-exports.pagePositionSet = pagePositionSet;

lib/actions/progress.js

@@ -28,7 +28,7 @@ function completePage(completed) {
                 dispatch(completeTutorial());
             }
             else {
-                dispatch(alert_1.alertToggle({
+                dispatch(alert_1.alertOpen({
                     message: "Page " + (pagePosition + 1) + " Complete",
                     action: 'PASS',
                 }));
@@ -45,7 +45,7 @@ function completeTutorial(completed) {
     return function (dispatch, getState) {
         var tutorial = getState().tutorial;
         dispatch({ type: _types_1.COMPLETE_TUTORIAL, payload: { tutorial: tutorial, completed: completed } });
-        dispatch('ALER'({
+        dispatch(alert_1.alertOpen({
             message: 'Tutorial Complete',
             action: 'PASS',
         }));

lib/actions/test.js

@@ -35,7 +35,7 @@ function testResult(result) {
             });
         }
         dispatch({ type: _types_1.TEST_RESULT, payload: { result: result, taskActions: taskActions } });
-        dispatch(alert_1.alertToggle(alert));
+        dispatch(alert_1.alertOpen(alert));
     };
 }
 exports.testResult = testResult;

lib/actions/tutorial.js

@@ -20,7 +20,7 @@ function tutorialUpdate(name) {
             duration: 3000,
         };
         dispatch({ type: _types_1.TUTORIAL_UPDATE, payload: { name: name } });
-        dispatch(alert_1.alertToggle(alert));
+        dispatch(alert_1.alertOpen(alert));
     };
 }
 exports.tutorialUpdate = tutorialUpdate;

lib/components/Alert/index.js

@@ -27,14 +27,14 @@ var Alert = (function (_super) {
         _super.apply(this, arguments);
     }
     Alert.prototype.render = function () {
-        var _a = this.props, alert = _a.alert, alertToggle = _a.alertToggle;
+        var _a = this.props, alert = _a.alert, close = _a.close;
         var action = alert.action, message = alert.message, open = alert.open, duration = alert.duration;
-        return (React.createElement(Snackbar_1.default, {className: "cr-alert " + action, open: open, message: message || '', action: action || 'NOTE', autoHideDuration: duration || 2000, onRequestClose: alertToggle}));
+        return (React.createElement(Snackbar_1.default, {className: "cr-alert " + action, open: open, message: message || '', action: action || 'NOTE', autoHideDuration: duration || 2000, onRequestClose: close}));
     };
     Alert = __decorate([
         react_redux_1.connect(null, function (dispatch) {
             return {
-                alertToggle: function () { return dispatch(actions_1.alertToggle({ open: false })); }
+                close: function () { return dispatch(actions_1.alertClose()); }
             };
         }), 
         __metadata('design:paramtypes', [])

lib/reducers/alert/index.js

@@ -28,8 +28,10 @@ function alertReducer(alert, action) {
     switch (action.type) {
         case _types_1.ALERT_REPLAY:
             return setAlert(current);
-        case _types_1.ALERT_TOGGLE:
+        case _types_1.ALERT_OPEN:
             return setAlert(action.payload.alert);
+        case _types_1.ALERT_CLOSE:
+            return Object.assign({}, alert, { open: false });
         default:
             return alert;
     }

lib/reducers/page-position/index.js

@@ -7,7 +7,6 @@ function pagePositionReducer(pagePosition, action) {
             var pages = action.payload.progress.pages;
             var firstFail = pages.indexOf(false);
             return firstFail < 0 ? pages.length - 1 : firstFail;
-        case _types_1.PAGE_SET:
         case _types_1.PAGE_POSITION_SET:
             return action.payload.pagePosition;
         default:

lib/store/index.js

@@ -1,9 +1,9 @@
 "use strict";
 var redux_1 = require('redux');
-var redux_action_thunk_1 = require('redux-action-thunk');
 var reducers_1 = require('../reducers');
 var createLogger = require('redux-logger');
-var middlewares = [redux_action_thunk_1.ratMiddleware];
+var redux_thunk_1 = require('redux-thunk');
+var middlewares = [redux_thunk_1.default];
 var devMode = true;
 if (devMode) {
     var logger = createLogger();

package.json

@@ -46,7 +46,6 @@
     "react-redux": "4.4.5",
     "react-tap-event-plugin": "1.0.0",
     "redux": "3.5.2",
-    "redux-action-thunk": "0.3.0",
     "redux-logger": "2.6.1",
     "redux-thunk": "2.1.0"
   },

src/actions/_types.ts

@@ -1,5 +1,6 @@
 export const ALERT_REPLAY = 'ALERT_REPLAY';
-export const ALERT_TOGGLE = 'ALERT_TOGGLE';
+export const ALERT_OPEN = 'ALERT_OPEN';
+export const ALERT_CLOSE = 'ALERT_CLOSE';
 export const COMPLETE_PAGE = 'COMPLETE_PAGE';
 export const COMPLETE_TUTORIAL = 'COMPLETE_TUTORIAL';
 export const DEVTOOLS_TOGGLE = 'DEVTOOLS_TOGGLE';

src/actions/alert.ts

@@ -1,19 +1,15 @@
-import {ALERT_REPLAY, ALERT_TOGGLE} from './_types';
+import {ALERT_REPLAY, ALERT_OPEN, ALERT_CLOSE} from './_types';
 
-export function alertToggle(alert: Object): ReduxThunk.ThunkInterface {
+export function alertOpen(alert: Object): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
-    dispatch({ type: ALERT_TOGGLE, payload: { alert } });
+    dispatch({ type: ALERT_OPEN, payload: { alert } });
   };
 }
 
 export function alertReplay(): Action {
   return { type: ALERT_REPLAY };
 }
 
-// import {rat} from 'redux-action-thunk';
-//
-// rat.add('ALERT_TOGGLE', (dispatch, getState) => (alert) => {
-//   dispatch({ type: 'ALERT_TOGGLE', payload: { alert } });
-// });
-//
-// rat.add('ALERT_REPLAY');
+export function alertClose(): Action {
+  return { type: ALERT_CLOSE };
+}

src/actions/index.ts

@@ -1,5 +1,4 @@
-export {alertToggle, alertReplay} from './alert';
-// import './alert';
+export {alertOpen, alertClose, alertReplay} from './alert';
 export {
   progressLoad, completePage, completeTutorial,
   progressPagePositionLoad

src/actions/progress.ts

@@ -1,7 +1,7 @@
 import {
   PROGRESS_PAGE_POSITION_LOAD, PROGRESS_LOAD, COMPLETE_PAGE, COMPLETE_TUTORIAL
 } from './_types';
-import {alertToggle} from './alert';
+import {alertOpen} from './alert';
 import {testRun} from './test';
 
 export function progressPagePositionLoad(): ReduxThunk.ThunkInterface {
@@ -30,7 +30,7 @@ export function completePage(completed = true): ReduxThunk.ThunkInterface {
       if (progress.pages.every(x => x.completed)) {
         dispatch(completeTutorial());
       } else {
-        dispatch(alertToggle({
+        dispatch(alertOpen({
           message: `Page ${pagePosition + 1} Complete`,
           action: 'PASS',
         }));
@@ -45,7 +45,7 @@ export function completeTutorial(completed = true): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
     const {tutorial} = getState();
     dispatch({ type: COMPLETE_TUTORIAL, payload: { tutorial, completed } });
-    dispatch('ALER'({
+    dispatch(alertOpen({
       message: 'Tutorial Complete',
       action: 'PASS',
     }));

src/actions/test.ts

@@ -3,7 +3,7 @@ import {
 } from './_types';
 import {hintPositionSet} from './hint';
 import {completePage} from './progress';
-import {alertToggle} from './alert';
+import {alertOpen} from './alert';
 
 export function testRun(): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
@@ -39,7 +39,7 @@ export function testResult(result: Test.Result): ReduxThunk.ThunkInterface {
       });
     }
     dispatch({ type: TEST_RESULT, payload: { result, taskActions } });
-    dispatch(alertToggle(alert));
+    dispatch(alertOpen(alert));
   };
 }
 

src/actions/tutorial.ts

@@ -3,7 +3,7 @@ import {
 } from './_types';
 import {progressLoad} from './progress';
 import {routeSet} from './route';
-import {alertToggle} from './alert';
+import {alertOpen} from './alert';
 
 export function tutorialSet(name: string): ReduxThunk.ThunkInterface {
   return (dispatch, getState): void => {
@@ -22,7 +22,7 @@ export function tutorialUpdate(name: string): ReduxThunk.ThunkInterface {
       duration: 3000,
     };
     dispatch({ type: TUTORIAL_UPDATE, payload: { name } });
-    dispatch(alertToggle(alert));
+    dispatch(alertOpen(alert));
   };
 }
 

src/components/Alert/index.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import Snackbar from 'material-ui/Snackbar';
-import {alertToggle} from '../../actions';
+import {alertClose} from '../../actions';
 
 const defaultAlert = {
   message: '',
@@ -10,14 +10,14 @@ const defaultAlert = {
 
 @connect(null, dispatch => {
   return {
-    alertToggle: () => dispatch(alertToggle({open: false}))
+    close: () => dispatch(alertClose())
   };
 })
 export default class Alert extends React.Component<{
-  alert: CR.Alert, alertToggle?: any
+  alert: CR.Alert, close?: any
 }, {}> {
   render() {
-    const {alert, alertToggle} = this.props;
+    const {alert, close} = this.props;
     const {action, message, open, duration} = alert;
     return (
       <Snackbar
@@ -26,7 +26,7 @@ export default class Alert extends React.Component<{
           message={message || ''}
           action={action || 'NOTE'}
           autoHideDuration={duration || 2000}
-          onRequestClose={alertToggle}
+          onRequestClose={close}
       />
     );
   }

src/reducers/alert/index.ts

@@ -1,6 +1,5 @@
 import {
-  ALERT_REPLAY, ALERT_TOGGLE, TUTORIAL_UPDATE,
-  TEST_RESULT, COMPLETE_PAGE, COMPLETE_TUTORIAL
+  ALERT_REPLAY, ALERT_OPEN, ALERT_CLOSE
 } from '../../actions/_types';
 
 const _alert: CR.Alert = {
@@ -25,7 +24,6 @@ const colors = {
 let current: CR.Alert = _alert;
 
 function setAlert(a: CR.Alert): CR.Alert {
-
   const color = colors[a.action] || colors.NOTE;
   let statusBarAlert = <HTMLElement>document.getElementsByClassName('cr-alert-replay')[0];
   statusBarAlert.style.color = color;
@@ -40,9 +38,12 @@ export default function alertReducer(
     case ALERT_REPLAY:
       return setAlert(current);
 
-    case ALERT_TOGGLE:
+    case ALERT_OPEN:
       return setAlert(action.payload.alert);
 
+    case ALERT_CLOSE:
+      return Object.assign({}, alert, {open: false});
+
     default:
       return alert;
   }

src/reducers/tutorial-list/update.ts

@@ -1,5 +1,4 @@
 import commandLine from '../../services/command-line';
-// import {alertToggle} from '../../actions';
 import {tutorialsFind} from '../../actions';
 
 export function tutorialUpdate(name: string): void {

src/store/index.ts

@@ -1,11 +1,10 @@
 import { applyMiddleware, createStore } from 'redux';
-import {ratMiddleware} from 'redux-action-thunk';
 import reducer from '../reducers';
 import * as createLogger from 'redux-logger';
 import thunk from 'redux-thunk';
 
 // const middlewares = [ramMiddleware];
-const middlewares = [ratMiddleware];
+const middlewares = [thunk];
 
 const devMode = true;
 if (devMode) {