From f917fbfe428d00b6d23f30cddbccaee5da801318 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Mon, 24 Jul 2023 13:51:00 +0000 Subject: [PATCH] NestedFolders: Enable new nested folder picker by default for nested folders (#72129) NestedFolders: Enable new nested folder picker by default --- .../configure-grafana/feature-toggles/index.md | 2 +- pkg/services/featuremgmt/registry.go | 10 ++++++---- pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.go | 2 +- pkg/services/featuremgmt/toggles_gen_test.go | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md index 31d5d3b1afa..d7a0452868e 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -29,6 +29,7 @@ Some features are enabled by default. You can disable these feature by setting t | `redshiftAsyncQueryDataSupport` | Enable async query data support for Redshift | Yes | | `athenaAsyncQueryDataSupport` | Enable async query data support for Athena | Yes | | `newPanelChromeUI` | Show updated look and feel of grafana-ui PanelChrome: panel header, icons, and menu | Yes | +| `nestedFolderPicker` | Enables the new folder picker to work with nested folders. Requires the folderPicker feature flag | Yes | | `accessTokenExpirationCheck` | Enable OAuth access_token expiration check and token refresh using the refresh_token | | | `emptyDashboardPage` | Enable the redesigned user interface of a dashboard page that includes no panels | Yes | | `disablePrometheusExemplarSampling` | Disable Prometheus exemplar sampling | | @@ -89,7 +90,6 @@ Experimental features might be changed or removed without prior notice. | `logRequestsInstrumentedAsUnknown` | Logs the path for requests that are instrumented as unknown | | `showDashboardValidationWarnings` | Show warnings when dashboards do not validate against the schema | | `mysqlAnsiQuotes` | Use double quotes to escape keyword in a MySQL query | -| `nestedFolderPicker` | Enables the still in-development new folder picker to support nested folders | | `alertingBacktesting` | Rule backtesting API for alerting | | `editPanelCSVDragAndDrop` | Enables drag and drop for CSV and Excel files | | `lokiQuerySplittingConfig` | Give users the option to configure split durations for Loki queries | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index f77369222e3..bd84f4f3491 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -240,10 +240,12 @@ var ( Owner: grafanaBackendPlatformSquad, }, { - Name: "nestedFolderPicker", - Description: "Enables the still in-development new folder picker to support nested folders", - Stage: FeatureStageExperimental, - Owner: grafanaFrontendPlatformSquad, + Name: "nestedFolderPicker", + Description: "Enables the new folder picker to work with nested folders. Requires the folderPicker feature flag", + Stage: FeatureStageGeneralAvailability, + Owner: grafanaFrontendPlatformSquad, + FrontendOnly: true, + Expression: "true", // enabled by default }, { Name: "accessTokenExpirationCheck", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 6b20c2fc6d9..25ac4e8c9c3 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -34,7 +34,7 @@ showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,fal mysqlAnsiQuotes,experimental,@grafana/backend-platform,false,false,false,false accessControlOnCall,preview,@grafana/grafana-authnz-team,false,false,false,false nestedFolders,preview,@grafana/backend-platform,false,false,false,false -nestedFolderPicker,experimental,@grafana/grafana-frontend-platform,false,false,false,false +nestedFolderPicker,GA,@grafana/grafana-frontend-platform,false,false,false,true accessTokenExpirationCheck,GA,@grafana/grafana-authnz-team,false,false,false,false emptyDashboardPage,GA,@grafana/dashboards-squad,false,false,false,true disablePrometheusExemplarSampling,GA,@grafana/observability-metrics,false,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 6fa4f881084..c00a9c897d1 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -148,7 +148,7 @@ const ( FlagNestedFolders = "nestedFolders" // FlagNestedFolderPicker - // Enables the still in-development new folder picker to support nested folders + // Enables the new folder picker to work with nested folders. Requires the folderPicker feature flag FlagNestedFolderPicker = "nestedFolderPicker" // FlagAccessTokenExpirationCheck diff --git a/pkg/services/featuremgmt/toggles_gen_test.go b/pkg/services/featuremgmt/toggles_gen_test.go index 02c61f733f1..2e75aeb482c 100644 --- a/pkg/services/featuremgmt/toggles_gen_test.go +++ b/pkg/services/featuremgmt/toggles_gen_test.go @@ -31,7 +31,7 @@ func TestFeatureToggleFiles(t *testing.T) { t.Run("check registry constraints", func(t *testing.T) { for _, flag := range standardFeatureFlags { if flag.Expression == "true" && flag.Stage != FeatureStageGeneralAvailability { - t.Errorf("only stable features can be enabled by default. See: %s", flag.Name) + t.Errorf("only FeatureStageGeneralAvailability features can be enabled by default. See: %s", flag.Name) } if flag.RequiresDevMode && flag.Stage != FeatureStageExperimental { t.Errorf("only alpha features can require dev mode. See: %s", flag.Name)