From 62d4f1cff198f345829e0a165dcc1901ccc37f20 Mon Sep 17 00:00:00 2001 From: Christos Nasikas Date: Fri, 23 Apr 2021 15:26:38 +0300 Subject: [PATCH] Fix types --- x-pack/plugins/cases/common/api/cases/case.ts | 6 ++---- .../server/routes/api/__fixtures__/mock_saved_objects.ts | 2 ++ x-pack/plugins/cases/server/services/mocks.ts | 6 +++++- .../public/cases/containers/configure/mock.ts | 3 +++ .../public/cases/containers/configure/use_configure.tsx | 2 ++ 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/cases/common/api/cases/case.ts b/x-pack/plugins/cases/common/api/cases/case.ts index 29821ea6b4463c8..389caffee1a5cc7 100644 --- a/x-pack/plugins/cases/common/api/cases/case.ts +++ b/x-pack/plugins/cases/common/api/cases/case.ts @@ -180,9 +180,7 @@ export const AllTagsFindRequestRt = rt.partial({ owner: rt.union([rt.array(rt.string), rt.string]), }); -export const AllReportersFindRequestRt = rt.partial({ - owner: rt.union([rt.array(rt.string), rt.string]), -}); +export const AllReportersFindRequestRt = AllTagsFindRequestRt; export type CaseAttributes = rt.TypeOf; /** @@ -208,4 +206,4 @@ export type ESCasePatchRequest = Omit & { }; export type AllTagsFindRequest = rt.TypeOf; -export type AllReportersFindRequest = rt.TypeOf; +export type AllReportersFindRequest = AllTagsFindRequest; diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts index bb4e529192df333..933a59cf060165b 100644 --- a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts +++ b/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_saved_objects.ts @@ -471,6 +471,7 @@ export const mockCaseConfigure: Array> = email: 'testemail@elastic.co', username: 'elastic', }, + owner: 'securitySolution', }, references: [], updated_at: '2020-04-09T09:43:51.778Z', @@ -484,6 +485,7 @@ export const mockCaseMappings: Array> = [ id: 'mock-mappings-1', attributes: { mappings: mappings[ConnectorTypes.jira], + owner: 'securitySolution', }, references: [], }, diff --git a/x-pack/plugins/cases/server/services/mocks.ts b/x-pack/plugins/cases/server/services/mocks.ts index 5e5b4ff31309e63..2b58cd023a8ad56 100644 --- a/x-pack/plugins/cases/server/services/mocks.ts +++ b/x-pack/plugins/cases/server/services/mocks.ts @@ -71,7 +71,11 @@ export const createConfigureServiceMock = (): CaseConfigureServiceMock => { }; export const connectorMappingsServiceMock = (): ConnectorMappingsServiceMock => { - const service: PublicMethodsOf = { find: jest.fn(), post: jest.fn() }; + const service: PublicMethodsOf = { + find: jest.fn(), + post: jest.fn(), + update: jest.fn(), + }; // the cast here is required because jest.Mocked tries to include private members and would throw an error return (service as unknown) as ConnectorMappingsServiceMock; diff --git a/x-pack/plugins/security_solution/public/cases/containers/configure/mock.ts b/x-pack/plugins/security_solution/public/cases/containers/configure/mock.ts index 4e71c9a990ecede..cccf04f7654aaec 100644 --- a/x-pack/plugins/security_solution/public/cases/containers/configure/mock.ts +++ b/x-pack/plugins/security_solution/public/cases/containers/configure/mock.ts @@ -116,6 +116,7 @@ export const actionTypesMock: ActionTypeConnector[] = [ ]; export const caseConfigurationResposeMock: CasesConfigureResponse = { + id: '123', created_at: '2020-04-06T13:03:18.657Z', created_by: { username: 'elastic', full_name: 'Elastic', email: 'elastic@elastic.co' }, connector: { @@ -129,6 +130,7 @@ export const caseConfigurationResposeMock: CasesConfigureResponse = { mappings: [], updated_at: '2020-04-06T14:03:18.657Z', updated_by: { username: 'elastic', full_name: 'Elastic', email: 'elastic@elastic.co' }, + owner: 'securitySolution', version: 'WzHJ12', }; @@ -139,6 +141,7 @@ export const caseConfigurationMock: CasesConfigureRequest = { type: ConnectorTypes.jira, fields: null, }, + owner: 'securitySolution', closure_type: 'close-by-user', }; diff --git a/x-pack/plugins/security_solution/public/cases/containers/configure/use_configure.tsx b/x-pack/plugins/security_solution/public/cases/containers/configure/use_configure.tsx index 2ec2a73363bfece..ca817747e91914a 100644 --- a/x-pack/plugins/security_solution/public/cases/containers/configure/use_configure.tsx +++ b/x-pack/plugins/security_solution/public/cases/containers/configure/use_configure.tsx @@ -278,6 +278,8 @@ export const useCaseConfigure = (): ReturnUseCaseConfigure => { const connectorObj = { connector, closure_type: closureType, + // TODO: use constant after https://github.com/elastic/kibana/pull/97646 is being merged + owner: 'securitySolution', }; const res =