Tests: Updated comment test to account for new editor usage

[bookstack] / app / Activity / Controllers / CommentController.php

diff --git a/app/Activity/Controllers/CommentController.php b/app/Activity/Controllers/CommentController.php
index 516bcac759a981921c3e610cd1c9dba65fdb9214..479d57c4db941455bf34d8a158c6e186b12a686c 100644 (file)
--- a/app/Activity/Controllers/CommentController.php
+++ b/app/Activity/Controllers/CommentController.php
@@ -3,7 +3,9 @@
 namespace BookStack\Activity\Controllers;
 
 use BookStack\Activity\CommentRepo;
 namespace BookStack\Activity\Controllers;
 
 use BookStack\Activity\CommentRepo;

-use BookStack\Entities\Models\Page;
+use BookStack\Activity\Tools\CommentTree;
+use BookStack\Activity\Tools\CommentTreeNode;
+use BookStack\Entities\Queries\PageQueries;

 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use BookStack\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;


@@ -11,7 +13,8 @@ use Illuminate\Validation\ValidationException;
 class CommentController extends Controller
 {
     public function __construct(
 class CommentController extends Controller
 {
     public function __construct(

-        protected CommentRepo $commentRepo
+        protected CommentRepo $commentRepo,
+        protected PageQueries $pageQueries,

     ) {
     }
 
     ) {
     }
 


@@ -22,12 +25,13 @@ class CommentController extends Controller
      */
     public function savePageComment(Request $request, int $pageId)
     {
      */
     public function savePageComment(Request $request, int $pageId)
     {

-        $this->validate($request, [
-            'text'      => ['required', 'string'],
+        $input = $this->validate($request, [
+            'html'      => ['required', 'string'],

             'parent_id' => ['nullable', 'integer'],
             'parent_id' => ['nullable', 'integer'],

+            'content_ref' => ['string'],

         ]);
 
         ]);
 

-        $page = Page::visible()->find($pageId);
+        $page = $this->pageQueries->findVisibleById($pageId);

         if ($page === null) {
             return response('Not found', 404);
         }
         if ($page === null) {
             return response('Not found', 404);
         }


@@ -39,14 +43,12 @@ class CommentController extends Controller
 
         // Create a new comment.
         $this->checkPermission('comment-create-all');
 
         // Create a new comment.
         $this->checkPermission('comment-create-all');

-        $comment = $this->commentRepo->create($page, $request->get('text'), $request->get('parent_id'));
+        $contentRef = $input['content_ref'] ?? '';
+        $comment = $this->commentRepo->create($page, $input['html'], $input['parent_id'] ?? null, $contentRef);

 
         return view('comments.comment-branch', [
             'readOnly' => false,
 
         return view('comments.comment-branch', [
             'readOnly' => false,

-            'branch' => [
-                'comment' => $comment,
-                'children' => [],
-            ]
+            'branch' => new CommentTreeNode($comment, 0, []),

         ]);
     }
 
         ]);
     }
 


@@ -57,17 +59,60 @@ class CommentController extends Controller
      */
     public function update(Request $request, int $commentId)
     {
      */
     public function update(Request $request, int $commentId)
     {

-        $this->validate($request, [
-            'text' => ['required', 'string'],
+        $input = $this->validate($request, [
+            'html' => ['required', 'string'],

         ]);
 
         $comment = $this->commentRepo->getById($commentId);
         $this->checkOwnablePermission('page-view', $comment->entity);
         $this->checkOwnablePermission('comment-update', $comment);
 
         ]);
 
         $comment = $this->commentRepo->getById($commentId);
         $this->checkOwnablePermission('page-view', $comment->entity);
         $this->checkOwnablePermission('comment-update', $comment);
 

-        $comment = $this->commentRepo->update($comment, $request->get('text'));
+        $comment = $this->commentRepo->update($comment, $input['html']);

 
 

-        return view('comments.comment', ['comment' => $comment, 'readOnly' => false]);
+        return view('comments.comment', [
+            'comment' => $comment,
+            'readOnly' => false,
+        ]);
+    }
+
+    /**
+     * Mark a comment as archived.
+     */
+    public function archive(int $id)
+    {
+        $comment = $this->commentRepo->getById($id);
+        $this->checkOwnablePermission('page-view', $comment->entity);
+        if (!userCan('comment-update', $comment) && !userCan('comment-delete', $comment)) {
+            $this->showPermissionError();
+        }
+
+        $this->commentRepo->archive($comment);
+
+        $tree = new CommentTree($comment->entity);
+        return view('comments.comment-branch', [
+            'readOnly' => false,
+            'branch' => $tree->getCommentNodeForId($id),
+        ]);
+    }
+
+    /**
+     * Unmark a comment as archived.
+     */
+    public function unarchive(int $id)
+    {
+        $comment = $this->commentRepo->getById($id);
+        $this->checkOwnablePermission('page-view', $comment->entity);
+        if (!userCan('comment-update', $comment) && !userCan('comment-delete', $comment)) {
+            $this->showPermissionError();
+        }
+
+        $this->commentRepo->unarchive($comment);
+
+        $tree = new CommentTree($comment->entity);
+        return view('comments.comment-branch', [
+            'readOnly' => false,
+            'branch' => $tree->getCommentNodeForId($id),
+        ]);

     }
 
     /**
     }
 
     /**