From c2333e3bc005157e6cfce5cf0bfcb3d78365b8ae Mon Sep 17 00:00:00 2001
From: Juan Cabanas <juan.cabanas@grafana.com>
Date: Tue, 10 Dec 2024 12:52:18 -0300
Subject: [PATCH] ShareDrawer: Enable by default (#97259)

---
 .../configure-grafana/feature-toggles/index.md             | 2 +-
 e2e/dashboards-suite/dashboard-public-templating.spec.ts   | 2 +-
 e2e/dashboards-suite/snapshot-create.spec.ts               | 2 +-
 pkg/services/featuremgmt/registry.go                       | 2 +-
 pkg/services/featuremgmt/toggles_gen.json                  | 6 +++---
 .../dashboard-scene/sharing/ShareButton/ShareButton.tsx    | 7 ++++++-
 6 files changed, 13 insertions(+), 8 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 ddc8fa3aa15..e628d8caa8d 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -70,7 +70,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `tlsMemcached`                         | Use TLS-enabled memcached in the enterprise caching feature                                                                                                        | Yes                |
 | `cloudWatchNewLabelParsing`            | Updates CloudWatch label parsing to be more accurate                                                                                                               | Yes                |
 | `accessActionSets`                     | Introduces action sets for resource permissions. Also ensures that all folder editors and admins can create subfolders without needing any additional permissions. | Yes                |
-| `newDashboardSharingComponent`         | Enables the new sharing drawer design                                                                                                                              |                    |
+| `newDashboardSharingComponent`         | Enables the new sharing drawer design                                                                                                                              | Yes                |
 | `notificationBanner`                   | Enables the notification banner UI and API                                                                                                                         | Yes                |
 | `pluginProxyPreserveTrailingSlash`     | Preserve plugin proxy trailing slash.                                                                                                                              |                    |
 | `pinNavItems`                          | Enables pinning of nav items                                                                                                                                       | Yes                |
diff --git a/e2e/dashboards-suite/dashboard-public-templating.spec.ts b/e2e/dashboards-suite/dashboard-public-templating.spec.ts
index 4a4e660d44e..8040f4ce56e 100644
--- a/e2e/dashboards-suite/dashboard-public-templating.spec.ts
+++ b/e2e/dashboards-suite/dashboard-public-templating.spec.ts
@@ -7,7 +7,7 @@ describe('Create a public dashboard with template variables shows a template var
 
   it('Create a public dashboard with template variables shows a template variable warning', () => {
     // Opening a dashboard with template variables
-    e2e.flows.openDashboard({ uid: 'HYaGDGIMk' });
+    e2e.flows.openDashboard({ uid: 'HYaGDGIMk', queryParams: { '__feature.newDashboardSharingComponent': false } });
 
     // Open sharing modal
     e2e.components.NavToolbar.shareDashboard().click();
diff --git a/e2e/dashboards-suite/snapshot-create.spec.ts b/e2e/dashboards-suite/snapshot-create.spec.ts
index aff04b6b805..ee07081bfd0 100644
--- a/e2e/dashboards-suite/snapshot-create.spec.ts
+++ b/e2e/dashboards-suite/snapshot-create.spec.ts
@@ -10,7 +10,7 @@ describe('Snapshots', () => {
     cy.intercept({
       pathname: '/api/ds/query',
     }).as('query');
-    e2e.flows.openDashboard({ uid: 'ZqZnVvFZz' });
+    e2e.flows.openDashboard({ uid: 'ZqZnVvFZz', queryParams: { '__feature.newDashboardSharingComponent': false } });
     cy.wait('@query');
 
     const panelsToCheck = [
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 5a46de6b5d2..730ad3741d0 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1248,7 +1248,7 @@ var (
 			Stage:        FeatureStageGeneralAvailability,
 			Owner:        grafanaSharingSquad,
 			FrontendOnly: true,
-			Expression:   "false", // disabled by default
+			Expression:   "true", // enabled by default
 		},
 		{
 			Name:         "alertingListViewV2",
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 52d099066e9..324b18dee2f 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -2327,10 +2327,10 @@
     {
       "metadata": {
         "name": "newDashboardSharingComponent",
-        "resourceVersion": "1726241874335",
+        "resourceVersion": "1733231733564",
         "creationTimestamp": "2024-05-03T15:02:18Z",
         "annotations": {
-          "grafana.app/updatedTimestamp": "2024-09-13 15:37:54.335099 +0000 UTC"
+          "grafana.app/updatedTimestamp": "2024-12-03 13:15:33.564083 +0000 UTC"
         }
       },
       "spec": {
@@ -2338,7 +2338,7 @@
         "stage": "GA",
         "codeowner": "@grafana/sharing-squad",
         "frontend": true,
-        "expression": "false"
+        "expression": "true"
       }
     },
     {
diff --git a/public/app/features/dashboard-scene/sharing/ShareButton/ShareButton.tsx b/public/app/features/dashboard-scene/sharing/ShareButton/ShareButton.tsx
index 3a387f084d7..00e9dd599ac 100644
--- a/public/app/features/dashboard-scene/sharing/ShareButton/ShareButton.tsx
+++ b/public/app/features/dashboard-scene/sharing/ShareButton/ShareButton.tsx
@@ -46,7 +46,12 @@ export default function ShareButton({ dashboard, panel }: { dashboard: Dashboard
         <Trans i18nKey="share-dashboard.share-button">Share</Trans>
       </Button>
       <Dropdown overlay={MenuActions} placement="bottom-end" onVisibleChange={onMenuClick}>
-        <Button data-testid={newShareButtonSelector.arrowMenu} size="sm" icon={isOpen ? 'angle-up' : 'angle-down'} />
+        <Button
+          aria-label="share-dropdown-menu"
+          data-testid={newShareButtonSelector.arrowMenu}
+          size="sm"
+          icon={isOpen ? 'angle-up' : 'angle-down'}
+        />
       </Dropdown>
     </ButtonGroup>
   );