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=a5eddf6c2b49a7dbf5400874febe5c5a15cb00cd;hb=5f46d28ccac4a20fcbb12c96a047a84a08e485ae;hp=2ab371cbbdc0c2e457d82f9f389ad94fc729565f;hpb=0db1a226507a39b0a663e3e63f04851836a44d5a;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 2ab371cbb..a5eddf6c2 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,19 +1,28 @@ + import { Component, OnInit } from '@angular/core' -import { FormBuilder, FormGroup } from '@angular/forms' -import { Router } from '@angular/router' +import { ActivatedRoute, Router } from '@angular/router' import { ConfigService } from '@app/+admin/config/shared/config.service' -import { ConfirmService } from '@app/core' +import { Notifier } from '@app/core' import { ServerService } from '@app/core/server/server.service' -import { FormReactive, USER_VIDEO_QUOTA } from '@app/shared' import { - ADMIN_EMAIL, - CACHE_PREVIEWS_SIZE, - INSTANCE_NAME, INSTANCE_SHORT_DESCRIPTION, - SIGNUP_LIMIT, - TRANSCODING_THREADS -} from '@app/shared/forms/form-validators/custom-config' -import { NotificationsService } from 'angular2-notifications' -import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model' + ADMIN_EMAIL_VALIDATOR, + CACHE_CAPTIONS_SIZE_VALIDATOR, + CACHE_PREVIEWS_SIZE_VALIDATOR, + CONCURRENCY_VALIDATOR, + INDEX_URL_VALIDATOR, + INSTANCE_NAME_VALIDATOR, + INSTANCE_SHORT_DESCRIPTION_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 { forkJoin } from 'rxjs' +import { SelectOptionsItem } from 'src/types/select-options-item.model' +import { EditConfigurationService } from './edit-configuration.service' @Component({ selector: 'my-edit-custom-config', @@ -21,230 +30,292 @@ import { CustomConfig } from '../../../../../../shared/models/server/custom-conf styleUrls: [ './edit-custom-config.component.scss' ] }) export class EditCustomConfigComponent extends FormReactive implements OnInit { + activeNav: string + 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: 1, label: '1' }, - { value: 2, label: '2' }, - { value: 4, label: '4' }, - { value: 8, label: '8' } - ] - - form: FormGroup - formErrors = { - instanceName: '', - instanceShortDescription: '', - instanceDescription: '', - instanceTerms: '', - instanceDefaultClientRoute: '', - instanceDefaultNSFWPolicy: '', - cachePreviewsSize: '', - signupLimit: '', - adminEmail: '', - userVideoQuota: '', - transcodingThreads: '', - customizationJavascript: '', - customizationCSS: '' - } - validationMessages = { - instanceShortDescription: INSTANCE_SHORT_DESCRIPTION.MESSAGES, - instanceName: INSTANCE_NAME.MESSAGES, - cachePreviewsSize: CACHE_PREVIEWS_SIZE.MESSAGES, - signupLimit: SIGNUP_LIMIT.MESSAGES, - adminEmail: ADMIN_EMAIL.MESSAGES, - userVideoQuota: USER_VIDEO_QUOTA.MESSAGES - } + serverConfig: ServerConfig - private oldCustomJavascript: string - private oldCustomCSS: string + languageItems: SelectOptionsItem[] = [] + categoryItems: SelectOptionsItem[] = [] constructor ( - private formBuilder: FormBuilder, private router: Router, - private notificationsService: NotificationsService, + private route: ActivatedRoute, + protected formValidatorService: FormValidatorService, + private notifier: Notifier, private configService: ConfigService, private serverService: ServerService, - private confirmService: ConfirmService + private editConfigurationService: EditConfigurationService ) { super() } - getResolutionKey (resolution: string) { - return 'transcodingResolution' + resolution - } - - buildForm () { - const formGroupData = { - instanceName: [ '', INSTANCE_NAME.VALIDATORS ], - instanceShortDescription: [ '', INSTANCE_SHORT_DESCRIPTION.VALIDATORS ], - instanceDescription: [ '' ], - instanceTerms: [ '' ], - instanceDefaultClientRoute: [ '' ], - instanceDefaultNSFWPolicy: [ '' ], - cachePreviewsSize: [ '', CACHE_PREVIEWS_SIZE.VALIDATORS ], - signupEnabled: [ ], - signupLimit: [ '', SIGNUP_LIMIT.VALIDATORS ], - adminEmail: [ '', ADMIN_EMAIL.VALIDATORS ], - userVideoQuota: [ '', USER_VIDEO_QUOTA.VALIDATORS ], - transcodingThreads: [ '', TRANSCODING_THREADS.VALIDATORS ], - transcodingEnabled: [ ], - customizationJavascript: [ '' ], - customizationCSS: [ '' ] - } - - for (const resolution of this.resolutions) { - const key = this.getResolutionKey(resolution) - formGroupData[key] = [ false ] - } - - this.form = this.formBuilder.group(formGroupData) - - this.form.valueChanges.subscribe(data => this.onValueChanged(data)) - } - ngOnInit () { - this.buildForm() - - this.configService.getCustomConfig() - .subscribe( - res => { - this.customConfig = res + this.serverConfig = this.serverService.getTmpConfig() + this.serverService.getConfig() + .subscribe(config => { + this.serverConfig = config + }) - this.oldCustomCSS = this.customConfig.instance.customizations.css - this.oldCustomJavascript = this.customConfig.instance.customizations.javascript - - this.updateForm() - // Force form validation - this.forceCheck() - }, - - err => this.notificationsService.error('Error', err.message) - ) - } + const formGroupData: { [key in keyof CustomConfig ]: any } = { + instance: { + name: INSTANCE_NAME_VALIDATOR, + shortDescription: INSTANCE_SHORT_DESCRIPTION_VALIDATOR, + description: null, - isTranscodingEnabled () { - return this.form.value['transcodingEnabled'] === true - } + isNSFW: false, + defaultNSFWPolicy: null, - isSignupEnabled () { - return this.form.value['signupEnabled'] === true - } + terms: null, + codeOfConduct: null, - async formValidated () { - const newCustomizationJavascript = this.form.value['customizationJavascript'] - const newCustomizationCSS = this.form.value['customizationCSS'] + creationReason: null, + moderationInformation: null, + administrator: null, + maintenanceLifetime: null, + businessModel: null, - const customizations = [] - if (newCustomizationJavascript && newCustomizationJavascript !== this.oldCustomJavascript) customizations.push('JavaScript') - if (newCustomizationCSS && newCustomizationCSS !== this.oldCustomCSS) customizations.push('CSS') + hardwareInformation: null, - if (customizations.length !== 0) { - const customizationsText = customizations.join('/') + categories: null, + languages: null, - const message = `You set custom ${customizationsText}. ` + - 'This could lead to security issues or bugs if you do not understand it. ' + - 'Are you sure you want to update the configuration?' - const label = `Please type "I understand the ${customizationsText} I set" to confirm.` - const expectedInputValue = `I understand the ${customizationsText} I set` + defaultClientRoute: null, - const confirmRes = await this.confirmService.confirmWithInput(message, label, expectedInputValue) - if (confirmRes === false) return - } - - 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: SERVICES_TWITTER_USERNAME_VALIDATOR, + whitelisted: null } }, cache: { previews: { - size: this.form.value['cachePreviewsSize'] + size: CACHE_PREVIEWS_SIZE_VALIDATOR + }, + captions: { + size: CACHE_CAPTIONS_SIZE_VALIDATOR } }, signup: { - enabled: this.form.value['signupEnabled'], - limit: this.form.value['signupLimit'] + 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'] + 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 + } + }, + live: { + enabled: null, + + maxDuration: null, + maxInstanceLives: null, + maxUserLives: null, + allowReplay: null, + + transcoding: { + enabled: null, + threads: TRANSCODING_THREADS_VALIDATOR, + profile: null, + resolutions: {} + } + }, + autoBlacklist: { + videos: { + ofUsers: { + enabled: null + } + } + }, + followers: { + instance: { + enabled: null, + manualApproval: null + } + }, + followings: { + instance: { + autoFollowBack: { + enabled: null + }, + 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('Success', 'Configuration updated.') + this.notifier.success($localize`Configuration updated.`) }, - err => this.notificationsService.error('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, - cachePreviewsSize: this.customConfig.cache.previews.size, - signupEnabled: this.customConfig.signup.enabled, - signupLimit: this.customConfig.signup.limit, - adminEmail: this.customConfig.admin.email, - userVideoQuota: this.customConfig.user.videoQuota, - transcodingThreads: this.customConfig.transcoding.threads, - transcodingEnabled: this.customConfig.transcoding.enabled, - customizationJavascript: this.customConfig.instance.customizations.javascript, - customizationCSS: this.customConfig.instance.customizations.css - } + 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) + ) + } }