@sapui5/sap.suite.ui.generic.template 1.151.1 → 1.153.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.151.1",
+  "version": "1.153.0",
   "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.151.1</version>
+	<version>1.153.0</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/SmartVisualFilterBar.js

@@ -13,6 +13,7 @@ sap.ui.define([
 	"sap/m/VBox",
 	"sap/m/Button",
 	"sap/m/Title",
+	"sap/m/Text",
 	"sap/suite/ui/generic/template/AnalyticalListPage/controller/DropDownController",
 	"sap/suite/ui/generic/template/AnalyticalListPage/controller/DynamicDateRangeController",
 	"sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/FilterItemMicroBar",
@@ -49,6 +50,7 @@ sap.ui.define([
 	VBox,
 	Button,
 	Title,
+	Text,
 	DropDownController,
 	DynamicDateRangeController,
 	FilterItemMicroBar,
@@ -854,10 +856,9 @@ sap.ui.define([
 			titleMD.addStyleClass("sapSmartTemplatesAnalyticalListPageRequired");
 		}
 		//second part of the title i.e unit and currency
-		var titleUnitCurr = new Title({
+		var titleUnitCurr = new Text({
 				text: titleObject.titleUnitCurr.length > 1 ? "| " + titleObject.titleUnitCurr : "",
-				titleStyle: SapCoreLibrary.TitleLevel.H6,
-				level: SapCoreLibrary.TitleLevel.Auto,
+				wrapping: false,
 				width: titleObject.titleUnitCurr.length > 1 ? "4.15rem" : "0rem"
 			});
 

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.151.1"
+			"version": "1.153.0"
 		},
 		"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.151.1"
+			"version": "1.153.0"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/Component.js

@@ -59,8 +59,10 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 				var oTemplatePrivate = oComponent.getModel("_templPriv");
 				oTemplatePrivate.setProperty("/listReport", {}); // Note that component properties are not yet available here
             },
-			onActivate: function() {
-				oViewProxy.onComponentActivate();
+			onActivate: function(sBindingPath, bIsComponentCurrentlyActive, bIsBackwards) {
+				if (bIsBackwards) {
+					oViewProxy.onComponentActivate();
+				}
 			},
 			adaptToChildContext: function(sCurrentChildContext) {
 				oViewProxy.adaptToChildContext(sCurrentChildContext);

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

@@ -933,12 +933,6 @@ sap.ui.define([
 						var oTempModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 						if (oTempModel.getProperty("/listReport/filterMode") === "easyFilter") {
 							oSmartFilterbar.setVisible(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/i18n/i18n_sv.properties

@@ -73,7 +73,7 @@ CANCEL_AND_DISCARD=F\u00F6rkasta utkast?
 
 DISCARD_EDIT=F\u00F6rkasta alla \u00E4ndringar?
 
-DISCARD=F\u00F6rkasta
+DISCARD=Kasta
 
 DELETE=Radera
 

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.151.1"
+			"version": "1.153.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/FullscreenPage.fragment.xml

@@ -93,6 +93,9 @@
 						</template:with>
 					</OverflowToolbar>
 				</f:footer>
+				<f:landmarkInfo>
+					<f:DynamicPageAccessibleLandmarkInfo footerRole="ContentInfo"/>
+				</f:landmarkInfo>
 			</f:DynamicPage>
 		</template:with>
 	</template:with>

package/src/sap/suite/ui/generic/template/ObjectPage/Component.js

@@ -126,6 +126,11 @@ sap.ui.define(["sap/suite/ui/generic/template/lib/TemplateAssembler",
 					"type": "boolean",
 					"defaultValue": false
 				},
+				// shall Smart Summarization entry point be visible on this object page?
+				"hideSummarizationButton": {
+					"type": "boolean",
+					"defaultValue": false
+				},
 				// shall confirmation popup be shown in object page while saving?
 				"showConfirmationOnDraftActivate": {
 					"type": "boolean",

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

@@ -1907,6 +1907,11 @@ sap.ui.define([
 
 			oViewProxy.onComponentActivate = function(sBindingPath, bIsComponentCurrentlyActive){
 				oBase.onComponentActivate(sBindingPath, bIsComponentCurrentlyActive);
+				// Seed showRelatedApps for paths that skip startup-parameter processing (cross-app nav, direct URL).
+				var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+				if (oTemplatePrivateModel.getProperty("/objectPage/showRelatedApps") === undefined) {
+					oTemplatePrivateModel.setProperty("/objectPage/showRelatedApps", oController.getOwnerComponent().getShowRelatedApps());
+				}
 				mTablesWithSelectionChangeDuringDraftEdit = Object.create(null);
 			};
 
@@ -2420,12 +2425,36 @@ sap.ui.define([
 					return;
 				}
 
+				// Check manifest opt-out: global takes precedence, then page-level
+				if (oTemplPrivGlobal.getProperty("/generic/fioriAI/hideSummarizationButtonGlobal")) {
+					return;
+				}
+				var oTemplPriv = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+				if (oTemplPriv.getProperty("/objectPage/hideSummarizationButton")) {
+					return;
+				}
+
 				// Find "Summarize" button
 				var oButton = oController.byId("summarize");
 				if (oButton) {
 					oButton.firePress();
 				}
 			}
+			
+			// Calculate summarization rendering based on global and per-object page settings.
+			function setSummarizationButtonVisibility() {
+				var oComponentUtils = oTemplateUtils.oComponentUtils;
+				var bHideSummarizationButtonGlobal = oComponentUtils.getTemplatePrivateGlobalModel().getProperty("/generic/fioriAI/hideSummarizationButtonGlobal");
+				var bHideSummarizationButton = false;
+				if (oComponentUtils.getSettings().hideSummarizationButton !== undefined) {
+					if (typeof oComponentUtils.getSettings().hideSummarizationButton !== "boolean") {
+						oLogger.warning("Manifest setting 'hideSummarizationButton' must be a boolean. Falling back to default: false.");
+					} else {
+						bHideSummarizationButton = oComponentUtils.getSettings().hideSummarizationButton;
+					}
+				}
+				oComponentUtils.getTemplatePrivateModel().setProperty("/objectPage/hideSummarizationButton", bHideSummarizationButtonGlobal || bHideSummarizationButton);
+			}
 
 			// Generation of Event Handlers
 			var oControllerImplementation = {
@@ -2434,6 +2463,8 @@ sap.ui.define([
 					var bHeaderContent = oObjectPage.getShowHeaderContent();
 					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 					oTemplatePrivateModel.setProperty("/objectPage/headerContentVisible", bHeaderContent);
+					// Calculate summarization rendering based on global and per-object page settings.
+					setSummarizationButtonVisibility();
 					// Create a wrapper around the object page
 					// Use this wrapper to store/restore the pinned status of the header.
 					oObjectPageLayoutWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oObjectPage);

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

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

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/Actions.fragment.xml

@@ -149,7 +149,7 @@
 		fesr:press="fe:sum:summarize"
 		type="Ghost"
 		dt:designtime="not-adaptable"
-		visible="{_templPrivGlobal>/generic/fioriAI/isSummarizationEnabled}" />
+		visible="{= ${_templPrivGlobal>/generic/fioriAI/isSummarizationEnabled} && !${_templPriv>/objectPage/hideSummarizationButton} }"/>
 	<uxap:ObjectPageHeaderActionButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'RelatedApps'}) }"
 		text="{i18n>RELATED_APPS}"
 		hideText="false"

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.151.1"
+			"version": "1.153.0"
 		},
 		"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.151.1"
+		"version": "1.153.0"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -33,6 +33,8 @@ sap.ui.define([
 		// not yet been called (race condition on second navigation: bAllControlsInitialized=true
 		// causes fnApplyVariantState to run synchronously, triggering afterVariantLoad before the
 		// Promise.all in SmartVariantManagementWrapper resolves and calls setSVMWrapperCallbacks).
+		// Cold-start _CUSTOM restore is also handled there: afterVariantLoad("INIT") fires before
+		// getInitializedPromise() resolves, so modifyStartupExtension always gets the final word.
 		var oSVMWrapperCallbacks = null;
 
 		var oVariantManagementInitializedPromise;
@@ -59,10 +61,9 @@ sap.ui.define([
 				if (oCustomData && oCustomData[dataPropertyNameGeneric]) {
 					oGenericData = oCustomData[dataPropertyNameGeneric];
 				} else {
-					// getCustomFilterData() returns null on cold start (no prior sap-iapp-state) because
-					// setCustomFilterData() is only called from beforeVariantFetch (variant save path),
-					// never during the initial LREP variant load. The _CUSTOM section is present in the
-					// variant content — fall back to reading it via getVariantContent().
+					// getCustomFilterData() returns null when no beforeVariantFetch has run yet for this
+					// variant (e.g. a named variant being switched to for the first time in the session, or cold-start INIT).
+					// The _CUSTOM section is present in the variant content — fall back to reading it via getVariantContent().
 					try {
 						var oSVM = oSmartFilterBar.getSmartVariant();
 						// getCurrentVariantId() converts STANDARDVARIANTKEY to "" which _getVariantById can't look up.
@@ -189,7 +190,13 @@ sap.ui.define([
 		function fnSetState(oState) {
 			// Don't cause side effects (filter change event), if setting state is no real change.
 			// If this comparison fails for state that actually are identically, maybe it needs to be enhanced (e.g. ignoring order in some arrays might be needed)
-			if (JSON.stringify(oState) === JSON.stringify(fnGetState())){
+			// If default values present - always set state, to ensure that DefaultValues will be converted to tokens.
+			// SFB will have DefaultValues only in case then SFB currently have selected variant with DefaultValues.
+			// In case then application is restored from state, SFB will load variant with DefaultValues.
+			// SFB ui state and state from URL will be equals. But SFB will have DefaultValues in corresponding ValueHelp controls.
+			// To override DefaultValues and to convert to tokens, FEv2 will set state from URL.
+			var oUiState = oSmartFilterBar.getUiState();
+			if (JSON.stringify(oState) === JSON.stringify(fnGetState()) && !oUiState.getDefaultValues()){
 				return;
 			}
 
@@ -197,8 +204,7 @@ sap.ui.define([
 
 			// SFB expects a UIState object - not serializable, but a managed object, actually containing also information not belonging to SFBs state
 			// => get current UIState object from SFB, replace only relevant information, and set it again
-			var oUiState = oSmartFilterBar.getUiState(),
-				oSmartVariant = oSmartFilterBar.getSmartVariant(),
+			var oSmartVariant = oSmartFilterBar.getSmartVariant(),
 				bIsCurrentVariantModifiedBeforeSetState = oSmartVariant.currentVariantGetModified();
 
 			oUiState.getSelectionVariant().SelectOptions = oState && oState.selectOptions;

package/src/sap/suite/ui/generic/template/js/AnnotationHelper.js

@@ -924,26 +924,30 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					oDataField = oCollection[i];
 					oResult = null;
 					// if type is DataFieldForAnnotation, then loop over target annotations
-					if (oDataField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" &&
-						oDataField.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.FieldGroup") >= 0) {
-						// oDataField = oAnnotationHelper.getDataFieldFromDataFieldForAnnotation(oInterface, oDataField);
-						var oTargetLineItem = oMetaModel.getContext(oInterface.getPath() + "/" + i + "/Target");
-						var sResolvedPath = AnnotationHelperModel.resolvePath(oTargetLineItem);
-						var oDataFieldTarget = oMetaModel.getObject(sResolvedPath);
-
-						if (oDataFieldTarget.Data && oDataFieldTarget.Data.length > 0) {
-							for (var j = 0; j < oDataFieldTarget.Data.length; j++) {
-								oResult = oAnnotationHelper.generateAnnotatedActionCustomData(oDataFieldTarget.Data[j], oFacet, oTabItem, oChartItem);
-								if (oResult) {
-									aButtonsData.push(oResult);
+					try {
+						if (oDataField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" &&
+							oDataField.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.FieldGroup") >= 0) {
+							// oDataField = oAnnotationHelper.getDataFieldFromDataFieldForAnnotation(oInterface, oDataField);
+							var oTargetLineItem = oMetaModel.getContext(oInterface.getPath() + "/" + i + "/Target");
+							var sResolvedPath = AnnotationHelperModel.resolvePath(oTargetLineItem);
+							var oDataFieldTarget = oMetaModel.getObject(sResolvedPath);
+
+							if (oDataFieldTarget.Data && oDataFieldTarget.Data.length > 0) {
+								for (var j = 0; j < oDataFieldTarget.Data.length; j++) {
+									oResult = oAnnotationHelper.generateAnnotatedActionCustomData(oDataFieldTarget.Data[j], oFacet, oTabItem, oChartItem);
+									if (oResult) {
+										aButtonsData.push(oResult);
+									}
 								}
 							}
+						} else {
+							oResult = oAnnotationHelper.generateAnnotatedActionCustomData(oDataField, oFacet, oTabItem, oChartItem);
+							if (oResult) {
+								aButtonsData.push(oResult);
+							}
 						}
-					} else {
-						oResult = oAnnotationHelper.generateAnnotatedActionCustomData(oDataField, oFacet, oTabItem, oChartItem);
-						if (oResult) {
-							aButtonsData.push(oResult);
-						}
+					} catch (oError) {
+						oLogger.error("configure - " + JSON.stringify(oDataField));
 					}
 				}
 			}

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

@@ -290,7 +290,17 @@ sap.ui.define([
 		// - FCL: only used in case the App runs in FCL. In this case the FlexibleColumnLayoutHandler instantiates and maintains this subsection
 		// - messagePage: is used to control the MessagePage. It is set on demand by the NavigationController.
 		// Moreover, this function attaches the ui5 message model as named model to the AppComponent with name _templPrivMessage
-		function setGlobalTemplateModels(){
+		function setGlobalTemplateModels() {
+			var oGenericApp = oAppComponent.getManifestEntry("sap.ui.generic.app");
+			var oGlobalSettings = oGenericApp && oGenericApp.settings;
+			var bGlobalHideSummarizationButton = false;
+			if (oGlobalSettings && oGlobalSettings.hideSummarizationButton !== undefined) {
+				if (typeof oGlobalSettings.hideSummarizationButton !== "boolean") {
+					oLogger.warning("Manifest setting 'hideSummarizationButton' must be a boolean. Falling back to default: false.");
+				} else {
+					bGlobalHideSummarizationButton = oGlobalSettings.hideSummarizationButton;
+				}
+			}
 			oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic", {
 					// Since draft saving is done globally, there is a global state which applies to all DraftIndicators
 					draftIndicatorState: DraftIndicatorState.Clear,
@@ -303,7 +313,8 @@ sap.ui.define([
 						isSummarizationEnabled : false,
 						isEasyFilterEnabled : false,
 						isErrorExplanationEnabled : false,
-						isEasyFillEnabled: false
+						isEasyFillEnabled: false,
+						hideSummarizationButtonGlobal: bGlobalHideSummarizationButton
 					}
 			});
 			oAppComponent.setModel(oTemplateContract.oTemplatePrivateGlobalModel, "_templPrivGlobal");
@@ -961,7 +972,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.151.1
+	 * @version 1.153.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
@@ -1073,6 +1084,11 @@ sap.ui.define([
 				noDataRepresentation: {
 					type: "string",
 					defaultValue: "illustration" // Possible values: 'illustration', 'illustrationWithFallback' and 'textOnly'
+				},
+				// Hide Smart Summarization button globally in the application object page
+				hideSummarizationButton: {
+					type: "boolean",
+					defaultValue: false
 				}
 			},
 			events: {

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

@@ -13,7 +13,7 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 		// Here we have introduced probing as for test scenarios as sap.ushell is not present all the iframe cases
 		var UShellContainer = sap.ui.require("sap/ushell/Container");
 		return UShellContainer ? new Promise(function(fnResolve){
-			UShellContainer.getFLPUrlAsync(true).done(function (sFLPUrl){
+			UShellContainer.getFLPUrlAsync(true).then(function (sFLPUrl){
 				fnResolve(sFLPUrl);
 			});
 		}) : Promise.resolve(document.URL);

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

@@ -73,6 +73,21 @@ sap.ui.define([
                 fnGetLabel
             );
 
+            // Seed current field values so the LLM can compute relative changes
+            // (e.g. "increase Delivery Date by 10 days", "increase Price by 20%").
+            if (oObjectPageContext) {
+                Object.keys(mFieldMapping).forEach(function(sPropertyName) {
+                    var oEntry = mFieldMapping[sPropertyName];
+                    if (!oEntry || oEntry.isCollection === true) {
+                        return;
+                    }
+                    var vCurrentValue = oObjectPageContext.getProperty(sPropertyName);
+                    if (vCurrentValue !== undefined && vCurrentValue !== null) {
+                        oEntry.currentValue = vCurrentValue;
+                    }
+                });
+            }
+
             return mFieldMapping;
         },
 
@@ -188,14 +203,9 @@ sap.ui.define([
                         oSplitResult.collectionsWithRejectedNewRows[sFieldName] = sRejectionType;
                     }
 
+                    // All proposed new rows are accepted when creation is allowed
                     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);
 
                     var oValidation = oFieldCollector.isValidSmartTable(oFieldMeta.entitySet, oObjectPage);

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

@@ -1,7 +1,8 @@
 sap.ui.define([
     "sap/suite/ui/generic/template/genericUtilities/FeLogger",
-    "sap/suite/ui/generic/template/genericUtilities/FeError"
-], function(FeLogger, FeError) {
+    "sap/suite/ui/generic/template/genericUtilities/FeError",
+    "sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillFieldCollector"
+], function(FeLogger, FeError, EasyFillFieldCollector) {
     "use strict";
 
     var sClassName = "lib.ai.EasyFill.EasyFillApplyHandler";
@@ -45,7 +46,8 @@ sap.ui.define([
 
             // Copy each AI-suggested property value from the transient context to the live OP context
             for (var sProp in oTransientObject) {
-                if (sProp !== "__metadata" && mUpdatableLookupMap[sProp]) {
+                if (!Object.prototype.hasOwnProperty.call(oTransientObject, sProp)) { continue; }
+                if (sProp !== "__metadata" && Object.prototype.hasOwnProperty.call(mUpdatableLookupMap, sProp)) {
                     oObjectPageContext.setProperty(sProp, oTransientObject[sProp]);
                     iApplied++;
                 }
@@ -84,7 +86,7 @@ sap.ui.define([
          *
          * @param {object} oTableStagingState - table staging state { mPendingNewRowContexts }
          * @param {object} mCollectionState - collection tracking state (mCollectionProperties)
-         * @returns {object} map of { navProperty: plainValuesObject }
+         * @returns {object} map of { navProperty: plainValuesObject[] }
          */
         extractPendingNewRowValues: function(oTableStagingState, mCollectionState) {
             var mNewRowValues = Object.create(null);
@@ -96,18 +98,23 @@ sap.ui.define([
                 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;
-                    }
+                // Extract scalar values for ALL non-excluded new row contexts
+                var oExcludedNew = oTableStagingState.mExcludedNewRows && oTableStagingState.mExcludedNewRows[sCollectionName];
+                var aRowValues = aNewContexts.filter(function(_, i) {
+                    return !oExcludedNew || !oExcludedNew[i];
+                }).map(function(oNewContext) {
+                    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;
+                        }
+                    });
+                    return oValues;
                 });
-                mNewRowValues[sCollectionName] = oValues;
-                oLogger.debug("extractPendingNewRowValues: extracted " + Object.keys(oValues).length +
-                    " value(s) for new row in '" + sCollectionName + "'");
+                mNewRowValues[sCollectionName] = aRowValues;
+                oLogger.debug("extractPendingNewRowValues: extracted " + aRowValues.length +
+                    " new row(s) for '" + sCollectionName + "'");
             });
             return mNewRowValues;
         },
@@ -128,7 +135,9 @@ sap.ui.define([
                 var aStagedRows = mStagedRowsByCollection[sCollectionName] || [];
                 var mCollectionPropertyMap = mCollectionState.mCollectionProperties[sCollectionName] || Object.create(null);
 
-                aStagedRows.forEach(function(oStagedRow) {
+                var oExcludedRows = oTableStagingState.mExcludedRows && oTableStagingState.mExcludedRows[sCollectionName];
+                aStagedRows.forEach(function(oStagedRow, iIndex) {
+                    if (oExcludedRows && oExcludedRows[iIndex]) { return; }
                     var oRealContext = oStagedRow.realContext;
                     var oTransientContext = oStagedRow.transientContext;
                     if (!oRealContext || !oTransientContext) {
@@ -188,9 +197,11 @@ sap.ui.define([
             if (bHasUpdates) {
                 return true;
             }
-            // Also return true if there are pending new row contexts
+            // Also return true if there are pending new row contexts that are not excluded
             return Object.keys((oTableStagingState && oTableStagingState.mPendingNewRowContexts) || {}).some(function(sCollectionName) {
-                return ((oTableStagingState.mPendingNewRowContexts[sCollectionName]) || []).length > 0;
+                var aContexts = (oTableStagingState.mPendingNewRowContexts[sCollectionName]) || [];
+                var oExcludedNew = oTableStagingState.mExcludedNewRows && oTableStagingState.mExcludedNewRows[sCollectionName];
+                return aContexts.some(function(_, i) { return !oExcludedNew || !oExcludedNew[i]; });
             });
         },
 
@@ -208,7 +219,6 @@ sap.ui.define([
          * @param {function} fnResetTransientContext - EasyFillFormRenderer.resetTransientContext
          */
         resetEasyFill: function(bRemoveTextAreaValue, oDialogModel, oController, mCollectionUpdates, oEasyFillLayoutMode, fnRevertStagedUpdates, fnResetTransientContext) {
-            // Remove dynamically-added table ObjectPageSections from the shared OPL
             var sTableSectionMarker = "easyfillTableSection";
             var oObjectPageLayout = oController.byId("EasyFillObjectPageLayout");
             if (oObjectPageLayout) {
@@ -222,13 +232,9 @@ sap.ui.define([
                 });
             }
 
-            // Revert any staged table row values back to original
             fnRevertStagedUpdates();
-
-            // Reset the transient context (discard all staged scalar AI values)
             fnResetTransientContext();
 
-            // Reset all dialog model properties to their initial state
             oDialogModel.setProperty("/isFormVisible", false);
             oDialogModel.setProperty("/isIllustrationVisible", true);
             oDialogModel.setProperty("/isSaveEnabled", false);
@@ -246,16 +252,13 @@ sap.ui.define([
             oDialogModel.setProperty("/nonUpdatableFields", {});
             oDialogModel.setProperty("/hasNonUpdatableFields", false);
 
-            // Clear the mutable collection updates map in place
             Object.keys(mCollectionUpdates).forEach(function(sKey) {
                 delete mCollectionUpdates[sKey];
             });
 
             if (bRemoveTextAreaValue) {
                 var oTextArea = oController.byId("EasyFillInputTextArea");
-                if (oTextArea) {
-                    oTextArea.setValue("");
-                }
+                if (oTextArea) { oTextArea.setValue(""); }
                 oDialogModel.setProperty("/isEasyFillButtonEnabled", false);
             }
 
@@ -289,30 +292,15 @@ sap.ui.define([
         },
 
         _isEditableProperty: function(oPropertyMeta, oRowObject) {
-            if (!oPropertyMeta) {
-                return false;
-            }
-            var sUpdatable = oPropertyMeta["sap:updatable"];
-            if (sUpdatable) {
-                return sUpdatable !== "false";
-            }
-            var oAnnotation = oPropertyMeta["com.sap.vocabularies.Common.v1.FieldControl"];
-            if (oAnnotation && oAnnotation["EnumMember"]) {
-                return oAnnotation["EnumMember"] !== "com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";
-            }
-            var sFieldControl = oPropertyMeta["sap:field-control"];
-            if (sFieldControl) {
-                var iFieldControlValue = oRowObject && oRowObject[sFieldControl];
-                return iFieldControlValue !== 1;
-            }
-            return true;
+            return EasyFillFieldCollector.isEditableByContextObject(oPropertyMeta, oRowObject, undefined);
         },
 
         _isSupportedStagedValue: function(vValue) {
-            return vValue === null ||
-                vValue === undefined ||
+            return vValue !== undefined && (
+                vValue === null ||
                 typeof vValue !== "object" ||
-                vValue instanceof Date;
+                vValue instanceof Date
+            );
         },
 
         _areValuesEqual: function(vLeft, vRight) {