Move more to PDF package

rshen91 · Nov 14, 2023 · 073390a · 073390a
1 parent ac970d4
commit 073390a
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 20 deletions.
diff --git a/...reporting/server/get_absolute_url.test.ts → ...export_types/pdf/get_absolute_url.test.ts b/...reporting/server/get_absolute_url.test.ts → ...export_types/pdf/get_absolute_url.test.ts
diff --git a/.../kbn-reporting/server/get_absolute_url.ts → ...ting/export_types/pdf/get_absolute_url.ts b/.../kbn-reporting/server/get_absolute_url.ts → ...ting/export_types/pdf/get_absolute_url.ts
diff --git a/...-reporting/server/get_custom_logo.test.ts → .../export_types/pdf/get_custom_logo.test.ts b/...-reporting/server/get_custom_logo.test.ts → .../export_types/pdf/get_custom_logo.test.ts
diff --git a/...s/kbn-reporting/server/get_custom_logo.ts → ...rting/export_types/pdf/get_custom_logo.ts b/...s/kbn-reporting/server/get_custom_logo.ts → ...rting/export_types/pdf/get_custom_logo.ts
diff --git a/...bn-reporting/server/get_full_urls.test.ts → ...ng/export_types/pdf/get_full_urls.test.ts b/...bn-reporting/server/get_full_urls.test.ts → ...ng/export_types/pdf/get_full_urls.test.ts
@@ -8,12 +8,12 @@
 
 import type { ReportingServerInfo } from '@kbn/reporting-common/types';
 import type { TaskPayloadPDF } from '@kbn/reporting-export-types-pdf-common';
+import { createMockConfigSchema } from '@kbn/reporting-mocks-server';
 
-import type { ReportingConfigType } from '.';
 import { getFullUrls } from './get_full_urls';
 
 const getMockJob = (base: object) => base as TaskPayloadPDF;
-const mockConfig = { kibanaServer: {} } as unknown as ReportingConfigType;
+const mockConfig = createMockConfigSchema();
 const mockServerInfo: ReportingServerInfo = {
   hostname: 'localhost',
   protocol: 'http',

diff --git a/...ges/kbn-reporting/server/get_full_urls.ts → ...porting/export_types/pdf/get_full_urls.ts b/...ges/kbn-reporting/server/get_full_urls.ts → ...porting/export_types/pdf/get_full_urls.ts
@@ -15,8 +15,8 @@ import {
 
 import type { ReportingServerInfo } from '@kbn/reporting-common/types';
 import type { TaskPayloadPDF } from '@kbn/reporting-export-types-pdf-common';
+import type { ReportingConfigType } from '@kbn/reporting-server';
 
-import type { ReportingConfigType } from '.';
 import { getAbsoluteUrlFactory } from './get_absolute_url';
 import { validateUrls } from './validate_urls';
 

diff --git a/packages/kbn-reporting/export_types/pdf/printable_pdf.ts b/packages/kbn-reporting/export_types/pdf/printable_pdf.ts
@@ -27,15 +27,12 @@ import {
   PDF_JOB_TYPE,
   TaskPayloadPDF,
 } from '@kbn/reporting-export-types-pdf-common';
-import {
-  ExportType,
-  decryptJobHeaders,
-  getCustomLogo,
-  getFullUrls,
-  validateUrls,
-} from '@kbn/reporting-server';
+import { ExportType, decryptJobHeaders } from '@kbn/reporting-server';
 
 import { generatePdfObservable } from './generate_pdf';
+import { validateUrls } from './validate_urls';
+import { getCustomLogo } from './get_custom_logo';
+import { getFullUrls } from './get_full_urls';
 
 /**
  * @deprecated

diff --git a/packages/kbn-reporting/export_types/pdf/printable_pdf_v2.ts b/packages/kbn-reporting/export_types/pdf/printable_pdf_v2.ts
@@ -29,14 +29,10 @@ import {
   PDF_REPORT_TYPE_V2,
   TaskPayloadPDFV2,
 } from '@kbn/reporting-export-types-pdf-common';
-import {
-  decryptJobHeaders,
-  getFullRedirectAppUrl,
-  ExportType,
-  getCustomLogo,
-} from '@kbn/reporting-server';
+import { decryptJobHeaders, getFullRedirectAppUrl, ExportType } from '@kbn/reporting-server';
 
 import { generatePdfObservableV2 } from './generate_pdf_v2';
+import { getCustomLogo } from './get_custom_logo';
 
 export class PdfExportType extends ExportType<JobParamsPDFV2, TaskPayloadPDFV2> {
   id = PDF_REPORT_TYPE_V2;

diff --git a/...bn-reporting/server/validate_urls.test.ts → ...ng/export_types/pdf/validate_urls.test.ts b/...bn-reporting/server/validate_urls.test.ts → ...ng/export_types/pdf/validate_urls.test.ts
diff --git a/...ges/kbn-reporting/server/validate_urls.ts → ...porting/export_types/pdf/validate_urls.ts b/...ges/kbn-reporting/server/validate_urls.ts → ...porting/export_types/pdf/validate_urls.ts
diff --git a/packages/kbn-reporting/server/index.ts b/packages/kbn-reporting/server/index.ts
@@ -9,12 +9,8 @@
 export { cryptoFactory } from './crypto';
 export { decryptJobHeaders } from './decrypt_job_headers';
 export { ExportType } from './export_type';
-export { getAbsoluteUrlFactory } from './get_absolute_url';
-export { getCustomLogo } from './get_custom_logo';
 export { getFullRedirectAppUrl } from './get_full_redirect_app_url';
-export { getFullUrls } from './get_full_urls';
 export { getFieldFormats, setFieldFormats } from './services';
-export { validateUrls } from './validate_urls';
 
 export type { BaseExportTypeSetupDeps, BaseExportTypeStartDeps } from './export_type';
 export { ConfigSchema } from './config_schema';