Dashboard Provisioning: Add duplicate cleanup for modes 0-2 (#113336)
This commit is contained in:
@@ -312,7 +312,7 @@ func (c *DashboardSearchClient) Search(ctx context.Context, req *resourcepb.Reso
|
||||
for _, dashboard := range provisioningData {
|
||||
list.Results.Rows = append(list.Results.Rows, &resourcepb.ResourceTableRow{
|
||||
Key: getResourceKey(&dashboards.DashboardSearchProjection{
|
||||
UID: dashboard.Dashboard.UID,
|
||||
UID: dashboard.UID,
|
||||
}, req.Options.Key.Namespace),
|
||||
Cells: c.createDetailedProvisioningCells(dashboard, query),
|
||||
})
|
||||
@@ -512,7 +512,7 @@ func (c *DashboardSearchClient) createProvisioningCells(dashboard *dashboards.Da
|
||||
}
|
||||
|
||||
func (c *DashboardSearchClient) createDetailedProvisioningCells(dashboard *dashboards.DashboardProvisioningSearchResults, query *dashboards.FindPersistedDashboardsQuery) [][]byte {
|
||||
cells := c.createCommonCells(dashboard.Dashboard.Title, dashboard.Dashboard.FolderUID, dashboard.Dashboard.ID, []byte("[]"))
|
||||
cells := c.createCommonCells(dashboard.Title, dashboard.FolderUID, dashboard.ID, []byte("[]"))
|
||||
return append(cells,
|
||||
[]byte(query.ManagedBy),
|
||||
[]byte(dashboard.Provisioner),
|
||||
|
||||
@@ -454,7 +454,9 @@ func TestDashboardSearchClient_Search(t *testing.T) {
|
||||
t.Run("Should retrieve dashboards by provisioner name through a different function", func(t *testing.T) {
|
||||
mockStore.On("GetProvisionedDashboardsByName", mock.Anything, "test", mock.Anything).Return([]*dashboards.DashboardProvisioningSearchResults{
|
||||
{
|
||||
Dashboard: dashboards.Dashboard{UID: "uid", Title: "Test Dashboard", FolderUID: "folder1"},
|
||||
UID: "uid",
|
||||
Title: "Test Dashboard",
|
||||
FolderUID: "folder1",
|
||||
ExternalID: "test",
|
||||
Provisioner: string(utils.ManagerKindClassicFP), // nolint:staticcheck
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user