diff --git a/src/core/public/core_system.ts b/src/core/public/core_system.ts index 8d9a0ddce02..731cf461824 100644 --- a/src/core/public/core_system.ts +++ b/src/core/public/core_system.ts @@ -318,35 +318,4 @@ export class CoreSystem { this.workspaces.stop(); this.rootDomElement.textContent = ''; } - - public async displayWarning(title: string, text: string) { - const i18n = await this.i18n.start(); - const injectedMetadata = this.injectedMetadata.setup(); - this.fatalErrorsSetup = this.fatalErrors.setup({ - injectedMetadata, - i18n: this.i18n.getContext(), - }); - await this.integrations.setup(); - this.docLinks.setup(); - const http = this.http.setup({ injectedMetadata, fatalErrors: this.fatalErrorsSetup }); - const uiSettings = this.uiSettings.setup({ http, injectedMetadata }); - const notificationsTargetDomElement = document.createElement('div'); - const overlayTargetDomElement = document.createElement('div'); - const overlays = this.overlay.start({ - i18n, - targetDomElement: overlayTargetDomElement, - uiSettings, - }); - if (this.notifications) { - const toasts = await this.notifications.start({ - i18n, - overlays, - targetDomElement: notificationsTargetDomElement, - })?.toasts; - - if (toasts) { - toasts.addWarning({ title, text }); - } - } - } } diff --git a/src/core/public/osd_bootstrap.test.mocks.ts b/src/core/public/osd_bootstrap.test.mocks.ts index 982eef04b38..87a6ab49973 100644 --- a/src/core/public/osd_bootstrap.test.mocks.ts +++ b/src/core/public/osd_bootstrap.test.mocks.ts @@ -50,7 +50,6 @@ jest.doMock('@osd/i18n', () => ({ }, })); -export const displayWarningMock = jest.fn(); export const coreSystemMock = { setup: jest.fn().mockResolvedValue({ fatalErrors: fatalErrorMock, @@ -58,8 +57,9 @@ export const coreSystemMock = { start: jest.fn().mockResolvedValue({ application: applicationServiceMock.createInternalStartContract(), }), - displayWarning: displayWarningMock, }; jest.doMock('./core_system', () => ({ CoreSystem: jest.fn().mockImplementation(() => coreSystemMock), })); + +export const consoleWarnMock = jest.spyOn(console, 'warn').mockImplementation(() => {}); diff --git a/src/core/public/osd_bootstrap.test.ts b/src/core/public/osd_bootstrap.test.ts index ec7559c3c31..7630b4441ab 100644 --- a/src/core/public/osd_bootstrap.test.ts +++ b/src/core/public/osd_bootstrap.test.ts @@ -33,7 +33,7 @@ import { fatalErrorMock, i18nLoad, i18nSetLocale, - displayWarningMock, + consoleWarnMock, } from './osd_bootstrap.test.mocks'; import { __osdBootstrap__ } from './'; import { getLocaleInUrl } from './locale_helper'; @@ -110,7 +110,7 @@ describe('osd_bootstrap', () => { await __osdBootstrap__(); - expect(displayWarningMock).toHaveBeenCalledWith('Locale Warning', 'Invalid locale'); + expect(consoleWarnMock).toHaveBeenCalledWith('Locale Warning: Invalid locale'); expect((window as any).__localeWarning).toBeUndefined(); }); @@ -119,7 +119,7 @@ describe('osd_bootstrap', () => { await __osdBootstrap__(); - expect(displayWarningMock).toHaveBeenCalledWith('i18n Warning', 'Translation issue'); + expect(consoleWarnMock).toHaveBeenCalledWith('i18n Warning: Translation issue'); expect((window as any).__i18nWarning).toBeUndefined(); }); }); diff --git a/src/core/public/osd_bootstrap.ts b/src/core/public/osd_bootstrap.ts index fc131b277af..b1f00d25ca1 100644 --- a/src/core/public/osd_bootstrap.ts +++ b/src/core/public/osd_bootstrap.ts @@ -98,14 +98,16 @@ export async function __osdBootstrap__() { // Display the i18n warning if it exists if ((window as any).__i18nWarning) { const warning = (window as any).__i18nWarning; - coreSystem.displayWarning(warning.title, warning.text); + // eslint-disable-next-line no-console + console.warn(`${warning.title}: ${warning.text}`); delete (window as any).__i18nWarning; } // Display the locale warning if it exists if ((window as any).__localeWarning) { const warning = (window as any).__localeWarning; - coreSystem.displayWarning(warning.title, warning.text); + // eslint-disable-next-line no-console + console.warn(`${warning.title}: ${warning.text}`); delete (window as any).__localeWarning; } }