[Serverless Elasticsearch] Fix user is blocked from moving forward when opening Discover, Dashboard, or Visualize Library

config/serverless.es.yml

@@ -27,3 +27,6 @@ telemetry.labels.serverless: search
 
 # Alerts config
 xpack.actions.enabledActionTypes: ['.email', '.index', '.slack', '.jira', '.webhook', '.teams']
+
+# Customize empty page state for analytics apps
+no_data_page.analyticsNoDataPageFlavor: 'serverless_search'

package.json

@@ -535,6 +535,7 @@
     "@kbn/navigation-plugin": "link:src/plugins/navigation",
     "@kbn/newsfeed-plugin": "link:src/plugins/newsfeed",
     "@kbn/newsfeed-test-plugin": "link:test/common/plugins/newsfeed",
+    "@kbn/no-data-page-plugin": "link:src/plugins/no_data_page",
     "@kbn/notifications-plugin": "link:x-pack/plugins/notifications",
     "@kbn/object-versioning": "link:packages/kbn-object-versioning",
     "@kbn/observability-ai-assistant-plugin": "link:x-pack/plugins/observability_ai_assistant",

packages/shared-ux/card/no_data/impl/src/no_data_card.tsx

@@ -35,7 +35,9 @@ export const NoDataCard = ({ href: srcHref, category, description, ...props }: P
 
   return (
     <RedirectAppLinksContainer>
-      <Component {...{ ...props, href, canAccessFleet, description }} />
+      <Component
+        {...{ ...props, href, canAccessFleet: props.canAccessFleet || canAccessFleet, description }}
+      />
     </RedirectAppLinksContainer>
   );
 };

packages/shared-ux/card/no_data/types/index.d.ts

@@ -79,4 +79,4 @@ export type NoDataCardComponentProps = Partial<
 /**
  * Props for the `NoDataCard` sevice-connected component.
  */
-export type NoDataCardProps = Omit<NoDataCardComponentProps, 'canAccessFleet'>;
+export type NoDataCardProps = NoDataCardComponentProps;

packages/shared-ux/page/analytics_no_data/impl/src/analytics_no_data_page.component.tsx

@@ -8,6 +8,8 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { KibanaNoDataPage } from '@kbn/shared-ux-page-kibana-no-data';
+import { KibanaNoDataPageProps } from '@kbn/shared-ux-page-kibana-no-data-types';
+import { AnalyticsNoDataPageFlavor } from '@kbn/shared-ux-page-analytics-no-data-types';
 
 /**
  * Props for the pure component.
@@ -21,26 +23,63 @@ export interface Props {
   allowAdHocDataView?: boolean;
   /** if the kibana instance is customly branded */
   showPlainSpinner: boolean;
+  /** The flavor of the empty page to use. */
+  pageFlavor?: AnalyticsNoDataPageFlavor;
+  prependBasePath: (path: string) => string;
 }
 
