jupiter-dynamic-forms 1.15.6 → 1.15.8

package/dist/index.mjs

@@ -1494,7 +1494,8 @@ class XBRLFormBuilder {
 }
 const form$1 = {
   loading: "Loading form...",
-  submit: "Submit",
+  submit: "Validate",
+  save: "Save",
   saveDraft: "Save Draft",
   errors: "Errors",
   modified: "Modified",
@@ -1633,7 +1634,8 @@ const enTranslations = {
 };
 const form = {
   loading: "Formulier laden...",
-  submit: "Indienen",
+  submit: "Valideren",
+  save: "Opslaan",
   saveDraft: "Concept opslaan",
   errors: "Fouten",
   modified: "Gewijzigd",
@@ -9476,7 +9478,15 @@ let JupiterDynamicForm = class extends LitElement {
         concept.fields.forEach((field2) => {
           var _a, _b, _c, _d;
           const conceptData = this._formData[concept.id];
-          const fieldValue = conceptData == null ? void 0 : conceptData[field2.columnId];
+          let fieldValue = conceptData == null ? void 0 : conceptData[field2.columnId];
+          if ((fieldValue === void 0 || fieldValue === null || fieldValue === "") && this.masterData) {
+            const baseConceptId = field2.conceptId || concept.id.split("__").slice(0, -1).join("__") || concept.id;
+            const masterValue = this.masterData[baseConceptId];
+            if (masterValue !== void 0 && masterValue !== null && masterValue !== "") {
+              fieldValue = masterValue;
+              console.warn(`  📦 [Submission] Using masterData for: ${baseConceptId} [${field2.columnId}] = ${JSON.stringify(fieldValue)}`);
+            }
+          }
           if (fieldValue !== void 0 && fieldValue !== null && fieldValue !== "") {
             const column2 = this._findColumnByIdInSection(field2.columnId, section2);
             const fieldPeriodData = (_a = this._periodData[concept.id]) == null ? void 0 : _a[field2.columnId];
@@ -9725,7 +9735,7 @@ let JupiterDynamicForm = class extends LitElement {
     }
   }
   _collectAllFields(concepts, sectionColumnIds, sectionColumns, allFields) {
-    var _a, _b;
+    var _a, _b, _c;
     for (const concept of concepts) {
       if (concept.abstract) {
         if (concept.children && concept.children.length > 0) {
@@ -9738,16 +9748,15 @@ let JupiterDynamicForm = class extends LitElement {
         for (const field2 of relevantFields) {
           const conceptIdWithSuffix = concept.id;
           const fieldConceptId = field2.conceptId;
-          const isMasterDataField = this.masterData && this.masterData[fieldConceptId] !== void 0;
-          if (isMasterDataField && this.masterData) {
-            const masterValue = this.masterData[fieldConceptId];
-            console.warn(`  ⏭️  SKIPPING masterData field: ${fieldConceptId} [${field2.columnId}] = ${JSON.stringify(masterValue)}`);
-            continue;
-          }
           let value = (_a = this._formData[conceptIdWithSuffix]) == null ? void 0 : _a[field2.columnId];
           if (value === void 0 && conceptIdWithSuffix !== fieldConceptId) {
             value = (_b = this._formData[fieldConceptId]) == null ? void 0 : _b[field2.columnId];
           }
+          const masterValue = (_c = this.masterData) == null ? void 0 : _c[fieldConceptId];
+          if ((value === null || value === void 0 || typeof value === "string" && value.trim() === "") && masterValue !== void 0) {
+            value = masterValue;
+            console.warn(`  📦 Using masterData value for: ${fieldConceptId} [${field2.columnId}] = ${JSON.stringify(value)}`);
+          }
           let isEmpty = value === null || value === void 0 || typeof value === "string" && value.trim() === "";
           if (isEmpty && concept.facts && concept.facts.length > 0) {
             const column2 = sectionColumns.find((col) => col.id === field2.columnId);
@@ -10462,7 +10471,7 @@ let JupiterDynamicForm = class extends LitElement {
             @click="${this._handleSubmit}"
             ?disabled="${this.disabled || this.readonly || this._submitDisabled}"
           >
-            ${this.submitButtonLabel || I18n.t("form.submit")}
+            ${this.submitButtonLabel || (this.mode === "admin" ? I18n.t("form.save") : I18n.t("form.submit"))}
           </button>
 
         </div>