More type fixes

elastic · Aug 19, 2024 · ebffcdd · ebffcdd
1 parent 19cdd48
commit ebffcdd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/x-pack/plugins/data_visualizer/public/application/data_drift/use_data_drift_result.ts b/x-pack/plugins/data_visualizer/public/application/data_drift/use_data_drift_result.ts
@@ -304,10 +304,8 @@ const getDataComparisonQuery = ({
 
   if (rangeFilter && isPopulatedObject<string, QueryDslBoolQuery>(query, ['bool'])) {
     if (Array.isArray(query.bool.filter)) {
-      // @ts-expect-error gte and lte can be numeric
       query.bool.filter.push(rangeFilter);
     } else {
-      // @ts-expect-error gte and lte can be numeric
       query.bool.filter = [rangeFilter];
     }
   }

diff --git a/x-pack/plugins/rule_registry/common/types.ts b/x-pack/plugins/rule_registry/common/types.ts
@@ -367,7 +367,8 @@ const allowedFilterKeysSchema = t.union([
   t.literal('range'),
   t.literal('rank_feature'),
   t.literal('regexp'),
-  t.literal('rule_query'),
+  t.literal('rule'),
+  t.literal('semantic'),
   t.literal('shape'),
   t.literal('simple_query_string'),
   t.literal('span_containing'),

diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
@@ -30,7 +30,6 @@ import {
   AggregateName,
   AggregationsAggregate,
   AggregationsMultiBucketAggregateBase,
-  InlineScript,
   MappingRuntimeFields,
   QueryDslQueryContainer,
   SortCombinations,
@@ -826,18 +825,16 @@ export class AlertsClient {
         const result = await this.esClient.updateByQuery({
           index,
           conflicts: 'proceed',
-          body: {
-            script: {
-              source: `if (ctx._source['${ALERT_WORKFLOW_STATUS}'] != null) {
+          script: {
+            source: `if (ctx._source['${ALERT_WORKFLOW_STATUS}'] != null) {
                 ctx._source['${ALERT_WORKFLOW_STATUS}'] = '${status}'
               }
               if (ctx._source.signal != null && ctx._source.signal.status != null) {
                 ctx._source.signal.status = '${status}'
               }`,
-              lang: 'painless',
-            } as InlineScript,
-            query: fetchAndAuditResponse.authorizedQuery as Omit<QueryDslQueryContainer, 'script'>,
+            lang: 'painless',
           },
+          query: fetchAndAuditResponse.authorizedQuery as Omit<QueryDslQueryContainer, 'script'>,
           ignore_unavailable: true,
         });
         return result;
@@ -965,14 +962,12 @@ export class AlertsClient {
       await this.esClient.updateByQuery({
         index,
         conflicts: 'proceed',
-        body: {
-          script: {
-            source: painlessScript,
-            lang: 'painless',
-            params: { caseIds },
-          } as InlineScript,
-          query: esQuery,
+        script: {
+          source: painlessScript,
+          lang: 'painless',
+          params: { caseIds },
         },
+        query: esQuery,
         ignore_unavailable: true,
       });
     } catch (err) {