From 7663e55a2cc46a413bceee2787d48902b15ae642 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 22 Jul 2019 16:31:47 +0200 Subject: Log error on unknown hook --- client/src/app/core/plugins/plugin.service.ts | 7 ++++++- client/src/app/search/search.component.ts | 2 ++ client/src/app/videos/video-list/video-local.component.ts | 4 ++-- client/src/app/videos/video-list/video-recently-added.component.ts | 4 ++-- client/src/app/videos/video-list/video-trending.component.ts | 4 ++-- .../app/videos/video-list/video-user-subscriptions.component.ts | 4 ++-- 6 files changed, 16 insertions(+), 9 deletions(-) (limited to 'client/src') diff --git a/client/src/app/core/plugins/plugin.service.ts b/client/src/app/core/plugins/plugin.service.ts index 7c1d69bec..90ebe5669 100644 --- a/client/src/app/core/plugins/plugin.service.ts +++ b/client/src/app/core/plugins/plugin.service.ts @@ -8,7 +8,7 @@ import { RegisterHookOptions } from '@shared/models/plugins/register-hook.model' import { ReplaySubject } from 'rxjs' import { first, shareReplay } from 'rxjs/operators' import { getHookType, internalRunHook } from '@shared/core-utils/plugins/hooks' -import { ClientHook, ClientHookName } from '@shared/models/plugins/client-hook.model' +import { ClientHook, ClientHookName, clientHookObject } from '@shared/models/plugins/client-hook.model' import { PluginClientScope } from '@shared/models/plugins/plugin-client-scope.type' interface HookStructValue extends RegisterHookOptions { @@ -155,6 +155,11 @@ export class PluginService implements ClientHook { const { plugin, clientScript } = pluginInfo const registerHook = (options: RegisterHookOptions) => { + if (clientHookObject[options.target] !== true) { + console.error('Unknown hook %s of plugin %s. Skipping.', options.target, plugin.name) + return + } + if (!this.hooks[options.target]) this.hooks[options.target] = [] this.hooks[options.target].push({ diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts index 55637771e..691e57619 100644 --- a/client/src/app/search/search.component.ts +++ b/client/src/app/search/search.component.ts @@ -79,6 +79,8 @@ export class SearchComponent implements OnInit, OnDestroy { err => this.notifier.error(err.text) ) + + this.hooks.runAction('action:search.init') } ngOnDestroy () { diff --git a/client/src/app/videos/video-list/video-local.component.ts b/client/src/app/videos/video-list/video-local.component.ts index 81b6ce493..b96e46e6a 100644 --- a/client/src/app/videos/video-list/video-local.component.ts +++ b/client/src/app/videos/video-list/video-local.component.ts @@ -69,8 +69,8 @@ export class VideoLocalComponent extends AbstractVideoList implements OnInit, On this.videoService.getVideos.bind(this.videoService), params, 'common', - 'filter:api.videos.list.local.params', - 'filter:api.videos.list.local.result' + 'filter:api.local-videos.videos.list.params', + 'filter:api.local-videos.videos.list.result' ) } diff --git a/client/src/app/videos/video-list/video-recently-added.component.ts b/client/src/app/videos/video-list/video-recently-added.component.ts index 638e7caed..5c50fd396 100644 --- a/client/src/app/videos/video-list/video-recently-added.component.ts +++ b/client/src/app/videos/video-list/video-recently-added.component.ts @@ -61,8 +61,8 @@ export class VideoRecentlyAddedComponent extends AbstractVideoList implements On this.videoService.getVideos.bind(this.videoService), params, 'common', - 'filter:api.videos.list.recently-added.params', - 'filter:api.videos.list.recently-added.result' + 'filter:api.recently-added-videos.videos.list.params', + 'filter:api.recently-added-videos.videos.list.result' ) } diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts index 0e69bfd64..19324da63 100644 --- a/client/src/app/videos/video-list/video-trending.component.ts +++ b/client/src/app/videos/video-list/video-trending.component.ts @@ -74,8 +74,8 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, this.videoService.getVideos.bind(this.videoService), params, 'common', - 'filter:api.videos.list.trending.params', - 'filter:api.videos.list.trending.result' + 'filter:api.trending-videos.videos.list.params', + 'filter:api.trending-videos.videos.list.result' ) } diff --git a/client/src/app/videos/video-list/video-user-subscriptions.component.ts b/client/src/app/videos/video-list/video-user-subscriptions.component.ts index ac325aeff..b36c85766 100644 --- a/client/src/app/videos/video-list/video-user-subscriptions.component.ts +++ b/client/src/app/videos/video-list/video-user-subscriptions.component.ts @@ -57,8 +57,8 @@ export class VideoUserSubscriptionsComponent extends AbstractVideoList implement this.videoService.getUserSubscriptionVideos.bind(this.videoService), params, 'common', - 'filter:api.videos.list.user-subscriptions.params', - 'filter:api.videos.list.user-subscriptions.result' + 'filter:api.user-subscriptions-videos.videos.list.params', + 'filter:api.user-subscriptions-videos.videos.list.result' ) } -- cgit v1.2.3