pict-section-form 1.3.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pict-section-form",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "description": "Pict dynamic form sections",
     "main": "source/Pict-Section-Form.js",
     "directories": {
@@ -38,7 +38,7 @@
         "browser-env": "^3.3.0",
         "eslint": "^9.39.2",
         "jquery": "^4.0.0",
-        "pict": "^1.0.386",
+        "pict": "^1.0.387",
         "pict-application": "^1.0.34",
         "pict-docuserve": "^1.4.19",
         "pict-service-commandlineutility": "^1.0.20",

package/source/providers/Pict-Provider-DynamicTabularData.js

@@ -234,11 +234,9 @@ class DynamicTabularData extends libPictProvider
 						return false;
 					}
 				)
-				// We expect this view to be in the set.
-				for (let i = 0; i < tmpViewsToRender.length; i++)
-				{
-					tmpViewsToRender[i].render();
-				}
+				// We expect this view to be in the set. Re-rendering an entity-selector
+				// table clobbers its selected values in the model, so preserve them.
+				this._renderViewsPreservingRecordSet(tmpGroup.RecordSetAddress, tmpViewsToRender);
 
 				// Rebuild any OTHER views whose DynamicColumns are sourced from this record set
 				// (e.g. a "% Passing" table whose columns are generated from this "Products" table)
@@ -494,11 +492,9 @@ class DynamicTabularData extends libPictProvider
 						return false;
 					}
 				)
-				// We expect this view to be in the set.
-				for (let i = 0; i < tmpViewsToRender.length; i++)
-				{
-					tmpViewsToRender[i].render();
-				}
+				// We expect this view to be in the set. Re-rendering an entity-selector
+				// table clobbers its selected values in the model, so preserve them.
+				this._renderViewsPreservingRecordSet(tmpGroup.RecordSetAddress, tmpViewsToRender);
 
 				// Rebuild any OTHER views whose DynamicColumns are sourced from this record set
 				// (e.g. a "% Passing" table whose columns are generated from this "Products" table)
@@ -518,6 +514,57 @@ class DynamicTabularData extends libPictProvider
 		}
 	}
 
