Fix CI types error

elastic · Nov 2, 2022 · d6e46f5 · d6e46f5
1 parent 091eb74
commit d6e46f5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/x-pack/plugins/notifications/server/services/connectors_email_service.ts b/x-pack/plugins/notifications/server/services/connectors_email_service.ts
@@ -6,8 +6,7 @@
  */
 
 import type { IUnsecuredActionsClient } from '@kbn/actions-plugin/server';
-import type { RelatedSavedObjects } from '@kbn/actions-plugin/server/lib/related_saved_objects';
-import type { EmailService, PlainTextEmail, RelatedSavedObject } from './types';
+import type { EmailService, PlainTextEmail } from './types';
 
 export class ConnectorsEmailService implements EmailService {
   constructor(
@@ -25,13 +24,11 @@ export class ConnectorsEmailService implements EmailService {
         message: params.message,
       },
       ...(params.context?.relatedObjects?.length && {
-        relatedSavedObjects: this._getRelatedSavedObjects(params.context!.relatedObjects!),
+        relatedSavedObjects: params.context!.relatedObjects!.map(
+          ({ id, type, spaceId: namespace }) => ({ id, type, namespace })
+        ),
       }),
     }));
     return await this.actionsClient.bulkEnqueueExecution(this.requesterId, actions);
   }
-
-  private _getRelatedSavedObjects(relatedObjects: RelatedSavedObject[]): RelatedSavedObjects {
-    return relatedObjects.map(({ id, type, spaceId: namespace }) => ({ id, type, namespace }));
-  }
 }
diff --git a/x-pack/plugins/notifications/server/services/licensed_email_service.test.ts b/x-pack/plugins/notifications/server/services/licensed_email_service.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Subject } from 'rxjs';
-import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import { licensingMock } from '@kbn/licensing-plugin/server/mocks';
 import { loggerMock } from '@kbn/logging-mocks';
 import { LicensedEmailService } from './licensed_email_service';
 import type { ILicense } from '@kbn/licensing-plugin/server';
@@ -18,8 +18,8 @@ const emailServiceMock: EmailService = {
   sendPlainTextEmail: jest.fn(),
 };
 
-const validLicense = licenseMock.createLicenseMock();
-const invalidLicense = licenseMock.createLicenseMock();
+const validLicense = licensingMock.createLicenseMock();
+const invalidLicense = licensingMock.createLicenseMock();
 invalidLicense.type = 'basic';
 invalidLicense.check = jest.fn(() => ({
   state: 'invalid',

diff --git a/x-pack/plugins/notifications/tsconfig.json b/x-pack/plugins/notifications/tsconfig.json
@@ -13,7 +13,9 @@
     "public/**/*",
     "common/**/*"
   ],
-  "references": [
-    { "path": "../actions/tsconfig.json" }
+  "kbn_references": [
+    { "path": "../../../src/core/tsconfig.json" },
+    { "path": "../actions/tsconfig.json" },
+    { "path": "../licensing/tsconfig.json" }
   ]
 }