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

Variables: hides dropdown before refreshing starts (#28112)

Browse Source
This commit is contained in:
Hugo Häggmark
2020-10-09 06:31:45 +02:00
committed by GitHub
parent 3b44276504
commit c052abed87
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/variables/pickers/OptionsPicker/actions.test.ts
+6 -6
View File
@@ -192,9 +192,9 @@ describe('options picker actions', () => {
toggleOption({ option: options[1], forceSelect: true, clearOthers }),
setCurrentVariableValue(toVariablePayload(variable, { option })),
changeVariableProp(toVariablePayload(variable, { propName: 'queryValue', propValue: '' })),
hideOptions(),
setCurrentVariableValue(toVariablePayload(variable, { option })),
updateLocation({ query: { 'var-Constant': ['B'] } }),
hideOptions()
updateLocation({ query: { 'var-Constant': ['B'] } })
);
});
});
@@ -265,9 +265,9 @@ describe('options picker actions', () => {
tester.thenDispatchedActionsShouldEqual(
setCurrentVariableValue(toVariablePayload(variable, { option })),
changeVariableProp(toVariablePayload(variable, { propName: 'queryValue', propValue: '' })),
hideOptions(),
setCurrentVariableValue(toVariablePayload(variable, { option })),
updateLocation({ query: { 'var-Constant': [] } }),
hideOptions()
updateLocation({ query: { 'var-Constant': [] } })
);
});
});
@@ -297,9 +297,9 @@ describe('options picker actions', () => {
tester.thenDispatchedActionsShouldEqual(
setCurrentVariableValue(toVariablePayload(variable, { option })),
changeVariableProp(toVariablePayload(variable, { propName: 'queryValue', propValue: 'C' })),
hideOptions(),
setCurrentVariableValue(toVariablePayload(variable, { option })),
updateLocation({ query: { 'var-Constant': [] } }),
hideOptions()
updateLocation({ query: { 'var-Constant': [] } })
);
});
});
public/app/features/variables/pickers/OptionsPicker/actions.ts
+3 -2
View File
@@ -82,14 +82,15 @@ export const commitChangesToVariable = (): ThunkResult<void> => {
dispatch(setCurrentVariableValue(toVariablePayload(existing, currentPayload)));
dispatch(changeVariableProp(toVariablePayload(existing, searchQueryPayload)));
const updated = getVariable<VariableWithMultiSupport>(picker.id, getState());
dispatch(hideOptions());
if (getCurrentText(existing) === getCurrentText(updated)) {
return dispatch(hideOptions());
return;
}
const adapter = variableAdapters.get(updated.type);
await adapter.setValue(updated, updated.current, true);
return dispatch(hideOptions());
return;
};
};