Chore: Remove `extraThemes` feature toggle (#105623)

remove extraThemes feature toggle
eleijonmarck/banner-service/add-update-verb
Ashley Harrison 2 months ago committed by GitHub
parent 15aa879acb
commit 546f0c2675
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      packages/grafana-data/src/types/featureToggles.gen.ts
  2. 2
      pkg/api/index.go
  3. 7
      pkg/services/featuremgmt/registry.go
  4. 1
      pkg/services/featuremgmt/toggles_gen.csv
  5. 4
      pkg/services/featuremgmt/toggles_gen.go
  6. 3
      pkg/services/featuremgmt/toggles_gen.json
  7. 4
      public/app/core/components/ThemeSelector/getSelectableThemes.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;

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

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

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

1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
32 refactorVariablesTimeRange preview @grafana/dashboards-squad false false false
33 faroDatasourceSelector preview @grafana/app-o11y false false true
34 enableDatagridEditing preview @grafana/dataviz-squad false false true
extraThemes experimental @grafana/grafana-frontend-platform false false true
35 lokiPredefinedOperations experimental @grafana/observability-logs false false true
36 pluginsFrontendSandbox privatePreview @grafana/plugins-platform-backend false false false
37 pluginsDetailsRightPanel GA @grafana/plugins-platform-backend false false true

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

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

@ -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');

Loading…
Cancel
Save