From 1353eb55068772278767384a7d9f300cd4fd1c5b Mon Sep 17 00:00:00 2001
From: Simon Howe <footless@gmail.com>
Date: Thu, 24 May 2018 17:41:37 +0200
Subject: [PATCH] Fixes sending the default topologyOptions to the /api

- Which fails sometimes as we overwrite them whatever we find in the
  url state. Url state is not complete anymore so this doesn't work
---
 client/app/scripts/reducers/root.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/app/scripts/reducers/root.js b/client/app/scripts/reducers/root.js
index 184b10d280..5ddaacfcd6 100644
--- a/client/app/scripts/reducers/root.js
+++ b/client/app/scripts/reducers/root.js
@@ -688,7 +688,8 @@ export function rootReducer(state = initialState, action) {
         pinnedMetricType: action.state.pinnedMetricType,
       });
       if (action.state.topologyOptions) {
-        state = state.set('topologyOptions', fromJS(action.state.topologyOptions));
+        const options = getDefaultTopologyOptions(state).mergeDeep(action.state.topologyOptions);
+        state = state.set('topologyOptions', options);
       }
       if (action.state.topologyViewMode) {
         state = state.set('topologyViewMode', action.state.topologyViewMode);