Add necessary serverless and chrome extensions

elastic · May 1, 2023 · dd1463a · dd1463a
1 parent fb4e6ea
commit dd1463a
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 19 deletions.
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
@@ -121,6 +121,7 @@ export class ChromeService {
     const helpSupportUrl$ = new BehaviorSubject<string>(KIBANA_ASK_ELASTIC_LINK);
     const isNavDrawerLocked$ = new BehaviorSubject(localStorage.getItem(IS_LOCKED_KEY) === 'true');
     const chromeStyle$ = new BehaviorSubject<ChromeStyle>('classic');
+    const projectNavigation$ = new BehaviorSubject<JSX.Element | undefined>(undefined);
 
     const getKbnVersionClass = () => {
       // we assume that the version is valid and has the form 'X.X.X'
@@ -170,6 +171,10 @@ export class ChromeService {
       chromeStyle$.next(style);
     };
 
+    const setProjectNavigation = (navigation: JSX.Element) => {
+      projectNavigation$.next(navigation);
+    };
+
     const isIE = () => {
       const ua = window.navigator.userAgent;
       const msie = ua.indexOf('MSIE '); // IE 10 or older
@@ -211,14 +216,21 @@ export class ChromeService {
     }
 
     const getHeaderComponent = () => {
-      const Component = ({ style$ }: { style$: typeof chromeStyle$ }) => {
+      const Component = ({
+        style$,
+        navigation$,
+      }: {
+        style$: typeof chromeStyle$;
+        navigation$: typeof projectNavigation$;
+      }) => {
         if (style$.getValue() === 'project') {
           return (
             <ProjectHeader
               {...{
                 application,
                 globalHelpExtensionMenuLinks$,
               }}
+              navigation={navigation$.getValue() ?? null}
               actionMenu$={application.currentActionMenu$}
               breadcrumbs$={breadcrumbs$.pipe(takeUntil(this.stop$))}
               helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
@@ -260,7 +272,7 @@ export class ChromeService {
           />
         );
       };
-      return <Component {...{ style$: chromeStyle$ }} />;
+      return <Component {...{ style$: chromeStyle$, navigation$: projectNavigation$ }} />;
     };
 
     return {
@@ -335,6 +347,7 @@ export class ChromeService {
       getBodyClasses$: () => bodyClasses$.pipe(takeUntil(this.stop$)),
       setChromeStyle,
       getChromeStyle$: () => chromeStyle$.pipe(takeUntil(this.stop$)),
+      setProjectNavigation,
     };
   }
 

diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { Router } from 'react-router-dom';
-import { EuiHeader, EuiHeaderLogo, EuiHeaderSection, EuiHeaderSectionItem } from '@elastic/eui';
+import { EuiHeader, EuiHeaderSection, EuiHeaderSectionItem } from '@elastic/eui';
 import {
   ChromeBreadcrumb,
   ChromeGlobalHelpExtensionMenuLink,
@@ -33,29 +33,21 @@ interface Props {
   helpSupportUrl$: Observable<string>;
   kibanaVersion: string;
   application: InternalApplicationStart;
+  navigation: JSX.Element | null;
   navControlsRight$: Observable<ChromeNavControl[]>;
 }
 
 export const ProjectHeader = ({
   application,
   kibanaDocLink,
   kibanaVersion,
+  navigation,
   ...observables
 }: Props) => {
-  const renderLogo = () => (
-    <EuiHeaderLogo
-      iconType="logoElastic"
-      href="#"
-      onClick={(e) => e.preventDefault()}
-      aria-label="Go to home page"
-    />
-  );
-
   return (
     <>
       <EuiHeader position="fixed">
         <EuiHeaderSection grow={false}>
-          <EuiHeaderSectionItem border="right">{renderLogo()}</EuiHeaderSectionItem>
           <EuiHeaderSectionItem>
             <HeaderBreadcrumbs breadcrumbs$={observables.breadcrumbs$} />
           </EuiHeaderSectionItem>
@@ -81,9 +73,7 @@ export const ProjectHeader = ({
         </EuiHeaderSection>
       </EuiHeader>
       <Router history={application.history}>
-        <ProjectNavigation>
-          <span />
-        </ProjectNavigation>
+        <ProjectNavigation>{navigation}</ProjectNavigation>
       </Router>
     </>
   );

diff --git a/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts b/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts
@@ -63,6 +63,7 @@ const createStartContractMock = () => {
     getBodyClasses$: jest.fn(),
     getChromeStyle$: jest.fn(),
     setChromeStyle: jest.fn(),
+    setProjectNavigation: jest.fn(),
   };
   startContract.navLinks.getAll.mockReturnValue([]);
   startContract.getIsVisible$.mockReturnValue(new BehaviorSubject(false));

diff --git a/packages/core/chrome/core-chrome-browser/src/contracts.ts b/packages/core/chrome/core-chrome-browser/src/contracts.ts
@@ -161,4 +161,12 @@ export interface ChromeStart {
    * Get an observable of the current style type of the chrome.
    */
   getChromeStyle$(): Observable<ChromeStyle>;
+
+  /**
+   * Sets the project navigation to render in the chrome.
+   * @param projectNavigation The navigation to render in the chrome.
+   *
+   * @remarks Has no effect if the chrome style is not `project`.
+   */
+  setProjectNavigation(projectNavigation: JSX.Element): void;
 }
diff --git a/x-pack/plugins/serverless/public/plugin.tsx b/x-pack/plugins/serverless/public/plugin.tsx
@@ -41,7 +41,10 @@ export class ServerlessPlugin implements Plugin<ServerlessPluginSetup, Serverles
 
     core.chrome.setChromeStyle('project');
 
-    return {};
+    return {
+      setServerlessNavigation: (navigation: JSX.Element) =>
+        core.chrome.setProjectNavigation(navigation),
+    };
   }
 
   public stop() {}

diff --git a/x-pack/plugins/serverless/public/types.ts b/x-pack/plugins/serverless/public/types.ts
@@ -8,5 +8,6 @@
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ServerlessPluginSetup {}
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface ServerlessPluginStart {}
+export interface ServerlessPluginStart {
+  setServerlessNavigation: (navigation: JSX.Element) => void;
+}