Rename feature toggle

grafana · aocenas · Jun 18, 2025 · Jun 19, 2025 · Jun 19, 2025 · Jun 20, 2025
commit 2a00788a308dce2f663d4e7a1c5ba5725d6c8967
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -1026,8 +1026,8 @@ export interface FeatureToggles {
   */
   alertingImportAlertmanagerAPI?: boolean;
   /**
-  * Enables new API for folders
+  * Enables use of app platform API for folders
   * @default false
   */
-  foldersNewApi?: boolean;
+  foldersAppPlatformAPI?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
@@ -1765,8 +1765,8 @@ var (
 			Expression:        "false",
 		},
 		{
-			Name:              "foldersNewApi",
-			Description:       "Enables new API for folders",
+			Name:              "foldersAppPlatformAPI",
+			Description:       "Enables use of app platform API for folders",
 			Stage:             FeatureStageExperimental,
 			Owner:             grafanaFrontendSearchNavOrganise,
 			HideFromAdminPage: true,

diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
@@ -230,4 +230,4 @@ restoreDashboards,experimental,@grafana/grafana-frontend-platform,false,false,fa
 skipTokenRotationIfRecent,privatePreview,@grafana/identity-access-team,false,false,false
 alertEnrichment,experimental,@grafana/alerting-squad,false,false,false
 alertingImportAlertmanagerAPI,experimental,@grafana/alerting-squad,false,false,false
-foldersNewApi,experimental,@grafana/grafana-search-navigate-organise,false,false,true
+foldersAppPlatformAPI,experimental,@grafana/grafana-search-navigate-organise,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
@@ -931,7 +931,7 @@ const (
 	// Enables the API to import Alertmanager configuration
 	FlagAlertingImportAlertmanagerAPI = "alertingImportAlertmanagerAPI"
 
-	// FlagFoldersNewApi
-	// Enables new API for folders
-	FlagFoldersNewApi = "foldersNewApi"
+	// FlagFoldersAppPlatformAPI
+	// Enables use of app platform API for folders
+	FlagFoldersAppPlatformAPI = "foldersAppPlatformAPI"
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
@@ -1391,11 +1391,28 @@
         "hideFromDocs": true
       }
     },
+    {
+      "metadata": {
+        "name": "foldersAppPlatformAPI",
+        "resourceVersion": "1751375289151",
+        "creationTimestamp": "2025-07-01T13:08:09Z"
+      },
+      "spec": {
+        "description": "Enables use of app platform API for folders",
+        "stage": "experimental",
+        "codeowner": "@grafana/grafana-search-navigate-organise",
+        "frontend": true,
+        "hideFromAdminPage": true,
+        "hideFromDocs": true,
+        "expression": "false"
+      }
+    },
     {
       "metadata": {
         "name": "foldersNewApi",
         "resourceVersion": "1750425724072",
-        "creationTimestamp": "2025-06-20T13:22:04Z"
+        "creationTimestamp": "2025-06-20T13:22:04Z",
+        "deletionTimestamp": "2025-07-01T13:08:09Z"
       },
       "spec": {
         "description": "Enables new API for folders",

diff --git a/public/app/core/components/NestedFolderPicker/useFoldersQuery.ts b/public/app/core/components/NestedFolderPicker/useFoldersQuery.ts
@@ -15,5 +15,5 @@ export function useFoldersQuery(
 
   // Running the hooks themselves don't have any side effects, so we can just conditionally use one or the other
   // requestNextPage function from the result
-  return config.featureToggles.foldersNewApi ? resultv2 : resultv1;
+  return config.featureToggles.foldersAppPlatformAPI ? resultv2 : resultv1;
 }