fixed types

elastic · Apr 2, 2021 · 3266b39 · 3266b39
1 parent f8a6b42
commit 3266b39
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 4 deletions.
diff --git a/x-pack/plugins/alerting/server/alerts_client/tests/update.test.ts b/x-pack/plugins/alerting/server/alerts_client/tests/update.test.ts
@@ -198,20 +198,23 @@ describe('update()', () => {
             params: {
               foo: true,
             },
+            actionTypeId: 'test',
           },
           {
             group: 'default',
             id: '1',
             params: {
               foo: true,
             },
+            actionTypeId: 'test',
           },
           {
             group: 'default',
             id: '2',
             params: {
               foo: true,
             },
+            actionTypeId: 'test2',
           },
         ],
       },
@@ -435,6 +438,7 @@ describe('update()', () => {
             params: {
               foo: true,
             },
+            actionTypeId: 'test',
           },
         ],
       },
@@ -604,6 +608,7 @@ describe('update()', () => {
             params: {
               foo: true,
             },
+            actionTypeId: 'test',
           },
         ],
       },
@@ -727,6 +732,7 @@ describe('update()', () => {
               params: {
                 foo: true,
               },
+              actionTypeId: 'test',
             },
           ],
         },
@@ -856,6 +862,7 @@ describe('update()', () => {
             params: {
               foo: true,
             },
+            actionTypeId: 'test',
           },
         ],
       },
@@ -964,20 +971,23 @@ describe('update()', () => {
             params: {
               foo: true,
             },
+            actionTypeId: 'test',
           },
           {
             group: 'default',
             id: '1',
             params: {
               foo: true,
             },
+            actionTypeId: 'test',
           },
           {
             group: 'default',
             id: '2',
             params: {
               foo: true,
             },
+            actionTypeId: 'test',
           },
         ],
       },
@@ -1026,6 +1036,7 @@ describe('update()', () => {
               params: {
                 foo: true,
               },
+              actionTypeId: 'test',
             },
           ],
         },
@@ -1148,6 +1159,7 @@ describe('update()', () => {
               params: {
                 foo: true,
               },
+              actionTypeId: 'test',
             },
           ],
         },
@@ -1180,6 +1192,7 @@ describe('update()', () => {
               params: {
                 foo: true,
               },
+              actionTypeId: 'test',
             },
           ],
         },
@@ -1217,6 +1230,7 @@ describe('update()', () => {
               params: {
                 foo: true,
               },
+              actionTypeId: 'test',
             },
           ],
         },
@@ -1253,6 +1267,7 @@ describe('update()', () => {
               params: {
                 foo: true,
               },
+              actionTypeId: 'test',
             },
           ],
         },

diff --git a/x-pack/plugins/alerting/server/routes/create_rule.ts b/x-pack/plugins/alerting/server/routes/create_rule.ts
@@ -59,11 +59,13 @@ const rewriteBodyReqActions: RewriteRequestCase<AlertAction> = ({
 const rewriteBodyReq: RewriteRequestCase<CreateOptions<AlertTypeParams>['data']> = ({
   rule_type_id: alertTypeId,
   notify_when: notifyWhen,
+  actions,
   ...rest
 }) => ({
   ...rest,
   alertTypeId,
   notifyWhen,
+  actions,
 });
 const rewriteBodyRes: RewriteResponseCase<SanitizedAlert<AlertTypeParams>> = ({
   actions,

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/aggregate.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/aggregate.ts
@@ -7,7 +7,7 @@
 import { HttpSetup } from 'kibana/public';
 import { AlertAggregations } from '../../../types';
 import { INTERNAL_BASE_ALERTING_API_PATH } from '../../constants';
-import { mapFiltersToKql } from './mapFiltersToKql';
+import { mapFiltersToKql } from './map_filters_to_kql';
 import { RewriteRequestCase } from '../../../../../actions/common';
 
 const rewriteBodyRes: RewriteRequestCase<AlertAggregations> = ({

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/index.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/index.ts
@@ -6,7 +6,7 @@
  */
 
 export { alertingFrameworkHealth } from './health';
-export { mapFiltersToKql } from './mapFiltersToKql';
+export { mapFiltersToKql } from './map_filters_to_kql';
 export { loadAlertAggregations } from './aggregate';
 export { createAlert } from './create';
 export { deleteAlerts } from './delete';

diff --git a/...ion/lib/alert_api/mapFiltersToKql.test.ts → .../lib/alert_api/map_filters_to_kql.test.ts b/...ion/lib/alert_api/mapFiltersToKql.test.ts → .../lib/alert_api/map_filters_to_kql.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mapFiltersToKql } from './mapFiltersToKql';
+import { mapFiltersToKql } from './map_filters_to_kql';
 
 describe('mapFiltersToKql', () => {
   beforeEach(() => jest.resetAllMocks());

diff --git a/...lication/lib/alert_api/mapFiltersToKql.ts → ...ation/lib/alert_api/map_filters_to_kql.ts b/...lication/lib/alert_api/mapFiltersToKql.ts → ...ation/lib/alert_api/map_filters_to_kql.ts
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/rules.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/rules.ts
@@ -8,7 +8,7 @@ import { HttpSetup } from 'kibana/public';
 import { BASE_ALERTING_API_PATH } from '../../constants';
 import { Alert, Pagination, Sorting } from '../../../types';
 import { AsApiContract } from '../../../../../actions/common';
-import { mapFiltersToKql } from './mapFiltersToKql';
+import { mapFiltersToKql } from './map_filters_to_kql';
 import {
   transformAction,
   transformExecutionStatus,