[Reporting/Legacy] Remove reporting legacy job params compatibility s…

…him (#52539) * [Reporting/Tests] consolidate functional test configs * remove console.log * trash * Update * add more to the comment * restore historic archive for wip ui functional tests * [Reporting/Legacy] Remove reporting legacy job params compatibility shimmy shim shim * objectType: objectType * fix jest test and get_urls logging * simplify change Co-authored-by: Elastic Machine <[email protected]>
elastic · Jan 6, 2020 · fef8485 · fef8485
1 parent 9481cbf
commit fef8485
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 713 deletions.
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.test.ts
@@ -28,7 +28,7 @@ test(`fails if no URL is passed`, async () => {
       server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
-    `"No valid URL fields found in Job Params! Expected \`job.relativeUrl\` or \`job.objects[{ relativeUrl }]\`"`
+    `"No valid URL fields found in Job Params! Expected \`job.relativeUrl: string\` or \`job.relativeUrls: string[]\`"`
   );
 });
 
@@ -64,7 +64,10 @@ test(`fails if URLs are file-protocols for PDF`, async () => {
   const relativeUrl = 'file://etc/passwd/#/something';
   const fn = () =>
     getFullUrls({
-      job: { objects: [{ relativeUrl }], forceNow },
+      job: {
+        relativeUrls: [relativeUrl],
+        forceNow,
+      },
       server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
@@ -79,11 +82,7 @@ test(`fails if URLs are absolute for PDF`, async () => {
   const fn = () =>
     getFullUrls({
       job: {
-        objects: [
-          {
-            relativeUrl,
-          },
-        ],
+        relativeUrls: [relativeUrl],
         forceNow,
       },
       server: mockServer,
@@ -95,18 +94,15 @@ test(`fails if URLs are absolute for PDF`, async () => {
 
 test(`fails if any URLs are absolute or file's for PDF`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
-  const objects = [
-    { relativeUrl: '/app/kibana#/something_aaa' },
-    {
-      relativeUrl:
-        'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something',
-    },
-    { relativeUrl: 'file://etc/passwd/#/something' },
+  const relativeUrls = [
+    '/app/kibana#/something_aaa',
+    'http://169.254.169.254/latest/meta-data/iam/security-credentials/profileName/#/something',
+    'file://etc/passwd/#/something',
   ];
 
   const fn = () =>
     getFullUrls({
-      job: { objects, forceNow },
+      job: { relativeUrls, forceNow },
       server: mockServer,
     } as FullUrlsOpts);
   expect(fn).toThrowErrorMatchingInlineSnapshot(
@@ -163,11 +159,11 @@ test(`adds forceNow to each of multiple urls`, async () => {
   const forceNow = '2000-01-01T00:00:00.000Z';
   const urls = await getFullUrls({
     job: {
-      objects: [
-        { relativeUrl: '/app/kibana#/something_aaa' },
-        { relativeUrl: '/app/kibana#/something_bbb' },
-        { relativeUrl: '/app/kibana#/something_ccc' },
-        { relativeUrl: '/app/kibana#/something_ddd' },
+      relativeUrls: [
+        '/app/kibana#/something_aaa',
+        '/app/kibana#/something_bbb',
+        '/app/kibana#/something_ccc',
+        '/app/kibana#/something_ddd',
       ],
       forceNow,
     },

diff --git a/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts b/x-pack/legacy/plugins/reporting/export_types/common/execute_job/get_full_urls.ts
@@ -20,7 +20,7 @@ function isPngJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloa
   return (job as JobDocPayloadPNG).relativeUrl !== undefined;
 }
 function isPdfJob(job: JobDocPayloadPNG | JobDocPayloadPDF): job is JobDocPayloadPDF {
-  return (job as JobDocPayloadPDF).objects !== undefined;
+  return (job as JobDocPayloadPDF).relativeUrls !== undefined;
 }
 
 export function getFullUrls<JobDocPayloadType>({
@@ -45,10 +45,10 @@ export function getFullUrls<JobDocPayloadType>({
   if (isPngJob(job)) {
     relativeUrls = [job.relativeUrl];
   } else if (isPdfJob(job)) {
-    relativeUrls = job.objects.map(obj => obj.relativeUrl);
+    relativeUrls = job.relativeUrls;
   } else {
     throw new Error(
-      `No valid URL fields found in Job Params! Expected \`job.relativeUrl\` or \`job.objects[{ relativeUrl }]\``
+      `No valid URL fields found in Job Params! Expected \`job.relativeUrl: string\` or \`job.relativeUrls: string[]\``
     );
   }
 

diff --git a/...gacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.js b/...gacy/plugins/reporting/export_types/printable_pdf/server/create_job/compatibility_shim.js