[Tests] Share Modal Redesign clean up and tests

packages/kbn-reporting/public/share/index.ts

@@ -6,10 +6,8 @@
  * Side Public License, v 1.
  */
 
-export { getSharedComponents } from './shared';
 export { reportingExportModalProvider } from './share_context_menu/register_pdf_png_modal_reporting';
-export { reportingScreenshotShareProvider } from './share_context_menu/register_pdf_png_reporting';
-export { reportingCsvShareProvider } from './share_context_menu/register_csv_reporting';
 export { reportingCsvShareProvider as reportingCsvShareModalProvider } from './share_context_menu/register_csv_modal_reporting';
-export type { ReportingPublicComponents } from './shared/get_shared_components';
 export type { JobParamsProviderOptions } from './share_context_menu';
+export { getSharedComponents } from './shared';
+export type { ReportingPublicComponents } from './shared';

packages/kbn-reporting/public/share/share_context_menu/register_csv_modal_reporting.tsx

@@ -153,7 +153,7 @@ export const reportingCsvShareProvider = ({
         helpText: (
           <FormattedMessage
             id="reporting.share.csv.reporting.helpTextCSV"
-            defaultMessage="Export a CSV of this {objectType}"
+            defaultMessage="Export a CSV of this {objectType}."
             values={{ objectType }}
           />
         ),

packages/kbn-reporting/public/share/share_context_menu/register_pdf_png_modal_reporting.tsx

@@ -274,20 +274,18 @@ export const reportingExportModalProvider = ({
       apiClient.getDecoratedJobParams(getJobParams(jobProviderOptions, 'pngV2')())
     );
 
-    const generateReportPDF = ({
-      intl,
-      optimizedForPrinting = false,
-    }: {
-      intl: InjectedIntl;
-      optimizedForPrinting?: boolean;
-    }) => {
-      const el = document.querySelector('[data-shared-items-container]');
-      const { height, width } = el ? el.getBoundingClientRect() : { height: 768, width: 1024 };
-      const dimensions = { height, width };
+    const generateReportPDF = ({ intl }: { intl: InjectedIntl }) => {
+      const { layout: outerLayout } = getJobParams(jobProviderOptions, 'printablePdfV2')();
+      let dimensions = outerLayout?.dimensions;
+      if (!dimensions) {
+        const el = document.querySelector('[data-shared-items-container]');
+        const { height, width } = el ? el.getBoundingClientRect() : { height: 768, width: 1024 };
+        dimensions = { height, width };
+      }
 
       const decoratedJobParams = apiClient.getDecoratedJobParams({
         ...getJobParams(jobProviderOptions, 'printablePdfV2')(),
-        layout: { id: optimizedForPrinting ? 'print' : 'preserve_layout', dimensions },
+        layout: { id: 'preserve_layout', dimensions },
         objectType,
         title: sharingData.title,
       });
@@ -322,6 +320,9 @@ export const reportingExportModalProvider = ({
             ),
             'data-test-subj': 'queueReportSuccess',
           });
+          if (onClose) {
+            onClose();
+          }
         })
         .catch((error: any) => {
           toasts.addError(error, {
@@ -334,11 +335,73 @@ export const reportingExportModalProvider = ({
         });
     };
 
-    const generateReportPNG = ({ intl }: { intl: InjectedIntl }) => {
-      const el = document.querySelector('[data-shared-items-container]');
-      const { height, width } = el ? el.getBoundingClientRect() : { height: 768, width: 1024 };
-      const dimensions = { height, width };
+    const generateReportPDFForPrinting = ({ intl }: { intl: InjectedIntl }) => {
+      const { layout: outerLayout } = getJobParams(jobProviderOptions, 'printablePdfV2')();
+      let dimensions = outerLayout?.dimensions;
+      if (!dimensions) {
+        const el = document.querySelector('[data-shared-items-container]');
+        const { height, width } = el ? el.getBoundingClientRect() : { height: 768, width: 1024 };
+        dimensions = { height, width };
+      }
+      const decoratedJobParams = apiClient.getDecoratedJobParams({
+        ...getJobParams(jobProviderOptions, 'printablePdfV2')(),
+        layout: { id: 'print', dimensions },
+        objectType,
+        title: sharingData.title,
+      });
+      return apiClient
+        .createReportingJob('printablePdfV2', decoratedJobParams)
+        .then(() => {
+          toasts.addSuccess({
+            title: intl.formatMessage(
+              {
+                id: 'reporting.share.modalContent.successfullyQueuedReportNotificationTitle',
+                defaultMessage: 'Queued report for {objectType}',
+              },
+              { objectType }
+            ),
+            text: toMountPoint(
+              <FormattedMessage
+                id="reporting.share.modalContent.successfullyQueuedReportNotificationDescription"
+                defaultMessage="Track its progress in {path}."
+                values={{
+                  path: (
+                    <a href={apiClient.getManagementLink()}>
+                      <FormattedMessage
+                        id="reporting.share.publicNotifier.reportLink.reportingSectionUrlLinkLabel"
+                        defaultMessage="Stack Management &gt; Reporting"
+                      />
+                    </a>
+                  ),
+                }}
+              />,
+              { theme, i18n: i18nStart }
+            ),
+            'data-test-subj': 'queueReportSuccess',
+          });
+          if (onClose) {
+            onClose();
+          }
+        })
+        .catch((error: any) => {
+          toasts.addError(error, {
+            title: intl.formatMessage({
+              id: 'reporting.share.modalContent.notification.reportingErrorTitle',
+              defaultMessage: 'Unable to create report',
+            }),
+            toastMessage: error.body?.message,
+          });
+        });
+    };
 
+    const generateReportPNG = ({ intl }: { intl: InjectedIntl }) => {
+      const { layout: outerLayout } = getJobParams(jobProviderOptions, 'printablePdfV2')();
+      let dimensions = outerLayout?.dimensions;
+      if (!dimensions) {
+        const el = document.querySelector('[data-shared-items-container]');
+        const { height, width } = el ? el.getBoundingClientRect() : { height: 768, width: 1024 };
+        dimensions = { height, width };
+      }
       const decoratedJobParams = apiClient.getDecoratedJobParams({
         ...getJobParams(jobProviderOptions, 'pngV2')(),
         layout: { id: 'preserve_layout', dimensions },
@@ -375,6 +438,9 @@ export const reportingExportModalProvider = ({
             ),
             'data-test-subj': 'queueReportSuccess',
           });
+          if (onClose) {
+            onClose();
+          }
         })
         .catch((error: any) => {
           toasts.addError(error, {
@@ -397,6 +463,7 @@ export const reportingExportModalProvider = ({
         ['data-test-subj']: 'imageExports',
       },
       label: 'PDF' as const,
+      generateReportForPrinting: generateReportPDFForPrinting,
       generateReport: generateReportPDF,
       reportType: 'printablePdfV2',
       requiresSavedState,
@@ -409,7 +476,6 @@ export const reportingExportModalProvider = ({
       generateReportButton: (
         <FormattedMessage
           id="reporting.printablePdfV2.generateButtonLabel"
-          data-test-subj="generateReportButton"
           defaultMessage="Generate export"
         />
       ),
@@ -430,6 +496,8 @@ export const reportingExportModalProvider = ({
         ['data-test-subj']: 'imageExports',
       },
       label: 'PNG' as const,
+      // avoids a bug where for printing toggled to on for PDF and then radio is selected for PNG
+      generateReportForPrinting: generateReportPNG,
       generateReport: generateReportPNG,
       reportType: 'pngV2',
       requiresSavedState,
@@ -443,7 +511,6 @@ export const reportingExportModalProvider = ({
         <FormattedMessage
           id="reporting.pngV2.generateButtonLabel"
           defaultMessage="Generate export"
-          data-test-subj="generateReportButton"
         />
       ),
       layoutOption: objectType === 'dashboard' ? ('print' as const) : undefined,