jupiter-dynamic-forms 1.22.4 → 1.22.5

package/dist/index.mjs

@@ -1808,6 +1808,7 @@ const field$1 = {
   selectUnit: "Select Unit",
   leaveBlankForInf: "Leave blank for INF",
   prefilledLocked: "Pre-filled — cannot be changed here",
+  notApplicablePriorYear: "Not required for the previous year",
   invalidNumber: `Can't read "{{value}}" as a number`,
   noDecimalsAllowed: "This field doesn't accept decimals",
   negativeNotAllowed: "A negative value isn't allowed here",
@@ -1865,7 +1866,9 @@ const duplicateFactWarning$1 = {
   message: "The same concept, period and dimensions were found with different values entered in different roles. Only one value can be correct — click a fact below to review and fix it.",
   role: "Role:",
   value: "Value:",
-  clickToFocus: "Click to go to this fact"
+  clickToFocus: "Click to go to this fact",
+  cellTooltip: "This value differs from the same fact entered elsewhere — click to review",
+  close: "Close"
 };
 const calculationWarning$1 = {
   title: "Calculation warning",
@@ -2068,6 +2071,7 @@ const field = {
   selectUnit: "Selecteer eenheid",
   leaveBlankForInf: "Leeg laten voor INF",
   prefilledLocked: "Vooraf ingevuld — kan hier niet worden gewijzigd",
+  notApplicablePriorYear: "Niet vereist voor het voorgaande jaar",
   invalidNumber: "Kan '{{value}}' niet lezen als getal",
   noDecimalsAllowed: "Dit veld accepteert geen decimalen",
   negativeNotAllowed: "Een negatieve waarde is hier niet toegestaan",
@@ -2125,7 +2129,9 @@ const duplicateFactWarning = {
   message: "Hetzelfde concept, dezelfde periode en dimensies zijn gevonden met verschillende waarden in verschillende rollen. Slechts één waarde kan juist zijn — klik op een feit hieronder om het te controleren en te corrigeren.",
   role: "Rol:",
   value: "Waarde:",
-  clickToFocus: "Klik om naar dit feit te gaan"
+  clickToFocus: "Klik om naar dit feit te gaan",
+  cellTooltip: "Deze waarde wijkt af van hetzelfde feit dat elders is ingevoerd — klik om te controleren",
+  close: "Sluiten"
 };
 const calculationWarning = {
   title: "Berekeningswaarschuwing",
@@ -5011,7 +5017,7 @@ let JupiterFormField = class extends LitElement {
     if (changedProperties.has("value") || changedProperties.has("field")) {
       this._validateField();
     }
-    if (changedProperties.has("unit") && this.unit) {
+    if (changedProperties.has("unit") && this.unit && this.hasUpdated) {
       console.log(`🏷️ [FormField willUpdate] Unit property changed to: ${this.unit}, conceptId: ${this.conceptId}, columnId: ${this.columnId}`);
       this.dispatchEvent(new CustomEvent("unit-change", {
         detail: {
@@ -5046,6 +5052,14 @@ let JupiterFormField = class extends LitElement {
   _isRoundingLevelConcept() {
     return !!this.conceptId && this.conceptId.includes("DocumentIntendedRoundingLevel");
   }
+  // jenv-bw2-i:BalanceSheetBeforeAfterAppropriationResults records the profit-appropriation
+  // decision for the current balance sheet only — the NL taxonomy's validation rules warn when
+  // it's also reported for the comparative year, so the prior-year column doesn't accept it.
+  // `columnId` carries the `_prev` marker `generatePreviousYearColumns` (xbrl-form-builder.ts)
+  // gives every comparative-year column, whether dimensioned (`${id}_prev`) or not (`duration_prev_N`).
+  _isDisabledForPriorYear() {
+    return !!this.conceptId && !!this.columnId && this.conceptId.includes("BalanceSheetBeforeAfterAppropriationResults") && this.columnId.includes("_prev");
+  }
   /**
    * JDF-110: lock icon (SVG, not emoji) shown on a masterData-prefilled or rounding-level-locked
    * cell, so a locked value reads as "filled and protected" rather than empty placeholder text.
@@ -5689,7 +5703,7 @@ let JupiterFormField = class extends LitElement {
     const isMonetary = this._isMonetaryType();
     return html`<span class="readonly-value ${isEmpty ? "empty" : ""} ${isMonetary ? "monetary" : ""}">${isEmpty ? "—" : displayValue}</span>`;
   }
-  _renderInput(effectiveValue = this.value, effectiveDisabled = this.disabled, isLocked = false) {
+  _renderInput(effectiveValue = this.value, effectiveDisabled = this.disabled, isLocked = false, disabledTooltip) {
     if (this.mode === "readonly") {
       return this._renderReadonlyValue(effectiveValue);
     }
@@ -5715,6 +5729,7 @@ let JupiterFormField = class extends LitElement {
           class="${cssClass}"
           .value="${effectiveValue ?? ""}"
           ?disabled="${effectiveDisabled || this.field.disabled}"
+          title="${disabledTooltip || ""}"
           @change="${this._handleInput}"
           @focus="${this._handleFocus}"
           @blur="${this._handleBlur}"
@@ -6066,6 +6081,7 @@ let JupiterFormField = class extends LitElement {
     const baseConceptId = this._extractBaseConceptId(this.conceptId);
     const isPredefinedValue = this.mode !== "admin" && this.masterData && baseConceptId in this.masterData;
     const isRoundingLevelLocked = this._isRoundingLevelConcept();
+    const isDisabledForPriorYear = this._isDisabledForPriorYear();
     let factValue = null;
     if (this.facts && this.facts.length > 0 && !isPredefinedValue) {
       const cellContext = {
@@ -6119,8 +6135,8 @@ let JupiterFormField = class extends LitElement {
       }
     }
     const hasUserValue = this.value !== null && this.value !== void 0;
-    const effectiveValue = isPredefinedValue ? this.masterData[baseConceptId] : hasUserValue ? this.value : factValue;
-    const effectiveDisabled = isPredefinedValue || isRoundingLevelLocked || this.disabled || this.mode === "readonly";
+    const effectiveValue = isDisabledForPriorYear ? null : isPredefinedValue ? this.masterData[baseConceptId] : hasUserValue ? this.value : factValue;
+    const effectiveDisabled = isPredefinedValue || isRoundingLevelLocked || isDisabledForPriorYear || this.disabled || this.mode === "readonly";
     const isLocked = (isPredefinedValue || isRoundingLevelLocked) && this.mode !== "readonly";
     const typeConfigForLock = getInputTypeForConceptType(this.conceptType, this.datatypes);
     const effectiveFieldTypeForLock = typeConfigForLock.fieldType || this.field.type || "text";
@@ -6134,7 +6150,7 @@ let JupiterFormField = class extends LitElement {
         ` : ""}
 
         <div class="field-wrapper">
-          ${this._renderInput(effectiveValue, effectiveDisabled, isLocked)}
+          ${this._renderInput(effectiveValue, effectiveDisabled, isLocked, isDisabledForPriorYear ? I18n.t("field.notApplicablePriorYear") : void 0)}
 
           ${isLocked && !isTextareaField || hasPeriodControl && this.mode !== "readonly" && !isRoundingLevelLocked ? html`
             <div class="field-trailing-icons">
@@ -7061,6 +7077,19 @@ let JupiterConceptTree = class extends LitElement {
     `;
     document.head.appendChild(style);
   }
+  /**
+   * Dispatches the clicked cell's duplicate-fact mismatch up to `jupiter-dynamic-form`, which owns
+   * the click-to-navigate machinery (role/column reveal, side-panel switch, highlight) already
+   * built for the Validate pre-flight popup — reused here to show this one mismatch's facts.
+   */
+  _handleDuplicateFactWarningBadgeClick(e2, mismatch) {
+    e2.stopPropagation();
+    this.dispatchEvent(new CustomEvent("duplicate-fact-warning-click", {
+      detail: { mismatch },
+      bubbles: true,
+      composed: true
+    }));
+  }
   _openCalculationWarningDialog(e2, mismatch) {
     var _a;
     e2.stopPropagation();
@@ -7135,7 +7164,7 @@ let JupiterConceptTree = class extends LitElement {
 
       <!-- Input Field Cells (Period Columns) - Only for non-abstract concepts -->
       ${this.columns.map((column2) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f;
       if (column2.hidden) {
         return html`<td class="field-cell hidden-column"></td>`;
       }
@@ -7144,8 +7173,9 @@ let JupiterConceptTree = class extends LitElement {
       const storedUnit = (_b = (_a = this.unitData) == null ? void 0 : _a[this.concept.id]) == null ? void 0 : _b[column2.id];
       const storedDecimals = (_d = (_c = this.decimalsData) == null ? void 0 : _c[this.concept.id]) == null ? void 0 : _d[column2.id];
       const calcMismatch = this.mode !== "readonly" ? (_e = this.calculationMismatches) == null ? void 0 : _e.get(`${this.concept.id}__${column2.id}`) : void 0;
+      const dupWarning = this.mode !== "readonly" ? (_f = this.duplicateFactWarnings) == null ? void 0 : _f.get(`${this.concept.id}__${column2.id}`) : void 0;
       return html`
-          <td class="field-cell ${!shouldShowField ? "empty" : ""} ${isAbstract ? "abstract-row" : ""} ${isTotal ? "total-row" : ""} ${this.highlightType && column2.id === this.highlightColumnId ? "highlight-" + this.highlightType : ""} ${calcMismatch ? "calc-warning" : ""} ${this.rowFocused ? "row-focused" : ""}">
+          <td class="field-cell ${!shouldShowField ? "empty" : ""} ${isAbstract ? "abstract-row" : ""} ${isTotal ? "total-row" : ""} ${this.highlightType && column2.id === this.highlightColumnId ? "highlight-" + this.highlightType : ""} ${calcMismatch ? "calc-warning" : ""} ${dupWarning ? "duplicate-fact-warning" : ""} ${this.rowFocused ? "row-focused" : ""}">
             ${calcMismatch ? html`
               <button
                 class="calc-warning-badge"
@@ -7155,6 +7185,15 @@ let JupiterConceptTree = class extends LitElement {
                 @click="${(e2) => this._openCalculationWarningDialog(e2, calcMismatch)}"
               >!</button>
             ` : ""}
+            ${dupWarning ? html`
+              <button
+                class="duplicate-warning-badge"
+                type="button"
+                tabindex="-1"
+                title="${I18n.t("duplicateFactWarning.cellTooltip")}"
+                @click="${(e2) => this._handleDuplicateFactWarningBadgeClick(e2, dupWarning)}"
+              >≠</button>
+            ` : ""}
             ${shouldShowField ? html`
               <jupiter-form-field
                 .field="${field2}"
@@ -7407,6 +7446,38 @@ JupiterConceptTree.styles = css`
       background: #e65100;
     }
 
+    /* Live counterpart to the Validate pre-flight's duplicate-fact-value check — deliberately a
+       distinct color from calc-warning's amber so the two non-blocking warnings never look like
+       the same issue when both land on the same cell. */
+    .field-cell.duplicate-fact-warning {
+      box-shadow: inset 0 0 0 2px var(--jupiter-duplicate-warning-color, #8e24aa);
+    }
+
+    .duplicate-warning-badge {
+      position: absolute;
+      top: 2px;
+      left: 2px;
+      width: 16px;
+      height: 16px;
+      border-radius: 50%;
+      border: none;
+      background: var(--jupiter-duplicate-warning-color, #8e24aa);
+      color: #fff;
+      font-size: 10px;
+      font-weight: 700;
+      line-height: 1;
+      padding: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+      z-index: 3;
+    }
+
+    .duplicate-warning-badge:hover {
+      background: #6a1b9a;
+    }
+
     /* Row-level highlight while a field in this row has focus. Applied to every
        cell so the row stays identifiable even after the user scrolls the table
        horizontally away from the focused input. */
@@ -7560,6 +7631,9 @@ __decorateClass$7([
 __decorateClass$7([
   n2({ type: Object })
 ], JupiterConceptTree.prototype, "calculationMismatches", 2);
+__decorateClass$7([
+  n2({ type: Object })
+], JupiterConceptTree.prototype, "duplicateFactWarnings", 2);
 __decorateClass$7([
   n2({ type: String })
 ], JupiterConceptTree.prototype, "language", 2);
@@ -9347,6 +9421,7 @@ let JupiterFormSection = class extends LitElement {
         .highlightColumnId="${(_b = this._highlightMap.get(instanceConcept.id)) == null ? void 0 : _b.columnId}"
         .rowFocused="${this._focusedConceptId === instanceConcept.id}"
         .calculationMismatches="${this._calculationMismatches}"
+        .duplicateFactWarnings="${this.duplicateFactWarnings}"
         @field-change="${this._handleFieldChange}"
         @field-focus="${this._handleFieldFocusForHighlight}"
         @period-change="${this._handlePeriodChange}"
@@ -9982,6 +10057,9 @@ __decorateClass$5([
 __decorateClass$5([
   n2({ type: Object })
 ], JupiterFormSection.prototype, "totalManuallyEditedData", 2);
+__decorateClass$5([
+  n2({ type: Object })
+], JupiterFormSection.prototype, "duplicateFactWarnings", 2);
 __decorateClass$5([
   r()
 ], JupiterFormSection.prototype, "_expanded", 2);
@@ -12939,6 +13017,8 @@ let JupiterDynamicForm = class extends LitElement {
     this._showValidateWarningPopup = false;
     this._typedDimensionWarningFacts = [];
     this._duplicateFactMismatches = [];
+    this._duplicateFactWarnings = /* @__PURE__ */ new Map();
+    this._duplicateWarningPopupMode = "validate";
     this._submitDisabled = false;
     this._allSections = [];
     this._selectedRoleIds = [];
@@ -12996,6 +13076,15 @@ let JupiterDynamicForm = class extends LitElement {
     this.addEventListener("calculation-mismatch-changed", (e2) => {
       this._handleCalculationMismatchChanged(e2);
     });
+    this.addEventListener("duplicate-fact-warning-click", (e2) => {
+      const { mismatch } = e2.detail || {};
+      if (!mismatch)
+        return;
+      this._typedDimensionWarningFacts = [];
+      this._duplicateFactMismatches = [mismatch];
+      this._duplicateWarningPopupMode = "cellInfo";
+      this._showValidateWarningPopup = true;
+    });
     this.addEventListener("total-manually-edited", (e2) => {
       const { conceptId, columnId } = e2.detail;
       const updated = { ...this._totalManuallyEditedData };
@@ -13209,6 +13298,7 @@ let JupiterDynamicForm = class extends LitElement {
     if ((_a = this.xbrlInput) == null ? void 0 : _a.initialData) {
       this._formData = { ...this._formData, ...this.xbrlInput.initialData };
     }
+    this._formData = this._stripPriorYearExcludedFacts(this._formData);
     this._initializeGlobalDecimalsFromRoundingData();
     this._extractTypedMembersFromFacts();
     if (!this._skipDraftLoading) {
@@ -13889,8 +13979,15 @@ let JupiterDynamicForm = class extends LitElement {
   // which reads as "still cut off" when its row height isn't an exact multiple of the container.
   _scrollActiveRoleIntoView() {
     var _a;
-    const activeItem = (_a = this.shadowRoot) == null ? void 0 : _a.querySelector(".side-panel-roles-list .side-panel-role-item.active");
-    activeItem == null ? void 0 : activeItem.scrollIntoView({ block: "center" });
+    const rolesList = (_a = this.shadowRoot) == null ? void 0 : _a.querySelector(".side-panel-roles-list");
+    const activeItem = rolesList == null ? void 0 : rolesList.querySelector(".side-panel-role-item.active");
+    if (!rolesList || !activeItem)
+      return;
+    const listRect = rolesList.getBoundingClientRect();
+    const itemRect = activeItem.getBoundingClientRect();
+    const itemCenter = itemRect.top + itemRect.height / 2;
+    const listCenter = listRect.top + listRect.height / 2;
+    rolesList.scrollTop += itemCenter - listCenter;
   }
   // Re-locates the fact input identified by _lastFocusedFieldIdentity after a rebuild and restores
   // focus to it, mirroring the shadow-DOM traversal scrollToConcept/_handleErrorFieldClick use.
@@ -14115,6 +14212,29 @@ let JupiterDynamicForm = class extends LitElement {
     this._calculationWarnings = next;
     this._validateForm();
   }
+  // jenv-bw2-i:BalanceSheetBeforeAfterAppropriationResults isn't applicable to the previous-year
+  // column — mirrors `_isDisabledForPriorYear` in form-field.ts (which disables the input itself);
+  // this is the `_formData`/submission-side counterpart so a value already sitting in a draft,
+  // `initialData`, or preserved (hidden-role) data from before that UI restriction existed gets
+  // scrubbed on load and can never resurface in a later draft save or submission.
+  _isPriorYearExcludedFact(conceptId, columnId) {
+    return !!conceptId && !!columnId && conceptId.includes("BalanceSheetBeforeAfterAppropriationResults") && columnId.includes("_prev");
+  }
+  /** Strips any prior-year-excluded concept/column entries from a `FormData` map (immutable). */
+  _stripPriorYearExcludedFacts(data) {
+    const cleaned = {};
+    Object.keys(data).forEach((conceptId) => {
+      const columns = data[conceptId] || {};
+      const keptColumns = {};
+      Object.keys(columns).forEach((columnId) => {
+        if (!this._isPriorYearExcludedFact(conceptId, columnId)) {
+          keptColumns[columnId] = columns[columnId];
+        }
+      });
+      cleaned[conceptId] = keptColumns;
+    });
+    return cleaned;
+  }
   /**
    * JDF-058: single source of truth for writing a value into `_formData` with the immutable-update
    * pattern Lit reactivity needs — shared by a real user keystroke (`_handleFieldChange`) and the
@@ -14122,6 +14242,10 @@ let JupiterDynamicForm = class extends LitElement {
    * duplicated. Returns the value that was previously stored, for event `oldValue` fields.
    */
   _writeFormDataValue(conceptId, columnId, value) {
+    var _a;
+    if (this._isPriorYearExcludedFact(conceptId, columnId)) {
+      return (_a = this._formData[conceptId]) == null ? void 0 : _a[columnId];
+    }
     const updatedFormData = { ...this._formData };
     if (!updatedFormData[conceptId]) {
       updatedFormData[conceptId] = {};
@@ -14174,13 +14298,17 @@ let JupiterDynamicForm = class extends LitElement {
     this.requestUpdate();
   }
   _handleUnitChange(event) {
+    var _a;
     console.log(`🏷️ [DynamicForm] _handleUnitChange called with event:`, event);
     console.log(`🏷️ [DynamicForm] Event detail:`, event.detail);
     const { conceptId, columnId, unit } = event.detail;
     console.log(`🏷️ Unit change received: conceptId=${conceptId}, columnId=${columnId}, unit=${unit}`);
+    const isUnchanged = ((_a = this._unitData[conceptId]) == null ? void 0 : _a[columnId]) === unit;
     this._storeUnit(conceptId, columnId, unit);
-    this._dirty = true;
-    this.hasUnsavedChanges = true;
+    if (!isUnchanged) {
+      this._dirty = true;
+      this.hasUnsavedChanges = true;
+    }
     this.requestUpdate();
   }
   _storeUnit(conceptId, columnId, unit) {
@@ -14488,6 +14616,7 @@ let JupiterDynamicForm = class extends LitElement {
       console.log(`🟧 [DynamicForm] Removed ${beforeLength - this._xbrlFormErrors.length} errors`);
     }
     console.log(`🔍 [Validation] Total errors: ${this._xbrlFormErrors.length}`, this._xbrlFormErrors);
+    this._updateDuplicateFactWarnings(conceptId, columnId);
   }
   _getSectionTitle(sectionId) {
     console.log(`🔍 [_getSectionTitle] Looking for sectionId: "${sectionId}"`);
@@ -15325,6 +15454,33 @@ let JupiterDynamicForm = class extends LitElement {
     }
     return String(value);
   }
+  /**
+   * Live, blur-triggered counterpart to `_findDuplicateFactMismatches`. Re-runs the full duplicate
+   * check (cheap — the same pass Validate already does) and rebuilds `_duplicateFactWarnings` from
+   * scratch, so a resolved conflict clears itself and a newly created one appears without any
+   * extra bookkeeping. Every fact in every current mismatch group gets flagged, not just the field
+   * that was just blurred, so the user sees all the cells involved in a conflict — including one
+   * they filled in earlier — the moment either side changes, rather than having to revisit them
+   * one by one after Validate. Skipped when the blurred cell has no value and wasn't already
+   * flagged, since a blank cell can never be part of a mismatch (`_collectDuplicateFactCandidates`
+   * ignores blanks) — this keeps tabbing through empty cells cheap.
+   */
+  _updateDuplicateFactWarnings(conceptId, columnId) {
+    var _a;
+    const value = (_a = this._formData[conceptId]) == null ? void 0 : _a[columnId];
+    const hasMeaningfulValue = value !== void 0 && value !== null && String(value).trim() !== "";
+    const key = `${conceptId}__${columnId}`;
+    if (!hasMeaningfulValue && !this._duplicateFactWarnings.has(key))
+      return;
+    const mismatches = this._findDuplicateFactMismatches();
+    const updated = /* @__PURE__ */ new Map();
+    for (const mismatch of mismatches) {
+      for (const fact of mismatch.facts) {
+        updated.set(`${fact.conceptId}__${fact.columnId}`, mismatch);
+      }
+    }
+    this._duplicateFactWarnings = updated;
+  }
   /** Popup header for the Validate pre-flight warning: specific when only one check found something, generic when both did. */
   _validateWarningPopupTitle() {
     const hasTypedDimensionWarning = this._typedDimensionWarningFacts.length > 0;
@@ -15352,6 +15508,7 @@ let JupiterDynamicForm = class extends LitElement {
       console.log("⚠️ [Submit] Duplicate facts with mismatched values:", duplicateFactMismatches);
       this._typedDimensionWarningFacts = missingTypedDimensionFacts;
       this._duplicateFactMismatches = duplicateFactMismatches;
+      this._duplicateWarningPopupMode = "validate";
       this._showValidateWarningPopup = true;
       this._submitDisabled = false;
       this.requestUpdate();
@@ -15722,6 +15879,10 @@ let JupiterDynamicForm = class extends LitElement {
           return;
         }
       }
+      if (this._isPriorYearExcludedFact(conceptId, columnId)) {
+        console.log(`⏭️ Dropping legacy draft value for ${conceptId}/${columnId} — not applicable to the previous year`);
+        return;
+      }
       const instanceKey = draftInstanceId || conceptId;
       const baseConceptId = instanceKey.includes("__repeat_") ? instanceKey.split("__repeat_")[0] : instanceKey;
       const actualBaseId = this._findActualConceptId(baseConceptId);
@@ -16265,6 +16426,8 @@ let JupiterDynamicForm = class extends LitElement {
   }
   _addConceptDataToSubmission(concept, columnId, value, submissionData, section2) {
     var _a, _b, _c, _d, _e;
+    if (this._isPriorYearExcludedFact(concept.id, columnId))
+      return;
     const field2 = concept.fields.find((f2) => f2.columnId === columnId);
     if (!field2)
       return;
@@ -16437,26 +16600,25 @@ let JupiterDynamicForm = class extends LitElement {
       }
       if (concept.fields && concept.fields.length > 0) {
         concept.fields.forEach((field2) => {
-          var _a, _b, _c, _d, _e, _f, _g, _h;
+          var _a, _b, _c, _d, _e, _f, _g;
+          if (this._isPriorYearExcludedFact(concept.id, field2.columnId)) {
+            return;
+          }
           const conceptData = this._formData[concept.id];
-          let fieldValue = conceptData == null ? void 0 : conceptData[field2.columnId];
           const baseConceptId = field2.conceptId || concept.id.split("__").slice(0, -1).join("__") || concept.id;
-          if ((fieldValue === void 0 || fieldValue === null || fieldValue === "") && this._isRoundingLevelConcept(baseConceptId) && !this._hasValidGlobalDecimals()) {
+          const masterDataWins = this.mode !== "admin" && !!this._effectiveMasterData && baseConceptId in this._effectiveMasterData;
+          let fieldValue = masterDataWins ? this._effectiveMasterData[baseConceptId] : conceptData == null ? void 0 : conceptData[field2.columnId];
+          if (masterDataWins) {
+            console.log(`  📦 [Submission] Using masterData for: ${baseConceptId} [${field2.columnId}] = ${JSON.stringify(fieldValue)}`);
+          } else if ((fieldValue === void 0 || fieldValue === null || fieldValue === "") && this._isRoundingLevelConcept(baseConceptId) && !this._hasValidGlobalDecimals()) {
             const factValue = this._findFactValueForField(concept, field2, section2);
             if (factValue !== void 0 && factValue !== null && factValue !== "") {
               fieldValue = factValue;
             }
           }
-          if ((fieldValue === void 0 || fieldValue === null || fieldValue === "") && this._effectiveMasterData) {
-            const masterValue = (_a = this._effectiveMasterData) == null ? void 0 : _a[baseConceptId];
-            if (masterValue !== void 0 && masterValue !== null && masterValue !== "") {
-              fieldValue = masterValue;
-              console.log(`  📦 [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 = (_b = this._periodData[concept.id]) == null ? void 0 : _b[field2.columnId];
+            const fieldPeriodData = (_a = this._periodData[concept.id]) == null ? void 0 : _a[field2.columnId];
             const submissionEntry = {
               conceptId: concept.id,
               draftInstanceId: concept.id,
@@ -16478,21 +16640,21 @@ let JupiterDynamicForm = class extends LitElement {
               submissionEntry.period.endDate = endDate;
             }
             console.log(`🔍 [Submission] Concept: ${concept.id}, Column: ${field2.columnId}, Field Period: ${fieldPeriodData ? JSON.stringify(fieldPeriodData) : "none"}, Column Period: ${(column2 == null ? void 0 : column2.periodStartDate) || "none"} - ${(column2 == null ? void 0 : column2.periodEndDate) || "none"}, Used Period: ${submissionEntry.period.type === "instant" ? submissionEntry.period.date : `${submissionEntry.period.startDate} - ${submissionEntry.period.endDate}`}`);
-            const fieldUnit = (_c = this._unitData[concept.id]) == null ? void 0 : _c[field2.columnId];
+            const fieldUnit = (_b = this._unitData[concept.id]) == null ? void 0 : _b[field2.columnId];
             if (fieldUnit) {
               submissionEntry.unit = fieldUnit;
               console.log(`✅ [Submission] Adding unit to entry: ${fieldUnit} for ${concept.id}/${field2.columnId}`);
             } else {
               console.log(`⚠️ [Submission] No unit found in _unitData for ${concept.id}/${field2.columnId}. _unitData state:`, JSON.stringify(this._unitData, null, 2));
             }
-            const isMonetary = (_d = concept.type) == null ? void 0 : _d.toLowerCase().includes("monetary");
-            const fieldDecimals = (_e = this._decimalsData[concept.id]) == null ? void 0 : _e[field2.columnId];
+            const isMonetary = (_c = concept.type) == null ? void 0 : _c.toLowerCase().includes("monetary");
+            const fieldDecimals = (_d = this._decimalsData[concept.id]) == null ? void 0 : _d[field2.columnId];
             const decimalsValue = fieldDecimals || (this.decimals !== "INF" ? this.decimals : void 0);
             if (isMonetary && decimalsValue) {
               const parsed = parseFloat(decimalsValue);
               submissionEntry.decimals = isNaN(parsed) ? decimalsValue : String(-Math.abs(parsed));
             }
-            if ((column2 == null ? void 0 : column2.type) === "dimension" && ((_f = column2.dimensionData) == null ? void 0 : _f.dimensionIdKey)) {
+            if ((column2 == null ? void 0 : column2.type) === "dimension" && ((_e = column2.dimensionData) == null ? void 0 : _e.dimensionIdKey)) {
               submissionEntry.dimension = column2.dimensionData.dimensionIdKey;
               console.log(`🔍 [DynamicForm] Using dimension key from field's column (${field2.columnId}):`, column2.dimensionData.dimensionIdKey);
             } else {
@@ -16531,12 +16693,12 @@ let JupiterDynamicForm = class extends LitElement {
                 console.log(`🔍 [DynamicForm] Column details:`, {
                   id: column2.id,
                   type: column2.type,
-                  hasTypedMembers: (_g = column2.dimensionData) == null ? void 0 : _g.hasTypedMembers,
+                  hasTypedMembers: (_f = column2.dimensionData) == null ? void 0 : _f.hasTypedMembers,
                   dimensionData: column2.dimensionData
                 });
               }
             }
-            if (!submissionEntry.typedMembers && ((_h = field2.crossRoleTypedMembers) == null ? void 0 : _h.length)) {
+            if (!submissionEntry.typedMembers && ((_g = field2.crossRoleTypedMembers) == null ? void 0 : _g.length)) {
               const crossRoleKey = `${concept.id}__${field2.columnId}`;
               const crossRoleValues = this._typedMemberData[crossRoleKey];
               if (crossRoleValues) {
@@ -16627,7 +16789,7 @@ let JupiterDynamicForm = class extends LitElement {
     });
   }
   _handleReset() {
-    this._formData = { ...this.initialData };
+    this._formData = this._stripPriorYearExcludedFacts(this.initialData);
     this._touched.clear();
     this._dirty = false;
     this.hasUnsavedChanges = false;
@@ -17394,6 +17556,7 @@ let JupiterDynamicForm = class extends LitElement {
             .periodEndDate="${this.periodEndDate}"
             .calculationEnabled="${this.calculationEnabled}"
             .totalManuallyEditedData="${this._totalManuallyEditedData}"
+            .duplicateFactWarnings="${this._duplicateFactWarnings}"
             @field-change="${this._handleFieldChange}"
             @period-change="${this._handlePeriodChange}"
             @typed-member-change="${this._handleTypedMemberChange}"
@@ -17601,6 +17764,7 @@ let JupiterDynamicForm = class extends LitElement {
                 .periodEndDate="${this.periodEndDate}"
                 .calculationEnabled="${this.calculationEnabled}"
                 .totalManuallyEditedData="${this._totalManuallyEditedData}"
+                .duplicateFactWarnings="${this._duplicateFactWarnings}"
                 @field-change="${this._handleFieldChange}"
                 @typed-member-change="${this._handleTypedMemberChange}"
                 @add-concept-repeat="${this._handleAddConceptRepeat}"
@@ -17653,7 +17817,7 @@ let JupiterDynamicForm = class extends LitElement {
     return { ...this._formData };
   }
   setData(data) {
-    this._formData = { ...data };
+    this._formData = this._stripPriorYearExcludedFacts(data);
     this._dirty = true;
     this.hasUnsavedChanges = true;
     this._validateForm();
@@ -18464,14 +18628,21 @@ let JupiterDynamicForm = class extends LitElement {
                 ` : ""}
               </div>
               <div class="error-popup-footer">
-                <button class="btn-secondary" @click="${() => {
+                ${this._duplicateWarningPopupMode === "validate" ? html`
+                  <button class="btn-secondary" @click="${() => {
       this._showValidateWarningPopup = false;
       this.requestUpdate();
     }}">${I18n.t("typedDimensionWarning.cancel")}</button>
-                <button class="btn-primary" @click="${() => {
+                  <button class="btn-primary" @click="${() => {
       this._showValidateWarningPopup = false;
       this._continueSubmit();
     }}">${I18n.t("typedDimensionWarning.continue")}</button>
+                ` : html`
+                  <button class="btn-primary" @click="${() => {
+      this._showValidateWarningPopup = false;
+      this.requestUpdate();
+    }}">${I18n.t("duplicateFactWarning.close")}</button>
+                `}
               </div>
             </div>
           </div>
@@ -19605,6 +19776,12 @@ __decorateClass([
 __decorateClass([
   r()
 ], JupiterDynamicForm.prototype, "_duplicateFactMismatches", 2);
+__decorateClass([
+  r()
+], JupiterDynamicForm.prototype, "_duplicateFactWarnings", 2);
+__decorateClass([
+  r()
+], JupiterDynamicForm.prototype, "_duplicateWarningPopupMode", 2);
 __decorateClass([
   r()
 ], JupiterDynamicForm.prototype, "_submitDisabled", 2);