mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Loki: Remove raw query toggle (#59125)
* set default query expression * always show raw query * remove raw query title * remove test for raw query toggle * remove raw query toggle * remove default expression * hide raw query preview if empty * remove e2e test for raw query toggle * update test name
This commit is contained in:
@@ -32,7 +32,6 @@ describe('LokiQueryBuilderContainer', () => {
|
||||
),
|
||||
onChange: jest.fn(),
|
||||
onRunQuery: () => {},
|
||||
showRawQuery: true,
|
||||
showExplain: false,
|
||||
};
|
||||
props.datasource.getDataSamples = jest.fn().mockResolvedValue([]);
|
||||
|
||||
@@ -16,7 +16,6 @@ export interface Props {
|
||||
datasource: LokiDatasource;
|
||||
onChange: (update: LokiQuery) => void;
|
||||
onRunQuery: () => void;
|
||||
showRawQuery: boolean;
|
||||
showExplain: boolean;
|
||||
}
|
||||
|
||||
@@ -29,7 +28,7 @@ export interface State {
|
||||
* This component is here just to contain the translation logic between string query and the visual query builder model.
|
||||
*/
|
||||
export function LokiQueryBuilderContainer(props: Props) {
|
||||
const { query, onChange, onRunQuery, datasource, showRawQuery, showExplain } = props;
|
||||
const { query, onChange, onRunQuery, datasource, showExplain } = props;
|
||||
const [state, dispatch] = useReducer(stateSlice.reducer, {
|
||||
expr: query.expr,
|
||||
// Use initial visual query only if query.expr is empty string
|
||||
@@ -67,7 +66,7 @@ export function LokiQueryBuilderContainer(props: Props) {
|
||||
showExplain={showExplain}
|
||||
data-testid={testIds.editor}
|
||||
/>
|
||||
{showRawQuery && <QueryPreview query={query.expr} />}
|
||||
{query.expr !== '' && <QueryPreview query={query.expr} />}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React from 'react';
|
||||
|
||||
import { EditorRow, EditorFieldGroup, EditorField } from '@grafana/experimental';
|
||||
import { EditorRow, EditorFieldGroup } from '@grafana/experimental';
|
||||
|
||||
import { RawQuery } from '../../../prometheus/querybuilder/shared/RawQuery';
|
||||
import { lokiGrammar } from '../../syntax';
|
||||
@@ -13,9 +13,7 @@ export function QueryPreview({ query }: Props) {
|
||||
return (
|
||||
<EditorRow>
|
||||
<EditorFieldGroup>
|
||||
<EditorField label="Raw query">
|
||||
<RawQuery query={query} lang={{ grammar: lokiGrammar, name: 'lokiql' }} />
|
||||
</EditorField>
|
||||
<RawQuery query={query} lang={{ grammar: lokiGrammar, name: 'lokiql' }} />
|
||||
</EditorFieldGroup>
|
||||
</EditorRow>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user