Search: Include collapsed panels in search v2 (#83047)

* Include collapsed panels in searchv2
* Include collapsed row in TestReadSummaries

pkg/services/store/kind/dashboard/summary.go

@@ -60,43 +60,58 @@ func NewStaticDashboardSummaryBuilder(lookup DatasourceLookup, sanitize bool) en
 		summary.Fields["schemaVersion"] = fmt.Sprint(dash.SchemaVersion)
 
 		for _, panel := range dash.Panels {
-			panelRefs := NewReferenceAccumulator()
+			s := panelSummary(panel, uid, dashboardRefs)
-			p := &entity.EntitySummary{
+			summary.Nested = append(summary.Nested, s...)
-				UID:  uid + "#" + strconv.FormatInt(panel.ID, 10),
-				Kind: "panel",
-			}
-			p.Name = panel.Title
-			p.Description = panel.Description
-			p.Fields = make(map[string]string, 0)
-			p.Fields["type"] = panel.Type
-
-			if panel.Type != "row" {
-				panelRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypePanel), panel.Type)
-				dashboardRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypePanel), panel.Type)
-			}
-			if panel.LibraryPanel != "" {
-				panelRefs.Add(entity.StandardKindLibraryPanel, panel.Type, panel.LibraryPanel)
-				dashboardRefs.Add(entity.StandardKindLibraryPanel, panel.Type, panel.LibraryPanel)
-			}
-			for _, v := range panel.Datasource {
-				dashboardRefs.Add(entity.StandardKindDataSource, v.Type, v.UID)
-				panelRefs.Add(entity.StandardKindDataSource, v.Type, v.UID)
-				if v.Type != "" {
-					dashboardRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypeDataSource), v.Type)
-				}
-			}
-			for _, v := range panel.Transformer {
-				panelRefs.Add(entity.ExternalEntityReferenceRuntime, entity.ExternalEntityReferenceRuntime_Transformer, v)
-				dashboardRefs.Add(entity.ExternalEntityReferenceRuntime, entity.ExternalEntityReferenceRuntime_Transformer, v)
-			}
-			p.References = panelRefs.Get()
-			summary.Nested = append(summary.Nested, p)
 		}
 
 		summary.References = dashboardRefs.Get()
 		if sanitize {
 			body, err = json.MarshalIndent(parsed, "", "  ")
 		}
+
 		return summary, body, err
 	}
 }
+
+// panelSummary take panel info and returns entity summaries for the given panel and all its collapsed panels.
+func panelSummary(panel panelInfo, uid string, dashboardRefs ReferenceAccumulator) []*entity.EntitySummary {
+	panels := []*entity.EntitySummary{}
+
+	panelRefs := NewReferenceAccumulator()
+	p := &entity.EntitySummary{
+		UID:  uid + "#" + strconv.FormatInt(panel.ID, 10),
+		Kind: "panel",
+	}
+	p.Name = panel.Title
+	p.Description = panel.Description
+	p.Fields = make(map[string]string, 0)
+	p.Fields["type"] = panel.Type
+
+	if panel.Type != "row" {
+		panelRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypePanel), panel.Type)
+		dashboardRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypePanel), panel.Type)
+	}
+	if panel.LibraryPanel != "" {
+		panelRefs.Add(entity.StandardKindLibraryPanel, panel.Type, panel.LibraryPanel)
+		dashboardRefs.Add(entity.StandardKindLibraryPanel, panel.Type, panel.LibraryPanel)
+	}
+	for _, v := range panel.Datasource {
+		dashboardRefs.Add(entity.StandardKindDataSource, v.Type, v.UID)
+		panelRefs.Add(entity.StandardKindDataSource, v.Type, v.UID)
+		if v.Type != "" {
+			dashboardRefs.Add(entity.ExternalEntityReferencePlugin, string(plugins.TypeDataSource), v.Type)
+		}
+	}
+	for _, v := range panel.Transformer {
+		panelRefs.Add(entity.ExternalEntityReferenceRuntime, entity.ExternalEntityReferenceRuntime_Transformer, v)
+		dashboardRefs.Add(entity.ExternalEntityReferenceRuntime, entity.ExternalEntityReferenceRuntime_Transformer, v)
+	}
+	p.References = panelRefs.Get()
+	panels = append(panels, p)
+
+	for _, c := range panel.Collapsed {
+		collapsed := panelSummary(c, uid, dashboardRefs)
+		panels = append(panels, collapsed...)
+	}
+	return panels
+}

pkg/services/store/kind/dashboard/testdata/with-library-panels-info.json

@@ -45,6 +45,32 @@
           "type": "panel"
         }
       ]
+    },
+    {
+      "UID": "with-library-panels#3",
+      "kind": "panel",
+      "name": "collapsed row",
+      "fields": {
+        "type": "row"
+      }
+    },
+    {
+      "UID": "with-library-panels#42",
+      "kind": "panel",
+      "name": "blue pie",
+      "fields": {
+        "type": ""
+      },
+      "references": [
+        {
+          "family": "librarypanel",
+          "identifier": "l3d2s634-fdgf-75u4-3fg3-67j966ii7jur"
+        },
+        {
+          "family": "plugin",
+          "type": "panel"
+        }
+      ]
     }
   ],
   "references": [
@@ -59,6 +85,10 @@
       "family": "librarypanel",
       "identifier": "e1d5f519-dabd-47c6-9ad7-83d181ce1cee"
     },
+    {
+      "family": "librarypanel",
+      "identifier": "l3d2s634-fdgf-75u4-3fg3-67j966ii7jur"
+    },
     {
       "family": "plugin",
       "type": "panel"

pkg/services/store/kind/dashboard/testdata/with-library-panels.json

@@ -49,6 +49,34 @@
           "uid": "e1d5f519-dabd-47c6-9ad7-83d181ce1cee"
         },
         "title": "green pie"
+      },
+      {
+        "collapsed": true,
+        "gridPos": {
+          "h": 1,
+          "w": 24,
+          "x": 0,
+          "y": 9
+        },
+        "id": 3,
+        "panels": [
+          {
+            "gridPos": {
+              "h": 8,
+              "w": 12,
+              "x": 12,
+              "y": 0
+            },
+            "id": 42,
+            "libraryPanel": {
+              "name": "blue pie",
+              "uid": "l3d2s634-fdgf-75u4-3fg3-67j966ii7jur"
+            },
+            "title": "blue pie"
+          }
+        ],
+        "title": "collapsed row",
+        "type": "row"
       }
     ],
     "refresh": "",