Fixed merge issues

elastic · Feb 3, 2020 · 8d332db · 8d332db
1 parent 21a0631
commit 8d332db
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/...s_ui/np_ready/public/application/sections/alert_details/components/alert_details.test.tsx b/...s_ui/np_ready/public/application/sections/alert_details/components/alert_details.test.tsx
@@ -43,6 +43,8 @@ describe('alert_details', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     expect(
@@ -61,6 +63,8 @@ describe('alert_details', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     expect(
@@ -86,6 +90,8 @@ describe('alert_details', () => {
       const alertType = {
         id: '.noop',
         name: 'No Op',
+        actionGroups: ['default'],
+        actionVariables: [],
       };
 
       const actionTypes: ActionType[] = [
@@ -133,6 +139,8 @@ describe('alert_details', () => {
       const alertType = {
         id: '.noop',
         name: 'No Op',
+        actionGroups: ['default'],
+        actionVariables: [],
       };
       const actionTypes: ActionType[] = [
         {
@@ -181,6 +189,8 @@ describe('alert_details', () => {
       const alertType = {
         id: '.noop',
         name: 'No Op',
+        actionGroups: ['default'],
+        actionVariables: [],
       };
 
       expect(
@@ -203,6 +213,8 @@ describe('alert_details', () => {
       const alertType = {
         id: '.noop',
         name: 'No Op',
+        actionGroups: ['default'],
+        actionVariables: [],
       };
 
       expect(
@@ -225,6 +237,8 @@ describe('alert_details', () => {
       const alertType = {
         id: '.noop',
         name: 'No Op',
+        actionGroups: ['default'],
+        actionVariables: [],
       };
 
       expect(
@@ -252,6 +266,8 @@ describe('enable button', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     const enableButton = shallow(
@@ -275,6 +291,8 @@ describe('enable button', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     const enableButton = shallow(
@@ -298,6 +316,8 @@ describe('enable button', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     const disableAlert = jest.fn();
@@ -330,6 +350,8 @@ describe('enable button', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     const enableAlert = jest.fn();
@@ -365,6 +387,8 @@ describe('mute button', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     const enableButton = shallow(
@@ -389,6 +413,8 @@ describe('mute button', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     const enableButton = shallow(
@@ -413,6 +439,8 @@ describe('mute button', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     const muteAlert = jest.fn();
@@ -446,6 +474,8 @@ describe('mute button', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     const unmuteAlert = jest.fn();
@@ -479,6 +509,8 @@ describe('mute button', () => {
     const alertType = {
       id: '.noop',
       name: 'No Op',
+      actionGroups: ['default'],
+      actionVariables: [],
     };
 
     const enableButton = shallow(

diff --git a/x-pack/legacy/plugins/triggers_actions_ui/np_ready/public/types.ts b/x-pack/legacy/plugins/triggers_actions_ui/np_ready/public/types.ts
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { ActionType } from '../../../../../plugins/actions/common';
 import { TypeRegistry } from './application/type_registry';
 import { SanitizedAlert as Alert, AlertAction } from '../../../alerting/common';
 import {