+
+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'
-import { ServerService } from '@app/core/server/server.service'
-import { CustomConfigValidatorsService, FormReactive, UserValidatorsService } from '@app/shared'
import { Notifier } from '@app/core'
-import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
+import { ServerService } from '@app/core/server/server.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 { CustomPageService } from '@app/shared/shared-main/custom-page'
+import { CustomConfig, CustomPage, ServerConfig } from '@shared/models'
+import { EditConfigurationService } from './edit-configuration.service'
+
+type ComponentCustomConfig = CustomConfig & {
+ instanceCustomHomepage: CustomPage
+}
@Component({
selector: 'my-edit-custom-config',
styleUrls: [ './edit-custom-config.component.scss' ]
})
export class EditCustomConfigComponent extends FormReactive implements OnInit {
- customConfig: CustomConfig
+ activeNav: string
+
+ customConfig: ComponentCustomConfig
+ serverConfig: ServerConfig
+
+ homepage: CustomPage
- resolutions: { id: string, label: string }[] = []
- transcodingThreadOptions: { label: string, value: number }[] = []
+ languageItems: SelectOptionsItem[] = []
+ categoryItems: SelectOptionsItem[] = []
constructor (
+ private router: Router,
+ private route: ActivatedRoute,
protected formValidatorService: FormValidatorService,
- private customConfigValidatorsService: CustomConfigValidatorsService,
- private userValidatorsService: UserValidatorsService,
private notifier: Notifier,
private configService: ConfigService,
+ private customPage: CustomPageService,
private serverService: ServerService,
- private i18n: I18n
+ private editConfigurationService: EditConfigurationService
) {
super()
-
- this.resolutions = [
- {
- id: '240p',
- label: this.i18n('240p')
- },
- {
- id: '360p',
- label: this.i18n('360p')
- },
- {
- id: '480p',
- label: this.i18n('480p')
- },
- {
- id: '720p',
- label: this.i18n('720p')
- },
- {
- id: '1080p',
- label: this.i18n('1080p')
- },
- {
- id: '2160p',
- label: this.i18n('2160p')
- }
- ]
-
- 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 'transcoding.resolutions.' + resolution
}
ngOnInit () {
- const formGroupData: { [key in keyof CustomConfig ]: any } = {
+ this.serverConfig = this.serverService.getTmpConfig()
+ this.serverService.getConfig()
+ .subscribe(config => this.serverConfig = config)
+
+ const formGroupData: { [key in keyof ComponentCustomConfig ]: any } = {
instance: {
- name: this.customConfigValidatorsService.INSTANCE_NAME,
- shortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION,
+ name: INSTANCE_NAME_VALIDATOR,
+ shortDescription: INSTANCE_SHORT_DESCRIPTION_VALIDATOR,
description: null,
- terms: null,
- defaultClientRoute: null,
+
isNSFW: false,
defaultNSFWPolicy: null,
+
+ terms: null,
+ codeOfConduct: null,
+
+ creationReason: null,
+ moderationInformation: null,
+ administrator: null,
+ maintenanceLifetime: null,
+ businessModel: null,
+
+ hardwareInformation: null,
+
+ categories: null,
+ languages: null,
+
+ defaultClientRoute: null,
+
customizations: {
javascript: null,
css: null
}
},
+ theme: {
+ default: null
+ },
services: {
twitter: {
- username: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME,
+ username: SERVICES_TWITTER_USERNAME_VALIDATOR,
whitelisted: null
}
},
cache: {
previews: {
- size: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE
+ size: CACHE_PREVIEWS_SIZE_VALIDATOR
},
captions: {
- size: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE
+ size: CACHE_CAPTIONS_SIZE_VALIDATOR
+ },
+ torrents: {
+ size: CACHE_CAPTIONS_SIZE_VALIDATOR
}
},
signup: {
enabled: null,
- limit: this.customConfigValidatorsService.SIGNUP_LIMIT,
+ limit: SIGNUP_LIMIT_VALIDATOR,
requiresEmailVerification: null
},
import: {
videos: {
+ concurrency: CONCURRENCY_VALIDATOR,
http: {
enabled: null
},
}
}
},
+ trending: {
+ videos: {
+ algorithms: {
+ enabled: null,
+ default: null
+ }
+ }
+ },
admin: {
- email: this.customConfigValidatorsService.ADMIN_EMAIL
+ email: ADMIN_EMAIL_VALIDATOR
},
contactForm: {
enabled: null
},
user: {
- videoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
- videoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY
+ videoQuota: USER_VIDEO_QUOTA_VALIDATOR,
+ videoQuotaDaily: USER_VIDEO_QUOTA_DAILY_VALIDATOR
},
transcoding: {
enabled: null,
- threads: this.customConfigValidatorsService.TRANSCODING_THREADS,
+ threads: TRANSCODING_THREADS_VALIDATOR,
allowAdditionalExtensions: null,
allowAudioFiles: null,
- resolutions: {}
+ profile: null,
+ concurrency: CONCURRENCY_VALIDATOR,
+ resolutions: {},
+ hls: {
+ enabled: null
+ },
+ webtorrent: {
+ enabled: null
+ }
+ },
+ 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: {
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
+ }
+ },
+
+ instanceCustomHomepage: {
+ content: null
}
}
const defaultValues = {
transcoding: {
resolutions: {}
+ },
+ live: {
+ transcoding: {
+ resolutions: {}
+ }
}
}
- 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.editConfigurationService.getLiveResolutions()) {
+ defaultValues.live.transcoding.resolutions[resolution.id] = 'false'
+ formGroupData.live.transcoding.resolutions[resolution.id] = null
+ }
+
this.buildForm(formGroupData)
- this.configService.getCustomConfig()
+ if (this.route.snapshot.fragment) {
+ this.onNavChange(this.route.snapshot.fragment)
+ }
+
+ this.loadConfigAndUpdateForm()
+ this.loadCategoriesAndLanguages()
+ }
+
+ async formValidated () {
+ const value: ComponentCustomConfig = this.form.getRawValue()
+
+ forkJoin([
+ this.configService.updateCustomConfig(omit(value, 'instanceCustomHomepage')),
+ this.customPage.updateInstanceHomepage(value.instanceCustomHomepage.content)
+ ])
.subscribe(
- res => {
- this.customConfig = res
+ ([ resConfig ]) => {
+ const instanceCustomHomepage = {
+ content: value.instanceCustomHomepage.content
+ }
+
+ this.customConfig = { ...resConfig, instanceCustomHomepage }
+
+ // Reload general configuration
+ this.serverService.resetConfig()
+ .subscribe(config => this.serverConfig = config)
this.updateForm()
- // Force form validation
- this.forceCheck()
+
+ this.notifier.success($localize`Configuration updated.`)
},
err => this.notifier.error(err.message)
)
}
- isTranscodingEnabled () {
- return this.form.value['transcoding']['enabled'] === true
+ hasConsistentOptions () {
+ if (this.hasLiveAllowReplayConsistentOptions()) return true
+
+ return false
}
- isSignupEnabled () {
- return this.form.value['signup']['enabled'] === true
+ hasLiveAllowReplayConsistentOptions () {
+ if (
+ this.editConfigurationService.isTranscodingEnabled(this.form) === false &&
+ this.editConfigurationService.isLiveEnabled(this.form) &&
+ this.form.value['live']['allowReplay'] === true
+ ) {
+ return false
+ }
+
+ return true
}
- async formValidated () {
- this.configService.updateCustomConfig(this.form.value)
- .subscribe(
- res => {
- this.customConfig = res
+ onNavChange (newActiveNav: string) {
+ this.activeNav = newActiveNav
- // Reload general configuration
- this.serverService.loadConfig()
+ this.router.navigate([], { fragment: this.activeNav })
+ }
- this.updateForm()
+ grabAllErrors (errorObjectArg?: any) {
+ const errorObject = errorObjectArg || this.formErrors
- this.notifier.success(this.i18n('Configuration updated.'))
- },
+ let acc: string[] = []
- err => this.notifier.error(err.message)
- )
+ 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 () {
+ forkJoin([
+ this.configService.getCustomConfig(),
+ this.customPage.getInstanceHomepage()
+ ])
+ .subscribe(([ config, homepage ]) => {
+ this.customConfig = { ...config, instanceCustomHomepage: homepage }
+
+ 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)
+ )
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff