diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md index ff022049075..ea82fe1bfc7 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -25,7 +25,6 @@ Some stable features are enabled by default. You can disable a stable feature by | `database_metrics` | Add Prometheus metrics for database tables | | | `lokiMonacoEditor` | Access to Monaco query editor for Loki | Yes | | `featureHighlights` | Highlight Grafana Enterprise features | | -| `commandPalette` | Enable command palette | Yes | | `cloudWatchDynamicLabels` | Use dynamic labels instead of alias patterns in CloudWatch datasource | Yes | | `internationalization` | Enables internationalization | Yes | | `cloudWatchCrossAccountQuerying` | Enables cross-account querying in CloudWatch datasources | Yes | @@ -45,6 +44,7 @@ Some stable features are enabled by default. You can disable a stable feature by | `newDBLibrary` | Use jmoiron/sqlx rather than xorm for a few backend services | | `validateDashboardsOnSave` | Validate dashboard JSON POSTed to api/dashboards/db | | `autoMigrateGraphPanels` | Replace the angular graph panel with timeseries | +| `topnav` | Displays new top nav and page layouts | | `datasourceLogger` | Logs all datasource requests | | `accessControlOnCall` | Access control primitives for OnCall | | `alertingNoNormalState` | Stop maintaining state of alerts that are not firing | @@ -82,7 +82,6 @@ Alpha features might be changed or removed without prior notice. | `disableSecretsCompatibility` | Disable duplicated secret storage in legacy tables | | `logRequestsInstrumentedAsUnknown` | Logs the path for requests that are instrumented as unknown | | `dataConnectionsConsole` | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins. | -| `topnav` | New top nav and page layouts | | `flameGraph` | Show the flame graph | | `redshiftAsyncQueryDataSupport` | Enable async query data support for Redshift | | `athenaAsyncQueryDataSupport` | Enable async query data support for Athena | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index b73cd62a87b..ea12eb94ce2 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -49,7 +49,6 @@ export interface FeatureToggles { export?: boolean; exploreMixedDatasource?: boolean; tracing?: boolean; - commandPalette?: boolean; correlations?: boolean; cloudWatchDynamicLabels?: boolean; datasourceQueryMultiStatus?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 66c59630add..04767c8549d 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -189,13 +189,6 @@ var ( State: FeatureStateAlpha, FrontendOnly: true, }, - { - Name: "commandPalette", - Description: "Enable command palette", - State: FeatureStateStable, - Expression: "true", // enabled by default - FrontendOnly: true, - }, { Name: "correlations", Description: "Correlations page", @@ -276,8 +269,8 @@ var ( }, { Name: "topnav", - Description: "New top nav and page layouts", - State: FeatureStateAlpha, + Description: "Displays new top nav and page layouts", + State: FeatureStateBeta, }, { Name: "grpcServer", diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 8b9d51f5ca8..b47a1e88240 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -139,10 +139,6 @@ const ( // Adds trace ID to error notifications FlagTracing = "tracing" - // FlagCommandPalette - // Enable command palette - FlagCommandPalette = "commandPalette" - // FlagCorrelations // Correlations page FlagCorrelations = "correlations" @@ -200,7 +196,7 @@ const ( FlagInternationalization = "internationalization" // FlagTopnav - // New top nav and page layouts + // Displays new top nav and page layouts FlagTopnav = "topnav" // FlagGrpcServer diff --git a/public/app/core/components/AppChrome/AppChrome.tsx b/public/app/core/components/AppChrome/AppChrome.tsx index 39d15857da1..c09a2c7a567 100644 --- a/public/app/core/components/AppChrome/AppChrome.tsx +++ b/public/app/core/components/AppChrome/AppChrome.tsx @@ -31,7 +31,7 @@ export function AppChrome({ children }: Props) { <> - {featureToggles.commandPalette && } + )}
{children}
diff --git a/public/app/core/components/AppChrome/TopSearchBar.tsx b/public/app/core/components/AppChrome/TopSearchBar.tsx index 726171f4ddc..8c21831f2ba 100644 --- a/public/app/core/components/AppChrome/TopSearchBar.tsx +++ b/public/app/core/components/AppChrome/TopSearchBar.tsx @@ -26,12 +26,11 @@ export function TopSearchBar() { const helpNode = navIndex['help']; const profileNode = navIndex['profile']; - const search = - config.featureToggles.commandPalette && config.featureToggles.topNavCommandPalette ? ( - - ) : ( - - ); + const search = config.featureToggles.topNavCommandPalette ? ( + + ) : ( + + ); return (