Skip to content

Commit

Permalink
CR changes: simplifying code
Browse files Browse the repository at this point in the history
  • Loading branch information
yngrdyn committed Dec 14, 2023
1 parent 6164774 commit 777c0fd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -36,16 +36,15 @@ export const LogExplorerLink = React.memo(
values: [namespace],
},
},
} as SingleDatasetLocatorParams;
};

const singleDatasetLocator =
share.url.locators.get<SingleDatasetLocatorParams>(SINGLE_DATASET_LOCATOR_ID);

const urlToLogExplorer = share.url.locators
.get<SingleDatasetLocatorParams>(SINGLE_DATASET_LOCATOR_ID)
?.getRedirectUrl(params);
const urlToLogExplorer = singleDatasetLocator?.getRedirectUrl(params);

const navigateToLogExplorer = () => {
share.url.locators
.get<SingleDatasetLocatorParams>(SINGLE_DATASET_LOCATOR_ID)
?.navigate(params) as Promise<void>;
singleDatasetLocator?.navigate(params) as Promise<void>;
};

const logExplorerLinkProps = getRouterLinkProps({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ const createDiscoverPhrasesFilter = ({
({
meta: {
key,
negate,
type: FILTERS.PHRASES,
params: values,
},
Expand Down Expand Up @@ -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<keyof ControlOptions>).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',
})
)
: []),
Expand Down

0 comments on commit 777c0fd

Please sign in to comment.