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=f48b6fc1aa1ac91038c71c31d5cfa16871f568f4;hb=c199c427d4ae586339822320f20f512a7a19dc3f;hp=e614c1892a2abcc4f15927037b3f123fa734754a;hpb=7160878c4a7650261e476f08d031ea71fe38bd34;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 e614c1892..f48b6fc1a 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,7 +1,5 @@ import { Component, OnInit } from '@angular/core' -import { Router } from '@angular/router' import { ConfigService } from '@app/+admin/config/shared/config.service' -import { ConfirmService } from '@app/core' import { ServerService } from '@app/core/server/server.service' import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared' import { NotificationsService } from 'angular2-notifications' @@ -16,25 +14,9 @@ import { BuildFormDefaultValues, FormValidatorService } from '@app/shared/forms/ }) export class EditCustomConfigComponent extends FormReactive implements OnInit { customConfig: CustomConfig - resolutions = [ '240p', '360p', '480p', '720p', '1080p' ] - - videoQuotaOptions = [ - { value: -1, label: 'Unlimited' }, - { value: 0, label: '0' }, - { value: 100 * 1024 * 1024, label: '100MB' }, - { value: 500 * 1024 * 1024, label: '500MB' }, - { value: 1024 * 1024 * 1024, label: '1GB' }, - { value: 5 * 1024 * 1024 * 1024, label: '5GB' }, - { value: 20 * 1024 * 1024 * 1024, label: '20GB' }, - { value: 50 * 1024 * 1024 * 1024, label: '50GB' } - ] - transcodingThreadOptions = [ - { value: 0, label: 'Auto (via ffmpeg)' }, - { value: 1, label: '1' }, - { value: 2, label: '2' }, - { value: 4, label: '4' }, - { value: 8, label: '8' } - ] + + resolutions: string[] = [] + transcodingThreadOptions: { label: string, value: number }[] = [] private oldCustomJavascript: string private oldCustomCSS: string @@ -43,14 +25,36 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { protected formValidatorService: FormValidatorService, private customConfigValidatorsService: CustomConfigValidatorsService, private userValidatorsService: UserValidatorsService, - private router: Router, private notificationsService: NotificationsService, private configService: ConfigService, private serverService: ServerService, - private confirmService: ConfirmService, private i18n: I18n ) { 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) { @@ -58,7 +62,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } ngOnInit () { - const formGroupData = { + const formGroupData: { [key: string]: any } = { instanceName: this.customConfigValidatorsService.INSTANCE_NAME, instanceShortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION, instanceDescription: null, @@ -71,8 +75,12 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { 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, @@ -114,28 +122,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } async formValidated () { - const newCustomizationJavascript = this.form.value['customizationJavascript'] - const newCustomizationCSS = this.form.value['customizationCSS'] - - const customizations = [] - if (newCustomizationJavascript && newCustomizationJavascript !== this.oldCustomJavascript) customizations.push('JavaScript') - if (newCustomizationCSS && newCustomizationCSS !== this.oldCustomCSS) customizations.push('CSS') - - if (customizations.length !== 0) { - const customizationsText = customizations.join('/') - - // FIXME: i18n service does not support string concatenation - const message = this.i18n('You set custom {{customizationsText}}. ', { customizationsText }) + - this.i18n('This could lead to security issues or bugs if you do not understand it. ') + - this.i18n('Are you sure you want to update the configuration?') - - const label = this.i18n('Please type') + ` "I understand the ${customizationsText} I set" ` + this.i18n('to confirm.') - const expectedInputValue = `I understand the ${customizationsText} I set` - - const confirmRes = await this.confirmService.confirmWithInput(message, label, expectedInputValue) - if (confirmRes === false) return - } - const data: CustomConfig = { instance: { name: this.form.value['instanceName'], @@ -165,13 +151,15 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { }, signup: { enabled: this.form.value['signupEnabled'], - limit: this.form.value['signupLimit'] + limit: this.form.value['signupLimit'], + requiresEmailVerification: this.form.value['signupRequiresEmailVerification'] }, admin: { email: this.form.value['adminEmail'] }, user: { - videoQuota: this.form.value['userVideoQuota'] + videoQuota: this.form.value['userVideoQuota'], + videoQuotaDaily: this.form.value['userVideoQuotaDaily'] }, transcoding: { enabled: this.form.value['transcodingEnabled'], @@ -183,6 +171,16 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { '720p': this.form.value[this.getResolutionKey('720p')], '1080p': this.form.value[this.getResolutionKey('1080p')] } + }, + import: { + videos: { + http: { + enabled: this.form.value['importVideosHttpEnabled'] + }, + torrent: { + enabled: this.form.value['importVideosTorrentEnabled'] + } + } } } @@ -204,7 +202,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } private updateForm () { - const data = { + const data: { [key: string]: any } = { instanceName: this.customConfig.instance.name, instanceShortDescription: this.customConfig.instance.shortDescription, instanceDescription: this.customConfig.instance.description, @@ -217,12 +215,16 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { 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 + customizationCSS: this.customConfig.instance.customizations.css, + importVideosHttpEnabled: this.customConfig.import.videos.http.enabled, + importVideosTorrentEnabled: this.customConfig.import.videos.torrent.enabled } for (const resolution of this.resolutions) {