form-builder-pro 1.2.9 → 1.3.0

package/dist/index.mjs

@@ -4608,10 +4608,12 @@ function transformField(field) {
     transformed.optionsSource = field.optionsSource;
   if (field.customOptionsEnabled !== void 0)
     transformed.customOptionsEnabled = field.customOptionsEnabled;
-  if (field.groupName !== void 0)
-    transformed.groupName = field.groupName;
-  if (field.masterTypeName !== void 0)
-    transformed.masterTypeName = field.masterTypeName;
+  if (transformed.optionSource === "MASTER") {
+    if (field.groupName !== void 0)
+      transformed.groupName = field.groupName;
+    if (field.masterTypeName !== void 0)
+      transformed.masterTypeName = field.masterTypeName;
+  }
   if ((normalizedType === "select" || normalizedType === "radio" || normalizedType === "checkbox") && field.options && Array.isArray(field.options)) {
     transformed.options = field.options.map((opt, idx) => {
       if (opt && typeof opt === "object" && "label" in opt && "value" in opt) {
@@ -4776,10 +4778,12 @@ function fieldToPayload(field) {
     payload.optionSource = field.optionSource;
   if (field.customOptionsEnabled !== void 0)
     payload.customOptionsEnabled = field.customOptionsEnabled;
-  if (field.groupName !== void 0)
-    payload.groupName = field.groupName;
-  if (field.masterTypeName !== void 0)
-    payload.masterTypeName = field.masterTypeName;
+  if (field.optionSource === "MASTER") {
+    if (field.groupName !== void 0)
+      payload.groupName = field.groupName;
+    if (field.masterTypeName !== void 0)
+      payload.masterTypeName = field.masterTypeName;
+  }
   if (field.lookupSourceType !== void 0)
     payload.lookupSourceType = field.lookupSourceType;
   if (field.lookupSource !== void 0)
@@ -10159,112 +10163,6 @@ var FormBuilder = class {
         `show-country-name-${selectedField.id}`
       ));
     }
-    if (selectedField.type === "select" && selectedField.optionSource === "MASTER") {
-      const masterTypes = formStore.getState().masterTypes;
-      const activeMasterTypes = masterTypes.filter((mt) => mt.active === true);
-      const dropdownOptionsMap = formStore.getState().dropdownOptionsMap;
-      const convertIndexesToOptions = (indexes) => {
-        if (!indexes || !Array.isArray(indexes) || indexes.length === 0) {
-          return [];
-        }
-        return indexes.map((item, index2) => {
-          if (typeof item === "string") {
-            return { label: item, value: item };
-          }
-          if (typeof item === "object" && item !== null) {
-            const label = item.label || item.name || item.displayName || item.text || `Option ${index2 + 1}`;
-            const value = item.value || item.id || item.name || String(index2);
-            return { label, value };
-          }
-          return { label: String(item), value: String(item) };
-        });
-      };
-      if (activeMasterTypes.length > 0) {
-        const groupNameGroup = createElement("div", { className: "mb-4" });
-        groupNameGroup.appendChild(createElement("label", { className: "block text-sm font-normal text-gray-700 dark:text-gray-300 mb-1", text: "Master List" }));
-        const groupNameSelect = createElement("select", {
-          className: "w-full px-3 py-2 border border-gray-200 dark:border-gray-700 rounded-md bg-transparent",
-          onchange: (e) => {
-            const selectedEnumName = e.target.value;
-            if (selectedEnumName) {
-              const selectedMasterType = activeMasterTypes.find((mt) => mt.enumName === selectedEnumName);
-              if (selectedMasterType) {
-                let options = [];
-                if (dropdownOptionsMap && dropdownOptionsMap[selectedEnumName]) {
-                  options = dropdownOptionsMap[selectedEnumName];
-                } else if (selectedMasterType.indexes && selectedMasterType.indexes.length > 0) {
-                  options = convertIndexesToOptions(selectedMasterType.indexes);
-                }
-                formStore.getState().updateField(selectedField.id, {
-                  groupName: {
-                    id: selectedMasterType.id,
-                    name: selectedMasterType.name
-                  },
-                  masterTypeName: selectedEnumName,
-                  options: options.length > 0 ? options : void 0
-                });
-                if (this.options.onGroupSelectionChange) {
-                  this.options.onGroupSelectionChange({
-                    fieldId: selectedField.id,
-                    groupEnumName: selectedEnumName
-                  });
-                }
-              }
-            } 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: !currentMasterType
-        }));
-        activeMasterTypes.forEach((mt) => {
-          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,
-            text: mt.displayName || mt.name,
-            selected: !!isSelected
-          }));
-        });
-        groupNameGroup.appendChild(groupNameSelect);
-        body.appendChild(groupNameGroup);
-        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
-              }
-            });
-          }
-        }
-      }
-    }
     if (["select", "checkbox", "radio"].includes(selectedField.type)) {
       const optionSourceHeader = createElement("h3", { className: "text-xs font-semibold text-gray-500 uppercase tracking-wider mb-3 mt-6", text: "Option Source" });
       body.appendChild(optionSourceHeader);
@@ -10276,12 +10174,18 @@ var FormBuilder = class {
         onchange: (e) => {
           const source = e.target.value;
           const updates = { optionSource: source };
-          if (source === "MASTER" && !selectedField.masterTypeName && !selectedField.groupName) ; else if (source === "STATIC") {
+          if (source === "MASTER") ; else if (source === "STATIC") {
             updates.customOptionsEnabled = true;
+            updates.groupName = void 0;
+            updates.masterTypeName = void 0;
+            updates.options = void 0;
           } else if (source === "LOOKUP") {
             if (!selectedField.lookupSourceType) {
               updates.lookupSourceType = "MODULE";
             }
+            updates.groupName = void 0;
+            updates.masterTypeName = void 0;
+            updates.options = void 0;
           }
           formStore.getState().updateField(selectedField.id, updates);
           this.render();
@@ -10294,6 +10198,101 @@ var FormBuilder = class {
       }
       optionSourceGroup.appendChild(optionSourceSelect);
       body.appendChild(optionSourceGroup);
+      if (selectedField.type === "select" && selectedField.optionSource === "MASTER") {
+        const masterTypes = formStore.getState().masterTypes;
+        const activeMasterTypes = masterTypes.filter((mt) => mt.active === true);
+        const dropdownOptionsMap = formStore.getState().dropdownOptionsMap;
+        const convertIndexesToOptions = (indexes) => {
+          if (!indexes || !Array.isArray(indexes) || indexes.length === 0) {
+            return [];
+          }
+          return indexes.map((item, index2) => {
+            if (typeof item === "string") {
+              return { label: item, value: item };
+            }
+            if (typeof item === "object" && item !== null) {
+              const label = item.label || item.name || item.displayName || item.text || `Option ${index2 + 1}`;
+              const value = item.value || item.id || item.name || String(index2);
+              return { label, value };
+            }
+            return { label: String(item), value: String(item) };
+          });
+        };
+        if (activeMasterTypes.length > 0) {
+          const groupNameGroup = createElement("div", { className: "mb-4" });
+          groupNameGroup.appendChild(createElement("label", { className: "block text-sm font-normal text-gray-700 dark:text-gray-300 mb-1", text: "Master List" }));
+          const groupNameSelect = createElement("select", {
+            className: "w-full px-3 py-2 border border-gray-200 dark:border-gray-700 rounded-md bg-transparent",
+            onchange: (e) => {
+              const selectedEnumName = e.target.value;
+              if (selectedEnumName) {
+                const selectedMasterType = activeMasterTypes.find((mt) => mt.enumName === selectedEnumName);
+                if (selectedMasterType) {
+                  let options = [];
+                  if (dropdownOptionsMap && dropdownOptionsMap[selectedEnumName]) {
+                    options = dropdownOptionsMap[selectedEnumName];
+                  } else if (selectedMasterType.indexes && selectedMasterType.indexes.length > 0) {
+                    options = convertIndexesToOptions(selectedMasterType.indexes);
+                  }
+                  formStore.getState().updateField(selectedField.id, {
+                    groupName: { id: selectedMasterType.id, name: selectedMasterType.name },
+                    masterTypeName: selectedEnumName,
+                    options: options.length > 0 ? options : void 0
+                  });
+                  if (this.options.onGroupSelectionChange) {
+                    this.options.onGroupSelectionChange({
+                      fieldId: selectedField.id,
+                      groupEnumName: selectedEnumName
+                    });
+                  }
+                }
+              } else {
+                formStore.getState().updateField(selectedField.id, {
+                  groupName: void 0,
+                  masterTypeName: void 0,
+                  options: void 0
+                });
+              }
+            }
+          });
+          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: !currentMasterType }));
+          activeMasterTypes.forEach((mt) => {
+            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,
+              text: mt.displayName || mt.name,
+              selected: !!isSelected
+            }));
+          });
+          groupNameGroup.appendChild(groupNameSelect);
+          body.appendChild(groupNameGroup);
+          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 }
+              });
+            }
+          }
+        }
+      }
       if (selectedField.type === "select" && selectedField.optionSource === "LOOKUP") {
         const lookupSourceTypeGroup = createElement("div", { className: "mb-4" });
         lookupSourceTypeGroup.appendChild(createElement("label", { className: "block text-sm font-normal text-gray-700 dark:text-gray-300 mb-1", text: "Lookup Source Type" }));