Refactor comment UI code

And run prettier
This commit is contained in:
Michael Shamoon
2022-08-07 17:33:13 -07:00
parent 6d956ac13b
commit 5c1e09cc48
7 changed files with 85 additions and 75 deletions

View File

@@ -0,0 +1,25 @@
<div *ngIf="comments">
<form [formGroup]='commentForm'>
<div class="form-group">
<textarea class="form-control" rows="5" formControlName='newcomment'></textarea>
</div>
<button type="button" class="btn btn-primary" [disabled]="networkActive" (click)="addComment()" i18n>Add comment</button>
</form>
<hr>
<div *ngFor="let comment of comments; trackBy: commentId" class="card border-bg-primary bg-primary mb-3 comment-card" [attr.comment-id]="comment.id">
<div class="d-flex card-header comment-card-header text-white justify-content-between">
<span>{{comment?.user?.firstname}} {{comment?.user?.lastname}} ({{comment?.user?.username}}) - {{ comment?.created | customDate}}</span>
<span>
<a class="text-white" (click)="deleteComment(comment.id)">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
<path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>
<path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4L4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>
</svg>
</a>
</span>
</div>
<div class="card-body bg-white text-dark comment-card-body card-text">
{{comment.comment}}
</div>
</div>
</div>

View File

@@ -0,0 +1,22 @@
.comment-card-body {
padding-top: .8rem !important;
padding-bottom: .8rem !important;
max-height: 10rem;
overflow: scroll;
white-space: pre-wrap;
}
.comment-card-header a {
border: none;
background: none;
padding: 5px;
border-radius: 50%;
}
.comment-card-header a:hover {
background: #FFF;
}
.comment-card-header a:hover svg {
fill: var(--primary);
}

View File

@@ -0,0 +1,73 @@
import { Component, Input, OnInit } from '@angular/core'
import { DocumentCommentsService } from 'src/app/services/rest/document-comments.service'
import { PaperlessDocumentComment } from 'src/app/data/paperless-document-comment'
import { FormControl, FormGroup } from '@angular/forms'
import { first } from 'rxjs/operators'
import { ToastService } from 'src/app/services/toast.service'
@Component({
selector: 'app-document-comments',
templateUrl: './document-comments.component.html',
styleUrls: ['./document-comments.component.scss'],
})
export class DocumentCommentsComponent implements OnInit {
commentForm: FormGroup = new FormGroup({
newcomment: new FormControl(''),
})
networkActive = false
comments: PaperlessDocumentComment[] = []
@Input()
documentId: number
constructor(
private commentsService: DocumentCommentsService,
private toastService: ToastService
) {}
ngOnInit(): void {
this.commentsService
.getComments(this.documentId)
.pipe(first())
.subscribe((comments) => (this.comments = comments))
}
commentId(index, comment: PaperlessDocumentComment) {
return comment.id
}
addComment() {
this.networkActive = true
this.commentsService
.addComment(this.documentId, this.commentForm.get('newcomment').value)
.subscribe({
next: (result) => {
this.comments = result
this.commentForm.get('newcomment').reset()
this.networkActive = false
},
error: (e) => {
this.networkActive = false
this.toastService.showError(
$localize`Error saving comment: ${e.toString()}`
)
},
})
}
deleteComment(commentId: number) {
this.commentsService.deleteComment(this.documentId, commentId).subscribe({
next: (result) => {
this.comments = result
this.networkActive = false
},
error: (e) => {
this.networkActive = false
this.toastService.showError(
$localize`Error deleting comment: ${e.toString()}`
)
},
})
}
}