From 9eb0c11c8286bc70404b4c4f7491266282d2957e Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 17:28:42 +0200
Subject: [PATCH] [v11.0.x] AdHocFilters: Use queries in ad hoc filters api
 calls (#87627)

AdHocFilters: Use queries in ad hoc filters api calls (#87624)

(cherry picked from commit 39aafde8cb86177a5b0d9db48d343347fb9fe763)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
---
 .../serialization/transformSaveModelToScene.test.ts          | 5 +++++
 .../serialization/transformSaveModelToScene.ts               | 1 +
 2 files changed, 6 insertions(+)

diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
index d83a1d20114..76774787c8d 100644
--- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.test.ts
@@ -126,6 +126,9 @@ describe('transformSaveModelToScene', () => {
       expect(scene.state?.$variables?.state.variables).toHaveLength(2);
       expect(scene.state?.$variables?.getByName('constant')).toBeInstanceOf(ConstantVariable);
       expect(scene.state?.$variables?.getByName('CoolFilters')).toBeInstanceOf(AdHocFiltersVariable);
+      expect(
+        (scene.state?.$variables?.getByName('CoolFilters') as AdHocFiltersVariable).state.useQueriesAsFilterForOptions
+      ).toBe(true);
       expect(dashboardControls).toBeDefined();
 
       expect(dashboardControls.state.refreshPicker.state.intervals).toEqual(defaultTimePickerConfig.refresh_intervals);
@@ -936,6 +939,7 @@ describe('transformSaveModelToScene', () => {
         baseFilters: [{ key: 'baseFilterTest', operator: '=', value: 'test' }],
         datasource: { uid: 'gdev-prometheus', type: 'prometheus' },
         applyMode: 'auto',
+        useQueriesAsFilterForOptions: true,
       });
     });
 
@@ -1018,6 +1022,7 @@ describe('transformSaveModelToScene', () => {
             value: '3',
           },
         ],
+        useQueriesAsFilterForOptions: true,
       });
     });
 
diff --git a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
index 98d9256a1dc..d460614330d 100644
--- a/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
+++ b/public/app/features/dashboard-scene/serialization/transformSaveModelToScene.ts
@@ -312,6 +312,7 @@ export function createSceneVariableFromVariableModel(variable: TypedVariableMode
       filters: variable.filters ?? [],
       baseFilters: variable.baseFilters ?? [],
       defaultKeys: variable.defaultKeys,
+      useQueriesAsFilterForOptions: true,
     });
   }
   if (variable.type === 'custom') {