tests cleanup

* unified-storage: fix dashboard sharedwithme search not returning folders shared with the user

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.span_zero_demo.v42.v0alpha1.json

@@ -46,7 +46,7 @@
           "x": 0,
           "y": 0
         },
-        "id": 1,
+        "id": 23,
         "options": {
           "content": "This dashboard demonstrates various monitoring components for application observability and performance metrics.\n",
           "mode": "markdown"
@@ -77,7 +77,7 @@
           "x": 0,
           "y": 0
         },
-        "id": 23,
+        "id": 24,
         "panels": [],
         "targets": [
           {

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.span_zero_demo.v42.v2alpha1.json

@@ -31,53 +31,6 @@
     "cursorSync": "Off",
     "editable": false,
     "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "Application Monitoring",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "prometheus",
-                      "spec": {}
-                    },
-                    "datasource": {
-                      "type": "prometheus",
-                      "uid": "default-ds-uid"
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "text",
-            "spec": {
-              "pluginVersion": "",
-              "options": {
-                "content": "This dashboard demonstrates various monitoring components for application observability and performance metrics.\n",
-                "mode": "markdown"
-              },
-              "fieldConfig": {
-                "defaults": {},
-                "overrides": []
-              }
-            }
-          }
-        }
-      },
       "panel-10": {
         "kind": "Panel",
         "spec": {
@@ -1024,6 +977,53 @@
           }
         }
       },
+      "panel-23": {
+        "kind": "Panel",
+        "spec": {
+          "id": 23,
+          "title": "Application Monitoring",
+          "description": "",
+          "links": [],
+          "data": {
+            "kind": "QueryGroup",
+            "spec": {
+              "queries": [
+                {
+                  "kind": "PanelQuery",
+                  "spec": {
+                    "query": {
+                      "kind": "prometheus",
+                      "spec": {}
+                    },
+                    "datasource": {
+                      "type": "prometheus",
+                      "uid": "default-ds-uid"
+                    },
+                    "refId": "A",
+                    "hidden": false
+                  }
+                }
+              ],
+              "transformations": [],
+              "queryOptions": {}
+            }
+          },
+          "vizConfig": {
+            "kind": "text",
+            "spec": {
+              "pluginVersion": "",
+              "options": {
+                "content": "This dashboard demonstrates various monitoring components for application observability and performance metrics.\n",
+                "mode": "markdown"
+              },
+              "fieldConfig": {
+                "defaults": {},
+                "overrides": []
+              }
+            }
+          }
+        }
+      },
       "panel-6": {
         "kind": "Panel",
         "spec": {
@@ -1259,7 +1259,7 @@
                         "height": 3,
                         "element": {
                           "kind": "ElementReference",
-                          "name": "panel-1"
+                          "name": "panel-23"
                         }
                       }
                     }

apps/dashboard/pkg/migration/conversion/testdata/migrated_dashboards_output/v1beta1-mig-v16.span_zero_demo.v42.v2beta1.json

@@ -32,55 +32,6 @@
     "cursorSync": "Off",
     "editable": false,
     "elements": {
-      "panel-1": {
-        "kind": "Panel",
-        "spec": {
-          "id": 1,
-          "title": "Application Monitoring",
-          "description": "",
-          "links": [],
-          "data": {
-            "kind": "QueryGroup",
-            "spec": {
-              "queries": [
-                {
-                  "kind": "PanelQuery",
-                  "spec": {
-                    "query": {
-                      "kind": "DataQuery",
-                      "group": "prometheus",
-                      "version": "v0",
-                      "datasource": {
-                        "name": "default-ds-uid"
-                      },
-                      "spec": {}
-                    },
-                    "refId": "A",
-                    "hidden": false
-                  }
-                }
-              ],
-              "transformations": [],
-              "queryOptions": {}
-            }
-          },
-          "vizConfig": {
-            "kind": "VizConfig",
-            "group": "text",
-            "version": "",
-            "spec": {
-              "options": {
-                "content": "This dashboard demonstrates various monitoring components for application observability and performance metrics.\n",
-                "mode": "markdown"
-              },
-              "fieldConfig": {
-                "defaults": {},
-                "overrides": []
-              }
-            }
-          }
-        }
-      },
       "panel-10": {
         "kind": "Panel",
         "spec": {
@@ -1067,6 +1018,55 @@
           }
         }
       },
