Merge branch 'master' into task-manager/schema-config

* master: Fix suggested value for time_zone in range query (elastic#53841) Clean up generic hooks, use react-use instead (elastic#53822) Bump year in NOTICE.txt Add kibanamachine support to Github PR comments (elastic#53852) Add tests to ensure AAD isn't broken after performing a change on an alert / action (elastic#53333) Skip failing test suite [Vega] Sample [Flights] Airport Connections (Hover Over Airport) visualization not working (elastic#53799) Do not remount applications between page navigations (elastic#53851) [Canvas] Refactor Canvas to no longer use componentWillReceiveProps (elastic#52129) [Canvas] Migrate usage collector to NP plugin (elastic#53303)
gmmorris · Jan 2, 2020 · 4246b94 · 4246b94
2 parents b0c47b6 + 64dda89
commit 4246b94
Show file tree

Hide file tree

Showing 73 changed files with 585 additions and 441 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,5 +1,5 @@
 Kibana source code with Kibana X-Pack source code
-Copyright 2012-2019 Elasticsearch B.V.
+Copyright 2012-2020 Elasticsearch B.V.
 
 ---
 Pretty handling of logarithmic axes.

diff --git a/package.json b/package.json
@@ -234,7 +234,7 @@
     "react-resize-detector": "^4.2.0",
     "react-router-dom": "^5.1.2",
     "react-sizeme": "^2.3.6",
-    "react-use": "^13.10.2",
+    "react-use": "^13.13.0",
     "reactcss": "1.2.3",
     "redux": "4.0.0",
     "redux-actions": "2.2.1",

diff --git a/src/core/public/application/integration_tests/router.test.tsx b/src/core/public/application/integration_tests/router.test.tsx
@@ -18,7 +18,7 @@
  */
 
 import React from 'react';
-import { createMemoryHistory, History } from 'history';
+import { createMemoryHistory, History, createHashHistory } from 'history';
 
 import { AppRouter, AppNotFound } from '../ui';
 import { EitherApp, MockedMounterMap, MockedMounterTuple } from '../test_types';
@@ -27,7 +27,15 @@ import { createRenderer, createAppMounter, createLegacyAppMounter } from './util
 describe('AppContainer', () => {
   let mounters: MockedMounterMap<EitherApp>;
   let history: History;
-  let navigate: ReturnType<typeof createRenderer>;
+  let update: ReturnType<typeof createRenderer>;
+
+  const navigate = (path: string) => {
+    history.push(path);
+    return update();
+  };
+
+  const mockMountersToMounters = () =>
+    new Map([...mounters].map(([appId, { mounter }]) => [appId, mounter]));
 
   beforeEach(() => {
     mounters = new Map([
@@ -38,26 +46,26 @@ describe('AppContainer', () => {
       createAppMounter('app3', '<div>App 3</div>', '/custom/path'),
     ] as Array<MockedMounterTuple<EitherApp>>);
     history = createMemoryHistory();
-    navigate = createRenderer(<AppRouter history={history} mounters={mounters} />, history.push);
+    update = createRenderer(<AppRouter history={history} mounters={mockMountersToMounters()} />);
   });
 
   it('calls mount handler and returned unmount function when navigating between apps', async () => {
     const dom1 = await navigate('/app/app1');
     const app1 = mounters.get('app1')!;
 
-    expect(app1.mount).toHaveBeenCalled();
+    expect(app1.mounter.mount).toHaveBeenCalled();
     expect(dom1?.html()).toMatchInlineSnapshot(`
       "<div><div>
       basename: /app/app1
       html: <span>App 1</span>
       </div></div>"
     `);
 
-    const app1Unmount = await app1.mount.mock.results[0].value;
+    const app1Unmount = await app1.mounter.mount.mock.results[0].value;
     const dom2 = await navigate('/app/app2');
 
     expect(app1Unmount).toHaveBeenCalled();
-    expect(mounters.get('app2')!.mount).toHaveBeenCalled();
+    expect(mounters.get('app2')!.mounter.mount).toHaveBeenCalled();
     expect(dom2?.html()).toMatchInlineSnapshot(`
       "<div><div>
       basename: /app/app2
@@ -70,29 +78,77 @@ describe('AppContainer', () => {
     mounters.set(...createAppMounter('spaces', '<div>Custom Space</div>', '/spaces/fake-login'));
     mounters.set(...createAppMounter('login', '<div>Login Page</div>', '/fake-login'));
     history = createMemoryHistory();
-    navigate = createRenderer(<AppRouter history={history} mounters={mounters} />, history.push);
+    update = createRenderer(<AppRouter history={history} mounters={mockMountersToMounters()} />);
 
     await navigate('/fake-login');
 
-    expect(mounters.get('spaces')!.mount).not.toHaveBeenCalled();
-    expect(mounters.get('login')!.mount).toHaveBeenCalled();
+    expect(mounters.get('spaces')!.mounter.mount).not.toHaveBeenCalled();
+    expect(mounters.get('login')!.mounter.mount).toHaveBeenCalled();
   });
 
   it('should not mount when partial route path has higher specificity', async () => {
     mounters.set(...createAppMounter('login', '<div>Login Page</div>', '/fake-login'));
     mounters.set(...createAppMounter('spaces', '<div>Custom Space</div>', '/spaces/fake-login'));
     history = createMemoryHistory();
-    navigate = createRenderer(<AppRouter history={history} mounters={mounters} />, history.push);
+    update = createRenderer(<AppRouter history={history} mounters={mockMountersToMounters()} />);
 
     await navigate('/spaces/fake-login');
 
-    expect(mounters.get('spaces')!.mount).toHaveBeenCalled();
-    expect(mounters.get('login')!.mount).not.toHaveBeenCalled();
+    expect(mounters.get('spaces')!.mounter.mount).toHaveBeenCalled();
+    expect(mounters.get('login')!.mounter.mount).not.toHaveBeenCalled();
+  });
+
+  it('should not remount when changing pages within app', async () => {
+    const { mounter, unmount } = mounters.get('app1')!;
+    await navigate('/app/app1/page1');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+
+    // Navigating to page within app does not trigger re-render
+    await navigate('/app/app1/page2');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+    expect(unmount).not.toHaveBeenCalled();
+  });
+
+  it('should not remount when going back within app', async () => {
+    const { mounter, unmount } = mounters.get('app1')!;
+    await navigate('/app/app1/page1');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+
+    // Hitting back button within app does not trigger re-render
+    await navigate('/app/app1/page2');
+    history.goBack();
+    await update();
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+    expect(unmount).not.toHaveBeenCalled();
+  });
+
+  it('should not remount when when changing pages within app using hash history', async () => {
+    history = createHashHistory();
+    update = createRenderer(<AppRouter history={history} mounters={mockMountersToMounters()} />);
+
+    const { mounter, unmount } = mounters.get('app1')!;
+    await navigate('/app/app1/page1');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+
+    // Changing hash history does not trigger re-render
+    await navigate('/app/app1/page2');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+    expect(unmount).not.toHaveBeenCalled();
+  });
+
+  it('should unmount when changing between apps', async () => {
+    const { mounter, unmount } = mounters.get('app1')!;
+    await navigate('/app/app1/page1');
+    expect(mounter.mount).toHaveBeenCalledTimes(1);
+
+    // Navigating to other app triggers unmount
+    await navigate('/app/app2/page1');
+    expect(unmount).toHaveBeenCalledTimes(1);
   });
 
   it('calls legacy mount handler', async () => {
     await navigate('/app/legacyApp1');
-    expect(mounters.get('legacyApp1')!.mount.mock.calls[0]).toMatchInlineSnapshot(`
+    expect(mounters.get('legacyApp1')!.mounter.mount.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
         Object {
           "appBasePath": "/app/legacyApp1",
@@ -104,7 +160,7 @@ describe('AppContainer', () => {
 
   it('handles legacy apps with subapps', async () => {
     await navigate('/app/baseApp');
-    expect(mounters.get('baseApp:legacyApp2')!.mount.mock.calls[0]).toMatchInlineSnapshot(`
+    expect(mounters.get('baseApp:legacyApp2')!.mounter.mount.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
         Object {
           "appBasePath": "/app/baseApp",

diff --git a/src/core/public/application/integration_tests/utils.tsx b/src/core/public/application/integration_tests/utils.tsx
@@ -26,19 +26,13 @@ import { App, LegacyApp, AppMountParameters } from '../types';
 import { MockedMounter, MockedMounterTuple } from '../test_types';
 
 type Dom = ReturnType<typeof mount> | null;
-type Renderer = (item: string) => Dom | Promise<Dom>;
+type Renderer = () => Dom | Promise<Dom>;
 
-export const createRenderer = (
-  element: ReactElement | null,
-  callback?: (item: string) => void | Promise<void>
-): Renderer => {
+export const createRenderer = (element: ReactElement | null): Renderer => {
   const dom: Dom = element && mount(<I18nProvider>{element}</I18nProvider>);
 
-  return item =>
+  return () =>
     new Promise(async resolve => {
-      if (callback) {
-        await callback(item);
-      }
       if (dom) {
         dom.update();
       }
@@ -50,29 +44,39 @@ export const createAppMounter = (
   appId: string,
   html: string,
   appRoute = `/app/${appId}`
-): MockedMounterTuple<App> => [
-  appId,
-  {
-    appRoute,
-    appBasePath: appRoute,
-    mount: jest.fn(async ({ appBasePath: basename, element }: AppMountParameters) => {
-      Object.assign(element, {
-        innerHTML: `<div>\nbasename: ${basename}\nhtml: ${html}\n</div>`,
-      });
-      return jest.fn(() => Object.assign(element, { innerHTML: '' }));
-    }),
-  },
-];
+): MockedMounterTuple<App> => {
+  const unmount = jest.fn();
+  return [
+    appId,
+    {
+      mounter: {
+        appRoute,
+        appBasePath: appRoute,
+        mount: jest.fn(async ({ appBasePath: basename, element }: AppMountParameters) => {
+          Object.assign(element, {
+            innerHTML: `<div>\nbasename: ${basename}\nhtml: ${html}\n</div>`,
+          });
+          unmount.mockImplementation(() => Object.assign(element, { innerHTML: '' }));
+          return unmount;
+        }),
+      },
+      unmount,
+    },
+  ];
+};
 
 export const createLegacyAppMounter = (
   appId: string,
   legacyMount: MockedMounter<LegacyApp>['mount']
 ): MockedMounterTuple<LegacyApp> => [
   appId,
   {
-    appRoute: `/app/${appId.split(':')[0]}`,
-    appBasePath: `/app/${appId.split(':')[0]}`,
-    unmountBeforeMounting: true,
-    mount: legacyMount,
+    mounter: {
+      appRoute: `/app/${appId.split(':')[0]}`,
+      appBasePath: `/app/${appId.split(':')[0]}`,
+      unmountBeforeMounting: true,
+      mount: legacyMount,
+    },
+    unmount: jest.fn(),
   },
 ];
diff --git a/src/core/public/application/test_types.ts b/src/core/public/application/test_types.ts
@@ -17,19 +17,27 @@
  * under the License.
  */
 
-import { App, LegacyApp, Mounter } from './types';
+import { App, LegacyApp, Mounter, AppUnmount } from './types';
 import { ApplicationService } from './application_service';
 
 /** @internal */
 export type ApplicationServiceContract = PublicMethodsOf<ApplicationService>;
 /** @internal */
 export type EitherApp = App | LegacyApp;
 /** @internal */
+export type MockedUnmount = jest.Mocked<AppUnmount>;
+/** @internal */
 export type MockedMounter<T extends EitherApp> = jest.Mocked<Mounter<jest.Mocked<T>>>;
 /** @internal */
-export type MockedMounterTuple<T extends EitherApp> = [string, MockedMounter<T>];
+export type MockedMounterTuple<T extends EitherApp> = [
+  string,
+  { mounter: MockedMounter<T>; unmount: MockedUnmount }
+];
 /** @internal */
-export type MockedMounterMap<T extends EitherApp> = Map<string, MockedMounter<T>>;
+export type MockedMounterMap<T extends EitherApp> = Map<
+  string,
+  { mounter: MockedMounter<T>; unmount: MockedUnmount }
+>;
 /** @internal */
 export type MockLifecycle<
   T extends keyof ApplicationService,

diff --git a/src/core/public/application/ui/app_container.tsx b/src/core/public/application/ui/app_container.tsx
@@ -65,7 +65,7 @@ export const AppContainer: FunctionComponent<Props> = ({ mounter, appId }: Props
 
     mount();
     return unmount;
-  });
+  }, [mounter]);
 
   return (
     <Fragment>

diff --git a/src/core/server/rendering/views/styles.tsx b/src/core/server/rendering/views/styles.tsx
@@ -78,7 +78,7 @@ export const Styles: FunctionComponent<Props> = ({ darkMode }) => {
             background-repeat: no-repeat;
             background-size: contain;
             /* SVG optimized according to http://codepen.io/tigt/post/optimizing-svgs-in-data-uris */
-            background-image: url'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMCIgaGVpZ2h0PSIzOSIgdmlld0JveD0iMCAwIDMwIDM5Ij4gIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgIDxwb2x5Z29uIGZpbGw9IiNGMDRFOTgiIHBvaW50cz0iMCAwIDAgMzQuNTQ3IDI5LjkyMiAuMDIiLz4gICAgPHBhdGggZmlsbD0iIzM0Mzc0MSIgZD0iTTAsMTQuNCBMMCwzNC41NDY4IEwxNC4yODcyLDE4LjA2MTIgQzEwLjA0MTYsMTUuNzM4IDUuMTgwNCwxNC40IDAsMTQuNCIvPiAgICA8cGF0aCBmaWxsPSIjMDBCRkIzIiBkPSJNMTcuMzc0MiwxOS45OTY4IEwyLjcyMSwzNi45MDQ4IEwxLjQzMzQsMzguMzg5MiBMMjkuMjYzOCwzOC4zODkyIEMyNy43NjE0LDMwLjgzODggMjMuNDA0MiwyNC4zMjY0IDE3LjM3NDIsMTkuOTk2OCIvPiAgPC9nPjwvc3ZnPg==');
+            background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMCIgaGVpZ2h0PSIzOSIgdmlld0JveD0iMCAwIDMwIDM5Ij4gIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+ICAgIDxwb2x5Z29uIGZpbGw9IiNGMDRFOTgiIHBvaW50cz0iMCAwIDAgMzQuNTQ3IDI5LjkyMiAuMDIiLz4gICAgPHBhdGggZmlsbD0iIzM0Mzc0MSIgZD0iTTAsMTQuNCBMMCwzNC41NDY4IEwxNC4yODcyLDE4LjA2MTIgQzEwLjA0MTYsMTUuNzM4IDUuMTgwNCwxNC40IDAsMTQuNCIvPiAgICA8cGF0aCBmaWxsPSIjMDBCRkIzIiBkPSJNMTcuMzc0MiwxOS45OTY4IEwyLjcyMSwzNi45MDQ4IEwxLjQzMzQsMzguMzg5MiBMMjkuMjYzOCwzOC4zODkyIEMyNy43NjE0LDMwLjgzODggMjMuNDA0MiwyNC4zMjY0IDE3LjM3NDIsMTkuOTk2OCIvPiAgPC9nPjwvc3ZnPg==');
           }
 
           .kibanaWelcomeTitle {

diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/filter.js b/src/legacy/core_plugins/console/server/api_server/es_6_0/filter.js
@@ -260,7 +260,7 @@ filters.range = {
     gt: 1,
     lte: 20,
     lt: 20,
-    time_zone: '+1:00',
+    time_zone: '+01:00',
     format: 'dd/MM/yyyy||yyyy',
     execution: { __one_of: ['index', 'fielddata'] },
   },

diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/query/dsl.js b/src/legacy/core_plugins/console/server/api_server/es_6_0/query/dsl.js
@@ -467,7 +467,7 @@ export function queryDsl(api) {
         __one_of: [true, false],
       },
       tie_breaker: 0,
-      time_zone: '+1:00',
+      time_zone: '+01:00',
     },
     simple_query_string: {
       __template: {
@@ -493,7 +493,7 @@ export function queryDsl(api) {
         gt: 10,
         lte: 20,
         lt: 20,
-        time_zone: '+1:00',
+        time_zone: '+01:00',
         boost: 1.0,
         format: 'dd/MM/yyyy||yyyy',
       },

diff --git a/src/legacy/core_plugins/tile_map/index.ts b/src/legacy/core_plugins/tile_map/index.ts
@@ -30,7 +30,14 @@ const tileMapPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPlu
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       hacks: [resolve(__dirname, 'public/legacy')],
-      injectDefaultVars: server => ({}),
+      injectDefaultVars: server => {
+        const serverConfig = server.config();
+        const mapConfig: Record<string, any> = serverConfig.get('map');
+
+        return {
+          emsTileLayerId: mapConfig.emsTileLayerId,
+        };
+      },
     },
     config(Joi: any) {
       return Joi.object({

diff --git a/src/legacy/core_plugins/vis_type_vega/index.ts b/src/legacy/core_plugins/vis_type_vega/index.ts
@@ -33,9 +33,15 @@ const vegaPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPlugin
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       hacks: [resolve(__dirname, 'public/legacy')],
-      injectDefaultVars: server => ({
-        enableExternalUrls: server.config().get('vega.enableExternalUrls'),
-      }),
+      injectDefaultVars: server => {
+        const serverConfig = server.config();
+        const mapConfig: Record<string, any> = serverConfig.get('map');
+
+        return {
+          emsTileLayerId: mapConfig.emsTileLayerId,
+          enableExternalUrls: serverConfig.get('vega.enableExternalUrls'),
+        };
+      },
     },
     init: (server: Legacy.Server) => ({}),
     config(Joi: any) {

diff --git a/src/legacy/ui/public/vis/editors/default/components/agg_params.tsx b/src/legacy/ui/public/vis/editors/default/components/agg_params.tsx
@@ -20,10 +20,11 @@
 import React, { useReducer, useEffect, useMemo } from 'react';
 import { EuiForm, EuiAccordion, EuiSpacer, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import useUnmount from 'react-use/lib/useUnmount';
 
 import { VisState } from 'ui/vis';
-import { aggTypes, AggType, AggParam, AggConfig } from 'ui/agg_types/';
 import { IndexPattern } from 'ui/index_patterns';
+import { aggTypes, AggType, AggParam, AggConfig } from 'ui/agg_types/';
 
 import { DefaultEditorAggSelect } from './agg_select';
 import { DefaultEditorAggParam } from './agg_param';
@@ -44,9 +45,6 @@ import {
 } from './agg_params_state';
 import { editorConfigProviders } from '../../config/editor_config_providers';
 import { FixedParam, TimeIntervalParam, EditorParamConfig } from '../../config/types';
-// TODO: Below import is temporary, use `react-use` lib instead.
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { useUnmount } from '../../../../../../../plugins/kibana_react/public/util/use_unmount';
 import { AggGroupNames } from '../agg_groups';
 import { OnAggParamsChange } from './agg_common_props';
 

diff --git a/src/plugins/expressions/public/expression_renderer.tsx b/src/plugins/expressions/public/expression_renderer.tsx
@@ -22,9 +22,9 @@ import React from 'react';
 import classNames from 'classnames';
 import { Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';
+import useShallowCompareEffect from 'react-use/lib/useShallowCompareEffect';
 import { EuiLoadingChart, EuiProgress } from '@elastic/eui';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { useShallowCompareEffect } from '../../kibana_react/public';
 import { IExpressionLoaderParams, IInterpreterRenderHandlers, RenderError } from './types';
 import { ExpressionAST } from '../common/types';
 import { ExpressionLoader } from './loader';

diff --git a/src/plugins/kibana_react/public/index.ts b/src/plugins/kibana_react/public/index.ts
@@ -25,4 +25,4 @@ export * from './overlays';
 export * from './ui_settings';
 export * from './field_icon';
 export * from './table_list_view';
-export { toMountPoint, useObservable, useShallowCompareEffect } from './util';
+export { toMountPoint } from './util';