-const solution = i18n.translate('sharedUXPackages.noDataConfig.analytics', {
-  defaultMessage: 'Analytics',
-});
-
-const pageTitle = i18n.translate('sharedUXPackages.noDataConfig.analyticsPageTitle', {
-  defaultMessage: 'Welcome to Analytics!',
-});
-
-const addIntegrationsTitle = i18n.translate('sharedUXPackages.noDataConfig.addIntegrationsTitle', {
-  defaultMessage: 'Add integrations',
-});
-
-const addIntegrationsDescription = i18n.translate(
-  'sharedUXPackages.noDataConfig.addIntegrationsDescription',
-  {
-    defaultMessage: 'Use Elastic Agent to collect data and build out Analytics solutions.',
-  }
-);
+const flavors: {
+  [K in AnalyticsNoDataPageFlavor]: (deps: {
+    kibanaGuideDocLink: string;
+    prependBasePath: (path: string) => string;
+  }) => KibanaNoDataPageProps['noDataConfig'];
+} = {
+  kibana: ({ kibanaGuideDocLink }) => ({
+    solution: i18n.translate('sharedUXPackages.noDataConfig.analytics', {
+      defaultMessage: 'Analytics',
+    }),
+    pageTitle: i18n.translate('sharedUXPackages.noDataConfig.analyticsPageTitle', {
+      defaultMessage: 'Welcome to Analytics!',
+    }),
+    logo: 'logoKibana',
+    action: {
+      elasticAgent: {
+        title: i18n.translate('sharedUXPackages.noDataConfig.addIntegrationsTitle', {
+          defaultMessage: 'Add integrations',
+        }),
+        description: i18n.translate('sharedUXPackages.noDataConfig.addIntegrationsDescription', {
+          defaultMessage: 'Use Elastic Agent to collect data and build out Analytics solutions.',
+        }),
+        'data-test-subj': 'kbnOverviewAddIntegrations',
+      },
+    },
+    docsLink: kibanaGuideDocLink,
+  }),
+  serverless_search: ({ prependBasePath }) => ({
+    solution: i18n.translate('sharedUXPackages.noDataConfig.analytics', {
+      defaultMessage: 'Elasticsearch',
+    }),
+    pageTitle: i18n.translate('sharedUXPackages.noDataConfig.analyticsPageTitle', {
+      defaultMessage: 'Welcome to Elasticsearch!',
+    }),
+    logo: 'logoElasticsearch',
+    action: {
+      elasticsearch: {
+        title: i18n.translate('sharedUXPackages.noDataConfig.elasticsearchTitle', {
+          defaultMessage: 'Get started',
+        }),
+        description: i18n.translate('sharedUXPackages.noDataConfig.elasticsearchDescription', {
+          defaultMessage:
+            'Set up your programming language client, ingest some data, and start searching.',
+        }),
+        'data-test-subj': 'kbnOverviewElasticsearchGettingStarted',
+        href: prependBasePath('/app/elasticsearch/'),
+        /** force the no data card to be shown **/
+        canAccessFleet: true,
+      },
+    },
+  }),
+};
 
 /**
  * A pure component of an entire page that can be displayed when Kibana "has no data", specifically for Analytics.
@@ -50,20 +89,13 @@ export const AnalyticsNoDataPage = ({
   onDataViewCreated,
   allowAdHocDataView,
   showPlainSpinner,
+  prependBasePath,
+  pageFlavor = 'kibana',
 }: Props) => {
-  const noDataConfig = {
-    solution,
-    pageTitle,
-    logo: 'logoKibana',
-    action: {
-      elasticAgent: {
-        title: addIntegrationsTitle,
-        description: addIntegrationsDescription,
-        'data-test-subj': 'kbnOverviewAddIntegrations',
-      },
-    },
-    docsLink: kibanaGuideDocLink,
-  };
+  const noDataConfig: KibanaNoDataPageProps['noDataConfig'] = flavors[pageFlavor]({
+    kibanaGuideDocLink,
+    prependBasePath,
+  });
 
   return (
     <KibanaNoDataPage

packages/shared-ux/page/analytics_no_data/impl/src/analytics_no_data_page.tsx

@@ -21,7 +21,7 @@ export const AnalyticsNoDataPage = ({
   allowAdHocDataView,
 }: AnalyticsNoDataPageProps) => {
   const services = useServices();
-  const { kibanaGuideDocLink, customBranding } = services;
+  const { kibanaGuideDocLink, customBranding, prependBasePath, pageFlavor } = services;
   const { hasCustomBranding$ } = customBranding;
   const showPlainSpinner = useObservable(hasCustomBranding$) ?? false;
 
@@ -32,6 +32,8 @@ export const AnalyticsNoDataPage = ({
         allowAdHocDataView,
         kibanaGuideDocLink,
         showPlainSpinner,
+        prependBasePath,
+        pageFlavor,
       }}
     />
   );

packages/shared-ux/page/analytics_no_data/impl/src/services.tsx

@@ -27,10 +27,10 @@ export const AnalyticsNoDataPageProvider: FC<AnalyticsNoDataPageServices> = ({
   children,
   ...services
 }) => {
-  const { kibanaGuideDocLink, customBranding } = services;
+  const { kibanaGuideDocLink, customBranding, prependBasePath, pageFlavor } = services;
 
   return (
-    <Context.Provider value={{ kibanaGuideDocLink, customBranding }}>
+    <Context.Provider value={{ kibanaGuideDocLink, customBranding, prependBasePath, pageFlavor }}>
       <KibanaNoDataPageProvider {...services}>{children}</KibanaNoDataPageProvider>
     </Context.Provider>
   );
@@ -48,6 +48,8 @@ export const AnalyticsNoDataPageKibanaProvider: FC<AnalyticsNoDataPageKibanaDepe
     customBranding: {
       hasCustomBranding$: dependencies.coreStart.customBranding.hasCustomBranding$,
     },
+    prependBasePath: dependencies.coreStart.http.basePath.prepend,
+    pageFlavor: dependencies.noDataPage.getAnalyticsNoDataPageFlavor(),
   };
   return (
     <Context.Provider {...{ value }}>

packages/shared-ux/page/analytics_no_data/impl/tsconfig.json

@@ -19,6 +19,7 @@
     "@kbn/shared-ux-page-analytics-no-data-types",
     "@kbn/test-jest-helpers",
     "@kbn/shared-ux-page-analytics-no-data-mocks",
+    "@kbn/shared-ux-page-kibana-no-data-types",
   ],
   "exclude": [
     "target/**/*",

