IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Azure Monitor: Add select all subscription option for ARG queries (#79582)

Browse Source
This commit is contained in:
Alyssa Bull 2024-01-10 13:58:03 -07:00 committed by GitHub
parent afa33f12b2
commit 284afbcd4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx
View File

@ -182,4 +182,55 @@ describe('ArgQueryEditor', () => {
);
expect(await waitFor(() => screen.getByText('At least one subscription must be chosen.'))).toBeInTheDocument();
});
it('should select all subscriptions if select all is chosen from the dropdown', async () => {
const onChange = jest.fn();
const datasource = createMockDatasource({
getSubscriptions: jest.fn().mockResolvedValue([
{ text: 'foo', value: 'test-subscription-value1' },
{ text: 'bar', value: 'test-subscription-value2' },
{ text: 'Select all subscriptions', value: 'Select all' },
]),
});
const query = createMockQuery({
subscription: undefined,
subscriptions: ['test-subscription-value1', 'test-subscription-value2', 'Select all'],
});
const { rerender } = render(
<ArgQueryEditor
{...defaultProps}
query={query}
datasource={datasource}
onChange={onChange}
variableOptionGroup={{ label: 'Template Variables', options: [] }}
/>
);
expect(datasource.getSubscriptions).toHaveBeenCalled();
expect(await waitFor(() => onChange)).toHaveBeenCalledWith(
expect.objectContaining({ subscriptions: ['test-subscription-value1', 'test-subscription-value2', 'Select all'] })
);
expect(await waitFor(() => screen.findByText('foo'))).toBeInTheDocument();
expect(await waitFor(() => screen.findByText('bar'))).toBeInTheDocument();
expect(await waitFor(() => screen.findByText('Select all subscriptions'))).toBeInTheDocument();
const selectAll = screen.getByText('Select all subscriptions');
await userEvent.click(selectAll);
expect(onChange).toHaveBeenCalledWith(
expect.objectContaining({ subscriptions: ['test-subscription-value1', 'test-subscription-value2', 'Select all'] })
);
rerender(
<ArgQueryEditor
{...defaultProps}
datasource={datasource}
onChange={onChange}
query={{ ...query, subscriptions: ['test-subscription-value1', 'test-subscription-value2', 'Select all'] }}
variableOptionGroup={{ label: 'Template Variables', options: [] }}
/>
);
expect(await waitFor(() => screen.getByText('foo'))).toBeInTheDocument();
expect(await waitFor(() => screen.getByText('bar'))).toBeInTheDocument();
});
});

5
public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.tsx
View File

@ -57,8 +57,11 @@ const ArgQueryEditor = ({
datasource
.getSubscriptions()
.then((results) => {
const selectAllSubscriptionOption = [
{ label: 'Select all subscriptions', value: 'Select all subscriptions', description: 'Select all' },
];
const fetchedSubscriptions = results.map((v) => ({ label: v.text, value: v.value, description: v.value }));
setSubscriptions(fetchedSubscriptions);
setSubscriptions(selectAllSubscriptionOption.concat(fetchedSubscriptions));
setError(ERROR_SOURCE, undefined);
onChange({

7
public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/SubscriptionField.tsx
View File

@ -28,6 +28,7 @@ const SubscriptionField = ({ query, subscriptions, variableOptionGroup, onQueryC
}, [query.subscriptions, subscriptions, variableOptionGroup.options]);
const onChange = (change: Array<SelectableValue<string>>) => {
const containsSelectAll = change.filter((c) => c.value === 'Select all subscriptions');
if (!change || change.length === 0) {
setValues([]);
onQueryChange({
@ -35,6 +36,12 @@ const SubscriptionField = ({ query, subscriptions, variableOptionGroup, onQueryC
subscriptions: [],
});
setError(true);
} else if (containsSelectAll.length > 0) {
const allSubs = subscriptions.map((c) => c.value ?? '').filter((c) => c !== 'Select all subscriptions');
onQueryChange({
...query,
subscriptions: allSubs,
});
} else {
const newSubs = change.map((c) => c.value ?? '');
onQueryChange({