From 1b21e69b40776f1a1929b49d7904c080e830c6bc Mon Sep 17 00:00:00 2001
From: ThaumRystra <9525416+ThaumRystra@users.noreply.github.com>
Date: Wed, 13 Sep 2023 10:05:45 +0200
Subject: [PATCH] Only top-level notes are displayed in journal

---
 .../characterSheetTabs/JournalTab.vue         | 24 ++++++++++++++-----
 app/package-lock.json                         |  2 +-
 app/package.json                              |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
index 5d8446a1..8dd83703 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
@@ -59,7 +59,8 @@ export default {
     };
   },
   meteor: {
-    notes(){
+    notes() {
+      // Get all the notes that aren't children of group folders or of other displayed notes
       const folderIds = CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
@@ -68,8 +69,8 @@ export default {
         removed: { $ne: true },
         inactive: { $ne: true },
       }, { fields: { _id: 1 } }).map(folder => folder._id);
-      
-      return CreatureProperties.find({
+
+      const noteFilter = {
         'ancestors.id': {
           $eq: this.creatureId,
         },
@@ -77,9 +78,20 @@ export default {
           $nin: folderIds,
         },
         type: 'note',
-        removed: {$ne: true},
-        inactive: {$ne: true},
-      }, {
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      };
+      const noteIds = CreatureProperties.find(noteFilter, {
+        sort: { order: 1 },
+        fields: {_id: 1},
+      }).map(note => note._id);
+
+      noteFilter['ancestors.id'] = {
+        $eq: this.creatureId,
+        $nin: noteIds,
+      }
+      
+      return CreatureProperties.find(noteFilter, {
         sort: {order: 1},
       });
     },
diff --git a/app/package-lock.json b/app/package-lock.json
index 9fe1b74e..a772ebfa 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "dicecloud",
-  "version": "2.0.51",
+  "version": "2.0.57",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/app/package.json b/app/package.json
index 12f8fd6c..db8214ba 100644
--- a/app/package.json
+++ b/app/package.json
@@ -125,4 +125,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}