Merge branch 'main' into lodash-set-fix

.github/CODEOWNERS

@@ -911,6 +911,8 @@ packages/kbn-yarn-lock-validator @elastic/kibana-operations
 #CC# /x-pack/plugins/translations/ @elastic/kibana-localization @elastic/kibana-core
 
 # Kibana Platform Security
+/.github/codeql @elastic/kibana-security
+/.github/workflows/codeql.yml @elastic/kibana-security
 /src/plugins/telemetry/server/config/telemetry_labels.ts @elastic/kibana-security
 /test/interactive_setup_api_integration/ @elastic/kibana-security
 /test/interactive_setup_functional/ @elastic/kibana-security

.github/paths-labeller.yml

@@ -10,6 +10,10 @@
     - "src/plugins/bfetch/**/*.*"
   - "Team:apm":
     - "x-pack/plugins/apm/**/*.*"
+    - "x-pack/test/apm_api_integration/**/*.*"
+    - "packages/kbn-apm-synthtrace/**/*.*"
+    - "packages/kbn-apm-synthtrace-client/**/*.*"
+    - "packages/kbn-apm-utils/**/*.*"
   - "Team:Fleet":
     - "x-pack/plugins/fleet/**/*.*"
     - "x-pack/test/fleet_api_integration/**/*.*"

packages/shared-ux/button/exit_full_screen/impl/src/exit_full_screen_button.component.tsx

@@ -12,6 +12,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiIcon,
+  EuiImage,
   useEuiTheme,
   makeHighContrastColor,
 } from '@elastic/eui';
