Add expand/collapse affordance in the left column header of ZoneGrids. (

#3790)
xh · Sep 18, 2024 · 44cad8f · 44cad8f
1 parent 6c8d5df
commit 44cad8f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 * Requires `hoist-core >= 21.1` for consolidated polling of Alert Banner updates (see below).
 
+### 🎁 New Features
+
+* Added expand/collapse affordance in the left column header of ZoneGrids in tree mode.
+
 ### ⚙️ Technical
 
 * Updated Admin Console's Cluster tab to refresh more frequently.

diff --git a/cmp/grid/columns/Column.ts b/cmp/grid/columns/Column.ts
@@ -1103,6 +1103,6 @@ export class Column {
 
         return isFunction(sortValue)
             ? sortValue(v, {record, column: this, gridModel})
-            : record?.data[sortValue] ?? v;
+            : (record?.data[sortValue] ?? v);
     }
 }
diff --git a/cmp/zoneGrid/ZoneGridModel.ts b/cmp/zoneGrid/ZoneGridModel.ts
@@ -583,15 +583,15 @@ export class ZoneGridModel extends HoistModel {
             const colId = it.field;
             subFields.push({
                 colId,
-                label: it.showLabel ? labelRenderers[colId] ?? true : false,
+                label: it.showLabel ? (labelRenderers[colId] ?? true) : false,
                 position: 'top'
             });
         });
         bottomMappings.forEach(it => {
             const colId = it.field;
             subFields.push({
                 colId,
-                label: it.showLabel ? labelRenderers[colId] ?? true : false,
+                label: it.showLabel ? (labelRenderers[colId] ?? true) : false,
                 position: 'bottom'
             });
         });
@@ -608,6 +608,7 @@ export class ZoneGridModel extends HoistModel {
             // Controlled properties
             field: isLeft ? 'left_column' : 'right_column',
             align: isLeft ? 'left' : 'right',
+            isTreeColumn: gridModel?.treeMode && isLeft,
             flex: overrideSpec.width ? null : isLeft ? 2 : 1,
             renderer: (value, context) => zoneGridRenderer(value, context, isLeft),
             rendererIsComplex: true,