+      "panel-23": {
+        "kind": "Panel",
+        "spec": {
+          "id": 23,
+          "title": "Application Monitoring",
+          "description": "",
+          "links": [],
+          "data": {
+            "kind": "QueryGroup",
+            "spec": {
+              "queries": [
+                {
+                  "kind": "PanelQuery",
+                  "spec": {
+                    "query": {
+                      "kind": "DataQuery",
+                      "group": "prometheus",
+                      "version": "v0",
+                      "datasource": {
+                        "name": "default-ds-uid"
+                      },
+                      "spec": {}
+                    },
+                    "refId": "A",
+                    "hidden": false
+                  }
+                }
+              ],
+              "transformations": [],
+              "queryOptions": {}
+            }
+          },
+          "vizConfig": {
+            "kind": "VizConfig",
+            "group": "text",
+            "version": "",
+            "spec": {
+              "options": {
+                "content": "This dashboard demonstrates various monitoring components for application observability and performance metrics.\n",
+                "mode": "markdown"
+              },
+              "fieldConfig": {
+                "defaults": {},
+                "overrides": []
+              }
+            }
+          }
+        }
+      },
       "panel-6": {
         "kind": "Panel",
         "spec": {
@@ -1310,7 +1310,7 @@
                         "height": 3,
                         "element": {
                           "kind": "ElementReference",
-                          "name": "panel-1"
+                          "name": "panel-23"
                         }
                       }
                     }

apps/dashboard/pkg/migration/frontend_defaults.go

@@ -432,6 +432,21 @@ func getPanels(dashboard map[string]interface{}) []map[string]interface{} {
 		}
 	}
 
+	// Also get panels from rows
+	if rows, ok := dashboard["rows"].([]interface{}); ok {
+		for _, rowInterface := range rows {
+			if row, ok := rowInterface.(map[string]interface{}); ok {
+				if rowPanels, ok := row["panels"].([]interface{}); ok {
+					for _, panelInterface := range rowPanels {
+						if panel, ok := panelInterface.(map[string]interface{}); ok {
+							panels = append(panels, panel)
+						}
+					}
+				}
+			}
+		}
+	}
+
 	return panels
 }
 

apps/dashboard/pkg/migration/schemaversion/v16.go

@@ -46,7 +46,8 @@ func upgradeToGridLayout(dashboard map[string]interface{}) {
 	widthFactor := gridColumnCount / 12.0
 
 	// Find max panel ID (lines 1014-1021 in TS)
-	maxPanelID := getMaxPanelID(rows)
+	// Also check top-level panels which may have been assigned IDs by ensurePanelsHaveUniqueIds
+	maxPanelID := getMaxPanelID(dashboard, rows)
 	nextRowID := maxPanelID + 1
 
 	// Match frontend: dashboard.panels already exists with top-level panels
@@ -269,10 +270,25 @@ func (r *rowArea) getPanelPosition(panelHeight int, panelWidth int) map[string]i
 	return r.getPanelPosition(panelHeight, panelWidth)
 }
 
