@sapui5/sap.suite.ui.generic.template 1.148.1 → 1.148.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.148.1",
+  "version": "1.148.2",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.148.1</version>
+	<version>1.148.2</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.148.1"
+			"version": "1.148.2"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.148.1"
+			"version": "1.148.2"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/controller/ControllerImplementation.js

@@ -939,9 +939,12 @@ sap.ui.define([
 						var oTempModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 						if (oTempModel.getProperty("/listReport/filterMode") === "easyFilter") {
 							oSmartFilterbar.setVisible(false);
-							var  oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
-							oTemplatePrivateModel.setProperty("/listReport/firstSelection", true);
-							oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", false);
+							// Only show gray overlay when data in table is present.
+							// filters scenario where gray overlay shows up when No data Illustrated msg is rendered
+							if (oTempModel.getProperty("/generic/bDataAreShownInTable")) {
+								oTempModel.setProperty("/listReport/firstSelection", true);
+								oTempModel.setProperty("/generic/bDataAreShownInTable", false);
+							}
 						} else {
 							PXFeedback.triggerPXIntegration("toggleSwitchV2");
 							oSmartFilterbar.setVisible(true);

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.148.1"
+			"version": "1.148.2"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.148.1"
+			"version": "1.148.2"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.148.1"
+			"version": "1.148.2"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.148.1"
+		"version": "1.148.2"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartFilterBarWrapper.js

@@ -27,6 +27,7 @@ sap.ui.define([
 		var aBasicFilters = [];
 		var oSmartFilterBar = oControl;
 		var oEasyFilterCallbacks = null;
+		var oPendingEasyFilterState = null;
 
 		var oVariantManagementInitializedPromise;
 
@@ -86,6 +87,11 @@ sap.ui.define([
 						filterMode: oCustomData[dataPropertyNameGeneric].filterMode,
 						easyFilter: oCustomData[dataPropertyNameGeneric].easyFilter
 					});
+				} else {
+					oPendingEasyFilterState = {
+						filterMode: oCustomData[dataPropertyNameGeneric].filterMode,
+						easyFilter: oCustomData[dataPropertyNameGeneric].easyFilter
+					};
 				}
 			});
 
@@ -142,7 +148,8 @@ sap.ui.define([
 							.map(oFilterItem => oFilterItem.getName()),
 						...aRemovedFromStandard
 					])],
-					customFilters: mParams.oCustomFiltersWrapper.getState()
+					customFilters: mParams.oCustomFiltersWrapper.getState(),
+					easyFilterState: oEasyFilterCallbacks ? oEasyFilterCallbacks.getState() : null
 			};
 		}
 
