From ce27fa17666ef35357634f26e1f23ba8ebef255c Mon Sep 17 00:00:00 2001 From: Joel Griffith Date: Fri, 13 Mar 2020 14:02:44 -0700 Subject: [PATCH] Move relative pathing to absolute --- x-pack/plugins/reporting/index.d.ts | 2 -- .../plugins/reporting/public/components/general_error.tsx | 2 +- .../plugins/reporting/public/components/job_failure.tsx | 2 +- .../plugins/reporting/public/components/job_success.tsx | 2 +- .../reporting/public/components/job_warning_formulas.tsx | 2 +- .../reporting/public/components/job_warning_max_size.tsx | 2 +- .../reporting/public/components/report_listing.tsx | 2 +- .../public/components/reporting_panel_content.tsx | 2 +- .../public/components/screen_capture_panel_content.tsx | 2 +- x-pack/plugins/reporting/public/index.ts | 2 +- .../plugins/reporting/public/lib/reporting_api_client.ts | 2 +- .../plugins/reporting/public/lib/stream_handler.test.ts | 2 +- .../public/panel_actions/get_csv_panel_action.tsx | 5 ++--- x-pack/plugins/reporting/public/plugin.tsx | 8 +------- .../public/share_context_menu/register_csv_reporting.tsx | 2 +- .../share_context_menu/register_pdf_png_reporting.tsx | 2 +- 16 files changed, 16 insertions(+), 25 deletions(-) diff --git a/x-pack/plugins/reporting/index.d.ts b/x-pack/plugins/reporting/index.d.ts index dcdb3b6c0839fe..7c1a2ebd7d9de5 100644 --- a/x-pack/plugins/reporting/index.d.ts +++ b/x-pack/plugins/reporting/index.d.ts @@ -13,8 +13,6 @@ import { NotificationsStart, } from '../../../src/core/public'; -export { ToastsSetup, HttpSetup, ApplicationStart, IUiSettingsClient } from 'src/core/public'; - export type JobId = string; export type JobStatus = 'completed' | 'pending' | 'processing' | 'failed'; diff --git a/x-pack/plugins/reporting/public/components/general_error.tsx b/x-pack/plugins/reporting/public/components/general_error.tsx index feb0ea0062ace8..bc1ec901cc4750 100644 --- a/x-pack/plugins/reporting/public/components/general_error.tsx +++ b/x-pack/plugins/reporting/public/components/general_error.tsx @@ -7,7 +7,7 @@ import React, { Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiCallOut, EuiSpacer } from '@elastic/eui'; -import { ToastInput } from '../../../../../src/core/public'; +import { ToastInput } from 'src/core/public'; import { toMountPoint } from '../../../../../src/plugins/kibana_react/public'; export const getGeneralErrorToast = (errorText: string, err: Error): ToastInput => ({ diff --git a/x-pack/plugins/reporting/public/components/job_failure.tsx b/x-pack/plugins/reporting/public/components/job_failure.tsx index 7544cbf9064580..628ecb56b9c21d 100644 --- a/x-pack/plugins/reporting/public/components/job_failure.tsx +++ b/x-pack/plugins/reporting/public/components/job_failure.tsx @@ -8,7 +8,7 @@ import React, { Fragment } from 'react'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiCallOut, EuiSpacer } from '@elastic/eui'; -import { ToastInput } from '../../../../../src/core/public'; +import { ToastInput } from 'src/core/public'; import { toMountPoint } from '../../../../../src/plugins/kibana_react/public'; import { JobSummary, ManagementLinkFn } from '../../index.d'; diff --git a/x-pack/plugins/reporting/public/components/job_success.tsx b/x-pack/plugins/reporting/public/components/job_success.tsx index b538cef030e0d8..c2feac382ca7ad 100644 --- a/x-pack/plugins/reporting/public/components/job_success.tsx +++ b/x-pack/plugins/reporting/public/components/job_success.tsx @@ -6,7 +6,7 @@ import React, { Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; -import { ToastInput } from '../../../../../src/core/public'; +import { ToastInput } from 'src/core/public'; import { toMountPoint } from '../../../../../src/plugins/kibana_react/public'; import { JobId, JobSummary } from '../../index.d'; import { ReportLink } from './report_link'; diff --git a/x-pack/plugins/reporting/public/components/job_warning_formulas.tsx b/x-pack/plugins/reporting/public/components/job_warning_formulas.tsx index 7981237c9b7810..22f656dbe738cf 100644 --- a/x-pack/plugins/reporting/public/components/job_warning_formulas.tsx +++ b/x-pack/plugins/reporting/public/components/job_warning_formulas.tsx @@ -6,7 +6,7 @@ import React, { Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; -import { ToastInput } from '../../../../../src/core/public'; +import { ToastInput } from 'src/core/public'; import { toMountPoint } from '../../../../../src/plugins/kibana_react/public'; import { JobId, JobSummary } from '../../index.d'; import { ReportLink } from './report_link'; diff --git a/x-pack/plugins/reporting/public/components/job_warning_max_size.tsx b/x-pack/plugins/reporting/public/components/job_warning_max_size.tsx index caeda6fc01678a..1abba8888bb818 100644 --- a/x-pack/plugins/reporting/public/components/job_warning_max_size.tsx +++ b/x-pack/plugins/reporting/public/components/job_warning_max_size.tsx @@ -6,7 +6,7 @@ import React, { Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; -import { ToastInput } from '../../../../../src/core/public'; +import { ToastInput } from 'src/core/public'; import { toMountPoint } from '../../../../../src/plugins/kibana_react/public'; import { JobId, JobSummary } from '../../index.d'; import { ReportLink } from './report_link'; diff --git a/x-pack/plugins/reporting/public/components/report_listing.tsx b/x-pack/plugins/reporting/public/components/report_listing.tsx index f82b15470a1be2..13fca019f32840 100644 --- a/x-pack/plugins/reporting/public/components/report_listing.tsx +++ b/x-pack/plugins/reporting/public/components/report_listing.tsx @@ -22,7 +22,7 @@ import { EuiToolTip, } from '@elastic/eui'; -import { ToastsSetup, ApplicationStart } from '../../'; +import { ToastsSetup, ApplicationStart } from 'src/core/public'; import { LicensingPluginSetup, ILicense } from '../../../licensing/public'; import { Poller } from '../../common/poller'; import { JobStatuses, JOB_COMPLETION_NOTIFICATIONS_POLLER_CONFIG } from '../../constants'; diff --git a/x-pack/plugins/reporting/public/components/reporting_panel_content.tsx b/x-pack/plugins/reporting/public/components/reporting_panel_content.tsx index 9ca98664d081d7..6bff50de63335a 100644 --- a/x-pack/plugins/reporting/public/components/reporting_panel_content.tsx +++ b/x-pack/plugins/reporting/public/components/reporting_panel_content.tsx @@ -8,9 +8,9 @@ import { EuiButton, EuiCopy, EuiForm, EuiFormRow, EuiSpacer, EuiText } from '@el import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react'; import React, { Component, ReactElement } from 'react'; import url from 'url'; +import { ToastsSetup } from 'src/core/public'; import { ReportingAPIClient } from '../lib/reporting_api_client'; import { toMountPoint } from '../../../../../src/plugins/kibana_react/public'; -import { ToastsSetup } from '../../'; interface Props { apiClient: ReportingAPIClient; diff --git a/x-pack/plugins/reporting/public/components/screen_capture_panel_content.tsx b/x-pack/plugins/reporting/public/components/screen_capture_panel_content.tsx index b1ebb2583e5ebc..9fb74a70ff1ac0 100644 --- a/x-pack/plugins/reporting/public/components/screen_capture_panel_content.tsx +++ b/x-pack/plugins/reporting/public/components/screen_capture_panel_content.tsx @@ -7,9 +7,9 @@ import { EuiSpacer, EuiSwitch } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import React, { Component, Fragment } from 'react'; +import { ToastsSetup } from 'src/core/public'; import { ReportingPanelContent } from './reporting_panel_content'; import { ReportingAPIClient } from '../lib/reporting_api_client'; -import { ToastsSetup } from '../../'; interface Props { apiClient: ReportingAPIClient; diff --git a/x-pack/plugins/reporting/public/index.ts b/x-pack/plugins/reporting/public/index.ts index 7e70f68096fbea..185367a85bdc0b 100644 --- a/x-pack/plugins/reporting/public/index.ts +++ b/x-pack/plugins/reporting/public/index.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { PluginInitializerContext } from '../../../../src/core/public'; +import { PluginInitializerContext } from 'src/core/public'; import { ReportingPublicPlugin } from './plugin'; import * as jobCompletionNotifications from './lib/job_completion_notifications'; diff --git a/x-pack/plugins/reporting/public/lib/reporting_api_client.ts b/x-pack/plugins/reporting/public/lib/reporting_api_client.ts index abc6f7559125f2..ddfeb144d3cd74 100644 --- a/x-pack/plugins/reporting/public/lib/reporting_api_client.ts +++ b/x-pack/plugins/reporting/public/lib/reporting_api_client.ts @@ -7,8 +7,8 @@ import { stringify } from 'query-string'; import rison from 'rison-node'; +import { HttpSetup } from 'src/core/public'; import { add } from './job_completion_notifications'; -import { HttpSetup } from '../../'; import { API_LIST_URL, API_BASE_URL, diff --git a/x-pack/plugins/reporting/public/lib/stream_handler.test.ts b/x-pack/plugins/reporting/public/lib/stream_handler.test.ts index 9c92825fd8f471..3a2c7de9ad0f0a 100644 --- a/x-pack/plugins/reporting/public/lib/stream_handler.test.ts +++ b/x-pack/plugins/reporting/public/lib/stream_handler.test.ts @@ -5,7 +5,7 @@ */ import sinon, { stub } from 'sinon'; -import { NotificationsStart } from '../../../../../src/core/public'; +import { NotificationsStart } from 'src/core/public'; import { SourceJob, JobSummary } from '../../index.d'; import { ReportingAPIClient } from './reporting_api_client'; import { ReportingNotifierStreamHandler } from './stream_handler'; diff --git a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx index 7a1fbd49f9f7ec..282ee75815fa51 100644 --- a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx +++ b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx @@ -6,12 +6,11 @@ import dateMath from '@elastic/datemath'; import { i18n } from '@kbn/i18n'; import moment from 'moment-timezone'; +import { CoreSetup } from 'src/core/public'; +import { Action, IncompatibleActionError } from '../../../../../src/plugins/ui_actions/public'; import { LicensingPluginSetup } from '../../../licensing/public'; import { checkLicense } from '../lib/license_check'; -import { CoreSetup } from '../../../../../src/core/public'; -import { Action, IncompatibleActionError } from '../../../../../src/plugins/ui_actions/public'; - import { ViewMode, IEmbeddable, diff --git a/x-pack/plugins/reporting/public/plugin.tsx b/x-pack/plugins/reporting/public/plugin.tsx index 6454c3de9e655d..08ba10ff692078 100644 --- a/x-pack/plugins/reporting/public/plugin.tsx +++ b/x-pack/plugins/reporting/public/plugin.tsx @@ -10,6 +10,7 @@ import ReactDOM from 'react-dom'; import { catchError, filter, map, mergeMap, takeUntil } from 'rxjs/operators'; import { i18n } from '@kbn/i18n'; import { ManagementSetup } from 'src/plugins/management/public'; +import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public'; import { I18nProvider } from '@kbn/i18n/react'; import { UiActionsSetup } from 'src/plugins/ui_actions/public'; @@ -31,13 +32,6 @@ import { HomePublicPluginSetup, } from '../../../../src/plugins/home/public'; -import { - CoreSetup, - CoreStart, - Plugin, - PluginInitializerContext, -} from '../../../../src/core/public'; - import { JOB_COMPLETION_NOTIFICATIONS_POLLER_CONFIG, JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY, diff --git a/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx b/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx index 8f544c091b79ca..9d4f475cde79a8 100644 --- a/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx +++ b/x-pack/plugins/reporting/public/share_context_menu/register_csv_reporting.tsx @@ -7,12 +7,12 @@ import { i18n } from '@kbn/i18n'; import React from 'react'; +import { ToastsSetup } from 'src/core/public'; import { ReportingPanelContent } from '../components/reporting_panel_content'; import { ReportingAPIClient } from '../lib/reporting_api_client'; import { checkLicense } from '../lib/license_check'; import { LicensingPluginSetup } from '../../../licensing/public'; import { ShareContext } from '../../../../../src/plugins/share/public'; -import { ToastsSetup } from '../..'; interface ReportingProvider { apiClient: ReportingAPIClient; diff --git a/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx b/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx index 0bccea385bd4c0..e9eaa9c2ed2a17 100644 --- a/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx +++ b/x-pack/plugins/reporting/public/share_context_menu/register_pdf_png_reporting.tsx @@ -7,12 +7,12 @@ import { i18n } from '@kbn/i18n'; import moment from 'moment-timezone'; import React from 'react'; +import { ToastsSetup, IUiSettingsClient } from 'src/core/public'; import { ReportingAPIClient } from '../lib/reporting_api_client'; import { checkLicense } from '../lib/license_check'; import { ScreenCapturePanelContent } from '../components/screen_capture_panel_content'; import { LicensingPluginSetup } from '../../../licensing/public'; import { ShareContext } from '../../../../../src/plugins/share/public'; -import { ToastsSetup, IUiSettingsClient } from '../../'; interface ReportingPDFPNGProvider { apiClient: ReportingAPIClient;