Cleanup frontend comment service & other code

[ci skip]

diff --git a/src-ui/src/app/components/document-comments/document-comments.component.html b/src-ui/src/app/components/document-comments/document-comments.component.html
index 055c9755221a0ed7cc0fdb53ebb7ebfea91d37c1..107d02623ac284d8423ad5239f8da0bdfaba5015 100644 (file)
--- a/src-ui/src/app/components/document-comments/document-comments.component.html
+++ b/src-ui/src/app/components/document-comments/document-comments.component.html
@@ -4,11 +4,10 @@
             <p class="card-text">{{comment.comment}}</p>
         </div>
         <div class="d-flex card-footer small bg-light text-primary justify-content-between align-items-center">
-            <span>{{displayName(comment)}} - {{ comment?.created | customDate}}</span>
+            <span>{{displayName(comment)}} - {{ comment.created | customDate}}</span>
             <btn class="btn btn-link btn-sm p-0 fade" (click)="deleteComment(comment.id)">
-                <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" 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 width="13" height="13" fill="currentColor">
+                    <use xlink:href="assets/bootstrap-icons.svg#trash" />
                 </svg>
             </btn>
         </div>

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index 8e7176655807b9da07fb6495bd77e75364e7e261..8481cad2fdb21bee913a549cfa3fe969b66db1ea 100644 (file)
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -174,7 +174,6 @@
                     <ng-template ngbNavContent>
                         <app-document-comments [documentId]="documentId"></app-document-comments>
                     </ng-template>
-
                 </li>
             </ul>
 

diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 06fddd41be072a82142862413fe5214e03d1b582..ff0a5303bbd8dec5ac092b502b0606730fbd3b04 100644 (file)
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -274,7 +274,6 @@ export class DocumentDetailComponent
           this.suggestions = null
         },
       })
-
     this.title = this.documentTitlePipe.transform(doc.title)
     this.documentForm.patchValue(doc)
   }

diff --git a/src-ui/src/app/data/paperless-document-comment.ts b/src-ui/src/app/data/paperless-document-comment.ts
index 1b60e6c5c70a37dd406afb5347adb70aeb3aea46..14085cf3255386594d587302dd1ca184813039d4 100644 (file)
--- a/src-ui/src/app/data/paperless-document-comment.ts
+++ b/src-ui/src/app/data/paperless-document-comment.ts
@@ -1,8 +1,8 @@
 import { ObjectWithId } from './object-with-id'
-import { CommentUser } from './user-type'
+import { User } from './user'
 
 export interface PaperlessDocumentComment extends ObjectWithId {
-    created?: Date
-    comment?: string
-    user?: CommentUser
-} 
\ No newline at end of file
+  created?: Date
+  comment?: string
+  user?: User
+}

diff --git a/src-ui/src/app/data/user-type.ts b/src-ui/src/app/data/user-type.ts
deleted file mode 100644 (file)
index 9324cab..0000000
--- a/src-ui/src/app/data/user-type.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { ObjectWithId } from './object-with-id'
-
-export interface CommentUser extends ObjectWithId {
-    username: string
-    firstname: string
-    lastname: string
-} 
\ No newline at end of file

diff --git a/src-ui/src/app/data/user.ts b/src-ui/src/app/data/user.ts
new file mode 100644 (file)
index 0000000..adf00e8
--- /dev/null
+++ b/src-ui/src/app/data/user.ts
@@ -0,0 +1,7 @@
+import { ObjectWithId } from './object-with-id'
+
+export interface User extends ObjectWithId {
+  username: string
+  firstname: string
+  lastname: string
+}

diff --git a/src-ui/src/app/services/rest/document-comments.service.ts b/src-ui/src/app/services/rest/document-comments.service.ts
index b105a90d152f87f73cf1944ac7872b0a2e158a59..a697c0e939057381bad45cf4dc5b76fb1d77c5d3 100644 (file)
--- a/src-ui/src/app/services/rest/document-comments.service.ts
+++ b/src-ui/src/app/services/rest/document-comments.service.ts
@@ -21,7 +21,7 @@ export class DocumentCommentsService extends AbstractPaperlessService<PaperlessD
   addComment(id: number, comment): Observable<PaperlessDocumentComment[]> {
     return this.http.post<PaperlessDocumentComment[]>(
       this.getResourceUrl(id, 'comments'),
-      { payload: comment }
+      { comment: comment }
     )
   }
 
@@ -29,11 +29,9 @@ export class DocumentCommentsService extends AbstractPaperlessService<PaperlessD
     documentId: number,
     commentId: number
   ): Observable<PaperlessDocumentComment[]> {
-    let httpParams = new HttpParams()
-    httpParams = httpParams.set('commentId', commentId.toString())
     return this.http.delete<PaperlessDocumentComment[]>(
       this.getResourceUrl(documentId, 'comments'),
-      { params: httpParams }
+      { params: new HttpParams({ fromString: `id=${commentId}` }) }
     )
   }
 }

diff --git a/src/documents/views.py b/src/documents/views.py
index 41f652905fba57deaa8de5f89d05fe754df4b023..b9c8a126593bd735a7ec1ecb2444bed7edb8d5f4 100644 (file)
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -414,7 +414,7 @@ class DocumentViewSet(
             try:
                 c = Comment.objects.create(
                     document=doc,
-                    comment=request.data["payload"],
+                    comment=request.data["comment"],
                     user=currentUser,
                 )
                 c.save()
@@ -427,7 +427,7 @@ class DocumentViewSet(
                     },
                 )
         elif request.method == "DELETE":
-            comment = Comment.objects.get(id=int(request.GET.get("commentId")))
+            comment = Comment.objects.get(id=int(request.GET.get("id")))
             comment.delete()
             return Response(self.getComments(doc))
 

diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index bfa498359cec4ee2a9ab4cd577df7b5dafdcc654..2ce99ac0ec2be1a34e4214dafab57352cac0b193 100644 (file)
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -566,6 +566,7 @@ CONVERT_MEMORY_LIMIT = os.getenv("PAPERLESS_CONVERT_MEMORY_LIMIT")
 
 GS_BINARY = os.getenv("PAPERLESS_GS_BINARY", "gs")
 
+
 # Pre-2.x versions of Paperless stored your documents locally with GPG
 # encryption, but that is no longer the default.  This behaviour is still
 # available, but it must be explicitly enabled by setting