X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fplugins%2Fplugin-show-installed%2Fplugin-show-installed.component.ts;h=ec02cfcd9a344b89afe9e7efa08d7d3266879f16;hb=9ca0f688e9e8558233f1a538b96a43da44e35353;hp=2c5dbea95c82411718cbac9a81a28f5960f60666;hpb=c713017f3cd2d617da22c24c579342ec4121cfcd;p=github%2FChocobozzz%2FPeerTube.git 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 2c5dbea95..ec02cfcd9 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 @@ -2,7 +2,7 @@ import { Subscription } from 'rxjs' import { map, switchMap } from 'rxjs/operators' import { Component, OnDestroy, OnInit } from '@angular/core' import { ActivatedRoute } from '@angular/router' -import { Notifier, PluginService } from '@app/core' +import { HooksService, Notifier, PluginService } from '@app/core' import { BuildFormArgument } from '@app/shared/form-validators' import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' import { PeerTubePlugin, RegisterServerSettingOptions } from '@shared/models' @@ -19,12 +19,14 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit pluginTypeLabel: string private sub: Subscription + private npmName: string constructor ( protected formValidatorService: FormValidatorService, private pluginService: PluginService, private pluginAPIService: PluginApiService, private notifier: Notifier, + private hooks: HooksService, private route: ActivatedRoute ) { super() @@ -33,9 +35,9 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit ngOnInit () { this.sub = this.route.params.subscribe( routeParams => { - const npmName = routeParams['npmName'] + this.npmName = routeParams['npmName'] - this.loadPlugin(npmName) + this.loadPlugin(this.npmName) } ) } @@ -48,13 +50,13 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit const settings = this.form.value this.pluginAPIService.updatePluginSettings(this.plugin.name, this.plugin.type, settings) - .subscribe( - () => { + .subscribe({ + next: () => { this.notifier.success($localize`Settings updated.`) }, - err => this.notifier.error(err.message) - ) + error: err => this.notifier.error(err.message) + }) } hasRegisteredSettings () { @@ -62,7 +64,17 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit } isSettingHidden (setting: RegisterServerSettingOptions) { - return false + const script = this.pluginService.getRegisteredSettingsScript(this.npmName) + + if (!script?.isSettingHidden) return false + + return script.isSettingHidden({ setting, formValues: this.form.value }) + } + + getWrapperId (setting: RegisterServerSettingOptions) { + if (!setting.name) return + + return setting.name + '-wrapper' } private loadPlugin (npmName: string) { @@ -71,9 +83,10 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit return this.pluginAPIService.getPluginRegisteredSettings(plugin.name, plugin.type) .pipe(map(data => ({ plugin, registeredSettings: data.registeredSettings }))) })) - .subscribe( - async ({ plugin, registeredSettings }) => { + .subscribe({ + next: async ({ plugin, registeredSettings }) => { this.plugin = plugin + this.registeredSettings = await this.translateSettings(registeredSettings) this.pluginTypeLabel = this.pluginAPIService.getPluginTypeLabel(this.plugin.type) @@ -81,8 +94,8 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit this.buildSettingsForm() }, - err => this.notifier.error(err.message) - ) + error: err => this.notifier.error(err.message) + }) } private buildSettingsForm () { @@ -90,19 +103,21 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit const settingsValues: any = {} for (const setting of this.registeredSettings) { - buildOptions[ setting.name ] = null - settingsValues[ setting.name ] = this.getSetting(setting.name) + buildOptions[setting.name] = null + settingsValues[setting.name] = this.getSetting(setting.name) } this.buildForm(buildOptions) this.form.patchValue(settingsValues) + + this.hooks.runAction('action:admin-plugin-settings.init', 'admin-plugin', { npmName: this.npmName }) } private getSetting (name: string) { const settings = this.plugin.settings - if (settings && settings[name] !== undefined) return settings[name] + if (settings?.[name] !== undefined) return settings[name] const registered = this.registeredSettings.find(r => r.name === name) @@ -110,28 +125,10 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit } private async translateSettings (settings: RegisterServerSettingOptions[]) { - const npmName = this.pluginService.nameToNpmName(this.plugin.name, this.plugin.type) - for (const setting of settings) { - for (const key of [ 'label', 'html', 'descriptionHTML' ]) { - if (setting[key]) setting[key] = await this.pluginService.translateBy(npmName, setting[key]) - } - - if (Array.isArray(setting.options)) { - const newOptions = [] - - for (const o of setting.options) { - newOptions.push({ - value: o.value, - label: await this.pluginService.translateBy(npmName, o.label) - }) - } - - setting.options = newOptions - } + await this.pluginService.translateSetting(this.npmName, setting) } return settings } - }