Provisioning: Show file path of provisioning file in save/delete dialogs (#16706)

* Add file path to metadata and show it in dialogs

* Make path relative to config directory

* Fix tests

* Add test for the relative path

* Refactor to use path relative to provisioner path

* Change return types

* Rename attribute

* Small fixes from review

pkg/services/sqlstore/dashboard_provisioning.go

@@ -19,16 +19,16 @@ type DashboardExtras struct {
 	Value       string
 }
 
-func GetProvisionedDataByDashboardId(cmd *models.IsDashboardProvisionedQuery) error {
+func GetProvisionedDataByDashboardId(cmd *models.GetProvisionedDashboardDataByIdQuery) error {
 	result := &models.DashboardProvisioning{}
 
 	exist, err := x.Where("dashboard_id = ?", cmd.DashboardId).Get(result)
 	if err != nil {
 		return err
 	}
-
-	cmd.Result = exist
-
+	if exist {
+		cmd.Result = result
+	}
 	return nil
 }
 

pkg/services/sqlstore/dashboard_provisioning_test.go

@@ -65,20 +65,20 @@ func TestDashboardProvisioningTest(t *testing.T) {
 			})
 
 			Convey("Can query for one provisioned dashboard", func() {
-				query := &models.IsDashboardProvisionedQuery{DashboardId: cmd.Result.Id}
+				query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: cmd.Result.Id}
 
 				err := GetProvisionedDataByDashboardId(query)
 				So(err, ShouldBeNil)
 
-				So(query.Result, ShouldBeTrue)
+				So(query.Result, ShouldNotBeNil)
 			})
 
 			Convey("Can query for none provisioned dashboard", func() {
-				query := &models.IsDashboardProvisionedQuery{DashboardId: 3000}
+				query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: 3000}
 
 				err := GetProvisionedDataByDashboardId(query)
 				So(err, ShouldBeNil)
-				So(query.Result, ShouldBeFalse)
+				So(query.Result, ShouldBeNil)
 			})
 
 			Convey("Deleting folder should delete provision meta data", func() {
@@ -89,11 +89,11 @@ func TestDashboardProvisioningTest(t *testing.T) {
 
 				So(DeleteDashboard(deleteCmd), ShouldBeNil)
 
-				query := &models.IsDashboardProvisionedQuery{DashboardId: cmd.Result.Id}
+				query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: cmd.Result.Id}
 
 				err = GetProvisionedDataByDashboardId(query)
 				So(err, ShouldBeNil)
-				So(query.Result, ShouldBeFalse)
+				So(query.Result, ShouldBeNil)
 			})
 
 			Convey("UnprovisionDashboard should delete provisioning metadata", func() {
@@ -103,11 +103,11 @@ func TestDashboardProvisioningTest(t *testing.T) {
 
 				So(UnprovisionDashboard(unprovisionCmd), ShouldBeNil)
 
-				query := &models.IsDashboardProvisionedQuery{DashboardId: dashId}
+				query := &models.GetProvisionedDashboardDataByIdQuery{DashboardId: dashId}
 
 				err = GetProvisionedDataByDashboardId(query)
 				So(err, ShouldBeNil)
-				So(query.Result, ShouldBeFalse)
+				So(query.Result, ShouldBeNil)
 			})
 		})
 	})

pkg/services/sqlstore/dashboard_service_integration_test.go

@@ -27,8 +27,8 @@ func TestIntegratedDashboardService(t *testing.T) {
 				return nil
 			})
 
-			bus.AddHandler("test", func(cmd *models.IsDashboardProvisionedQuery) error {
-				cmd.Result = false
+			bus.AddHandler("test", func(cmd *models.GetProvisionedDashboardDataByIdQuery) error {
+				cmd.Result = nil
 				return nil
 			})