From e87772c2a3ca93de6decb81af4c8abc4d609e3dd Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 29 Nov 2022 12:06:27 +0200
Subject: [PATCH] Fixed folder groupStats behaviour when !groupStats

---
 .../ui/creature/character/characterSheetTabs/ActionsTab.vue   | 1 +
 .../ui/creature/character/characterSheetTabs/FeaturesTab.vue  | 1 +
 .../ui/creature/character/characterSheetTabs/InventoryTab.vue | 1 +
 .../ui/creature/character/characterSheetTabs/JournalTab.vue   | 1 +
 .../ui/creature/character/characterSheetTabs/SpellsTab.vue    | 1 +
 .../ui/creature/character/characterSheetTabs/StatsTab.vue     | 4 ++--
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
index 4eb82fb7..13b5b4fa 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
@@ -61,6 +61,7 @@ export default {
       const folderIds = CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
+        groupStats: true,
         hideStatsGroup: true,
         removed: { $ne: true },
         inactive: { $ne: true },
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
index 5e4bda72..4a8a22ff 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
@@ -59,6 +59,7 @@ export default {
       const folderIds = CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
+        groupStats: true,
         hideStatsGroup: true,
         removed: { $ne: true },
         inactive: { $ne: true },
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
index 64eddd1b..b87f2dd9 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
@@ -145,6 +145,7 @@ export default {
       return CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
+        groupStats: true,
         hideStatsGroup: true,
         removed: { $ne: true },
         inactive: { $ne: true },
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
index d4834bb5..36502e54 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
@@ -63,6 +63,7 @@ export default {
       const folderIds = CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
+        groupStats: true,
         hideStatsGroup: true,
         removed: { $ne: true },
         inactive: { $ne: true },
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
index db5d3af3..549d742c 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
@@ -81,6 +81,7 @@ export default {
       return CreatureProperties.find({
         'ancestors.id': this.creatureId,
         type: 'folder',
+        groupStats: true,
         hideStatsGroup: true,
         removed: { $ne: true },
         inactive: { $ne: true },
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
index e751f8e8..7f350a16 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -427,10 +427,10 @@ const propertyHandlers = {
   folder(prop) {
     let skipChildren;
     let propPath = null;
-    if (prop.hideStatsGroup) {
+    if (prop.groupStats && prop.hideStatsGroup) {
       skipChildren = true;
     }
-    if (prop.tab === 'stats') {
+    if (prop.groupStats && prop.tab === 'stats') {
       propPath = ['folder', prop.location]
     }
     return { skipChildren, propPath }