elastic
diff --git a/‎src/platform/packages/private/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.tsx
Lines changed: 4 additions & 1 deletion b/‎src/platform/packages/private/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.tsx
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/platform/packages/private/kbn-reporting/public/share/share_context_menu/register_csv_modal_reporting.tsx
Lines changed: 3 additions & 1 deletion b/‎src/platform/packages/private/kbn-reporting/public/share/share_context_menu/register_csv_modal_reporting.tsx
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/platform/packages/private/kbn-reporting/public/share/share_context_menu/register_pdf_png_modal_reporting.tsx
Lines changed: 16 additions & 20 deletions b/‎src/platform/packages/private/kbn-reporting/public/share/share_context_menu/register_pdf_png_modal_reporting.tsx
Lines changed: 16 additions & 20 deletions
diff --git a/‎src/platform/test/functional/page_objects/export_page.ts
Lines changed: 4 additions & 0 deletions b/‎src/platform/test/functional/page_objects/export_page.ts
Lines changed: 4 additions & 0 deletions
diff --git a/‎x-pack/platform/packages/private/security/authorization_core/src/privileges/privileges.ts
Lines changed: 2 additions & 0 deletions b/‎x-pack/platform/packages/private/security/authorization_core/src/privileges/privileges.ts
Lines changed: 2 additions & 0 deletions
diff --git a/‎x-pack/platform/plugins/private/canvas/public/services/kibana_services.ts
Lines changed: 5 additions & 1 deletion b/‎x-pack/platform/plugins/private/canvas/public/services/kibana_services.ts
Lines changed: 5 additions & 1 deletion
diff --git a/‎x-pack/platform/plugins/private/reporting/server/features.ts
Lines changed: 42 additions & 3 deletions b/‎x-pack/platform/plugins/private/reporting/server/features.ts
Lines changed: 42 additions & 3 deletions
diff --git a/‎x-pack/platform/plugins/private/reporting/server/plugin.test.ts
Lines changed: 2 additions & 2 deletions b/‎x-pack/platform/plugins/private/reporting/server/plugin.test.ts
Lines changed: 2 additions & 2 deletions
diff --git a/‎x-pack/platform/plugins/shared/features/common/kibana_feature.ts
Lines changed: 2 additions & 0 deletions b/‎x-pack/platform/plugins/shared/features/common/kibana_feature.ts
Lines changed: 2 additions & 0 deletions
diff --git a/‎x-pack/platform/plugins/shared/features/server/feature_registry.test.ts
Lines changed: 108 additions & 0 deletions b/‎x-pack/platform/plugins/shared/features/server/feature_registry.test.ts
Lines changed: 108 additions & 0 deletions
@@ -148,8 +148,11 @@ export class ReportingCsvPanelAction implements ActionDefinition<EmbeddableApiCo
     const license = await firstValueFrom(licensing.license$);
     const licenseHasCsvReporting = checkLicense(license.check('reporting', 'basic')).showLinks;
 
+    const capabilities = application.capabilities;
     // NOTE: For historical reasons capability identifier is called `downloadCsv. It can not be renamed.
-    const capabilityHasCsvReporting = application.capabilities.dashboard_v2?.downloadCsv === true;
+    const capabilityHasCsvReporting =
+      capabilities.dashboard_v2?.downloadCsv === true ||
+      capabilities.reportingLegacy?.generateReport === true;
     if (!licenseHasCsvReporting || !capabilityHasCsvReporting) {
       return false;
     }
 
