X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-edit%2Fshared%2Fvideo-edit.component.ts;h=61515c0b0cb4069b958e0294814c6cd1947b75fa;hb=e309822b93d9b69f30cbe830ef3d09dfdb2c13b2;hp=af4438bd269835ed3faedb31b84273549f4a89c3;hpb=e998cf3cc757b58f06adae7a367e88b494c609d2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
index af4438bd2..61515c0b0 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts
@@ -1,21 +1,12 @@
 import { Component, Input, OnInit } from '@angular/core'
-import { FormBuilder, FormControl, FormGroup } from '@angular/forms'
+import { FormGroup, ValidatorFn } from '@angular/forms'
 import { ActivatedRoute, Router } from '@angular/router'
-import { VIDEO_IMAGE, VIDEO_SUPPORT } from '@app/shared'
+import { FormReactiveValidationMessages, VideoValidatorsService } from '@app/shared'
 import { NotificationsService } from 'angular2-notifications'
 import { ServerService } from '../../../core/server'
-import { VIDEO_CHANNEL } from '../../../shared/forms/form-validators'
-import { ValidatorMessage } from '../../../shared/forms/form-validators/validator-message'
-import {
-  VIDEO_CATEGORY,
-  VIDEO_DESCRIPTION,
-  VIDEO_LANGUAGE,
-  VIDEO_LICENCE,
-  VIDEO_NAME,
-  VIDEO_PRIVACY,
-  VIDEO_TAGS
-} from '../../../shared/forms/form-validators/video'
 import { VideoEdit } from '../../../shared/video/video-edit.model'
