From 2dbf6beed58753f0aa8c45faef691253eebe424c Mon Sep 17 00:00:00 2001
From: Kristina Demeshchik <kristina.demeshchik@gmail.com>
Date: Thu, 2 Apr 2026 11:18:38 -0400
Subject: [PATCH 1/2] optional method

---
 .../src/variables/adhoc/controller/AdHocFiltersController.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/scenes/src/variables/adhoc/controller/AdHocFiltersController.ts b/packages/scenes/src/variables/adhoc/controller/AdHocFiltersController.ts
index 242ffeaa3..773053b30 100644
--- a/packages/scenes/src/variables/adhoc/controller/AdHocFiltersController.ts
+++ b/packages/scenes/src/variables/adhoc/controller/AdHocFiltersController.ts
@@ -70,7 +70,7 @@ export interface AdHocFiltersController {
   /**
    * Get id for the form control. Used for accessibility.
    */
-  getControlId(): string;
+  getControlId?(): string;
 
   /**
    * Update filters list

From c309d9bfdb1b3115210d0e4532e7fce8642c1cb8 Mon Sep 17 00:00:00 2001
From: Kristina Demeshchik <kristina.demeshchik@gmail.com>
Date: Thu, 2 Apr 2026 11:19:47 -0400
Subject: [PATCH 2/2] methods calls

---
 .../adhoc/AdHocFiltersCombobox/AdHocFiltersCombobox.tsx         | 2 +-
 .../adhoc/AdHocFiltersCombobox/AdHocFiltersComboboxRenderer.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/scenes/src/variables/adhoc/AdHocFiltersCombobox/AdHocFiltersCombobox.tsx b/packages/scenes/src/variables/adhoc/AdHocFiltersCombobox/AdHocFiltersCombobox.tsx
index bf2fc69a0..a2fcf5177 100644
--- a/packages/scenes/src/variables/adhoc/AdHocFiltersCombobox/AdHocFiltersCombobox.tsx
+++ b/packages/scenes/src/variables/adhoc/AdHocFiltersCombobox/AdHocFiltersCombobox.tsx
@@ -709,7 +709,7 @@ export const AdHocCombobox = forwardRef(function AdHocCombobox(
       <input
         {...getReferenceProps({
           ref: refs.setReference,
-          id: controller.getControlId(),
+          id: controller.getControlId?.(),
           onChange,
           value: inputValue,
           // dynamic placeholder to display operator and/or value in filter edit mode
diff --git a/packages/scenes/src/variables/adhoc/AdHocFiltersCombobox/AdHocFiltersComboboxRenderer.tsx b/packages/scenes/src/variables/adhoc/AdHocFiltersCombobox/AdHocFiltersComboboxRenderer.tsx
index 1ea081dbc..a63c3c380 100644
--- a/packages/scenes/src/variables/adhoc/AdHocFiltersCombobox/AdHocFiltersComboboxRenderer.tsx
+++ b/packages/scenes/src/variables/adhoc/AdHocFiltersCombobox/AdHocFiltersComboboxRenderer.tsx
@@ -70,7 +70,7 @@ export const AdHocFiltersComboboxRenderer = memo(function AdHocFiltersComboboxRe
 
   const groupByFiltersToRender = shouldCollapse ? groupByFilters.slice(0, MAX_VISIBLE_GROUP_BY) : groupByFilters;
   const groupByHiddenCount = shouldCollapse ? Math.max(0, groupByFilters.length - MAX_VISIBLE_GROUP_BY) : 0;
-  const variableControlId = controller.getControlId();
+  const variableControlId = controller.getControlId?.();
 
   // Reset collapsed state when there are no filters (only when collapsible)
   useEffect(() => {