[Reporting] Move code out of Legacy

x-pack/index.js

@@ -6,7 +6,6 @@
 
 import { xpackMain } from './legacy/plugins/xpack_main';
 import { monitoring } from './legacy/plugins/monitoring';
-import { reporting } from './legacy/plugins/reporting';
 import { security } from './legacy/plugins/security';
 import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { beats } from './legacy/plugins/beats_management';
@@ -18,7 +17,6 @@ module.exports = function (kibana) {
  return [
  xpackMain(kibana),
  monitoring(kibana),
- reporting(kibana),
  spaces(kibana),
  security(kibana),
  dashboardMode(kibana),

x-pack/plugins/reporting/.gitignore

@@ -0,0 +1 @@
+.chromium

x-pack/plugins/reporting/common/index.ts

@@ -5,3 +5,4 @@
  */
 
 export { CancellationToken } from './cancellation_token';
+export { Poller } from './poller';

x-pack/plugins/reporting/common/types.ts

@@ -5,7 +5,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-export { ConfigType } from '../server/config';
+export { ReportingConfigType } from '../server/config';
 
 export type JobId = string;
 export type JobStatus =

x-pack/plugins/reporting/kibana.json

@@ -7,14 +7,13 @@
  ],
  "configPath": ["xpack", "reporting"],
  "requiredPlugins": [
+ "data",
  "home",
  "management",
  "licensing",
  "uiActions",
  "embeddable",
- "share",
- "kibanaLegacy",
- "licensing"
+ "share"
  ],
  "server": true,
  "ui": true

x-pack/plugins/reporting/public/plugin.tsx

@@ -26,7 +26,7 @@ import {
 import { ManagementSectionId, ManagementSetup } from '../../../../src/plugins/management/public';
 import { SharePluginSetup } from '../../../../src/plugins/share/public';
 import { LicensingPluginSetup } from '../../licensing/public';
-import { ConfigType, JobId, JobStatusBuckets } from '../common/types';
+import { ReportingConfigType, JobId, JobStatusBuckets } from '../common/types';
 import { JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY } from '../constants';
 import { getGeneralErrorToast } from './components';
 import { ReportListing } from './components/report_listing';
@@ -37,7 +37,7 @@ import { csvReportingProvider } from './share_context_menu/register_csv_reportin
 import { reportingPDFPNGProvider } from './share_context_menu/register_pdf_png_reporting';
 
 export interface ClientConfigType {
- poll: ConfigType['poll'];
+ poll: ReportingConfigType['poll'];
 }
 
 function getStored(): JobId[] {

x-pack/legacy/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts → x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts

@@ -9,7 +9,7 @@ import { map, trunc } from 'lodash';
 import open from 'opn';
 import { ElementHandle, EvaluateFn, Page, Response, SerializableOrJSHandle } from 'puppeteer';
 import { parse as parseUrl } from 'url';
-import { ViewZoomWidthHeight } from '../../../../export_types/common/layouts/layout';
+import { ViewZoomWidthHeight } from '../../../export_types/common/layouts/layout';
 import { LevelLogger } from '../../../lib';
 import { ConditionalHeaders, ElementPosition } from '../../../types';
 import { allowRequest, NetworkPolicy } from '../../network_policy';

x-pack/legacy/plugins/reporting/server/browsers/create_browser_driver_factory.ts → x-pack/plugins/reporting/server/browsers/create_browser_driver_factory.ts

@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { first } from 'rxjs/operators';
 import { ReportingConfig } from '../';
 import { LevelLogger } from '../lib';
 import { HeadlessChromiumDriverFactory } from './chromium/driver_factory';
@@ -19,7 +20,7 @@ export async function createBrowserDriverFactory(
  const browserConfig = captureConfig.browser.chromium;
  const browserAutoDownload = captureConfig.browser.autoDownload;
  const browserType = captureConfig.browser.type;
- const dataDir = config.kbnConfig.get('path', 'data');
+ const dataDir = await config.kbnConfig.get('path', 'data').pipe(first()).toPromise();
 
  if (browserConfig.disableSandbox) {
  logger.warning(`Enabling the Chromium sandbox provides an additional layer of protection.`);

x-pack/legacy/plugins/reporting/server/config/index.ts → x-pack/plugins/reporting/server/config/config.ts

@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Legacy } from 'kibana';
+import { Observable } from 'rxjs';
 import { get } from 'lodash';
-import { CoreSetup } from 'src/core/server';
-import { ConfigType as ReportingConfigType } from '../../../../../plugins/reporting/server';
+import { map } from 'rxjs/operators';
+import { CoreSetup, PluginInitializerContext } from 'src/core/server';
+import { ReportingConfigType } from './schema';
 
 // make config.get() aware of the value type it returns
 interface Config<BaseType> {
@@ -39,7 +40,7 @@ interface Config<BaseType> {
 }
 
 interface KbnServerConfigType {
- path: { data: string };
+ path: { data: Observable<string> };
  server: {
  basePath: string;
  host: string;
@@ -55,17 +56,16 @@ export interface ReportingConfig extends Config<ReportingConfigType> {
 }
 
 export const buildConfig = (
+ initContext: PluginInitializerContext<ReportingConfigType>,
  core: CoreSetup,
- server: Legacy.Server,
  reportingConfig: ReportingConfigType
 ): ReportingConfig => {
- const config = server.config();
  const { http } = core;
  const serverInfo = http.getServerInfo();
 
  const kbnConfig = {
  path: {
- data: config.get('path.data'),
+ data: initContext.config.legacy.globalConfig$.pipe(map((c) => c.path.data)),
  },
  server: {
  basePath: core.http.basePath.serverBasePath,
@@ -84,5 +84,3 @@ export const buildConfig = (
  },
  };
 };
-
-export { ReportingConfigType };