Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for parameter mapping bug #3581 #3582

Merged
merged 2 commits into from
Mar 13, 2019
Merged

Fix for parameter mapping bug #3581 #3582

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fb91e3
Fix for parameter mapping bug #3581
ranbena Mar 13, 2019
bea8268
Must run original snapshot with original dashboard params
ranbena Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions client/app/components/dashboards/EditParameterMappingsDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,25 @@ import PropTypes from 'prop-types';
import Modal from 'antd/lib/modal';
import { wrap as wrapDialog, DialogPropType } from '@/components/DialogWrapper';
import {
MappingType,
ParameterMappingListInput,
parameterMappingsToEditableMappings,
editableMappingsToParameterMappings,
synchronizeWidgetTitles,
} from '@/components/ParameterMappingInput';
import { ParameterMappingType } from '@/services/widget';

export function getParamValuesSnapshot(mappings, dashboardParameters) {
return map(
sortBy(mappings, m => m.name),
(m) => {
let param;
switch (m.type) {
case ParameterMappingType.StaticValue:
case MappingType.StaticValue:
return [m.name, m.value];
case ParameterMappingType.WidgetLevel:
case MappingType.WidgetLevel:
return [m.name, m.param.value];
case ParameterMappingType.DashboardLevel:
case MappingType.DashboardAddNew:
case MappingType.DashboardMapToExisting:
param = find(dashboardParameters, p => p.name === m.mapTo);
return [m.name, param ? param.value : null];
// no default
Expand All @@ -37,16 +38,25 @@ class EditParameterMappingsDialog extends React.Component {
dialog: DialogPropType.isRequired,
};

originalParamValuesSnapshot = null

constructor(props) {
super(props);

const parameterMappings = parameterMappingsToEditableMappings(
props.widget.options.parameterMappings,
props.widget.query.getParametersDefs(),
map(this.props.dashboard.getParametersDefs(), p => p.name),
);

this.originalParamValuesSnapshot = getParamValuesSnapshot(
parameterMappings,
this.props.dashboard.getParametersDefs(),
);

this.state = {
saveInProgress: false,
parameterMappings: parameterMappingsToEditableMappings(
props.widget.options.parameterMappings,
props.widget.query.getParametersDefs(),
map(this.props.dashboard.getParametersDefs(), p => p.name),
),
parameterMappings,
};
}

Expand All @@ -56,14 +66,12 @@ class EditParameterMappingsDialog extends React.Component {

this.setState({ saveInProgress: true });

const prevMappings = widget.options.parameterMappings;
const newMappings = editableMappingsToParameterMappings(this.state.parameterMappings);
widget.options.parameterMappings = newMappings;

const dashboardParameters = this.props.dashboard.getParametersDefs();
const valuesChanged = !isMatch(
getParamValuesSnapshot(prevMappings, dashboardParameters),
getParamValuesSnapshot(newMappings, dashboardParameters),
this.originalParamValuesSnapshot,
getParamValuesSnapshot(this.state.parameterMappings, this.props.dashboard.getParametersDefs()),
);

const widgetsToSave = [
Expand Down