From 3e2ca29c8d14446cbba287a47d3879a9f62c741d Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Thu, 5 Oct 2023 10:14:10 +0000 Subject: [PATCH] BrowseDashboards: Enable new browse dashboards UI by default (#75822) * BrowseDashboards: Enable new browse dashboards UI by default * update docs * enable new e2e tests --- .../configure-grafana/feature-toggles/index.md | 2 +- e2e/dashboards-suite/dashboard-browse.spec.ts | 17 +---------------- pkg/services/featuremgmt/registry.go | 3 ++- pkg/services/featuremgmt/toggles_gen.csv | 2 +- 4 files changed, 5 insertions(+), 19 deletions(-) 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 a7418ed2963..e3b43596eaf 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -49,6 +49,7 @@ Some features are enabled by default. You can disable these feature by setting t | `toggleLabelsInLogsUI` | Enable toggleable filters in log details view | Yes | | `azureMonitorDataplane` | Adds dataplane compliant frame metadata in the Azure Monitor datasource | Yes | | `prometheusConfigOverhaulAuth` | Update the Prometheus configuration page with the new auth component | Yes | +| `newBrowseDashboards` | New browse/manage dashboards UI | Yes | | `cloudWatchWildCardDimensionValues` | Fetches dimension values from CloudWatch to correctly label wildcard dimensions | Yes | ## Preview feature toggles @@ -78,7 +79,6 @@ Some features are enabled by default. You can disable these feature by setting t | `awsAsyncQueryCaching` | Enable caching for async queries for Redshift and Athena. Requires that the `useCachingService` feature toggle is enabled and the datasource has caching and async query support enabled | | `splitScopes` | Support faster dashboard and folder search by splitting permission scopes into parts | | `reportingRetries` | Enables rendering retries for the reporting feature | -| `newBrowseDashboards` | New browse/manage dashboards UI | ## Experimental feature toggles diff --git a/e2e/dashboards-suite/dashboard-browse.spec.ts b/e2e/dashboards-suite/dashboard-browse.spec.ts index 2bfc26b59fa..867a274a2d1 100644 --- a/e2e/dashboards-suite/dashboard-browse.spec.ts +++ b/e2e/dashboards-suite/dashboard-browse.spec.ts @@ -6,22 +6,7 @@ describe('Dashboard browse', () => { e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD')); }); - it('Basic folder view test', () => { - e2e.flows.importDashboard(testDashboard, 1000, true); - - e2e.pages.Dashboards.visit(); - - // folder view is collapsed - verify its content does not exist - e2e.components.Search.folderContent('General').should('not.exist'); - e2e.components.Search.dashboardItem('E2E Test - Dashboard Search').should('not.exist'); - - e2e.components.Search.folderHeader('General').click({ force: true }); - - e2e.components.Search.folderContent('General').should('be.visible'); - e2e.components.Search.dashboardItem('E2E Test - Import Dashboard').should('be.visible'); - }); - - it.skip('Manage Dashboards tests', () => { + it('Manage Dashboards tests', () => { e2e.flows.importDashboard(testDashboard, 1000, true); e2e.pages.Dashboards.visit(); diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index d2fdfc3838c..ca6130d155b 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -729,9 +729,10 @@ var ( { Name: "newBrowseDashboards", Description: "New browse/manage dashboards UI", - Stage: FeatureStagePublicPreview, + Stage: FeatureStageGeneralAvailability, Owner: grafanaFrontendPlatformSquad, FrontendOnly: true, + Expression: "true", // on by default }, { Name: "sseGroupByDatasource", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index c52d3030f7c..04aab1b8a94 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -103,7 +103,7 @@ alertingNoDataErrorExecution,privatePreview,@grafana/alerting-squad,false,false, angularDeprecationUI,experimental,@grafana/plugins-platform-backend,false,false,false,true dashgpt,experimental,@grafana/dashboards-squad,false,false,false,true reportingRetries,preview,@grafana/sharing-squad,false,false,true,false -newBrowseDashboards,preview,@grafana/grafana-frontend-platform,false,false,false,true +newBrowseDashboards,GA,@grafana/grafana-frontend-platform,false,false,false,true sseGroupByDatasource,experimental,@grafana/observability-metrics,false,false,false,false requestInstrumentationStatusSource,experimental,@grafana/plugins-platform-backend,false,false,false,false lokiRunQueriesInParallel,privatePreview,@grafana/observability-logs,false,false,false,false