[Cases] Migrate connector ID to references

x-pack/plugins/cases/common/api/cases/case.ts

@@ -11,7 +11,7 @@ import { NumberFromString } from '../saved_object';
 import { UserRT } from '../user';
 import { CommentResponseRt } from './comment';
 import { CasesStatusResponseRt, CaseStatusRt } from './status';
-import { CaseConnectorRt, ESCaseConnector } from '../connectors';
+import { CaseConnectorRt } from '../connectors';
 import { SubCaseResponseRt } from './sub_case';
 
 const BucketsAggs = rt.array(
@@ -87,24 +87,21 @@ const CaseBasicRt = rt.type({
   owner: rt.string,
 });
 
-const CaseExternalServiceBasicRt = rt.type({
-  connector_id: rt.string,
+/**
+ * The external service fields. Exporting here for use in the service transformation code so I can define
+ * a type without the connector_id field.
+ */
+export const CaseExternalServiceBasicRt = rt.type({
+  connector_id: rt.union([rt.string, rt.null]),
   connector_name: rt.string,
   external_id: rt.string,
   external_title: rt.string,
   external_url: rt.string,
+  pushed_at: rt.string,
+  pushed_by: UserRT,
 });
 
-const CaseFullExternalServiceRt = rt.union([
-  rt.intersection([
-    CaseExternalServiceBasicRt,
-    rt.type({
-      pushed_at: rt.string,
-      pushed_by: UserRT,
-    }),
-  ]),
-  rt.null,
-]);
+const CaseFullExternalServiceRt = rt.union([CaseExternalServiceBasicRt, rt.null]);
 
 export const CaseAttributesRt = rt.intersection([
   CaseBasicRt,
@@ -326,11 +323,6 @@ export type CaseFullExternalService = rt.TypeOf<typeof CaseFullExternalServiceRt
 export type CaseSettings = rt.TypeOf<typeof SettingsRt>;
 export type ExternalServiceResponse = rt.TypeOf<typeof ExternalServiceResponseRt>;
 
-export type ESCaseAttributes = Omit<CaseAttributes, 'connector'> & { connector: ESCaseConnector };
-export type ESCasePatchRequest = Omit<CasePatchRequest, 'connector'> & {
-  connector?: ESCaseConnector;
-};
-
 export type AllTagsFindRequest = rt.TypeOf<typeof AllTagsFindRequestRt>;
 export type AllReportersFindRequest = AllTagsFindRequest;
 

x-pack/plugins/cases/common/api/cases/configure.ts

@@ -8,7 +8,7 @@
 import * as rt from 'io-ts';
 
 import { UserRT } from '../user';
-import { CaseConnectorRt, ConnectorMappingsRt, ESCaseConnector } from '../connectors';
+import { CaseConnectorRt, ConnectorMappingsRt } from '../connectors';
 
 // TODO: we will need to add this type rt.literal('close-by-third-party')
 const ClosureTypeRT = rt.union([rt.literal('close-by-user'), rt.literal('close-by-pushing')]);
@@ -83,8 +83,4 @@ export type CasesConfigureAttributes = rt.TypeOf<typeof CaseConfigureAttributesR
 export type CasesConfigureResponse = rt.TypeOf<typeof CaseConfigureResponseRt>;
 export type CasesConfigurationsResponse = rt.TypeOf<typeof CaseConfigurationsResponseRt>;
 
-export type ESCasesConfigureAttributes = Omit<CasesConfigureAttributes, 'connector'> & {
-  connector: ESCaseConnector;
-};
-
 export type GetConfigureFindRequest = rt.TypeOf<typeof GetConfigureFindRequestRt>;

x-pack/plugins/cases/common/api/connectors/index.ts

@@ -73,6 +73,8 @@ const ConnectorNoneTypeFieldsRt = rt.type({
   fields: rt.null,
 });
 
+export const noneConnectorId: string = 'none';
+
 export const ConnectorTypeFieldsRt = rt.union([
   ConnectorJiraTypeFieldsRt,
   ConnectorNoneTypeFieldsRt,
@@ -102,16 +104,3 @@ export type ConnectorServiceNowSIRTypeFields = rt.TypeOf<typeof ConnectorService
 
 // we need to change these types back and forth for storing in ES (arrays overwrite, objects merge)
 export type ConnectorFields = rt.TypeOf<typeof ConnectorFieldsRt>;
-
-export type ESConnectorFields = Array<{
-  key: string;
-  value: unknown;
-}>;
-
-export type ESCaseConnectorTypes = ConnectorTypes;
-export interface ESCaseConnector {
-  id: string;
-  name: string;
-  type: ESCaseConnectorTypes;
-  fields: ESConnectorFields | null;
-}

x-pack/plugins/cases/public/components/user_action_tree/helpers.tsx

@@ -157,10 +157,11 @@ export const getPushedServiceLabelTitle = (action: CaseUserActions, firstPush: b
 
 export const getPushInfo = (
   caseServices: CaseServices,
-  parsedValue: { connector_id: string; connector_name: string },
+  // a JSON parse failure will result in null for parsedValue
+  parsedValue: { connector_id: string | null; connector_name: string } | null,
   index: number
 ) =>
-  parsedValue != null
+  parsedValue != null && parsedValue.connector_id != null
     ? {
         firstPush: caseServices[parsedValue.connector_id]?.firstPushIndex === index,
         parsedConnectorId: parsedValue.connector_id,

x-pack/plugins/cases/server/client/cases/create.ts

@@ -25,15 +25,9 @@ import {
   MAX_TITLE_LENGTH,
 } from '../../../common';
 import { buildCaseUserActionItem } from '../../services/user_actions/helpers';
-import { getConnectorFromConfiguration } from '../utils';
 
 import { Operations } from '../../authorization';
-import {
-  createCaseError,
-  flattenCaseSavedObject,
-  transformCaseConnectorToEsConnector,
-  transformNewCase,
-} from '../../common';
+import { createCaseError, flattenCaseSavedObject, transformNewCase } from '../../common';
 import { CasesClientArgs } from '..';
 
 /**
@@ -48,7 +42,6 @@ export const create = async (
   const {
     unsecuredSavedObjectsClient,
     caseService,
-    caseConfigureService,
     userActionService,
     user,
     logger,
@@ -90,10 +83,6 @@ export const create = async (
     // eslint-disable-next-line @typescript-eslint/naming-convention
     const { username, full_name, email } = user;
     const createdDate = new Date().toISOString();
-    const myCaseConfigure = await caseConfigureService.find({
-      unsecuredSavedObjectsClient,
-    });
-    const caseConfigureConnector = getConnectorFromConfiguration(myCaseConfigure);
 
     const newCase = await caseService.postNewCase({
       unsecuredSavedObjectsClient,
@@ -103,7 +92,7 @@ export const create = async (
         username,
         full_name,
         email,
-        connector: transformCaseConnectorToEsConnector(query.connector ?? caseConfigureConnector),
+        connector: query.connector,
       }),
       id: savedObjectID,
     });

x-pack/plugins/cases/server/client/cases/get.ts

@@ -13,7 +13,6 @@ import { SavedObject } from 'kibana/server';
 import {
   CaseResponseRt,
   CaseResponse,
-  ESCaseAttributes,
   User,
   UsersRt,
   AllTagsFindRequest,
@@ -27,6 +26,7 @@ import {
   ENABLE_CASE_CONNECTOR,
   CasesByAlertId,
   CasesByAlertIdRt,
+  CaseAttributes,
 } from '../../../common';
 import { countAlertsForID, createCaseError, flattenCaseSavedObject } from '../../common';
 import { CasesClientArgs } from '..';
@@ -171,7 +171,7 @@ export const get = async (
       );
     }
 
-    let theCase: SavedObject<ESCaseAttributes>;
+    let theCase: SavedObject<CaseAttributes>;
     let subCaseIds: string[] = [];
     if (ENABLE_CASE_CONNECTOR) {
       const [caseInfo, subCasesForCaseId] = await Promise.all([

x-pack/plugins/cases/server/client/cases/push.ts

@@ -14,10 +14,10 @@ import {
   CaseResponse,
   CaseStatuses,
   ExternalServiceResponse,
-  ESCaseAttributes,
-  ESCasesConfigureAttributes,
   CaseType,
   ENABLE_CASE_CONNECTOR,
+  CasesConfigureAttributes,
+  CaseAttributes,
 } from '../../../common';
 import { buildCaseUserActionItem } from '../../services/user_actions/helpers';
 
@@ -33,8 +33,8 @@ import { casesConnectors } from '../../connectors';
  * In the future we could allow push to close all the sub cases of a collection but that's not currently supported.
  */
 function shouldCloseByPush(
-  configureSettings: SavedObjectsFindResponse<ESCasesConfigureAttributes>,
-  caseInfo: SavedObject<ESCaseAttributes>
+  configureSettings: SavedObjectsFindResponse<CasesConfigureAttributes>,
+  caseInfo: SavedObject<CaseAttributes>
 ): boolean {
   return (
     configureSettings.total > 0 &&

x-pack/plugins/cases/server/client/cases/update.ts

@@ -34,13 +34,12 @@ import {
   CommentAttributes,
   CommentType,
   ENABLE_CASE_CONNECTOR,
-  ESCaseAttributes,
-  ESCasePatchRequest,
   excess,
   MAX_CONCURRENT_SEARCHES,
   SUB_CASE_SAVED_OBJECT,
   throwErrors,
   MAX_TITLE_LENGTH,
+  CaseAttributes,
 } from '../../../common';
 import { buildCaseUserActions } from '../../services/user_actions/helpers';
 import { getCaseToUpdate } from '../utils';
@@ -51,7 +50,6 @@ import {
   createCaseError,
   flattenCaseSavedObject,
   isCommentRequestTypeAlertOrGenAlert,
-  transformCaseConnectorToEsConnector,
 } from '../../common';
 import { UpdateAlertRequest } from '../alerts/types';
 import { CasesClientInternal } from '../client_internal';
@@ -62,8 +60,8 @@ import { Operations, OwnerEntity } from '../../authorization';
  * Throws an error if any of the requests attempt to update a collection style cases' status field.
  */
 function throwIfUpdateStatusOfCollection(
-  requests: ESCasePatchRequest[],
-  casesMap: Map<string, SavedObject<ESCaseAttributes>>
+  requests: CasePatchRequest[],
+  casesMap: Map<string, SavedObject<CaseAttributes>>
 ) {
   const requestsUpdatingStatusOfCollection = requests.filter(
     (req) =>
@@ -82,8 +80,8 @@ function throwIfUpdateStatusOfCollection(
  * Throws an error if any of the requests attempt to update a collection style case to an individual one.
  */
 function throwIfUpdateTypeCollectionToIndividual(
-  requests: ESCasePatchRequest[],
-  casesMap: Map<string, SavedObject<ESCaseAttributes>>
+  requests: CasePatchRequest[],
+  casesMap: Map<string, SavedObject<CaseAttributes>>
 ) {
   const requestsUpdatingTypeCollectionToInd = requests.filter(
     (req) =>
@@ -102,7 +100,7 @@ function throwIfUpdateTypeCollectionToIndividual(
 /**
  * Throws an error if any of the requests attempt to update the type of a case.
  */
-function throwIfUpdateType(requests: ESCasePatchRequest[]) {
+function throwIfUpdateType(requests: CasePatchRequest[]) {
   const requestsUpdatingType = requests.filter((req) => req.type !== undefined);
 
   if (requestsUpdatingType.length > 0) {
@@ -118,7 +116,7 @@ function throwIfUpdateType(requests: ESCasePatchRequest[]) {
 /**
  * Throws an error if any of the requests attempt to update the owner of a case.
  */
-function throwIfUpdateOwner(requests: ESCasePatchRequest[]) {
+function throwIfUpdateOwner(requests: CasePatchRequest[]) {
   const requestsUpdatingOwner = requests.filter((req) => req.owner !== undefined);
 
   if (requestsUpdatingOwner.length > 0) {
@@ -136,11 +134,11 @@ async function throwIfInvalidUpdateOfTypeWithAlerts({
   caseService,
   unsecuredSavedObjectsClient,
 }: {
-  requests: ESCasePatchRequest[];
+  requests: CasePatchRequest[];
   caseService: CasesService;
   unsecuredSavedObjectsClient: SavedObjectsClientContract;
 }) {
-  const getAlertsForID = async (caseToUpdate: ESCasePatchRequest) => {
+  const getAlertsForID = async (caseToUpdate: CasePatchRequest) => {
     const alerts = await caseService.getAllCaseComments({
       unsecuredSavedObjectsClient,
       id: caseToUpdate.id,
@@ -163,7 +161,7 @@ async function throwIfInvalidUpdateOfTypeWithAlerts({
   };
 
   const requestsUpdatingTypeField = requests.filter((req) => req.type === CaseType.collection);
-  const getAlertsMapper = async (caseToUpdate: ESCasePatchRequest) => getAlertsForID(caseToUpdate);
+  const getAlertsMapper = async (caseToUpdate: CasePatchRequest) => getAlertsForID(caseToUpdate);
   // Ensuring we don't too many concurrent get running.
   const casesAlertTotals = await pMap(requestsUpdatingTypeField, getAlertsMapper, {
     concurrency: MAX_CONCURRENT_SEARCHES,
@@ -185,7 +183,7 @@ async function throwIfInvalidUpdateOfTypeWithAlerts({
 /**
  * Throws an error if any of the requests updates a title and the length is over MAX_TITLE_LENGTH.
  */
-function throwIfTitleIsInvalid(requests: ESCasePatchRequest[]) {
+function throwIfTitleIsInvalid(requests: CasePatchRequest[]) {
   const requestsInvalidTitle = requests.filter(
     (req) => req.title !== undefined && req.title.length > MAX_TITLE_LENGTH
   );
@@ -218,7 +216,7 @@ async function getAlertComments({
   caseService,
   unsecuredSavedObjectsClient,
 }: {
-  casesToSync: ESCasePatchRequest[];
+  casesToSync: CasePatchRequest[];
   caseService: CasesService;
   unsecuredSavedObjectsClient: SavedObjectsClientContract;
 }): Promise<SavedObjectsFindResponse<CommentAttributes>> {
@@ -315,9 +313,9 @@ async function updateAlerts({
   unsecuredSavedObjectsClient,
   casesClientInternal,
 }: {
-  casesWithSyncSettingChangedToOn: ESCasePatchRequest[];
-  casesWithStatusChangedAndSynced: ESCasePatchRequest[];
-  casesMap: Map<string, SavedObject<ESCaseAttributes>>;
+  casesWithSyncSettingChangedToOn: CasePatchRequest[];
+  casesWithStatusChangedAndSynced: CasePatchRequest[];
+  casesMap: Map<string, SavedObject<CaseAttributes>>;
   caseService: CasesService;
   unsecuredSavedObjectsClient: SavedObjectsClientContract;
   casesClientInternal: CasesClientInternal;
@@ -376,7 +374,7 @@ async function updateAlerts({
 }
 
 function partitionPatchRequest(
-  casesMap: Map<string, SavedObject<ESCaseAttributes>>,
+  casesMap: Map<string, SavedObject<CaseAttributes>>,
   patchReqCases: CasePatchRequest[]
 ): {
   nonExistingCases: CasePatchRequest[];
@@ -441,7 +439,7 @@ export const update = async (
     const casesMap = myCases.saved_objects.reduce((acc, so) => {
       acc.set(so.id, so);
       return acc;
-    }, new Map<string, SavedObject<ESCaseAttributes>>());
+    }, new Map<string, SavedObject<CaseAttributes>>());
 
     const { nonExistingCases, conflictedCases, casesToAuthorize } = partitionPatchRequest(
       casesMap,
@@ -469,17 +467,12 @@ export const update = async (
       );
     }
 
-    const updateCases: ESCasePatchRequest[] = query.cases.map((updateCase) => {
+    const updateCases: CasePatchRequest[] = query.cases.map((updateCase) => {
       const currentCase = myCases.saved_objects.find((c) => c.id === updateCase.id);
-      const { connector, ...thisCase } = updateCase;
+      const { id, version } = updateCase;
       return currentCase != null
-        ? getCaseToUpdate(currentCase.attributes, {
-            ...thisCase,
-            ...(connector != null
-              ? { connector: transformCaseConnectorToEsConnector(connector) }
-              : {}),
-          })
-        : { id: thisCase.id, version: thisCase.version };
+        ? getCaseToUpdate(currentCase.attributes, updateCase)
+        : { id, version };
     });
 
     const updateFilterCases = updateCases.filter((updateCase) => {