diff options
Diffstat (limited to 'client')
3 files changed, 7 insertions, 7 deletions
diff --git a/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts b/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts index 0fbd65160..569d98482 100644 --- a/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts +++ b/client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts | |||
@@ -6,8 +6,8 @@ import { Notifier } from '@app/core' | |||
6 | import { ActivatedRoute } from '@angular/router' | 6 | import { ActivatedRoute } from '@angular/router' |
7 | import { Subscription } from 'rxjs' | 7 | import { Subscription } from 'rxjs' |
8 | import { map, switchMap } from 'rxjs/operators' | 8 | import { map, switchMap } from 'rxjs/operators' |
9 | import { RegisterSettingOptions } from '@shared/models/plugins/register-setting.model' | ||
10 | import { BuildFormArgument, FormReactive, FormValidatorService } from '@app/shared' | 9 | import { BuildFormArgument, FormReactive, FormValidatorService } from '@app/shared' |
10 | import { RegisterServerSettingOptions } from '@shared/models/plugins/register-server-setting.model' | ||
11 | 11 | ||
12 | @Component({ | 12 | @Component({ |
13 | selector: 'my-plugin-show-installed', | 13 | selector: 'my-plugin-show-installed', |
@@ -16,7 +16,7 @@ import { BuildFormArgument, FormReactive, FormValidatorService } from '@app/shar | |||
16 | }) | 16 | }) |
17 | export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy { | 17 | export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy { |
18 | plugin: PeerTubePlugin | 18 | plugin: PeerTubePlugin |
19 | registeredSettings: RegisterSettingOptions[] = [] | 19 | registeredSettings: RegisterServerSettingOptions[] = [] |
20 | pluginTypeLabel: string | 20 | pluginTypeLabel: string |
21 | 21 | ||
22 | private sub: Subscription | 22 | private sub: Subscription |
diff --git a/client/src/app/+admin/plugins/shared/plugin-api.service.ts b/client/src/app/+admin/plugins/shared/plugin-api.service.ts index 51f086a93..bfcaec011 100644 --- a/client/src/app/+admin/plugins/shared/plugin-api.service.ts +++ b/client/src/app/+admin/plugins/shared/plugin-api.service.ts | |||
@@ -10,8 +10,8 @@ import { ResultList } from '@shared/models' | |||
10 | import { PeerTubePlugin } from '@shared/models/plugins/peertube-plugin.model' | 10 | import { PeerTubePlugin } from '@shared/models/plugins/peertube-plugin.model' |
11 | import { ManagePlugin } from '@shared/models/plugins/manage-plugin.model' | 11 | import { ManagePlugin } from '@shared/models/plugins/manage-plugin.model' |
12 | import { InstallOrUpdatePlugin } from '@shared/models/plugins/install-plugin.model' | 12 | import { InstallOrUpdatePlugin } from '@shared/models/plugins/install-plugin.model' |
13 | import { RegisterSettingOptions } from '@shared/models/plugins/register-setting.model' | ||
14 | import { PeerTubePluginIndex } from '@shared/models/plugins/peertube-plugin-index.model' | 13 | import { PeerTubePluginIndex } from '@shared/models/plugins/peertube-plugin-index.model' |
14 | import { RegisterServerSettingOptions } from '@shared/models/plugins/register-server-setting.model' | ||
15 | 15 | ||
16 | @Injectable() | 16 | @Injectable() |
17 | export class PluginApiService { | 17 | export class PluginApiService { |
@@ -88,7 +88,7 @@ export class PluginApiService { | |||
88 | getPluginRegisteredSettings (pluginName: string, pluginType: PluginType) { | 88 | getPluginRegisteredSettings (pluginName: string, pluginType: PluginType) { |
89 | const path = PluginApiService.BASE_APPLICATION_URL + '/' + this.nameToNpmName(pluginName, pluginType) + '/registered-settings' | 89 | const path = PluginApiService.BASE_APPLICATION_URL + '/' + this.nameToNpmName(pluginName, pluginType) + '/registered-settings' |
90 | 90 | ||
91 | return this.authHttp.get<{ settings: RegisterSettingOptions[] }>(path) | 91 | return this.authHttp.get<{ settings: RegisterServerSettingOptions[] }>(path) |
92 | .pipe(catchError(res => this.restExtractor.handleError(res))) | 92 | .pipe(catchError(res => this.restExtractor.handleError(res))) |
93 | } | 93 | } |
94 | 94 | ||
diff --git a/client/src/app/core/plugins/plugin.service.ts b/client/src/app/core/plugins/plugin.service.ts index 5d180e5a0..e4a73de81 100644 --- a/client/src/app/core/plugins/plugin.service.ts +++ b/client/src/app/core/plugins/plugin.service.ts | |||
@@ -4,14 +4,14 @@ import { ServerConfigPlugin } from '@shared/models' | |||
4 | import { ServerService } from '@app/core/server/server.service' | 4 | import { ServerService } from '@app/core/server/server.service' |
5 | import { ClientScript } from '@shared/models/plugins/plugin-package-json.model' | 5 | import { ClientScript } from '@shared/models/plugins/plugin-package-json.model' |
6 | import { environment } from '../../../environments/environment' | 6 | import { environment } from '../../../environments/environment' |
7 | import { RegisterHookOptions } from '@shared/models/plugins/register-hook.model' | ||
8 | import { ReplaySubject } from 'rxjs' | 7 | import { ReplaySubject } from 'rxjs' |
9 | import { first, shareReplay } from 'rxjs/operators' | 8 | import { first, shareReplay } from 'rxjs/operators' |
10 | import { getHookType, internalRunHook } from '@shared/core-utils/plugins/hooks' | 9 | import { getHookType, internalRunHook } from '@shared/core-utils/plugins/hooks' |
11 | import { ClientHook, ClientHookName, clientHookObject } from '@shared/models/plugins/client-hook.model' | 10 | import { ClientHook, ClientHookName, clientHookObject } from '@shared/models/plugins/client-hook.model' |
12 | import { PluginClientScope } from '@shared/models/plugins/plugin-client-scope.type' | 11 | import { PluginClientScope } from '@shared/models/plugins/plugin-client-scope.type' |
12 | import { RegisterClientHookOptions } from '@shared/models/plugins/register-client-hook.model' | ||
13 | 13 | ||
14 | interface HookStructValue extends RegisterHookOptions { | 14 | interface HookStructValue extends RegisterClientHookOptions { |
15 | plugin: ServerConfigPlugin | 15 | plugin: ServerConfigPlugin |
16 | clientScript: ClientScript | 16 | clientScript: ClientScript |
17 | } | 17 | } |
@@ -164,7 +164,7 @@ export class PluginService implements ClientHook { | |||
164 | private loadPlugin (pluginInfo: PluginInfo) { | 164 | private loadPlugin (pluginInfo: PluginInfo) { |
165 | const { plugin, clientScript } = pluginInfo | 165 | const { plugin, clientScript } = pluginInfo |
166 | 166 | ||
167 | const registerHook = (options: RegisterHookOptions) => { | 167 | const registerHook = (options: RegisterClientHookOptions) => { |
168 | if (clientHookObject[options.target] !== true) { | 168 | if (clientHookObject[options.target] !== true) { |
169 | console.error('Unknown hook %s of plugin %s. Skipping.', options.target, plugin.name) | 169 | console.error('Unknown hook %s of plugin %s. Skipping.', options.target, plugin.name) |
170 | return | 170 | return |