Variables: Ensures all variable values are strings (#31942)

* Variables: Ensures all variable values are strings

* Chore: remove redundant typings

* Chore: fixes tests
This commit is contained in:
Hugo Häggmark
2021-03-15 08:52:44 +01:00
committed by GitHub
parent 16027770c8
commit 31ab1a4afe
8 changed files with 75 additions and 24 deletions

View File

@ -7,6 +7,7 @@ import { toVariableIdentifier, toVariablePayload, VariableIdentifier } from '../
import { setOptionFromUrl } from '../state/actions';
import { UrlQueryValue } from '@grafana/data';
import { changeVariableProp } from '../state/sharedReducer';
import { ensureStringValues } from '../utils';
export const updateTextBoxVariableOptions = (identifier: VariableIdentifier): ThunkResult<void> => {
return async (dispatch, getState) => {
@ -23,7 +24,8 @@ export const setTextBoxVariableOptionsFromUrl = (
): ThunkResult<void> => async (dispatch, getState) => {
const variableInState = getVariable<TextBoxVariableModel>(identifier.id, getState());
dispatch(changeVariableProp(toVariablePayload(variableInState, { propName: 'query', propValue: urlValue })));
const stringUrlValue = ensureStringValues(urlValue);
dispatch(changeVariableProp(toVariablePayload(variableInState, { propName: 'query', propValue: stringUrlValue })));
await dispatch(setOptionFromUrl(toVariableIdentifier(variableInState), urlValue));
await dispatch(setOptionFromUrl(toVariableIdentifier(variableInState), stringUrlValue));
};