From 546f0c2675064044ad83151fc67c87fa5cc145f4 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Tue, 20 May 2025 09:18:08 +0100
Subject: [PATCH] Chore: Remove `extraThemes` feature toggle (#105623)

remove extraThemes feature toggle
---
 packages/grafana-data/src/types/featureToggles.gen.ts      | 4 ----
 pkg/api/index.go                                           | 2 +-
 pkg/services/featuremgmt/registry.go                       | 7 -------
 pkg/services/featuremgmt/toggles_gen.csv                   | 1 -
 pkg/services/featuremgmt/toggles_gen.go                    | 4 ----
 pkg/services/featuremgmt/toggles_gen.json                  | 3 ++-
 .../core/components/ThemeSelector/getSelectableThemes.ts   | 4 ----
 7 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 73cc3a18b7a..0aae2fb6f1b 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -162,10 +162,6 @@ export interface FeatureToggles {
   */
   enableDatagridEditing?: boolean;
   /**
-  * Enables extra themes
-  */
-  extraThemes?: boolean;
-  /**
   * Adds predefined query operations to Loki query editor
   */
   lokiPredefinedOperations?: boolean;
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 016a78366c6..02bfc451c5a 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -282,7 +282,7 @@ func (hs *HTTPServer) getThemeForIndexData(themePrefId string, themeURLParam str
 	if pref.IsValidThemeID(themePrefId) {
 		theme := pref.GetThemeByID(themePrefId)
 		// TODO refactor
-		if !theme.IsExtra || hs.Features.IsEnabledGlobally(featuremgmt.FlagExtraThemes) || hs.Features.IsEnabledGlobally(featuremgmt.FlagGrafanaconThemes) {
+		if !theme.IsExtra || hs.Features.IsEnabledGlobally(featuremgmt.FlagGrafanaconThemes) {
 			return theme
 		}
 	}
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 0a4a0efda57..7fe0ed23ef2 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -256,13 +256,6 @@ var (
 			Stage:        FeatureStagePublicPreview,
 			Owner:        grafanaDatavizSquad,
 		},
-		{
-			Name:         "extraThemes",
-			Description:  "Enables extra themes",
-			FrontendOnly: true,
-			Stage:        FeatureStageExperimental,
-			Owner:        grafanaFrontendPlatformSquad,
-		},
 		{
 			Name:         "lokiPredefinedOperations",
 			Description:  "Adds predefined query operations to Loki query editor",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index e692911b325..88d74f4eb64 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -32,7 +32,6 @@ renderAuthJWT,preview,@grafana/sharing-squad,false,false,false
 refactorVariablesTimeRange,preview,@grafana/dashboards-squad,false,false,false
 faroDatasourceSelector,preview,@grafana/app-o11y,false,false,true
 enableDatagridEditing,preview,@grafana/dataviz-squad,false,false,true
-extraThemes,experimental,@grafana/grafana-frontend-platform,false,false,true
 lokiPredefinedOperations,experimental,@grafana/observability-logs,false,false,true
 pluginsFrontendSandbox,privatePreview,@grafana/plugins-platform-backend,false,false,false
 pluginsDetailsRightPanel,GA,@grafana/plugins-platform-backend,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 92efdb79dd4..0c31832770b 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -139,10 +139,6 @@ const (
 	// Enables the edit functionality in the datagrid panel
 	FlagEnableDatagridEditing = "enableDatagridEditing"
 
-	// FlagExtraThemes
-	// Enables extra themes
-	FlagExtraThemes = "extraThemes"
-
 	// FlagLokiPredefinedOperations
 	// Adds predefined query operations to Loki query editor
 	FlagLokiPredefinedOperations = "lokiPredefinedOperations"
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index f3c389fd743..23c5e9470b5 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -1223,7 +1223,8 @@
       "metadata": {
         "name": "extraThemes",
         "resourceVersion": "1743693517832",
-        "creationTimestamp": "2023-05-10T13:37:04Z"
+        "creationTimestamp": "2023-05-10T13:37:04Z",
+        "deletionTimestamp": "2025-05-19T15:29:06Z"
       },
       "spec": {
         "description": "Enables extra themes",
diff --git a/public/app/core/components/ThemeSelector/getSelectableThemes.ts b/public/app/core/components/ThemeSelector/getSelectableThemes.ts
index 7dc749d9793..ac6cff61cfe 100644
--- a/public/app/core/components/ThemeSelector/getSelectableThemes.ts
+++ b/public/app/core/components/ThemeSelector/getSelectableThemes.ts
@@ -4,10 +4,6 @@ import { config } from '@grafana/runtime';
 export function getSelectableThemes() {
   const allowedExtraThemes = [];
 
-  if (config.featureToggles.extraThemes) {
-    allowedExtraThemes.push('debug');
-  }
-
   if (config.featureToggles.grafanaconThemes) {
     allowedExtraThemes.push('desertbloom');
     allowedExtraThemes.push('gildedgrove');