Deduplicate invalid query symbol

elastic · Jan 18, 2022 · e4615a4 · e4615a4
1 parent a447341
commit e4615a4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
diff --git a/x-pack/plugins/infra/common/alerting/metrics/types.ts b/x-pack/plugins/infra/common/alerting/metrics/types.ts
@@ -108,3 +108,7 @@ export interface CountMetricExpressionParams extends BaseMetricExpressionParams
 }
 
 export type MetricExpressionParams = NonCountMetricExpressionParams | CountMetricExpressionParams;
+
+export const QUERY_INVALID: unique symbol = Symbol('QUERY_INVALID');
+
+export type FilterQuery = string | typeof QUERY_INVALID;
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
@@ -31,7 +31,12 @@ import {
   RuleTypeParamsExpressionProps,
   ThresholdExpression,
 } from '../../../../../triggers_actions_ui/public';
-import { Comparator, InventoryMetricConditions } from '../../../../common/alerting/metrics';
+import {
+  Comparator,
+  FilterQuery,
+  InventoryMetricConditions,
+  QUERY_INVALID,
+} from '../../../../common/alerting/metrics';
 import {
   SnapshotCustomMetricInput,
   SnapshotCustomMetricInputRT,
@@ -59,7 +64,6 @@ import { convertKueryToElasticSearchQuery } from '../../../utils/kuery';
 import { ExpressionChart } from './expression_chart';
 import { MetricExpression } from './metric';
 import { NodeTypeExpression } from './node_type';
-import { QUERY_INVALID } from './validation';
 
 const FILTER_TYPING_DEBOUNCE_MS = 500;
 
@@ -76,7 +80,7 @@ type Props = Omit<
     {
       criteria: Criteria;
       nodeType: InventoryItemType;
-      filterQuery?: string | symbol;
+      filterQuery?: FilterQuery;
       filterQueryText?: string;
       sourceId: string;
       alertOnNoData?: boolean;

diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/validation.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/validation.tsx
@@ -7,16 +7,19 @@
 
 import { i18n } from '@kbn/i18n';
 import type { ValidationResult } from '../../../../../triggers_actions_ui/public';
-import { Comparator, InventoryMetricConditions } from '../../../../common/alerting/metrics';
-
-export const QUERY_INVALID = Symbol('QUERY_INVALID');
+import {
+  Comparator,
+  FilterQuery,
+  InventoryMetricConditions,
+  QUERY_INVALID,
+} from '../../../../common/alerting/metrics';
 
 export function validateMetricThreshold({
   criteria,
   filterQuery,
 }: {
   criteria: InventoryMetricConditions[];
-  filterQuery?: string | typeof QUERY_INVALID;
+  filterQuery?: FilterQuery;
 }): ValidationResult {
   const validationResult = { errors: {} };
   const errors: {

diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
@@ -29,7 +29,7 @@ import {
   RuleTypeParams,
   RuleTypeParamsExpressionProps,
 } from '../../../../../triggers_actions_ui/public';
-import { Aggregators, Comparator } from '../../../../common/alerting/metrics';
+import { Aggregators, Comparator, QUERY_INVALID } from '../../../../common/alerting/metrics';
 import { useSourceViaHttp } from '../../../containers/metrics_source/use_source_via_http';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
 import { MetricsExplorerGroupBy } from '../../../pages/metrics/metrics_explorer/components/group_by';
@@ -39,7 +39,6 @@ import { convertKueryToElasticSearchQuery } from '../../../utils/kuery';
 import { AlertContextMeta, AlertParams, MetricExpression } from '../types';
 import { ExpressionChart } from './expression_chart';
 import { ExpressionRow } from './expression_row';
-import { QUERY_INVALID } from './validation';
 
 const FILTER_TYPING_DEBOUNCE_MS = 500;
 

diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx
@@ -7,16 +7,19 @@
 
 import { i18n } from '@kbn/i18n';
 import { ValidationResult } from '../../../../../triggers_actions_ui/public';
-import { Comparator, MetricExpressionParams } from '../../../../common/alerting/metrics';
-
-export const QUERY_INVALID = Symbol('QUERY_INVALID');
+import {
+  Comparator,
+  FilterQuery,
+  MetricExpressionParams,
+  QUERY_INVALID,
+} from '../../../../common/alerting/metrics';
 
 export function validateMetricThreshold({
   criteria,
   filterQuery,
 }: {
   criteria: MetricExpressionParams[];
-  filterQuery?: string | typeof QUERY_INVALID;
+  filterQuery?: FilterQuery;
 }): ValidationResult {
   const validationResult = { errors: {} };
   const errors: {

diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/types.ts b/x-pack/plugins/infra/public/alerting/metric_threshold/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MetricExpressionParams } from '../../../common/alerting/metrics';
+import { FilterQuery, MetricExpressionParams } from '../../../common/alerting/metrics';
 import { MetricsExplorerSeries } from '../../../common/http_api/metrics_explorer';
 import { MetricsExplorerOptions } from '../../pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options';
 
@@ -54,7 +54,7 @@ export interface ExpressionChartData {
 export interface AlertParams {
   criteria: MetricExpression[];
   groupBy?: string | string[];
-  filterQuery?: string | symbol;
+  filterQuery?: FilterQuery;
   sourceId: string;
   filterQueryText?: string;
   alertOnNoData?: boolean;