Revert "kaban : fix comments count for virtual sample step"

This reverts commit 57b5ee3949.

public/site/blueprints/users/client.yml

@@ -12,6 +12,7 @@ permissions:
     inspirations: false
     materials: false
     creations: false
+  pages: false
   user:
     changeRole: false
     delete: false

public/site/plugins/comments/routes/create.php

@@ -4,15 +4,13 @@ use adrienpayet\comments\Comment;
 
 return [
   'pattern' => '(:all)create-comment.json',
-  'method'  => 'POST',
+  'method' => 'POST',
   'action'  => function () {
       $json = file_get_contents('php://input');
       $data = json_decode($json);
 
-      // kirby()->impersonate('kirby');
-
       $page = page($data->fileParentUri);
-      $project = $page->parent()->template() == 'project' ? $page->parent() : $page->parent()->parent();
+      $project = $page->parent()->template() == "project" ? $page->parent() : $page->parent()->parent();
       $file = $page->file($data->fileName);
       $user = kirby()->user($data->userUuid);   
       
@@ -20,24 +18,24 @@ return [
       $comments = $file->comments()->isEmpty() == true ? [] : Yaml::decode($file->comments()->value());
 
       $commentData = [
-        'location' => [
+        "location" => [
-          'page'    => $page,
+          "page" => $page,
-          'project' => $project,
+          "project" => $project,
-          'file'    => $file,
+          "file" => $file
         ],
-        'position' => [
+        "position" => [
-          'x' => $data->position->x,
+          "x" => $data->position->x,
-          'y' => $data->position->y,
+          "y" => $data->position->y
         ],
-        'date'   => (string) $data->date,
+        "date" => (string) $data->date,
-        'text'   => $data->text,
+        "text" => $data->text,
-        'author' => kirby()->user(),
+        "author" => kirby()->user(),
-        'id'     => Str::uuid(),
+        "id" => Str::uuid(),
-        'type'   => 'comment',
+        "type" => "comment",
       ];
 
       if (isset($data->position->pageIndex)) {
-          $commentData['position']['pageIndex'] = $data->position->pageIndex;
+        $commentData["position"]["pageIndex"] = $data->position->pageIndex;
       }
 
       $newComment = new Comment($commentData);
@@ -45,17 +43,17 @@ return [
       $comments[] = $newComment->toArray();      
       
       $newFile = $file->update([
-        'comments' => $comments,
+        'comments' => $comments
       ]);      
 
       echo json_encode(getFileData($newFile));
       
       try {
-          $project->createNotification($commentData);
+        $project->createNotification($commentData);
       } catch (\Throwable $th) {
-          throw new Exception($th->getMessage() . '. line ' . $th->getLine() . ' in file ' . $th->getFile(), 1);
+        throw new Exception($th->getMessage() . ". line " . $th->getLine() . " in file " . $th->getFile(), 1);
       }
 
       exit;
-  },
+  }
 ];

public/site/plugins/comments/routes/delete.php

@@ -2,11 +2,10 @@
 
 return [
   'pattern' => '(:all)delete-comment.json',
-  'method'  => 'POST',
+  'method' => 'POST',
   'action'  => function () {
       $json = file_get_contents('php://input');
       $data = json_decode($json);
-      // kirby()->impersonate('kirby');
 
       $page = page($data->location->page->uri);
       
@@ -15,33 +14,33 @@ return [
 
       $isReply = $data->location->parent->id ?? false;
       foreach ($comments as $key => &$comment) {
-          if ($isReply) {
+        if ($isReply) {
-              if ($comment['id'] === $data->location->parent->id) {
+          if ($comment['id'] === $data->location->parent->id) {
-                  foreach ($comment['replies'] as $replyKey => $reply) {
+            foreach ($comment['replies'] as $replyKey => $reply) {
-                      if ($reply['id'] === $data->id) {
+              if ($reply['id'] === $data->id) {
-                          unset($comment['replies'][$replyKey]);
+                unset($comment['replies'][$replyKey]);
-                          $comment['replies'] = array_values($comment['replies']);
+                $comment['replies'] = array_values($comment['replies']);
-                      }
-                  }
-              }
-          } else {
-              if ($comment['id'] === $data->id) {
-                  unset($comments[$key]);
               }
+            }
           }
+        } else {
+          if ($comment['id'] === $data->id) {
+            unset($comments[$key]);
+          }
+        }
       }
 
       $comments = array_values($comments);
 
       $newFile = $file->update([
-        'comments' => $comments,
+        'comments' => $comments
       ]);
       
       echo json_encode(getFileData($newFile));
       
-      $project = $page->parents()->findBy('template', 'project');
+      $project = $page->parents()->findBy("template", "project");
       $project->deleteNotification($data->id);
       
       exit;
-  },
+  }
 ];

src/components/project/cards/Images.vue

@@ -17,10 +17,12 @@
       </template>
     </figure>
     <footer
-      v-if="commentsCount > 0"
+      v-if="images[0]?.comments?.length > 0"
       class="order-last | text-sm text-primary font-medium"
     >
-      {{ commentsCount }} commentaire{{ commentsCount > 1 ? 's' : '' }}
+      {{ images[0].comments.length }} commentaire{{
+        images[0].comments.length > 1 ? 's' : ''
+      }}
     </footer>
     <div
       class="btn btn--xs btn--dtl | mt-16"
@@ -35,7 +37,6 @@
 <script setup>
 import DateTime from './DateTime.vue';
 import { useDesignToLightStore } from '../../../stores/designToLight';
-import { computed } from 'vue';
 
 const { images, step, uri } = defineProps({
   images: Array,
@@ -44,30 +45,4 @@ const { images, step, uri } = defineProps({
 });
 
 const { isDesignToLightStep } = useDesignToLightStore();
-
-const commentsCount = computed(() => {
-  let count = 0;
-
-  if (Array.isArray(step.files)) {
-    for (const file of step.files) {
-      count += file?.comments?.length || 0;
-    }
-  } else {
-    if (step.files?.dynamic) {
-      for (const track of step.files.dynamic) {
-        for (const file of track.files) {
-          count += file?.comments?.length || 0;
-        }
-      }
-    }
-
-    if (step.files?.static) {
-      for (const element of Object.values(step.files.static)) {
-        count += element?.comments?.length || 0;
-      }
-    }
-  }
-
-  return count;
-});
 </script>