From be882ea762bcd511629b9653ad80e972f466f8fc Mon Sep 17 00:00:00 2001
From: Luca Foscili <45429703+lucafoscili@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:25:51 +0200
Subject: [PATCH 1/2] fix (datatable): expand by depth miscalculated maxdepth

---
 .../kup-data-table/kup-data-table.tsx         | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx b/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
index 6d36ff3746..44f398ec18 100644
--- a/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
+++ b/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
@@ -1358,7 +1358,8 @@ export class KupDataTable {
             const group = row.group;
 
             if (row.hasOwnProperty('group')) {
-                const shouldExpand = depth <= maxDepth ? true : false;
+                const shouldExpand = depth < maxDepth;
+
                 group.expanded = shouldExpand;
                 this.groupState[group.id] = { expanded: shouldExpand };
                 const paginated = paginatedStream?.find(
@@ -1388,14 +1389,17 @@ export class KupDataTable {
                 currentDepth: number
             ): void => {
                 const group = row.group;
-                for (
-                    let index = 0;
-                    group && index < group.children.length;
-                    index++
-                ) {
-                    maxDepth = Math.max(maxDepth, currentDepth);
-                    const child = group.children[index];
-                    if (child.group?.children && child.group?.expanded) {
+                if (row.hasOwnProperty('group')) {
+                    if (group.expanded) {
+                        maxDepth = Math.max(maxDepth, currentDepth);
+                        maxDepth += 1;
+                    }
+                    for (
+                        let index = 0;
+                        group && index < group.children.length;
+                        index++
+                    ) {
+                        const child = group.children[index];
                         traverseGroup(child, currentDepth + 1);
                     }
                 }
@@ -1410,6 +1414,7 @@ export class KupDataTable {
         const paginatedStream = toStream();
 
         let maxDepth = getGroupDepth() + modifier;
+        console.log(maxDepth);
 
         for (let index = 0; index < this.#rows.length; index++) {
             const row = this.#rows[index];

From bc78169913eb9c8333ded88ad30eb9603d75f0ff Mon Sep 17 00:00:00 2001
From: Luca Foscili <45429703+lucafoscili@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:51:49 +0200
Subject: [PATCH 2/2] Update kup-data-table.tsx

---
 .../ketchup/src/components/kup-data-table/kup-data-table.tsx     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx b/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
index 44f398ec18..248ac044e3 100644
--- a/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
+++ b/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx
@@ -1414,7 +1414,6 @@ export class KupDataTable {
         const paginatedStream = toStream();
 
         let maxDepth = getGroupDepth() + modifier;
-        console.log(maxDepth);
 
         for (let index = 0; index < this.#rows.length; index++) {
             const row = this.#rows[index];