Merge branch 'main' into task/olm-7053-serverless-pli-authz

.github/CODEOWNERS

@@ -790,6 +790,7 @@ packages/kbn-yarn-lock-validator @elastic/kibana-operations
 /x-pack/test/search_sessions_integration/ @elastic/kibana-data-discovery
 /test/plugin_functional/test_suites/data_plugin @elastic/kibana-data-discovery
 /examples/demo_search/ @elastic/kibana-data-discovery
+/test/examples/discover_customization_examples @elastic/kibana-data-discovery
 
 # Vis Editors
 /src/plugins/visualize/ @elastic/kibana-visualizations

fleet_packages.json

@@ -54,7 +54,7 @@
   },
   {
     "name": "synthetics",
-    "version": "1.0.2"
+    "version": "1.0.3"
   },
   {
     "name": "security_detection_engine",

nav-kibana-dev.docnav.json

@@ -181,6 +181,9 @@
         {
           "id": "kibDevTutorialScreenshotting"
         },
+        {
+          "id": "kibDevTutorialsContentManagementOnboarding"
+        },
         {
           "id": "kibDevTutorialsServerlessProjectNavigation"
         }
@@ -485,4 +488,4 @@
       ]
     }
   ]
-}
+}

packages/core/notifications/core-notifications-browser-internal/src/toasts/deduplicate_toasts.test.tsx

@@ -0,0 +1,126 @@
+/*
+ * 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 React from 'react';
+import { mount, render, shallow } from 'enzyme';
+import { ReactElement, ReactNode } from 'react';
+
+import { deduplicateToasts, TitleWithBadge, ToastWithRichTitle } from './deduplicate_toasts';
+import { Toast } from '@kbn/core-notifications-browser';
+import { MountPoint } from '@kbn/core-mount-utils-browser';
+
+function toast(title: string | MountPoint, text?: string | MountPoint, id = Math.random()): Toast {
+  return {
+    id: id.toString(),
+    title,
+    text,
+  };
+}
+
+const fakeMountPoint = () => () => {};
+
+describe('deduplicate toasts', () => {
+  it('returns an empty list for an empty input', () => {
+    const toasts: Toast[] = [];
+
+    const { toasts: deduplicatedToastList } = deduplicateToasts(toasts);
+
+    expect(deduplicatedToastList).toHaveLength(0);
+  });
+
+  it(`doesn't affect singular notifications`, () => {
+    const toasts: Toast[] = [
+      toast('A', 'B'), // single toast
+      toast('X', 'Y'), // single toast
+    ];
+
+    const { toasts: deduplicatedToastList } = deduplicateToasts(toasts);
+
+    expect(deduplicatedToastList).toHaveLength(toasts.length);
+    verifyTextAndTitle(deduplicatedToastList[0], 'A', 'B');
+    verifyTextAndTitle(deduplicatedToastList[1], 'X', 'Y');
+  });
+
+  it(`doesn't group notifications with MountPoints for title`, () => {
+    const toasts: Toast[] = [
+      toast('A', 'B'),
+      toast(fakeMountPoint, 'B'),
+      toast(fakeMountPoint, 'B'),
+      toast(fakeMountPoint, fakeMountPoint),
+      toast(fakeMountPoint, fakeMountPoint),
+    ];
+
+    const { toasts: deduplicatedToastList } = deduplicateToasts(toasts);
+
+    expect(deduplicatedToastList).toHaveLength(toasts.length);
+  });
+
+  it('groups toasts based on title + text', () => {
+    const toasts: Toast[] = [
+      toast('A', 'B'), // 2 of these
+      toast('X', 'Y'), // 3 of these
+      toast('A', 'B'),
+      toast('X', 'Y'),
+      toast('A', 'C'), // 1 of these
+      toast('X', 'Y'),
+    ];
+
+    const { toasts: deduplicatedToastList } = deduplicateToasts(toasts);
+
+    expect(deduplicatedToastList).toHaveLength(3);
+    verifyTextAndTitle(deduplicatedToastList[0], 'A 2', 'B');
+    verifyTextAndTitle(deduplicatedToastList[1], 'X 3', 'Y');
+    verifyTextAndTitle(deduplicatedToastList[2], 'A', 'C');
+  });
+
+  it('groups toasts based on title, when text is not available', () => {
+    const toasts: Toast[] = [
+      toast('A', 'B'), // 2 of these
+      toast('A', fakeMountPoint), // 2 of these
+      toast('A', 'C'), // 1 of this
+      toast('A', 'B'),
+      toast('A', fakeMountPoint),
+      toast('A'), // but it doesn't group functions with missing texts
+    ];
+
+    const { toasts: deduplicatedToastList } = deduplicateToasts(toasts);
+
+    expect(deduplicatedToastList).toHaveLength(4);
+    verifyTextAndTitle(deduplicatedToastList[0], 'A 2', 'B');
+    verifyTextAndTitle(deduplicatedToastList[1], 'A 2', expect.any(Function));
+    verifyTextAndTitle(deduplicatedToastList[2], 'A', 'C');
+    verifyTextAndTitle(deduplicatedToastList[3], 'A', undefined);
+  });
+});
+
+describe('TitleWithBadge component', () => {
+  it('renders with string titles', () => {
+    const title = 'Welcome!';
+
+    const titleComponent = <TitleWithBadge title={title} counter={5} />;
+    const shallowRender = shallow(titleComponent);
+    const fullRender = mount(titleComponent);
+
+    expect(fullRender.text()).toBe('Welcome! 5');
+    expect(shallowRender).toMatchSnapshot();
+  });
+});
+
+function verifyTextAndTitle(
+  { text, title }: ToastWithRichTitle,
+  expectedTitle?: string,
+  expectedText?: string
+) {
+  expect(getNodeText(title)).toEqual(expectedTitle);
+  expect(text).toEqual(expectedText);
+}
+
+function getNodeText(node: ReactNode) {
+  const rendered = render(node as ReactElement);
+  return rendered.text();
+}