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

Templating: Fix updating of definition to empty string (#69703)

Browse Source
This commit is contained in:
Ivana Huckova 2023-06-08 11:02:47 +02:00 committed by GitHub
parent 3e5e178ede
commit dbdb71fbfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
public/app/features/variables/query/actions.test.tsx
View File

@ -558,6 +558,45 @@ describe('query actions', () => {
});
});
describe('when changeQueryVariableQuery is dispatched with empty string definition', () => {
it('then correct actions are dispatched', async () => {
const optionsMetrics = [createMetric('A'), createMetric('B')];
const variable = createVariable({ datasource: { uid: 'datasource' }, includeAll: true });
const query = '$datasource';
const definition = '';
mockDatasourceMetrics({ ...variable, query }, optionsMetrics);
const tester = await reduxTester<RootReducerType>()
.givenRootReducer(getRootReducer())
.whenActionIsDispatched(
toKeyedAction('key', addVariable(toVariablePayload(variable, { global: false, index: 0, model: variable })))
)
.whenActionIsDispatched(toKeyedAction('key', variablesInitTransaction({ uid: 'key' })))
.whenAsyncActionIsDispatched(
changeQueryVariableQuery(toKeyedVariableIdentifier(variable), query, definition),
true
);
const option = createOption(ALL_VARIABLE_TEXT, ALL_VARIABLE_VALUE);
const update = { results: optionsMetrics, templatedRegex: '' };
tester.thenDispatchedActionsShouldEqual(
toKeyedAction('key', removeVariableEditorError({ errorProp: 'query' })),
toKeyedAction('key', changeVariableProp(toVariablePayload(variable, { propName: 'query', propValue: query }))),
toKeyedAction(
'key',
changeVariableProp(toVariablePayload(variable, { propName: 'definition', propValue: definition }))
),
toKeyedAction('key', variableStateFetching(toVariablePayload(variable))),
toKeyedAction('key', updateVariableOptions(toVariablePayload(variable, update))),
toKeyedAction('key', setCurrentVariableValue(toVariablePayload(variable, { option }))),
toKeyedAction('key', variableStateCompleted(toVariablePayload(variable)))
);
});
});
describe('hasSelfReferencingQuery', () => {
it('when called with a string', () => {
const query = '$query';

2
public/app/features/variables/query/actions.ts
View File

@ -137,7 +137,7 @@ export const changeQueryVariableQuery =
)
);
if (definition) {
if (definition !== undefined) {
dispatch(
toKeyedAction(
rootStateKey,