From f757be65b8dc2d3b286b5d8b22c64637d7bc2fb8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 15 Apr 2020 09:21:06 +0200 Subject: [PATCH] Better plugin notifier typings --- client/src/app/core/plugins/plugin.service.ts | 6 +++++- client/src/types/register-client-option.model.ts | 7 +++++-- shared/__ngcc_entry_points__.json | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 shared/__ngcc_entry_points__.json diff --git a/client/src/app/core/plugins/plugin.service.ts b/client/src/app/core/plugins/plugin.service.ts index b9d55a7e4..aa6823060 100644 --- a/client/src/app/core/plugins/plugin.service.ts +++ b/client/src/app/core/plugins/plugin.service.ts @@ -273,7 +273,11 @@ export class PluginService implements ClientHook { return this.authService.isLoggedIn() }, - notifier: this.notifier, + notifier: { + info: (text: string, title?: string, timeout?: number) => this.notifier.info(text, title, timeout), + error: (text: string, title?: string, timeout?: number) => this.notifier.error(text, title, timeout), + success: (text: string, title?: string, timeout?: number) => this.notifier.success(text, title, timeout) + }, translate: (value: string) => { return this.translationsObservable diff --git a/client/src/types/register-client-option.model.ts b/client/src/types/register-client-option.model.ts index 1faf13c42..b64652a0f 100644 --- a/client/src/types/register-client-option.model.ts +++ b/client/src/types/register-client-option.model.ts @@ -1,5 +1,4 @@ import { RegisterClientHookOptions } from '@shared/models/plugins/register-client-hook.model' -import { Notifier } from '@app/core' export type RegisterClientOptions = { registerHook: (options: RegisterClientHookOptions) => void @@ -14,7 +13,11 @@ export type RegisterClientHelpers = { getSettings: () => Promise<{ [ name: string ]: string }> - notifier: Notifier + notifier: { + info: (text: string, title?: string, timeout?: number) => void, + error: (text: string, title?: string, timeout?: number) => void, + success: (text: string, title?: string, timeout?: number) => void + } translate: (toTranslate: string) => Promise } diff --git a/shared/__ngcc_entry_points__.json b/shared/__ngcc_entry_points__.json deleted file mode 100644 index 179bdcda3..000000000 --- a/shared/__ngcc_entry_points__.json +++ /dev/null @@ -1 +0,0 @@ -{"ngccVersion":"9.1.0","configFileHash":"87c535c3ce0eac2a54c246892e0e21a1","lockFileHash":"d04bf20520f2518af162e882d32081e4","entryPointPaths":[]} \ No newline at end of file