Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ML] Fixes query bar not switching from KQL to Lucene and vice versa in Anomaly explorer #163625

Merged
merged 4 commits into from Aug 18, 2023
Merged

[ML] Fixes query bar not switching from KQL to Lucene and vice versa in Anomaly explorer #163625

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9a62ee
Fix KQL to Lucene switching in AD
qn895 Aug 10, 2023
2d0782c
Merge branch 'main' into ml-explorer-fix-switching
kibanamachine Aug 11, 2023
b9aea0d
Merge branch 'main' into ml-explorer-fix-switching
kibanamachine Aug 15, 2023
259cdc6
Merge branch 'main' into ml-explorer-fix-switching
kibanamachine Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 11 additions & 19 deletions ...ugins/ml/public/application/explorer/components/explorer_query_bar/explorer_query_bar.tsx
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import React, { FC, useState, useEffect } from 'react';
import React, { FC, useEffect, useState } from 'react';
import { EuiCode, EuiInputPopover } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@kbn/es-query';
Expand Down Expand Up @@ -78,23 +78,16 @@ export function getKqlQueryValues({
}

function getInitSearchInputState({
filterActive,
queryString,
searchInput,
}: {
filterActive: boolean;
queryString?: string;
searchInput?: Query;
}) {
if (queryString !== undefined && filterActive === true) {
return {
language: SEARCH_QUERY_LANGUAGE.KUERY,
query: queryString,
};
} else {
return {
query: '',
language: DEFAULT_QUERY_LANG,
};
}
return {
language: searchInput?.language ?? DEFAULT_QUERY_LANG,
query: queryString ?? '',
};
}

interface ExplorerQueryBarProps {
Expand Down Expand Up @@ -129,18 +122,17 @@ export const ExplorerQueryBar: FC<ExplorerQueryBarProps> = ({
} = services;

// The internal state of the input query bar updated on every key stroke.
const [searchInput, setSearchInput] = useState<Query>(
getInitSearchInputState({ filterActive, queryString })
);
const [searchInput, setSearchInput] = useState<Query>(getInitSearchInputState({ queryString }));
const [queryErrorMessage, setQueryErrorMessage] = useState<QueryErrorMessage | undefined>(
undefined
);

useEffect(
function updateSearchInputFromFilter() {
setSearchInput(getInitSearchInputState({ filterActive, queryString }));
setSearchInput(getInitSearchInputState({ queryString, searchInput }));
},
[filterActive, queryString]
// eslint-disable-next-line react-hooks/exhaustive-deps
[queryString, searchInput.language]
);

const searchChangeHandler = (query: Query) => {
Expand Down