@@ -183,7 +183,9 @@ export const reportingCsvExportProvider = ({
 
       const licenseHasCsvReporting = licenseCheck.showLinks;
 
-      const capabilityHasCsvReporting = capabilities.discover_v2?.generateCsv === true;
+      const capabilityHasCsvReporting =
+        capabilities.discover_v2?.generateCsv === true ||
+        capabilities.reportingLegacy?.generateReport === true;
 
       if (!(licenseHasCsvReporting && capabilityHasCsvReporting)) {
         return false;
 
@@ -9,6 +9,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { Capabilities } from '@kbn/core/public';
 import { toMountPoint } from '@kbn/react-kibana-mount';
 import { ShareContext } from '@kbn/share-plugin/public';
 import React from 'react';
@@ -79,6 +80,13 @@ const getJobParams = (opts: JobParamsProviderOptions, type: 'pngV2' | 'printable
   };
 };
 
+const hasCapabilityByKey = (capabilities: Capabilities, capabilityKey: keyof Capabilities) => {
+  return (
+    capabilities[capabilityKey]?.generateScreenshot === true ||
+    capabilities.reportingLegacy?.generateReport === true
+  );
+};
+
 export const reportingPDFExportProvider = ({
   apiClient,
   startServices$,
@@ -217,24 +225,18 @@ export const reportingPDFExportProvider = ({
         license.check('reporting', 'gold')
       );
 
-      const capabilityHasDashboardScreenshotReporting =
-        capabilities.dashboard_v2?.generateScreenshot === true;
-      const capabilityHasVisualizeScreenshotReporting =
-        capabilities.visualize_v2?.generateScreenshot === true;
+      const capabilityHasDashboardReporting = hasCapabilityByKey(capabilities, 'dashboard_v2');
+      const capabilityHasVisualizeReporting = hasCapabilityByKey(capabilities, 'visualize_v2');
 
       if (!licenseHasScreenshotReporting) {
         return false;
       }
 
-      if (objectType === 'dashboard' && !capabilityHasDashboardScreenshotReporting) {
+      if (objectType === 'dashboard' && !capabilityHasDashboardReporting) {
         return false;
       }
 
-      if (
-        isSupportedType &&
-        !capabilityHasVisualizeScreenshotReporting &&
-        !capabilityHasDashboardScreenshotReporting
-      ) {
+      if (isSupportedType && !capabilityHasVisualizeReporting && !capabilityHasDashboardReporting) {
         return false;
       }
 
@@ -380,24 +382,18 @@ export const reportingPNGExportProvider = ({
       const { showLinks } = checkLicense(license.check('reporting', 'gold'));
       const licenseHasScreenshotReporting = showLinks;
 
-      const capabilityHasDashboardScreenshotReporting =
-        capabilities.dashboard_v2?.generateScreenshot === true;
-      const capabilityHasVisualizeScreenshotReporting =
-        capabilities.visualize_v2?.generateScreenshot === true;
+      const capabilityHasDashboardReporting = hasCapabilityByKey(capabilities, 'dashboard_v2');
+      const capabilityHasVisualizeReporting = hasCapabilityByKey(capabilities, 'visualize_v2');
 
       if (!licenseHasScreenshotReporting) {
         return false;
       }
 
-      if (objectType === 'dashboard' && !capabilityHasDashboardScreenshotReporting) {
+      if (objectType === 'dashboard' && !capabilityHasDashboardReporting) {
         return false;
       }
 
-      if (
-        isSupportedType &&
-        !capabilityHasVisualizeScreenshotReporting &&
-        !capabilityHasDashboardScreenshotReporting
-      ) {
+      if (isSupportedType && !capabilityHasVisualizeReporting && !capabilityHasDashboardReporting) {
         return false;
       }
 
 
@@ -19,6 +19,10 @@ export class ExportPageObject extends FtrService {
     return await this.testSubjects.exists('exportTopNavButton');
   }
 
+  async exportButtonMissingOrFail() {
+    await this.testSubjects.missingOrFail('exportTopNavButton', { timeout: 1000 });
+  }
+
   async clickExportTopNavButton() {
     return this.testSubjects.click('exportTopNavButton');
   }
 
@@ -245,6 +245,8 @@ export function privilegesFactory(
           read: [actions.login, ...readActions],
         },
         reserved: features.reduce((acc: Record<string, string[]>, feature: KibanaFeature) => {
+          // Reserved privileges are intentionally not excluded from registration based on their `hidden` attribute.
+          // This is explicitly to support the legacy reporting use case.
           if (feature.reserved) {
             feature.reserved.privileges.forEach((reservedPrivilege) => {
               acc[reservedPrivilege.id] = [
 
@@ -43,13 +43,17 @@ export const setKibanaServices = (
   kibanaVersion = initContext.env.packageInfo.version;
 
   coreServices = kibanaCore;
+  const capabilities = kibanaCore.application.capabilities;
   contentManagementService = deps.contentManagement;
   dataService = deps.data;
   dataViewsService = deps.dataViews;
   embeddableService = deps.embeddable;
   expressionsService = deps.expressions;
   presentationUtilService = deps.presentationUtil;
-  reportingService = Boolean(kibanaCore.application.capabilities.canvas?.generatePdf)
+  reportingService = Boolean(
+    capabilities.canvas?.generatePdf === true ||
+      capabilities.reportingLegacy?.generateReport === true
+  )
     ? deps.reporting
     : undefined;
   spacesService = deps.spaces;
 
@@ -21,9 +21,10 @@ interface FeatureRegistrationOpts {
 }
 
 export function registerFeatures({ isServerless, features }: FeatureRegistrationOpts) {
-  // Register a 'shell' feature specifically for Serverless. If granted, it will automatically provide access to
-  // reporting capabilities in other features, such as Discover, Dashboards, and Visualizations. On its own, this
-  // feature doesn't grant any additional privileges.
+  // Register a 'shell' features for Reporting. On their own, they don't grant specific privileges.
+
+  // Shell feature for Serverless. If granted, it will automatically provide access to
+  // reporting capabilities in other features, such as Discover, Dashboards, and Visualizations.
   if (isServerless) {
     features.registerKibanaFeature({
       id: 'reporting',
@@ -39,6 +40,44 @@ export function registerFeatures({ isServerless, features }: FeatureRegistration
         read: { disabled: true, savedObject: { all: [], read: [] }, ui: [] },
       },
     });
+  } else {
+    // Shell feature for self-managed environments, to be leveraged by a reserved privilege defined
+    // in ES. This grants access to reporting features in a legacy fashion.
+    features.registerKibanaFeature({
+      id: 'reportingLegacy',
+      name: i18n.translate('xpack.reporting.features.reportingLegacyFeatureName', {
+        defaultMessage: 'Reporting Legacy',
+      }),
+      category: DEFAULT_APP_CATEGORIES.management,
+      management: { insightsAndAlerting: ['reporting'] },
+      scope: [KibanaFeatureScope.Spaces, KibanaFeatureScope.Security],
+      hidden: true,
+      app: [],
+      privileges: null,
+      reserved: {
+        description: i18n.translate(
+          'xpack.reporting.features.reportingLegacyFeatureReservedDescription',
+          {
+            defaultMessage:
+              'Reserved for use by the Reporting plugin. This feature is used to grant access to Reporting capabilities in a legacy manner.',
+          }
+        ),
+        privileges: [
+          {
+            id: 'reporting_user',
+            privilege: {
+              excludeFromBasePrivileges: true,
+              app: [],
+              catalogue: [],
+              management: { insightsAndAlerting: ['reporting'] },
+              savedObject: { all: [], read: [] },
+              api: ['generateReport'],
+              ui: ['generateReport'],
+            },
+          },
+        ],
+      },
+    });
   }
 
   features.enableReportingUiCapabilities();
 
@@ -185,7 +185,7 @@ describe('Reporting Plugin', () => {
   describe('features registration', () => {
     it('registers Kibana manage scheduled reporting feature in traditional build flavour', async () => {
       plugin.setup(coreSetup, pluginSetup);
-      expect(featuresSetup.registerKibanaFeature).toHaveBeenCalledTimes(1);
+      expect(featuresSetup.registerKibanaFeature).toHaveBeenCalledTimes(2); // manage scheduled reports + shell feature for self-managed
       expect(featuresSetup.registerKibanaFeature).toHaveBeenCalledWith({
         id: 'manageReporting',
         name: 'Manage Scheduled Reports',
@@ -212,7 +212,7 @@ describe('Reporting Plugin', () => {
       plugin = new ReportingPlugin(serverlessInitContext);
 
       plugin.setup(coreSetup, pluginSetup);
-      expect(featuresSetup.registerKibanaFeature).toHaveBeenCalledTimes(2);
+      expect(featuresSetup.registerKibanaFeature).toHaveBeenCalledTimes(2); // manage scheduled reports + shell feature for serverless
       expect(featuresSetup.registerKibanaFeature).toHaveBeenNthCalledWith(1, {
         id: 'reporting',
         name: 'Reporting',
 
@@ -159,6 +159,8 @@ export interface KibanaFeatureConfig {
    * Indicates whether the feature is available as a standalone feature. The feature can still be
    * referenced by other features, but it will not be displayed in any feature management UIs. By default, all features
    * are visible.
+   *
+   * @note This flag is designed for use via configuration overrides, and very select use cases. Please consult prior to use.
    */
   hidden?: boolean;
 
 
@@ -2030,6 +2030,114 @@ describe('FeatureRegistry', () => {
       );
     });
 
+    it('allows reserved features to be hidden', () => {
+      const feature: KibanaFeatureConfig = {
+        id: 'test-feature',
+        name: 'Test Feature',
+        app: [],
+        category: { id: 'foo', label: 'foo' },
+        privileges: null,
+        hidden: true,
+        reserved: {
+          description: 'my reserved privileges',
+          privileges: [
+            {
+              id: 'a_reserved_1',
+              privilege: {
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: [],
+                app: [],
+              },
+            },
+          ],
+        },
+      };
+
+      const featureRegistry = new FeatureRegistry();
+      expect(() => featureRegistry.registerKibanaFeature(feature)).not.toThrowError();
+    });
+
+    it('does not allow features with both regular and reserved privileges to be hidden', () => {
+      const feature: KibanaFeatureConfig = {
+        id: 'test-feature',
+        name: 'Test Feature',
+        app: [],
+        category: { id: 'foo', label: 'foo' },
+        privileges: {
+          all: {
+            savedObject: {
+              all: [],
+              read: [],
+            },
+            ui: [],
+          },
+          read: {
+            savedObject: {
+              all: [],
+              read: [],
+            },
+            ui: [],
+          },
+        },
+        hidden: true,
+        reserved: {
+          description: 'my reserved privileges',
+          privileges: [
+            {
+              id: 'a_reserved_1',
+              privilege: {
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: [],
+                app: [],
+              },
+            },
+          ],
+        },
+      };
+
+      const featureRegistry = new FeatureRegistry();
+      expect(() =>
+        featureRegistry.registerKibanaFeature(feature)
+      ).toThrowErrorMatchingInlineSnapshot(`"Feature test-feature cannot be hidden."`);
+    });
+
+    it('does not allow features with regular privileges to be hidden', () => {
+      const feature: KibanaFeatureConfig = {
+        id: 'test-feature',
+        name: 'Test Feature',
+        app: [],
+        category: { id: 'foo', label: 'foo' },
+        privileges: {
+          all: {
+            savedObject: {
+              all: [],
+              read: [],
+            },
+            ui: [],
+          },
+          read: {
+            savedObject: {
+              all: [],
+              read: [],
+            },
+            ui: [],
+          },
+        },
+        hidden: true,
+      };
+
+      const featureRegistry = new FeatureRegistry();
+      expect(() =>
+        featureRegistry.registerKibanaFeature(feature)
+      ).toThrowErrorMatchingInlineSnapshot(`"Feature test-feature cannot be hidden."`);
+    });
+
     it('allows independent sub-feature privileges to register a minimumLicense', () => {
       const feature1: KibanaFeatureConfig = {
         id: 'test-feature',
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ export class ExportPageObject extends FtrService {`
`19`	`19`	`return await this.testSubjects.exists('exportTopNavButton');`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ async exportButtonMissingOrFail() {`
	`23`	`+ await this.testSubjects.missingOrFail('exportTopNavButton', { timeout: 1000 });`
	`24`	`+ }`
	`25`	`+`
`22`	`26`	`async clickExportTopNavButton() {`
`23`	`27`	`return this.testSubjects.click('exportTopNavButton');`
`24`	`28`	`}`