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=2afe80a037011d226fc24a98707daa6bb32d6ea4;hb=3a380e9a71037b0fcbace58a7599221e7cc76e20;hp=a5eddf6c2b49a7dbf5400874febe5c5a15cb00cd;hpb=5f46d28ccac4a20fcbb12c96a047a84a08e485ae;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 a5eddf6c2..2afe80a03 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,7 @@ +import omit from 'lodash-es/omit' +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' @@ -12,18 +15,26 @@ import { INDEX_URL_VALIDATOR, INSTANCE_NAME_VALIDATOR, INSTANCE_SHORT_DESCRIPTION_VALIDATOR, + MAX_INSTANCE_LIVES_VALIDATOR, + MAX_LIVE_DURATION_VALIDATOR, + MAX_USER_LIVES_VALIDATOR, + MAX_VIDEO_CHANNELS_PER_USER_VALIDATOR, SEARCH_INDEX_URL_VALIDATOR, SERVICES_TWITTER_USERNAME_VALIDATOR, SIGNUP_LIMIT_VALIDATOR, + SIGNUP_MINIMUM_AGE_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 { FormReactive, FormReactiveService } from '@app/shared/shared-forms' +import { CustomPageService } from '@app/shared/shared-main/custom-page' +import { CustomConfig, CustomPage, HTMLServerConfig } from '@shared/models' import { EditConfigurationService } from './edit-configuration.service' +type ComponentCustomConfig = CustomConfig & { + instanceCustomHomepage: CustomPage +} + @Component({ selector: 'my-edit-custom-config', templateUrl: './edit-custom-config.component.html', @@ -32,18 +43,21 @@ import { EditConfigurationService } from './edit-configuration.service' export class EditCustomConfigComponent extends FormReactive implements OnInit { activeNav: string - customConfig: CustomConfig - serverConfig: ServerConfig + customConfig: ComponentCustomConfig + serverConfig: HTMLServerConfig + + homepage: CustomPage languageItems: SelectOptionsItem[] = [] categoryItems: SelectOptionsItem[] = [] constructor ( + protected formReactiveService: FormReactiveService, private router: Router, private route: ActivatedRoute, - protected formValidatorService: FormValidatorService, private notifier: Notifier, private configService: ConfigService, + private customPage: CustomPageService, private serverService: ServerService, private editConfigurationService: EditConfigurationService ) { @@ -51,13 +65,9 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } ngOnInit () { - this.serverConfig = this.serverService.getTmpConfig() - this.serverService.getConfig() - .subscribe(config => { - this.serverConfig = config - }) + this.serverConfig = this.serverService.getHTMLConfig() - const formGroupData: { [key in keyof CustomConfig ]: any } = { + const formGroupData: { [key in keyof ComponentCustomConfig ]: any } = { instance: { name: INSTANCE_NAME_VALIDATOR, shortDescription: INSTANCE_SHORT_DESCRIPTION_VALIDATOR, @@ -96,18 +106,35 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { whitelisted: null } }, + client: { + videos: { + miniature: { + preferAuthorDisplayName: null + } + }, + menu: { + login: { + redirectOnSingleExternalAuth: null + } + } + }, cache: { previews: { size: CACHE_PREVIEWS_SIZE_VALIDATOR }, captions: { size: CACHE_CAPTIONS_SIZE_VALIDATOR + }, + torrents: { + size: CACHE_CAPTIONS_SIZE_VALIDATOR } }, signup: { enabled: null, limit: SIGNUP_LIMIT_VALIDATOR, - requiresEmailVerification: null + requiresApproval: null, + requiresEmailVerification: null, + minimumAge: SIGNUP_MINIMUM_AGE_VALIDATOR }, import: { videos: { @@ -118,6 +145,9 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { torrent: { enabled: null } + }, + videoChannelSynchronization: { + enabled: null } }, trending: { @@ -138,6 +168,9 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { videoQuota: USER_VIDEO_QUOTA_VALIDATOR, videoQuotaDaily: USER_VIDEO_QUOTA_DAILY_VALIDATOR }, + videoChannels: { + maxPerUser: MAX_VIDEO_CHANNELS_PER_USER_VALIDATOR + }, transcoding: { enabled: null, threads: TRANSCODING_THREADS_VALIDATOR, @@ -146,6 +179,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { profile: null, concurrency: CONCURRENCY_VALIDATOR, resolutions: {}, + alwaysTranscodeOriginalResolution: null, hls: { enabled: null }, @@ -156,18 +190,25 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { 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, + latencySetting: { + enabled: null + }, transcoding: { enabled: null, threads: TRANSCODING_THREADS_VALIDATOR, profile: null, - resolutions: {} + resolutions: {}, + alwaysTranscodeOriginalResolution: null } }, + videoStudio: { + enabled: null + }, autoBlacklist: { videos: { ofUsers: { @@ -209,6 +250,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { disableLocalSearch: null, isDefaultSearch: null } + }, + + instanceCustomHomepage: { + content: null } } @@ -241,26 +286,47 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { this.loadConfigAndUpdateForm() this.loadCategoriesAndLanguages() + + if (!this.isUpdateAllowed()) { + this.form.disable() + } } - async formValidated () { - const value: CustomConfig = this.form.getRawValue() + formValidated () { + this.forceCheck() + if (!this.form.valid) return - this.configService.updateCustomConfig(value) - .subscribe( - res => { - this.customConfig = res + const value: ComponentCustomConfig = this.form.getRawValue() + + forkJoin([ + this.configService.updateCustomConfig(omit(value, 'instanceCustomHomepage')), + this.customPage.updateInstanceHomepage(value.instanceCustomHomepage.content) + ]) + .subscribe({ + next: ([ resConfig ]) => { + const instanceCustomHomepage = { + content: value.instanceCustomHomepage.content + } + + this.customConfig = { ...resConfig, instanceCustomHomepage } // Reload general configuration this.serverService.resetConfig() + .subscribe(config => { + this.serverConfig = config + }) this.updateForm() this.notifier.success($localize`Configuration updated.`) }, - err => this.notifier.error(err.message) - ) + error: err => this.notifier.error(err.message) + }) + } + + isUpdateAllowed () { + return this.serverConfig.webadmin.configuration.edition.allowed === true } hasConsistentOptions () { @@ -287,35 +353,56 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { this.router.navigate([], { fragment: this.activeNav }) } + grabAllErrors (errorObjectArg?: any) { + const errorObject = errorObjectArg || this.formErrors + + let acc: string[] = [] + + for (const key of Object.keys(errorObject)) { + const value = errorObject[key] + if (!value) continue + + if (typeof value === 'string') { + acc.push(value) + } else { + acc = acc.concat(this.grabAllErrors(value)) + } + } + + return acc + } + private updateForm () { this.form.patchValue(this.customConfig) } private loadConfigAndUpdateForm () { - this.configService.getCustomConfig() - .subscribe(config => { - this.customConfig = config + forkJoin([ + this.configService.getCustomConfig(), + this.customPage.getInstanceHomepage() + ]).subscribe({ + next: ([ config, homepage ]) => { + this.customConfig = { ...config, instanceCustomHomepage: homepage } this.updateForm() - // Force form validation - this.forceCheck() + this.markAllAsDirty() }, - err => this.notifier.error(err.message) - ) + error: err => this.notifier.error(err.message) + }) } private loadCategoriesAndLanguages () { forkJoin([ this.serverService.getVideoLanguages(), this.serverService.getVideoCategories() - ]).subscribe( - ([ languages, categories ]) => { + ]).subscribe({ + next: ([ 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) - ) + error: err => this.notifier.error(err.message) + }) } }