Merge branch '7.8' into backport/7.8/pr-65532

elastic · May 7, 2020 · c1580a4 · c1580a4
2 parents 906bb48 + 97c0bd6
commit c1580a4
Show file tree

Hide file tree

Showing 46 changed files with 695 additions and 287 deletions.
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
@@ -340,13 +340,14 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
       this.abortController.abort();
     }
     this.abortController = new AbortController();
+    const abortController = this.abortController;
     this.expression = await buildPipeline(this.vis, {
       timefilter: this.timefilter,
       timeRange: this.timeRange,
       abortSignal: this.abortController!.signal,
     });
 
-    if (this.handler) {
+    if (this.handler && !abortController.signal.aborted) {
       this.handler.update(this.expression, expressionParams);
     }
   }

diff --git a/x-pack/plugins/actions/server/action_type_registry.test.ts b/x-pack/plugins/actions/server/action_type_registry.test.ts
@@ -71,6 +71,19 @@ describe('register()', () => {
     `);
   });
 
+  test('shallow clones the given action type', () => {
+    const myType: ActionType = {
+      id: 'my-action-type',
+      name: 'My action type',
+      minimumLicenseRequired: 'basic',
+      executor,
+    };
+    const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
+    actionTypeRegistry.register(myType);
+    myType.name = 'Changed';
+    expect(actionTypeRegistry.get('my-action-type').name).toEqual('My action type');
+  });
+
   test('throws error if action type already registered', () => {
     const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({

diff --git a/x-pack/plugins/actions/server/action_type_registry.ts b/x-pack/plugins/actions/server/action_type_registry.ts
@@ -91,7 +91,7 @@ export class ActionTypeRegistry {
         )
       );
     }
-    this.actionTypes.set(actionType.id, actionType);
+    this.actionTypes.set(actionType.id, { ...actionType });
     this.taskManager.registerTaskDefinitions({
       [`actions:${actionType.id}`]: {
         title: actionType.name,

diff --git a/x-pack/plugins/alerting/server/alert_type_registry.test.ts b/x-pack/plugins/alerting/server/alert_type_registry.test.ts
@@ -72,6 +72,25 @@ describe('register()', () => {
     `);
   });
 
