Merge branch 'next' into Support-article

freshworks · Oct 25, 2024 · 10499d4 · 10499d4
2 parents cf63a30 + 5cab368
commit 10499d4
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/...s/crayons-extended/custom-objects/src/components/form-builder/components/field-editor.tsx b/...s/crayons-extended/custom-objects/src/components/form-builder/components/field-editor.tsx
@@ -511,7 +511,17 @@ export class FieldEditor {
     } else {
       try {
         const strNewFieldLabel = strInputValue.toLowerCase();
-        const arrFields = this.formValues.fields;
+        let arrFields = this.formValues.fields;
+        // Check if any field has sections and concatenate fields from sections
+        arrFields = arrFields.reduce((acc, field) => {
+          if (
+            field?.field_options?.has_sections &&
+            Array.isArray(field?.fields)
+          ) {
+            return acc.concat(field?.fields);
+          }
+          return acc.concat(field);
+        }, []);
 
         if (
           arrFields &&