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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.152.0",
+  "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.152.0</version>
+	<version>1.153.0</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.152.0"
+			"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.152.0"
+			"version": "1.153.0"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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/manifest.json

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

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

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

@@ -190,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;
 			}
 
@@ -198,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/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.152.0
+	 * @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/Application.js

@@ -810,6 +810,18 @@ sap.ui.define(["sap/ui/base/Object",
 				return oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
 			} 
 		
+			// Returns true when a navigation call will open in a new tab rather than replacing the current app.
+			// sap-ushell-navmode (manifest-level) takes priority; sap-ushell-next-navmode (FLP startup parameter,
+			// system-level) is the fallback — mirroring how NavigationHandler itself determines explace.
+			function fnIsExplaceNavigation(oOutboundParameters) {
+				if (oOutboundParameters && oOutboundParameters["sap-ushell-navmode"] === "explace") {
+					return true;
+				}
+				var oComponentData = oTemplateContract.oAppComponent.getComponentData && oTemplateContract.oAppComponent.getComponentData();
+				var oStartupParams = oComponentData && oComponentData.startupParameters;
+				return !!(oStartupParams && oStartupParams["sap-ushell-next-navmode"] && oStartupParams["sap-ushell-next-navmode"][0] === "explace");
+			}
+
 			oTemplateContract.oApplicationProxy = { // inject own api for AppComponent into the Template Contract. Other classes (NavigationController, BusyHelper) will call these functions accordingly.
 				createDraftSiblingPromise: oContextBookkeeping.createDraftSiblingPromise,
 				getDraftSiblingPromise: oContextBookkeeping.getDraftSiblingPromise,
@@ -916,6 +928,7 @@ sap.ui.define(["sap/ui/base/Object",
 				mustRequireRequestsCanonical: mustRequireRequestsCanonical,
 				getNavigationHandler: getNavigationHandler,
 				navigateExternal: fnNavigateExternal,
+				isExplaceNavigation: fnIsExplaceNavigation,
 				getStatePreservationMode: getStatePreservationMode,
 				setObjectInEditMode: fnSetObjectInEditMode,
 				getObjectInEditMode: fnGetObjectInEditMode,

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

@@ -722,7 +722,7 @@ sap.ui.define(["sap/ui/base/Object",
 			// null object has to be passed as the fourth argument (i.e. for oInnerAppData) to the navigate method as an indicator that the state should not be overwritten
 			// Explace outbounds must bypass fnNavigateExternal to avoid setting the app busy and consuming the re-entry guard.
 			// getNavigationHandler() returns a ghost stub (no .navigate) when ghostapp=true — guard before calling.
-			if (oOutbound.parameters && oOutbound.parameters["sap-ushell-navmode"] === "explace") {
+			if (oServices.oApplication.isExplaceNavigation(oOutbound.parameters)) {
 				var oNavHandler = oServices.oApplication.getNavigationHandler();
 				if (oNavHandler.navigate) {
 					oNavHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError, null, "explace");
@@ -742,7 +742,15 @@ sap.ui.define(["sap/ui/base/Object",
 			oCommonUtils.removePropertiesFromNavigationContext(oSelectionVariant, oEventSource);
 			oController.adaptNavigationParameterExtension(oSelectionVariant, oObjectInfo);
 			oCommonUtils.setComponentRefreshBehaviour(oOutbound);
-			oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			// SmartLink outbounds have no manifest parameters so sap-ushell-navmode is never set.
+			// System-level sap-ushell-next-navmode can still force a new tab — bypass the re-entry guard in that case.
+			if (oServices.oApplication.isExplaceNavigation()) {
+				if (oNavigationHandler.navigate) {
+					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError, null, "explace");
+				}
+			} else {
+				oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			}
 		}
 
 		function fnHideTitleArea(oSmLiContent,aContactTitleArea) {
@@ -1115,8 +1123,15 @@ sap.ui.define(["sap/ui/base/Object",
 						// The value "sEntitySet" holds the entity set of an object page or a table.
 						//
 						// Sometimes, the SmartLink is located on a field group which belongs to the child entity set of object page.
-						// So, we have to always derive the entity type from the smart link's binding context.
+						// So, we try to derive the entity type from the SmartLink's binding context.
 						var oEntityType = ModelUtil.getEntityTypeFromContext(oControl.getBindingContext());
+						// CS20260013063140: ModelUtil.getEntityTypeFromContext returns null when the SmartLink
+						// is resolved via SmartLinkDelegate, because the binding context is not yet resolvable
+						// to an entity type at that point.
+						// Fall back to deriving the entity type from the enclosing entity set instead.
+						if (!oEntityType) {
+							oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
+						}
 						var oField = oEntityType.property.find(function (oProperty) { return oProperty.name === sSourceClickedField; });
 						var sTextArrangement = "descriptionAndId";
 						if (oField) { // TODO: Need to provide the correct field Object using the entityType and corresponding association (should be handled by a BLI)
@@ -2724,7 +2739,7 @@ sap.ui.define(["sap/ui/base/Object",
 			oCommonUtils.setComponentRefreshBehaviour(oOutbound);
 			// Explace outbounds must bypass fnNavigateExternal to avoid setting the app busy and consuming the re-entry guard.
 			// getNavigationHandler() returns a ghost stub (no .navigate) when ghostapp=true — guard before calling.
-			if (oOutbound.parameters && oOutbound.parameters["sap-ushell-navmode"] === "explace") {
+			if (oServices.oApplication.isExplaceNavigation(oOutbound.parameters)) {
 				var oNavHandler = oServices.oApplication.getNavigationHandler();
 				if (oNavHandler.navigate) {
 					oNavHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError, null, "explace");

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

@@ -835,10 +835,10 @@ sap.ui.define(["sap/ui/base/Object",
 
 				setComponentRefreshBehaviour(oOutbound);
 
-				// We now  ensure that the 'sap-ushell-navmode' parameter is passed to the NavigationHandler.navigate method
-				// and skip setting the app to busy mode when opening a new tab
-				if (oOutbound.parameters["sap-ushell-navmode"] === "explace") {
-					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, null, null, oOutbound.parameters["sap-ushell-navmode"]);
+				// We now skip setting the app to busy mode when opening a new tab and bypass the re-entry guard (fnNavigateExternal) for explace navigations:
+				// the source app stays alive when a new tab is opened, so without the bypass AppComponent.restore() is never called and the guard is never reset.
+				if (oServices.oApplication.isExplaceNavigation(oOutbound.parameters)) {
+					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, null, null, "explace");
 				} else {
 					oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, fnHandleError);
 					//null object has to be passed to the NavigationHandler as an

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;
         },
 

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

@@ -98,8 +98,11 @@ sap.ui.define([
                 var mCollectionPropertyMap = (mCollectionState && mCollectionState.mCollectionProperties &&
                     mCollectionState.mCollectionProperties[sCollectionName]) || Object.create(null);
 
-                // Extract scalar values for ALL new row contexts — multiple row creation is supported
-                var aRowValues = aNewContexts.map(function(oNewContext) {
+                // 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);
@@ -132,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) {
@@ -192,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]; });
             });
         },
 

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

@@ -2,9 +2,11 @@ sap.ui.define([
     "sap/ui/comp/smartform/GroupElement",
     "sap/ui/comp/smartfield/SmartField",
     "sap/m/Text",
+    "sap/m/Link",
+    "sap/m/Button",
     "sap/ui/layout/form/ColumnElementData",
     "sap/suite/ui/generic/template/genericUtilities/FeLogger"
-], function(GroupElement, SmartField, Text, ColumnElementData, FeLogger) {
+], function(GroupElement, SmartField, Text, Link, Button, ColumnElementData, FeLogger) {
     "use strict";
 
     var sClassName = "lib.ai.EasyFill.EasyFillFormRenderer";
@@ -100,7 +102,10 @@ sap.ui.define([
             if (!Array.isArray(aFields) || aFields.length === 0) { return; }
 
             var oObjectPageLayout = oController.byId("EasyFillObjectPageLayout");
-            var sPreviouslyLabel = oController.getView().getModel("i18n").getResourceBundle().getText("EASY_FILL_PREVIOUSLY_LABEL");
+            var oRb = oController.getView().getModel("i18n").getResourceBundle();
+            var sOriginalValueLabel = oRb.getText("EASY_FILL_ORIGINAL_VALUE_LABEL");
+            var sProposedValueLabel = oRb.getText("EASY_FILL_PROPOSED_VALUE_LABEL");
+            var sRevertTooltip = oRb.getText("EASY_FILL_REVERT_FIELD_TOOLTIP");
             var that = this;
 
             function tryInject() {
@@ -147,23 +152,21 @@ sap.ui.define([
                         });
                     }
 
+                    // Hoist vAIValue so it can be reused when seeding the transient context below
+                    var vAIValue = oLLMData[sKey];
+
                     if (oTransientContextForEasyFill) {
                         oSmartField.setBindingContext(oTransientContextForEasyFill);
                         if (oTransientContextForEasyFill.getProperty(sKey) === undefined) {
-                            oTransientContextForEasyFill.setProperty(sKey, oLLMData[sKey]);
+                            oTransientContextForEasyFill.setProperty(sKey, vAIValue);
                         }
                     } else {
                         oSmartField.setBindingContext(oObjectPageContext);
                     }
 
-                    // Read the current (pre-AI) value as a plain string and render it as
-                    // compact secondary text directly below the SmartField.
-                    // Mirroring V4: no second SmartField — just a plain sap.m.Text showing
-                    // "Previously: <value>", avoiding all SmartField layout overhead.
+                    // Read the current (pre-AI) value as a plain string for display.
                     var vCurrentValue = (oObjectPageContext && typeof oObjectPageContext.getProperty === "function")
                         ? oObjectPageContext.getProperty(sKey) : null;
-                    // Use typeof check to guard against objects/arrays; Date.toLocaleDateString()
-                    // gives a readable form for date values rather than "[object Object]".
                     var sCurrentValue;
                     if (vCurrentValue === null || vCurrentValue === undefined || vCurrentValue === "") {
                         sCurrentValue = "-";
@@ -175,17 +178,75 @@ sap.ui.define([
                         sCurrentValue = String(vCurrentValue);
                     }
 
-                    var oPreviousValueText = new Text({
-                        text:     sPreviouslyLabel + " " + sCurrentValue,
+                    var oGroupElement = new GroupElement({ useHorizontalLayout: false });
+                    oGroupElement.addElement(oSmartField);
+
+                    // "Original Value:" text shown for all fields (editable and non-editable)
+                    var oOriginalValueText = new Text({
+                        text: sOriginalValueLabel + " " + sCurrentValue,
                         wrapping: false
                     }).addStyleClass("sapEasyFillPreviouslyLabel");
+                    oGroupElement.addElement(oOriginalValueText);
+
+                    // Toggle controls (revert button + proposed value link) only for editable fields
+                    if (bIsEditable) {
+                        var bReverted = false;
+
+                        var oRevertButton = new Button({
+                            icon: "sap-icon://undo",
+                            type: "Transparent",
+                            tooltip: sRevertTooltip
+                        }).addStyleClass("sapEasyFillRevertButton");
+
+                        // State 2 row: "Proposed Value: <aiValue>" clickable link — hidden until user reverts
+                        var sAIDisplayValue;
+                        if (vAIValue === null || vAIValue === undefined || vAIValue === "") {
+                            sAIDisplayValue = "-";
+                        } else if (vAIValue instanceof Date) {
+                            sAIDisplayValue = vAIValue.toLocaleDateString();
+                        } else if (typeof vAIValue === "object") {
+                            sAIDisplayValue = "-";
+                        } else {
+                            sAIDisplayValue = String(vAIValue);
+                        }
+
+                        var oProposedValueLink = new Link({
+                            text: sProposedValueLabel + " " + sAIDisplayValue,
+                            wrapping: false,
+                            visible: false,
+                            icon: "sap-icon://ai"
+                        }).addStyleClass("sapEasyFillProposedValueLink");
+
+                        // Revert button: State 1 → State 2
+                        oRevertButton.attachPress(function() {
+                            if (bReverted) { return; }
+                            bReverted = true;
+                            if (oTransientContextForEasyFill) {
+                                oTransientContextForEasyFill.setProperty(sKey, vCurrentValue);
+                            }
+                            oOriginalValueText.setVisible(false);
+                            oRevertButton.setVisible(false);
+                            oProposedValueLink.setVisible(true);
+                            if (typeof fnOnFieldChange === "function") { fnOnFieldChange(); }
+                        });
+
+                        // Proposed Value link: State 2 → State 1
+                        oProposedValueLink.attachPress(function() {
+                            if (!bReverted) { return; }
+                            bReverted = false;
+                            if (oTransientContextForEasyFill) {
+                                oTransientContextForEasyFill.setProperty(sKey, vAIValue);
+                            }
+                            oProposedValueLink.setVisible(false);
+                            oOriginalValueText.setVisible(true);
+                            oRevertButton.setVisible(true);
+                            if (typeof fnOnFieldChange === "function") { fnOnFieldChange(); }
+                        });
+
+                        oGroupElement.addElement(oRevertButton);
+                        oGroupElement.addElement(oProposedValueLink);
+                    }
 
-                    // Two elements stacked vertically in one GroupElement:
-                    // row 1 — primary SmartField (AI value, editable or read-only)
-                    // row 2 — "Previously: <value>" text directly below, no gap
-                    var oGroupElement = new GroupElement({ useHorizontalLayout: false });
-                    oGroupElement.addElement(oSmartField);
-                    oGroupElement.addElement(oPreviousValueText);
                     oGroup.addGroupElement(oGroupElement);
                 });
 

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

@@ -76,7 +76,9 @@ sap.ui.define([
         var mLastFieldMapping = null;                  // retained so table sections can be re-rendered on mode switch
         var oTableStagingState = {
             mStagedRows: Object.create(null),
-            mPendingNewRowContexts: Object.create(null)
+            mPendingNewRowContexts: Object.create(null),
+            mExcludedRows: Object.create(null),    // { navProp: { index: true } } existing rows excluded by user
+            mExcludedNewRows: Object.create(null)  // { navProp: { index: true } } new rows excluded by user
         };
 
         // ─── Internal Helpers ────────────────────────────────────────────────────