X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fconfig%2Fedit-custom-config%2Fedit-custom-config.component.ts;h=3a47ba25e3f2ecf4286df5b46d21e69f3275da8d;hb=5fb2e2888ce032c638e4b75d07458642f0833e52;hp=c238a6c8183777d2529ad4c46681e26a265e55e8;hpb=a41b9da1a9ce49df82ea10c82de4c2fbc6d1b189;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index c238a6c81..3a47ba25e 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core' +import { AfterViewChecked, Component, OnInit, ViewChild } from '@angular/core' import { ConfigService } from '@app/+admin/config/shared/config.service' import { ServerService } from '@app/core/server/server.service' import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared' @@ -6,19 +6,34 @@ import { Notifier } from '@app/core' import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model' import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' +import { SelectItem } from 'primeng/api' +import { forkJoin } from 'rxjs' +import { ServerConfig } from '@shared/models' +import { ViewportScroller } from '@angular/common' +import { NgbNav } from '@ng-bootstrap/ng-bootstrap' @Component({ selector: 'my-edit-custom-config', templateUrl: './edit-custom-config.component.html', styleUrls: [ './edit-custom-config.component.scss' ] }) -export class EditCustomConfigComponent extends FormReactive implements OnInit { +export class EditCustomConfigComponent extends FormReactive implements OnInit, AfterViewChecked { + // FIXME: use built-in router + @ViewChild('nav') nav: NgbNav + + initDone = false customConfig: CustomConfig - resolutions: string[] = [] + resolutions: { id: string, label: string, description?: string }[] = [] transcodingThreadOptions: { label: string, value: number }[] = [] + languageItems: SelectItem[] = [] + categoryItems: SelectItem[] = [] + + private serverConfig: ServerConfig + constructor ( + private viewportScroller: ViewportScroller, protected formValidatorService: FormValidatorService, private customConfigValidatorsService: CustomConfigValidatorsService, private userValidatorsService: UserValidatorsService, @@ -30,11 +45,35 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { super() this.resolutions = [ - this.i18n('240p'), - this.i18n('360p'), - this.i18n('480p'), - this.i18n('720p'), - this.i18n('1080p') + { + id: '0p', + label: this.i18n('Audio-only'), + description: this.i18n('A .mp4 that keeps the original audio track, with no video') + }, + { + id: '240p', + label: this.i18n('240p') + }, + { + id: '360p', + label: this.i18n('360p') + }, + { + id: '480p', + label: this.i18n('480p') + }, + { + id: '720p', + label: this.i18n('720p') + }, + { + id: '1080p', + label: this.i18n('1080p') + }, + { + id: '2160p', + label: this.i18n('2160p') + } ] this.transcodingThreadOptions = [ @@ -54,25 +93,53 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { return this.configService.videoQuotaDailyOptions } + get availableThemes () { + return this.serverConfig.theme.registered + .map(t => t.name) + } + getResolutionKey (resolution: string) { return 'transcoding.resolutions.' + resolution } ngOnInit () { + this.serverConfig = this.serverService.getTmpConfig() + this.serverService.getConfig() + .subscribe(config => this.serverConfig = config) + const formGroupData: { [key in keyof CustomConfig ]: any } = { instance: { name: this.customConfigValidatorsService.INSTANCE_NAME, shortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION, description: null, - terms: null, - defaultClientRoute: null, + isNSFW: false, defaultNSFWPolicy: null, + + terms: null, + codeOfConduct: null, + + creationReason: null, + moderationInformation: null, + administrator: null, + maintenanceLifetime: null, + businessModel: null, + + hardwareInformation: null, + + categories: null, + languages: null, + + defaultClientRoute: null, + customizations: { javascript: null, css: null } }, + theme: { + default: null + }, services: { twitter: { username: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME, @@ -117,7 +184,13 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { threads: this.customConfigValidatorsService.TRANSCODING_THREADS, allowAdditionalExtensions: null, allowAudioFiles: null, - resolutions: {} + resolutions: {}, + hls: { + enabled: null + }, + webtorrent: { + enabled: null + } }, autoBlacklist: { videos: { @@ -131,6 +204,35 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { enabled: null, manualApproval: null } + }, + followings: { + instance: { + autoFollowBack: { + enabled: null + }, + autoFollowIndex: { + enabled: null, + indexUrl: this.customConfigValidatorsService.INDEX_URL + } + } + }, + broadcastMessage: { + enabled: null, + level: null, + dismissable: null, + message: null + }, + search: { + remoteUri: { + users: null, + anonymous: null + }, + searchIndex: { + enabled: null, + url: this.customConfigValidatorsService.SEARCH_INDEX_URL, + disableLocalSearch: null, + isDefaultSearch: null + } } } @@ -140,24 +242,20 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } } for (const resolution of this.resolutions) { - defaultValues.transcoding.resolutions[resolution] = 'false' - formGroupData.transcoding.resolutions[resolution] = null + defaultValues.transcoding.resolutions[resolution.id] = 'false' + formGroupData.transcoding.resolutions[resolution.id] = null } this.buildForm(formGroupData) + this.loadForm() + this.checkTranscodingFields() + } - this.configService.getCustomConfig() - .subscribe( - res => { - this.customConfig = res - - this.updateForm() - // Force form validation - this.forceCheck() - }, - - err => this.notifier.error(err.message) - ) + ngAfterViewChecked () { + if (!this.initDone) { + this.initDone = true + this.gotoAnchor() + } } isTranscodingEnabled () { @@ -168,14 +266,22 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { return this.form.value['signup']['enabled'] === true } + isSearchIndexEnabled () { + return this.form.value['search']['searchIndex']['enabled'] === true + } + + isAutoFollowIndexEnabled () { + return this.form.value['followings']['instance']['autoFollowIndex']['enabled'] === true + } + async formValidated () { - this.configService.updateCustomConfig(this.form.value) + this.configService.updateCustomConfig(this.form.getRawValue()) .subscribe( res => { this.customConfig = res // Reload general configuration - this.serverService.loadConfig() + this.serverService.resetConfig() this.updateForm() @@ -186,8 +292,83 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { ) } + getSelectedLanguageLabel () { + return this.i18n('{{\'{0} languages selected') + } + + getDefaultLanguageLabel () { + return this.i18n('No language') + } + + getSelectedCategoryLabel () { + return this.i18n('{{\'{0} categories selected') + } + + getDefaultCategoryLabel () { + return this.i18n('No category') + } + + gotoAnchor () { + const hashToNav = { + 'customizations': 'advanced-configuration' + } + const hash = window.location.hash.replace('#', '') + + if (hash && Object.keys(hashToNav).includes(hash)) { + this.nav.select(hashToNav[hash]) + setTimeout(() => this.viewportScroller.scrollToAnchor(hash), 100) + } + } + private updateForm () { this.form.patchValue(this.customConfig) } + private loadForm () { + forkJoin([ + this.configService.getCustomConfig(), + this.serverService.getVideoLanguages(), + this.serverService.getVideoCategories() + ]).subscribe( + ([ config, languages, categories ]) => { + this.customConfig = config + + this.languageItems = languages.map(l => ({ label: l.label, value: l.id })) + this.categoryItems = categories.map(l => ({ label: l.label, value: l.id })) + + this.updateForm() + // Force form validation + this.forceCheck() + }, + + err => this.notifier.error(err.message) + ) + } + + private checkTranscodingFields () { + const hlsControl = this.form.get('transcoding.hls.enabled') + const webtorrentControl = this.form.get('transcoding.webtorrent.enabled') + + webtorrentControl.valueChanges + .subscribe(newValue => { + if (newValue === false && !hlsControl.disabled) { + hlsControl.disable() + } + + if (newValue === true && !hlsControl.enabled) { + hlsControl.enable() + } + }) + + hlsControl.valueChanges + .subscribe(newValue => { + if (newValue === false && !webtorrentControl.disabled) { + webtorrentControl.disable() + } + + if (newValue === true && !webtorrentControl.enabled) { + webtorrentControl.enable() + } + }) + } }