Merge pull request #3189 from weaveworks/fix-defaults-in-the-ui

Fixes sending the default topologyOptions to the /api
weaveworks · May 28, 2018 · 9d63432 · 9d63432
2 parents 4647ce1 + 1353eb5
commit 9d63432
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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);