@@ -37,7 +38,7 @@ const description = i18n.translate(
 /**
  * A presentational component that renders a button designed to exit "full screen" mode.
  */
-export const ExitFullScreenButton = ({ onClick, className }: Props) => {
+export const ExitFullScreenButton = ({ onClick, className, customLogo }: Props) => {
   const { euiTheme } = useEuiTheme();
   const { colors, size, border } = euiTheme;
 
@@ -63,7 +64,11 @@ export const ExitFullScreenButton = ({ onClick, className }: Props) => {
       >
         <EuiFlexGroup component="span" responsive={false} alignItems="center" gutterSize="s">
           <EuiFlexItem component="span" grow={false}>
-            <EuiIcon type="logoElastic" size="m" />
+            {customLogo ? (
+              <EuiImage src={customLogo} size={16} alt="customLogo" />
+            ) : (
+              <EuiIcon type="logoElastic" size="m" />
+            )}
           </EuiFlexItem>
           <EuiFlexItem component="span" grow={false} data-test-subj="exitFullScreenModeText">
             {text}

packages/shared-ux/button/exit_full_screen/impl/src/exit_full_screen_button.test.tsx

@@ -17,6 +17,7 @@ import {
 
 import { ExitFullScreenButton } from './exit_full_screen_button';
 import { ExitFullScreenButtonKibanaProvider, ExitFullScreenButtonProvider } from './services';
+import { of } from 'rxjs';
 
 const componentServices = getExitFullScreenButtonServicesMock();
 const kibanaServices = getExitFullScreenButtonKibanaDependenciesMock();
@@ -103,6 +104,16 @@ describe('<ExitFullScreenButton />', () => {
       expect(kibanaServices.coreStart.chrome.setIsVisible).toHaveBeenCalledTimes(0);
     });
 
+    test('renders custom logo', () => {
+      kibanaServices.coreStart.customBranding.customBranding$ = of({
+        logo: 'imageSrcAsBase64encodedstring',
+      });
+      const component = kibanaMount(
+        <ExitFullScreenButton onExit={jest.fn()} toggleChrome={false} />
+      );
+      expect(component.render()).toMatchSnapshot();
+    });
+
     describe('onExit', () => {
       const onExitHandler = jest.fn();
       let component: ReactWrapper;

packages/shared-ux/button/exit_full_screen/impl/src/exit_full_screen_button.tsx

@@ -13,6 +13,7 @@ import useMountedState from 'react-use/lib/useMountedState';
 
 import type { ExitFullScreenButtonProps as Props } from '@kbn/shared-ux-button-exit-full-screen-types';
 
+import useObservable from 'react-use/lib/useObservable';
 import { ExitFullScreenButton as Component } from './exit_full_screen_button.component';
 import { useServices } from './services';
 
@@ -22,8 +23,10 @@ import { useServices } from './services';
  */
 export const ExitFullScreenButton = ({ onExit = () => {}, toggleChrome = true }: Props) => {
   const { euiTheme } = useEuiTheme();
-  const { setIsFullscreen } = useServices();
+  const { setIsFullscreen, customBranding$ } = useServices();
   const isMounted = useMountedState();
+  const customBranding = useObservable(customBranding$);
+  const customLogo = customBranding?.logo;
 
   const onClick = useCallback(() => {
     if (toggleChrome) {
@@ -70,5 +73,5 @@ export const ExitFullScreenButton = ({ onExit = () => {}, toggleChrome = true }:
     z-index: 5;
   `;
 
-  return <Component css={buttonCSS} {...{ onClick }} />;
+  return <Component css={buttonCSS} customLogo={customLogo} {...{ onClick }} />;
 };

packages/shared-ux/button/exit_full_screen/impl/src/services.tsx

@@ -43,6 +43,7 @@ export const ExitFullScreenButtonKibanaProvider: FC<ExitFullScreenButtonKibanaDe
         setIsFullscreen: (isFullscreen: boolean) => {
           services.coreStart.chrome.setIsVisible(!isFullscreen);
         },
+        customBranding$: services.coreStart.customBranding.customBranding$,
       }}
     >
       {children}

packages/shared-ux/button/exit_full_screen/mocks/src/jest.ts

@@ -10,13 +10,15 @@ import {
   ExitFullScreenButtonKibanaDependencies,
   ExitFullScreenButtonServices,
 } from '@kbn/shared-ux-button-exit-full-screen-types';
+import { of } from 'rxjs';
 
 /**
  * Return a Jest mock of the services for the `ExitFullScreenButton` component.
  */
 export const getServicesMock = (): ExitFullScreenButtonServices => {
   return {
     setIsFullscreen: jest.fn(),
+    customBranding$: of({}),
   };
 };
 
@@ -29,6 +31,9 @@ export const getKibanaDependenciesMock = (): ExitFullScreenButtonKibanaDependenc
       chrome: {
         setIsVisible: jest.fn(),
       },
+      customBranding: {
+        customBranding$: of({}),
+      },
     },
   };
 };

packages/shared-ux/button/exit_full_screen/mocks/src/storybook.ts

@@ -12,6 +12,7 @@ import type {
   ExitFullScreenButtonProps as Props,
   ExitFullScreenButtonServices,
 } from '@kbn/shared-ux-button-exit-full-screen-types';
+import { of } from 'rxjs';
 
 type PropArguments = Pick<Props, 'toggleChrome'>;
 
@@ -51,6 +52,7 @@ export class StorybookMock extends AbstractStorybookMock<
       setIsFullscreen: (isFullscreen: boolean) => {
         action('setIsFullscreen')(isFullscreen);
       },
+      customBranding$: of({}),
     };
   }
 }

packages/shared-ux/button/exit_full_screen/types/index.d.ts

@@ -7,13 +7,17 @@
  */
 
 import { MouseEventHandler, HTMLAttributes } from 'react';
+import { Observable } from 'rxjs';
+import { CustomBranding } from '@kbn/core-custom-branding-common';
 
 /**
  * Abstract external services for this component.
  */
 export interface Services {
   /** Function to invoke to set the application to full-screen mode */
   setIsFullscreen: (isFullscreen: boolean) => void;
+  /** Observable that emits the value of custom branding, if set*/
+  customBranding$: Observable<CustomBranding>;
 }
 
 /**
@@ -29,6 +33,9 @@ export interface KibanaDependencies {
     chrome: {
       setIsVisible: (isVisible: boolean) => void;
     };
+    customBranding: {
+      customBranding$: Observable<CustomBranding>;
+    };
   };
 }
 
@@ -55,4 +62,6 @@ export interface ExitFullScreenButtonComponentProps
   extends Pick<HTMLAttributes<HTMLDivElement>, 'className'> {
   /** Handler to invoke when one clicks the button. */
   onClick: MouseEventHandler<HTMLButtonElement>;
+  /** If set, custom logo is displayed instead of Elastic logo */
+  customLogo?: string;
 }

packages/shared-ux/button/exit_full_screen/types/tsconfig.json

@@ -9,5 +9,8 @@
   ],
   "exclude": [
     "target/**/*",
+  ],
+  "kbn_references": [
+    "@kbn/core-custom-branding-common",
   ]
 }

src/plugins/content_management/public/registry/content_type.test.ts

@@ -12,10 +12,10 @@ import type { ContentTypeDefinition } from './content_type_definition';
 test('create a content type with just an id', () => {
   const type = new ContentType({ id: 'test' });
 
-  expect(type.id()).toBe('test');
-  expect(type.name()).toBe('test');
-  expect(type.icon()).toBe('questionInCircle');
-  expect(type.description()).toBe('');
+  expect(type.id).toBe('test');
+  expect(type.name).toBe('test');
+  expect(type.icon).toBe('questionInCircle');
+  expect(type.description).toBe('');
 });
 
 test('create a content type with all the full definition', () => {
@@ -27,9 +27,9 @@ test('create a content type with all the full definition', () => {
   };
   const type = new ContentType(definition);
 
-  expect(type.id()).toBe(definition.id);
-  expect(type.name()).toBe(definition.name);
-  expect(type.icon()).toBe(definition.icon);
-  expect(type.description()).toBe(definition.description);
+  expect(type.id).toBe(definition.id);
+  expect(type.name).toBe(definition.name);
+  expect(type.icon).toBe(definition.icon);
+  expect(type.description).toBe(definition.description);
   expect(type.definition).toEqual(definition);
 });

src/plugins/content_management/public/registry/content_type.ts

@@ -12,23 +12,23 @@ import type { CrudClient } from '../crud_client';
 export class ContentType {
   constructor(public readonly definition: ContentTypeDefinition) {}
 
-  id(): string {
+  public get id(): string {
     return this.definition.id;
   }
 
-  name(): string {
-    return this.definition.name ?? this.id();
+  public get name(): string {
+    return this.definition.name ?? this.id;
   }
 
-  description(): string {
+  public get description(): string {
     return this.definition.description ?? '';
   }
 
-  icon(): string {
+  public get icon(): string {
     return this.definition.icon ?? 'questionInCircle';
   }
 
-  crud(): CrudClient | undefined {
+  public get crud(): CrudClient | undefined {
     return this.definition.crud;
   }
 }

src/plugins/content_management/public/registry/registry.test.ts

@@ -22,10 +22,10 @@ test('registering a content type', () => {
     description: 'Test description',
   });
 
-  expect(type.id()).toBe('test');
-  expect(type.name()).toBe('Test');
-  expect(type.icon()).toBe('test');
-  expect(type.description()).toBe('Test description');
+  expect(type.id).toBe('test');
+  expect(type.name).toBe('Test');
+  expect(type.icon).toBe('test');
+  expect(type.description).toBe('Test description');
 });
 
 test('registering already registered content type throws', () => {

src/plugins/content_management/public/registry/registry.ts

@@ -17,7 +17,7 @@ export class ContentTypeRegistry {
       throw new Error(`Content type with id "${definition.id}" already registered.`);
     }
     const type = new ContentType(definition);
-    this.types.set(type.id(), type);
+    this.types.set(type.id, type);
 
     return type;
   }

src/plugins/content_management/server/core/content_type.ts

@@ -0,0 +1,39 @@
+/*
+ * 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 { ContentCrud } from './crud';
+import { EventBus } from './event_bus';
+import { ContentStorage, ContentTypeDefinition } from './types';
+
+export class ContentType {
+  /** Content definition. */
+  private readonly _definition: ContentTypeDefinition<ContentStorage>;
+  /** Content crud instance. */
+  private readonly contentCrud: ContentCrud;
+
+  constructor(definition: ContentTypeDefinition, eventBus: EventBus) {
+    this._definition = definition;
+    this.contentCrud = new ContentCrud(definition.id, definition.storage, { eventBus });
+  }
+
+  public get id() {
+    return this._definition.id;
+  }
+
+  public get definition() {
+    return this._definition;
+  }
+
+  public get storage() {
+    return this._definition.storage;
+  }
+
+  public get crud() {
+    return this.contentCrud;
+  }
+}