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

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

@@ -28,6 +28,12 @@ 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).
+		var oSVMWrapperCallbacks = null;
 
 		var oVariantManagementInitializedPromise;
 
@@ -42,34 +48,11 @@ 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;
@@ -102,7 +85,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 +100,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/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.151.1
 	 * @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){
@@ -800,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,
@@ -834,7 +856,10 @@ sap.ui.define(["sap/ui/base/Object",
 				removeTransientMessages: fnRemoveTransientMessages,
 				getTransientMessages: getTransientMessages,
 				setNextFocus: oFocusHelper.setNextFocus,
-				setStates: setStates
+				setStates: setStates,
+				resetExternalNavigation: function() {
+					bExternalNavigationTriggered = false;
+				}
 			};
 
 			return {
@@ -903,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/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 (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");
+				}
+			} else {
+				oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			}
 		}
 
 		function fnNavigateIntentSmartLink(oOutbound, oEventSource) {
@@ -733,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) {
@@ -803,9 +820,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 +836,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) {
@@ -1105,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)
@@ -1988,6 +2013,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 +2021,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 +2051,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 +2067,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 +2737,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 (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");
+				}
+			} 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

@@ -835,17 +835,17 @@ 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
 					//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/ai/EasyFill/fragments/EasyFillDialog.fragment.xml

@@ -32,7 +32,6 @@ xmlns:fesr="http://schemas.sap.com/sapui5/extension/sap.ui.core.FESR/1">
                                         placeholder="{i18n>EASY_FILL_TEXTAREA_PLACEHOLDER}"
                                         rows="20"
                                         width="100%"
-                                        height="17.5rem"
                                         showExceededText="true"
                                         ariaLabelledBy="EasyFillInputArea"/>
                                 </FlexBox>