diff --git a/src/app/user/myPlaylists/video-list/video-list.component.ts b/src/app/user/myPlaylists/video-list/video-list.component.ts index 3a6c049..e2a5eac 100644 --- a/src/app/user/myPlaylists/video-list/video-list.component.ts +++ b/src/app/user/myPlaylists/video-list/video-list.component.ts @@ -45,14 +45,14 @@ export class VideoListComponent implements OnChanges onDelete(video0: any, indexVideo: number): void { - let _idsVideo = this.videosInPlaylist.filter( x => (x._id !== video0._id) ); - _idsVideo = _idsVideo.map( x => x._id ); - - console.log("_idsVideo:"); - console.log(_idsVideo); - + const data = { + videoId: { + id: video0._id, + action: "delete" + } + } this.messageService - .put("playlist/update/"+this.playlist._id, {videoIds: _idsVideo}) + .put("playlist/update/"+this.playlist._id, data) .subscribe( ret => this.onDeleteCallback(ret, indexVideo), err => this.onDeleteCallback(err, indexVideo)); } diff --git a/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.ts b/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.ts index 8318e32..3b158cd 100644 --- a/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.ts +++ b/src/app/user/utils/components/popup-add-video-to-playlists/popup-add-video-to-playlists.component.ts @@ -52,19 +52,28 @@ export class PopupAddVideoToPlaylistsComponent implements OnInit onValider(): void { // --- Existing playlists --- - let listeDesPlaylists = "" ; + let listeDesPlaylistsSelected = "" ; + let listeDesPlaylistsNotSelected = "" ; for(let playlist of this.tabPlaylistAndBool) { - if(playlist.isSelected) listeDesPlaylists += playlist.id + "," ; + if(playlist.isSelected) listeDesPlaylistsSelected += playlist.id + "," ; + else listeDesPlaylistsNotSelected += playlist.id + "," ; } - if(listeDesPlaylists.endsWith(",")) listeDesPlaylists = listeDesPlaylists.slice(0, listeDesPlaylists.length-1); + if(listeDesPlaylistsSelected.endsWith(",")) listeDesPlaylistsSelected = listeDesPlaylistsSelected.slice(0, listeDesPlaylistsSelected.length-1); + if(listeDesPlaylistsNotSelected.endsWith(",")) listeDesPlaylistsNotSelected = listeDesPlaylistsNotSelected.slice(0, listeDesPlaylistsNotSelected.length-1); - console.log(listeDesPlaylists); - if(listeDesPlaylists !== "") + if(listeDesPlaylistsSelected !== "") { - const data1 = { videoId: this._idVideo }; + const data1 = { videoId: { id: this._idVideo, action: "add" } }; this.messageService - .put( "playlist/update/"+listeDesPlaylists, data1) + .put( "playlist/update/"+listeDesPlaylistsSelected, data1) + .subscribe( ret => this.callbackForExistingPlaylists(ret), err => this.callbackForExistingPlaylists(err)); + } + if(listeDesPlaylistsNotSelected !== "") + { + const data2 = { videoId: { id: this._idVideo, action: "delete" } }; + this.messageService + .put( "playlist/update/"+listeDesPlaylistsNotSelected, data2) .subscribe( ret => this.callbackForExistingPlaylists(ret), err => this.callbackForExistingPlaylists(err)); } @@ -72,12 +81,12 @@ export class PopupAddVideoToPlaylistsComponent implements OnInit // --- New playlists --- if(this.goToCreatePlaylist) { - const data2 = { + const data3 = { name: this.newPlaylistName, video: {videoId: this.videoId, interest: this.interest, source: this.source} }; this.messageService - .post("playlist/create", data2) + .post("playlist/create", data3) .subscribe( ret => this.callbackForNewPlaylist(ret), err => this.callbackForNewPlaylist(err)); } } diff --git a/src/app/user/watching/page-watching-video/page-watching-video.component.ts b/src/app/user/watching/page-watching-video/page-watching-video.component.ts index 10ce73a..2f88464 100644 --- a/src/app/user/watching/page-watching-video/page-watching-video.component.ts +++ b/src/app/user/watching/page-watching-video/page-watching-video.component.ts @@ -34,7 +34,8 @@ export class PageWatchingVideoComponent implements OnInit views: 0, publishedAt: null, description: "", - source: "" + source: "", + interest: "" }; search: string = ""; ad1: any = { title: "", url: "", images: [] }; @@ -55,7 +56,8 @@ export class PageWatchingVideoComponent implements OnInit public themeService: ThemeService, private activatedRoute: ActivatedRoute, private router: Router, - private _sanitizer: DomSanitizer ) { } + private _sanitizer: DomSanitizer, + private addVideoToPlaylistsService: AddVideoToPlaylistsService ) { } ngOnInit(): void @@ -139,7 +141,7 @@ export class PageWatchingVideoComponent implements OnInit onAddToPlaylist(): void { - //this.addVideoToPlaylistsService.run(this.video); + this.addVideoToPlaylistsService.run(this.video.videoId, this.video.source, this.video.interest); }