From 2b3a36b5721f10b12cd2efbdbff627d05346fbb4 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Mon, 17 Mar 2025 12:31:22 +0000
Subject: [PATCH] Query library: Add selectors and turn on feature toggle in
 e2e (#101347)

* add selectors and turn on feature toggle in e2e

* remove unneeded feature toggle
---
 packages/grafana-e2e-selectors/src/selectors/components.ts   | 3 +++
 packages/grafana-e2e-selectors/src/selectors/pages.ts        | 3 +++
 .../panel-edit/PanelDataPane/PanelDataQueriesTab.tsx         | 2 +-
 public/app/features/explore/SecondaryActions.tsx             | 2 ++
 scripts/grafana-server/custom.ini                            | 5 ++++-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-e2e-selectors/src/selectors/components.ts b/packages/grafana-e2e-selectors/src/selectors/components.ts
index 0ad5ecb22e1..fef0857db56 100644
--- a/packages/grafana-e2e-selectors/src/selectors/components.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/components.ts
@@ -590,6 +590,9 @@ export const versionedComponents = {
       '10.2.0': 'data-testid query-tab-add-query',
       [MIN_GRAFANA_VERSION]: 'Query editor add query button',
     },
+    addQueryFromLibrary: {
+      '11.5.0': 'data-testid query-tab-add-query-from-library',
+    },
     queryGroupTopSection: {
       '11.2.0': 'data-testid query group top section',
     },
diff --git a/packages/grafana-e2e-selectors/src/selectors/pages.ts b/packages/grafana-e2e-selectors/src/selectors/pages.ts
index 75d7c8dd4d0..2e63f0f21c4 100644
--- a/packages/grafana-e2e-selectors/src/selectors/pages.ts
+++ b/packages/grafana-e2e-selectors/src/selectors/pages.ts
@@ -867,6 +867,9 @@ export const versionedPages = {
       scrollView: {
         '9.0.0': 'data-testid explorer scroll view',
       },
+      addFromQueryLibrary: {
+        '11.5.0': 'data-testid explore add from query library button',
+      },
     },
     QueryHistory: {
       container: {
diff --git a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
index f669ebeeb98..31dbfc108e5 100644
--- a/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
+++ b/public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
@@ -386,7 +386,7 @@ export function PanelDataQueriesTabRendered({ model }: SceneComponentProps<Panel
                   openQueryLibraryDrawer(getDatasourceNames(datasource, queries), onSelectQueryFromLibrary)
                 }
                 variant="secondary"
-                data-testid={selectors.components.QueryTab.addQuery}
+                data-testid={selectors.components.QueryTab.addQueryFromLibrary}
               >
                 <Trans i18nKey={'dashboards.panel-queries.add-query-from-library'}>Add query from library</Trans>
               </Button>
diff --git a/public/app/features/explore/SecondaryActions.tsx b/public/app/features/explore/SecondaryActions.tsx
index e50bb642d86..0e43cba7558 100644
--- a/public/app/features/explore/SecondaryActions.tsx
+++ b/public/app/features/explore/SecondaryActions.tsx
@@ -1,6 +1,7 @@
 import { css } from '@emotion/css';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
 import { ToolbarButton, useTheme2 } from '@grafana/ui';
 import { t, Trans } from 'app/core/internationalization';
 import { useSelector } from 'app/types';
@@ -71,6 +72,7 @@ export function SecondaryActions({
           </ToolbarButton>
           {queryLibraryEnabled && (
             <ToolbarButton
+              data-testid={selectors.pages.Explore.General.addFromQueryLibrary}
               aria-label={t('explore.secondary-actions.add-from-query-library', 'Add query from library')}
               variant="canvas"
               onClick={() => openQueryLibraryDrawer(activeDatasources, onSelectQueryFromLibrary)}
diff --git a/scripts/grafana-server/custom.ini b/scripts/grafana-server/custom.ini
index 98a518778ec..ddda503e5c8 100644
--- a/scripts/grafana-server/custom.ini
+++ b/scripts/grafana-server/custom.ini
@@ -5,7 +5,10 @@ content_security_policy_template = """require-trusted-types-for 'script'; script
 enable_frontend_sandbox_for_plugins = sandbox-app-test,sandbox-test-datasource,sandbox-test-panel
 
 [feature_toggles]
-enable = publicDashboards
+publicDashboards=true
+grafanaAPIServer=true
+queryLibrary=true
+queryService=true
 
 [plugins]
 allow_loading_unsigned_plugins=grafana-extensionstest-app,grafana-extensionexample1-app,grafana-extensionexample2-app,grafana-extensionexample3-app,grafana-e2etest-datasource