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

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

@@ -28,6 +28,14 @@ sap.ui.define([
 		var oSmartFilterBar = oControl;
 		var oEasyFilterCallbacks = null;
 		var oPendingEasyFilterState = null;
+		// Holds SVM callbacks once setSVMWrapperCallbacks is called. The afterVariantLoad handler
+		// is attached eagerly (in fnInitialize) so it fires even when setSVMWrapperCallbacks has
+		// 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;
 
@@ -42,44 +50,20 @@ sap.ui.define([
 
 			// Initialize variant management promise
 			oVariantManagementInitializedPromise = oSmartFilterBar.getInitializedPromise();
-		}
-
-		// Attach to variantFetch and variantLoad events to be able to store and restore also custom filters and state of other controls (in case of page VM) with variant.
-		// Events for storing/restoring are provided by SFB, data to be stored/restored can come from 3 sources:
-		// - standard filters: handled directly by SFB
-		// - extension filters: provided from mParams.oCustomFiltersWrapper
-		// - other controls being part of VM: provided by oSVMWrapperCallbacks (controls with direct connection to VM are skipped in SVM wrapper)
-		function setSVMWrapperCallbacks(oSVMWrapperCallbacks){
-			// Before saving the current state as a new variant, we need to provide all state data of controls controlled by VM, but not known to it with setCustomFilterData. From a
-			// logical point of view, the event (beforeVariantFetch) as well as the method to store the extension data (setCustomFilterData) belong to SVM, but both are implemented
-			// in SFB. Additionally, beforeVariantSave would actually be the name more logical to the consumer, however that name had been used earlier and was deprecated and
-			// replaced by the given one. Fetch actually does not mean to fetch variant content from the place variants are stored, but to get the current state from the controls!
-			oSmartFilterBar.attachBeforeVariantFetch(function(){
-				var oCustomData = Object.create(null);
-				oCustomData[dataPropertyNameGeneric] = oSVMWrapperCallbacks.getManagedControlStates();
-				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
-				if (oEasyFilterCallbacks) {
-					var oEFState = oEasyFilterCallbacks.getState();
-					oCustomData[dataPropertyNameGeneric].filterMode = oEFState.filterMode;
-					oCustomData[dataPropertyNameGeneric].easyFilter = oEFState.easyFilter;
-				}
-				oSmartFilterBar.setCustomFilterData(oCustomData);
-			});
 
-			// When a variant is loaded, correspondingly we have to get the customData and apply the states to the controls not known to SVM. Again, event and method are implemented
-			// in SFB instead of SVM where it would make more sense.
-			// Here the event is afterVariantLoad, as the variant content known to SVM/SFB has first to be applied to the SFB, which will also pass the custom data accordingly. Only
-			// after this has happened, we can get the custom data from SFB.
+			// Attach afterVariantLoad eagerly so custom filter state is restored regardless of
+			// when setSVMWrapperCallbacks is called. setManagedControlStates is only called if
+			// SVM callbacks are already available; otherwise those controls are restored via the
+			// iAppState path (SmartVariantManagementWrapper.fnSetManagedControlStates).
 			oSmartFilterBar.attachAfterVariantLoad(function(){
 				var oCustomData = oSmartFilterBar.getCustomFilterData();
 				var oGenericData;
 				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.
@@ -102,7 +86,9 @@ sap.ui.define([
 					};
 				aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
 				mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
-				oSVMWrapperCallbacks.setManagedControlStates(oGenericData);
+				if (oSVMWrapperCallbacks) {
+					oSVMWrapperCallbacks.setManagedControlStates(oGenericData);
+				}
 				if (oEasyFilterCallbacks) {
 					oEasyFilterCallbacks.setState({
 						filterMode: oGenericData.filterMode,
@@ -115,7 +101,34 @@ sap.ui.define([
 					};
 				}
 			});
+		}
 
+		// When a variant is loaded, correspondingly we have to get the customData and apply the states to the controls not known to SVM. Again, event and method are implemented
+		// in SFB instead of SVM where it would make more sense.
+		// Here the event is afterVariantLoad, as the variant content known to SVM/SFB has first to be applied to the SFB, which will also pass the custom data accordingly. Only
+		// after this has happened, we can get the custom data from SFB.
+		// Attach to variantFetch and variantLoad events to be able to store and restore also custom filters and state of other controls (in case of page VM) with variant.
+		// Events for storing/restoring are provided by SFB, data to be stored/restored can come from 3 sources:
+		// - standard filters: handled directly by SFB
+		// - extension filters: provided from mParams.oCustomFiltersWrapper
+		// - other controls being part of VM: provided by oSVMWrapperCallbacks (controls with direct connection to VM are skipped in SVM wrapper)
+		function setSVMWrapperCallbacks(oCallbacks){
+			oSVMWrapperCallbacks = oCallbacks;
+			// Before saving the current state as a new variant, we need to provide all state data of controls controlled by VM, but not known to it with setCustomFilterData. From a
+			// logical point of view, the event (beforeVariantFetch) as well as the method to store the extension data (setCustomFilterData) belong to SVM, but both are implemented
+			// in SFB. Additionally, beforeVariantSave would actually be the name more logical to the consumer, however that name had been used earlier and was deprecated and
+			// replaced by the given one. Fetch actually does not mean to fetch variant content from the place variants are stored, but to get the current state from the controls!
+			oSmartFilterBar.attachBeforeVariantFetch(function(){
+				var oCustomData = Object.create(null);
+				oCustomData[dataPropertyNameGeneric] = oSVMWrapperCallbacks.getManagedControlStates();
+				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
+				if (oEasyFilterCallbacks) {
+					var oEFState = oEasyFilterCallbacks.getState();
+					oCustomData[dataPropertyNameGeneric].filterMode = oEFState.filterMode;
+					oCustomData[dataPropertyNameGeneric].easyFilter = oEFState.easyFilter;
+				}
+				oSmartFilterBar.setCustomFilterData(oCustomData);
+			});
 		}
 
 		function fnGetState() {

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

@@ -49,6 +49,12 @@ sap.ui.define([
         function getControlWrapper(oControl) {
             var bIsApplying = false;		// avoid forwarding change event when caused by us applying a state
             function fnGetState() {
+                // getCurrentState can iterate a managed control whose view was already torn down (e.g. navigation
+                // while an appState write is in flight). Reading state from a destroyed control crashes in
+                // getUiState() because its inner aggregation is gone, so skip it.
+                if (oControl.isDestroyed()) {
+                    return undefined;
+                }
                 var oControlUiState = oControl.getUiState(); // unfortunately not serializable, but a managed object
                 var oStateUiState = {
                     oPresentationVariant: oControlUiState.getPresentationVariant(),
@@ -66,6 +72,10 @@ sap.ui.define([
             }
 
             function fnSetState(oState) {
+                // Symmetric to fnGetState: never apply state to a destroyed control.
+                if (oControl.isDestroyed()) {
+                    return;
+                }
                 if (oState) {
                     if (!oState.oUiState) {
                         // Legacy handling for state without additional level oUiState (created with 1.99.0 - 1.99.3). Could be relevant on LR and OP, and independent of VM

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

@@ -661,6 +661,7 @@ sap.ui.define([
 
 		function restore(){
 			oTemplateContract.oBusyHelper.setBusyReason("exiting", false);
+			oTemplateContract.oApplicationProxy.resetExternalNavigation();
 			for (var sComponentId in oTemplateContract.componentRegistry){
 				var oRegistryEntry = oTemplateContract.componentRegistry[sComponentId];
 				if (oRegistryEntry.methods.onRestore) {
@@ -942,6 +943,7 @@ sap.ui.define([
 		var fnNormalizePagesMapToArray = testableHelper.testable(fnNormalizePagesMapToArray, "fnNormalizePagesMapToArray");
 		getConfig = testableHelper.testable(getConfig, "getConfig");
 		testableHelper.testable(setLeaveAppPromise, "AppComponent_setLeaveAppPromise");
+		testableHelper.testable(restore, "AppComponent_restore");
 		/* eslint-enable */
 
 		return oMethods;
@@ -959,7 +961,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.150.1
+	 * @version 1.152.0
 	 * @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/Application.js

@@ -82,6 +82,11 @@ sap.ui.define(["sap/ui/base/Object",
 		 */
 		function getMethods(oTemplateContract) {
 
+			// Set on first fnNavigateExternal call; blocks re-entry until reset. NavigationHandler.navigate() calls fnOnError
+			// on all failure paths and does not call it on the success path (app is leaving). The two valid reset points are
+			// therefore fnOnErrorWrapper (navigation failed) and AppComponent.restore() (FLP re-activated this app).
+			var bExternalNavigationTriggered = false;
+
 			var oFocusHelper = new FocusHelper(oTemplateContract);
 			var oContextBookkeeping = new ContextBookkeeping(oTemplateContract);
 			var mEntitySetToETagInfo = Object.create(null); // maps the name of the entity sets which have been already checked for eTag
@@ -671,8 +676,13 @@ sap.ui.define(["sap/ui/base/Object",
 				if (oCurrentNavigationHandler === GHOSTNAVIGATIONHANDLER){
 					return;
 				}
+				if (bExternalNavigationTriggered){
+					return;
+				}
+				bExternalNavigationTriggered = true;
 				oTemplateContract.oNavigationControllerProxy.leave();
-				var fnOnErrorWrapper = function(){
+				var fnOnErrorWrapper = function () {
+					bExternalNavigationTriggered = false;
 					oFocusHelper.setNextFocus(Function.prototype); // Do not change focus in case exiting the application fails
 					oTemplateContract.oBusyHelper.setBusyReason("exiting", false);  // in error case we are not navigating away         
 					if (fnOnError){
@@ -834,7 +844,10 @@ sap.ui.define(["sap/ui/base/Object",
 				removeTransientMessages: fnRemoveTransientMessages,
 				getTransientMessages: getTransientMessages,
 				setNextFocus: oFocusHelper.setNextFocus,
-				setStates: setStates
+				setStates: setStates,
+				resetExternalNavigation: function() {
+					bExternalNavigationTriggered = false;
+				}
 			};
 
 			return {

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

@@ -541,13 +541,7 @@ sap.ui.define(["sap/ui/base/Object",
 				var aMessagesBeforeSave = CRUDHelper.fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, true);
 				var mMessagesBeforeSave = Object.create(null);
 				aMessagesBeforeSave.forEach(function(oMessage){
-					// Exclude transition messages (persistent === false) left over from a prior 412 response.
-					// Including them causes false-positive deduplication on retry: the new 412 produces
-					// the same message IDs, they are filtered out of aNewMessages, and fnHandleWarning
-					// is never called.
-					if (oMessage.persistent !== false) {
-						mMessagesBeforeSave[oMessage.getId()] = oMessage;
-					}
+					mMessagesBeforeSave[oMessage.getId()] = oMessage;
 				});
 
 				// Handles the 412 Warning case.
@@ -570,23 +564,10 @@ sap.ui.define(["sap/ui/base/Object",
 						var aMessagesAfterSave = CRUDHelper.fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, true);
 						var aAllMessages = aMessagesAfterSave.map(function(oMessage){
 							if (!mMessagesBeforeSave[oMessage.getId()]) { // if this is a new message
-								// Create a new Message instance instead of mutating the original object.
-								// The original object may be held by ODataMessageParser._lastMessages; mutating it
-								// in-place causes _propagateMessages to treat the message as non-persistent on the
-								// next successful OData response and silently remove it before the popover opens.
-								var oNewMessage = new Message({
-									message: oMessage.getMessage(),
-									type: oMessage.getType(),
-									target: oMessage.getTargets ? oMessage.getTargets() : [oMessage.getTarget()],
-									processor: oMessage.getMessageProcessor(),
-									persistent: false,
-									technical: false,
-									code: oMessage.getCode(),
-									description: oMessage.getDescription(),
-									technicalDetails: oMessage.getTechnicalDetails()
-								});
-								bWarningOccured = bWarningOccured || oNewMessage.technicalDetails.statusCode === "412" && oNewMessage.technicalDetails.headers["preference-applied"] === "handling=strict";
-								aNewMessages.push(oNewMessage);
+								oMessage.persistent = false;
+								oMessage.technical = false;
+								bWarningOccured = bWarningOccured || oMessage.technicalDetails.statusCode === "412" && oMessage.technicalDetails.headers["preference-applied"] === "handling=strict";
+								aNewMessages.push(oMessage);
 							}
 							return oMessage;
 						});

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

@@ -720,7 +720,16 @@ 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
-			oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			// 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") {
+				var oNavHandler = oServices.oApplication.getNavigationHandler();
+				if (oNavHandler.navigate) {
+					oNavHandler.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 fnNavigateIntentSmartLink(oOutbound, oEventSource) {
@@ -803,9 +812,10 @@ sap.ui.define(["sap/ui/base/Object",
 
 		function fnOnSemanticObjectLinkNavigationPressed(oEventSource, oEventParameters){
 			var oEventObject = deepExtend({}, oEventSource);
+			var sSemanticObject = oEventObject.data('SemanticObject');
+			var sAction = oEventObject.data('Action');
+			var oTarget = (sSemanticObject && sAction) ? { semanticObject: sSemanticObject, action: sAction } : undefined;
 			oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function() {
-				var sSemanticObject = oEventObject.data('SemanticObject');
-				var sAction = oEventObject.data('Action');
 				var sSemanticAttributes = oEventObject.data('SemanticAttributes');
 				if (sSemanticObject && sAction){
 					var oOutbound = {
@@ -818,7 +828,7 @@ sap.ui.define(["sap/ui/base/Object",
 					}
 					fnNavigateIntentSmartLink(oOutbound, oEventObject);
 				}
-			}, Function.prototype, "LeaveApp");
+			}, Function.prototype, "LeaveApp", false, oTarget);
 		}
 
 		function fnOnSemanticObjectLinkNavigationTargetObtained(sEntitySet, mFieldSemanticObjects, oEventParameters, oState, sTitle) {
@@ -1988,6 +1998,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var oContext = oEventSource.getParent().getBindingContext();
 			var sSemanticObject = oEventSource.data("SemanticObject");
 			var sAction = oEventSource.data("Action");
+			var oTarget = { semanticObject: sSemanticObject, action: sAction };
 
 			oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function() {
 				var oOutbound = {
@@ -1995,7 +2006,7 @@ sap.ui.define(["sap/ui/base/Object",
 						semanticObject:	sSemanticObject
 				};
 				fnNavigateIntent(oOutbound, [oContext], oState.oSmartFilterbar || undefined);
-			}, Function.prototype, "LeaveApp");
+			}, Function.prototype, "LeaveApp", false, oTarget);
 		}
 
 		/*
@@ -2025,13 +2036,15 @@ sap.ui.define(["sap/ui/base/Object",
 			if (bRequiresContext && !aSelectedContexts.length) { // not consistent, since contexts missing
 				fnShowMessageForInvalidNumberOfSelects(aSelectedContexts.length);
 			} else {
+				var oTarget = { semanticObject: oCustomData.SemanticObject, action: oCustomData.Action };
 				oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function () {
 					onDataFieldForIntentBasedNavigationSelectedContext(oCustomData, aSelectedContexts, oSmartFilterbar);
-				}, Function.prototype, "LeaveApp");
+				}, Function.prototype, "LeaveApp", false, oTarget);
 			}
 		}
 
 		function onInlineDataFieldForIntentBasedNavigation(oEventSource, oState){
+			var oTarget = { semanticObject: oEventSource.data("SemanticObject"), action: oEventSource.data("Action") };
 			oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function() {
 				var oOutbound = {
 						semanticObject: oEventSource.data("SemanticObject"),
@@ -2039,7 +2052,7 @@ sap.ui.define(["sap/ui/base/Object",
 				};
 				var oContext = oEventSource.getParent().getBindingContext();
 				fnNavigateIntent(oOutbound, [oContext], oState.oSmartFilterbar);
-			}, Function.prototype, "LeaveApp");
+			}, Function.prototype, "LeaveApp", false, oTarget);
 		}
 
 		function onInlineDataFieldForAction(oEvent) {
@@ -2709,7 +2722,16 @@ sap.ui.define(["sap/ui/base/Object",
 			var oSelectionVariant = fnBuildSelectionVariantForNavigation(oOutbound, [], oContext);
 			oController.adaptNavigationParameterExtension(oSelectionVariant, oOutbound);
 			oCommonUtils.setComponentRefreshBehaviour(oOutbound);
-			oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			// 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") {
+				var oNavHandler = oServices.oApplication.getNavigationHandler();
+				if (oNavHandler.navigate) {
+					oNavHandler.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 onSmartFieldInitialise(oEvent,sViewId){

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

@@ -845,7 +845,7 @@ sap.ui.define(["sap/ui/base/Object",
 					//indicator that the state should not be overwritten
 					//if draft enabled then passing NavigateExternal else on back button passing LeavePage
 				}
-			}, Function.prototype, "LeaveApp");
+			}, Function.prototype, "LeaveApp", false, { semanticObject: oOutbound.semanticObject, action: oOutbound.action });
 		}
 
 		function fnGetNavigationKeyProperties(sTargetEntitySet) {
@@ -1020,7 +1020,6 @@ sap.ui.define(["sap/ui/base/Object",
 			var oSelectionVariant, sSelectionVariantPrepared, sParameter, sSemanticObject, aSelVariantPropertyNames, aSelOptionPropertyNames, aParameterNames;
 			var oEventParameters = oEvent.getParameters();
 			var oNavigationHandler = oServices.oApplication.getNavigationHandler();
-			var SuppressionBehavior = FENavLibrary.SuppressionBehavior;
 			// fill oSelectionVariant with the selectOptions from sSelectionVariant
 			oSelectionVariant = oNavigationHandler.mixAttributesAndSelectionVariant({}, sSelectionVariant);
 			//Invoke the "beforeSmartLinkPopoverOpensExtension" method to determine whether FE can process the event.
@@ -1068,7 +1067,16 @@ sap.ui.define(["sap/ui/base/Object",
 					}
 				});
 				// add the resulting selectOptions and parameters (if any!) in oSelectionVariant with the ones of the semanticObject in oEventParameters as selectOptions to oSelectionVariant
-				oSelectionVariant = oNavigationHandler.mixAttributesAndSelectionVariant(mSemanticAttributesOfEventSemanticObject, oSelectionVariant.toJSONString(), SuppressionBehavior.ignoreEmptyString);
+				// Only suppress empty-string properties that are not present in the empty-string semantic object bucket.
+				// Properties in oSemObjEmpty are genuine entity key fields (e.g. MaintenanceOrderSubOperation:"") and must be kept.
+				// Properties absent from oSemObjEmpty but present with "" in the event semantic object are spurious cache-inflated values and must be dropped.
+				var mSemanticAttrsFiltered = Object.assign({}, mSemanticAttributesOfEventSemanticObject);
+				Object.keys(mSemanticAttrsFiltered).forEach(function(sKey) {
+					if (mSemanticAttrsFiltered[sKey] === "" && !(sKey in oSemObjEmpty)) {
+						delete mSemanticAttrsFiltered[sKey];
+					}
+				});
+				oSelectionVariant = oNavigationHandler.mixAttributesAndSelectionVariant(mSemanticAttrsFiltered, oSelectionVariant.toJSONString());
 				// Remove sensitive data from the context
 				oSelectionVariant = fnRemovePropertiesFromNavigationContext(oSelectionVariant, oEvent.getSource(), oState);
 				var oObjectInfo = {
@@ -1361,10 +1369,10 @@ sap.ui.define(["sap/ui/base/Object",
 		// "LeaveApp": leave the app via a forward navigation
 		// "LeavePage": leave the page via an internal navigation or a backward navigation (which may or may not be internal)
 		// Note: if sMode is faulty it will be considered as "LeavePage"
-		function fnProcessDataLossOrDraftDiscardConfirmation(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck){
+		function fnProcessDataLossOrDraftDiscardConfirmation(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, oTarget){
 			sMode = sMode || "LeavePage";
 			if (oComponentUtils.isDraftEnabled()){
-				return oServices.oPageLeaveHandler.performAfterDiscardOrKeepDraft(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, false);
+				return oServices.oPageLeaveHandler.performAfterDiscardOrKeepDraft(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, false, oTarget);
 			} else {
 				return oServices.oDataLossHandler.performIfNoDataLoss(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, false);
 			}

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

@@ -22,19 +22,24 @@ sap.ui.define(["sap/ui/base/Object",
 			firstListItemOption.focus();
 		}
 
-		function checkIfNavigationIsExplace() {
+		function checkIfNavigationIsExplace(oTarget) {
 			var UShellContainer = sap.ui.require("sap/ushell/Container");
 			if (!UShellContainer) {
-				return Promise.resolve(false); // No UShell container, assume inplace navigation
+				return Promise.resolve(false);
 			}
 
-			return UShellContainer.getServiceAsync("FioriElements").then(function(oFioriElementsService) {
-				if (oFioriElementsService && typeof oFioriElementsService.isExplaceNavigation === "function") {
-					return oFioriElementsService.isExplaceNavigation();
-				}
-				return false; // API not available, default to inplace behavior
-			}).catch(function() {
-				return false; // Service not available or error, default to inplace behavior
+			return new Promise(function(resolve) {
+				sap.ui.require(["sap/ushell/api/FioriElements"], function(FioriElements) {
+					FioriElements.isExplaceNavigation(oTarget ? { target: oTarget } : undefined)
+						.then(function(bExplace) {
+							resolve(bExplace);
+						})
+						.catch(function() {
+							resolve(false);
+						});
+				}, function() {
+					resolve(false);
+				});
 			});
 		}
 
@@ -147,7 +152,7 @@ sap.ui.define(["sap/ui/base/Object",
 			return oDiscardPromise;
 		}
 
-		function fnPerformAfterDiscardOrKeepDraftImpl(fnPositive, fnNegative, sMode, bIsTechnical) {
+		function fnPerformAfterDiscardOrKeepDraftImpl(fnPositive, fnNegative, sMode, bIsTechnical, oTarget) {
 			var sEnableDiscardDraftConfirmation = oTemplateContract.oNavigationControllerProxy.isDiscardDraftConfirmationNeeded();
 			var bNeedsPopup = ((sEnableDiscardDraftConfirmation === "always" && sMode.startsWith("Leave")) || (sEnableDiscardDraftConfirmation === "restricted" && sMode === "LeavePage")) && isObjectEditable();
 
@@ -157,7 +162,7 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 
 			// Check if navigation will be explace and skip popup if so
-			checkIfNavigationIsExplace().then(function(bIsExplace) {
+			checkIfNavigationIsExplace(oTarget).then(function(bIsExplace) {
 				if (bIsExplace) {
 					fnPositive(); // Skip popup for explace navigation
 				} else {
@@ -195,7 +200,7 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 
 		// Parameter sMode has same possible values as fnProcessDataLossOrDraftDiscardConfirmation in CommonUtils
-		function fnPerformAfterDiscardOrKeepDraft(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, bIsTechnical) {
+		function fnPerformAfterDiscardOrKeepDraft(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, bIsTechnical, oTarget) {
 			var oRet = new Promise(function (fnResolve, fnReject) {
 				var fnPositive = function () {
 					var oRet = fnProcessFunction();
@@ -206,9 +211,9 @@ sap.ui.define(["sap/ui/base/Object",
 					fnReject();
 				};
 				if (bNoBusyCheck) {
-					fnPerformAfterDiscardOrKeepDraftImpl(fnPositive, fnNegative, sMode, bIsTechnical);
+					fnPerformAfterDiscardOrKeepDraftImpl(fnPositive, fnNegative, sMode, bIsTechnical, oTarget);
 				} else {
-					oTemplateContract.oApplicationProxy.performAfterSideEffectExecution(fnPerformAfterDiscardOrKeepDraftImpl.bind(null, fnPositive, fnNegative, sMode, bIsTechnical), true);
+					oTemplateContract.oApplicationProxy.performAfterSideEffectExecution(fnPerformAfterDiscardOrKeepDraftImpl.bind(null, fnPositive, fnNegative, sMode, bIsTechnical, oTarget), true);
 				}
 			});
 			return oRet;

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

@@ -188,14 +188,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);