packages/shared-ux/page/analytics_no_data/types/index.d.ts

@@ -17,13 +17,17 @@ import { Observable } from 'rxjs';
 export interface Services {
   kibanaGuideDocLink: string;
   customBranding: { hasCustomBranding$: Observable<boolean> };
+  prependBasePath: (path: string) => string;
+  pageFlavor: AnalyticsNoDataPageFlavor;
 }
 
 /**
  * Services that are consumed by this component and any dependencies.
  */
 export type AnalyticsNoDataPageServices = Services & KibanaNoDataPageServices;
 
+export type AnalyticsNoDataPageFlavor = 'kibana' | 'serverless_search';
+
 export interface KibanaDependencies {
   coreStart: {
     docLinks: {
@@ -36,6 +40,14 @@ export interface KibanaDependencies {
     customBranding: {
       hasCustomBranding$: Observable<boolean>;
     };
+    http: {
+      basePath: {
+        prepend: (path: string) => string;
+      };
+    };
+  };
+  noDataPage: {
+    getAnalyticsNoDataPageFlavor: () => AnalyticsNoDataPageFlavor;
   };
 }
 

packages/shared-ux/page/no_data/impl/src/no_data_page.tsx

@@ -33,13 +33,13 @@ export const NoDataPage = ({
       values: { solution },
     });
 
-  const link = (
+  const link = docsLink ? (
     <EuiLink href={docsLink} target="_blank">
       <FormattedMessage id="sharedUXPackages.noDataPage.intro.link" defaultMessage="learn more" />
     </EuiLink>
-  );
+  ) : null;
 
-  const message = (
+  const message = link ? (
     <FormattedMessage
       id="sharedUXPackages.noDataPage.intro"
       defaultMessage="Add your data to get started, or {link} about {solution}."
@@ -48,6 +48,11 @@ export const NoDataPage = ({
         link,
       }}
     />
+  ) : (
+    <FormattedMessage
+      id="sharedUXPackages.noDataPage.introNoDocLink"
+      defaultMessage="Add your data to get started."
+    />
   );
 
   return (

packages/shared-ux/page/no_data/types/index.d.ts

@@ -33,7 +33,7 @@ export interface NoDataPageProps extends CommonProps, ActionCardProps {
   /**
    * Required to set the docs link for the whole solution
    */
-  docsLink: string;
+  docsLink?: string;
   /**
    * Optionally replace the auto-generated logo
    */

src/plugins/discover/kibana.jsonc

@@ -27,6 +27,7 @@
       "unifiedSearch",
       "unifiedHistogram",
       "contentManagement",
+      "noDataPage"
     ],
     "optionalPlugins": [
       "home",

src/plugins/discover/public/application/main/discover_main_route.tsx

@@ -261,6 +261,7 @@ export function DiscoverMainRoute({
         },
       },
       dataViewEditor,
+      noDataPage: services.noDataPage,
     };
 
     return (

src/plugins/discover/public/build_services.ts

@@ -53,6 +53,7 @@ import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import type { SettingsStart } from '@kbn/core-ui-settings-browser';
 import type { ContentClient } from '@kbn/content-management-plugin/public';
 import type { ServerlessPluginStart } from '@kbn/serverless/public';
+import type { NoDataPagePluginStart } from '@kbn/no-data-page-plugin/public';
 import { getHistory } from './kibana_services';
 import { DiscoverStartPlugins } from './plugin';
 import { DiscoverContextAppLocator } from './application/context/services/locator';
@@ -111,6 +112,7 @@ export interface DiscoverServices {
   uiActions: UiActionsStart;
   contentClient: ContentClient;
   serverless?: ServerlessPluginStart;
+  noDataPage: NoDataPagePluginStart;
 }
 
 export const buildServices = memoize(function (
@@ -171,5 +173,6 @@ export const buildServices = memoize(function (
     uiActions: plugins.uiActions,
     contentClient: plugins.contentManagement.client,
     serverless: plugins.serverless,
+    noDataPage: plugins.noDataPage,
   };
 });

src/plugins/discover/public/plugin.tsx

@@ -46,6 +46,7 @@ import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import type { LensPublicStart } from '@kbn/lens-plugin/public';
 import type { ServerlessPluginStart } from '@kbn/serverless/public';
 import { DOC_TABLE_LEGACY, TRUNCATE_MAX_HEIGHT } from '@kbn/discover-utils';
+import { NoDataPagePluginStart } from '@kbn/no-data-page-plugin/public';
 import { PLUGIN_ID } from '../common';
 import { DocViewInput, DocViewInputFn } from './services/doc_views/doc_views_types';
 import { DocViewsRegistry } from './services/doc_views/doc_views_registry';
@@ -213,6 +214,7 @@ export interface DiscoverStartPlugins {
   lens: LensPublicStart;
   contentManagement: ContentManagementPublicStart;
   serverless?: ServerlessPluginStart;
+  noDataPage: NoDataPagePluginStart;
 }
 
 /**

src/plugins/discover/tsconfig.json

@@ -70,7 +70,8 @@
     "@kbn/content-management-plugin",
     "@kbn/serverless",
     "@kbn/react-kibana-mount",
-    "@kbn/react-kibana-context-render"
+    "@kbn/react-kibana-context-render",
+    "@kbn/no-data-page-plugin"
   ],
   "exclude": [
     "target/**/*"

src/plugins/no_data_page/README.md

@@ -0,0 +1,3 @@
+# No Data Page
+
+Helps to globally configure the no data page components

src/plugins/no_data_page/config.ts

@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { schema, TypeOf, offeringBasedSchema } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+  analyticsNoDataPageFlavor: offeringBasedSchema({
+    serverless: schema.oneOf(
+      [schema.oneOf([schema.literal('kibana'), schema.literal('serverless_search')])],
+      { defaultValue: 'kibana' as const }
+    ),
+  }),
+});
+export type NoDataPageConfig = TypeOf<typeof configSchema>;

src/plugins/no_data_page/jest.config.js

@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../..',
+  roots: ['<rootDir>/src/plugins/no_data'],
+  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/src/plugins/no_data',
+  coverageReporters: ['text', 'html'],
+  collectCoverageFrom: ['<rootDir>/src/plugins/no_data/{common,public,server}/**/*.{ts,tsx}'],
+};

src/plugins/no_data_page/kibana.jsonc

@@ -0,0 +1,10 @@
+{
+  "type": "plugin",
+  "id": "@kbn/no-data-page-plugin",
+  "owner": "@elastic/appex-sharedux",
+  "plugin": {
+    "id": "noDataPage",
+    "server": true,
+    "browser": true
+  }
+}