@sapui5/sap.suite.ui.generic.template 1.148.9 → 1.148.11

package/package.json

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

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

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

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

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

@@ -156,6 +156,13 @@ sap.ui.define([
                 oState.variantId = oState.sVariantId;
             }
 
+            // Compare current passed and control states. If states are same, setting state make no change, but trigger table refresh.
+            // For performance reason we compare object stringified versions. Object key order should not change as it only get applied at runtime.
+            var oControlState = bVariantManagementActive ? oVariantManagementStateWrapper.getState() : oSmartControlStateWrapper.getState();
+            if (JSON.stringify(oState) === JSON.stringify(oControlState)) {
+                return;
+            }
+
             if (bVariantManagementActive) {
                 // In case VariantManagement is configured
                 oVariantManagementStateWrapper.setState(oState);

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

@@ -961,7 +961,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.148.9
+	 * @version 1.148.11
 	 * @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

@@ -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) {
@@ -2731,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");
@@ -2813,7 +2821,17 @@ sap.ui.define(["sap/ui/base/Object",
 		 * @param {*} aNavRestriction - list of 1:n navigation properties
 		 */
 		function modifyDataSourceUrl(oExportEvent, aNavRestriction) {
-			let aSplitDataUrl = oExportEvent.mParameters.exportSettings.dataSource.dataUrl.split("&$");
+			let sDataUrl = oExportEvent.mParameters.exportSettings.dataSource.dataUrl;
+			// Extract non-$-prefixed query parameters (e.g. &search=NVT, &sap-client=100) before
+			// splitting by "&$". Without this, such parameters remain appended to the preceding
+			// $-parameter segment and their & / = characters get encoded by encodeURIComponent,
+			// corrupting the OData URL sent to the backend.
+			const aNonDollarParams = [];
+			sDataUrl = sDataUrl.replace(/&(?!\$)([^&]+)/g, function(match) {
+				aNonDollarParams.push(match);
+				return "";
+			});
+			let aSplitDataUrl = sDataUrl.split("&$");
 			const idxSelect = aSplitDataUrl.findIndex(data => data.startsWith("select"));
 			const idxExpand = aSplitDataUrl.findIndex(data => data.startsWith("expand"));
 			// reconsturct select query from URL.
@@ -2832,7 +2850,8 @@ sap.ui.define(["sap/ui/base/Object",
 					aSplitDataUrl.splice(idxExpand, 1);
 				}
 			}
-			oExportEvent.mParameters.exportSettings.dataSource.dataUrl = aSplitDataUrl.join("&$");
+			// Re-append the preserved non-$-prefixed parameters after the $-parameter reconstruction.
+			oExportEvent.mParameters.exportSettings.dataSource.dataUrl = aSplitDataUrl.join("&$") + aNonDollarParams.join("");
 		}
 
 		/**
@@ -2983,6 +3002,7 @@ sap.ui.define(["sap/ui/base/Object",
 		var getPaginatorInfo = testableHelper.testable(getPaginatorInfo, "getPaginatorInfo");
 		var fnRenderTeamsContactCollabOptions = testableHelper.testable(fnRenderTeamsContactCollabOptions, "fnRenderTeamsContactCollabOptions");
 		var removeUnsupportedColumnsToExport = testableHelper.testable(removeUnsupportedColumnsToExport, "removeUnsupportedColumnsToExport");
+		var modifyDataSourceUrl = testableHelper.testable(modifyDataSourceUrl, "modifyDataSourceUrl");
 		var fnAddMultiEditFieldGroupProperties = testableHelper.testable(fnAddMultiEditFieldGroupProperties,"fnAddMultiEditFieldGroupProperties");
 		var fnHideTableCells = testableHelper.testable(fnHideTableCells, "fnHideTableCells");
 		var fnApplyCellHiddenBindings = testableHelper.testable(fnApplyCellHiddenBindings, "fnApplyCellHiddenBindings");

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/insights/InsightsCardHelper.js

@@ -50,6 +50,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 		var oAppComponent = oComponent.getAppComponent();
 		var oUIManifest = oAppComponent.getManifestEntry("sap.ui");
 		var oAppManifest = oAppComponent.getManifestEntry("sap.app");
+		var oOutbounds = oAppManifest && oAppManifest["crossNavigation"] && oAppManifest["crossNavigation"]["outbounds"];
 		if (oAppManifest && oAppManifest["crossNavigation"]) {
 			delete oAppManifest["crossNavigation"];
 		}
@@ -57,7 +58,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 		oAppManifest.id = InsightsCardHelper.getCardId(oAppComponent);
 		oManifest["sap.app"] = fnCreateManifestSapApp(oAppManifest);
 		oManifest["sap.ui"] = oUIManifest;
-		oManifest["sap.card"] = fnCreateManifestSapCard(oCardDefinition);
+		oManifest["sap.card"] = fnCreateManifestSapCard(oCardDefinition, oOutbounds);
 		oManifest["sap.insights"] = fnCreateManifestSapInsight(oCardDefinition);
 		oManifest["sap.ui5"] = fnCreateSapui5();
 		return oManifest;
@@ -91,7 +92,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 		return oManifestAppData;
 	};
 
-	var fnCreateManifestSapCard = function (oCardDefinition) {
+	var fnCreateManifestSapCard = function (oCardDefinition, oOutbounds) {
 		var oCardConfig = {};
 		var sComponentName = oCardDefinition['component'].getMetadata().getName();
 		oCardConfig["type"] = getCardType(sComponentName);
@@ -104,7 +105,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 		} else {
 			oCardConfig["content"] = InsightsCardHelper.fnCreateManifestSapTableCardContent(oCardDefinition, oCardConfig);
 		}
-        InsightsCardHelper.getCardActions(oCardDefinition, oCardConfig);
+        InsightsCardHelper.getCardActions(oCardDefinition, oCardConfig, oOutbounds);
 		return oCardConfig;
 	};
 
@@ -703,7 +704,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 		return aDimensions;
 	};
 
-	InsightsCardHelper.getCardActions = function (oCardDefinition, oSapCard) {
+	InsightsCardHelper.getCardActions = function (oCardDefinition, oSapCard, oOutbounds) {
         var sHash = window.hasher.getHash(), aSemanticObjAction = sHash.split('&/')[0], sAppVarId;
 
         if (aSemanticObjAction.includes('?')) {
@@ -735,6 +736,10 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
         }];
 
         var oContentParams = JSON.parse(JSON.stringify(oHeaderParams));
+        var oRowOutbound = fnGetRowNavigationOutbound(oOutbounds, aSemanticObjAction[0]);
+        if (oRowOutbound) {
+            oContentParams.ibnTarget = oRowOutbound;
+        }
 
         var oContentParameterValue = [{
             "type": "Navigation",
@@ -757,6 +762,21 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
         }
     };
 
+	var fnGetRowNavigationOutbound = function (oOutbounds, sSemanticObject) {
+        if (!oOutbounds || !sSemanticObject) {
+            return null;
+        }
+        var oResult = null;
+        Object.keys(oOutbounds).some(function (sKey) {
+            var oOutbound = oOutbounds[sKey];
+            if (oOutbound && oOutbound.semanticObject === sSemanticObject && oOutbound.action) {
+                oResult = { semanticObject: oOutbound.semanticObject, action: oOutbound.action };
+                return oOutbound.action === "displayFactSheet";
+            }
+        });
+        return oResult;
+    };
+
 	var fnGetLineItemAnnotation = function (oCardDefinition) {
 		var oEntityType = oCardDefinition['entityType'];
 		var aCustomData = oCardDefinition['currentControlHandler'].getControl().getCustomData();

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

@@ -2445,7 +2445,7 @@ sap.ui.define(["sap/ui/base/Object",
 			};
 			for (var oHistoricHash = oCurrentHash; oHistoricHash.iHashChangeCount > 0; oHistoricHash = aPreviousHashes[oHistoricHash.backTarget]){
 				var oIdentity = (oHistoricHash === oCurrentHash) ? oCurrentIdentity : oHistoricHash.identity;
-				var oReducedIdentity = oIdentity.treeNode && {
+				var oReducedIdentity = oIdentity && oIdentity.treeNode && {
 					sRouteName: oIdentity.treeNode.sRouteName,
 					keys: oIdentity.keys,
 					appStates: oIdentity.appStates
@@ -3125,6 +3125,7 @@ sap.ui.define(["sap/ui/base/Object",
 		var fnPrepareHostView = testableHelper.testable(fnPrepareHostView, "prepareHostView");
 		var fnPreloadComponent = testableHelper.testable(fnPreloadComponent, "preloadComponent");
 		var fnGetRouteInfoByHash = testableHelper.testable(fnGetRouteInfoByHash, "getRouteInfoByHash");
+		var fnUpdateHistoryState = testableHelper.testable(fnUpdateHistoryState, "updateHistoryState");
 		
 		// Note: Function createHostView will be added by routingHelper.
 		// Allow to mock this by unit tests
@@ -3135,8 +3136,16 @@ sap.ui.define(["sap/ui/base/Object",
 		testableHelper.testable(function(fnPrepareHostViewStub){
 			fnPrepareHostView = fnPrepareHostViewStub;
 		}, "setPrepareHostView");
-		/* eslint-enable */
 
+		testableHelper.testable(function(oCurrentHashParam, aPreviousHashesParam, oCurrentIdentityParam, oHistoryStateParam){
+			oCurrentHash = oCurrentHashParam;
+			aPreviousHashes = aPreviousHashesParam;
+			oCurrentIdentity = oCurrentIdentityParam;
+			if (oHistoryStateParam !== undefined){
+				oHistoryState = oHistoryStateParam;
+			}
+		}, "setInternalNavigationState");
+		/* eslint-enable */
 
 		oTemplateContract.oBusyHelper.setBusy((getParsedShellHashFromFLP() || Promise.resolve()).then(function(oResults){
 			var oParsedUrl = oResults && oResults.parseParameters(document.location.search);
@@ -3222,7 +3231,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.148.9
+	 * @version 1.148.11
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

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