From 81908f4afc4c7c0c2035e1b8eef77118ce2aa3ea Mon Sep 17 00:00:00 2001 From: SuZhou-Joe Date: Thu, 23 Jan 2025 15:40:23 +0800 Subject: [PATCH] feat: optimize code Signed-off-by: SuZhou-Joe --- .../public/query_assist/utils/constant.ts | 7 +++++++ .../public/query_assist/utils/create_extension.tsx | 10 +++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/plugins/query_enhancements/public/query_assist/utils/constant.ts b/src/plugins/query_enhancements/public/query_assist/utils/constant.ts index 4a3f26f1a439..14410594d44a 100644 --- a/src/plugins/query_enhancements/public/query_assist/utils/constant.ts +++ b/src/plugins/query_enhancements/public/query_assist/utils/constant.ts @@ -3,4 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ +import { DEFAULT_DATA } from '../../../../data/common'; + export const DATA2SUMMARY_AGENT_CONFIG_ID = 'os_data2summary'; + +export const QUERY_ASSISTANT_SUPPORT_DATASET_TYPES = [ + DEFAULT_DATA.SET_TYPES.INDEX, + DEFAULT_DATA.SET_TYPES.INDEX_PATTERN, +]; diff --git a/src/plugins/query_enhancements/public/query_assist/utils/create_extension.tsx b/src/plugins/query_enhancements/public/query_assist/utils/create_extension.tsx index 13f8c097f44b..a9a4f1dfd673 100644 --- a/src/plugins/query_enhancements/public/query_assist/utils/create_extension.tsx +++ b/src/plugins/query_enhancements/public/query_assist/utils/create_extension.tsx @@ -21,6 +21,7 @@ import { QueryAssistBanner, QueryAssistBar, QueryAssistSummary } from '../compon import { UsageCollectionSetup } from '../../../../usage_collection/public'; import { QueryAssistContext } from '../hooks/use_query_assist'; import { CoreSetup } from '../../../../../core/public'; +import { QUERY_ASSISTANT_SUPPORT_DATASET_TYPES } from './constant'; const [getAvailableLanguagesForDataSource, clearCache] = (() => { const availableLanguagesByDataSource: Map = new Map(); @@ -79,7 +80,7 @@ const getAvailableLanguages$ = (http: HttpSetup, data: DataPublicPluginSetup) => if ( query.dataset?.dataSource?.type !== DEFAULT_DATA.SOURCE_TYPES.OPENSEARCH && // datasource is MDS OpenSearch query.dataset?.dataSource?.type !== 'DATA_SOURCE' && // datasource is MDS OpenSearch when using indexes - query.dataset?.type !== DEFAULT_DATA.SET_TYPES.INDEX_PATTERN // dataset is index pattern + !QUERY_ASSISTANT_SUPPORT_DATASET_TYPES.includes(query.dataset?.type || '') ) return []; @@ -88,11 +89,6 @@ const getAvailableLanguages$ = (http: HttpSetup, data: DataPublicPluginSetup) => }) ); -const queryAssistantSupportedDatasetTypes = [ - DEFAULT_DATA.SET_TYPES.INDEX, - DEFAULT_DATA.SET_TYPES.INDEX_PATTERN, -]; - export const createQueryAssistExtension = ( core: CoreSetup, data: DataPublicPluginSetup, @@ -122,7 +118,7 @@ export const createQueryAssistExtension = ( }, isEnabled$: (dependencies) => { const query = dependencies.query; - if (!queryAssistantSupportedDatasetTypes.includes(query.dataset?.type || '')) { + if (!QUERY_ASSISTANT_SUPPORT_DATASET_TYPES.includes(query.dataset?.type || '')) { return of(false); } return getAvailableLanguages$(http, data).pipe(map((languages) => languages.length > 0));