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

Update QueryVariableEditor layout (#75099)

Browse Source 
* Allow setting legend header style and add container

* Use Box and Text components

* Minor element update

* Use box instead of div
This commit is contained in:
Andreas Christou 2023-09-22 11:04:22 +01:00 committed by GitHub
parent 9052c2477d
commit c78d5fa4e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
public/app/features/variables/query/QueryVariableEditor.tsx
View File

@ -4,7 +4,8 @@ import { connect, ConnectedProps } from 'react-redux';
import { DataSourceInstanceSettings, getDataSourceRef, LoadingState, SelectableValue } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
import { getTemplateSrv } from '@grafana/runtime';
import { Field } from '@grafana/ui';
import { Field, Text } from '@grafana/ui';
import { Box } from '@grafana/ui/src/unstable';
import { DataSourcePicker } from 'app/features/datasources/components/picker/DataSourcePicker';
import { StoreState } from '../../../types';
@ -151,15 +152,18 @@ export class QueryVariableEditorUnConnected extends PureComponent<Props, State>
if (isLegacyQueryEditor(VariableQueryEditor, datasource)) {
return (
<Field label="Query">
<VariableQueryEditor
key={datasource.uid}
datasource={datasource}
query={query}
templateSrv={getTemplateSrv()}
onChange={this.onLegacyQueryChange}
/>
</Field>
<Box marginBottom={2}>
<Text element={'h4'}>Query</Text>
<Box marginTop={1}>
<VariableQueryEditor
key={datasource.uid}
datasource={datasource}
query={query}
templateSrv={getTemplateSrv()}
onChange={this.onLegacyQueryChange}
/>
</Box>
</Box>
);
}
@ -167,19 +171,22 @@ export class QueryVariableEditorUnConnected extends PureComponent<Props, State>
if (isQueryEditor(VariableQueryEditor, datasource)) {
return (
<Field label="Query">
<VariableQueryEditor
key={datasource.uid}
datasource={datasource}
query={query}
onChange={this.onQueryChange}
onRunQuery={() => {}}
data={{ series: [], state: LoadingState.Done, timeRange: range }}
range={range}
onBlur={() => {}}
history={[]}
/>
</Field>
<Box marginBottom={2}>
<Text element={'h4'}>Query</Text>
<Box marginTop={1}>
<VariableQueryEditor
key={datasource.uid}
datasource={datasource}
query={query}
onChange={this.onQueryChange}
onRunQuery={() => {}}
data={{ series: [], state: LoadingState.Done, timeRange: range }}
range={range}
onBlur={() => {}}
history={[]}
/>
</Box>
</Box>
);
}