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=25b303f44f18929a75eb6ed46e5b96c093a53806;hpb=54b3316099ed7d2dfcb6d708fdb686f1e125ce61;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 25b303f44..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,11 +1,31 @@ + +import { forkJoin } from 'rxjs' +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' -import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared' -import { NotificationsService } from 'angular2-notifications' -import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model' -import { I18n } from '@ngx-translate/i18n-polyfill' -import { BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' +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 } from '@app/shared/shared-forms' +import { CustomConfig, ServerConfig } from '@shared/models' +import { EditConfigurationService } from './edit-configuration.service' @Component({ selector: 'my-edit-custom-config', @@ -13,226 +33,292 @@ import { BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/ styleUrls: [ './edit-custom-config.component.scss' ] }) export class EditCustomConfigComponent extends FormReactive implements OnInit { - customConfig: CustomConfig + activeNav: string - resolutions: string[] = [] - transcodingThreadOptions: { label: string, value: number }[] = [] + customConfig: CustomConfig + serverConfig: ServerConfig - private oldCustomJavascript: string - private oldCustomCSS: string + languageItems: SelectOptionsItem[] = [] + categoryItems: SelectOptionsItem[] = [] constructor ( + private router: Router, + private route: ActivatedRoute, protected formValidatorService: FormValidatorService, - private customConfigValidatorsService: CustomConfigValidatorsService, - private userValidatorsService: UserValidatorsService, - private notificationsService: NotificationsService, + private notifier: Notifier, private configService: ConfigService, private serverService: ServerService, - private i18n: I18n + private editConfigurationService: EditConfigurationService ) { super() - - this.resolutions = [ - this.i18n('240p'), - this.i18n('360p'), - this.i18n('480p'), - this.i18n('720p'), - this.i18n('1080p') - ] - - this.transcodingThreadOptions = [ - { value: 0, label: this.i18n('Auto (via ffmpeg)') }, - { value: 1, label: '1' }, - { value: 2, label: '2' }, - { value: 4, label: '4' }, - { value: 8, label: '8' } - ] - } - - get videoQuotaOptions () { - return this.configService.videoQuotaOptions - } - - get videoQuotaDailyOptions () { - return this.configService.videoQuotaDailyOptions - } - - getResolutionKey (resolution: string) { - return 'transcodingResolution' + resolution } ngOnInit () { - const formGroupData = { - instanceName: this.customConfigValidatorsService.INSTANCE_NAME, - instanceShortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION, - instanceDescription: null, - instanceTerms: null, - instanceDefaultClientRoute: null, - instanceDefaultNSFWPolicy: null, - servicesTwitterUsername: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME, - servicesTwitterWhitelisted: null, - cachePreviewsSize: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE, - cacheCaptionsSize: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE, - signupEnabled: null, - signupLimit: this.customConfigValidatorsService.SIGNUP_LIMIT, - signupRequiresEmailVerification: null, - importVideosHttpEnabled: null, - importVideosTorrentEnabled: null, - adminEmail: this.customConfigValidatorsService.ADMIN_EMAIL, - userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, - userVideoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY, - transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS, - transcodingEnabled: null, - customizationJavascript: null, - customizationCSS: null - } - - const defaultValues: BuildFormDefaultValues = {} - for (const resolution of this.resolutions) { - const key = this.getResolutionKey(resolution) - defaultValues[key] = 'false' - formGroupData[key] = null - } + this.serverConfig = this.serverService.getTmpConfig() + this.serverService.getConfig() + .subscribe(config => { + this.serverConfig = config + }) - this.buildForm(formGroupData) + const formGroupData: { [key in keyof CustomConfig ]: any } = { + instance: { + name: INSTANCE_NAME_VALIDATOR, + shortDescription: INSTANCE_SHORT_DESCRIPTION_VALIDATOR, + description: null, - this.configService.getCustomConfig() - .subscribe( - res => { - this.customConfig = res + isNSFW: false, + defaultNSFWPolicy: null, - this.oldCustomCSS = this.customConfig.instance.customizations.css - this.oldCustomJavascript = this.customConfig.instance.customizations.javascript + terms: null, + codeOfConduct: null, - this.updateForm() - // Force form validation - this.forceCheck() - }, + creationReason: null, + moderationInformation: null, + administrator: null, + maintenanceLifetime: null, + businessModel: null, - err => this.notificationsService.error(this.i18n('Error'), err.message) - ) - } + hardwareInformation: null, - isTranscodingEnabled () { - return this.form.value['transcodingEnabled'] === true - } + categories: null, + languages: null, - isSignupEnabled () { - return this.form.value['signupEnabled'] === true - } + defaultClientRoute: null, - async formValidated () { - const data: CustomConfig = { - instance: { - name: this.form.value['instanceName'], - shortDescription: this.form.value['instanceShortDescription'], - description: this.form.value['instanceDescription'], - terms: this.form.value['instanceTerms'], - defaultClientRoute: this.form.value['instanceDefaultClientRoute'], - defaultNSFWPolicy: this.form.value['instanceDefaultNSFWPolicy'], customizations: { - javascript: this.form.value['customizationJavascript'], - css: this.form.value['customizationCSS'] + javascript: null, + css: null } }, + theme: { + default: null + }, services: { twitter: { - username: this.form.value['servicesTwitterUsername'], - whitelisted: this.form.value['servicesTwitterWhitelisted'] + username: SERVICES_TWITTER_USERNAME_VALIDATOR, + whitelisted: null } }, cache: { previews: { - size: this.form.value['cachePreviewsSize'] + size: CACHE_PREVIEWS_SIZE_VALIDATOR }, captions: { - size: this.form.value['cacheCaptionsSize'] + size: CACHE_CAPTIONS_SIZE_VALIDATOR } }, signup: { - enabled: this.form.value['signupEnabled'], - limit: this.form.value['signupLimit'], - requiresEmailVerification: this.form.value['signupRequiresEmailVerification'] + enabled: null, + limit: SIGNUP_LIMIT_VALIDATOR, + requiresEmailVerification: null + }, + import: { + videos: { + concurrency: CONCURRENCY_VALIDATOR, + http: { + enabled: null + }, + torrent: { + enabled: null + } + } + }, + trending: { + videos: { + algorithms: { + enabled: null, + default: null + } + } }, admin: { - email: this.form.value['adminEmail'] + email: ADMIN_EMAIL_VALIDATOR + }, + contactForm: { + enabled: null }, user: { - videoQuota: this.form.value['userVideoQuota'], - videoQuotaDaily: this.form.value['userVideoQuotaDaily'] + videoQuota: USER_VIDEO_QUOTA_VALIDATOR, + videoQuotaDaily: USER_VIDEO_QUOTA_DAILY_VALIDATOR }, transcoding: { - enabled: this.form.value['transcodingEnabled'], - threads: this.form.value['transcodingThreads'], - resolutions: { - '240p': this.form.value[this.getResolutionKey('240p')], - '360p': this.form.value[this.getResolutionKey('360p')], - '480p': this.form.value[this.getResolutionKey('480p')], - '720p': this.form.value[this.getResolutionKey('720p')], - '1080p': this.form.value[this.getResolutionKey('1080p')] + enabled: null, + threads: TRANSCODING_THREADS_VALIDATOR, + allowAdditionalExtensions: null, + allowAudioFiles: null, + profile: null, + concurrency: CONCURRENCY_VALIDATOR, + resolutions: {}, + hls: { + enabled: null + }, + webtorrent: { + enabled: null } }, - import: { + live: { + enabled: 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: {} + } + }, + autoBlacklist: { videos: { - http: { - enabled: this.form.value['importVideosHttpEnabled'] + ofUsers: { + enabled: null + } + } + }, + followers: { + instance: { + enabled: null, + manualApproval: null + } + }, + followings: { + instance: { + autoFollowBack: { + enabled: null }, - torrent: { - enabled: this.form.value['importVideosTorrentEnabled'] + autoFollowIndex: { + enabled: null, + indexUrl: INDEX_URL_VALIDATOR } } + }, + broadcastMessage: { + enabled: null, + level: null, + dismissable: null, + message: null + }, + search: { + remoteUri: { + users: null, + anonymous: null + }, + searchIndex: { + enabled: null, + url: SEARCH_INDEX_URL_VALIDATOR, + disableLocalSearch: null, + isDefaultSearch: null + } + } + } + + const defaultValues = { + transcoding: { + resolutions: {} + }, + live: { + transcoding: { + resolutions: {} + } } } - this.configService.updateCustomConfig(data) + for (const resolution of this.editConfigurationService.getVODResolutions()) { + defaultValues.transcoding.resolutions[resolution.id] = 'false' + formGroupData.transcoding.resolutions[resolution.id] = null + } + + for (const resolution of this.editConfigurationService.getLiveResolutions()) { + defaultValues.live.transcoding.resolutions[resolution.id] = 'false' + formGroupData.live.transcoding.resolutions[resolution.id] = null + } + + this.buildForm(formGroupData) + + if (this.route.snapshot.fragment) { + this.onNavChange(this.route.snapshot.fragment) + } + + this.loadConfigAndUpdateForm() + this.loadCategoriesAndLanguages() + } + + async formValidated () { + const value: CustomConfig = this.form.getRawValue() + + this.configService.updateCustomConfig(value) .subscribe( res => { this.customConfig = res // Reload general configuration - this.serverService.loadConfig() + this.serverService.resetConfig() this.updateForm() - this.notificationsService.success(this.i18n('Success'), this.i18n('Configuration updated.')) + this.notifier.success($localize`Configuration updated.`) }, - err => this.notificationsService.error(this.i18n('Error'), err.message) + err => this.notifier.error(err.message) ) } - private updateForm () { - const data = { - instanceName: this.customConfig.instance.name, - instanceShortDescription: this.customConfig.instance.shortDescription, - instanceDescription: this.customConfig.instance.description, - instanceTerms: this.customConfig.instance.terms, - instanceDefaultClientRoute: this.customConfig.instance.defaultClientRoute, - instanceDefaultNSFWPolicy: this.customConfig.instance.defaultNSFWPolicy, - servicesTwitterUsername: this.customConfig.services.twitter.username, - servicesTwitterWhitelisted: this.customConfig.services.twitter.whitelisted, - cachePreviewsSize: this.customConfig.cache.previews.size, - cacheCaptionsSize: this.customConfig.cache.captions.size, - signupEnabled: this.customConfig.signup.enabled, - signupLimit: this.customConfig.signup.limit, - signupRequiresEmailVerification: this.customConfig.signup.requiresEmailVerification, - adminEmail: this.customConfig.admin.email, - userVideoQuota: this.customConfig.user.videoQuota, - userVideoQuotaDaily: this.customConfig.user.videoQuotaDaily, - transcodingThreads: this.customConfig.transcoding.threads, - transcodingEnabled: this.customConfig.transcoding.enabled, - customizationJavascript: this.customConfig.instance.customizations.javascript, - customizationCSS: this.customConfig.instance.customizations.css, - importVideosHttpEnabled: this.customConfig.import.videos.http.enabled, - importVideosTorrentEnabled: this.customConfig.import.videos.torrent.enabled - } + hasConsistentOptions () { + if (this.hasLiveAllowReplayConsistentOptions()) return true - for (const resolution of this.resolutions) { - const key = this.getResolutionKey(resolution) - data[key] = this.customConfig.transcoding.resolutions[resolution] + return false + } + + hasLiveAllowReplayConsistentOptions () { + if ( + this.editConfigurationService.isTranscodingEnabled(this.form) === false && + this.editConfigurationService.isLiveEnabled(this.form) && + this.form.value['live']['allowReplay'] === true + ) { + return false } - this.form.patchValue(data) + return true + } + + onNavChange (newActiveNav: string) { + this.activeNav = newActiveNav + + this.router.navigate([], { fragment: this.activeNav }) } + private updateForm () { + this.form.patchValue(this.customConfig) + } + + private loadConfigAndUpdateForm () { + this.configService.getCustomConfig() + .subscribe(config => { + this.customConfig = config + + this.updateForm() + // Force form validation + this.forceCheck() + }, + + err => this.notifier.error(err.message) + ) + } + + 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 + '' })) + }, + + err => this.notifier.error(err.message) + ) + } }