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=bbdf1bfbe027918da8bff7f5136878892005f832;hb=4e55c132a007aa5466e1ac95a998df3ca88f3fb7;hp=7db65d038aff37e62b1e5a6067690e73145d5055;hpb=16a173bbc98509705105eec8189fa5543d9673c7;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 7db65d038..bbdf1bfbe 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,6 +1,8 @@ + import { forkJoin } from 'rxjs' -import { ViewportScroller } from '@angular/common' -import { AfterViewChecked, Component, OnInit, ViewChild } from '@angular/core' +import { SelectOptionsItem } from 'src/types/select-options-item.model' +import { Component, OnInit } from '@angular/core' +import { ActivatedRoute, Router } from '@angular/router' import { ConfigService } from '@app/+admin/config/shared/config.service' import { Notifier } from '@app/core' import { ServerService } from '@app/core/server/server.service' @@ -8,119 +10,47 @@ import { ADMIN_EMAIL_VALIDATOR, CACHE_CAPTIONS_SIZE_VALIDATOR, CACHE_PREVIEWS_SIZE_VALIDATOR, + CONCURRENCY_VALIDATOR, INDEX_URL_VALIDATOR, INSTANCE_NAME_VALIDATOR, INSTANCE_SHORT_DESCRIPTION_VALIDATOR, + MAX_INSTANCE_LIVES_VALIDATOR, + MAX_LIVE_DURATION_VALIDATOR, + MAX_USER_LIVES_VALIDATOR, SEARCH_INDEX_URL_VALIDATOR, SERVICES_TWITTER_USERNAME_VALIDATOR, SIGNUP_LIMIT_VALIDATOR, TRANSCODING_THREADS_VALIDATOR } from '@app/shared/form-validators/custom-config-validators' import { USER_VIDEO_QUOTA_DAILY_VALIDATOR, USER_VIDEO_QUOTA_VALIDATOR } from '@app/shared/form-validators/user-validators' -import { FormReactive, FormValidatorService, SelectOptionsItem } from '@app/shared/shared-forms' -import { NgbNav } from '@ng-bootstrap/ng-bootstrap' +import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' import { CustomConfig, ServerConfig } from '@shared/models' -import { pairwise } from 'rxjs/operators' +import { EditConfigurationService } from './edit-configuration.service' @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, AfterViewChecked { - // FIXME: use built-in router - @ViewChild('nav') nav: NgbNav +export class EditCustomConfigComponent extends FormReactive implements OnInit { + activeNav: string - initDone = false customConfig: CustomConfig - - resolutions: { id: string, label: string, description?: string }[] = [] - liveResolutions: { id: string, label: string, description?: string }[] = [] - transcodingThreadOptions: { label: string, value: number }[] = [] - liveMaxDurationOptions: { label: string, value: number }[] = [] + serverConfig: ServerConfig languageItems: SelectOptionsItem[] = [] categoryItems: SelectOptionsItem[] = [] - signupAlertMessage: string - - private serverConfig: ServerConfig - constructor ( - private viewportScroller: ViewportScroller, + private router: Router, + private route: ActivatedRoute, protected formValidatorService: FormValidatorService, private notifier: Notifier, private configService: ConfigService, - private serverService: ServerService + private serverService: ServerService, + private editConfigurationService: EditConfigurationService ) { super() - - this.resolutions = [ - { - id: '0p', - label: $localize`Audio-only`, - description: $localize`A .mp4 that keeps the original audio track, with no video` - }, - { - id: '240p', - label: $localize`240p` - }, - { - id: '360p', - label: $localize`360p` - }, - { - id: '480p', - label: $localize`480p` - }, - { - id: '720p', - label: $localize`720p` - }, - { - id: '1080p', - label: $localize`1080p` - }, - { - id: '2160p', - label: $localize`2160p` - } - ] - - this.liveResolutions = this.resolutions.filter(r => r.id !== '0p') - - this.transcodingThreadOptions = [ - { value: 0, label: $localize`Auto (via ffmpeg)` }, - { value: 1, label: '1' }, - { value: 2, label: '2' }, - { value: 4, label: '4' }, - { value: 8, label: '8' } - ] - - this.liveMaxDurationOptions = [ - { value: null, label: $localize`No limit` }, - { value: 1000 * 3600, label: $localize`1 hour` }, - { value: 1000 * 3600 * 3, label: $localize`3 hours` }, - { value: 1000 * 3600 * 5, label: $localize`5 hours` }, - { value: 1000 * 3600 * 10, label: $localize`10 hours` } - ] - } - - get videoQuotaOptions () { - return this.configService.videoQuotaOptions - } - - get videoQuotaDailyOptions () { - return this.configService.videoQuotaDailyOptions - } - - get availableThemes () { - return this.serverConfig.theme.registered - .map(t => t.name) - } - - getResolutionKey (resolution: string) { - return 'transcoding.resolutions.' + resolution } ngOnInit () { @@ -184,6 +114,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A }, import: { videos: { + concurrency: CONCURRENCY_VALIDATOR, http: { enabled: null }, @@ -192,6 +123,14 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A } } }, + trending: { + videos: { + algorithms: { + enabled: null, + default: null + } + } + }, admin: { email: ADMIN_EMAIL_VALIDATOR }, @@ -207,6 +146,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A threads: TRANSCODING_THREADS_VALIDATOR, allowAdditionalExtensions: null, allowAudioFiles: null, + profile: null, + concurrency: CONCURRENCY_VALIDATOR, resolutions: {}, hls: { enabled: null @@ -218,14 +159,15 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A live: { enabled: null, - maxDuration: null, - maxInstanceLives: null, - maxUserLives: null, + maxDuration: MAX_LIVE_DURATION_VALIDATOR, + maxInstanceLives: MAX_INSTANCE_LIVES_VALIDATOR, + maxUserLives: MAX_USER_LIVES_VALIDATOR, allowReplay: null, transcoding: { enabled: null, threads: TRANSCODING_THREADS_VALIDATOR, + profile: null, resolutions: {} } }, @@ -284,61 +226,29 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A } } - for (const resolution of this.resolutions) { + for (const resolution of this.editConfigurationService.getVODResolutions()) { defaultValues.transcoding.resolutions[resolution.id] = 'false' formGroupData.transcoding.resolutions[resolution.id] = null } - for (const resolution of this.liveResolutions) { + for (const resolution of this.editConfigurationService.getLiveResolutions()) { defaultValues.live.transcoding.resolutions[resolution.id] = 'false' formGroupData.live.transcoding.resolutions[resolution.id] = null } this.buildForm(formGroupData) - this.loadForm() - this.checkTranscodingFields() - this.checkSignupField() - } - - ngAfterViewChecked () { - if (!this.initDone) { - this.initDone = true - this.gotoAnchor() + if (this.route.snapshot.fragment) { + this.onNavChange(this.route.snapshot.fragment) } - } - - isTranscodingEnabled () { - return this.form.value['transcoding']['enabled'] === true - } - - isLiveEnabled () { - return this.form.value['live']['enabled'] === true - } - isLiveTranscodingEnabled () { - return this.form.value['live']['transcoding']['enabled'] === true - } - - isSignupEnabled () { - 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 + this.loadConfigAndUpdateForm() + this.loadCategoriesAndLanguages() } async formValidated () { const value: CustomConfig = this.form.getRawValue() - // Transform "null" to null - const maxDuration = value.live.maxDuration as any - if (maxDuration === 'null') value.live.maxDuration = null - this.configService.updateCustomConfig(value) .subscribe( res => { @@ -356,18 +266,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A ) } - 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) - } - } - hasConsistentOptions () { if (this.hasLiveAllowReplayConsistentOptions()) return true @@ -375,29 +273,32 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A } hasLiveAllowReplayConsistentOptions () { - if (this.isTranscodingEnabled() === false && this.isLiveEnabled() && this.form.value['live']['allowReplay'] === true) { + if ( + this.editConfigurationService.isTranscodingEnabled(this.form) === false && + this.editConfigurationService.isLiveEnabled(this.form) && + this.form.value['live']['allowReplay'] === true + ) { return false } return true } + onNavChange (newActiveNav: string) { + this.activeNav = newActiveNav + + this.router.navigate([], { fragment: this.activeNav }) + } + private updateForm () { this.form.patchValue(this.customConfig) } - private loadForm () { - forkJoin([ - this.configService.getCustomConfig(), - this.serverService.getVideoLanguages(), - this.serverService.getVideoCategories() - ]).subscribe( - ([ config, languages, categories ]) => { + private loadConfigAndUpdateForm () { + this.configService.getCustomConfig() + .subscribe(config => { this.customConfig = config - this.languageItems = languages.map(l => ({ label: l.label, id: l.id })) - this.categoryItems = categories.map(l => ({ label: l.label, id: l.id + '' })) - this.updateForm() // Force form validation this.forceCheck() @@ -407,53 +308,17 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A ) } - 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() - } - }) - } + private loadCategoriesAndLanguages () { + forkJoin([ + this.serverService.getVideoLanguages(), + this.serverService.getVideoCategories() + ]).subscribe( + ([ languages, categories ]) => { + this.languageItems = languages.map(l => ({ label: l.label, id: l.id })) + this.categoryItems = categories.map(l => ({ label: l.label, id: l.id + '' })) + }, - private checkSignupField () { - const signupControl = this.form.get('signup.enabled') - - signupControl.valueChanges - .pipe(pairwise()) - .subscribe(([ oldValue, newValue ]) => { - if (oldValue !== true && newValue === true) { - // tslint:disable:max-line-length - this.signupAlertMessage = $localize`You enabled signup: we automatically enabled the "Block new videos automatically" checkbox of the "Videos" section just below.` - - this.form.patchValue({ - autoBlacklist: { - videos: { - ofUsers: { - enabled: true - } - } - } - }) - } - }) + err => this.notifier.error(err.message) + ) } }