From 48e372bf98aeee718f6ce9758fd96d49fb2fd3a5 Mon Sep 17 00:00:00 2001
From: Clemens <cle1000.cb@gmail.com>
Date: Wed, 15 Jun 2016 08:54:55 +0200
Subject: rename view -> ui, make code more readable

---
 web/src/js/components/Header.js |  4 ++--
 web/src/js/ducks/index.js       |  4 ++--
 web/src/js/ducks/ui.js          | 37 +++++++++++++++++++++++++++++++++++++
 web/src/js/ducks/view.js        | 36 ------------------------------------
 4 files changed, 41 insertions(+), 40 deletions(-)
 create mode 100644 web/src/js/ducks/ui.js
 delete mode 100644 web/src/js/ducks/view.js

(limited to 'web/src/js')

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/ui.js b/web/src/js/ducks/ui.js
new file mode 100644
index 00000000..26420e0d
--- /dev/null
+++ b/web/src/js/ducks/ui.js
@@ -0,0 +1,37 @@
+import { SELECT_FLOW } from './flows'
+const SET_ACTIVE_MENU = 'SET_ACTIVE_MENU'
+
+
+const defaultState = {
+    active_menu: 'Start'
+}
+export default function reducer(state = defaultState, action) {
+    switch (action.type) {
+        case SET_ACTIVE_MENU:
+            return {
+                ...state,
+                active_menu: action.active_menu
+            }
+        case SELECT_FLOW:
+            let isNewSelection = (action.flowId && !action.currentSelection)
+            let isSelectAction = action.flowId
+            if (isNewSelection){
+                let wasFlowSelected = state.active_menu == 'Flow'
+                return{
+                    ...state,
+                    active_menu: isSelectAction ? 'Flow' : (wasFlowSelected ? 'Start' : state.active_menu)
+                }
+            }
+            return state
+        default:
+            return state
+    }
+}
+
+export function setActiveMenu(active_menu) {
+    return {
+        type: SET_ACTIVE_MENU,
+        active_menu
+    }
+}
+
diff --git a/web/src/js/ducks/view.js b/web/src/js/ducks/view.js
deleted file mode 100644
index b56561d0..00000000
--- a/web/src/js/ducks/view.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import ReduxThunk from 'redux-thunk'
-
-import { SELECT_FLOW } from './flows'
-const ACTIVE_MENU = 'ACTIVE_MENU'
-
-
-const defaultState = {
-    active_menu: 'Start'
-}
-export default function reducer(state = defaultState, action) {
-    switch (action.type) {
-        case ACTIVE_MENU:
-            return {
-                ...state,
-                active_menu: action.active_menu
-            }
-        case SELECT_FLOW:
-            if (!action.currentSelection != !action.flowId){
-                return{
-                    ...state,
-                    active_menu: action.flowId ? 'Flow' : (state.active_menu == 'Flow' ? 'Start' : state.active_menu)
-                }
-            }
-            return state
-        default:
-            return state
-    }
-}
-
-export function setActiveMenu(active_menu) {
-    return {
-        type: ACTIVE_MENU,
-        active_menu
-    }
-}
-
-- 
cgit v1.2.3