Merge branch 'master' into dev/filter-manager/missing-store-fix

elastic · Jan 30, 2020 · d98d2d7 · d98d2d7
2 parents 7bf3c88 + 74b9ed6
commit d98d2d7
Show file tree

Hide file tree

Showing 285 changed files with 1,194 additions and 916 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -12,14 +12,17 @@
 /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/visualize/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
-/src/legacy/core_plugins/kibana/public/home/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
 /src/legacy/core_plugins/metrics/ @elastic/kibana-app
 /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
 # Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
 /src/plugins/home/public @elastic/kibana-app
 /src/plugins/home/server/*.ts @elastic/kibana-app
 /src/plugins/home/server/services/ @elastic/kibana-app
+# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
+/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-app
+/src/legacy/core_plugins/kibana/public/home/*.scss @elastic/kibana-app
+/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
 /src/plugins/timelion/ @elastic/kibana-app
 /src/plugins/dev_tools/ @elastic/kibana-app

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -40,7 +40,7 @@
     "visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
     "visTypeTable": "src/legacy/core_plugins/vis_type_table",
     "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
-    "visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
+    "visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
     "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
     "visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
     "visualizations": [

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -19,7 +19,6 @@
 
 import { EuiConfirmModal, EuiIcon } from '@elastic/eui';
 import angular, { IModule } from 'angular';
-import { History } from 'history';
 import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
 import {
   AppMountContext,
@@ -28,7 +27,7 @@ import {
   LegacyCoreStart,
   SavedObjectsClientContract,
 } from 'kibana/public';
-import { IKbnUrlStateStorage, Storage } from '../../../../../../plugins/kibana_utils/public';
+import { Storage } from '../../../../../../plugins/kibana_utils/public';
 import {
   configureAppAngularModule,
   confirmModalFactory,
@@ -66,8 +65,6 @@ export interface RenderDeps {
   embeddables: IEmbeddableStart;
   localStorage: Storage;
   share: SharePluginStart;
-  history: History;
-  kbnUrlStateStorage: IKbnUrlStateStorage;
 }
 
 let angularModuleInstance: IModule | null = null;

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
@@ -19,6 +19,7 @@
 
 import moment from 'moment';
 import { Subscription } from 'rxjs';
+import { History } from 'history';
 
 import { IInjector } from '../legacy_imports';
 
@@ -35,6 +36,7 @@ import {
 
 import { DashboardAppController } from './dashboard_app_controller';
 import { RenderDeps } from './application';
+import { IKbnUrlStateStorage } from '../../../../../../plugins/kibana_utils/public/';
 
 export interface DashboardAppScope extends ng.IScope {
   dash: SavedObjectDashboard;
@@ -96,7 +98,9 @@ export function initDashboardAppDirective(app: any, deps: RenderDeps) {
         $route: any,
         $routeParams: {
           id?: string;
-        }
+        },
+        kbnUrlStateStorage: IKbnUrlStateStorage,
+        history: History
       ) =>
         new DashboardAppController({
           $route,
@@ -105,6 +109,8 @@ export function initDashboardAppDirective(app: any, deps: RenderDeps) {
           config,
           confirmModal,
           indexPatterns: deps.npDataStart.indexPatterns,
+          kbnUrlStateStorage,
+          history,
           ...deps,
         }),
     };

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -24,6 +24,7 @@ import angular from 'angular';
 
 import { Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { History } from 'history';
 import { DashboardEmptyScreen, DashboardEmptyScreenProps } from './dashboard_empty_screen';
 
 import {
@@ -77,7 +78,11 @@ import {
   SavedObjectFinderProps,
   SavedObjectFinderUi,
 } from '../../../../../../plugins/kibana_react/public';
-import { removeQueryParam, unhashUrl } from '../../../../../../plugins/kibana_utils/public';
+import {
+  IKbnUrlStateStorage,
+  removeQueryParam,
+  unhashUrl,
+} from '../../../../../../plugins/kibana_utils/public';
 
 export interface DashboardAppControllerDependencies extends RenderDeps {
   $scope: DashboardAppScope;
@@ -87,6 +92,8 @@ export interface DashboardAppControllerDependencies extends RenderDeps {
   dashboardConfig: any;
   config: any;
   confirmModal: ConfirmModalFn;
+  history: History;
+  kbnUrlStateStorage: IKbnUrlStateStorage;
 }
 
 export class DashboardAppController {

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js
@@ -21,11 +21,13 @@ import { i18n } from '@kbn/i18n';
 
 import dashboardTemplate from './dashboard_app.html';
 import dashboardListingTemplate from './listing/dashboard_listing_ng_wrapper.html';
+import { createHashHistory } from 'history';
 
 import { ensureDefaultIndexPattern } from '../legacy_imports';
 import { initDashboardAppDirective } from './dashboard_app';
 import { createDashboardEditUrl, DashboardConstants } from './dashboard_constants';
 import {
+  createKbnUrlStateStorage,
   InvalidJSONProperty,
   SavedObjectNotFound,
 } from '../../../../../../plugins/kibana_utils/public';
@@ -62,6 +64,14 @@ export function initDashboardApp(app, deps) {
     stateManagementConfigProvider.disable();
   });
 
+  app.factory('history', () => createHashHistory());
+  app.factory('kbnUrlStateStorage', history =>
+    createKbnUrlStateStorage({
+      history,
+      useHash: deps.uiSettings.get('state:storeInSessionStorage'),
+    })
+  );
+
   app.config(function($routeProvider) {
     const defaults = {
       reloadOnSearch: false,
@@ -87,15 +97,15 @@ export function initDashboardApp(app, deps) {
       .when(DashboardConstants.LANDING_PAGE_PATH, {
         ...defaults,
         template: dashboardListingTemplate,
-        controller($injector, $location, $scope) {
+        controller($injector, $location, $scope, kbnUrlStateStorage) {
           const service = deps.savedDashboards;
           const kbnUrl = $injector.get('kbnUrl');
           const dashboardConfig = deps.dashboardConfig;
 
           // syncs `_g` portion of url with query services
           const { stop: stopSyncingGlobalStateWithUrl } = syncQuery(
             deps.npDataStart.query,
-            deps.kbnUrlStateStorage
+            kbnUrlStateStorage
           );
 
           $scope.listingLimit = deps.uiSettings.get('savedObjects:listingLimit');
@@ -189,7 +199,7 @@ export function initDashboardApp(app, deps) {
         template: dashboardTemplate,
         controller: createNewDashboardCtrl,
         resolve: {
-          dash: function($rootScope, $route, redirectWhenMissing, kbnUrl) {
+          dash: function($rootScope, $route, redirectWhenMissing, kbnUrl, history) {
             const id = $route.current.params.id;
 
             return ensureDefaultIndexPattern(deps.core, deps.npDataStart, $rootScope, kbnUrl)
@@ -216,7 +226,6 @@ export function initDashboardApp(app, deps) {
                 // See https://github.com/elastic/kibana/issues/10951 for more context.
                 if (error instanceof SavedObjectNotFound && id === 'create') {
                   // Note preserve querystring part is necessary so the state is preserved through the redirect.
-                  const history = deps.history;
                   history.replace({
                     ...history.location, // preserve query,
                     pathname: DashboardConstants.CREATE_NEW_DASHBOARD_URL,

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
@@ -25,13 +25,12 @@ import {
   Plugin,
   SavedObjectsClientContract,
 } from 'kibana/public';
-import { createHashHistory } from 'history';
 import { i18n } from '@kbn/i18n';
 import { RenderDeps } from './np_ready/application';
 import { DataStart } from '../../../data/public';
 import { DataPublicPluginStart as NpDataStart } from '../../../../../plugins/data/public';
 import { IEmbeddableStart } from '../../../../../plugins/embeddable/public';
-import { createKbnUrlStateStorage, Storage } from '../../../../../plugins/kibana_utils/public';
+import { Storage } from '../../../../../plugins/kibana_utils/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
 import { DashboardConstants } from './np_ready/dashboard_constants';
 import {
@@ -97,12 +96,6 @@ export class DashboardPlugin implements Plugin {
           overlays: contextCore.overlays,
         });
 
-        const history = createHashHistory();
-        const kbnUrlStateStorage = createKbnUrlStateStorage({
-          history,
-          useHash: core.uiSettings.get('state:storeInSessionStorage'),
-        });
-
         const deps: RenderDeps = {
           core: contextCore as LegacyCoreStart,
           ...angularDependencies,
@@ -118,8 +111,6 @@ export class DashboardPlugin implements Plugin {
           embeddables,
           dashboardCapabilities: contextCore.application.capabilities.dashboard,
           localStorage: new Storage(localStorage),
-          history,
-          kbnUrlStateStorage,
         };
         const { renderApp } = await import('./np_ready/application');
         return renderApp(params.element, params.appBasePath, deps);

diff --git a/.../core_plugins/vis_default_editor/public/components/__snapshots__/agg_params.test.tsx.snap b/.../core_plugins/vis_default_editor/public/components/__snapshots__/agg_params.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.tsx
@@ -18,7 +18,7 @@
  */
 
 import React, { useCallback, useReducer, useEffect, useMemo } from 'react';
