IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Remove nestedFolderPicker toggle (#88660)

Browse Source 
remove nestedFolderPicker toggle
This commit is contained in:
Ashley Harrison 2024-06-04 10:16:12 +01:00 committed by GitHub
parent de67734871
commit 3f7017a471
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
View File

@ -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 |

1
packages/grafana-data/src/types/featureToggles.gen.ts
View File

@ -51,7 +51,6 @@ export interface FeatureToggles {
mysqlAnsiQuotes?: boolean;
accessControlOnCall?: boolean;
nestedFolders?: boolean;
nestedFolderPicker?: boolean;
alertingBacktesting?: boolean;
editPanelCSVDragAndDrop?: boolean;
alertingNoNormalState?: boolean;

9
pkg/services/featuremgmt/registry.go
View File

@ -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",

1
pkg/services/featuremgmt/toggles_gen.csv
View File

@ -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

1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
32 mysqlAnsiQuotes experimental @grafana/search-and-storage false false false
33 accessControlOnCall preview @grafana/identity-access-team false false false
34 nestedFolders GA @grafana/search-and-storage false false false
nestedFolderPicker GA @grafana/grafana-frontend-platform false false true
35 alertingBacktesting experimental @grafana/alerting-squad false false false
36 editPanelCSVDragAndDrop experimental @grafana/dataviz-squad false false true
37 alertingNoNormalState preview @grafana/alerting-squad false false false

4
pkg/services/featuremgmt/toggles_gen.go
View File

@ -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"

3
pkg/services/featuremgmt/toggles_gen.json
View File

@ -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",

4
public/app/core/components/Select/FolderPicker.tsx
View File

@ -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 ? <NestedFolderPicker {...newFolderPickerProps} /> : <OldFolderPickerWrapper {...props} />;