Revert "revert siem changes"

This reverts commit f1ffe64.
gmmorris · May 6, 2020 · 12e8da4 · 12e8da4
1 parent 687607e
commit 12e8da4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 24 deletions.
diff --git a/x-pack/plugins/siem/public/lib/connectors/jira/flyout.tsx b/x-pack/plugins/siem/public/lib/connectors/jira/flyout.tsx
@@ -109,3 +109,6 @@ export const JiraConnectorFlyout = withConnectorFlyout<JiraActionConnector>({
   configKeys: ['projectKey'],
   connectorActionTypeId: '.jira',
 });
+
+// eslint-disable-next-line import/no-default-export
+export { JiraConnectorFlyout as default };
diff --git a/x-pack/plugins/siem/public/lib/connectors/jira/index.tsx b/x-pack/plugins/siem/public/lib/connectors/jira/index.tsx
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { lazy } from 'react';
 import {
   ValidationResult,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -13,7 +14,6 @@ import { connector } from './config';
 import { createActionType } from '../utils';
 import logo from './logo.svg';
 import { JiraActionConnector } from './types';
-import { JiraConnectorFlyout } from './flyout';
 import * as i18n from './translations';
 
 interface Errors {
@@ -50,5 +50,5 @@ export const getActionType = createActionType({
   selectMessage: i18n.JIRA_DESC,
   actionTypeTitle: connector.name,
   validateConnector,
-  actionConnectorFields: JiraConnectorFlyout,
+  actionConnectorFields: lazy(() => import('./flyout')),
 });
diff --git a/x-pack/plugins/siem/public/lib/connectors/servicenow/flyout.tsx b/x-pack/plugins/siem/public/lib/connectors/servicenow/flyout.tsx
@@ -82,3 +82,6 @@ export const ServiceNowConnectorFlyout = withConnectorFlyout<ServiceNowActionCon
   secretKeys: ['username', 'password'],
   connectorActionTypeId: '.servicenow',
 });
+
+// eslint-disable-next-line import/no-default-export
+export { ServiceNowConnectorFlyout as default };
diff --git a/x-pack/plugins/siem/public/lib/connectors/servicenow/index.tsx b/x-pack/plugins/siem/public/lib/connectors/servicenow/index.tsx
@@ -4,16 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { lazy } from 'react';
 import {
   ValidationResult,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../../triggers_actions_ui/public/types';
-
 import { connector } from './config';
 import { createActionType } from '../utils';
 import logo from './logo.svg';
 import { ServiceNowActionConnector } from './types';
-import { ServiceNowConnectorFlyout } from './flyout';
 import * as i18n from './translations';
 
 interface Errors {
@@ -44,5 +43,5 @@ export const getActionType = createActionType({
   selectMessage: i18n.SERVICENOW_DESC,
   actionTypeTitle: connector.name,
   validateConnector,
-  actionConnectorFields: ServiceNowConnectorFlyout,
+  actionConnectorFields: lazy(() => import('./flyout')),
 });
diff --git a/x-pack/plugins/siem/public/lib/connectors/utils.ts b/x-pack/plugins/siem/public/lib/connectors/utils.ts
@@ -7,7 +7,6 @@
 import {
   ActionTypeModel,
   ValidationResult,
-  ActionParamsProps,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../triggers_actions_ui/public/types';
 
@@ -31,7 +30,7 @@ export const createActionType = ({
   validateConnector,
   validateParams = connectorParamsValidator,
   actionConnectorFields,
-  actionParamsFields = ConnectorParamsFields,
+  actionParamsFields = null,
 }: Optional<ActionTypeModel, 'validateParams' | 'actionParamsFields'>) => (): ActionTypeModel => {
   return {
     id,
@@ -59,15 +58,6 @@ export const createActionType = ({
   };
 };
 
-const ConnectorParamsFields: React.FunctionComponent<ActionParamsProps<ActionConnectorParams>> = ({
-  actionParams,
-  editAction,
-  index,
-  errors,
-}) => {
-  return null;
-};
-
 const connectorParamsValidator = (actionParams: ActionConnectorParams): ValidationResult => {
   return { errors: {} };
 };

diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -54,14 +54,12 @@ export interface ActionTypeModel<ActionConnector = any, ActionParams = any> {
   actionTypeTitle?: string;
   validateConnector: (connector: any) => ValidationResult;
   validateParams: (actionParams: any) => ValidationResult;
-  actionConnectorFields:
-    | React.FunctionComponent<any>
-    | React.LazyExoticComponent<ComponentType<ActionConnectorFieldsProps<ActionConnector>>>
-    | null;
-  actionParamsFields:
-    | React.FunctionComponent<any>
-    | React.LazyExoticComponent<ComponentType<ActionParamsProps<ActionParams>>>
-    | null;
+  actionConnectorFields: React.LazyExoticComponent<
+    ComponentType<ActionConnectorFieldsProps<ActionConnector>>
+  > | null;
+  actionParamsFields: React.LazyExoticComponent<
+    ComponentType<ActionParamsProps<ActionParams>>
+  > | null;
 }
 
 export interface ValidationResult {