From 43436bd6f055be24db4d4f782aad1e4e73a1d1e7 Mon Sep 17 00:00:00 2001
From: Giordano Ricci <me@giordanoricci.com>
Date: Mon, 7 Nov 2022 16:06:40 +0000
Subject: [PATCH] Explore: Remove explore2Dashboard feature toggle (#58329)

---
 docs/sources/explore/_index.md                        | 6 ------
 packages/grafana-data/src/types/featureToggles.gen.ts | 1 -
 pkg/services/featuremgmt/registry.go                  | 7 -------
 pkg/services/featuremgmt/toggles_gen.go               | 4 ----
 public/app/features/explore/ExploreToolbar.tsx        | 2 +-
 5 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/docs/sources/explore/_index.md b/docs/sources/explore/_index.md
index 013e01db4c2..40e6f1303da 100644
--- a/docs/sources/explore/_index.md
+++ b/docs/sources/explore/_index.md
@@ -68,12 +68,6 @@ The Share shortened link capability allows you to create smaller and simpler URL
 
 ## Available feature toggles
 
-### explore2Dashboard
-
-> **Note:** Available in Grafana 8.5.0 and later versions.
-
-Enabled by default, allows users to create panels in dashboards from within Explore.
-
 ### exploreMixedDatasource
 
 Disabled by default, allows users in Explore to have different datasources for different queries. If compatible, results will be combined.
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index f6c943a949d..be9f94d3b37 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -45,7 +45,6 @@ export interface FeatureToggles {
   dashboardsFromStorage?: boolean;
   export?: boolean;
   azureMonitorResourcePickerForMetrics?: boolean;
-  explore2Dashboard?: boolean;
   exploreMixedDatasource?: boolean;
   tracing?: boolean;
   commandPalette?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index f9220629234..814089f0bbf 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -166,13 +166,6 @@ var (
 			RequiresDevMode: true,
 			FrontendOnly:    true,
 		},
-		{
-			Name:         "explore2Dashboard",
-			Description:  "Experimental Explore to Dashboard workflow",
-			State:        FeatureStateStable,
-			Expression:   "true", // enabled by default
-			FrontendOnly: true,
-		},
 		{
 			Name:         "exploreMixedDatasource",
 			Description:  "Enable mixed datasource in Explore",
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 44193087731..3ea262fdcf2 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -123,10 +123,6 @@ const (
 	// New UI for Azure Monitor Metrics Query
 	FlagAzureMonitorResourcePickerForMetrics = "azureMonitorResourcePickerForMetrics"
 
-	// FlagExplore2Dashboard
-	// Experimental Explore to Dashboard workflow
-	FlagExplore2Dashboard = "explore2Dashboard"
-
 	// FlagExploreMixedDatasource
 	// Enable mixed datasource in Explore
 	FlagExploreMixedDatasource = "exploreMixedDatasource"
diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index 6703018efd6..b746c6f28f3 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -157,7 +157,7 @@ class UnConnectedExploreToolbar extends PureComponent<Props> {
         </ToolbarButton>
       ),
 
-      config.featureToggles.explore2Dashboard && showExploreToDashboard && (
+      showExploreToDashboard && (
         <Suspense key="addToDashboard" fallback={null}>
           <AddToDashboard exploreId={exploreId} />
         </Suspense>