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 { NotificationsService } from 'angular2-notifications'
+import { Notifier } from '@app/core'
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 { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
@Component({
selector: 'my-edit-custom-config',
resolutions: string[] = []
transcodingThreadOptions: { label: string, value: number }[] = []
- private oldCustomJavascript: string
- private oldCustomCSS: string
-
constructor (
protected formValidatorService: FormValidatorService,
private customConfigValidatorsService: CustomConfigValidatorsService,
private userValidatorsService: UserValidatorsService,
- private notificationsService: NotificationsService,
+ private notifier: Notifier,
private configService: ConfigService,
private serverService: ServerService,
private i18n: I18n
}
getResolutionKey (resolution: string) {
- return 'transcodingResolution' + resolution
+ return 'transcoding.resolutions.' + 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.buildForm(formGroupData)
-
- this.configService.getCustomConfig()
- .subscribe(
- res => {
- this.customConfig = res
-
- 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(this.i18n('Error'), err.message)
- )
- }
-
- isTranscodingEnabled () {
- return this.form.value['transcodingEnabled'] === true
- }
-
- isSignupEnabled () {
- return this.form.value['signupEnabled'] === true
- }
-
- async formValidated () {
- const data: CustomConfig = {
+ const formGroupData: { [key in keyof CustomConfig ]: any } = {
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'],
+ name: this.customConfigValidatorsService.INSTANCE_NAME,
+ shortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION,
+ description: null,
+ terms: null,
+ defaultClientRoute: null,
+ isNSFW: false,
+ defaultNSFWPolicy: null,
customizations: {
- javascript: this.form.value['customizationJavascript'],
- css: this.form.value['customizationCSS']
+ javascript: null,
+ css: null
}
},
services: {
twitter: {
- username: this.form.value['servicesTwitterUsername'],
- whitelisted: this.form.value['servicesTwitterWhitelisted']
+ username: this.customConfigValidatorsService.SERVICES_TWITTER_USERNAME,
+ whitelisted: null
}
},
cache: {
previews: {
- size: this.form.value['cachePreviewsSize']
+ size: this.customConfigValidatorsService.CACHE_PREVIEWS_SIZE
},
captions: {
- size: this.form.value['cacheCaptionsSize']
+ size: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE
}
},
signup: {
- enabled: this.form.value['signupEnabled'],
- limit: this.form.value['signupLimit'],
- requiresEmailVerification: this.form.value['signupRequiresEmailVerification']
+ enabled: null,
+ limit: this.customConfigValidatorsService.SIGNUP_LIMIT,
+ requiresEmailVerification: null
+ },
+ import: {
+ videos: {
+ http: {
+ enabled: null
+ },
+ torrent: {
+ enabled: null
+ }
+ }
},
admin: {
- email: this.form.value['adminEmail']
+ email: this.customConfigValidatorsService.ADMIN_EMAIL
+ },
+ contactForm: {
+ enabled: null
},
user: {
- videoQuota: this.form.value['userVideoQuota'],
- videoQuotaDaily: this.form.value['userVideoQuotaDaily']
+ videoQuota: this.userValidatorsService.USER_VIDEO_QUOTA,
+ videoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY
},
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: this.customConfigValidatorsService.TRANSCODING_THREADS,
+ allowAdditionalExtensions: null,
+ allowAudioFiles: null,
+ resolutions: {}
},
- import: {
+ autoBlacklist: {
videos: {
- http: {
- enabled: this.form.value['importVideosHttpEnabled']
- },
- torrent: {
- enabled: this.form.value['importVideosTorrentEnabled']
+ ofUsers: {
+ enabled: null
}
}
+ },
+ followers: {
+ instance: {
+ enabled: null,
+ manualApproval: null
+ }
+ }
+ }
+
+ const defaultValues = {
+ transcoding: {
+ resolutions: {}
}
}
+ for (const resolution of this.resolutions) {
+ defaultValues.transcoding.resolutions[resolution] = 'false'
+ formGroupData.transcoding.resolutions[resolution] = null
+ }
- this.configService.updateCustomConfig(data)
+ this.buildForm(formGroupData)
+
+ this.configService.getCustomConfig()
+ .subscribe(
+ res => {
+ this.customConfig = res
+
+ this.updateForm()
+ // Force form validation
+ this.forceCheck()
+ },
+
+ err => this.notifier.error(err.message)
+ )
+ }
+
+ isTranscodingEnabled () {
+ return this.form.value['transcoding']['enabled'] === true
+ }
+
+ isSignupEnabled () {
+ return this.form.value['signup']['enabled'] === true
+ }
+
+ async formValidated () {
+ this.configService.updateCustomConfig(this.form.value)
.subscribe(
res => {
this.customConfig = res
this.updateForm()
- this.notificationsService.success(this.i18n('Success'), this.i18n('Configuration updated.'))
+ this.notifier.success(this.i18n('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
- }
-
- for (const resolution of this.resolutions) {
- const key = this.getResolutionKey(resolution)
- data[key] = this.customConfig.transcoding.resolutions[resolution]
- }
-
- this.form.patchValue(data)
+ this.form.patchValue(this.customConfig)
}
}
projects / github / Chocobozzz / PeerTube.git / blobdiff