From c02d57c6a9e8ae83164dd4e3e128c1fd2068c293 Mon Sep 17 00:00:00 2001
From: Timur Olzhabayev <timur.olzhabayev@grafana.com>
Date: Tue, 16 Jan 2024 11:08:39 +0100
Subject: [PATCH] Chore: removing folderId from plugindashboard service
 (#80570)

* removing folderId from plugindashboard service

* fixing linting
---
 .../plugindashboards/plugindashboards.go       | 18 ++++++++----------
 .../components/DashboardsTable.test.tsx        |  1 -
 public/app/types/plugins.ts                    |  1 -
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkg/services/plugindashboards/plugindashboards.go b/pkg/services/plugindashboards/plugindashboards.go
index 153a9e306dc..086d23fca5f 100644
--- a/pkg/services/plugindashboards/plugindashboards.go
+++ b/pkg/services/plugindashboards/plugindashboards.go
@@ -8,16 +8,14 @@ import (
 
 // PluginDashboard plugin dashboard model..
 type PluginDashboard struct {
-	UID         string `json:"uid"`
-	PluginId    string `json:"pluginId"`
-	Title       string `json:"title"`
-	Imported    bool   `json:"imported"`
-	ImportedUri string `json:"importedUri"`
-	ImportedUrl string `json:"importedUrl"`
-	Slug        string `json:"slug"`
-	DashboardId int64  `json:"dashboardId"`
-	// Deprecated: use FolderUID instead
-	FolderId         int64  `json:"folderId"`
+	UID              string `json:"uid"`
+	PluginId         string `json:"pluginId"`
+	Title            string `json:"title"`
+	Imported         bool   `json:"imported"`
+	ImportedUri      string `json:"importedUri"`
+	ImportedUrl      string `json:"importedUrl"`
+	Slug             string `json:"slug"`
+	DashboardId      int64  `json:"dashboardId"`
 	ImportedRevision int64  `json:"importedRevision"`
 	Revision         int64  `json:"revision"`
 	Description      string `json:"description"`
diff --git a/public/app/features/datasources/components/DashboardsTable.test.tsx b/public/app/features/datasources/components/DashboardsTable.test.tsx
index 8b463ad4343..8ce9bcad388 100644
--- a/public/app/features/datasources/components/DashboardsTable.test.tsx
+++ b/public/app/features/datasources/components/DashboardsTable.test.tsx
@@ -25,7 +25,6 @@ describe('DashboardsTable', () => {
     mockDashboard = {
       dashboardId: 0,
       description: '',
-      folderId: 0,
       imported: false,
       importedRevision: 0,
       importedUri: '',
diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts
index a6d6f68ab47..d5d09b0eef2 100644
--- a/public/app/types/plugins.ts
+++ b/public/app/types/plugins.ts
@@ -3,7 +3,6 @@ import { PanelPlugin, PluginError, PluginMeta } from '@grafana/data';
 export interface PluginDashboard {
   dashboardId: number;
   description: string;
-  folderId: number;
   imported: boolean;
   importedRevision: number;
   importedUri: string;