From ab039ef41cc0a3f35cf2f967045baa105b592cc6 Mon Sep 17 00:00:00 2001
From: Harsh Tandiya <harsh.tandiya@gmail.com>
Date: Sat, 10 Jan 2026 17:49:48 +0530
Subject: [PATCH] fix: ensure proper field indexing when form is saved

---
 frontend/src/stores/editForm.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/stores/editForm.ts b/frontend/src/stores/editForm.ts
index 7f9aac4..03cd337 100644
--- a/frontend/src/stores/editForm.ts
+++ b/frontend/src/stores/editForm.ts
@@ -92,11 +92,14 @@ export const useEditForm = defineStore("editForm", () => {
 
   function save() {
     if (formResource.value) {
-      formResource.value.doc.fields.forEach((field: FormField) => {
-        if (!field.fieldname || field.fieldname.trim() === "") {
-          field.fieldname = scrubFieldname(field.label);
+      formResource.value.doc.fields.forEach(
+        (field: FormField, index: number) => {
+          field.idx = index + 1;
+          if (!field.fieldname || field.fieldname.trim() === "") {
+            field.fieldname = scrubFieldname(field.label);
+          }
         }
-      });
+      );
 
       return formResource.value.setValue.submit(formResource.value.doc, {
         onSuccess: () => {