+import { map } from 'rxjs/operators'
+import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 
 @Component({
   selector: 'my-video-edit',
@@ -26,64 +17,93 @@ import { VideoEdit } from '../../../shared/video/video-edit.model'
 export class VideoEditComponent implements OnInit {
   @Input() form: FormGroup
   @Input() formErrors: { [ id: string ]: string } = {}
-  @Input() validationMessages: ValidatorMessage = {}
+  @Input() validationMessages: FormReactiveValidationMessages = {}
   @Input() videoPrivacies = []
-  @Input() userVideoChannels = []
+  @Input() userVideoChannels: { id: number, label: string, support: string }[] = []
 
   videoCategories = []
   videoLicences = []
   videoLanguages = []
   video: VideoEdit
 
-  tagValidators = VIDEO_TAGS.VALIDATORS
-  tagValidatorsMessages = VIDEO_TAGS.MESSAGES
+  tagValidators: ValidatorFn[]
+  tagValidatorsMessages: { [ name: string ]: string }
 
   error: string = null
 
   constructor (
-    private formBuilder: FormBuilder,
+    private formValidatorService: FormValidatorService,
+    private videoValidatorsService: VideoValidatorsService,
     private route: ActivatedRoute,
     private router: Router,
     private notificationsService: NotificationsService,
     private serverService: ServerService
-  ) { }
+  ) {
+    this.tagValidators = this.videoValidatorsService.VIDEO_TAGS.VALIDATORS
+    this.tagValidatorsMessages = this.videoValidatorsService.VIDEO_TAGS.MESSAGES
+  }
 
   updateForm () {
-    this.formErrors['name'] = ''
-    this.formErrors['privacy'] = ''
-    this.formErrors['channelId'] = ''
-    this.formErrors['category'] = ''
-    this.formErrors['licence'] = ''
-    this.formErrors['language'] = ''
-    this.formErrors['description'] = ''
-    this.formErrors['thumbnailfile'] = ''
-    this.formErrors['previewfile'] = ''
-    this.formErrors['support'] = ''
-
-    this.validationMessages['name'] = VIDEO_NAME.MESSAGES
-    this.validationMessages['privacy'] = VIDEO_PRIVACY.MESSAGES
-    this.validationMessages['channelId'] = VIDEO_CHANNEL.MESSAGES
-    this.validationMessages['category'] = VIDEO_CATEGORY.MESSAGES
-    this.validationMessages['licence'] = VIDEO_LICENCE.MESSAGES
-    this.validationMessages['language'] = VIDEO_LANGUAGE.MESSAGES
-    this.validationMessages['description'] = VIDEO_DESCRIPTION.MESSAGES
-    this.validationMessages['thumbnailfile'] = VIDEO_IMAGE.MESSAGES
-    this.validationMessages['previewfile'] = VIDEO_IMAGE.MESSAGES
-    this.validationMessages['support'] = VIDEO_SUPPORT.MESSAGES
-
-    this.form.addControl('name', new FormControl('', VIDEO_NAME.VALIDATORS))
-    this.form.addControl('privacy', new FormControl('', VIDEO_PRIVACY.VALIDATORS))
-    this.form.addControl('channelId', new FormControl('', VIDEO_CHANNEL.VALIDATORS))
-    this.form.addControl('nsfw', new FormControl(false))
-    this.form.addControl('commentsEnabled', new FormControl(true))
-    this.form.addControl('category', new FormControl('', VIDEO_CATEGORY.VALIDATORS))
-    this.form.addControl('licence', new FormControl('', VIDEO_LICENCE.VALIDATORS))
-    this.form.addControl('language', new FormControl('', VIDEO_LANGUAGE.VALIDATORS))
-    this.form.addControl('description', new FormControl('', VIDEO_DESCRIPTION.VALIDATORS))
-    this.form.addControl('tags', new FormControl(''))
-    this.form.addControl('thumbnailfile', new FormControl(''))
-    this.form.addControl('previewfile', new FormControl(''))
-    this.form.addControl('support', new FormControl('', VIDEO_SUPPORT.VALIDATORS))
+    const defaultValues = {
+      nsfw: 'false',
+      commentsEnabled: 'true',
+      tags: []
+    }
+    const obj = {
+      name: this.videoValidatorsService.VIDEO_NAME,
+      privacy: this.videoValidatorsService.VIDEO_PRIVACY,
+      channelId: this.videoValidatorsService.VIDEO_CHANNEL,
+      nsfw: null,
+      commentsEnabled: null,
+      category: this.videoValidatorsService.VIDEO_CATEGORY,
+      licence: this.videoValidatorsService.VIDEO_LICENCE,
+      language: this.videoValidatorsService.VIDEO_LANGUAGE,
+      description: this.videoValidatorsService.VIDEO_DESCRIPTION,
+      tags: null,
+      thumbnailfile: null,
+      previewfile: null,
+      support: this.videoValidatorsService.VIDEO_SUPPORT
+    }
+
+    this.formValidatorService.updateForm(
+      this.form,
+      this.formErrors,
+      this.validationMessages,
+      obj,
+      defaultValues
+    )
+
+    // We will update the "support" field depending on the channel
+    this.form.controls['channelId']
+      .valueChanges
+      .pipe(map(res => parseInt(res.toString(), 10)))
+      .subscribe(
+        newChannelId => {
+          const oldChannelId = parseInt(this.form.value['channelId'], 10)
+          const currentSupport = this.form.value['support']
+
+          // Not initialized yet
+          if (isNaN(newChannelId)) return
+          const newChannel = this.userVideoChannels.find(c => c.id === newChannelId)
+          if (!newChannel) return
+
+          // First time we set the channel?
+          if (isNaN(oldChannelId)) return this.updateSupportField(newChannel.support)
+          const oldChannel = this.userVideoChannels.find(c => c.id === oldChannelId)
+
+          if (!newChannel || !oldChannel) {
+            console.error('Cannot find new or old channel.')
+            return
+          }
+
+          // If the current support text is not the same than the old channel, the user updated it.
+          // We don't want the user to lose his text, so stop here
+          if (currentSupport && currentSupport !== oldChannel.support) return
+
+          // Update the support text with our new channel
+          this.updateSupportField(newChannel.support)
+        }
+      )
   }
 
   ngOnInit () {
@@ -93,4 +113,8 @@ export class VideoEditComponent implements OnInit {
     this.videoLicences = this.serverService.getVideoLicences()
     this.videoLanguages = this.serverService.getVideoLanguages()
   }
+
+  private updateSupportField (support: string) {
+    return this.form.patchValue({ support: support || '' })
+  }
 }