-import { EuiForm, EuiAccordion, EuiSpacer, EuiFormRow } from '@elastic/eui';
+import { EuiForm, EuiAccordion, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import useUnmount from 'react-use/lib/useUnmount';
 
@@ -219,7 +219,8 @@ function DefaultEditorAggParams({
       })}
 
       {params.advanced.length ? (
-        <EuiFormRow>
+        <>
+          <EuiSpacer size="m" />
           <EuiAccordion
             id="advancedAccordion"
             data-test-subj={`advancedParams-${agg.id}`}
@@ -247,7 +248,7 @@ function DefaultEditorAggParams({
               );
             })}
           </EuiAccordion>
-        </EuiFormRow>
+        </>
       ) : null}
     </EuiForm>
   );

diff --git a/src/legacy/core_plugins/vis_type_timeseries/index.ts b/src/legacy/core_plugins/vis_type_timeseries/index.ts
@@ -21,7 +21,6 @@ import { resolve } from 'path';
 import { Legacy } from 'kibana';
 
 import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy/types';
-import { VisTypeTimeseriesSetup } from '../../../plugins/vis_type_timeseries/server';
 
 const metricsPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
   new Plugin({
@@ -47,11 +46,6 @@ const metricsPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPlu
         },
       },
     },
-    init: (server: Legacy.Server) => {
-      const visTypeTimeSeriesPlugin = server.newPlatform.setup.plugins
-        .metrics as VisTypeTimeseriesSetup;
-      visTypeTimeSeriesPlugin.__legacy.registerLegacyAPI({ server });
-    },
     config(Joi: any) {
       return Joi.object({
         enabled: Joi.boolean().default(true),

diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/filter_ratio.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/filter_ratio.js
@@ -36,7 +36,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public';
-import { METRIC_TYPES } from '../../../common/metric_types';
+import { METRIC_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/metric_types';
 
 export const FilterRatioAgg = props => {
   const { series, fields, panel } = props;

diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/metric_select.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/metric_select.js
@@ -23,10 +23,10 @@ import { includes } from 'lodash';
 import { injectI18n } from '@kbn/i18n/react';
 import { EuiComboBox } from '@elastic/eui';
 import { calculateSiblings } from '../lib/calculate_siblings';
-import { calculateLabel } from '../../../common/calculate_label';
-import { basicAggs } from '../../../common/basic_aggs';
-import { toPercentileNumber } from '../../../common/to_percentile_number';
-import { METRIC_TYPES } from '../../../common/metric_types';
+import { calculateLabel } from '../../../../../../plugins/vis_type_timeseries/common/calculate_label';
+import { basicAggs } from '../../../../../../plugins/vis_type_timeseries/common/basic_aggs';
+import { toPercentileNumber } from '../../../../../../plugins/vis_type_timeseries/common/to_percentile_number';
+import { METRIC_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/metric_types';
 
 function createTypeFilter(restrict, exclude) {
   return metric => {

diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/moving_average.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/moving_average.js
@@ -36,7 +36,7 @@ import {
   EuiFieldNumber,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { MODEL_TYPES } from '../../../common/model_options';
+import { MODEL_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/model_options';
 
 const DEFAULTS = {
   model_type: MODEL_TYPES.UNWEIGHTED,

diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/std_agg.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/std_agg.js
@@ -34,7 +34,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public';
-import { METRIC_TYPES } from '../../../common/metric_types';
+import { METRIC_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/metric_types';
 
 export function StandardAgg(props) {
   const { model, panel, series, fields, uiRestrictions } = props;

diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/top_hit.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/top_hit.js
@@ -36,7 +36,7 @@ import {
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
 import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public';
-import { PANEL_TYPES } from '../../../common/panel_types';
+import { PANEL_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/panel_types';
 
 const isFieldTypeEnabled = (fieldRestrictions, fieldType) =>
   fieldRestrictions.length ? fieldRestrictions.includes(fieldType) : true;