IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

AzureMonitor: Use Field instead of InlineField (#75837)

Browse Source 
Use Field instead of InlineField

- Update labels
This commit is contained in:
Andreas Christou 2023-10-04 14:44:59 +01:00 committed by GitHub
parent d494f69660
commit 3ef3dee751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.tsx
View File

@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
import { useEffectOnce } from 'react-use';
import { SelectableValue } from '@grafana/data';
import { Alert, InlineField, Select } from '@grafana/ui';
import { Alert, Field, Select } from '@grafana/ui';
import DataSource from '../../datasource';
import { selectors } from '../../e2e/selectors';
@ -228,11 +228,7 @@ const VariableEditor = (props: Props) => {
return (
<>
<InlineField
label="Select query type"
labelWidth={20}
data-testid={selectors.components.variableEditor.queryType.input}
>
<Field label="Query Type" data-testid={selectors.components.variableEditor.queryType.input}>
<Select
aria-label="select query type"
onChange={onQueryTypeChange}
@ -240,7 +236,7 @@ const VariableEditor = (props: Props) => {
width={25}
value={queryType}
/>
</InlineField>
</Field>
{query.queryType === AzureQueryType.LogAnalytics && (
<>
<LogsQueryEditor
@ -266,11 +262,7 @@ const VariableEditor = (props: Props) => {
<GrafanaTemplateVariableFnInput query={query} updateQuery={props.onChange} datasource={datasource} />
)}
{requireSubscription && (
<InlineField
label="Select subscription"
labelWidth={20}
data-testid={selectors.components.variableEditor.subscription.input}
>
<Field label="Subscription" data-testid={selectors.components.variableEditor.subscription.input}>
<Select
aria-label="select subscription"
onChange={onChangeSubscription}
@ -278,14 +270,10 @@ const VariableEditor = (props: Props) => {
width={25}
value={query.subscription || null}
/>
</InlineField>
</Field>
)}
{(requireResourceGroup || hasResourceGroup) && (
<InlineField
label="Select resource group"
labelWidth={20}
data-testid={selectors.components.variableEditor.resourceGroup.input}
>
<Field label="Resource Group" data-testid={selectors.components.variableEditor.resourceGroup.input}>
<Select
aria-label="select resource group"
onChange={onChangeResourceGroup}
@ -298,14 +286,10 @@ const VariableEditor = (props: Props) => {
value={query.resourceGroup || null}
placeholder={requireResourceGroup ? undefined : 'Optional'}
/>
</InlineField>
</Field>
)}
{(requireNamespace || hasNamespace) && (
<InlineField
label="Select namespace"
labelWidth={20}
data-testid={selectors.components.variableEditor.namespace.input}
>
<Field label="Namespace" data-testid={selectors.components.variableEditor.namespace.input}>
<Select
aria-label="select namespace"
onChange={onChangeNamespace}
@ -318,14 +302,10 @@ const VariableEditor = (props: Props) => {
value={query.namespace || null}
placeholder={requireNamespace ? undefined : 'Optional'}
/>
</InlineField>
</Field>
)}
{hasRegion && (
<InlineField
label="Select region"
labelWidth={20}
data-testid={selectors.components.variableEditor.region.input}
>
<Field label="Region" data-testid={selectors.components.variableEditor.region.input}>
<Select
aria-label="select region"
onChange={onChangeRegion}
@ -334,14 +314,10 @@ const VariableEditor = (props: Props) => {
value={query.region || null}
placeholder="Optional"
/>
</InlineField>
</Field>
)}
{requireResource && (
<InlineField
label="Select resource"
labelWidth={20}
data-testid={selectors.components.variableEditor.resource.input}
>
<Field label="Resource" data-testid={selectors.components.variableEditor.resource.input}>
<Select
aria-label="select resource"
onChange={onChangeResource}
@ -349,7 +325,7 @@ const VariableEditor = (props: Props) => {
width={25}
value={query.resource || null}
/>
</InlineField>
</Field>
)}
{query.queryType === AzureQueryType.AzureResourceGraph && (
<>