Improve comment highlighting

11 files changed, 103 insertions, 58 deletions

diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
index 865908ba4..e393daa79 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html
@@ -4,7 +4,7 @@
 
     <div class="form-group">
       <textarea placeholder="Add comment..." formControlName="text" [ngClass]="{ 'input-error': formErrors['text'] }"
-                (keyup.control.enter)="formValidated()" (keyup.meta.enter)="formValidated()" #textarea>
+                (keyup.control.enter)="onValidKey()" (keyup.meta.enter)="onValidKey()" #textarea>
 
       </textarea>
       <div *ngIf="formErrors.text" class="form-error">
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
index 3e064efcb..9e499d829 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts
@@ -69,6 +69,13 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit {
     }
   }
 
+  onValidKey () {
+    this.onValueChanged()
+    if (!this.form.valid) return
+
+    this.formValidated()
+  }
+
   formValidated () {
     const commentCreate: VideoCommentCreate = this.form.value
     let obs: Observable<any>
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.html b/client/src/app/videos/+video-watch/comment/video-comment.component.html
index ec9a236d3..e3049e15b 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.html
@@ -2,10 +2,11 @@
   <img [src]="getAvatarUrl(comment.account)" alt="Avatar" />
 
   <div class="comment">
-    <span class="marked-comment" *ngIf="comment.marked">Marked comment</span>
+    <div *ngIf="highlightedComment === true" class="highlighted-comment">Highlighted comment</div>
+
     <div class="comment-account-date">
       <a target="_blank" [href]="comment.account.url" class="comment-account">{{ comment.by }}</a>
-      <a [routerLink]="['/videos/watch', video.uuid, 'comment', comment.id]" class="comment-date">{{ comment.createdAt | myFromNow }}</a>
+      <a [routerLink]="['/videos/watch', video.uuid, { 'commentId': comment.id }]" class="comment-date">{{ comment.createdAt | myFromNow }}</a>
     </div>
     <div class="comment-html" [innerHTML]="sanitizedCommentHTML"></div>
 
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/videos/+video-watch/comment/video-comment.component.scss
index b03bc73d0..3e8892e84 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.scss
@@ -15,6 +15,17 @@
   .comment {
     flex-grow: 1;
 
+    .highlighted-comment {
+      display: inline-block;
+      background-color: #F5F5F5;
+      color: #3d3d3d;
+      padding: 0 5px;
+      font-size: 13px;
+      margin-bottom: 5px;
+      font-weight: $font-semibold;
+      border-radius: 3px;
+    }
+
     .comment-account-date {
       display: flex;
       margin-bottom: 4px;
@@ -32,13 +43,6 @@
       }
     }
 
-    .marked-comment {
-      background-color: #F5F5F5;
-      padding-left: 3px;
-      padding-right: 3px;
-      font-size: 12px;
-    }
-
     .comment-html {
       a {
         @include disable-default-a-behaviour;
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.ts b/client/src/app/videos/+video-watch/comment/video-comment.component.ts
index 38e603d0d..7c664ca60 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.component.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comment.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
+import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'
 import * as sanitizeHtml from 'sanitize-html'
 import { Account as AccountInterface } from '../../../../../../shared/models/actors'
 import { UserRight } from '../../../../../../shared/models/users'
@@ -13,12 +13,13 @@ import { VideoComment } from './video-comment.model'
   templateUrl: './video-comment.component.html',
   styleUrls: ['./video-comment.component.scss']
 })
-export class VideoCommentComponent implements OnInit {
+export class VideoCommentComponent implements OnInit, OnChanges {
   @Input() video: Video
   @Input() comment: VideoComment
   @Input() parentComments: VideoComment[] = []
   @Input() commentTree: VideoCommentThreadTree
   @Input() inReplyToCommentId: number
+  @Input() highlightedComment = false
 
   @Output() wantedToDelete = new EventEmitter<VideoComment>()
   @Output() wantedToReply = new EventEmitter<VideoComment>()
@@ -35,11 +36,11 @@ export class VideoCommentComponent implements OnInit {
   }
 
   ngOnInit () {
-    this.sanitizedCommentHTML = sanitizeHtml(this.comment.text, {
-      allowedTags: [ 'p', 'span' ]
-    })
+    this.init()
+  }
 
-    this.newParentComments = this.parentComments.concat([ this.comment ])
+  ngOnChanges () {
+    this.init()
   }
 
   onCommentReplyCreated (createdComment: VideoComment) {
@@ -86,4 +87,12 @@ export class VideoCommentComponent implements OnInit {
         this.user.hasRight(UserRight.REMOVE_ANY_VIDEO_COMMENT)
       )
   }
+
+  private init () {
+    this.sanitizedCommentHTML = sanitizeHtml(this.comment.text, {
+      allowedTags: [ 'p', 'span' ]
+    })
+
+    this.newParentComments = this.parentComments.concat([ this.comment ])
+  }
 }
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.model.ts b/client/src/app/videos/+video-watch/comment/video-comment.model.ts
index d7b03521a..8fa02aee1 100644
--- a/client/src/app/videos/+video-watch/comment/video-comment.model.ts
+++ b/client/src/app/videos/+video-watch/comment/video-comment.model.ts
@@ -14,7 +14,6 @@ export class VideoComment implements VideoCommentServerModel {
   account: AccountInterface
   totalReplies: number
   by: string
-  marked = false
 
   constructor (hash: VideoCommentServerModel) {
     this.id = hash.id
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/videos/+video-watch/comment/video-comments.component.html
index 7f2e96e93..f95e2cbba 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.html
@@ -19,8 +19,23 @@
       [autoLoading]="true"
       (nearOfBottom)="onNearOfBottom()"
     >
+      <div *ngIf="highlightedComment" id="highlighted-comment">
+        <my-video-comment
+            [comment]="highlightedComment"
+            [video]="video"
+            [inReplyToCommentId]="inReplyToCommentId"
+            [commentTree]="threadComments[highlightedComment.id]"
+            [highlightedComment]="true"
+            (wantedToReply)="onWantedToReply($event)"
+            (wantedToDelete)="onWantedToDelete($event)"
+            (threadCreated)="onThreadCreated($event)"
+            (resetReply)="onResetReply()"
+        ></my-video-comment>
+      </div>
+
       <div *ngFor="let comment of comments">
         <my-video-comment
+          *ngIf="!highlightedComment || comment.id !== highlightedComment.id"
           [comment]="comment"
           [video]="video"
           [inReplyToCommentId]="inReplyToCommentId"
@@ -31,7 +46,7 @@
           (resetReply)="onResetReply()"
         ></my-video-comment>
 
-        <div *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment)" class="view-replies">
+        <div *ngIf="comment.totalReplies !== 0 && !threadComments[comment.id]" (click)="viewReplies(comment.id)" class="view-replies">
           View all {{ comment.totalReplies }} replies
 
           <span *ngIf="!threadLoading[comment.id]" class="glyphicon glyphicon-menu-down"></span>
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.scss b/client/src/app/videos/+video-watch/comment/video-comments.component.scss
index 19ab3b633..bf8b154a2 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.scss
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.scss
@@ -1,6 +1,10 @@
 @import '_variables';
 @import '_mixins';
 
+#highlighted-comment {
+  margin-bottom: 25px;
+}
+
 .view-replies {
   font-weight: $font-semibold;
   font-size: 15px;
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 7970a5dcf..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,7 +1,9 @@
-import { Component, Input, OnChanges, SimpleChanges } 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 { VideoComment as VideoCommentInterface, VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model'
+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'
 import { User } from '../../../shared/users'
@@ -9,18 +11,18 @@ import { SortField } from '../../../shared/video/sort-field.type'
 import { VideoDetails } from '../../../shared/video/video-details.model'
 import { VideoComment } from './video-comment.model'
 import { VideoCommentService } from './video-comment.service'
-import { ActivatedRoute } from '@angular/router'
 
 @Component({
   selector: 'my-video-comments',
   templateUrl: './video-comments.component.html',
   styleUrls: ['./video-comments.component.scss']
 })
-export class VideoCommentsComponent implements OnChanges {
+export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
   @Input() video: VideoDetails
   @Input() user: User
 
   comments: VideoComment[] = []
+  highlightedComment: VideoComment
   sort: SortField = '-createdAt'
   componentPagination: ComponentPagination = {
     currentPage: 1,
@@ -30,7 +32,8 @@ export class VideoCommentsComponent implements OnChanges {
   inReplyToCommentId: number
   threadComments: { [ id: number ]: VideoCommentThreadTree } = {}
   threadLoading: { [ id: number ]: boolean } = {}
-  markedCommentID: number
+
+  private sub: Subscription
 
   constructor (
     private authService: AuthService,
@@ -40,20 +43,38 @@ export class VideoCommentsComponent implements OnChanges {
     private activatedRoute: ActivatedRoute
   ) {}
 
+  ngOnInit () {
+    // 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.loadVideoComments()
+      this.resetVideo()
     }
   }
 
-  viewReplies (comment: VideoCommentInterface) {
-    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)
@@ -66,18 +87,6 @@ export class VideoCommentsComponent implements OnChanges {
         res => {
           this.comments = this.comments.concat(res.comments)
           this.componentPagination.totalItems = res.totalComments
-
-          if (this.markedCommentID) {
-            // If there is a marked comment, retrieve it separately as it may not be on this page, filter to prevent duplicate
-            this.comments = this.comments.filter(value => value.id !== this.markedCommentID)
-            this.videoCommentService.getVideoThreadComments(this.video.id, this.markedCommentID).subscribe(
-              res => {
-                let comment = new VideoComment(res.comment)
-                comment.marked = true
-                this.comments.unshift(comment) // Insert marked comment at the beginning
-              }
-            )
-          }
         },
 
         err => this.notificationsService.error('Error', err.message)
@@ -97,7 +106,7 @@ export class VideoCommentsComponent implements OnChanges {
   }
 
   onThreadCreated (commentTree: VideoCommentThreadTree) {
-    this.viewReplies(commentTree.comment)
+    this.viewReplies(commentTree.comment.id)
   }
 
   onWantedToDelete (commentToDelete: VideoComment) {
@@ -168,9 +177,10 @@ export class VideoCommentsComponent implements OnChanges {
     }
   }
 
-  private loadVideoComments () {
+  private resetVideo () {
     if (this.video.commentsEnabled === true) {
       // Reset all our fields
+      this.highlightedComment = null
       this.comments = []
       this.threadComments = {}
       this.threadLoading = {}
@@ -178,16 +188,14 @@ export class VideoCommentsComponent implements OnChanges {
       this.componentPagination.currentPage = 1
       this.componentPagination.totalItems = null
 
-      // Find marked comment in params
-      this.activatedRoute.params.subscribe(
-        params => {
-          if (params['commentId']) {
-            this.markedCommentID = +params['commentId']
-          }
-        }
-      )
-
       this.loadMoreComments()
     }
   }
+
+  private processHighlightedComment (highlightedCommentId: number) {
+    this.highlightedComment = this.comments.find(c => c.id === highlightedCommentId)
+
+    const highlightComment = true
+    this.viewReplies(highlightedCommentId, highlightComment)
+  }
 }
diff --git a/client/src/app/videos/+video-watch/video-watch-routing.module.ts b/client/src/app/videos/+video-watch/video-watch-routing.module.ts
index 72f76ab46..bdd4f945e 100644
--- a/client/src/app/videos/+video-watch/video-watch-routing.module.ts
+++ b/client/src/app/videos/+video-watch/video-watch-routing.module.ts
@@ -10,11 +10,6 @@ const videoWatchRoutes: Routes = [
     path: '',
     component: VideoWatchComponent,
     canActivate: [ MetaGuard ]
-  },
-  {
-    path: 'comment/:commentId',
-    component: VideoWatchComponent,
-    canActivate: [ MetaGuard ]
   }
 ]
 
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 7c97f0964..553eed341 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -83,7 +83,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
         this.player.pause()
       }
 
-      let uuid = routeParams['uuid']
+      const uuid = routeParams['uuid']
+      // Video did not changed
+      if (this.video && this.video.uuid === uuid) return
+
       this.videoService.getVideo(uuid).subscribe(
         video => this.onVideoFetched(video),