From 7a6f4ced060dc855f3540f8447ff7aa860de2ec2 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 17 Feb 2025 16:39:04 +0000
Subject: [PATCH] Themes: Temporary fix for initialising saved grafanacon
 themes (#100810)

temporary fix for initialising saved grafanacon themes
---
 pkg/api/index.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/api/index.go b/pkg/api/index.go
index e9a30714e30..32ff98532f2 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -250,7 +250,8 @@ func (hs *HTTPServer) getThemeForIndexData(themePrefId string, themeURLParam str
 
 	if pref.IsValidThemeID(themePrefId) {
 		theme := pref.GetThemeByID(themePrefId)
-		if !theme.IsExtra || hs.Features.IsEnabledGlobally(featuremgmt.FlagExtraThemes) {
+		// TODO refactor
+		if !theme.IsExtra || hs.Features.IsEnabledGlobally(featuremgmt.FlagExtraThemes) || hs.Features.IsEnabledGlobally(featuremgmt.FlagGrafanaconThemes) {
 			return theme
 		}
 	}