github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-04-20 01:17:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper handling of namespace selection when time travelling.

Browse Source
This commit is contained in:
Filip Barl
2017-08-21 15:06:39 +02:00
parent c159315245
commit 16e520da5e
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/app/scripts/components/topology-options.js
View File

@@ -1,6 +1,6 @@
import React from 'react';
import { connect } from 'react-redux';
import { Map as makeMap } from 'immutable';
import { Set as makeSet, Map as makeMap } from 'immutable';
import includes from 'lodash/includes';
import { trackMixpanelEvent } from '../utils/tracking-utils';
@@ -73,9 +73,26 @@ class TopologyOptions extends React.Component {
renderOption(option) {
const { activeOptions, currentTopologyId } = this.props;
const optionId = option.get('id');
const activeValue = activeOptions && activeOptions.has(optionId)
? activeOptions.get(optionId)
: option.get('defaultValue');
// Make the active value be the intersection of the available options
// and the active selection and use the default value if there is no
// overlap. It seems intuitive that active selection would always be a
// subset of available option, but the exception can happen when going
// back in time (making available options change, while not touching
// the selection).
// TODO: This logic should probably be made consistent with how topology
// selection is handled when time travelling, especially when the name-
// spaces are brought under category selection.
let activeValue = option.get('defaultValue');
if (activeOptions && activeOptions.has(optionId)) {
const activeSelection = makeSet(activeOptions.get(optionId));
const availableOptions = makeSet(option.get('options').map(o => o.get('value')));
const intersection = activeSelection.intersect(availableOptions);
if (!intersection.isEmpty()) {
activeValue = intersection.toJS();
}
}
const noneItem = makeMap({
value: '',
label: option.get('noneLabel')

2
client/app/scripts/reducers/root.js
View File

@@ -223,7 +223,7 @@ export function rootReducer(state = initialState, action) {
if (topology) {
const topologyId = topology.get('parentId') || topology.get('id');
const optionKey = ['topologyOptions', topologyId, action.option];
const currentOption = state.getIn(['topologyOptions', topologyId, action.option]);
const currentOption = state.getIn(optionKey);
if (!isEqual(currentOption, action.value)) {
state = clearNodes(state);