Merge branch '7.x' into backport/7.x/pr-83589

package.json

@@ -103,7 +103,7 @@
  "@elastic/datemath": "link:packages/elastic-datemath",
  "@elastic/elasticsearch": "7.10.0-rc.1",
  "@elastic/ems-client": "7.10.0",
- "@elastic/eui": "30.1.1",
+ "@elastic/eui": "30.2.0",
  "@elastic/filesaver": "1.1.2",
  "@elastic/good": "8.1.1-kibana2",
  "@elastic/node-crypto": "1.2.1",

x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/CustomLinkFlyout/link_preview.test.tsx

@@ -14,6 +14,9 @@ import {
 } from '@testing-library/react';
 import * as apmApi from '../../../../../../services/rest/createCallApmApi';
 
+export const removeExternalLinkText = (str: string) =>
+ str.replace(/\(opens in a new tab or window\)/g, '');
+
 describe('LinkPreview', () => {
  let callApmApiSpy: jest.SpyInstance<any, never>;
  beforeAll(() => {
@@ -53,7 +56,9 @@ describe('LinkPreview', () => {
  );
  expect(getElementValue(container, 'preview-label')).toEqual('foo');
  expect(
- (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+ removeExternalLinkText(
+ (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+ )
  ).toEqual('https://baz.co');
  });
  });
@@ -69,7 +74,9 @@ describe('LinkPreview', () => {
  );
  expect(getElementValue(container, 'preview-label')).toEqual('foo');
  expect(
- (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+ removeExternalLinkText(
+ (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+ )
  ).toEqual('https://baz.co?service.name={{invalid}');
  expect(getByTestId(container, 'preview-warning')).toBeInTheDocument();
  });
@@ -85,7 +92,9 @@ describe('LinkPreview', () => {
  await waitFor(() => expect(callApmApiSpy).toHaveBeenCalled());
  expect(getElementValue(container, 'preview-label')).toEqual('foo');
  expect(
- (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+ removeExternalLinkText(
+ (getByTestId(container, 'preview-link') as HTMLAnchorElement).text
+ )
  ).toEqual('https://baz.co?transaction=foo');
  });
 });