Fixed merge conflicts (#55093)

x-pack/.i18nrc.json

@@ -4,6 +4,7 @@
     "xpack.actions": "legacy/plugins/actions",
     "xpack.advancedUiActions": "plugins/advanced_ui_actions",
     "xpack.alerting": "legacy/plugins/alerting",
+    "xpack.triggersActionsUI": "legacy/plugins/triggers_actions_ui",
     "xpack.apm": "legacy/plugins/apm",
     "xpack.beatsManagement": "legacy/plugins/beats_management",
     "xpack.canvas": "legacy/plugins/canvas",

x-pack/index.js

@@ -42,6 +42,7 @@ import { transform } from './legacy/plugins/transform';
 import { actions } from './legacy/plugins/actions';
 import { alerting } from './legacy/plugins/alerting';
 import { lens } from './legacy/plugins/lens';
+import { triggersActionsUI } from './legacy/plugins/triggers_actions_ui';
 
 module.exports = function(kibana) {
   return [
@@ -83,5 +84,6 @@ module.exports = function(kibana) {
     snapshotRestore(kibana),
     actions(kibana),
     alerting(kibana),
+    triggersActionsUI(kibana),
   ];
 };

x-pack/legacy/plugins/actions/server/builtin_action_types/email.test.ts

@@ -49,7 +49,7 @@ beforeEach(() => {
 describe('actionTypeRegistry.get() works', () => {
   test('action type static data is as expected', () => {
     expect(actionType.id).toEqual(ACTION_TYPE_ID);
-    expect(actionType.name).toEqual('email');
+    expect(actionType.name).toEqual('Email');
   });
 });
 

x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts

@@ -118,7 +118,9 @@ export function getActionType(params: GetActionTypeParams): ActionType {
   const { logger, configurationUtilities } = params;
   return {
     id: '.email',
-    name: 'email',
+    name: i18n.translate('xpack.actions.builtin.emailTitle', {
+      defaultMessage: 'Email',
+    }),
     validate: {
       config: schema.object(ConfigSchemaProps, {
         validate: curry(validateConfig)(configurationUtilities),

x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.test.ts

@@ -37,7 +37,7 @@ beforeEach(() => {
 describe('actionTypeRegistry.get() works', () => {
   test('action type static data is as expected', () => {
     expect(actionType.id).toEqual(ACTION_TYPE_ID);
-    expect(actionType.name).toEqual('index');
+    expect(actionType.name).toEqual('Index');
   });
 });
 

x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts

@@ -38,7 +38,9 @@ const ParamsSchema = schema.object({
 export function getActionType({ logger }: { logger: Logger }): ActionType {
   return {
     id: '.index',
-    name: 'index',
+    name: i18n.translate('xpack.actions.builtin.esIndexTitle', {
+      defaultMessage: 'Index',
+    }),
     validate: {
       config: ConfigSchema,
       params: ParamsSchema,

x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts

@@ -38,7 +38,7 @@ beforeAll(() => {
 describe('get()', () => {
   test('should return correct action type', () => {
     expect(actionType.id).toEqual(ACTION_TYPE_ID);
-    expect(actionType.name).toEqual('pagerduty');
+    expect(actionType.name).toEqual('PagerDuty');
   });
 });
 

x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts

@@ -96,7 +96,9 @@ export function getActionType({
 }): ActionType {
   return {
     id: '.pagerduty',
-    name: 'pagerduty',
+    name: i18n.translate('xpack.actions.builtin.pagerdutyTitle', {
+      defaultMessage: 'PagerDuty',
+    }),
     validate: {
       config: schema.object(configSchemaProps, {
         validate: curry(valdiateActionTypeConfig)(configurationUtilities),

x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.test.ts

@@ -25,7 +25,7 @@ beforeAll(() => {
 describe('get()', () => {
   test('returns action type', () => {
     expect(actionType.id).toEqual(ACTION_TYPE_ID);
-    expect(actionType.name).toEqual('server-log');
+    expect(actionType.name).toEqual('Server log');
   });
 });
 
@@ -98,6 +98,6 @@ describe('execute()', () => {
       config: {},
       secrets: {},
     });
-    expect(mockedLogger.info).toHaveBeenCalledWith('server-log: message text here');
+    expect(mockedLogger.info).toHaveBeenCalledWith('Server log: message text here');
   });
 });

x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts

@@ -12,7 +12,7 @@ import { Logger } from '../../../../../../src/core/server';
 import { ActionType, ActionTypeExecutorOptions, ActionTypeExecutorResult } from '../types';
 import { withoutControlCharacters } from './lib/string_utils';
 
-const ACTION_NAME = 'server-log';
+const ACTION_NAME = 'Server log';
 
 // params definition
 

x-pack/legacy/plugins/actions/server/builtin_action_types/slack.test.ts

@@ -29,7 +29,7 @@ beforeAll(() => {
 describe('action registeration', () => {
   test('returns action type', () => {
     expect(actionType.id).toEqual(ACTION_TYPE_ID);
-    expect(actionType.name).toEqual('slack');
+    expect(actionType.name).toEqual('Slack');
   });
 });
 

x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts

@@ -49,7 +49,9 @@ export function getActionType({
 }): ActionType {
   return {
     id: '.slack',
-    name: 'slack',
+    name: i18n.translate('xpack.actions.builtin.slackTitle', {
+      defaultMessage: 'Slack',
+    }),
     validate: {
       secrets: schema.object(secretsSchemaProps, {
         validate: curry(valdiateActionTypeConfig)(configurationUtilities),

x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.test.ts

@@ -25,7 +25,7 @@ beforeAll(() => {
 describe('actionType', () => {
   test('exposes the action as `webhook` on its Id and Name', () => {
     expect(actionType.id).toEqual('.webhook');
-    expect(actionType.name).toEqual('webhook');
+    expect(actionType.name).toEqual('Webhook');
   });
 });
 

x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.ts

@@ -56,7 +56,9 @@ export function getActionType({
 }): ActionType {
   return {
     id: '.webhook',
-    name: 'webhook',
+    name: i18n.translate('xpack.actions.builtin.webhookTitle', {
+      defaultMessage: 'Webhook',
+    }),
     validate: {
       config: schema.object(configSchemaProps, {
         validate: curry(valdiateActionTypeConfig)(configurationUtilities),

x-pack/legacy/plugins/siem/server/plugin.ts

@@ -60,7 +60,16 @@ export class Plugin {
             ],
             read: ['config'],
           },
-          ui: ['show', 'crud'],
+          ui: [
+            'show',
+            'crud',
+            'alerting:show',
+            'actions:show',
+            'alerting:save',
+            'actions:save',
+            'alerting:delete',
+            'actions:delete',
+          ],
         },
         read: {
           api: ['siem', 'actions-read', 'actions-all', 'alerting-read', 'alerting-all'],
@@ -73,7 +82,15 @@ export class Plugin {
               timelineSavedObjectType,
             ],
           },
-          ui: ['show'],
+          ui: [
+            'show',
+            'alerting:show',
+            'actions:show',
+            'alerting:save',
+            'actions:save',
+            'alerting:delete',
+            'actions:delete',
+          ],
         },
       },
     });

x-pack/legacy/plugins/triggers_actions_ui/index.ts

@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Legacy } from 'kibana';
+import { Root } from 'joi';
+import { resolve } from 'path';
+
+export function triggersActionsUI(kibana: any) {
+  return new kibana.Plugin({
+    id: 'triggers_actions_ui',
+    configPrefix: 'xpack.triggers_actions_ui',
+    isEnabled(config: Legacy.KibanaConfig) {
+      return (
+        config.get('xpack.triggers_actions_ui.enabled') &&
+        (config.get('xpack.actions.enabled') || config.get('xpack.alerting.enabled'))
+      );
+    },
+    publicDir: resolve(__dirname, 'public'),
+    require: ['kibana'],
+    config(Joi: Root) {
+      return Joi.object()
+        .keys({
+          enabled: Joi.boolean().default(false),
+          createAlertUiEnabled: Joi.boolean().default(false),
+        })
+        .default();
+    },
+    uiExports: {
+      home: ['plugins/triggers_actions_ui/hacks/register'],
+      managementSections: ['plugins/triggers_actions_ui/legacy'],
+      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
+      injectDefaultVars(server: Legacy.Server) {
+        const serverConfig = server.config();
+        return {
+          createAlertUiEnabled: serverConfig.get('xpack.triggers_actions_ui.createAlertUiEnabled'),
+        };
+      },
+    },
+  });
+}

x-pack/legacy/plugins/triggers_actions_ui/np_ready/kibana.json

@@ -0,0 +1,6 @@
+{
+    "id": "triggers_actions_ui",
+    "version": "kibana",
+    "server": false,
+    "ui": true
+  }

x-pack/legacy/plugins/triggers_actions_ui/np_ready/public/application/action_type_registry.mock.ts

@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ActionTypeRegistryContract } from '../types';
+
+const createActionTypeRegistryMock = () => {
+  const mocked: jest.Mocked<ActionTypeRegistryContract> = {
+    has: jest.fn(x => true),
+    register: jest.fn(),
+    get: jest.fn(),
+    list: jest.fn(),
+  };
+  return mocked;
+};
+
+export const actionTypeRegistryMock = {
+  create: createActionTypeRegistryMock,
+};

x-pack/legacy/plugins/triggers_actions_ui/np_ready/public/application/alert_type_registry.mock.ts

@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { AlertTypeRegistryContract } from '../types';
+
+const createAlertTypeRegistryMock = () => {
+  const mocked: jest.Mocked<AlertTypeRegistryContract> = {
+    has: jest.fn(),
+    register: jest.fn(),
+    get: jest.fn(),
+    list: jest.fn(),
+  };
+  return mocked;
+};
+
+export const alertTypeRegistryMock = {
+  create: createAlertTypeRegistryMock,
+};

x-pack/legacy/plugins/triggers_actions_ui/np_ready/public/application/app.tsx

@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { Switch, Route, Redirect, HashRouter } from 'react-router-dom';
+import {
+  ChromeStart,
+  DocLinksStart,
+  ToastsSetup,
+  HttpSetup,
+  IUiSettingsClient,
+} from 'kibana/public';
+import { BASE_PATH, Section } from './constants';
+import { TriggersActionsUIHome } from './home';
+import { AppContextProvider, useAppDependencies } from './app_context';
+import { hasShowAlertsCapability } from './lib/capabilities';
+import { LegacyDependencies, ActionTypeModel, AlertTypeModel } from '../types';
+import { TypeRegistry } from './type_registry';
+
+export interface AppDeps {
+  chrome: ChromeStart;
+  docLinks: DocLinksStart;
+  toastNotifications: ToastsSetup;
+  injectedMetadata: any;
+  http: HttpSetup;
+  uiSettings: IUiSettingsClient;
+  legacy: LegacyDependencies;
+  actionTypeRegistry: TypeRegistry<ActionTypeModel>;
+  alertTypeRegistry: TypeRegistry<AlertTypeModel>;
+}
+
+export const App = (appDeps: AppDeps) => {
+  const sections: Section[] = ['alerts', 'connectors'];
+
+  const sectionsRegex = sections.join('|');
+
+  return (
+    <HashRouter>
+      <AppContextProvider appDeps={appDeps}>
+        <AppWithoutRouter sectionsRegex={sectionsRegex} />
+      </AppContextProvider>
+    </HashRouter>
+  );
+};
+
+export const AppWithoutRouter = ({ sectionsRegex }: any) => {
+  const {
+    legacy: { capabilities },
+  } = useAppDependencies();
+  const canShowAlerts = hasShowAlertsCapability(capabilities.get());
+  const DEFAULT_SECTION: Section = canShowAlerts ? 'alerts' : 'connectors';
+  return (
+    <Switch>
+      <Route
+        exact
+        path={`${BASE_PATH}/:section(${sectionsRegex})`}
+        component={TriggersActionsUIHome}
+      />
+      <Redirect from={`${BASE_PATH}`} to={`${BASE_PATH}/${DEFAULT_SECTION}`} />
+    </Switch>
+  );
+};

x-pack/legacy/plugins/triggers_actions_ui/np_ready/public/application/app_context.tsx

@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { createContext, useContext } from 'react';
+import { AppDeps } from './app';
+
+const AppContext = createContext<AppDeps | null>(null);
+
+export const AppContextProvider = ({
+  children,
+  appDeps,
+}: {
+  appDeps: AppDeps | null;
+  children: React.ReactNode;
+}) => {
+  return appDeps ? <AppContext.Provider value={appDeps}>{children}</AppContext.Provider> : null;
+};
+
+export const useAppDependencies = (): AppDeps => {
+  const ctx = useContext(AppContext);
+  if (!ctx) {
+    throw new Error(
+      'The app dependencies Context has not been set. Use the "setAppDependencies()" method when bootstrapping the app.'
+    );
+  }
+  return ctx;
+};