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=5f23c80a20546d907182ebacaf1fc8e0b627be1b;hpb=5c7d650827cc471a03e7fa18362bcbcbe5d30838;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 5f23c80a2..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,14 +1,28 @@
+
 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 { SelectItem } from 'primeng/api'
+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,
+  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 { first } from 'rxjs/operators'
+import { SelectOptionsItem } from 'src/types/select-options-item.model'
+import { EditConfigurationService } from './edit-configuration.service'
 
 @Component({
   selector: 'my-edit-custom-config',
@@ -16,87 +30,37 @@ import { first } from 'rxjs/operators'
   styleUrls: [ './edit-custom-config.component.scss' ]
 })
 export class EditCustomConfigComponent extends FormReactive implements OnInit {
-  customConfig: CustomConfig
+  activeNav: string
 
-  resolutions: { id: string, label: string }[] = []
-  transcodingThreadOptions: { label: string, value: number }[] = []
+  customConfig: CustomConfig
+  serverConfig: ServerConfig
 
-  languageItems: SelectItem[] = []
-  categoryItems: SelectItem[] = []
+  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 serverService: ServerService,
-    private i18n: I18n
+    private editConfigurationService: EditConfigurationService
   ) {
     super()
-
-    this.resolutions = [
-       {
-        id: '0p',
-        label: this.i18n('Audio-only')
-      },
-      {
-        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
-  }
-
-  get availableThemes () {
-    return this.serverService.getConfig().theme.registered
-      .map(t => t.name)
-  }
-
-  getResolutionKey (resolution: string) {
-    return 'transcoding.resolutions.' + resolution
   }
 
   ngOnInit () {
+    this.serverConfig = this.serverService.getTmpConfig()
+    this.serverService.getConfig()
+        .subscribe(config => {
+          this.serverConfig = config
+        })
+
     const formGroupData: { [key in keyof CustomConfig ]: any } = {
       instance: {
-        name: this.customConfigValidatorsService.INSTANCE_NAME,
-        shortDescription: this.customConfigValidatorsService.INSTANCE_SHORT_DESCRIPTION,
+        name: INSTANCE_NAME_VALIDATOR,
+        shortDescription: INSTANCE_SHORT_DESCRIPTION_VALIDATOR,
         description: null,
 
         isNSFW: false,
@@ -128,25 +92,26 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
       },
       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
         }
       },
       signup: {
         enabled: null,
-        limit: this.customConfigValidatorsService.SIGNUP_LIMIT,
+        limit: SIGNUP_LIMIT_VALIDATOR,
         requiresEmailVerification: null
       },
       import: {
         videos: {
+          concurrency: CONCURRENCY_VALIDATOR,
           http: {
             enabled: null
           },
@@ -155,21 +120,31 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
           }
         }
       },
+      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,
+        profile: null,
+        concurrency: CONCURRENCY_VALIDATOR,
         resolutions: {},
         hls: {
           enabled: null
@@ -178,6 +153,21 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
           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: {
@@ -198,90 +188,134 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
           },
           autoFollowIndex: {
             enabled: null,
-            indexUrl: this.customConfigValidatorsService.INDEX_URL
+            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: {}
+        }
       }
     }
-    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
     }
 
-    this.buildForm(formGroupData)
-
-    forkJoin([
-      this.configService.getCustomConfig(),
-      this.serverService.videoLanguagesLoaded.pipe(first()), // First so the observable completes
-      this.serverService.videoCategoriesLoaded.pipe(first())
-    ]).subscribe(
-      ([ config ]) => {
-        this.customConfig = config
-
-        const languages = this.serverService.getVideoLanguages()
-        this.languageItems = languages.map(l => ({ label: l.label, value: l.id }))
-
-        const categories = this.serverService.getVideoCategories()
-        this.categoryItems = categories.map(l => ({ label: l.label, value: l.id }))
-
-        this.updateForm()
-        // Force form validation
-        this.forceCheck()
-      },
+    for (const resolution of this.editConfigurationService.getLiveResolutions()) {
+      defaultValues.live.transcoding.resolutions[resolution.id] = 'false'
+      formGroupData.live.transcoding.resolutions[resolution.id] = null
+    }
 
-      err => this.notifier.error(err.message)
-    )
-  }
+    this.buildForm(formGroupData)
 
-  isTranscodingEnabled () {
-    return this.form.value['transcoding']['enabled'] === true
-  }
+    if (this.route.snapshot.fragment) {
+      this.onNavChange(this.route.snapshot.fragment)
+    }
 
-  isSignupEnabled () {
-    return this.form.value['signup']['enabled'] === true
+    this.loadConfigAndUpdateForm()
+    this.loadCategoriesAndLanguages()
   }
 
   async formValidated () {
-    this.configService.updateCustomConfig(this.form.value)
+    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.notifier.success(this.i18n('Configuration updated.'))
+          this.notifier.success($localize`Configuration updated.`)
         },
 
         err => this.notifier.error(err.message)
       )
   }
 
-  getSelectedLanguageLabel () {
-    return this.i18n('{{\'{0} languages selected')
-  }
+  hasConsistentOptions () {
+    if (this.hasLiveAllowReplayConsistentOptions()) return true
 
-  getDefaultLanguageLabel () {
-    return this.i18n('No language')
+    return false
   }
 
-  getSelectedCategoryLabel () {
-    return this.i18n('{{\'{0} categories selected')
+  hasLiveAllowReplayConsistentOptions () {
+    if (
+      this.editConfigurationService.isTranscodingEnabled(this.form) === false &&
+      this.editConfigurationService.isLiveEnabled(this.form) &&
+      this.form.value['live']['allowReplay'] === true
+    ) {
+      return false
+    }
+
+    return true
   }
 
-  getDefaultCategoryLabel () {
-    return this.i18n('No category')
+  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)
+    )
+  }
 }