Merge branch 'master' into bug/form-lib-addfield-on-component-mount

elastic · Aug 26, 2020 · ef8aa16 · ef8aa16
2 parents d04098b + 789b67f
commit ef8aa16
Show file tree

Hide file tree

Showing 20 changed files with 1,494 additions and 353 deletions.
diff --git a/src/core/public/chrome/chrome_service.test.ts b/src/core/public/chrome/chrome_service.test.ts
@@ -405,6 +405,59 @@ describe('start', () => {
             `);
     });
   });
+
+  describe('erase chrome fields', () => {
+    it('while switching an app', async () => {
+      const startDeps = defaultStartDeps([new FakeApp('alpha')]);
+      const { navigateToApp } = startDeps.application;
+      const { chrome, service } = await start({ startDeps });
+
+      const helpExtensionPromise = chrome.getHelpExtension$().pipe(toArray()).toPromise();
+      const breadcrumbsPromise = chrome.getBreadcrumbs$().pipe(toArray()).toPromise();
+      const badgePromise = chrome.getBadge$().pipe(toArray()).toPromise();
+      const docTitleResetSpy = jest.spyOn(chrome.docTitle, 'reset');
+
+      const promises = Promise.all([helpExtensionPromise, breadcrumbsPromise, badgePromise]);
+
+      chrome.setHelpExtension({ appName: 'App name' });
+      chrome.setBreadcrumbs([{ text: 'App breadcrumb' }]);
+      chrome.setBadge({ text: 'App badge', tooltip: 'App tooltip' });
+
+      navigateToApp('alpha');
+
+      service.stop();
+
+      expect(docTitleResetSpy).toBeCalledTimes(1);
+      await expect(promises).resolves.toMatchInlineSnapshot(`
+        Array [
+          Array [
+            undefined,
+            Object {
+              "appName": "App name",
+            },
+            undefined,
+          ],
+          Array [
+            Array [],
+            Array [
+              Object {
+                "text": "App breadcrumb",
+              },
+            ],
+            Array [],
+          ],
+          Array [
+            undefined,
+            Object {
+              "text": "App badge",
+              "tooltip": "App tooltip",
+            },
+            undefined,
+          ],
+        ]
+      `);
+    });
+  });
 });
 
 describe('stop', () => {

diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
@@ -157,6 +157,14 @@ export class ChromeService {
     const recentlyAccessed = await this.recentlyAccessed.start({ http });
     const docTitle = this.docTitle.start({ document: window.document });
 
+    // erase chrome fields from a previous app while switching to a next app
+    application.currentAppId$.subscribe(() => {
+      helpExtension$.next(undefined);
+      breadcrumbs$.next([]);
+      badge$.next(undefined);
+      docTitle.reset();
+    });
+
     const setIsNavDrawerLocked = (isLocked: boolean) => {
       isNavDrawerLocked$.next(isLocked);
       localStorage.setItem(IS_LOCKED_KEY, `${isLocked}`);

diff --git a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
@@ -21,6 +21,7 @@ import React, { lazy, Suspense } from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Switch, Route } from 'react-router-dom';
 import { I18nProvider } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import { CoreSetup } from 'src/core/public';
 import { ManagementAppMountParams } from '../../../management/public';
@@ -36,6 +37,10 @@ interface MountParams {
 
 let allowedObjectTypes: string[] | undefined;
 
+const title = i18n.translate('savedObjectsManagement.objects.savedObjectsTitle', {
+  defaultMessage: 'Saved Objects',
+});
+
 const SavedObjectsEditionPage = lazy(() => import('./saved_objects_edition_page'));
 const SavedObjectsTablePage = lazy(() => import('./saved_objects_table_page'));
 export const mountManagementSection = async ({
@@ -49,6 +54,8 @@ export const mountManagementSection = async ({
     allowedObjectTypes = await getAllowedTypes(coreStart.http);
   }
 
+  coreStart.chrome.docTitle.change(title);
+
   const capabilities = coreStart.application.capabilities;
 
   const RedirectToHomeIfUnauthorized: React.FunctionComponent = ({ children }) => {

diff --git a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/StaticPlot.js b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/StaticPlot.js
@@ -71,11 +71,29 @@ class StaticPlot extends PureComponent {
         const data = serie.data.map((value) => {
           return 'y' in value && isValidCoordinateValue(value.y)
             ? value
-            : {
-                ...value,
-                y: undefined,
-              };
+            : { ...value, y: undefined };
         });
+
+        // make sure individual markers are displayed in cases
+        // where there are gaps
+
+        const markersForGaps = serie.data.map((value, index) => {
+          const prevHasData = getNull(serie.data[index - 1] ?? {});
+          const nextHasData = getNull(serie.data[index + 1] ?? {});
+          const thisHasData = getNull(value);
+
+          const isGap = !prevHasData && !nextHasData && thisHasData;
+
+          if (!isGap) {
+            return {
+              ...value,
+              y: undefined,
+            };
+          }
+
+          return value;
+        });
+
         return [
           <AreaSeries
             getNull={getNull}
@@ -99,6 +117,21 @@ class StaticPlot extends PureComponent {
             stack={true}
             cluster="line"
           />,
+          <LineMarkSeries
+            getNull={getNull}
+            key={`${serie.title}-line-markers`}
+            xType="time-utc"
+            curve={'curveMonotoneX'}
+            data={markersForGaps}
+            stroke={serie.color}
+            color={serie.color}
+            lineStyle={{
+              opacity: 0,
+            }}
+            stack={true}
+            cluster="line-mark"
+            size={1}
+          />,
         ];
       }
 
@@ -132,7 +165,7 @@ class StaticPlot extends PureComponent {
             curve={'curveMonotoneX'}
             data={serie.data}
             color={serie.color}
-            size={0.5}
+            size={1}
           />
         );
       default: