Merge branch 'main' into guided_onboarding_cypress

.backportrc.json

@@ -3,6 +3,7 @@
   "repoName": "kibana",
   "targetBranchChoices": [
     "main",
+    "8.6",
     "8.5",
     "8.4",
     "8.3",
@@ -42,7 +43,7 @@
     "backport"
   ],
   "branchLabelMapping": {
-    "^v8.6.0$": "main",
+    "^v8.7.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

package.json

@@ -11,7 +11,7 @@
     "dashboarding"
   ],
   "private": true,
-  "version": "8.6.0",
+  "version": "8.7.0",
   "branch": "main",
   "types": "./kibana.d.ts",
   "tsdocMetadata": "./build/tsdoc-metadata.json",

src/plugins/presentation_util/public/components/data_view_picker/data_view_picker.stories.tsx

@@ -11,9 +11,9 @@ import React, { useState } from 'react';
 import useMount from 'react-use/lib/useMount';
 import { DataView, DataViewListItem } from '@kbn/data-views-plugin/common';
 import { DataViewPicker } from './data_view_picker';
-import { injectStorybookDataView } from '../../services/storybook/data_views';
+import { injectStorybookDataView } from '../../services/data_views/data_views.story';
 import { storybookFlightsDataView } from '../../mocks';
-import { pluginServices, registry, StorybookParams } from '../../services/storybook';
+import { pluginServices, registry, StorybookParams } from '../../services/plugin_services.story';
 
 export default {
   component: DataViewPicker,

src/plugins/presentation_util/public/components/labs/project_list_item.stories.tsx

@@ -11,7 +11,7 @@ import { action } from '@storybook/addon-actions';
 import { mapValues } from 'lodash';
 
 import { EnvironmentStatus, ProjectConfig, ProjectID, ProjectStatus } from '../../../common';
-import { applyProjectStatus } from '../../services/labs';
+import { applyProjectStatus } from '../../services/labs/types';
 import { ProjectListItem, Props } from './project_list_item';
 
 import { projects as projectConfigs } from '../../../common';

src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard_selector.stories.tsx

@@ -9,7 +9,7 @@
 import React, { useState } from 'react';
 import { action } from '@storybook/addon-actions';
 
-import { StorybookParams } from '../services/storybook';
+import { StorybookParams } from '../services/plugin_services.story';
 import { SaveModalDashboardSelector } from './saved_object_save_modal_dashboard_selector';
 
 export default {

src/plugins/presentation_util/public/index.ts

@@ -18,7 +18,6 @@ export type {
   PresentationDashboardsService,
   PresentationLabsService,
 } from './services';
-export { getStubPluginServices } from './services';
 
 export type {
   KibanaPluginServiceFactory,

src/plugins/presentation_util/public/mocks.ts

@@ -9,7 +9,7 @@
 import { CoreStart } from '@kbn/core/public';
 import { PresentationUtilPluginStart } from './types';
 import { pluginServices } from './services';
-import { registry } from './services/kibana';
+import { registry } from './services/plugin_services';
 import { registerExpressionsLanguage } from '.';
 
 const createStartContract = (coreStart: CoreStart): PresentationUtilPluginStart => {

src/plugins/presentation_util/public/plugin.ts

@@ -7,8 +7,7 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
-import { pluginServices } from './services';
-import { registry } from './services/kibana';
+import { pluginServices, registry } from './services/plugin_services';
 import {
   PresentationUtilPluginSetupDeps,
   PresentationUtilPluginStartDeps,

src/plugins/presentation_util/public/services/storybook/capabilities.ts → src/plugins/presentation_util/public/services/capabilities/capabilities.story.ts

@@ -7,8 +7,8 @@
  */
 
 import { PluginServiceFactory } from '../create';
-import { StorybookParams } from '.';
-import { PresentationCapabilitiesService } from '../capabilities';
+import { StorybookParams } from '../plugin_services.story';
+import { PresentationCapabilitiesService } from './types';
 
 type CapabilitiesServiceFactory = PluginServiceFactory<
   PresentationCapabilitiesService,

src/plugins/presentation_util/public/services/stub/capabilities.ts → src/plugins/presentation_util/public/services/capabilities/capabilities.stub.ts

@@ -7,7 +7,7 @@
  */
 
 import { PluginServiceFactory } from '../create';
-import { PresentationCapabilitiesService } from '../capabilities';
+import { PresentationCapabilitiesService } from './types';
 
 type CapabilitiesServiceFactory = PluginServiceFactory<PresentationCapabilitiesService>;
 

src/plugins/presentation_util/public/services/kibana/capabilities.ts → src/plugins/presentation_util/public/services/capabilities/capabilities_service.ts

@@ -8,7 +8,7 @@
 
 import { PresentationUtilPluginStartDeps } from '../../types';
 import { KibanaPluginServiceFactory } from '../create';
-import { PresentationCapabilitiesService } from '../capabilities';
+import { PresentationCapabilitiesService } from './types';
 
 export type CapabilitiesServiceFactory = KibanaPluginServiceFactory<
   PresentationCapabilitiesService,

src/plugins/presentation_util/public/services/stub/dashboards.ts → src/plugins/presentation_util/public/services/dashboards/dashboards.stub.ts

@@ -7,7 +7,7 @@
  */
 
 import { PluginServiceFactory } from '../create';
-import { PresentationDashboardsService } from '../dashboards';
+import { PresentationDashboardsService } from './types';
 
 // TODO (clint): Create set of dashboards to stub and return.
 

src/plugins/presentation_util/public/services/kibana/dashboards.ts → src/plugins/presentation_util/public/services/dashboards/dashboards_service.ts

@@ -8,7 +8,7 @@
 
 import { PresentationUtilPluginStartDeps } from '../../types';
 import { KibanaPluginServiceFactory } from '../create';
-import { PresentationDashboardsService } from '../dashboards';
+import type { PresentationDashboardsService } from './types';
 
 export type DashboardsServiceFactory = KibanaPluginServiceFactory<
   PresentationDashboardsService,
@@ -18,7 +18,6 @@ export type DashboardsServiceFactory = KibanaPluginServiceFactory<
 export interface PartialDashboardAttributes {
   title: string;
 }
-
 export const dashboardsServiceFactory: DashboardsServiceFactory = ({ coreStart }) => {
   const findDashboards = async (query: string = '', fields: string[] = []) => {
     const { find } = coreStart.savedObjects.client;

src/plugins/presentation_util/public/services/dashboards.ts → src/plugins/presentation_util/public/services/dashboards/types.ts

@@ -7,7 +7,7 @@
  */
 
 import { SimpleSavedObject } from '@kbn/core/public';
-import { PartialDashboardAttributes } from './kibana/dashboards';
+import { PartialDashboardAttributes } from './dashboards_service';
 
 export interface PresentationDashboardsService {
   findDashboards: (

src/plugins/presentation_util/public/services/storybook/data_views.ts → src/plugins/presentation_util/public/services/data_views/data_views.story.ts

@@ -9,7 +9,7 @@
 import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { DataView } from '@kbn/data-views-plugin/common';
 import { PluginServiceFactory } from '../create';
-import { PresentationDataViewsService } from '../data_views';
+import { PresentationDataViewsService } from './types';
 
 export type DataViewsServiceFactory = PluginServiceFactory<PresentationDataViewsService>;
 

src/plugins/presentation_util/public/services/kibana/data_views.ts → src/plugins/presentation_util/public/services/data_views/data_views_service.ts

@@ -7,7 +7,7 @@
  */
 
 import { PresentationUtilPluginStartDeps } from '../../types';
-import { PresentationDataViewsService } from '../data_views';
+import { PresentationDataViewsService } from './types';
 import { KibanaPluginServiceFactory } from '../create';
 
 export type DataViewsServiceFactory = KibanaPluginServiceFactory<

src/plugins/presentation_util/public/services/index.ts

@@ -6,34 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { PresentationUtilPluginStart } from '../types';
-import { PluginServices } from './create';
-import { PresentationCapabilitiesService } from './capabilities';
-import { PresentationDashboardsService } from './dashboards';
-import { PresentationLabsService } from './labs';
-// eslint-disable-next-line @kbn/imports/no_boundary_crossing
-import { registry as stubRegistry } from './stub';
-import { PresentationDataViewsService } from './data_views';
-import { registerExpressionsLanguage } from '..';
+export { pluginServices } from './plugin_services';
 
-export type { PresentationCapabilitiesService } from './capabilities';
-export type { PresentationDashboardsService } from './dashboards';
-export type { PresentationLabsService } from './labs';
-
-export interface PresentationUtilServices {
-  dashboards: PresentationDashboardsService;
-  dataViews: PresentationDataViewsService;
-  capabilities: PresentationCapabilitiesService;
-  labs: PresentationLabsService;
-}
-
-export const pluginServices = new PluginServices<PresentationUtilServices>();
-
-export const getStubPluginServices = (): PresentationUtilPluginStart => {
-  pluginServices.setRegistry(stubRegistry.start({}));
-  return {
-    ContextProvider: pluginServices.getContextProvider(),
-    labsService: pluginServices.getServices().labs,
-    registerExpressionsLanguage,
-  };
-};
+export type {
+  PresentationCapabilitiesService,
+  PresentationDashboardsService,
+  PresentationLabsService,
+} from './types';

src/plugins/presentation_util/public/services/storybook/labs.ts → src/plugins/presentation_util/public/services/labs/labs.story.ts

@@ -9,7 +9,7 @@
 import { EnvironmentName, projectIDs, Project } from '../../../common';
 import { PluginServiceFactory } from '../create';
 import { projects, ProjectID, getProjectIDs, SolutionName } from '../../../common';
-import { PresentationLabsService, isEnabledByStorageValue, applyProjectStatus } from '../labs';
+import { PresentationLabsService, isEnabledByStorageValue, applyProjectStatus } from './types';
 
 export type LabsServiceFactory = PluginServiceFactory<PresentationLabsService>;
 

src/plugins/presentation_util/public/services/stub/labs.ts → src/plugins/presentation_util/public/services/labs/labs.stub.ts

@@ -16,7 +16,7 @@ import {
   SolutionName,
 } from '../../../common';
 import { PluginServiceFactory } from '../create';
-import { PresentationLabsService, isEnabledByStorageValue, applyProjectStatus } from '../labs';
+import { PresentationLabsService, isEnabledByStorageValue, applyProjectStatus } from './types';
 
 export type LabsServiceFactory = PluginServiceFactory<PresentationLabsService>;
 

src/plugins/presentation_util/public/services/kibana/labs.ts → src/plugins/presentation_util/public/services/labs/labs_service.ts

@@ -24,7 +24,7 @@ import {
   setStorageStatus,
   setUISettingsStatus,
   applyProjectStatus,
-} from '../labs';
+} from './types';
 
 export type LabsServiceFactory = KibanaPluginServiceFactory<
   PresentationLabsService,

src/plugins/presentation_util/public/services/labs.ts → src/plugins/presentation_util/public/services/labs/types.ts

@@ -17,7 +17,7 @@ import {
   environmentNames,
   isProjectEnabledByStatus,
   SolutionName,
-} from '../../common';
+} from '../../../common';
 
 export interface PresentationLabsService {
   isProjectEnabled: (id: ProjectID) => boolean;

src/plugins/presentation_util/public/services/storybook/index.ts → src/plugins/presentation_util/public/services/plugin_services.story.ts

@@ -11,31 +11,28 @@ import {
   PluginServiceProviders,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../create';
-import { dashboardsServiceFactory } from '../stub/dashboards';
-import { labsServiceFactory } from './labs';
-import { capabilitiesServiceFactory } from './capabilities';
-import { PresentationUtilServices } from '..';
-import { dataViewsServiceFactory } from './data_views';
+} from './create';
+import { PresentationUtilServices } from './types';
 
-export type { PluginServiceProviders } from '../create';
-export { PluginServiceProvider, PluginServiceRegistry } from '../create';
-export type { PresentationUtilServices } from '..';
+import { capabilitiesServiceFactory } from './capabilities/capabilities.story';
+import { dataViewsServiceFactory } from './data_views/data_views.story';
+import { dashboardsServiceFactory } from './dashboards/dashboards.stub';
+import { labsServiceFactory } from './labs/labs.story';
 
-export interface StorybookParams {
-  canAccessDashboards?: boolean;
-  canCreateNewDashboards?: boolean;
-  canSaveVisualizations?: boolean;
-  canSetAdvancedSettings?: boolean;
-}
-
-export const providers: PluginServiceProviders<PresentationUtilServices, StorybookParams> = {
+export const providers: PluginServiceProviders<PresentationUtilServices> = {
   capabilities: new PluginServiceProvider(capabilitiesServiceFactory),
-  dashboards: new PluginServiceProvider(dashboardsServiceFactory),
-  dataViews: new PluginServiceProvider(dataViewsServiceFactory),
   labs: new PluginServiceProvider(labsServiceFactory),
+  dataViews: new PluginServiceProvider(dataViewsServiceFactory),
+  dashboards: new PluginServiceProvider(dashboardsServiceFactory),
 };
 
 export const pluginServices = new PluginServices<PresentationUtilServices>();
 
 export const registry = new PluginServiceRegistry<PresentationUtilServices>(providers);
+
+export interface StorybookParams {
+  canAccessDashboards?: boolean;
+  canCreateNewDashboards?: boolean;
+  canSaveVisualizations?: boolean;
+  canSetAdvancedSettings?: boolean;
+}

src/plugins/presentation_util/public/services/plugin_services.stub.ts

@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { PluginServices, PluginServiceProviders, PluginServiceProvider } from './create';
+import { PresentationUtilServices } from './types';
+import { registry as stubRegistry } from './plugin_services.story';
+import { PresentationUtilPluginStart, registerExpressionsLanguage } from '..';
+
+import { capabilitiesServiceFactory } from './capabilities/capabilities.story';
+import { dataViewsServiceFactory } from './data_views/data_views.story';
+import { dashboardsServiceFactory } from './dashboards/dashboards.stub';
+import { labsServiceFactory } from './labs/labs.story';
+
+export const providers: PluginServiceProviders<PresentationUtilServices> = {
+  capabilities: new PluginServiceProvider(capabilitiesServiceFactory),
+  labs: new PluginServiceProvider(labsServiceFactory),
+  dataViews: new PluginServiceProvider(dataViewsServiceFactory),
+  dashboards: new PluginServiceProvider(dashboardsServiceFactory),
+};
+
+export const pluginServices = new PluginServices<PresentationUtilServices>();
+
+export const getStubPluginServices = (): PresentationUtilPluginStart => {
+  pluginServices.setRegistry(stubRegistry.start({}));
+  return {
+    ContextProvider: pluginServices.getContextProvider(),
+    labsService: pluginServices.getServices().labs,
+    registerExpressionsLanguage,
+  };
+};

src/plugins/presentation_util/public/services/kibana/index.ts → src/plugins/presentation_util/public/services/plugin_services.ts

@@ -7,18 +7,19 @@
  */
 
 import {
+  PluginServices,
   PluginServiceProviders,
   KibanaPluginServiceParams,
   PluginServiceProvider,
   PluginServiceRegistry,
-} from '../create';
-import { PresentationUtilPluginStartDeps } from '../../types';
-import { PresentationUtilServices } from '..';
+} from './create';
+import { PresentationUtilPluginStartDeps } from '../types';
 
-import { capabilitiesServiceFactory } from './capabilities';
-import { dataViewsServiceFactory } from './data_views';
-import { dashboardsServiceFactory } from './dashboards';
-import { labsServiceFactory } from './labs';
+import { capabilitiesServiceFactory } from './capabilities/capabilities_service';
+import { dataViewsServiceFactory } from './data_views/data_views_service';
+import { dashboardsServiceFactory } from './dashboards/dashboards_service';
+import { labsServiceFactory } from './labs/labs_service';
+import { PresentationUtilServices } from './types';
 
 export const providers: PluginServiceProviders<
   PresentationUtilServices,
@@ -30,6 +31,8 @@ export const providers: PluginServiceProviders<
   dashboards: new PluginServiceProvider(dashboardsServiceFactory),
 };
 
+export const pluginServices = new PluginServices<PresentationUtilServices>();
+
 export const registry = new PluginServiceRegistry<
   PresentationUtilServices,
   KibanaPluginServiceParams<PresentationUtilPluginStartDeps>