From cc4581135a53fe15eee192eeb5609d67a24acb38 Mon Sep 17 00:00:00 2001
From: Aditya Hegde <adityahegderocks@gmail.com>
Date: Tue, 28 Apr 2026 21:20:12 +0530
Subject: [PATCH 1/2] fix: nested measure filter form not submitting

---
 .../filters/measure-filters/MeasureFilterForm.svelte         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web-common/src/features/dashboards/filters/measure-filters/MeasureFilterForm.svelte b/web-common/src/features/dashboards/filters/measure-filters/MeasureFilterForm.svelte
index 3831bb37174e..5f3990945fe5 100644
--- a/web-common/src/features/dashboards/filters/measure-filters/MeasureFilterForm.svelte
+++ b/web-common/src/features/dashboards/filters/measure-filters/MeasureFilterForm.svelte
@@ -65,6 +65,7 @@
     {
       SPA: true,
       validators: yup(validationSchema),
+      id: "measure",
       onUpdate({ form }) {
         if (!form.valid) return;
         const values = form.data;
@@ -146,6 +147,10 @@
     autocomplete="off"
     class="flex flex-col gap-y-3"
     id="measure"
+    onsubmit={(e) => {
+      e.preventDefault();
+      submit(e);
+    }}
   >
     <Select
       bind:value={$form["dimension"]}

From 310df59248b7ff3bb035476b95deb2fd45201a03 Mon Sep 17 00:00:00 2001
From: Aditya Hegde <adityahegderocks@gmail.com>
Date: Tue, 28 Apr 2026 21:35:44 +0530
Subject: [PATCH 2/2] Use formId from superforms

---
 .../filters/measure-filters/MeasureFilterForm.svelte  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/web-common/src/features/dashboards/filters/measure-filters/MeasureFilterForm.svelte b/web-common/src/features/dashboards/filters/measure-filters/MeasureFilterForm.svelte
index 5f3990945fe5..34701b816eb7 100644
--- a/web-common/src/features/dashboards/filters/measure-filters/MeasureFilterForm.svelte
+++ b/web-common/src/features/dashboards/filters/measure-filters/MeasureFilterForm.svelte
@@ -60,12 +60,11 @@
     }),
   });
 
-  const { form, errors, submit, enhance } = superForm(
+  const { form, formId, errors, submit, enhance } = superForm(
     defaults(initialValues, yup(validationSchema)),
     {
       SPA: true,
       validators: yup(validationSchema),
-      id: "measure",
       onUpdate({ form }) {
         if (!form.valid) return;
         const values = form.data;
@@ -146,11 +145,7 @@
     use:enhance
     autocomplete="off"
     class="flex flex-col gap-y-3"
-    id="measure"
-    onsubmit={(e) => {
-      e.preventDefault();
-      submit(e);
-    }}
+    id={$formId}
   >
     <Select
       bind:value={$form["dimension"]}
@@ -198,6 +193,6 @@
       />
     {/if}
 
-    <Button submitForm type="primary" form="measure">Apply</Button>
+    <Button submitForm type="primary" form={$formId}>Apply</Button>
   </form>
 </Popover.Content>