Rewrite type check for Filters component to a type guard

elastic · Sep 18, 2024 · 7f44356 · 7f44356
1 parent 3753f04
commit 7f44356
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/...urity_solution/public/detection_engine/rule_management/components/rule_details/helpers.ts b/...urity_solution/public/detection_engine/rule_management/components/rule_details/helpers.ts
@@ -77,16 +77,10 @@ export function getQueryLanguageLabel(language: string) {
 }
 
 /**
- * Assigns type `Filter` to items that have a `meta` property. Removes any other items.
+ * Assigns type `Filter[]` to an array if every item in has a `meta` property.
  */
-export function typeCheckFilters(filters: unknown[]): Filter[] {
-  return filters.filter((f) => {
-    if (typeof f === 'object' && f !== null && 'meta' in f) {
-      return true;
-    }
-
-    return false;
-  }) as Filter[];
+export function isFilters(maybeFilters: unknown[]): maybeFilters is Filter[] {
+  return maybeFilters.every((f) => typeof f === 'object' && f !== null && 'meta' in f);
 }
 
 type DataSourceProps =

diff --git a/...ment/components/rule_details/three_way_diff/final_readonly/fields/eql_query/eql_query.tsx b/...ment/components/rule_details/three_way_diff/final_readonly/fields/eql_query/eql_query.tsx
@@ -14,7 +14,7 @@ import type {
 } from '../../../../../../../../../common/api/detection_engine';
 import * as descriptionStepI18n from '../../../../../../../rule_creation_ui/components/description_step/translations';
 import { Query, Filters } from '../../../../rule_definition_section';
-import { getDataSourceProps, typeCheckFilters } from '../../../../helpers';
+import { getDataSourceProps, isFilters } from '../../../../helpers';
 
 interface EqlQueryReadOnlyProps {
   eqlQuery: RuleEqlQuery;
@@ -29,14 +29,12 @@ export function EqlQueryReadOnly({ eqlQuery, dataSource }: EqlQueryReadOnlyProps
     },
   ];
 
-  const filters = typeCheckFilters(eqlQuery.filters);
-
-  if (filters.length > 0) {
+  if (isFilters(eqlQuery.filters) && eqlQuery.filters.length > 0) {
     const dataSourceProps = getDataSourceProps(dataSource);
 
     listItems.push({
       title: descriptionStepI18n.FILTERS_LABEL,
-      description: <Filters filters={filters} {...dataSourceProps} />,
+      description: <Filters filters={eqlQuery.filters} {...dataSourceProps} />,
     });
   }
 

diff --git a/...mponents/rule_details/three_way_diff/final_readonly/fields/kql_query/inline_kql_query.tsx b/...mponents/rule_details/three_way_diff/final_readonly/fields/kql_query/inline_kql_query.tsx
@@ -15,7 +15,7 @@ import type {
 import { Query, Filters } from '../../../../rule_definition_section';
 import * as ruleDetailsI18n from '../../../../translations';
 import * as descriptionStepI18n from '../../../../../../../rule_creation_ui/components/description_step/translations';
-import { getDataSourceProps, getQueryLanguageLabel, typeCheckFilters } from '../../../../helpers';
+import { getDataSourceProps, getQueryLanguageLabel, isFilters } from '../../../../helpers';
 
 const defaultI18nLabels = {
   query: descriptionStepI18n.QUERY_LABEL,
@@ -49,14 +49,12 @@ export function InlineKqlQueryReadOnly({
     },
   ];
 
-  const filters = typeCheckFilters(kqlQuery.filters);
-
-  if (filters.length > 0) {
+  if (isFilters(kqlQuery.filters) && kqlQuery.filters.length > 0) {
     const dataSourceProps = getDataSourceProps(dataSource);
 
     listItems.push({
       title: i18nLabels.filters,
-      description: <Filters filters={filters} {...dataSourceProps} />,
+      description: <Filters filters={kqlQuery.filters} {...dataSourceProps} />,
     });
   }