From 777c0fde3964c5c91dd13790d4df0ce691f1fa52 Mon Sep 17 00:00:00 2001 From: Yngrid Coello Date: Thu, 14 Dec 2023 15:40:42 +0100 Subject: [PATCH] CR changes: simplifying code --- .../public/components/log_explorer_link.tsx | 15 +++++++-------- .../public/utils/convert_discover_app_state.ts | 10 +++++----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/x-pack/plugins/dataset_quality/public/components/log_explorer_link.tsx b/x-pack/plugins/dataset_quality/public/components/log_explorer_link.tsx index 16559cbdf2de4..1b16097539fa0 100644 --- a/x-pack/plugins/dataset_quality/public/components/log_explorer_link.tsx +++ b/x-pack/plugins/dataset_quality/public/components/log_explorer_link.tsx @@ -23,7 +23,7 @@ export const LogExplorerLink = React.memo( const [dataset, namespace] = dataStreamStat.title.split('-'); const integration = dataStreamStat.integration?.name; - const params = { + const params: SingleDatasetLocatorParams = { dataset, timeRange: { from: 'now-1d', @@ -36,16 +36,15 @@ export const LogExplorerLink = React.memo( values: [namespace], }, }, - } as SingleDatasetLocatorParams; + }; + + const singleDatasetLocator = + share.url.locators.get(SINGLE_DATASET_LOCATOR_ID); - const urlToLogExplorer = share.url.locators - .get(SINGLE_DATASET_LOCATOR_ID) - ?.getRedirectUrl(params); + const urlToLogExplorer = singleDatasetLocator?.getRedirectUrl(params); const navigateToLogExplorer = () => { - share.url.locators - .get(SINGLE_DATASET_LOCATOR_ID) - ?.navigate(params) as Promise; + singleDatasetLocator?.navigate(params) as Promise; }; const logExplorerLinkProps = getRouterLinkProps({ diff --git a/x-pack/plugins/log_explorer/public/utils/convert_discover_app_state.ts b/x-pack/plugins/log_explorer/public/utils/convert_discover_app_state.ts index 2bb3afee90e50..90d51f75e8c7c 100644 --- a/x-pack/plugins/log_explorer/public/utils/convert_discover_app_state.ts +++ b/x-pack/plugins/log_explorer/public/utils/convert_discover_app_state.ts @@ -87,6 +87,7 @@ const createDiscoverPhrasesFilter = ({ ({ meta: { key, + negate, type: FILTERS.PHRASES, params: values, }, @@ -116,17 +117,16 @@ const createDiscoverExistsFilter = ({ export const getDiscoverFiltersFromState = (filters: Filter[] = [], controls?: ControlOptions) => [ ...filters, ...(controls - ? Object.keys(controls).map((key) => + ? (Object.keys(controls) as Array).map((key) => controls[key as keyof ControlOptions]?.selection.type === 'exists' ? createDiscoverExistsFilter({ key, - negate: controls[key as keyof ControlOptions]?.mode === 'exclude', + negate: controls[key]?.mode === 'exclude', }) : createDiscoverPhrasesFilter({ key, - values: (controls[key as keyof ControlOptions]?.selection as OptionsListControlOption) - .selectedOptions, - negate: controls[key as keyof ControlOptions]?.mode === 'exclude', + values: (controls[key]?.selection as OptionsListControlOption).selectedOptions, + negate: controls[key]?.mode === 'exclude', }) ) : []),