-func getMaxPanelID(rows []interface{}) int {
+func getMaxPanelID(dashboard map[string]interface{}, rows []interface{}) int {
 	maxID := 0
 	hasValidID := false
 
+	// Check top-level panels first (these may have been assigned IDs by ensurePanelsHaveUniqueIds)
+	if panels, ok := dashboard["panels"].([]interface{}); ok {
+		for _, panelInterface := range panels {
+			if panel, ok := panelInterface.(map[string]interface{}); ok {
+				if id := GetIntValue(panel, "id", 0); id > 0 {
+					hasValidID = true
+					if id > maxID {
+						maxID = id
+					}
+				}
+			}
+		}
+	}
+
+	// Also check panels inside rows
 	for _, rowInterface := range rows {
 		if row, ok := rowInterface.(map[string]interface{}); ok {
 			if panels, ok := row["panels"].([]interface{}); ok {

apps/dashboard/pkg/migration/testdata/output/latest_version/v16.span_zero_demo.v42.json

@@ -40,7 +40,7 @@
         "x": 0,
         "y": 0
       },
-      "id": 1,
+      "id": 23,
       "options": {
         "content": "This dashboard demonstrates various monitoring components for application observability and performance metrics.\n",
         "mode": "markdown"
@@ -71,7 +71,7 @@
         "x": 0,
         "y": 0
       },
-      "id": 23,
+      "id": 24,
       "panels": [],
       "targets": [
         {

apps/dashboard/pkg/migration/testdata/output/single_version/v16.span_zero_demo.v16.json

@@ -35,7 +35,7 @@
         "x": 0,
         "y": 0
       },
-      "id": 1,
+      "id": 23,
       "options": {
         "content": "This dashboard demonstrates various monitoring components for application observability and performance metrics.\n",
         "mode": "markdown"
@@ -51,7 +51,7 @@
         "x": 0,
         "y": 0
       },
-      "id": 23,
+      "id": 24,
       "panels": [],
       "title": "Application Service",
       "type": "row"

pkg/registry/apis/dashboard/search.go

@@ -552,6 +552,7 @@ func (s *SearchHandler) getDashboardsUIDsSharedWithUser(ctx context.Context, use
 	// gets dashboards that the user was granted read access to
 	permissions := user.GetPermissions()
 	dashboardPermissions := permissions[dashboards.ActionDashboardsRead]
+	folderPermissions := permissions[dashboards.ActionFoldersRead]
 	dashboardUids := make([]string, 0)
 	sharedDashboards := make([]string, 0)
 
@@ -562,6 +563,13 @@ func (s *SearchHandler) getDashboardsUIDsSharedWithUser(ctx context.Context, use
 			}
 		}
 	}
+	for _, folderPermission := range folderPermissions {
+		if folderUid, found := strings.CutPrefix(folderPermission, dashboards.ScopeFoldersPrefix); found {
+			if !slices.Contains(dashboardUids, folderUid) && folderUid != foldermodel.SharedWithMeFolderUID && folderUid != foldermodel.GeneralFolderUID {
+				dashboardUids = append(dashboardUids, folderUid)
+			}
+		}
+	}
 
 	if len(dashboardUids) == 0 {
 		return sharedDashboards, nil
@@ -572,9 +580,15 @@ func (s *SearchHandler) getDashboardsUIDsSharedWithUser(ctx context.Context, use
 		return sharedDashboards, err
 	}
 
+	folderKey, err := asResourceKey(user.GetNamespace(), folders.RESOURCE)
+	if err != nil {
+		return sharedDashboards, err
+	}
+
 	dashboardSearchRequest := &resourcepb.ResourceSearchRequest{
-		Fields: []string{"folder"},
-		Limit:  int64(len(dashboardUids)),
+		Federated: []*resourcepb.ResourceKey{folderKey},
+		Fields:    []string{"folder"},
+		Limit:     int64(len(dashboardUids)),
 		Options: &resourcepb.ListOptions{
 			Key: key,
 			Fields: []*resourcepb.Requirement{{
@@ -610,12 +624,6 @@ func (s *SearchHandler) getDashboardsUIDsSharedWithUser(ctx context.Context, use
 		}
 	}
 
-	// only folders the user has access to will be returned here
-	folderKey, err := asResourceKey(user.GetNamespace(), folders.RESOURCE)
-	if err != nil {
-		return sharedDashboards, err
-	}
-
 	folderSearchRequest := &resourcepb.ResourceSearchRequest{
 		Fields: []string{"folder"},
 		Limit:  int64(len(allFolders)),
@@ -628,6 +636,7 @@ func (s *SearchHandler) getDashboardsUIDsSharedWithUser(ctx context.Context, use
 			}},
 		},
 	}
+	// only folders the user has access to will be returned here
 	foldersResult, err := s.client.Search(ctx, folderSearchRequest)
 	if err != nil {
 		return sharedDashboards, err

pkg/registry/apis/dashboard/search_test.go

@@ -507,6 +507,15 @@ func TestSearchHandlerSharedDashboards(t *testing.T) {
 							[]byte("publicfolder"), // folder uid
 						},
 					},
+					{
+						Key: &resourcepb.ResourceKey{
+							Name:     "sharedfolder",
+							Resource: "folder",
+						},
+						Cells: [][]byte{
+							[]byte("privatefolder"), // folder uid
+						},
+					},
 				},
 			},
 		}
@@ -550,6 +559,15 @@ func TestSearchHandlerSharedDashboards(t *testing.T) {
 							[]byte("privatefolder"), // folder uid
 						},
 					},
+					{
+						Key: &resourcepb.ResourceKey{
+							Name:     "sharedfolder",
+							Resource: "folder",
+						},
+						Cells: [][]byte{
+							[]byte("privatefolder"), // folder uid
+						},
+					},
 				},
 			},
 		}
