revert siem changes

gmmorris · May 6, 2020 · f1ffe64 · f1ffe64
1 parent 93eaa01
commit f1ffe64
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 19 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,6 +109,3 @@ 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,7 +4,6 @@
  * 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
@@ -14,6 +13,7 @@ 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: lazy(() => import('./flyout')),
+  actionConnectorFields: JiraConnectorFlyout,
 });
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,6 +82,3 @@ 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,15 +4,16 @@
  * 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 {
@@ -43,5 +44,5 @@ export const getActionType = createActionType({
   selectMessage: i18n.SERVICENOW_DESC,
   actionTypeTitle: connector.name,
   validateConnector,
-  actionConnectorFields: lazy(() => import('./flyout')),
+  actionConnectorFields: ServiceNowConnectorFlyout,
 });
diff --git a/x-pack/plugins/siem/public/lib/connectors/types.ts b/x-pack/plugins/siem/public/lib/connectors/types.ts
@@ -8,7 +8,6 @@
 /* eslint-disable @kbn/eslint/no-restricted-paths */
 
 import { ActionType } from '../../../../triggers_actions_ui/public';
-import { IErrorObject } from '../../../../triggers_actions_ui/public/types';
 import { ExternalIncidentServiceConfiguration } from '../../../../actions/server/builtin_action_types/case/types';
 
 import { ActionType as ThirdPartySupportedActions, CaseField } from '../../../../case/common/api';
@@ -43,7 +42,7 @@ export interface ActionConnectorValidationErrors {
 export type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
 
 export interface ConnectorFlyoutFormProps<T> {
-  errors: IErrorObject;
+  errors: { [key: string]: string[] };
   action: T;
   onChangeSecret: (key: string, value: string) => void;
   onBlurSecret: (key: string) => void;

diff --git a/x-pack/plugins/siem/public/lib/connectors/utils.ts b/x-pack/plugins/siem/public/lib/connectors/utils.ts
@@ -7,6 +7,7 @@
 import {
   ActionTypeModel,
   ValidationResult,
+  ActionParamsProps,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../triggers_actions_ui/public/types';
 
@@ -30,7 +31,7 @@ export const createActionType = ({
   validateConnector,
   validateParams = connectorParamsValidator,
   actionConnectorFields,
-  actionParamsFields = null,
+  actionParamsFields = ConnectorParamsFields,
 }: Optional<ActionTypeModel, 'validateParams' | 'actionParamsFields'>) => (): ActionTypeModel => {
   return {
     id,
@@ -58,6 +59,15 @@ 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,12 +54,14 @@ export interface ActionTypeModel<ActionConnector = any, ActionParams = any> {
   actionTypeTitle?: string;
   validateConnector: (connector: any) => ValidationResult;
   validateParams: (actionParams: any) => ValidationResult;
-  actionConnectorFields: React.LazyExoticComponent<
-    ComponentType<ActionConnectorFieldsProps<ActionConnector>>
-  > | null;
-  actionParamsFields: React.LazyExoticComponent<
-    ComponentType<ActionParamsProps<ActionParams>>
-  > | null;
+  actionConnectorFields:
+    | React.FunctionComponent<any>
+    | React.LazyExoticComponent<ComponentType<ActionConnectorFieldsProps<ActionConnector>>>
+    | null;
+  actionParamsFields:
+    | React.FunctionComponent<any>
+    | React.LazyExoticComponent<ComponentType<ActionParamsProps<ActionParams>>>
+    | null;
 }
 
 export interface ValidationResult {