@@ -175,6 +182,14 @@ sap.ui.define([
 
 			mParams.oCustomFiltersWrapper.setState(oState && oState.customFilters);
 
+			if (oState && oState.easyFilterState) {
+				if (oEasyFilterCallbacks) {
+					oEasyFilterCallbacks.setState(oState.easyFilterState);
+				} else {
+					oPendingEasyFilterState = oState.easyFilterState;
+				}
+			}
+
 			// set visibility
 			// TODO:
 			// - How to deal with old states (not containing all information about visibility) -> legacy state handler?
@@ -250,6 +265,10 @@ sap.ui.define([
 			setSVMWrapperCallbacks: setSVMWrapperCallbacks,
 			setEasyFilterCallbacks: function(oCallbacks) {
 				oEasyFilterCallbacks = oCallbacks;
+				if (oPendingEasyFilterState) {
+					oEasyFilterCallbacks.setState(oPendingEasyFilterState);
+					oPendingEasyFilterState = null;
+				}
 			},
 			bVMConnection: oSmartFilterBar.getSmartVariant(),
 			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar), // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -959,7 +959,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.148.1
+	 * @version 1.148.2
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/CRUDManager.js

@@ -589,13 +589,6 @@ sap.ui.define(["sap/ui/base/Object",
 								oServices.oTemplateCapabilities.oMessageButtonHelper.showMessagePopover();
 							}
 						}
-						// Reset pending changes to prevent infinite loop when entering edit mode again.
-						// Invalid values cause infinite loop because the pending changes (with invalid values) are resubmitted when the user clicks Edit, triggering the same error.
-						var oContext = oController.getView().getBindingContext();
-						var sContextPath = oContext && oContext.getPath();
-						if (sContextPath && oModel && oModel.hasPendingChanges()) {
-							oModel.resetChanges([sContextPath], undefined, true);
-						}
 						reject();
 					});
 					oBusyHelper.setBusy(oSubmitChange);

package/src/sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillAIOrchestrator.js

@@ -131,18 +131,28 @@ sap.ui.define([
          * - collectionFields: row-level updates for SmartTable collections
          *
          * Collection fields are identified by the isCollection flag in the field mapping.
-         * Currently only the first valid collection is processed (single-table limitation).
+         * For tables that allow creation (mCollectionState.mCollectionAllowsCreation), rows
+         * without _rowIndex or _contextPath are treated as new rows to be created.
+         * Only one new row per table is supported; extra new rows are flagged via multipleNewRows.
+         * Tables where the AI proposed new rows but creation is not allowed are tracked in
+         * collectionsWithRejectedNewRows so the renderer can show a per-table warning strip.
          *
          * @param {object} oAiData - the AI response data map { fieldName: value | rowArray }
          * @param {object} mFieldMapping - the complete field mapping
          * @param {object} oFieldCollector - EasyFillFieldCollector (used for SmartTable validation)
          * @param {object} oObjectPage - the ObjectPage control (used for SmartTable validation)
-         * @returns {{ simpleFields: object, collectionFields: object }}
+         * @param {object} mCollectionState - collection tracking state (used for allowsCreation check)
+         * @returns {{ simpleFields: object, collectionFields: object, attemptedMultipleNewRows: boolean, collectionsWithRejectedNewRows: object }}
          */
-        splitAIResultByCollection: function(oAiData, mFieldMapping, oFieldCollector, oObjectPage) {
+        splitAIResultByCollection: function(oAiData, mFieldMapping, oFieldCollector, oObjectPage, mCollectionState) {
             var oSplitResult = {
                 simpleFields: {},
-                collectionFields: {}
+                collectionFields: {},
+                attemptedMultipleNewRows: false,
+                // Map of { navProperty: "all" | "mixed" } for tables where AI proposed new rows
+                // but creation is not allowed. "all" = only new rows proposed; "mixed" = some
+                // existing updates + some rejected new rows.
+                collectionsWithRejectedNewRows: {}
             };
 
             Object.keys(oAiData || {}).forEach(function(sFieldName) {
@@ -158,20 +168,41 @@ sap.ui.define([
                 }
 
                 if (oFieldMeta && oFieldMeta.isCollection === true && aCollectionRows) {
-                    // Validate that each row update has at least a context path or row index for binding
-                    var aRowUpdates = aCollectionRows.filter(function(oRow) {
+                    var bAllowsCreation = !!(mCollectionState && mCollectionState.mCollectionAllowsCreation &&
+                        mCollectionState.mCollectionAllowsCreation[sFieldName]);
+
+                    // Separate existing-row updates (have _rowIndex or _contextPath) from new rows
+                    var aExistingRowUpdates = aCollectionRows.filter(function(oRow) {
                         return oRow && typeof oRow === "object" &&
                             (typeof oRow._contextPath === "string" || typeof oRow._rowIndex === "number");
                     });
+                    var aRawNewRows = aCollectionRows.filter(function(oRow) {
+                        return oRow && typeof oRow === "object" &&
+                            typeof oRow._contextPath !== "string" &&
+                            typeof oRow._rowIndex !== "number";
+                    });
+
+                    // Track tables where AI proposed new rows that cannot be created
+                    if (!bAllowsCreation && aRawNewRows.length > 0) {
+                        var sRejectionType = aExistingRowUpdates.length === 0 ? "all" : "mixed";
+                        oSplitResult.collectionsWithRejectedNewRows[sFieldName] = sRejectionType;
+                    }
+
+                    var aNewRows = bAllowsCreation ? aRawNewRows : [];
+
+                    // Cap new rows to one per table; flag if the AI proposed more
+                    if (aNewRows.length > 1) {
+                        oSplitResult.attemptedMultipleNewRows = true;
+                        aNewRows = [aNewRows[0]];
+                    }
+
+                    var aRowUpdates = aExistingRowUpdates.concat(aNewRows);
 
-                    // Single-table limitation: only the first valid collection is accepted.
-                    // Future work: extend collectionFields structure to support multiple tables.
                     var oValidation = oFieldCollector.isValidSmartTable(oFieldMeta.entitySet, oObjectPage);
-                    if (aRowUpdates.length > 0 &&
-                        Object.keys(oSplitResult.collectionFields).length === 0 &&
-                        oValidation.isValid) {
+                    if (aRowUpdates.length > 0 && oValidation.isValid) {
                         oSplitResult.collectionFields[sFieldName] = aRowUpdates;
-                        oLogger.debug("splitAIResultByCollection: accepted collection field '" + sFieldName + "' with " + aRowUpdates.length + " rows");
+                        oLogger.debug("splitAIResultByCollection: accepted collection field '" + sFieldName + "' with " +
+                            aExistingRowUpdates.length + " updates and " + aNewRows.length + " new row(s)");
                     }
                 } else {
                     // Scalar field → goes to simpleFields

package/src/sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillApplyHandler.js

@@ -1,30 +1,12 @@
 sap.ui.define([
     "sap/suite/ui/generic/template/genericUtilities/FeLogger",
-    "sap/suite/ui/generic/template/genericUtilities/FeError",
-    "sap/ui/model/Filter",
-    "sap/ui/model/FilterOperator"
-], function(FeLogger, FeError, Filter, FilterOperator) {
+    "sap/suite/ui/generic/template/genericUtilities/FeError"
+], function(FeLogger, FeError) {
     "use strict";
 
     var sClassName = "lib.ai.EasyFill.EasyFillApplyHandler";
     var oLogger = new FeLogger(sClassName).getLogger();
 
-    /**
-     * Returns the first ValueListParameterInOut parameter matching the given local property name.
-     * Extracted as a module-level helper to avoid no-loop-func ESLint violations.
-     *
-     * @param {Array} aParameters - value-list Parameters array from OData annotations
-     * @param {string} sProperty - local property name to match
-     * @returns {object|undefined}
-     */
-    function fnFindValueListParameter(aParameters, sProperty) {
-        return aParameters.find(function(oParam) {
-            return oParam.RecordType === "com.sap.vocabularies.Common.v1.ValueListParameterInOut" &&
-                oParam.LocalDataProperty &&
-                oParam.LocalDataProperty.PropertyPath === sProperty;
-        });
-    }
-
     /**
      * EasyFillApplyHandler
      *
@@ -39,15 +21,17 @@ sap.ui.define([
          * Applies all AI-suggested scalar field values from the transient context to the live ObjectPage context.
          * Called when the user clicks "Confirm" in the EasyFill dialog.
          *
-         * 
+         *
          * Only properties present in the updatable lookup map are written back.
          * Collection (table) row values are copied from transient staging contexts to the
          * live row contexts only here, so the ObjectPage table updates only after confirm.
+         * New row creation is NOT done here — the caller must call createPendingNewRows separately
+         * because it requires CRUDManager access (draft-aware) that ApplyHandler does not hold.
          *
          * @param {object} oTransientContextForEasyFill - the transient OData context holding AI-suggested values
          * @param {object} oObjectPageContext - the live ObjectPage binding context to write values into
          * @param {object} mUpdatableLookupMap - map of { fieldName: value } for fields that are updatable
-         * @param {object} oTableStagingState - table staging state { mStagedRows }
+         * @param {object} oTableStagingState - table staging state { mStagedRows, mPendingNewRowContexts }
          * @param {object} mCollectionState - collection tracking state
          */
         applyAndSave: function(oTransientContextForEasyFill, oObjectPageContext, mUpdatableLookupMap, oTableStagingState, mCollectionState) {
@@ -93,6 +77,41 @@ sap.ui.define([
             oLogger.debug("applyAndSave: applied " + iCollectionApplied + " staged table value(s) to ObjectPage context");
         },
 
+        /**
+         * Extracts user-reviewed values from the pending new-row transient contexts.
+         * Returns a map of { navProperty: predefinedValues } ready to pass to CRUDManager.addEntry.
+         * The caller is responsible for discarding the transient contexts afterwards.
+         *
+         * @param {object} oTableStagingState - table staging state { mPendingNewRowContexts }
+         * @param {object} mCollectionState - collection tracking state (mCollectionProperties)
+         * @returns {object} map of { navProperty: plainValuesObject }
+         */
+        extractPendingNewRowValues: function(oTableStagingState, mCollectionState) {
+            var mNewRowValues = Object.create(null);
+            Object.keys((oTableStagingState && oTableStagingState.mPendingNewRowContexts) || {}).forEach(function(sCollectionName) {
+                var aNewContexts = oTableStagingState.mPendingNewRowContexts[sCollectionName] || [];
+                if (!aNewContexts.length) {
+                    return;
+                }
+                var mCollectionPropertyMap = (mCollectionState && mCollectionState.mCollectionProperties &&
+                    mCollectionState.mCollectionProperties[sCollectionName]) || Object.create(null);
+
+                // Extract scalar values set by the user during the preview (first new row only — cap is 1)
+                var oNewContext = aNewContexts[0];
+                var oValues = Object.create(null);
+                Object.keys(mCollectionPropertyMap).forEach(function(sPropName) {
+                    var vValue = oNewContext.getProperty && oNewContext.getProperty(sPropName);
+                    if (vValue !== undefined && vValue !== null && typeof vValue !== "object") {
+                        oValues[sPropName] = vValue;
+                    }
+                });
+                mNewRowValues[sCollectionName] = oValues;
+                oLogger.debug("extractPendingNewRowValues: extracted " + Object.keys(oValues).length +
+                    " value(s) for new row in '" + sCollectionName + "'");
+            });
+            return mNewRowValues;
+        },
+
         /**
          * Builds a collection updates map from the staged transient row contexts.
          * Only editable scalar properties whose staged value differs from the live row value are included.
@@ -154,157 +173,25 @@ sap.ui.define([
         },
 
         /**
-         * Returns whether any staged collection row currently differs from the live ObjectPage rows.
+         * Returns whether any staged collection row currently differs from the live ObjectPage rows,
+         * or whether any new rows are pending creation.
          *
-         * @param {object} oTableStagingState - table staging state { mStagedRows }
+         * @param {object} oTableStagingState - table staging state { mStagedRows, mPendingNewRowContexts }
          * @param {object} mCollectionState - collection tracking state
          * @returns {boolean}
          */
         hasStagedCollectionChanges: function(oTableStagingState, mCollectionState) {
             var mCollectionUpdates = this.buildStagedCollectionUpdates(oTableStagingState, mCollectionState);
-            return Object.keys(mCollectionUpdates).some(function(sCollectionName) {
+            var bHasUpdates = Object.keys(mCollectionUpdates).some(function(sCollectionName) {
                 return (mCollectionUpdates[sCollectionName] || []).length > 0;
             });
-        },
-
-        /**
-         * Validates each collection (table) row update by checking that value-help constrained
-         * properties contain values that exist in the corresponding value-help collection.
-         *
-         * Returns an array of validation error objects for any values that fail the check.
-         * If validation cannot be performed (e.g. missing metadata), the property is skipped
-         * and save is not blocked.
-         *
-         * @param {object} mCollectionUpdates - map of { navProperty: [ rowUpdate ] }
-         * @param {object} mCollectionState - collection tracking state: { mCollectionProperties, mCollectionEntityTypes, mCollectionRowContextsByPath, mCollectionRowContexts }
-         * @param {object} oObjectPageModel - the OData model (used to read value-help collections)
-         * @param {object} oRb - i18n resource bundle
-         * @param {object} oFieldCollector - EasyFillFieldCollector (used for isEditableByContextObject)
-         * @param {object} oGenericAnnotationHelper - GenericAnnotationHelper (used for isValueHelpTableAvailable)
-         * @returns {Promise<Array>} array of { collectionName, collectionLabel, rowLabel, rowIndex, rowPath, propertyName, propertyLabel }
-         */
-        validateCollectionUpdatesAgainstValueHelp: async function(mCollectionUpdates, mCollectionState, oObjectPageModel, oRb, oFieldCollector, oGenericAnnotationHelper) {
-            var oMetaModel = oObjectPageModel && oObjectPageModel.getMetaModel();
-            if (!oMetaModel) {
-                oLogger.warning("validateCollectionUpdatesAgainstValueHelp: no MetaModel available");
-                return [];
+            if (bHasUpdates) {
+                return true;
             }
-
-            var aValidationErrors = [];
-            var aCollectionNames = Object.keys(mCollectionUpdates || {});
-
-            for (var i = 0; i < aCollectionNames.length; i++) {
-                var sCollectionName = aCollectionNames[i];
-                var aRowUpdates = mCollectionUpdates[sCollectionName] || [];
-                var mCollectionPropertyMap = mCollectionState.mCollectionProperties[sCollectionName] || Object.create(null);
-                var oCollectionEntityType = mCollectionState.mCollectionEntityTypes[sCollectionName];
-
-                if (!oCollectionEntityType) { continue; }
-
-                // Use the field mapping description as the collection label in error messages
-                var sCollectionLabel = sCollectionName;
-
-                for (var j = 0; j < aRowUpdates.length; j++) {
-                    var oRowUpdate = aRowUpdates[j];
-                    var oResolvedRow = this._resolveCollectionRowContext(sCollectionName, oRowUpdate, mCollectionState);
-                    if (!oResolvedRow || !oResolvedRow.context) { continue; }
-
-                    var oRowContext = oResolvedRow.context;
-                    var oRowObject = oRowContext.getObject && oRowContext.getObject();
-                    var sRowLabel = oRb.getText("EASY_FILL_TABLE_ROW_LABEL", [String((oResolvedRow.rowIndex || 0) + 1)]);
-
-                    var aPropNames = Object.keys(oRowUpdate);
-                    for (var k = 0; k < aPropNames.length; k++) {
-                        var sPropertyName = aPropNames[k];
-                        if (sPropertyName === "_rowIndex" || sPropertyName === "_contextPath") { continue; }
-
-                        var oPropertyMeta = mCollectionPropertyMap[sPropertyName];
-                        // Skip non-editable properties — they cannot be written back
-                        if (!oPropertyMeta || !oFieldCollector.isEditableByContextObject(oPropertyMeta, oRowObject)) { continue; }
-
-                        // Only validate properties that have an associated value-help table
-                        if (!oGenericAnnotationHelper.isValueHelpTableAvailable(oPropertyMeta)) { continue; }
-
-                        var vUpdatedValue = oRowUpdate[sPropertyName];
-                        if (vUpdatedValue === null || vUpdatedValue === undefined || typeof vUpdatedValue === "object") { continue; }
-
-                        try {
-                            var sPropertyPath = oMetaModel.getODataProperty(oCollectionEntityType, sPropertyName, true);
-                            if (!sPropertyPath) { continue; }
-
-                            var oPropertyContext = oMetaModel.createBindingContext(sPropertyPath);
-                            var oValueLists = await oMetaModel.getODataValueLists(oPropertyContext);
-                            var oDefaultValueList = oValueLists && oValueLists[""];
-
-                            if (!oDefaultValueList || !oDefaultValueList.CollectionPath || !oDefaultValueList.CollectionPath.String) { continue; }
-
-                            // Resolve which value-list property maps to this local property
-                            var sValueListProperty = sPropertyName;
-                            if (Array.isArray(oDefaultValueList.Parameters)) {
-                                var oParameter = fnFindValueListParameter(oDefaultValueList.Parameters, sPropertyName);
-                                if (oParameter && oParameter.ValueListProperty && oParameter.ValueListProperty.String) {
-                                    sValueListProperty = oParameter.ValueListProperty.String;
-                                }
-                            }
-
-                            // Check that the AI-provided value exists in the value-help collection
-                            var bValueFound = await this._readValueListByEquality(
-                                oDefaultValueList.CollectionPath.String,
-                                sValueListProperty,
-                                vUpdatedValue,
-                                oObjectPageModel
-                            );
-
-                            if (!bValueFound) {
-                                aValidationErrors.push({
-                                    collectionName: sCollectionName,
-                                    collectionLabel: sCollectionLabel,
-                                    rowLabel: sRowLabel,
-                                    rowIndex: oResolvedRow.rowIndex,
-                                    rowPath: oRowContext.getPath && oRowContext.getPath(),
-                                    propertyName: sPropertyName,
-                                    propertyLabel: this._getPropertyLabel(oPropertyMeta) || sPropertyName
-                                });
-                                oLogger.warning("validateCollectionUpdatesAgainstValueHelp: invalid value for '" + sPropertyName + "' in row " + oResolvedRow.rowIndex);
-                            }
-                        } catch (e) {
-                            // If metadata or value list cannot be resolved, skip the check and do not block save
-                            oLogger.warning("validateCollectionUpdatesAgainstValueHelp: could not validate '" + sPropertyName + "': " + (e && e.message));
-                        }
-                    }
-                }
-            }
-
-            return aValidationErrors;
-        },
-
-        /**
-         * Updates the EasyFill dialog model to reflect the current table validation state.
-         * Sets hasTableValidationErrors and a human-readable summary message (up to 3 errors shown).
-         *
-         * @param {Array} aValidationErrors - array of validation error objects
-         * @param {object} oDialogModel - the easyFillDialogModel JSONModel
-         * @param {object} oRb - i18n resource bundle
-         */
-        applyTableValidationState: function(aValidationErrors, oDialogModel, oRb) {
-            if (!aValidationErrors || aValidationErrors.length === 0) {
-                oDialogModel.setProperty("/hasTableValidationErrors", false);
-                oDialogModel.setProperty("/tableValidationMessage", "");
-                return;
-            }
-
-            // Show up to 3 errors in the summary message to avoid overwhelming the user
-            var sSummary = aValidationErrors.slice(0, 3).map(function(oError) {
-                return oError.collectionLabel + " / " + oError.rowLabel + " / " + oError.propertyLabel;
-            }).join(", ");
-
-            oDialogModel.setProperty("/hasTableValidationErrors", true);
-            oDialogModel.setProperty(
-                "/tableValidationMessage",
-                oRb.getText("EASY_FILL_TABLE_VALIDATION_MESSAGE", [sSummary])
-            );
-
-            oLogger.warning("applyTableValidationState: " + aValidationErrors.length + " validation error(s) found");
+            // Also return true if there are pending new row contexts
+            return Object.keys((oTableStagingState && oTableStagingState.mPendingNewRowContexts) || {}).some(function(sCollectionName) {
+                return ((oTableStagingState.mPendingNewRowContexts[sCollectionName]) || []).length > 0;
+            });
         },
 
         /**
@@ -321,10 +208,18 @@ sap.ui.define([
          * @param {function} fnResetTransientContext - EasyFillFormRenderer.resetTransientContext
          */
         resetEasyFill: function(bRemoveTextAreaValue, oDialogModel, oController, mCollectionUpdates, oEasyFillLayoutMode, fnRevertStagedUpdates, fnResetTransientContext) {
-            // Destroy all rendered table preview sections
-            var oTablePreviewContainer = oController.byId("EasyFillTablePreviewContainer");
-            if (oTablePreviewContainer) {
-                oTablePreviewContainer.destroyItems();
+            // Remove dynamically-added table ObjectPageSections from the shared OPL
+            var sTableSectionMarker = "easyfillTableSection";
+            var oObjectPageLayout = oController.byId("EasyFillObjectPageLayout");
+            if (oObjectPageLayout) {
+                oObjectPageLayout.getSections().filter(function(oSection) {
+                    return oSection.getCustomData().some(function(oData) {
+                        return oData.getKey() === sTableSectionMarker;
+                    });
+                }).forEach(function(oSection) {
+                    oObjectPageLayout.removeSection(oSection);
+                    oSection.destroy();
+                });
             }
 
             // Revert any staged table row values back to original
@@ -343,11 +238,13 @@ sap.ui.define([
             oDialogModel.setProperty("/feedbackPressedDown", false);
             oDialogModel.setProperty("/isFullScreen", true);
             oDialogModel.setProperty("/hasTableUpdates", false);
-            oDialogModel.setProperty("/hasTableValidationErrors", false);
-            oDialogModel.setProperty("/tableValidationMessage", "");
+            oDialogModel.setProperty("/attemptedMultipleNewRows", false);
             oDialogModel.setProperty("/easyFillMode", oEasyFillLayoutMode.CondensedMode);
             oDialogModel.setProperty("/llmData", {});
             oDialogModel.setProperty("/sections", []);
+            oDialogModel.setProperty("/updatableFields", {});
+            oDialogModel.setProperty("/nonUpdatableFields", {});
+            oDialogModel.setProperty("/hasNonUpdatableFields", false);
 
             // Clear the mutable collection updates map in place
             Object.keys(mCollectionUpdates).forEach(function(sKey) {
@@ -391,54 +288,6 @@ sap.ui.define([
             return null;
         },
 
-        /**
-         * Checks whether a given value exists in a value-help collection via an OData $filter read.
-         * Returns true if the value is found or if the read fails (fail-open to not block save unexpectedly).
-         *
-         * @param {string} sCollectionPath - value-help entity set name
-         * @param {string} sValueListProperty - property name in the value-help to filter on
-         * @param {*} vValue - the value to look up
-         * @param {object} oObjectPageModel - the OData model
-         * @returns {Promise<boolean>}
-         */
-        _readValueListByEquality: function(sCollectionPath, sValueListProperty, vValue, oObjectPageModel) {
-            return new Promise(function(resolve) {
-                oObjectPageModel.read("/" + sCollectionPath, {
-                    filters: [
-                        new Filter({
-                            path: sValueListProperty,
-                            operator: FilterOperator.EQ,
-                            value1: vValue
-                        })
-                    ],
-                    success: function(oResponse) {
-                        // Value found if the filtered result set is non-empty
-                        resolve(!!(oResponse && Array.isArray(oResponse.results) && oResponse.results.length > 0));
-                    },
-                    error: function() {
-                        // On error, resolve true to not block save (fail-open)
-                        resolve(true);
-                    }
-                });
-            });
-        },
-
-        /**
-         * Extracts the display label for an OData property.
-         * Prefers Common.Label annotation, falls back to sap:label.
-         *
-         * @param {object} oPropertyMeta - OData property metadata
-         * @returns {string|null}
-         */
-        _getPropertyLabel: function(oPropertyMeta) {
-            if (!oPropertyMeta) { return null; }
-            var oLabel = oPropertyMeta["com.sap.vocabularies.Common.v1.Label"];
-            if (oLabel && oLabel.String) {
-                return oLabel.String;
-            }
-            return oPropertyMeta["sap:label"] || null;
-        },
-
         _isEditableProperty: function(oPropertyMeta, oRowObject) {
             if (!oPropertyMeta) {
                 return false;