Loki: Fix showing of default visual query only if no expression (#47764)

* AutoSizeInput: Fix updating of value

* Update

* Revert "Update"

This reverts commit a3b527e0c6.

* Revert "AutoSizeInput: Fix updating of value"

This reverts commit d4b4ae0a10.

* Fix showing of default visual query only if no expression

* Update public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.tsx

* Update public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.tsx

* Update

* Update
This commit is contained in:
Ivana Huckova 2022-04-19 15:29:27 +02:00 committed by GitHub
parent 4570615afc
commit 2aa6f4d17b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,11 +26,15 @@ export interface State {
export function LokiQueryBuilderContainer(props: Props) { export function LokiQueryBuilderContainer(props: Props) {
const { query, onChange, onRunQuery, datasource } = props; const { query, onChange, onRunQuery, datasource } = props;
const [state, dispatch] = useReducer(stateSlice.reducer, { const [state, dispatch] = useReducer(stateSlice.reducer, {
expr: '', expr: query.expr,
visQuery: { // Use initial visual query only if query.expr is empty string
visQuery:
query.expr === ''
? {
labels: [], labels: [],
operations: [{ id: '__line_contains', params: [''] }], operations: [{ id: '__line_contains', params: [''] }],
}, }
: undefined,
}); });
// Only rebuild visual query if expr changes from outside // Only rebuild visual query if expr changes from outside
@ -62,7 +66,7 @@ export function LokiQueryBuilderContainer(props: Props) {
} }
const stateSlice = createSlice({ const stateSlice = createSlice({
name: 'prom-builder-container', name: 'loki-builder-container',
initialState: { expr: '' } as State, initialState: { expr: '' } as State,
reducers: { reducers: {
visualQueryChange: (state, action: PayloadAction<{ visQuery: LokiVisualQuery; expr: string }>) => { visualQueryChange: (state, action: PayloadAction<{ visQuery: LokiVisualQuery; expr: string }>) => {