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

MultiSelect: Respect value passed to the component regardless of custom value being allowed or not (#87906)

Browse Source 
* MultiSelect: Respect value passed to the component regardless of custom value being allowed or not

* reset input for test

---------

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
This commit is contained in:
Dominik Prokop 2024-05-15 16:24:30 +02:00 committed by GitHub
parent 953c8f838f
commit fa63e03df3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grafana-ui/src/components/Select/SelectBase.tsx
View File

@ -186,7 +186,7 @@ export function SelectBase<T, Rest = {}>({
const selectableValue = findSelectedValue(v.value ?? v, options); const selectableValue = findSelectedValue(v.value ?? v, options);
// If the select allows custom values there likely won't be a selectableValue in options // If the select allows custom values there likely won't be a selectableValue in options
// so we must return a new selectableValue // so we must return a new selectableValue
if (!allowCustomValue || selectableValue) { if (selectableValue) {
return selectableValue; return selectableValue;
} }
return typeof v === 'string' ? toOption(v) : v; return typeof v === 'string' ? toOption(v) : v;

2
public/app/features/alerting/unified/AlertGroups.test.tsx
View File

@ -189,6 +189,8 @@ describe('AlertGroups', () => {
renderAmNotifications(); renderAmNotifications();
await waitForElementToBeRemoved(ui.loadingIndicator.query()); await waitForElementToBeRemoved(ui.loadingIndicator.query());
// reset the input of the MultiSelect component
await user.type(ui.groupByInput.get(), '{backspace}');
await user.type(ui.groupByInput.get(), 'appName{enter}'); await user.type(ui.groupByInput.get(), 'appName{enter}');
const groups = await ui.group.findAll(); const groups = await ui.group.findAll();