rename view -> ui, make code more readable

3 files changed, 12 insertions, 11 deletions

diff --git a/web/src/js/components/Header.js b/web/src/js/components/Header.js
index 080f438a..15d33ab3 100644
--- a/web/src/js/components/Header.js
+++ b/web/src/js/components/Header.js
@@ -8,7 +8,7 @@ import ViewMenu from './Header/ViewMenu'
 import OptionMenu from './Header/OptionMenu'
 import FileMenu from './Header/FileMenu'
 import FlowMenu from './Header/FlowMenu'
-import {setActiveMenu} from '../ducks/view'
+import {setActiveMenu} from '../ducks/ui.js'
 
 class Header extends Component {
     static entries = [MainMenu, ViewMenu, OptionMenu]
@@ -60,7 +60,7 @@ class Header extends Component {
 export default connect(
     (state) => ({
         selectedFlow: state.flows.selected[0],
-        active_menu: state.view.active_menu
+        active_menu: state.ui.active_menu
     }),
     dispatch => bindActionCreators({
         setActiveMenu,
diff --git a/web/src/js/ducks/index.js b/web/src/js/ducks/index.js
index 2638272d..f4ce8fa6 100644
--- a/web/src/js/ducks/index.js
+++ b/web/src/js/ducks/index.js
@@ -2,13 +2,13 @@ import {combineReducers} from 'redux'
 import eventLog from './eventLog'
 import websocket from './websocket'
 import flows from './flows'
-import view from './view'
+import ui from './ui.js'
 
 const rootReducer = combineReducers({
     eventLog,
     websocket,
     flows,
-    view
+    ui
 })
 
 export default rootReducer
diff --git a/web/src/js/ducks/view.js b/web/src/js/ducks/ui.js
index b56561d0..26420e0d 100644
--- a/web/src/js/ducks/view.js
+++ b/web/src/js/ducks/ui.js
@@ -1,7 +1,5 @@
-import ReduxThunk from 'redux-thunk'
-
 import { SELECT_FLOW } from './flows'
-const ACTIVE_MENU = 'ACTIVE_MENU'
+const SET_ACTIVE_MENU = 'SET_ACTIVE_MENU'
 
 
 const defaultState = {
@@ -9,16 +7,19 @@ const defaultState = {
 }
 export default function reducer(state = defaultState, action) {
     switch (action.type) {
-        case ACTIVE_MENU:
+        case SET_ACTIVE_MENU:
             return {
                 ...state,
                 active_menu: action.active_menu
             }
         case SELECT_FLOW:
-            if (!action.currentSelection != !action.flowId){
+            let isNewSelection = (action.flowId && !action.currentSelection)
+            let isSelectAction = action.flowId
+            if (isNewSelection){
+                let wasFlowSelected = state.active_menu == 'Flow'
                 return{
                     ...state,
-                    active_menu: action.flowId ? 'Flow' : (state.active_menu == 'Flow' ? 'Start' : state.active_menu)
+                    active_menu: isSelectAction ? 'Flow' : (wasFlowSelected ? 'Start' : state.active_menu)
                 }
             }
             return state
@@ -29,7 +30,7 @@ export default function reducer(state = defaultState, action) {
 
 export function setActiveMenu(active_menu) {
     return {
-        type: ACTIVE_MENU,
+        type: SET_ACTIVE_MENU,
         active_menu
     }
 }