form-builder-pro 1.0.9 → 1.0.11

package/dist/index.d.mts

@@ -39,6 +39,7 @@ interface FormField {
         id: string;
         name: string;
     };
+    masterTypeName?: string;
     enabled?: boolean;
     visible?: boolean;
 }
@@ -234,8 +235,8 @@ declare class FormRenderer {
 /**
  * Cleans a form schema by removing invalid properties and normalizing field types
  * - Converts "decimal" type to "number"
- * - Removes invalid properties like "masterTypeName"
  * - Removes empty options arrays from non-select/radio fields
+ * - Preserves masterTypeName for select fields with groupName
  * @param schema
  * @returns Cleaned schema
  */

package/dist/index.d.ts

@@ -39,6 +39,7 @@ interface FormField {
         id: string;
         name: string;
     };
+    masterTypeName?: string;
     enabled?: boolean;
     visible?: boolean;
 }
@@ -234,8 +235,8 @@ declare class FormRenderer {
 /**
  * Cleans a form schema by removing invalid properties and normalizing field types
  * - Converts "decimal" type to "number"
- * - Removes invalid properties like "masterTypeName"
  * - Removes empty options arrays from non-select/radio fields
+ * - Preserves masterTypeName for select fields with groupName
  * @param schema
  * @returns Cleaned schema
  */

package/dist/index.js

@@ -4188,6 +4188,9 @@ var cleanFormSchema = (schema) => {
     if (field.type === "select" && field.groupName) {
       cleaned.groupName = field.groupName;
     }
+    if (field.type === "select" && field.masterTypeName !== void 0) {
+      cleaned.masterTypeName = field.masterTypeName;
+    }
     return cleaned;
   };
   return {
@@ -4257,32 +4260,99 @@ var formStore = createStore((set, get) => ({
       const updatedSections = cleanedSchema.sections.map((section) => ({
         ...section,
         fields: section.fields.map((field) => {
-          if (field.type === "select" && field.groupName) {
-            const masterType = state.masterTypes.find(
-              (mt) => mt.active === true && (mt.id === field.groupName?.id || mt.name === field.groupName?.name)
-            );
+          if (field.type === "select") {
+            let masterType;
+            let updatedField = { ...field };
+            if (field.masterTypeName && !field.groupName) {
+              masterType = state.masterTypes.find(
+                (mt) => mt.active === true && mt.enumName === field.masterTypeName
+              );
+              if (masterType) {
+                updatedField = {
+                  ...updatedField,
+                  groupName: {
+                    id: masterType.id,
+                    name: masterType.name
+                  }
+                };
+                if (process.env.NODE_ENV === "development") {
+                  console.log(`[FormBuilder] Hydrating dropdown field "${field.id}": Resolved groupName from masterTypeName "${field.masterTypeName}"`, {
+                    fieldId: field.id,
+                    masterTypeName: field.masterTypeName,
+                    groupName: updatedField.groupName
+                  });
+                }
+              } else {
+                console.warn(`[FormBuilder] Master type not found for masterTypeName: "${field.masterTypeName}"`, {
+                  fieldId: field.id,
+                  masterTypeName: field.masterTypeName
+                });
+              }
+            } else if (field.groupName) {
+              masterType = state.masterTypes.find(
+                (mt) => mt.active === true && (mt.id === field.groupName?.id || mt.name === field.groupName?.name)
+              );
+              if (masterType && !field.masterTypeName && masterType.enumName) {
+                updatedField = {
+                  ...updatedField,
+                  masterTypeName: masterType.enumName
+                };
+              }
+            } else if (field.masterTypeName && field.groupName) {
+              masterType = state.masterTypes.find(
+                (mt) => mt.active === true && mt.enumName === field.masterTypeName && (mt.id === field.groupName?.id || mt.name === field.groupName?.name)
+              );
+              if (!masterType) {
+                masterType = state.masterTypes.find(
+                  (mt) => mt.active === true && mt.enumName === field.masterTypeName
+                );
+                if (masterType) {
+                  updatedField = {
+                    ...updatedField,
+                    groupName: {
+                      id: masterType.id,
+                      name: masterType.name
+                    }
+                  };
+                }
+              }
+            }
             if (masterType) {
+              let options = [];
               if (masterType.enumName && state.dropdownOptionsMap && state.dropdownOptionsMap[masterType.enumName]) {
-                return { ...field, options: state.dropdownOptionsMap[masterType.enumName] };
-              }
-              if (!masterType.indexes || masterType.indexes.length === 0) {
-                console.warn(`[FormBuilder] Master type "${masterType.displayName}" (${masterType.name}) has empty indexes array. Dropdown will have no options. Please ensure the API returns populated indexes.`, {
+                options = state.dropdownOptionsMap[masterType.enumName];
+                if (process.env.NODE_ENV === "development") {
+                  console.log(`[FormBuilder] Hydrating dropdown field "${field.id}": Loaded ${options.length} options from dropdownOptionsMap for "${masterType.enumName}"`);
+                }
+              } else if (masterType.indexes && masterType.indexes.length > 0) {
+                options = convertIndexesToOptions(masterType.indexes);
+                if (process.env.NODE_ENV === "development") {
+                  console.log(`[FormBuilder] Hydrating dropdown field "${field.id}": Loaded ${options.length} options from master type indexes for "${masterType.displayName}"`);
+                }
+              } else {
+                console.warn(`[FormBuilder] Master type "${masterType.displayName}" (${masterType.name}) has empty indexes array and no dropdownOptionsMap entry. Dropdown will have no options. Please ensure the API returns populated indexes or provide dropdownOptionsMap.`, {
                   masterTypeId: masterType.id,
                   masterTypeName: masterType.name,
                   enumName: masterType.enumName,
-                  indexes: masterType.indexes
+                  indexes: masterType.indexes,
+                  fieldId: field.id
                 });
               }
-              if (masterType.indexes && masterType.indexes.length > 0) {
-                if (!field.options || field.options.length === 0 || areDefaultOptions(field.options)) {
-                  const options = convertIndexesToOptions(masterType.indexes);
-                  console.log(`[FormBuilder] Populating ${options.length} options from master type "${masterType.displayName}"`);
-                  return { ...field, options };
+              if (options.length > 0) {
+                if (!updatedField.options || updatedField.options.length === 0 || areDefaultOptions(updatedField.options)) {
+                  updatedField = {
+                    ...updatedField,
+                    options
+                  };
                 }
               }
-            } else {
-              console.warn("[FormBuilder] Master type not found for groupName:", field.groupName);
+            } else if (field.groupName) {
+              console.warn("[FormBuilder] Master type not found for groupName:", field.groupName, {
+                fieldId: field.id,
+                groupName: field.groupName
+              });
             }
+            return updatedField;
           }
           return field;
         })
@@ -4321,10 +4391,17 @@ var formStore = createStore((set, get) => ({
       const updatedSections = state.schema.sections.map((section) => ({
         ...section,
         fields: section.fields.map((field) => {
-          if (field.type === "select" && field.groupName) {
-            const masterType = state.masterTypes.find(
-              (mt) => mt.active === true && (mt.id === field.groupName?.id || mt.name === field.groupName?.name)
-            );
+          if (field.type === "select") {
+            let masterType;
+            if (field.masterTypeName) {
+              masterType = state.masterTypes.find(
+                (mt) => mt.active === true && mt.enumName === field.masterTypeName
+              );
+            } else if (field.groupName) {
+              masterType = state.masterTypes.find(
+                (mt) => mt.active === true && (mt.id === field.groupName?.id || mt.name === field.groupName?.name)
+              );
+            }
             if (masterType && masterType.indexes && masterType.indexes.length > 0) {
               if (!field.options || field.options.length === 0 || areDefaultOptions(field.options)) {
                 const options = convertIndexesToOptions(masterType.indexes);
@@ -4362,10 +4439,17 @@ var formStore = createStore((set, get) => ({
       const updatedSections = state.schema.sections.map((section) => ({
         ...section,
         fields: section.fields.map((field) => {
-          if (field.type === "select" && field.groupName) {
-            const masterType = state.masterTypes.find(
-              (mt) => mt.active === true && (mt.id === field.groupName?.id || mt.name === field.groupName?.name)
-            );
+          if (field.type === "select") {
+            let masterType;
+            if (field.masterTypeName) {
+              masterType = state.masterTypes.find(
+                (mt) => mt.active === true && mt.enumName === field.masterTypeName
+              );
+            } else if (field.groupName) {
+              masterType = state.masterTypes.find(
+                (mt) => mt.active === true && (mt.id === field.groupName?.id || mt.name === field.groupName?.name)
+              );
+            }
             if (masterType && masterType.enumName && map[masterType.enumName]) {
               return { ...field, options: map[masterType.enumName] };
             }
@@ -4406,16 +4490,40 @@ var formStore = createStore((set, get) => ({
       const updatedSections = state.schema.sections.map((section) => ({
         ...section,
         fields: section.fields.map((field) => {
-          if (field.type === "select" && field.groupName) {
-            const masterType = masterTypes.find(
-              (mt) => mt.active === true && (mt.id === field.groupName?.id || mt.name === field.groupName?.name)
-            );
+          if (field.type === "select") {
+            let masterType;
+            let updatedField = { ...field };
+            if (field.masterTypeName) {
+              masterType = masterTypes.find(
+                (mt) => mt.active === true && mt.enumName === field.masterTypeName
+              );
+              if (masterType && !field.groupName) {
+                updatedField = {
+                  ...updatedField,
+                  groupName: {
+                    id: masterType.id,
+                    name: masterType.name
+                  }
+                };
+              }
+            } else if (field.groupName) {
+              masterType = masterTypes.find(
+                (mt) => mt.active === true && (mt.id === field.groupName?.id || mt.name === field.groupName?.name)
+              );
+              if (masterType && !field.masterTypeName && masterType.enumName) {
+                updatedField = {
+                  ...updatedField,
+                  masterTypeName: masterType.enumName
+                };
+              }
+            }
             if (masterType && masterType.indexes && masterType.indexes.length > 0) {
-              if (!field.options || field.options.length === 0 || areDefaultOptions(field.options)) {
+              if (!updatedField.options || updatedField.options.length === 0 || areDefaultOptions(updatedField.options)) {
                 const options = convertIndexesToOptions(masterType.indexes);
-                return { ...field, options };
+                return { ...updatedField, options };
               }
             }
+            return updatedField;
           }
           return field;
         })
@@ -8001,6 +8109,7 @@ var FormBuilder = class {
                     id: selectedMasterType.id,
                     name: selectedMasterType.name
                   },
+                  masterTypeName: selectedEnumName,
                   options: options.length > 0 ? options : void 0
                 });
                 if (this.options.onGroupSelectionChange) {
@@ -8013,19 +8122,28 @@ var FormBuilder = class {
             } else {
               formStore.getState().updateField(selectedField.id, {
                 groupName: void 0,
+                masterTypeName: void 0,
                 options: void 0
                 // Clear options when groupName is cleared
               });
             }
           }
         });
+        let currentMasterType;
+        if (selectedField.masterTypeName) {
+          currentMasterType = activeMasterTypes.find((mt) => mt.enumName === selectedField.masterTypeName);
+        } else if (selectedField.groupName) {
+          currentMasterType = activeMasterTypes.find(
+            (mt) => mt.id === selectedField.groupName?.id || mt.name === selectedField.groupName?.name
+          );
+        }
         groupNameSelect.appendChild(createElement("option", {
           value: "",
           text: "None",
-          selected: !selectedField.groupName
+          selected: !currentMasterType
         }));
         activeMasterTypes.forEach((mt) => {
-          const isSelected = selectedField.groupName && (selectedField.groupName.id === mt.id || selectedField.groupName.name === mt.name);
+          const isSelected = currentMasterType && (selectedField.masterTypeName && mt.enumName === selectedField.masterTypeName || selectedField.groupName && (mt.id === selectedField.groupName?.id || mt.name === selectedField.groupName?.name));
           const optionValue = mt.enumName || mt.id || mt.name;
           groupNameSelect.appendChild(createElement("option", {
             value: optionValue,
@@ -8035,20 +8153,23 @@ var FormBuilder = class {
         });
         groupNameGroup.appendChild(groupNameSelect);
         body.appendChild(groupNameGroup);
-        if (selectedField.groupName && (!selectedField.options || selectedField.options.length === 0)) {
-          const currentMasterType = activeMasterTypes.find(
-            (mt) => mt.id === selectedField.groupName?.id || mt.name === selectedField.groupName?.name
-          );
-          if (currentMasterType) {
-            let options = [];
-            if (currentMasterType.enumName && dropdownOptionsMap && dropdownOptionsMap[currentMasterType.enumName]) {
-              options = dropdownOptionsMap[currentMasterType.enumName];
-            } else if (currentMasterType.indexes && currentMasterType.indexes.length > 0) {
-              options = convertIndexesToOptions(currentMasterType.indexes);
-            }
-            if (options.length > 0) {
-              formStore.getState().updateField(selectedField.id, { options });
-            }
+        if (currentMasterType && (!selectedField.options || selectedField.options.length === 0)) {
+          let options = [];
+          if (currentMasterType.enumName && dropdownOptionsMap && dropdownOptionsMap[currentMasterType.enumName]) {
+            options = dropdownOptionsMap[currentMasterType.enumName];
+          } else if (currentMasterType.indexes && currentMasterType.indexes.length > 0) {
+            options = convertIndexesToOptions(currentMasterType.indexes);
+          }
+          if (options.length > 0) {
+            formStore.getState().updateField(selectedField.id, { options });
+          }
+          if (selectedField.masterTypeName && !selectedField.groupName) {
+            formStore.getState().updateField(selectedField.id, {
+              groupName: {
+                id: currentMasterType.id,
+                name: currentMasterType.name
+              }
+            });
           }
         }
       }