X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-edit%2Fshared%2Fvideo-edit.component.ts;h=52801802bdd0f21d1e5730c0c3323249e024c5a9;hb=2989628b7913383b39ac34c7db8666a21f8e5037;hp=050b6d931b38f7ed90338ae11b7ff562960563b8;hpb=66357162f8e1227495f09bd4f68446aad7071c6d;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 050b6d931..52801802b 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,17 +1,44 @@ import { forkJoin } from 'rxjs' import { map } from 'rxjs/operators' -import { Component, Input, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' -import { FormArray, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms' -import { ServerService } from '@app/core' +import { SelectChannelItem } from 'src/types/select-options-item.model' +import { Component, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output, ViewChild } from '@angular/core' +import { FormArray, FormControl, FormGroup, Validators } from '@angular/forms' +import { HooksService, PluginService, ServerService } from '@app/core' import { removeElementFromArray } from '@app/helpers' -import { FormReactiveValidationMessages, FormValidatorService, SelectChannelItem, VideoValidatorsService } from '@app/shared/shared-forms' +import { + VIDEO_CATEGORY_VALIDATOR, + VIDEO_CHANNEL_VALIDATOR, + VIDEO_DESCRIPTION_VALIDATOR, + VIDEO_LANGUAGE_VALIDATOR, + VIDEO_LICENCE_VALIDATOR, + VIDEO_NAME_VALIDATOR, + VIDEO_ORIGINALLY_PUBLISHED_AT_VALIDATOR, + VIDEO_PRIVACY_VALIDATOR, + VIDEO_SCHEDULE_PUBLICATION_AT_VALIDATOR, + VIDEO_SUPPORT_VALIDATOR, + VIDEO_TAGS_ARRAY_VALIDATOR +} from '@app/shared/form-validators/video-validators' +import { FormReactiveValidationMessages, FormValidatorService } from '@app/shared/shared-forms' import { InstanceService } from '@app/shared/shared-instance' import { VideoCaptionEdit, VideoEdit, VideoService } from '@app/shared/shared-main' -import { ServerConfig, VideoConstant, VideoPrivacy } from '@shared/models' +import { + HTMLServerConfig, + LiveVideo, + RegisterClientFormFieldOptions, + RegisterClientVideoFieldOptions, + VideoConstant, + VideoDetails, + VideoPrivacy +} from '@shared/models' import { I18nPrimengCalendarService } from './i18n-primeng-calendar.service' import { VideoCaptionAddModalComponent } from './video-caption-add-modal.component' +import { VideoEditType } from './video-edit.type' type VideoLanguages = VideoConstant & { group?: string } +type PluginField = { + commonOptions: RegisterClientFormFieldOptions + videoFormOptions: RegisterClientVideoFieldOptions +} @Component({ selector: 'my-video-edit', @@ -22,13 +49,22 @@ export class VideoEditComponent implements OnInit, OnDestroy { @Input() form: FormGroup @Input() formErrors: { [ id: string ]: string } = {} @Input() validationMessages: FormReactiveValidationMessages = {} + + @Input() videoToUpdate: VideoDetails + @Input() userVideoChannels: SelectChannelItem[] = [] @Input() schedulePublicationPossible = true + @Input() videoCaptions: (VideoCaptionEdit & { captionPath?: string })[] = [] + @Input() waitTranscodingEnabled = true + @Input() type: VideoEditType + @Input() liveVideo: LiveVideo @ViewChild('videoCaptionAddModal', { static: true }) videoCaptionAddModal: VideoCaptionAddModalComponent + @Output() pluginFieldsAdded = new EventEmitter() + // So that it can be accessed in the template readonly SPECIAL_SCHEDULED_PRIVACY = VideoEdit.SPECIAL_SCHEDULED_PRIVACY @@ -37,8 +73,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { videoLicences: VideoConstant[] = [] videoLanguages: VideoLanguages[] = [] - tagValidators: ValidatorFn[] - tagValidatorsMessages: { [ name: string ]: string } + pluginDataFormGroup: FormGroup schedulePublicationEnabled = false @@ -49,7 +84,9 @@ export class VideoEditComponent implements OnInit, OnDestroy { calendarTimezone: string calendarDateFormat: string - serverConfig: ServerConfig + serverConfig: HTMLServerConfig + + pluginFields: PluginField[] = [] private schedulerInterval: any private firstPatchDone = false @@ -57,24 +94,18 @@ export class VideoEditComponent implements OnInit, OnDestroy { constructor ( private formValidatorService: FormValidatorService, - private videoValidatorsService: VideoValidatorsService, private videoService: VideoService, private serverService: ServerService, + private pluginService: PluginService, private instanceService: InstanceService, private i18nPrimengCalendarService: I18nPrimengCalendarService, - private ngZone: NgZone + private ngZone: NgZone, + private hooks: HooksService ) { - this.calendarLocale = this.i18nPrimengCalendarService.getCalendarLocale() this.calendarTimezone = this.i18nPrimengCalendarService.getTimezone() this.calendarDateFormat = this.i18nPrimengCalendarService.getDateFormat() } - get existingCaptions () { - return this.videoCaptions - .filter(c => c.action !== 'REMOVE') - .map(c => c.language.id) - } - updateForm () { const defaultValues: any = { nsfw: 'false', @@ -84,22 +115,25 @@ export class VideoEditComponent implements OnInit, OnDestroy { tags: [] } const obj: any = { - name: this.videoValidatorsService.VIDEO_NAME, - privacy: this.videoValidatorsService.VIDEO_PRIVACY, - channelId: this.videoValidatorsService.VIDEO_CHANNEL, + name: VIDEO_NAME_VALIDATOR, + privacy: VIDEO_PRIVACY_VALIDATOR, + channelId: VIDEO_CHANNEL_VALIDATOR, nsfw: null, commentsEnabled: null, downloadEnabled: null, waitTranscoding: null, - category: this.videoValidatorsService.VIDEO_CATEGORY, - licence: this.videoValidatorsService.VIDEO_LICENCE, - language: this.videoValidatorsService.VIDEO_LANGUAGE, - description: this.videoValidatorsService.VIDEO_DESCRIPTION, - tags: this.videoValidatorsService.VIDEO_TAGS_ARRAY, + category: VIDEO_CATEGORY_VALIDATOR, + licence: VIDEO_LICENCE_VALIDATOR, + language: VIDEO_LANGUAGE_VALIDATOR, + description: VIDEO_DESCRIPTION_VALIDATOR, + tags: VIDEO_TAGS_ARRAY_VALIDATOR, previewfile: null, - support: this.videoValidatorsService.VIDEO_SUPPORT, - schedulePublicationAt: this.videoValidatorsService.VIDEO_SCHEDULE_PUBLICATION_AT, - originallyPublishedAt: this.videoValidatorsService.VIDEO_ORIGINALLY_PUBLISHED_AT + support: VIDEO_SUPPORT_VALIDATOR, + schedulePublicationAt: VIDEO_SCHEDULE_PUBLICATION_AT_VALIDATOR, + originallyPublishedAt: VIDEO_ORIGINALLY_PUBLISHED_AT_VALIDATOR, + liveStreamKey: null, + permanentLive: null, + saveReplay: null } this.formValidatorService.updateForm( @@ -119,24 +153,32 @@ export class VideoEditComponent implements OnInit, OnDestroy { this.trackChannelChange() this.trackPrivacyChange() + this.trackLivePermanentFieldChange() } ngOnInit () { this.updateForm() + this.pluginService.ensurePluginsAreLoaded('video-edit') + .then(() => this.updatePluginFields()) + this.serverService.getVideoCategories() .subscribe(res => this.videoCategories = res) + this.serverService.getVideoLicences() .subscribe(res => this.videoLicences = res) + forkJoin([ this.instanceService.getAbout(), this.serverService.getVideoLanguages() ]).pipe(map(([ about, languages ]) => ({ about, languages }))) .subscribe(res => { this.videoLanguages = res.languages - .map(l => res.about.instance.languages.includes(l.id) - ? { ...l, group: $localize`Instance languages`, groupOrder: 0 } - : { ...l, group: $localize`All languages`, groupOrder: 1 }) + .map(l => { + return res.about.instance.languages.includes(l.id) + ? { ...l, group: $localize`Instance languages`, groupOrder: 0 } + : { ...l, group: $localize`All languages`, groupOrder: 1 } + }) .sort((a, b) => a.groupOrder - b.groupOrder) }) @@ -152,21 +194,28 @@ export class VideoEditComponent implements OnInit, OnDestroy { } }) - this.serverConfig = this.serverService.getTmpConfig() - this.serverService.getConfig() - .subscribe(config => this.serverConfig = config) + + this.serverConfig = this.serverService.getHTMLConfig() this.initialVideoCaptions = this.videoCaptions.map(c => c.language.id) this.ngZone.runOutsideAngular(() => { this.schedulerInterval = setInterval(() => this.minScheduledDate = new Date(), 1000 * 60) // Update every minute }) + + this.hooks.runAction('action:video-edit.init', 'video-edit', { type: this.type }) } ngOnDestroy () { if (this.schedulerInterval) clearInterval(this.schedulerInterval) } + getExistingCaptions () { + return this.videoCaptions + .filter(c => c.action !== 'REMOVE') + .map(c => c.language.id) + } + onCaptionAdded (caption: VideoCaptionEdit) { const existingCaption = this.videoCaptions.find(c => c.language.id === caption.language.id) @@ -202,6 +251,24 @@ export class VideoEditComponent implements OnInit, OnDestroy { this.videoCaptionAddModal.show() } + isSaveReplayEnabled () { + return this.serverConfig.live.allowReplay + } + + isPermanentLiveEnabled () { + return this.form.value['permanentLive'] === true + } + + isPluginFieldHidden (pluginField: PluginField) { + if (typeof pluginField.commonOptions.hidden !== 'function') return false + + return pluginField.commonOptions.hidden({ + formValues: this.form.value, + videoToUpdate: this.videoToUpdate, + liveVideo: this.liveVideo + }) + } + private sortVideoCaptions () { this.videoCaptions.sort((v1, v2) => { if (v1.language.label < v2.language.label) return -1 @@ -211,6 +278,23 @@ export class VideoEditComponent implements OnInit, OnDestroy { }) } + private updatePluginFields () { + this.pluginFields = this.pluginService.getRegisteredVideoFormFields(this.type) + + if (this.pluginFields.length === 0) return + + const obj: any = {} + + for (const setting of this.pluginFields) { + obj[setting.commonOptions.name] = new FormControl(setting.commonOptions.default) + } + + this.pluginDataFormGroup = new FormGroup(obj) + this.form.addControl('pluginData', this.pluginDataFormGroup) + + this.pluginFieldsAdded.emit() + } + private trackPrivacyChange () { // We will update the schedule input and the wait transcoding checkbox validators this.form.controls[ 'privacy' ] @@ -269,7 +353,12 @@ export class VideoEditComponent implements OnInit, OnDestroy { const currentSupport = this.form.value[ 'support' ] // First time we set the channel? - if (isNaN(oldChannelId) && !currentSupport) return this.updateSupportField(newChannel.support) + if (isNaN(oldChannelId)) { + // Fill support if it's empty + if (!currentSupport) this.updateSupportField(newChannel.support) + + return + } const oldChannel = this.userVideoChannels.find(c => c.id === oldChannelId) if (!newChannel || !oldChannel) { @@ -288,6 +377,24 @@ export class VideoEditComponent implements OnInit, OnDestroy { ) } + private trackLivePermanentFieldChange () { + // We will update the "support" field depending on the channel + this.form.controls['permanentLive'] + .valueChanges + .subscribe( + permanentLive => { + const saveReplayControl = this.form.controls['saveReplay'] + + if (permanentLive === true) { + saveReplayControl.setValue(false) + saveReplayControl.disable() + } else { + saveReplayControl.enable() + } + } + ) + } + private updateSupportField (support: string) { return this.form.patchValue({ support: support || '' }) }