IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Variables: Fixes error when manually non-matching entering custom value in variable input/picker (#32390)

Browse Source
This commit is contained in:
Torkel Ödegaard 2021-03-29 08:14:43 +02:00 committed by GitHub
parent 27aa7bb900
commit 340334994f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/app/features/variables/pickers/OptionsPicker/reducer.test.ts
View File

@ -81,6 +81,28 @@ describe('optionsPickerReducer', () => {
});
};
describe('When toggleOption with undefined option is dispatched', () => {
it('should update selected values', () => {
const { initialState } = getVariableTestContext({
options: [],
selectedValues: [],
});
const payload = {
forceSelect: false,
clearOthers: true,
option: undefined,
};
reducerTester<OptionsPickerState>()
.givenReducer(optionsPickerReducer, cloneDeep(initialState))
.whenActionIsDispatched(toggleOption(payload))
.thenStateShouldEqual({
...initialState,
selectedValues: [],
options: [],
});
});
});
describe('toggleOption for multi value variable', () => {
const multi = true;
describe('and value All is selected in options', () => {
@ -112,6 +134,7 @@ describe('optionsPickerReducer', () => {
})
);
});
describe('and value A is selected in options', () => {
const options = opsA;
it.each`

33
public/app/features/variables/pickers/OptionsPicker/reducer.ts
View File

@ -7,7 +7,7 @@ import { applyStateChanges } from '../../../../core/utils/applyStateChanges';
import { containsSearchFilter } from '../../utils';
export interface ToggleOption {
option: VariableOption;
option?: VariableOption;
forceSelect: boolean;
clearOthers: boolean;
}
@ -148,23 +148,28 @@ const optionsPickerSlice = createSlice({
toggleOption: (state, action: PayloadAction<ToggleOption>): OptionsPickerState => {
const { option, clearOthers, forceSelect } = action.payload;
const { multi, selectedValues } = state;
const selected = !selectedValues.find((o) => o.value === option.value);
if (option.value === ALL_VARIABLE_VALUE || !multi || clearOthers) {
if (selected || forceSelect) {
state.selectedValues = [{ ...option, selected: true }];
} else {
state.selectedValues = [];
if (option) {
const selected = !selectedValues.find((o) => o.value === option.value);
if (option.value === ALL_VARIABLE_VALUE || !multi || clearOthers) {
if (selected || forceSelect) {
state.selectedValues = [{ ...option, selected: true }];
} else {
state.selectedValues = [];
}
return applyStateChanges(state, updateDefaultSelection, updateAllSelection, updateOptions);
}
return applyStateChanges(state, updateDefaultSelection, updateAllSelection, updateOptions);
if (forceSelect || selected) {
state.selectedValues.push({ ...option, selected: true });
return applyStateChanges(state, updateDefaultSelection, updateAllSelection, updateOptions);
}
state.selectedValues = selectedValues.filter((o) => o.value !== option.value);
} else {
state.selectedValues = [];
}
if (forceSelect || selected) {
state.selectedValues.push({ ...option, selected: true });
return applyStateChanges(state, updateDefaultSelection, updateAllSelection, updateOptions);
}
state.selectedValues = selectedValues.filter((o) => o.value !== option.value);
return applyStateChanges(state, updateDefaultSelection, updateAllSelection, updateOptions);
},
toggleTag: (state, action: PayloadAction<VariableTag>): OptionsPickerState => {