@sapui5/sap.suite.ui.generic.template 1.136.20 → 1.136.21

package/package.json

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

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

@@ -108,7 +108,7 @@ sap.ui.define([
                 aCollection.sort(function (oFirstData, oSecondData) {
                     var iFirstDataImportance = getImportance(oFirstData);
                     var iSecondDataImportance = getImportance(oSecondData);
-                    return iFirstDataImportance < iSecondDataImportance ? -1 : 1;
+                    return iFirstDataImportance < iSecondDataImportance ? -1 : iFirstDataImportance > iSecondDataImportance ? 1 : 0;
                 });
             }
 

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_sv.properties

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

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

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

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

@@ -2581,9 +2581,11 @@ sap.ui.define([
 					onDataFieldForIntentBasedNavigation: function (oEvent) {
 						oEvent = merge({}, oEvent);
 						oTemplateUtils.oServices.oApplication.performAfterSideEffectExecution(function () {
+							var oCustomData = oTemplateUtils.oCommonUtils.getCustomDataFromEvent(oEvent);
+							var oTarget = { semanticObject: oCustomData.SemanticObject, action: oCustomData.Action };
 							oTemplateUtils.oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function () {
 								oTemplateUtils.oCommonEventHandlers.onDataFieldForIntentBasedNavigation(oEvent, oBase.state);
-							}, Function.prototype, "LeaveApp");
+							}, Function.prototype, "LeaveApp", false, oTarget);
 						}, true);
 					},
 					onDataFieldWithIntentBasedNavigation: function (oEvent) {

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

@@ -25,7 +25,7 @@ sap.ui.define([
 						oTemplateUtils.oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function () {
 							var oContext = oController.getView().getBindingContext();
 							oTemplateUtils.oCommonEventHandlers.onRelatedAppNavigation(oTarget, oContext);
-						}, Function.prototype, "LeaveApp");
+						}, Function.prototype, "LeaveApp", false, oTarget);
 					}
 				}, "buttons");
 		}
@@ -109,7 +109,7 @@ sap.ui.define([
 						if (bHasRelatedAppSettings) {
 							// Iterate through oRelatedAppSettings and add all related apps into the set
 							for (const sKey in oRelatedAppsSettings) {
-								if (oRelatedAppsSettings.hasOwnProperty(sKey)) {
+								if (sKey && oRelatedAppsSettings.hasOwnProperty(sKey)) {
 									const sSemanticObject = oRelatedAppsSettings[sKey].semanticObject;
 									aSemanticObjects.push(sSemanticObject);
 								}

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

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

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

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

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

@@ -666,6 +666,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) {
@@ -947,6 +948,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;
@@ -964,7 +966,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.136.20
+	 * @version 1.136.21
 	 * @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/CommonEventHandlers.js

@@ -714,7 +714,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) {
@@ -797,9 +806,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 = {
@@ -812,7 +822,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) {
@@ -1901,6 +1911,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 = {
@@ -1908,7 +1919,7 @@ sap.ui.define(["sap/ui/base/Object",
 						semanticObject:	sSemanticObject
 				};
 				fnNavigateIntent(oOutbound, [oContext], oState.oSmartFilterbar || undefined);
-			}, Function.prototype, "LeaveApp");
+			}, Function.prototype, "LeaveApp", false, oTarget);
 		}
 
 		/*
@@ -1938,13 +1949,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"),
@@ -1952,7 +1965,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) {
@@ -2620,7 +2633,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

@@ -798,7 +798,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) {
@@ -1313,10 +1313,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/i18n/i18n_sl.properties

@@ -182,7 +182,7 @@ ST_GENERIC_ERROR_NAVIGATION_PROPERTY_NOT_CORRECT=Lastnost navigacije {0} v pripo
 
 ST_GENERIC_FCL_FULLSCREEN=Celotni ekran
 
-ST_GENERIC_FCL_EXIT_FULLSCREEN=Izhod iz modusa celotnega ekrana
+ST_GENERIC_FCL_EXIT_FULLSCREEN=Izhod iz celozaslonskega na\u010Dina
 
 ST_GENERIC_FCL_CLOSE_COLUMN=Zapri
 

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3206,7 +3206,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.136.20
+	 * @version 1.136.21
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

@@ -66,7 +66,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.136.20",
+		version: "1.136.21",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {