IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-21 05:53:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Azure Monitor: fix bug in variable editor (#52804)

Browse Source
This commit is contained in:
Andres Martinez Gotor 2022-07-26 17:42:43 +02:00 committed by GitHub
parent 817837a532
commit d68f8d9577
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.test.tsx
View File

@ -245,6 +245,25 @@ describe('VariableEditor:', () => {
);
});
it('should clean up related fields', async () => {
const onChange = jest.fn();
const { rerender } = render(<VariableEditor {...defaultProps} onChange={onChange} />);
// wait for initial load
await waitFor(() => expect(screen.getByText('Logs')).toBeInTheDocument());
// Select a new query type
await selectAndRerender('select query type', 'Subscriptions', onChange, rerender);
expect(onChange).toHaveBeenCalledWith(
expect.objectContaining({
queryType: AzureQueryType.SubscriptionsQuery,
subscription: undefined,
resourceGroup: undefined,
namespace: undefined,
resource: undefined,
refId: 'A',
})
);
});
it('should run the query if requesting workspaces', async () => {
const onChange = jest.fn();
const { rerender } = render(<VariableEditor {...defaultProps} onChange={onChange} />);

22
public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.tsx
View File

@ -149,6 +149,10 @@ const VariableEditor = (props: Props) => {
onChange({
...query,
queryType: selectableValue.value,
subscription: undefined,
resourceGroup: undefined,
namespace: undefined,
resource: undefined,
});
}
};
@ -158,6 +162,9 @@ const VariableEditor = (props: Props) => {
onChange({
...query,
subscription: selectableValue.value,
resourceGroup: undefined,
namespace: undefined,
resource: undefined,
});
}
};
@ -166,6 +173,8 @@ const VariableEditor = (props: Props) => {
onChange({
...query,
resourceGroup: selectableValue.value,
namespace: undefined,
resource: undefined,
});
};
@ -173,6 +182,7 @@ const VariableEditor = (props: Props) => {
onChange({
...query,
namespace: selectableValue.value,
resource: undefined,
});
};
@ -229,7 +239,7 @@ const VariableEditor = (props: Props) => {
onChange={onChangeSubscription}
options={subscriptions.concat(variableOptionGroup)}
width={25}
value={query.subscription}
value={query.subscription || null}
/>
</InlineField>
)}
@ -244,8 +254,8 @@ const VariableEditor = (props: Props) => {
: resourceGroups.concat(variableOptionGroup, removeOption)
}
width={25}
value={query.resourceGroup}
placeholder={requireResourceGroup ? '' : 'Optional'}
value={query.resourceGroup || null}
placeholder={requireResourceGroup ? undefined : 'Optional'}
/>
</InlineField>
)}
@ -260,8 +270,8 @@ const VariableEditor = (props: Props) => {
: namespaces.concat(variableOptionGroup, removeOption)
}
width={25}
value={query.namespace}
placeholder={requireNamespace ? '' : 'Optional'}
value={query.namespace || null}
placeholder={requireNamespace ? undefined : 'Optional'}
/>
</InlineField>
)}
@ -272,7 +282,7 @@ const VariableEditor = (props: Props) => {
onChange={onChangeResource}
options={resources.concat(variableOptionGroup)}
width={25}
value={query.resource}
value={query.resource || null}
/>
</InlineField>
)}