From 261e0f590c6e9d2bd4faf668bc4d455cff30bc40 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Tue, 4 Jul 2017 22:52:08 +0900 Subject: [PATCH] update it --- webui/src/modules/notification/actions.js | 28 ++++++++--------------- webui/src/modules/notification/const.js | 3 --- webui/src/modules/notification/reducer.js | 19 --------------- webui/src/modules/reducers.js | 2 +- webui/src/modules/ui/index.js | 4 +--- 5 files changed, 11 insertions(+), 45 deletions(-) delete mode 100644 webui/src/modules/notification/const.js delete mode 100644 webui/src/modules/notification/reducer.js diff --git a/webui/src/modules/notification/actions.js b/webui/src/modules/notification/actions.js index e369ce944f..7370c40d9e 100644 --- a/webui/src/modules/notification/actions.js +++ b/webui/src/modules/notification/actions.js @@ -1,22 +1,12 @@ -import {RNS_SHOW_NOTIFICATION, RNS_HIDE_NOTIFICATION, RNS_REMOVE_ALL_NOTIFICATIONS} from './const'; - -//Example opts -// { -// title: 'Hey, it\'s good to see you!', -// message: 'Now you can see how easy it is to use notifications in React!', -// position: 'tr', -// autoDismiss: 0, -// action: { -// label: 'Awesome!', -// callback: function() { -// console.log('Clicked'); -// } -// } -// } +export const NOTIFICATION = { + SHOW: 'notification/SHOW', + HIDE: 'notification/HIDE', + CLEAR: 'notification/CLEAR', +} export function show(opts = {}, level = 'success') { return { - type: RNS_SHOW_NOTIFICATION, + type: NOTIFICATION.SHOW, ...opts, uid: opts.uid || Date.now(), level @@ -41,11 +31,11 @@ export function info(opts) { export function hide(uid) { return { - type: RNS_HIDE_NOTIFICATION, + type: NOTIFICATION.HIDE, uid }; } -export function removeAll() { - return { type: RNS_REMOVE_ALL_NOTIFICATIONS }; +export function clear() { + return { type: NOTIFICATION.CLEAR }; } diff --git a/webui/src/modules/notification/const.js b/webui/src/modules/notification/const.js deleted file mode 100644 index 470658c160..0000000000 --- a/webui/src/modules/notification/const.js +++ /dev/null @@ -1,3 +0,0 @@ -export const RNS_SHOW_NOTIFICATION = 'RNS_SHOW_NOTIFICATION'; -export const RNS_HIDE_NOTIFICATION = 'RNS_HIDE_NOTIFICATION'; -export const RNS_REMOVE_ALL_NOTIFICATIONS = 'RNS_REMOVE_ALL_NOTIFICATIONS'; diff --git a/webui/src/modules/notification/reducer.js b/webui/src/modules/notification/reducer.js deleted file mode 100644 index 576fa6ee4e..0000000000 --- a/webui/src/modules/notification/reducer.js +++ /dev/null @@ -1,19 +0,0 @@ -import {RNS_SHOW_NOTIFICATION, RNS_HIDE_NOTIFICATION, RNS_REMOVE_ALL_NOTIFICATIONS} from './const'; - -export default function Notifications(state = [], action = {}) { - switch(action.type) { - case RNS_SHOW_NOTIFICATION: - const { type, ...rest } = action; - return [ - ...state, - { ...rest, uid: action.uid} - ]; - case RNS_HIDE_NOTIFICATION: - return state.filter(notification => { - return notification.uid !== action.uid; - }); - case RNS_REMOVE_ALL_NOTIFICATIONS: - return []; - } - return state; -} diff --git a/webui/src/modules/reducers.js b/webui/src/modules/reducers.js index d7e8fae413..dd331e25e2 100644 --- a/webui/src/modules/reducers.js +++ b/webui/src/modules/reducers.js @@ -3,7 +3,7 @@ import { combineReducers } from 'redux'; import auth from './auth/reducers'; import crud from './crud/reducers'; import ui from './ui'; -import notifications from './notification/reducer'; +import notifications from './notification/reducers'; export default combineReducers({ auth, diff --git a/webui/src/modules/ui/index.js b/webui/src/modules/ui/index.js index e3df520512..8f325fc59a 100644 --- a/webui/src/modules/ui/index.js +++ b/webui/src/modules/ui/index.js @@ -4,8 +4,7 @@ import { handleActions } from 'redux-actions'; export const UI = { TOGGLE_SIDEBAR: 'ui/TOGGLE_SIDEBAR', SET_SIDEBAR_VISIBILITY: 'ui/SET_SIDEBAR_VISIBILITY', - SELECT_VIEW: 'ui/SELECT_VIEW', - TEST_UI: 'ui/SELECT_VIEW' + SELECT_VIEW: 'ui/SELECT_VIEW' } /* @@ -25,7 +24,6 @@ export const UI = { export const toggleSidebar = createAction(UI.TOGGLE_SIDEBAR); export const setSidebarVisibility = createAction(UI.SET_SIDEBAR_VISIBILITY); export const selectView = createAction(UI.SELECT_VIEW); -export const testUI = ({type:UI.TEST_UI, argu:true}) const initialState = { sidebar: {