+  test('shallow clones the given alert type', () => {
+    const alertType: AlertType = {
+      id: 'test',
+      name: 'Test',
+      actionGroups: [
+        {
+          id: 'default',
+          name: 'Default',
+        },
+      ],
+      defaultActionGroupId: 'default',
+      executor: jest.fn(),
+    };
+    const registry = new AlertTypeRegistry(alertTypeRegistryParams);
+    registry.register(alertType);
+    alertType.name = 'Changed';
+    expect(registry.get('test').name).toEqual('Test');
+  });
+
   test('should throw an error if type is already registered', () => {
     const registry = new AlertTypeRegistry(alertTypeRegistryParams);
     registry.register({

diff --git a/x-pack/plugins/alerting/server/alert_type_registry.ts b/x-pack/plugins/alerting/server/alert_type_registry.ts
@@ -41,7 +41,7 @@ export class AlertTypeRegistry {
       );
     }
     alertType.actionVariables = normalizedActionVariables(alertType.actionVariables);
-    this.alertTypes.set(alertType.id, alertType);
+    this.alertTypes.set(alertType.id, { ...alertType });
     this.taskManager.registerTaskDefinitions({
       [`alerting:${alertType.id}`]: {
         title: alertType.name,

diff --git a/...Main/__test__/ProvideBreadcrumbs.test.tsx → ...ents/app/Main/ProvideBreadcrumbs.test.tsx b/...Main/__test__/ProvideBreadcrumbs.test.tsx → ...ents/app/Main/ProvideBreadcrumbs.test.tsx
@@ -5,8 +5,8 @@
  */
 
 import { Location } from 'history';
-import { BreadcrumbRoute, getBreadcrumbs } from '../ProvideBreadcrumbs';
-import { RouteName } from '../route_config/route_names';
+import { BreadcrumbRoute, getBreadcrumbs } from './ProvideBreadcrumbs';
+import { RouteName } from './route_config/route_names';
 
 describe('getBreadcrumbs', () => {
   const getTestRoutes = (): BreadcrumbRoute[] => [

diff --git a/x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx b/x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx
@@ -30,10 +30,18 @@ function getTitleFromBreadCrumbs(breadcrumbs: Breadcrumb[]) {
 
 class UpdateBreadcrumbsComponent extends React.Component<Props> {
   public updateHeaderBreadcrumbs() {
-    const breadcrumbs = this.props.breadcrumbs.map(({ value, match }) => ({
-      text: value,
-      href: getAPMHref(match.url, this.props.location.search)
-    }));
+    const breadcrumbs = this.props.breadcrumbs.map(
+      ({ value, match }, index) => {
+        const isLastBreadcrumbItem =
+          index === this.props.breadcrumbs.length - 1;
+        return {
+          text: value,
+          href: isLastBreadcrumbItem
+            ? undefined // makes the breadcrumb item not clickable
+            : getAPMHref(match.url, this.props.location.search)
+        };
+      }
+    );
 
     document.title = getTitleFromBreadCrumbs(this.props.breadcrumbs);
     this.props.core.chrome.setBreadcrumbs(breadcrumbs);

diff --git a/x-pack/plugins/apm/public/components/app/Main/__snapshots__/UpdateBreadcrumbs.test.tsx.snap b/x-pack/plugins/apm/public/components/app/Main/__snapshots__/UpdateBreadcrumbs.test.tsx.snap
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page.tsx
@@ -4,18 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
-
 import { ColumnarPage } from '../../../components/page';
 import { LogEntryCategoriesPageContent } from './page_content';
 import { LogEntryCategoriesPageProviders } from './page_providers';
 
 export const LogEntryCategoriesPage = () => {
   return (
-    <LogEntryCategoriesPageProviders>
-      <ColumnarPage data-test-subj="logsLogEntryCategoriesPage">
-        <LogEntryCategoriesPageContent />
-      </ColumnarPage>
-    </LogEntryCategoriesPageProviders>
+    <EuiErrorBoundary>
+      <LogEntryCategoriesPageProviders>
+        <ColumnarPage data-test-subj="logsLogEntryCategoriesPage">
+          <LogEntryCategoriesPageContent />
+        </ColumnarPage>
+      </LogEntryCategoriesPageProviders>
+    </EuiErrorBoundary>
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page.tsx
@@ -4,18 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
-
 import { ColumnarPage } from '../../../components/page';
 import { LogEntryRatePageContent } from './page_content';
 import { LogEntryRatePageProviders } from './page_providers';
 
 export const LogEntryRatePage = () => {
   return (
-    <LogEntryRatePageProviders>
-      <ColumnarPage data-test-subj="logsLogEntryRatePage">
-        <LogEntryRatePageContent />
-      </ColumnarPage>
-    </LogEntryRatePageProviders>
+    <EuiErrorBoundary>
+      <LogEntryRatePageProviders>
+        <ColumnarPage data-test-subj="logsLogEntryRatePage">
+          <LogEntryRatePageContent />
+        </ColumnarPage>
+      </LogEntryRatePageProviders>
+    </EuiErrorBoundary>
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/logs/page.tsx b/x-pack/plugins/infra/public/pages/logs/page.tsx
@@ -4,16 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-
 import { LogsPageContent } from './page_content';
 import { LogsPageProviders } from './page_providers';
 
-export const LogsPage: React.FunctionComponent<RouteComponentProps> = ({ match }) => {
+export const LogsPage: React.FunctionComponent<RouteComponentProps> = () => {
   return (
-    <LogsPageProviders>
-      <LogsPageContent />
-    </LogsPageProviders>
+    <EuiErrorBoundary>
+      <LogsPageProviders>
+        <LogsPageContent />
+      </LogsPageProviders>
+    </EuiErrorBoundary>
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
@@ -7,6 +7,7 @@
 import {
   EuiButton,
   EuiCallOut,
+  EuiErrorBoundary,
   EuiFlexGroup,
   EuiFlexItem,
   EuiPanel,
@@ -74,7 +75,7 @@ export const LogsSettingsPage = () => {
   }
 
   return (
-    <>
+    <EuiErrorBoundary>
       <EuiPage>
         <EuiPageBody
           className="eui-displayBlock"
@@ -181,7 +182,7 @@ export const LogsSettingsPage = () => {
           </EuiFlexGroup>
         </EuiPageBody>
       </EuiPage>
-    </>
+    </EuiErrorBoundary>
   );
 };
 

diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page.tsx
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiErrorBoundary } from '@elastic/eui';
 import React from 'react';
 import { useTrackPageview } from '../../../../../observability/public';
 import { ColumnarPage } from '../../../components/page';
@@ -15,11 +16,13 @@ export const StreamPage = () => {
   useTrackPageview({ app: 'infra_logs', path: 'stream' });
   useTrackPageview({ app: 'infra_logs', path: 'stream', delay: 15000 });
   return (
-    <LogsPageProviders>
-      <ColumnarPage data-test-subj="infraLogsPage">
-        <StreamPageHeader />
-        <StreamPageContent />
-      </ColumnarPage>
-    </LogsPageProviders>
+    <EuiErrorBoundary>
+      <LogsPageProviders>
+        <ColumnarPage data-test-subj="infraLogsPage">
+          <StreamPageHeader />
+          <StreamPageContent />
+        </ColumnarPage>
+      </LogsPageProviders>
+    </EuiErrorBoundary>
   );
 };