From 3f7017a47102b52a84ccba9ad22cc6ee48c3e278 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Tue, 4 Jun 2024 10:16:12 +0100 Subject: [PATCH] Chore: Remove `nestedFolderPicker` toggle (#88660) remove nestedFolderPicker toggle --- .../configure-grafana/feature-toggles/index.md | 1 - packages/grafana-data/src/types/featureToggles.gen.ts | 1 - pkg/services/featuremgmt/registry.go | 9 --------- pkg/services/featuremgmt/toggles_gen.csv | 1 - pkg/services/featuremgmt/toggles_gen.go | 4 ---- pkg/services/featuremgmt/toggles_gen.json | 3 ++- public/app/core/components/Select/FolderPicker.tsx | 4 +--- 7 files changed, 3 insertions(+), 20 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 fbb7d1c19bf..cdd99caa05b 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -30,7 +30,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `exploreContentOutline` | Content outline sidebar | Yes | | `cloudWatchCrossAccountQuerying` | Enables cross-account querying in CloudWatch datasources | Yes | | `nestedFolders` | Enable folder nesting | Yes | -| `nestedFolderPicker` | Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle | Yes | | `logsContextDatasourceUi` | Allow datasource to provide custom UI for context view | Yes | | `lokiQuerySplitting` | Split large interval queries into subqueries with smaller time intervals | Yes | | `prometheusMetricEncyclopedia` | Adds the metrics explorer component to the Prometheus query builder as an option in metric select | Yes | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index f70fffb4a2a..a229f5bfe4d 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -51,7 +51,6 @@ export interface FeatureToggles { mysqlAnsiQuotes?: boolean; accessControlOnCall?: boolean; nestedFolders?: boolean; - nestedFolderPicker?: boolean; alertingBacktesting?: boolean; editPanelCSVDragAndDrop?: boolean; alertingNoNormalState?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 3c047ba8f05..7fbb206fc76 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -255,15 +255,6 @@ var ( Owner: grafanaSearchAndStorageSquad, Expression: "true", // enabled by default }, - { - Name: "nestedFolderPicker", - Description: "Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle", - Stage: FeatureStageGeneralAvailability, - Owner: grafanaFrontendPlatformSquad, - FrontendOnly: true, - Expression: "true", // enabled by default - AllowSelfServe: true, - }, { Name: "alertingBacktesting", Description: "Rule backtesting API for alerting", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 0a34e89e287..092783aacd3 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -32,7 +32,6 @@ showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,fal mysqlAnsiQuotes,experimental,@grafana/search-and-storage,false,false,false accessControlOnCall,preview,@grafana/identity-access-team,false,false,false nestedFolders,GA,@grafana/search-and-storage,false,false,false -nestedFolderPicker,GA,@grafana/grafana-frontend-platform,false,false,true alertingBacktesting,experimental,@grafana/alerting-squad,false,false,false editPanelCSVDragAndDrop,experimental,@grafana/dataviz-squad,false,false,true alertingNoNormalState,preview,@grafana/alerting-squad,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index dfd4866c09c..cfafc2cb753 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -139,10 +139,6 @@ const ( // Enable folder nesting FlagNestedFolders = "nestedFolders" - // FlagNestedFolderPicker - // Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle - FlagNestedFolderPicker = "nestedFolderPicker" - // FlagAlertingBacktesting // Rule backtesting API for alerting FlagAlertingBacktesting = "alertingBacktesting" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 59c80db9502..31249f4e8b7 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -264,7 +264,8 @@ "metadata": { "name": "nestedFolderPicker", "resourceVersion": "1687945229020", - "creationTimestamp": "2023-06-28T09:40:29Z" + "creationTimestamp": "2023-06-28T09:40:29Z", + "deletionTimestamp": "2024-06-04T08:42:53Z" }, "spec": { "description": "Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle", diff --git a/public/app/core/components/Select/FolderPicker.tsx b/public/app/core/components/Select/FolderPicker.tsx index 1611b961366..39fbea56a38 100644 --- a/public/app/core/components/Select/FolderPicker.tsx +++ b/public/app/core/components/Select/FolderPicker.tsx @@ -28,9 +28,7 @@ interface FolderPickerProps extends NestedFolderPickerProps { // Temporary wrapper component to switch between the NestedFolderPicker and the old flat // FolderPicker depending on feature flags export function FolderPicker(props: FolderPickerProps) { - const nestedEnabled = - config.featureToggles.newFolderPicker || - (config.featureToggles.nestedFolders && config.featureToggles.nestedFolderPicker); + const nestedEnabled = config.featureToggles.newFolderPicker || config.featureToggles.nestedFolders; const { initialTitle, dashboardId, enableCreateNew, ...newFolderPickerProps } = props; return nestedEnabled ? : ;