X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fcomment%2Fvideo-comments.component.ts;h=aada9554d77d53830a6ca9699d1d360c1578d814;hb=3d9eaae318670986fedab257b8be344c9b43d8d5;hp=1230725c1e3fc60d79fd7775a87a28aef4d7dc7e;hpb=cf117aaafc1e9ae1ab4c388fc5d2e5ba9349efee;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.ts b/client/src/app/videos/+video-watch/comment/video-comments.component.ts index 1230725c1..aada9554d 100644 --- a/client/src/app/videos/+video-watch/comment/video-comments.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comments.component.ts @@ -1,5 +1,8 @@ -import { Component, Input, OnInit } from '@angular/core' +import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core' +import { ActivatedRoute } from '@angular/router' +import { ConfirmService } from '@app/core' import { NotificationsService } from 'angular2-notifications' +import { Subscription } from 'rxjs/Subscription' import { VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model' import { AuthService } from '../../../core/auth' import { ComponentPagination } from '../../../shared/rest/component-pagination.model' @@ -14,11 +17,12 @@ import { VideoCommentService } from './video-comment.service' templateUrl: './video-comments.component.html', styleUrls: ['./video-comments.component.scss'] }) -export class VideoCommentsComponent implements OnInit { +export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy { @Input() video: VideoDetails @Input() user: User comments: VideoComment[] = [] + highlightedComment: VideoComment sort: SortField = '-createdAt' componentPagination: ComponentPagination = { currentPage: 1, @@ -29,26 +33,48 @@ export class VideoCommentsComponent implements OnInit { threadComments: { [ id: number ]: VideoCommentThreadTree } = {} threadLoading: { [ id: number ]: boolean } = {} + private sub: Subscription + constructor ( private authService: AuthService, private notificationsService: NotificationsService, - private videoCommentService: VideoCommentService + private confirmService: ConfirmService, + private videoCommentService: VideoCommentService, + private activatedRoute: ActivatedRoute ) {} ngOnInit () { - if (this.video.commentsEnabled === true) { - this.loadMoreComments() + // Find highlighted comment in params + this.sub = this.activatedRoute.params.subscribe( + params => { + if (params['commentId']) { + const highlightedCommentId = +params['commentId'] + this.processHighlightedComment(highlightedCommentId) + } + } + ) + } + + ngOnChanges (changes: SimpleChanges) { + if (changes['video']) { + this.resetVideo() } } - viewReplies (comment: VideoComment) { - this.threadLoading[comment.id] = true + ngOnDestroy () { + if (this.sub) this.sub.unsubscribe() + } + + viewReplies (commentId: number, highlightComment = false) { + this.threadLoading[commentId] = true - this.videoCommentService.getVideoThreadComments(this.video.id, comment.id) + this.videoCommentService.getVideoThreadComments(this.video.id, commentId) .subscribe( res => { - this.threadComments[comment.id] = res - this.threadLoading[comment.id] = false + this.threadComments[commentId] = res + this.threadLoading[commentId] = false + + if (highlightComment) this.highlightedComment = new VideoComment(res.comment) }, err => this.notificationsService.error('Error', err.message) @@ -79,6 +105,44 @@ export class VideoCommentsComponent implements OnInit { this.inReplyToCommentId = undefined } + onThreadCreated (commentTree: VideoCommentThreadTree) { + this.viewReplies(commentTree.comment.id) + } + + onWantedToDelete (commentToDelete: VideoComment) { + let message = 'Do you really want to delete this comment?' + if (commentToDelete.totalReplies !== 0) message += `${commentToDelete.totalReplies} would be deleted too.` + + this.confirmService.confirm(message, 'Delete').subscribe( + res => { + if (res === false) return + + this.videoCommentService.deleteVideoComment(commentToDelete.videoId, commentToDelete.id) + .subscribe( + () => { + // Delete the comment in the tree + if (commentToDelete.inReplyToCommentId) { + const thread = this.threadComments[commentToDelete.threadId] + if (!thread) { + console.error(`Cannot find thread ${commentToDelete.threadId} of the comment to delete ${commentToDelete.id}`) + return + } + + this.deleteLocalCommentThread(thread, commentToDelete) + return + } + + // Delete the thread + this.comments = this.comments.filter(c => c.id !== commentToDelete.id) + this.componentPagination.totalItems-- + }, + + err => this.notificationsService.error('Error', err.message) + ) + } + ) + } + isUserLoggedIn () { return this.authService.isLoggedIn() } @@ -91,7 +155,7 @@ export class VideoCommentsComponent implements OnInit { } } - protected hasMoreComments () { + private hasMoreComments () { // No results if (this.componentPagination.totalItems === 0) return false @@ -101,4 +165,37 @@ export class VideoCommentsComponent implements OnInit { const maxPage = this.componentPagination.totalItems / this.componentPagination.itemsPerPage return maxPage > this.componentPagination.currentPage } + + private deleteLocalCommentThread (parentComment: VideoCommentThreadTree, commentToDelete: VideoComment) { + for (const commentChild of parentComment.children) { + if (commentChild.comment.id === commentToDelete.id) { + parentComment.children = parentComment.children.filter(c => c.comment.id !== commentToDelete.id) + return + } + + this.deleteLocalCommentThread(commentChild, commentToDelete) + } + } + + private resetVideo () { + if (this.video.commentsEnabled === true) { + // Reset all our fields + this.highlightedComment = null + this.comments = [] + this.threadComments = {} + this.threadLoading = {} + this.inReplyToCommentId = undefined + this.componentPagination.currentPage = 1 + this.componentPagination.totalItems = null + + this.loadMoreComments() + } + } + + private processHighlightedComment (highlightedCommentId: number) { + this.highlightedComment = this.comments.find(c => c.id === highlightedCommentId) + + const highlightComment = true + this.viewReplies(highlightedCommentId, highlightComment) + } }