From 2236ed4ba5a01f899fb964e51b82e41028665a47 Mon Sep 17 00:00:00 2001 From: Clemens Date: Wed, 17 Aug 2016 11:07:56 +0200 Subject: fix deselection on delete, fix toggleInputButton props --- web/src/js/ducks/flows.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'web/src/js/ducks') diff --git a/web/src/js/ducks/flows.js b/web/src/js/ducks/flows.js index f96653a9..913d0881 100644 --- a/web/src/js/ducks/flows.js +++ b/web/src/js/ducks/flows.js @@ -210,5 +210,8 @@ export function updateFlow(item) { * @private */ export function removeFlow(id) { - return { type: REMOVE, id } + return (dispatch) => { + dispatch(select()) + dispatch({ type: REMOVE, id }) + } } -- cgit v1.2.3 From d4b18eae8181051f5230b796046cc7ff56e94862 Mon Sep 17 00:00:00 2001 From: Clemens Date: Fri, 19 Aug 2016 09:23:41 +0200 Subject: refactoring --- web/src/js/ducks/ui/flow.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'web/src/js/ducks') diff --git a/web/src/js/ducks/ui/flow.js b/web/src/js/ducks/ui/flow.js index 22a8c22d..e65c39a3 100644 --- a/web/src/js/ducks/ui/flow.js +++ b/web/src/js/ducks/ui/flow.js @@ -152,6 +152,5 @@ export function setContent(content){ } export function stopEdit(flow, modifiedFlow) { - let diff = getDiff(flow, modifiedFlow) - return flowsActions.update(flow, diff) + return flowsActions.update(flow, getDiff(flow, modifiedFlow)) } -- cgit v1.2.3 From eddc4243791c2c2b1a91c1d8ae49b830206bc6df Mon Sep 17 00:00:00 2001 From: Clemens Date: Mon, 22 Aug 2016 08:57:55 +0200 Subject: fix dropdown css, add new selection after delete --- web/src/js/ducks/flows.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'web/src/js/ducks') diff --git a/web/src/js/ducks/flows.js b/web/src/js/ducks/flows.js index 913d0881..404db0d1 100644 --- a/web/src/js/ducks/flows.js +++ b/web/src/js/ducks/flows.js @@ -1,5 +1,6 @@ import { fetchApi } from '../utils' import reduceList, * as listActions from './utils/list' +import { selectRelative } from './flowView' import * as msgQueueActions from './msgQueue' import * as websocketActions from './websocket' @@ -210,8 +211,14 @@ export function updateFlow(item) { * @private */ export function removeFlow(id) { - return (dispatch) => { - dispatch(select()) + return (dispatch, getState) => { + let currentIndex = getState().flowView.indexOf[getState().flows.selected[0]] + let maxIndex = getState().flowView.data.length - 1 + let deleteLastEntry = maxIndex == 0 + if (deleteLastEntry) + dispatch(select()) + else + dispatch(selectRelative(currentIndex == maxIndex ? -1 : 1) ) dispatch({ type: REMOVE, id }) } } -- cgit v1.2.3