Separate export menu from share

src/platform/packages/private/kbn-reporting/public/share/share_context_menu/index.ts

@@ -31,8 +31,6 @@ export type StartServices = [
 
 export interface ExportModalShareOpts {
   apiClient: ReportingAPIClient;
-  license: ILicense;
-  application: ApplicationStart;
   startServices$: Rx.Observable<StartServices>;
 }
 

src/platform/packages/private/kbn-reporting/public/share/share_context_menu/register_csv_modal_reporting.tsx

@@ -21,26 +21,13 @@ import { checkLicense } from '../..';
 
 export const reportingCsvExportProvider = ({
   apiClient,
-  application,
-  license,
   startServices$,
 }: ExportModalShareOpts): ExportShare => {
   const getShareMenuItems = ({
     objectType,
     sharingData,
     toasts,
   }: ShareContext): ReturnType<ExportShare['config']> => {
-    const licenseCheck = checkLicense(license.check('reporting', 'basic'));
-    const licenseToolTipContent = licenseCheck.message;
-    const licenseHasCsvReporting = licenseCheck.showLinks;
-    const licenseDisabled = !licenseCheck.enableLinks;
-
-    const capabilityHasCsvReporting = application.capabilities.discover_v2?.generateCsv === true;
-
-    if (!(licenseHasCsvReporting && capabilityHasCsvReporting)) {
-      return null;
-    }
-
     const getSearchSource = sharingData.getSearchSource as ({
       addGlobalTimeFilter,
       absoluteTime,
@@ -138,34 +125,58 @@ export const reportingCsvExportProvider = ({
 
     return {
       name: panelTitle,
-      toolTipContent: licenseToolTipContent,
       exportType: reportType,
       label: 'CSV',
-      disabled: licenseDisabled,
       generateAssetExport: generateReportingJobCSV,
-      generateAssetURIValue: () => absoluteUrl,
       helpText: (
         <FormattedMessage
           id="reporting.share.csv.reporting.helpTextCSV"
           defaultMessage="Export a CSV of this {objectType}."
           values={{ objectType }}
         />
       ),
-      generateExportButton: (
+      generateExportButtonLabel: (
         <FormattedMessage
           id="reporting.share.generateButtonLabelCSV"
           data-test-subj="generateReportButton"
           defaultMessage="Generate CSV"
         />
       ),
-      renderCopyURIButton: true,
+      copyAssetURIConfig: {
+        headingText: i18n.translate('reporting.export.csv.exportFlyout.csvExportCopyUriHeading', {
+          defaultMessage: 'Post URL',
+        }),
+        helpText: i18n.translate('reporting.export.csv.exportFlyout.csvExportCopyUriHelpText', {
+          defaultMessage:
+            'Allows to generate selected file format programmatically outside Kibana or in Watcher.',
+        }),
+        contentType: 'text',
+        generateAssetURIValue: () => absoluteUrl,
+      },
     };
   };
 
   return {
     shareType: 'integration',
-    id: 'csvReportsModal',
+    id: 'csvReports',
     groupId: 'export',
     config: getShareMenuItems,
+    prerequisiteCheck: ({ license, capabilities }) => {
+      if (!license) {
+        return false;
+      }
+
+      const licenseCheck = checkLicense(license.check('reporting', 'basic'));
+
+      const licenseHasCsvReporting = licenseCheck.showLinks;
+
+      const capabilityHasCsvReporting = capabilities.discover_v2?.generateCsv === true;
+
+      if (!(licenseHasCsvReporting && capabilityHasCsvReporting)) {
+        return false;
+      }
+
+      return true;
+    },
   };
 };

src/platform/packages/private/kbn-reporting/public/share/share_context_menu/register_pdf_png_modal_reporting.tsx

@@ -41,10 +41,10 @@ const getJobParams = (opts: JobParamsProviderOptions, type: 'pngV2' | 'printable
 
 export const reportingPDFExportProvider = ({
   apiClient,
-  license,
-  application,
   startServices$,
 }: ExportModalShareOpts): ExportShare => {
+  const supportedObjectTypes = ['dashboard', 'visualization', 'lens'];
+
   const getShareMenuItems = ({
     objectType,
     objectId,
@@ -55,39 +55,6 @@ export const reportingPDFExportProvider = ({
     toasts,
     ...shareOpts
   }: ShareContext): ReturnType<ExportShare['config']> => {
-    const { enableLinks, showLinks, message } = checkLicense(license.check('reporting', 'gold'));
-    const licenseToolTipContent = message;
-    const licenseHasScreenshotReporting = showLinks;
-    const licenseDisabled = !enableLinks;
-
-    const capabilityHasDashboardScreenshotReporting =
-      application.capabilities.dashboard_v2?.generateScreenshot === true;
-    const capabilityHasVisualizeScreenshotReporting =
-      application.capabilities.visualize_v2?.generateScreenshot === true;
-
-    if (!licenseHasScreenshotReporting) {
-      return null;
-    }
-
-    // for lens png pdf and csv are combined into one modal
-    const isSupportedType = ['dashboard', 'visualization', 'lens'].includes(objectType);
-
-    if (!isSupportedType) {
-      return null;
-    }
-
-    if (objectType === 'dashboard' && !capabilityHasDashboardScreenshotReporting) {
-      return null;
-    }
-
-    if (
-      isSupportedType &&
-      !capabilityHasVisualizeScreenshotReporting &&
-      !capabilityHasDashboardScreenshotReporting
-    ) {
-      return null;
-    }
-
     const { sharingData } = shareOpts as unknown as { sharingData: ReportingSharingData };
 
     const jobProviderOptions: JobParamsProviderOptions = {
@@ -159,15 +126,30 @@ export const reportingPDFExportProvider = ({
       name: i18n.translate('reporting.shareContextMenu.ExportsButtonLabel', {
         defaultMessage: 'PDF',
       }),
-      toolTipContent: licenseToolTipContent,
-      disabled: licenseDisabled || sharingData.reportingDisabled,
+      icon: 'document',
+      disabled: sharingData.reportingDisabled,
       label: 'PDF' as const,
       generateAssetExport: generateReportPDF,
-      generateAssetURIValue: generateExportUrlPDF,
       exportType: 'printablePdfV2',
       requiresSavedState,
       renderLayoutOptionSwitch: objectType === 'dashboard',
-      renderCopyURIButton: true,
+      copyAssetURIConfig: {
+        headingText: i18n.translate(
+          'reporting.shareContextMenu.copyUriModal.pdfExportCopyUriHeading',
+          {
+            defaultMessage: 'Post URL',
+          }
+        ),
+        helpText: i18n.translate(
+          'reporting.shareContextMenu.copyUriModal.pdfExportCopyUriHelpText',
+          {
+            defaultMessage:
+              'Allows to generate selected file format programmatically outside Kibana or in Watcher.',
+          }
+        ),
+        contentType: 'text',
+        generateAssetURIValue: generateExportUrlPDF,
+      },
     };
   };
 
@@ -176,15 +158,53 @@ export const reportingPDFExportProvider = ({
     shareType: 'integration',
     groupId: 'export',
     config: getShareMenuItems,
+    prerequisiteCheck({ license, capabilities, objectType }) {
+      if (!license) {
+        return false;
+      }
+
+      let isSupportedType: boolean;
+
+      if (!(isSupportedType = supportedObjectTypes.includes(objectType))) {
+        return false;
+      }
+
+      const { showLinks: licenseHasScreenshotReporting } = checkLicense(
+        license.check('reporting', 'gold')
+      );
+
+      const capabilityHasDashboardScreenshotReporting =
+        capabilities.dashboard_v2?.generateScreenshot === true;
+      const capabilityHasVisualizeScreenshotReporting =
+        capabilities.visualize_v2?.generateScreenshot === true;
+
+      if (!licenseHasScreenshotReporting) {
+        return false;
+      }
+
+      if (objectType === 'dashboard' && !capabilityHasDashboardScreenshotReporting) {
+        return false;
+      }
+
+      if (
+        isSupportedType &&
+        !capabilityHasVisualizeScreenshotReporting &&
+        !capabilityHasDashboardScreenshotReporting
+      ) {
+        return false;
+      }
+
+      return true;
+    },
   };
 };
 
 export const reportingPNGExportProvider = ({
   apiClient,
-  license,
-  application,
   startServices$,
 }: ExportModalShareOpts): ExportShare => {
+  const supportedObjectTypes = ['dashboard', 'visualization', 'lens'];
+
   const getShareMenuItems = ({
     objectType,
     objectId,
@@ -194,39 +214,7 @@ export const reportingPNGExportProvider = ({
     shareableUrlForSavedObject,
     toasts,
     ...shareOpts
-  }: ShareContext): ReturnType<ExportShare['config']> | null => {
-    const { enableLinks, showLinks, message } = checkLicense(license.check('reporting', 'gold'));
-    const licenseToolTipContent = message;
-    const licenseHasScreenshotReporting = showLinks;
-    const licenseDisabled = !enableLinks;
-
-    const capabilityHasDashboardScreenshotReporting =
-      application.capabilities.dashboard_v2?.generateScreenshot === true;
-    const capabilityHasVisualizeScreenshotReporting =
-      application.capabilities.visualize_v2?.generateScreenshot === true;
-
-    if (!licenseHasScreenshotReporting) {
-      return null;
-    }
-    // for lens png pdf and csv are combined into one modal
-    const isSupportedType = ['dashboard', 'visualization', 'lens'].includes(objectType);
-
-    if (!isSupportedType) {
-      return null;
-    }
-
-    if (objectType === 'dashboard' && !capabilityHasDashboardScreenshotReporting) {
-      return null;
-    }
-
-    if (
-      isSupportedType &&
-      !capabilityHasVisualizeScreenshotReporting &&
-      !capabilityHasDashboardScreenshotReporting
-    ) {
-      return null;
-    }
-
+  }: ShareContext): ReturnType<ExportShare['config']> => {
     const { sharingData } = shareOpts as unknown as { sharingData: ReportingSharingData };
 
     const jobProviderOptions: JobParamsProviderOptions = {
@@ -297,14 +285,29 @@ export const reportingPNGExportProvider = ({
       name: i18n.translate('reporting.shareContextMenu.ExportsButtonLabelPNG', {
         defaultMessage: 'PNG export',
       }),
-      toolTipContent: licenseToolTipContent,
-      disabled: licenseDisabled || sharingData.reportingDisabled,
+      icon: 'image',
+      disabled: sharingData.reportingDisabled,
       label: 'PNG' as const,
       generateAssetExport: generateReportPNG,
-      generateAssetURIValue: generateExportUrlPNG,
       exportType: 'pngV2',
       requiresSavedState,
-      renderCopyURIButton: true,
+      copyAssetURIConfig: {
+        headingText: i18n.translate(
+          'reporting.shareContextMenu.copyUriModal.pngExportCopyUriHeading',
+          {
+            defaultMessage: 'Post URL',
+          }
+        ),
+        helpText: i18n.translate(
+          'reporting.shareContextMenu.copyUriModal.pngExportCopyUriHelpText',
+          {
+            defaultMessage:
+              'Allows to generate selected file format programmatically outside Kibana or in Watcher.',
+          }
+        ),
+        contentType: 'text',
+        generateAssetURIValue: generateExportUrlPNG,
+      },
     };
   };
 
@@ -313,5 +316,42 @@ export const reportingPNGExportProvider = ({
     groupId: 'export',
     id: 'imageReports',
     config: getShareMenuItems,
+    prerequisiteCheck({ license, capabilities, objectType }) {
+      if (!license) {
+        return false;
+      }
+
+      let isSupportedType: boolean;
+
+      if (!(isSupportedType = supportedObjectTypes.includes(objectType))) {
+        return false;
+      }
+
+      const { showLinks } = checkLicense(license.check('reporting', 'gold'));
+      const licenseHasScreenshotReporting = showLinks;
+
+      const capabilityHasDashboardScreenshotReporting =
+        capabilities.dashboard_v2?.generateScreenshot === true;
+      const capabilityHasVisualizeScreenshotReporting =
+        capabilities.visualize_v2?.generateScreenshot === true;
+
+      if (!licenseHasScreenshotReporting) {
+        return false;
+      }
+
+      if (objectType === 'dashboard' && !capabilityHasDashboardScreenshotReporting) {
+        return false;
+      }
+
+      if (
+        isSupportedType &&
+        !capabilityHasVisualizeScreenshotReporting &&
+        !capabilityHasDashboardScreenshotReporting
+      ) {
+        return false;
+      }
+
+      return true;
+    },
   };
 };

src/platform/packages/shared/kbn-discover-utils/src/components/app_menu/types.ts

@@ -38,6 +38,7 @@ export enum AppMenuActionId {
   new = 'new',
   open = 'open',
   share = 'share',
+  export = 'export',
   alerts = 'alerts',
   inspect = 'inspect',
   createRule = 'createRule',

src/platform/plugins/shared/dashboard/public/dashboard_app/_dashboard_app_strings.ts

@@ -214,6 +214,14 @@ export const topNavStrings = {
       defaultMessage: 'Switch to view-only mode',
     }),
   },
+  export: {
+    label: i18n.translate('dashboard.topNave.exportButtonAriaLabel', {
+      defaultMessage: 'Export',
+    }),
+    description: i18n.translate('dashboard.topNave.exportConfigDescription', {
+      defaultMessage: 'Export dashboard',
+    }),
+  },
   share: {
     label: i18n.translate('dashboard.topNave.shareButtonAriaLabel', {
       defaultMessage: 'share',