From 0ba9696c012804670ccdd5256acdaa7ed9484339 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 22 Oct 2021 15:51:02 +0200 Subject: Cleanup video update component --- .../+video-edit/shared/video-edit.component.ts | 3 ++ .../+video-edit/video-update.component.html | 2 + .../+videos/+video-edit/video-update.component.ts | 53 +++++++++------------- 3 files changed, 27 insertions(+), 31 deletions(-) (limited to 'client/src/app/+videos/+video-edit') 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 bf7fdeeed..b4638c2df 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 @@ -63,6 +63,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { @ViewChild('videoCaptionAddModal', { static: true }) videoCaptionAddModal: VideoCaptionAddModalComponent + @Output() formBuilt = new EventEmitter() @Output() pluginFieldsAdded = new EventEmitter() // So that it can be accessed in the template @@ -154,6 +155,8 @@ export class VideoEditComponent implements OnInit, OnDestroy { this.trackChannelChange() this.trackPrivacyChange() this.trackLivePermanentFieldChange() + + this.formBuilt.emit() } ngOnInit () { diff --git a/client/src/app/+videos/+video-edit/video-update.component.html b/client/src/app/+videos/+video-edit/video-update.component.html index 33e3ddd14..ca322318c 100644 --- a/client/src/app/+videos/+video-edit/video-update.component.html +++ b/client/src/app/+videos/+video-edit/video-update.component.html @@ -12,6 +12,8 @@ [videoCaptions]="videoCaptions" [waitTranscodingEnabled]="isWaitTranscodingEnabled()" type="update" (pluginFieldsAdded)="hydratePluginFieldsFromVideo()" [liveVideo]="liveVideo" [videoToUpdate]="videoDetails" + + (formBuilt)="onFormBuilt()" >
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 9bef60133..e44aea10a 100644 --- a/client/src/app/+videos/+video-edit/video-update.component.ts +++ b/client/src/app/+videos/+video-edit/video-update.component.ts @@ -1,5 +1,5 @@ import { of } from 'rxjs' -import { map, switchMap } from 'rxjs/operators' +import { switchMap } from 'rxjs/operators' import { SelectChannelItem } from 'src/types/select-options-item.model' import { Component, HostListener, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' @@ -45,37 +45,28 @@ export class VideoUpdateComponent extends FormReactive implements OnInit { ngOnInit () { this.buildForm({}) - this.route.data - .pipe(map(data => data.videoData)) - .subscribe({ - next: ({ video, videoChannels, videoCaptions, liveVideo }) => { - this.video = new VideoEdit(video) - this.videoDetails = video - - this.userVideoChannels = videoChannels - this.videoCaptions = videoCaptions - this.liveVideo = liveVideo - - this.schedulePublicationPossible = this.video.privacy === VideoPrivacy.PRIVATE - - // FIXME: Angular does not detect the change inside this subscription, so use the patched setTimeout - setTimeout(() => { - hydrateFormFromVideo(this.form, this.video, true) - - if (this.liveVideo) { - this.form.patchValue({ - saveReplay: this.liveVideo.saveReplay, - permanentLive: this.liveVideo.permanentLive - }) - } - }) - }, + const { videoData } = this.route.snapshot.data + const { video, videoChannels, videoCaptions, liveVideo } = videoData - error: err => { - console.error(err) - this.notifier.error(err.message) - } - }) + this.video = new VideoEdit(video) + this.videoDetails = video + + this.userVideoChannels = videoChannels + this.videoCaptions = videoCaptions + this.liveVideo = liveVideo + + this.schedulePublicationPossible = this.video.privacy === VideoPrivacy.PRIVATE + } + + onFormBuilt () { + hydrateFormFromVideo(this.form, this.video, true) + + if (this.liveVideo) { + this.form.patchValue({ + saveReplay: this.liveVideo.saveReplay, + permanentLive: this.liveVideo.permanentLive + }) + } } @HostListener('window:beforeunload', [ '$event' ]) -- cgit v1.2.3