fix: Ensure row panels are rendered in report

* Get panels in collapsed rows as well for PDF report

* Add rows with collapsed panels in test dashboard

* Set images to maximum width and floating height to fit them properly in grid

Signed-off-by: Mahendra Paipuri <mahendra.paipuri@gmail.com>

pkg/plugin/dashboard.go

@@ -67,27 +67,20 @@ func (p Panel) Is(t PanelType) bool {
 }
 
 // Row represents a container for Panels
-type Row struct {
-	Id        int     `json:"id"`
-	Collapsed bool    `json:"collapsed"`
-	Title     string  `json:"title"`
-	Panels    []Panel `json:"panels"`
-}
-
-// If row is visible
-func (r Row) IsVisible() bool {
-	return r.Collapsed
+type RowOrPanel struct {
+	Panel
+	Panels []Panel `json:"panels"`
 }
 
 // Dashboard represents a Grafana dashboard
 // This is both used to unmarshal the dashbaord JSON into
 // and then enriched (sanitize fields for TeX consumption and add VarialbeValues)
 type Dashboard struct {
-	Title          string  `json:"title"`
-	Description    string  `json:"description"`
-	VariableValues string  // Not present in the Grafana JSON structure. Enriched data passed used by the Tex templating
-	Rows           []Row   `json:"rows"`
-	Panels         []Panel `json:"panels"`
+	Title          string       `json:"title"`
+	Description    string       `json:"description"`
+	VariableValues string       // Not present in the Grafana JSON structure. Enriched data passed used by the Tex templating
+	RowOrPanels    []RowOrPanel `json:"panels"`
+	Panels         []Panel
 }
 
 // Get dashboard variables
@@ -112,11 +105,14 @@ func NewDashboard(dashJSON []byte, queryParams url.Values) Dashboard {
 	} else {
 		// Remove row panels from model
 		var filteredPanels []Panel
-		for _, p := range dashboard.Panels {
+		for _, p := range dashboard.RowOrPanels {
 			if p.Type == "row" {
+				if p.Panels != nil {
+					filteredPanels = append(filteredPanels, p.Panels...)
+				}
 				continue
 			}
-			filteredPanels = append(filteredPanels, p)
+			filteredPanels = append(filteredPanels, p.Panel)
 		}
 		dashboard.Panels = filteredPanels
 		dashboard.VariableValues = getVariablesValues(queryParams)

pkg/plugin/dashboard_test.go

@@ -12,14 +12,14 @@ func TestDashboard(t *testing.T) {
 		const dashJSON = `
 {"dashboard":
 	{
-		"Panels":
+		"panels":
 			[{"type":"singlestat", "id":0},
 			{"type":"graph", "id":1, "gridPos":{"H":6,"W":24,"X":0,"Y":0}},
-			{"type":"singlestat", "id":2, "Title":"Panel3Title #"},
+			{"type":"singlestat", "id":2, "title":"Panel3Title #"},
 			{"type":"text", "gridPos":{"H":6.5,"W":20.5,"X":0,"Y":0}, "id":3},
 			{"type":"table", "id":4},
 			{"type":"row", "id":5}],
-		"Title":"DashTitle #"
+		"title":"DashTitle #"
 	},
 
 "Meta":

pkg/plugin/report_test.go

@@ -16,8 +16,8 @@ import (
 const dashJSON = `
 {"dashboard":
 	{
-		"Title":"My first dashboard",
-		"Panels": 
+		"title":"My first dashboard",
+		"panels": 
 			[{"type":"singlestat", "id":1},
 			 {"type":"graph", "id":22},
 			 {"type":"singlestat", "id":33},

pkg/plugin/templates/report.gohtml

@@ -40,7 +40,7 @@
 
     .grid-image {
         width: 100%;
-        height: 100%;
+        {{/* height: 100%; */}}
         object-fit: cover;
         display: block;
     }