+	/**
+	 * Render every view in pViewsToRender while preserving pRecordSetAddress's data in
+	 * the model. Re-rendering a table that contains entity-selector cells (Material /
+	 * Organization / Product / etc.) destroys and recreates their select2 widgets; the
+	 * transient empty widget gets read back into the model and wipes the selected value
+	 * AND its resolved __Record for EVERY row -- the "selected Source / Name disappears
+	 * after adding or deleting a row" data-loss bug. Because it clobbers the saved
+	 * FormData, the value is then also missing from the exported PDF. A render() must be
+	 * model-non-destructive, so snapshot the record set before rendering and restore any
+	 * cleared fields afterward. No-op for plain (non-entity) tables, where render never
+	 * changes the model (snapshot == post-render state, restore is a no-op).
+	 *
+	 * @param {string} pRecordSetAddress - RecordSetAddress of the table being re-rendered.
+	 * @param {Array<Object>} pViewsToRender - Views bound to that record set to render.
+	 */
+	_renderViewsPreservingRecordSet(pRecordSetAddress, pViewsToRender)
+	{
+		if (!Array.isArray(pViewsToRender) || (pViewsToRender.length < 1))
+		{
+			return;
+		}
+		// Snapshot the record set (deep clone each row) from a view that owns it.
+		let tmpRecordSet = false;
+		let tmpSnapshot = false;
+		for (let i = 0; i < pViewsToRender.length; i++)
+		{
+			let tmpCandidate = pViewsToRender[i].sectionManifest.getValueByHash(pViewsToRender[i].getMarshalDestinationObject(), pRecordSetAddress);
+			if (Array.isArray(tmpCandidate))
+			{
+				tmpRecordSet = tmpCandidate;
+				tmpSnapshot = tmpCandidate.map((pRow) => (pRow && (typeof pRow === 'object')) ? JSON.parse(JSON.stringify(pRow)) : pRow);
+				break;
+			}
+		}
+		for (let i = 0; i < pViewsToRender.length; i++)
+		{
+			pViewsToRender[i].render();
+		}
+		// Restore any model fields a destructive re-render cleared (entity value + __Record).
+		if (Array.isArray(tmpRecordSet) && Array.isArray(tmpSnapshot))
+		{
+			for (let i = 0; i < tmpRecordSet.length; i++)
+			{
+				if (tmpRecordSet[i] && (typeof tmpRecordSet[i] === 'object') && tmpSnapshot[i] && (typeof tmpSnapshot[i] === 'object'))
+				{
+					Object.assign(tmpRecordSet[i], tmpSnapshot[i]);
+				}
+			}
+		}
+	}
+
 	/**
 	 * Rebuild every OTHER section-form view whose DynamicColumns are sourced from
 	 * pSourceRecordSetAddress: re-resolve their generated columns and rebuild their
@@ -817,10 +864,9 @@ class DynamicTabularData extends libPictProvider
 				}
 				return false;
 			});
-		for (let i = 0; i < tmpViewsToRender.length; i++)
-		{
-			tmpViewsToRender[i].render();
-		}
+		// Re-rendering an entity-selector table clobbers its selected values in the
+		// model, so preserve them across the render.
+		this._renderViewsPreservingRecordSet(pGroup.RecordSetAddress, tmpViewsToRender);
 
 		// Rebuild any OTHER views whose DynamicColumns are sourced from this record set
 		// HERE, in the render phase -- BEFORE the marshal below -- so the column DOM is

package/source/providers/layouts/Pict-Layout-Tabular.js

@@ -1423,7 +1423,12 @@ class TabularLayout extends libPictSectionGroupLayout
 			}
 			if (tmpEditingRight)
 			{
-				tmpTemplate += `<th class="pict-row-label-spacer"></th>`;
+				// Parity cell for the right-side editing-controls column. Tag it with the same
+				// pict-tabular-editing-controls-header class as the left-controls header (below)
+				// so host CSS sizes it like the controls column AND collapses it in lockstep when
+				// that column is hidden -- otherwise it lingers as an empty phantom column and the
+				// stacked-header rule's bottom border overshoots the data columns.
+				tmpTemplate += `<th class="pict-row-label-spacer pict-tabular-editing-controls-header"></th>`;
 			}
 			tmpTemplate += tmpMetatemplateGenerator.getMetatemplateTemplateReference(pView, `-TabularTemplate-ExtraHeaderRow-Postfix`, `getGroup("${pGroup.GroupIndex}")`);
 		}
@@ -1456,7 +1461,9 @@ class TabularLayout extends libPictSectionGroupLayout
 			}
 			if (tmpEditingRight)
 			{
-				tmpColumnSelectRow += `<th class="pict-row-label-spacer"></th>`;
+				// Parity cell for the right-side editing-controls column (mirrors the extra-header
+				// row above) -- collapses with the column via pict-tabular-editing-controls-header.
+				tmpColumnSelectRow += `<th class="pict-row-label-spacer pict-tabular-editing-controls-header"></th>`;
 			}
 			tmpColumnSelectRow += `</tr>`;
 			tmpTemplate += tmpColumnSelectRow;
@@ -1647,6 +1654,8 @@ class TabularLayout extends libPictSectionGroupLayout
 				{
 					pView.rebuildCustomTemplate();
 					pView.render();
+					// Refill the freshly rebuilt table DOM in this same marshal cycle.
+					this._refillAfterDynamicColumnRebuild(pView);
 				}
 				finally
 				{
@@ -1666,6 +1675,8 @@ class TabularLayout extends libPictSectionGroupLayout
 				try
 				{
 					pView.render();
+					// Same-cycle refill: a label-only re-render still repaints the cell DOM.
+					this._refillAfterDynamicColumnRebuild(pView);
 				}
 				finally
 				{
@@ -1691,6 +1702,8 @@ class TabularLayout extends libPictSectionGroupLayout
 				{
 					pView.rebuildCustomTemplate();
 					pView.render();
+					// Refill the freshly rebuilt table DOM in this same marshal cycle.
+					this._refillAfterDynamicColumnRebuild(pView);
 				}
 				finally
 				{
@@ -1706,6 +1719,30 @@ class TabularLayout extends libPictSectionGroupLayout
 		this._reapplyTabularSelectionHighlights(pView, pGroup);
 		return true;
 	}
+
+	/**
+	 * After a mid-marshal DynamicColumns rebuild/re-render, the freshly painted table DOM
+	 * is empty: the enclosing onMarshalToView already ran its marshalDataToForm BEFORE this
+	 * hook re-rendered, so the dynamic cells lost the values that pass had just written and
+	 * would only refill on the NEXT marshal -- the "% Passing table blanks on row add/delete
+	 * or Source/Name select until another action brings it back" bug. Re-marshal the view's
+	 * data into the new DOM here so the cells repopulate within the SAME cycle. This is safe
+	 * to call from inside onDataMarshalToForm: marshalDataToForm only writes model values into
+	 * the inputs and does NOT itself invoke onDataMarshalToForm, so it cannot recurse here.
+	 *
+	 * @param {Object} pView
+	 */
+	_refillAfterDynamicColumnRebuild(pView)
+	{
+		try
+		{
+			this.pict.providers.Informary.marshalDataToForm(pView.getMarshalDestinationObject(), pView.formID, pView.sectionManifest);
+		}
+		catch (pError)
+		{
+			this.log.error(`Error refilling tabular dynamic-column cells after rebuild: ${pError}`);
+		}
+	}
 }
 
 module.exports = TabularLayout;