From 77e255f8837618d9c3d294cd8f5d4c62380fe06e Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Thu, 12 Mar 2020 09:58:37 +0100 Subject: [PATCH] Code cleanups --- src/legacy/ui/public/notify/fatal_error.ts | 19 ++----------------- src/legacy/ui/public/notify/index.js | 2 +- .../public/notify/lib/add_fatal_error.ts | 6 ------ 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/legacy/ui/public/notify/fatal_error.ts b/src/legacy/ui/public/notify/fatal_error.ts index 7fa2ae7ac6fe6a..5614ffea7913e7 100644 --- a/src/legacy/ui/public/notify/fatal_error.ts +++ b/src/legacy/ui/public/notify/fatal_error.ts @@ -18,23 +18,8 @@ */ import { npSetup } from 'ui/new_platform'; -import { - AngularHttpError, - formatAngularHttpError, - isAngularHttpError, -} from '../../../../plugins/kibana_legacy/public'; - -export function addFatalErrorCallback(callback: () => void) { - npSetup.core.fatalErrors.get$().subscribe(() => { - callback(); - }); -} +import { AngularHttpError, addFatalError } from '../../../../plugins/kibana_legacy/public'; export function fatalError(error: AngularHttpError | Error | string, location?: string) { - // add support for angular http errors to newPlatformFatalErrors - if (isAngularHttpError(error)) { - error = formatAngularHttpError(error); - } - - npSetup.core.fatalErrors.add(error, location); + addFatalError(npSetup.core.fatalErrors, error, location); } diff --git a/src/legacy/ui/public/notify/index.js b/src/legacy/ui/public/notify/index.js index 7ec6a394d7e885..51394033e4d2e0 100644 --- a/src/legacy/ui/public/notify/index.js +++ b/src/legacy/ui/public/notify/index.js @@ -17,6 +17,6 @@ * under the License. */ -export { fatalError, addFatalErrorCallback } from './fatal_error'; +export { fatalError } from './fatal_error'; export { toastNotifications } from './toasts'; export { banners } from './banners'; diff --git a/src/plugins/kibana_legacy/public/notify/lib/add_fatal_error.ts b/src/plugins/kibana_legacy/public/notify/lib/add_fatal_error.ts index ed5b8cdf823c62..928d59d71fbdf7 100644 --- a/src/plugins/kibana_legacy/public/notify/lib/add_fatal_error.ts +++ b/src/plugins/kibana_legacy/public/notify/lib/add_fatal_error.ts @@ -23,12 +23,6 @@ import { isAngularHttpError, } from './format_angular_http_error'; -export function addFatalErrorCallback(fatalErrors: FatalErrorsSetup, callback: () => void) { - fatalErrors.get$().subscribe(() => { - callback(); - }); -} - export function addFatalError( fatalErrors: FatalErrorsSetup, error: AngularHttpError | Error | string,