fix(util/grid): pass smoke test for redMethod

grafana · Jan 5, 2024 · 79fe602 · 79fe602
1 parent e119d38
commit 79fe602
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 14 deletions.
diff --git a/custom/util/grid.libsonnet b/custom/util/grid.libsonnet
@@ -28,16 +28,26 @@ local panelUtil = import './panel.libsonnet';
     ],
   ),
   makeGrid(panels, panelWidth=8, panelHeight=8, startY=0):
-    local sanitizedPanels = std.map(
+    local sanitizePanels(ps) = std.map(
       function(p)
-        panelUtil.sanitizePanel(p)
-        + (
-          if p.type != 'row'
-          then { gridPos+: { h: panelHeight, w: panelWidth } }
-          else {}
+        local sanePanel = panelUtil.sanitizePanel(p);
+        (
+          if p.type == 'row'
+          then sanePanel + {
+            panels: sanitizePanels(sanePanel.panels),
+          }
+          else sanePanel + {
+            gridPos+: {
+              h: panelHeight,
+              w: panelWidth,
+            },
+          }
         ),
-      panels
+      ps
     );
+
+    local sanitizedPanels = sanitizePanels(panels);
+
     local grouped = panelUtil.groupPanelsInRows(sanitizedPanels);
 
     local panelsBeforeRows = panelUtil.getPanelsBeforeNextRow(grouped);

diff --git a/gen/grafonnet-v10.1.0/custom/util/grid.libsonnet b/gen/grafonnet-v10.1.0/custom/util/grid.libsonnet
@@ -28,16 +28,26 @@ local panelUtil = import './panel.libsonnet';
     ],
   ),
   makeGrid(panels, panelWidth=8, panelHeight=8, startY=0):
-    local sanitizedPanels = std.map(
+    local sanitizePanels(ps) = std.map(
       function(p)
-        panelUtil.sanitizePanel(p)
-        + (
-          if p.type != 'row'
-          then { gridPos+: { h: panelHeight, w: panelWidth } }
-          else {}
+        local sanePanel = panelUtil.sanitizePanel(p);
+        (
+          if p.type == 'row'
+          then sanePanel + {
+            panels: sanitizePanels(sanePanel.panels),
+          }
+          else sanePanel + {
+            gridPos+: {
+              h: panelHeight,
+              w: panelWidth,
+            },
+          }
         ),
-      panels
+      ps
     );
+
+    local sanitizedPanels = sanitizePanels(panels);
+
     local grouped = panelUtil.groupPanelsInRows(sanitizedPanels);
 
     local panelsBeforeRows = panelUtil.getPanelsBeforeNextRow(grouped);