From f1ffe648d911043807abfc35c0d87ff9bdd0df48 Mon Sep 17 00:00:00 2001 From: Gidi Meir Morris Date: Wed, 6 May 2020 10:10:07 +0100 Subject: [PATCH] revert siem changes --- .../siem/public/lib/connectors/jira/flyout.tsx | 3 --- .../siem/public/lib/connectors/jira/index.tsx | 4 ++-- .../public/lib/connectors/servicenow/flyout.tsx | 3 --- .../public/lib/connectors/servicenow/index.tsx | 5 +++-- x-pack/plugins/siem/public/lib/connectors/types.ts | 3 +-- x-pack/plugins/siem/public/lib/connectors/utils.ts | 12 +++++++++++- x-pack/plugins/triggers_actions_ui/public/types.ts | 14 ++++++++------ 7 files changed, 25 insertions(+), 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 index 337ca2e3c918e0..9c3d1c90e67d7a 100644 --- 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({ 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 index 049ccb7cf17b7e..ada9608e37c983 100644 --- 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 index 2783e988a64052..5d5d08dacf90c9 100644 --- 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 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 index 3d3692c9806e48..ffb013c347e59e 100644 --- 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 = Omit & Partial; export interface ConnectorFlyoutFormProps { - 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 index cc1608a05e2ce8..169b4758876e8c 100644 --- 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 => { return { id, @@ -58,6 +59,15 @@ export const createActionType = ({ }; }; +const ConnectorParamsFields: React.FunctionComponent> = ({ + 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 index b65ed4927b03e3..b525078eef0417 100644 --- 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 { actionTypeTitle?: string; validateConnector: (connector: any) => ValidationResult; validateParams: (actionParams: any) => ValidationResult; - actionConnectorFields: React.LazyExoticComponent< - ComponentType> - > | null; - actionParamsFields: React.LazyExoticComponent< - ComponentType> - > | null; + actionConnectorFields: + | React.FunctionComponent + | React.LazyExoticComponent>> + | null; + actionParamsFields: + | React.FunctionComponent + | React.LazyExoticComponent>> + | null; } export interface ValidationResult {