X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-edit%2Fvideo-update.component.ts;h=4fe65bccd83cee34acbeed2e85256b8450afa0f5;hb=ef4c78da4f0da61aebfa42f6e8420bf431a68bc8;hp=ad6452835f4d522242a05e4e86f134943c36137f;hpb=6de36768980ef6063b8fcd730b59fa685dd2b99c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/videos/+video-edit/video-update.component.ts b/client/src/app/videos/+video-edit/video-update.component.ts
index ad6452835..4fe65bccd 100644
--- a/client/src/app/videos/+video-edit/video-update.component.ts
+++ b/client/src/app/videos/+video-edit/video-update.component.ts
@@ -1,88 +1,103 @@
+import { map, switchMap } from 'rxjs/operators'
 import { Component, OnInit } from '@angular/core'
-import { FormBuilder, FormGroup } from '@angular/forms'
 import { ActivatedRoute, Router } from '@angular/router'
+import { LoadingBarService } from '@ngx-loading-bar/core'
 import { NotificationsService } from 'angular2-notifications'
-import 'rxjs/add/observable/forkJoin'
-import { VideoPrivacy } from '../../../../../shared/models/videos'
+import { VideoConstant, VideoPrivacy } from '../../../../../shared/models/videos'
 import { ServerService } from '../../core'
 import { AuthService } from '../../core/auth'
 import { FormReactive } from '../../shared'
-import { ValidatorMessage } from '../../shared/forms/form-validators/validator-message'
-import { populateAsyncUserVideoChannels } from '../../shared/misc/utils'
 import { VideoEdit } from '../../shared/video/video-edit.model'
 import { VideoService } from '../../shared/video/video.service'
+import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
+import { VideoCaptionService } from '@app/shared/video-caption'
+import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model'
 
 @Component({
   selector: 'my-videos-update',
   styleUrls: [ './shared/video-edit.component.scss' ],
   templateUrl: './video-update.component.html'
 })
-
 export class VideoUpdateComponent extends FormReactive implements OnInit {
   video: VideoEdit
 
-  form: FormGroup
-  formErrors: { [ id: string ]: string } = {}
-  validationMessages: ValidatorMessage = {}
-  videoPrivacies = []
-  userVideoChannels = []
+  isUpdatingVideo = false
+  videoPrivacies: VideoConstant<string>[] = []
+  userVideoChannels: { id: number, label: string, support: string }[] = []
+  schedulePublicationPossible = false
+  videoCaptions: VideoCaptionEdit[] = []
 
   constructor (
-    private formBuilder: FormBuilder,
+    protected formValidatorService: FormValidatorService,
     private route: ActivatedRoute,
     private router: Router,
     private notificationsService: NotificationsService,
     private serverService: ServerService,
     private videoService: VideoService,
-    private authService: AuthService
+    private authService: AuthService,
+    private loadingBar: LoadingBarService,
+    private videoChannelService: VideoChannelService,
+    private videoCaptionService: VideoCaptionService,
+    private i18n: I18n
   ) {
     super()
   }
 
-  buildForm () {
-    this.form = this.formBuilder.group({})
-    this.form.valueChanges.subscribe(data => this.onValueChanged(data))
-  }
-
   ngOnInit () {
-    this.buildForm()
+    this.buildForm({})
 
     this.serverService.videoPrivaciesLoaded
       .subscribe(() => this.videoPrivacies = this.serverService.getVideoPrivacies())
 
-    populateAsyncUserVideoChannels(this.authService, this.userVideoChannels)
-      .catch(err => console.error('Cannot populate async user video channels.', err))
-
-    const uuid: string = this.route.snapshot.params['uuid']
+    const uuid: string = this.route.snapshot.params[ 'uuid' ]
     this.videoService.getVideo(uuid)
-      .switchMap(video => {
-        return this.videoService
-          .loadCompleteDescription(video.descriptionPath)
-          .do(description => video.description = description)
-          .map(() => video)
-      })
-      .subscribe(
-        video => {
-          this.video = new VideoEdit(video)
-
-          // We cannot set private a video that was not private
-          if (video.privacy !== VideoPrivacy.PRIVATE) {
-            const newVideoPrivacies = []
-            for (const p of this.videoPrivacies) {
-              if (p.id !== VideoPrivacy.PRIVATE) newVideoPrivacies.push(p)
+        .pipe(
+          switchMap(video => {
+            return this.videoService
+                       .loadCompleteDescription(video.descriptionPath)
+                       .pipe(map(description => Object.assign(video, { description })))
+          }),
+          switchMap(video => {
+            return this.videoChannelService
+                       .listAccountVideoChannels(video.account)
+                       .pipe(
+                         map(result => result.data),
+                         map(videoChannels => videoChannels.map(c => ({ id: c.id, label: c.displayName, support: c.support }))),
+                         map(videoChannels => ({ video, videoChannels }))
+                       )
+          }),
+          switchMap(({ video, videoChannels }) => {
+            return this.videoCaptionService
+                       .listCaptions(video.id)
+                       .pipe(
+                         map(result => result.data),
+                         map(videoCaptions => ({ video, videoChannels, videoCaptions }))
+                       )
+          })
+        )
+        .subscribe(
+          ({ video, videoChannels, videoCaptions }) => {
+            this.video = new VideoEdit(video)
+            this.userVideoChannels = videoChannels
+            this.videoCaptions = videoCaptions
+
+            // We cannot set private a video that was not private
+            if (this.video.privacy !== VideoPrivacy.PRIVATE) {
+              this.videoPrivacies = this.videoPrivacies.filter(p => p.id.toString() !== VideoPrivacy.PRIVATE.toString())
+            } else { // We can schedule video publication only if it it is private
+              this.schedulePublicationPossible = this.video.privacy === VideoPrivacy.PRIVATE
             }
 
-            this.videoPrivacies = newVideoPrivacies
-          }
-
-          this.hydrateFormFromVideo()
-        },
+            this.hydrateFormFromVideo()
+          },
 
-        err => {
-          console.error(err)
-          this.notificationsService.error('Error', err.message)
-        }
-      )
+          err => {
+            console.error(err)
+            this.notificationsService.error(this.i18n('Error'), err.message)
+          }
+        )
   }
 
   checkForm () {
@@ -98,23 +113,34 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
 
     this.video.patch(this.form.value)
 
+    this.loadingBar.start()
+    this.isUpdatingVideo = true
+
+    // Update the video
     this.videoService.updateVideo(this.video)
-                     .subscribe(
-                       () => {
-                         this.notificationsService.success('Success', 'Video updated.')
-                         this.router.navigate([ '/videos/watch', this.video.uuid ])
-                       },
-
-                       err => {
-                         this.notificationsService.error('Error', err.message)
-                         console.error(err)
-                       }
-                      )
+        .pipe(
+          // Then update captions
+          switchMap(() => this.videoCaptionService.updateCaptions(this.video.id, this.videoCaptions))
+        )
+        .subscribe(
+          () => {
+            this.isUpdatingVideo = false
+            this.loadingBar.complete()
+            this.notificationsService.success(this.i18n('Success'), this.i18n('Video updated.'))
+            this.router.navigate([ '/videos/watch', this.video.uuid ])
+          },
+
+          err => {
+            this.isUpdatingVideo = false
+            this.notificationsService.error(this.i18n('Error'), err.message)
+            console.error(err)
+          }
+        )
 
   }
 
   private hydrateFormFromVideo () {
-    this.form.patchValue(this.video.toJSON())
+    this.form.patchValue(this.video.toFormPatch())
 
     const objects = [
       {