public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Variables: Improve display when selecting variables with the same value (#40607)

Browse Source 
* Variables: Allow selection of different variables with the same value

* Variables: Don't modify this key
This commit is contained in:
Ashley Harrison
2021-10-19 14:13:17 +01:00
committed by GitHub
parent 60b4e95d15
commit e48d77b1eb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/variables/pickers/OptionsPicker/reducer.ts
+2 -2
View File
@@ -138,7 +138,7 @@ const optionsPickerSlice = createSlice({
const { multi, selectedValues } = state; const { multi, selectedValues } = state;
if (option) { if (option) {
const selected = !selectedValues.find((o) => o.value === option.value); const selected = !selectedValues.find((o) => o.value === option.value && o.text === option.text);
if (option.value === ALL_VARIABLE_VALUE || !multi || clearOthers) { if (option.value === ALL_VARIABLE_VALUE || !multi || clearOthers) {
if (selected || forceSelect) { if (selected || forceSelect) {
@@ -153,7 +153,7 @@ const optionsPickerSlice = createSlice({
return applyStateChanges(state, updateDefaultSelection, updateAllSelection, updateOptions); return applyStateChanges(state, updateDefaultSelection, updateAllSelection, updateOptions);
} }
state.selectedValues = selectedValues.filter((o) => o.value !== option.value); state.selectedValues = selectedValues.filter((o) => o.value !== option.value && o.text !== option.text);
} else { } else {
state.selectedValues = []; state.selectedValues = [];
} }