@@ -571,6 +589,7 @@ func TestSearchHandlerSharedDashboards(t *testing.T) {
 		allPermissions := make(map[int64]map[string][]string)
 		permissions := make(map[string][]string)
 		permissions[dashboards.ActionDashboardsRead] = []string{"dashboards:uid:dashboardinroot", "dashboards:uid:dashboardinprivatefolder", "dashboards:uid:dashboardinpublicfolder"}
+		permissions[dashboards.ActionFoldersRead] = []string{"folders:uid:sharedfolder"}
 		allPermissions[1] = permissions
 		// "Permissions" is where we store the uid of dashboards shared with the user
 		req = req.WithContext(identity.WithRequester(req.Context(), &user.SignedInUser{Namespace: "test", OrgID: 1, Permissions: allPermissions}))
@@ -581,14 +600,19 @@ func TestSearchHandlerSharedDashboards(t *testing.T) {
 
 		// first call gets all dashboards user has permission for
 		firstCall := mockClient.MockCalls[0]
-		assert.Equal(t, firstCall.Options.Fields[0].Values, []string{"dashboardinroot", "dashboardinprivatefolder", "dashboardinpublicfolder"})
+		assert.Equal(t, firstCall.Options.Fields[0].Values, []string{"dashboardinroot", "dashboardinprivatefolder", "dashboardinpublicfolder", "sharedfolder"})
+		// verify federated field is set to include folders
+		assert.NotNil(t, firstCall.Federated)
+		assert.Equal(t, 1, len(firstCall.Federated))
+		assert.Equal(t, "folder.grafana.app", firstCall.Federated[0].Group)
+		assert.Equal(t, "folders", firstCall.Federated[0].Resource)
 		// second call gets folders associated with the previous dashboards
 		secondCall := mockClient.MockCalls[1]
 		assert.Equal(t, secondCall.Options.Fields[0].Values, []string{"privatefolder", "publicfolder"})
-		// lastly, search ONLY for dashboards user has permission to read that are within folders the user does NOT have
+		// lastly, search ONLY for dashboards and folders user has permission to read that are within folders the user does NOT have
 		// permission to read
 		thirdCall := mockClient.MockCalls[2]
-		assert.Equal(t, thirdCall.Options.Fields[0].Values, []string{"dashboardinprivatefolder"})
+		assert.Equal(t, thirdCall.Options.Fields[0].Values, []string{"dashboardinprivatefolder", "sharedfolder"})
 
 		resp := rr.Result()
 		defer func() {

public/app/features/dashboard/state/DashboardMigrator.ts

@@ -816,14 +816,17 @@ export class DashboardMigrator {
     let yPos = 0;
     const widthFactor = GRID_COLUMN_COUNT / 12;
 
-    const maxPanelId =
-      max(
-        flattenDeep(
-          map(old.rows, (row) => {
-            return map(row.panels, 'id');
-          })
-        ).filter((id) => id != null)
-      ) || 0;
+    // Find max panel ID from both rows and existing top-level panels
+    // Top-level panels may have been assigned IDs by ensurePanelsHaveUniqueIds
+    const rowPanelIds = flattenDeep(
+      map(old.rows, (row) => {
+        return map(row.panels, 'id');
+      })
+    ).filter((id) => id != null);
+
+    const topLevelPanelIds = map(this.dashboard.panels, 'id').filter((id) => id != null);
+
+    const maxPanelId = max([...rowPanelIds, ...topLevelPanelIds]) || 0;
     let nextRowId = maxPanelId + 1;
 
     if (!old.rows) {

public/app/features/dashboard/state/DashboardModel.ts

@@ -525,6 +525,14 @@ export class DashboardModel implements TimeModel {
       }
     }
 
+    // Also check panels in legacy rows (pre-v16 dashboard format)
+    // This ensures unique IDs are assigned before the row upgrade migration runs
+    for (const panel of this.rawPanelIterator()) {
+      if (panel.id > max) {
+        max = panel.id;
+      }
+    }
+
     return max + 1;
   }
 
@@ -539,6 +547,26 @@ export class DashboardModel implements TimeModel {
     }
   }
 
+  /**
+   * Iterates over panels from the original raw dashboard data, including legacy rows.
+   * This is needed to find panel IDs before row upgrade migration runs.
+   */
+  private *rawPanelIterator() {
+    // @ts-expect-error - rows is a legacy property not included in the modern Dashboard schema
+    const rows = this.originalDashboard?.rows;
+
+    if (Array.isArray(rows)) {
+      for (const row of rows) {
+        const rowPanels = row?.panels;
+        if (Array.isArray(rowPanels)) {
+          for (const panel of rowPanels) {
+            yield panel;
+          }
+        }
+      }
+    }
+  }
+
   forEachPanel(callback: (panel: PanelModel, index: number) => void) {
     for (let i = 0; i < this.panels.length; i++) {
       callback(this.panels[i], i);