Create ActionUnion (#41)

* create ActionUnion

* refactor other actions to use ActionUnion

* make ActionUnion names more specific

Author: codeBelt

src/stores/meta/MetaAction.ts

@@ -1,6 +1,8 @@
 import IAction from '../IAction';
 import ITitleDescription from './models/ITitleDescription';
 
+export type MetaActionUnion = ITitleDescription;
+
 export default class MetaAction {
 
     public static readonly SET_META: string = 'MetaAction.SET_META';

src/stores/meta/MetaReducer.ts

@@ -1,4 +1,4 @@
-import MetaAction from './MetaAction';
+import MetaAction, {MetaActionUnion} from './MetaAction';
 import IMetaReducerState from './IMetaReducerState';
 import IAction from '../IAction';
 import ITitleDescription from './models/ITitleDescription';
@@ -10,21 +10,19 @@ export default class MetaReducer {
         description: '',
     };
 
-    public static reducer(state: IMetaReducerState = MetaReducer._initialState, action: IAction<any>): IMetaReducerState {
+    public static reducer(state: IMetaReducerState = MetaReducer._initialState, action: IAction<MetaActionUnion>): IMetaReducerState {
         switch (action.type) {
             case MetaAction.SET_META:
-                return MetaReducer._setMeta(state, action);
+                const model: ITitleDescription = action.payload as ITitleDescription;
+
+                return {
+                    ...state,
+                    description: model.description || '',
+                    title: model.title,
+                };
             default:
                 return state;
         }
     }
 
-    private static _setMeta(state: IMetaReducerState, action: IAction<ITitleDescription>): IMetaReducerState {
-        return {
-            ...state,
-            description: action.payload.description || '',
-            title: action.payload.title,
-        };
-    }
-
 }

src/stores/modal/ModalAction.ts

@@ -1,5 +1,7 @@
 import IAction from '../IAction';
 
+export type ModalActionUnion = void | JSX.Element;
+
 export default class ModalAction {
 
     public static readonly ADD_MODAL: string = 'ModalAction.ADD_MODAL';

src/stores/modal/ModalReducer.ts

@@ -1,4 +1,4 @@
-import ModalAction from './ModalAction';
+import ModalAction, {ModalActionUnion} from './ModalAction';
 import IModalReducerState from './IModalReducerState';
 import IAction from '../IAction';
 
@@ -9,39 +9,33 @@ export default class ModalReducer {
         modals: [],
     };
 
-    public static reducer(state: IModalReducerState = ModalReducer._initialState, action: IAction<any>): IModalReducerState {
+    public static reducer(state: IModalReducerState = ModalReducer._initialState, action: IAction<ModalActionUnion>): IModalReducerState {
         switch (action.type) {
             case ModalAction.ADD_MODAL:
-                return ModalReducer._addModal(state, action);
+                const modal: JSX.Element = action.payload as JSX.Element;
+
+                return {
+                    ...state,
+                    currentModal: modal,
+                    modals: [...state.modals, modal],
+                };
             case ModalAction.REMOVE_MODAL:
-                return ModalReducer._closeCurrentModal(state, action);
+                const currentModal: JSX.Element = state.currentModal;
+                const modalIndex: number = state.modals.indexOf(currentModal);
+                const modals = [
+                    ...state.modals.slice(0, modalIndex),
+                    ...state.modals.slice(modalIndex + 1),
+                ];
+                const previousModal: JSX.Element = modals[modals.length - 1];
+
+                return {
+                    ...state,
+                    currentModal: previousModal || null,
+                    modals,
+                };
             default:
                 return state;
         }
     }
 
-    private static _addModal(state: IModalReducerState, action: IAction<JSX.Element>): IModalReducerState {
-        return {
-            ...state,
-            currentModal: action.payload,
-            modals: [...state.modals, action.payload],
-        };
-    }
-
-    private static _closeCurrentModal(state: IModalReducerState, action: IAction<void>): IModalReducerState {
-        const currentModal: JSX.Element = state.currentModal;
-        const modalIndex: number = state.modals.indexOf(currentModal);
-        const modals = [
-            ...state.modals.slice(0, modalIndex),
-            ...state.modals.slice(modalIndex + 1),
-        ];
-        const previousModal: JSX.Element = modals[modals.length - 1];
-
-        return {
-            ...state,
-            currentModal: previousModal || null,
-            modals,
-        };
-    }
-
 }

src/stores/user/UserAction.ts

@@ -1,6 +1,8 @@
 import IAction from '../IAction';
 import UserModel from './models/UserModel';
 
+export type UserActionUnion = void | UserModel;
+
 export default class UserAction {
 
     public static readonly LOAD_USER: string = 'UserAction.LOAD_USER';

src/stores/user/UserReducer.ts

@@ -1,4 +1,4 @@
-import UserAction from './UserAction';
+import UserAction, {UserActionUnion} from './UserAction';
 import IUserReducerState from './IUserReducerState';
 import IAction from '../IAction';
 import UserModel from './models/UserModel';
@@ -10,30 +10,22 @@ export default class UserReducer {
         isLoadingUser: false,
     };
 
-    public static reducer(state: IUserReducerState = UserReducer._initialState, action: IAction<any>): IUserReducerState {
+    public static reducer(state: IUserReducerState = UserReducer._initialState, action: IAction<UserActionUnion>): IUserReducerState {
         switch (action.type) {
             case UserAction.LOAD_USER:
-                return UserReducer._loadUser(state, action);
+                return {
+                    ...state,
+                    isLoadingUser: true,
+                };
             case UserAction.LOAD_USER_SUCCESS:
-                return UserReducer._loadUserSuccess(state, action);
+                return {
+                    ...state,
+                    isLoadingUser: false,
+                    currentUser: action.payload as UserModel,
+                };
             default:
                 return state;
         }
     }
 
-    private static _loadUser(state: IUserReducerState, action: IAction<UserModel>): IUserReducerState {
-        return {
-            ...state,
-            isLoadingUser: true,
-        };
-    }
-
-    private static _loadUserSuccess(state: IUserReducerState, action: IAction<UserModel>): IUserReducerState {
-        return {
-            ...state,
-            currentUser: action.payload,
-            isLoadingUser: false,
-        };
-    }
-
 }