From d62f2989a88855b782076c689bccfc060bf292e1 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Mon, 22 May 2023 15:46:24 +0200 Subject: [PATCH] [v10.0.x] Datagrid: Hide from panel list if toggle disabled (#68818) Datagrid: Hide from panel list if toggle disabled (#68482) Hide datagrid from panel list if ff disabled (cherry picked from commit 6dbadf614b2957f454a826f895375528613a63f8) Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com> --- pkg/api/frontendsettings.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index 23e7957796a..9896db63761 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -11,6 +11,7 @@ import ( "github.com/grafana/grafana/pkg/services/accesscontrol" contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model" "github.com/grafana/grafana/pkg/services/datasources" + "github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/licensing" "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings" "github.com/grafana/grafana/pkg/services/secrets/kvstore" @@ -63,6 +64,10 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro continue } + if panel.ID == "datagrid" && !hs.Features.IsEnabled(featuremgmt.FlagEnableDatagridEditing) { + continue + } + panels[panel.ID] = plugins.PanelDTO{ ID: panel.ID, Name: panel.Name,