@one-paragon/angular-utilities 2.6.0 → 2.6.2

package/fesm2022/one-paragon-angular-utilities.mjs

@@ -4549,15 +4549,17 @@ const supportsGroupBy = typeof Object.groupBy === 'function';
 function getGroupedData(data, groupByDatas, metaData) {
     return tbGroupBy(data, groupByDatas, 1, metaData);
 }
-let tbGroupBy = (data, groupByDatas, level = 1, metaData, parentGroupName) => {
+let tbGroupBy = (data, groupByDatas, level = 1, metaData, parent) => {
     const currentGroupData = groupByDatas[0];
-    const groupedDataArr = groupData(currentGroupData, data, level, metaData, parentGroupName);
+    const groupedDataArr = groupData(currentGroupData, data, level, metaData, parent);
     const remainingGroupByDatas = groupByDatas.slice(1);
     const hasChildrenGroups = !!remainingGroupByDatas.length;
     if (hasChildrenGroups) {
+        //update the group with children groups and related data
         //group the children by iterating over each group and grouping it by the next keys
         const groupOfGroups = groupedDataArr.map((group) => {
             const children = group.children;
+            const groups = tbGroupBy(children, remainingGroupByDatas, level + 1, metaData, group);
             const groupGroup = {
                 groupName: group.groupName,
                 groupHeaderDisplay: group.groupHeaderDisplay,
@@ -4568,7 +4570,8 @@ let tbGroupBy = (data, groupByDatas, level = 1, metaData, parentGroupName) => {
                 padding: group.padding,
                 level: group.level,
                 length: group.length,
-                groups: tbGroupBy(children, remainingGroupByDatas, level + 1, metaData, group.groupName),
+                groups,
+                parent: group.parent,
                 [initIndexSymbol]: group[initIndexSymbol],
                 custom: false
             };
@@ -4578,14 +4581,14 @@ let tbGroupBy = (data, groupByDatas, level = 1, metaData, parentGroupName) => {
     }
     return groupedDataArr;
 };
-function groupData(groupByData, groupData, level = 1, metaData, parentGroupName) {
+function groupData(groupByData, groupData, level = 1, metaData, parent) {
     const groupByKey = groupByData.key;
     const meta = metaData[groupByKey];
     const metaGroupGroupBy = meta && (meta.groupByLogic?.groupBy === 'use map' ? meta.map : meta.groupByLogic?.groupBy);
     const getter = metaGroupGroupBy || getFactory(groupByKey);
     const groupedDataDict = supportsGroupBy ? Object.groupBy(groupData, d => getter(d) ?? null) : groupBy(groupData, groupByKey);
     let groupedDataArr = Object.entries(groupedDataDict).map(([name, groupData], index) => {
-        const uniqueName = parentGroupName ? `${parentGroupName}-${name}` : name;
+        const uniqueName = parent?.groupName ? `${parent.groupName}-${name}` : name;
         return {
             isGroupHeader: true,
             groupHeaderDisplay: name,
@@ -4598,6 +4601,7 @@ function groupData(groupByData, groupData, level = 1, metaData, parentGroupName)
             uniqueName,
             level,
             custom: false,
+            parent,
             [initIndexSymbol]: index,
         };
     });