@sapui5/sap.suite.ui.generic.template 1.124.4 → 1.124.6

package/package.json

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

package/src/sap/suite/ui/generic/template/ListReport/controller/IappStateHandler.js

@@ -14,9 +14,10 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/listTemplates/semanticDateRangeTypeHelper",
 	"sap/suite/ui/generic/template/ListReport/controller/LegacyStateHandler",
 	"sap/suite/ui/generic/template/genericUtilities/testableHelper",
-	"sap/suite/ui/generic/template/js/StableIdHelper"
+	"sap/suite/ui/generic/template/js/StableIdHelper",
+	"sap/suite/ui/generic/template/genericUtilities/utils"
 	], function(BaseObject, ControllerExtension, NavError, listUtils, SelectionVariant, UIState, FeLogger, deepEqual, extend,
-			isEmptyObject, FeError, Device, semanticDateRangeTypeHelper, LegacyStateHandler, testableHelper, StableIdHelper) {
+			isEmptyObject, FeError, Device, semanticDateRangeTypeHelper, LegacyStateHandler, testableHelper, StableIdHelper, Utils) {
 	"use strict";
 
 	var	sClassName = "ListReport.controller.IappStateHandler";
@@ -27,6 +28,9 @@ sap.ui.define([
 	var dataPropertyNameCustom = "sap.suite.ui.generic.template.customData",
 	dataPropertyNameExtension = "sap.suite.ui.generic.template.extensionData",
 	dataPropertyNameGeneric = "sap.suite.ui.generic.template.genericData";
+	// Array contains URL parameters that should be ignored and trigger app initialization as only
+	// default parameters were passed
+	var aIgnoreURLParameters = ["save-appvar-id"];
 
 	function fnLogInfo(sMessage, vDetails){
 		if (sap.ui.support) { //only if support assistant is loaded
@@ -746,7 +750,9 @@ sap.ui.define([
 				break;
 			case sap.fe.navigation.NavType.xAppState:
 			case sap.fe.navigation.NavType.URLParams:
-				if (oAppData.bNavSelVarHasDefaultsOnly){
+				if (oAppData.bNavSelVarHasDefaultsOnly
+					|| oAppData.oSelectionVariant.getSelectOptionsPropertyNames().length && Utils.isASubsetOfB(oAppData.oSelectionVariant.getSelectOptionsPropertyNames(), aIgnoreURLParameters)
+				){
 					fnAdaptToAppStateStartUpWithParameters(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey);
 				} else {
 					fnAdaptToAppStateNavigation(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey);

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

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

@@ -1817,23 +1817,25 @@ sap.ui.define([
 
 			// This function is called when a sub-section is getting in view-port
 			function fnSubSectionEntered(oSubSection) {
-				var oSubSectionInfoObj = oTemplateUtils.oInfoObjectHandler.setInformationWithControl(oSubSection); // Assigning the SubSection control to Info Object, in case it is assigned infoObject is returned without doing anything
-				// Check if initialization code is executed for the SubSection. If not initialize the same
-				var sSubSectionId = oSubSection.getId();
-				if (!mSubSectionsInitState[sSubSectionId]) {
-					// Execute Application specific logic which needs to be executed
-					oController.onSubSectionEnteredExtension(oSubSection);
-					mSubSectionsInitState[sSubSectionId] = true;
-				}
-
-				if (oSubSectionInfoObj) { // In case of EditableHeaderFacet Sections & SubSection is created at runtime and there is info object handling
-					oMultipleViewsHandler.subSectionEntered(oSubSectionInfoObj); // Assigning the SubSection control MultipleViewsHandler. In case not relevant method simply returns
-					// The loading strategy of a sub-section might depend on the content of oWaitForState (together with the strategy) and whether or not the sub-section is currently in view-port.
-					// The second condition is fulfilled for sure. Only check the first one.
-					var oStrategy = oSubSectionInfoObj.getLoadingStrategy();
-					var bExecuteNow = checkGlobalWaitState(oStrategy);
-					if (bExecuteNow) {
-						oStrategy.activeHandler(oSubSection, oSubSectionInfoObj);
+				if (oWaitForState && oWaitForState.bRebindCompleted){
+					var oSubSectionInfoObj = oTemplateUtils.oInfoObjectHandler.setInformationWithControl(oSubSection); // Assigning the SubSection control to Info Object, in case it is assigned infoObject is returned without doing anything
+					// Check if initialization code is executed for the SubSection. If not initialize the same
+					var sSubSectionId = oSubSection.getId();
+					if (!mSubSectionsInitState[sSubSectionId]) {
+						// Execute Application specific logic which needs to be executed
+						oController.onSubSectionEnteredExtension(oSubSection);
+						mSubSectionsInitState[sSubSectionId] = true;
+					}
+	
+					if (oSubSectionInfoObj) { // In case of EditableHeaderFacet Sections & SubSection is created at runtime and there is info object handling
+						oMultipleViewsHandler.subSectionEntered(oSubSectionInfoObj); // Assigning the SubSection control MultipleViewsHandler. In case not relevant method simply returns
+						// The loading strategy of a sub-section might depend on the content of oWaitForState (together with the strategy) and whether or not the sub-section is currently in view-port.
+						// The second condition is fulfilled for sure. Only check the first one.
+						var oStrategy = oSubSectionInfoObj.getLoadingStrategy();
+						var bExecuteNow = checkGlobalWaitState(oStrategy);
+						if (bExecuteNow) {
+							oStrategy.activeHandler(oSubSection, oSubSectionInfoObj);
+						}
 					}
 				}
 			}

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

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

package/src/sap/suite/ui/generic/template/designtime/ObjectPage.designtime.js

@@ -144,6 +144,12 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 						}
 					}
 				},
+				"sap.ui.layout.VerticalLayout": {
+					actions: ["remove"]
+				},
+				"sap.ui.layout.HorizontalLayout": {
+					actions: ["remove"]
+				},
 				"sap.uxap.ObjectPageHeaderActionButton": {
 					actions: ["remove", "reveal"]
 				},

package/src/sap/suite/ui/generic/template/fragments/SmartControlContextMenu.fragment.xml

@@ -11,6 +11,12 @@
 						 press="._templateEventHandlers.onContextMenu($event, '{smartControlId>id}')"/>
 				</items>
 			</MenuItem>
+			<template:if test="{parts: [{path: 'listEntitySet>name'}, {path: 'parameter>/settings/subPages/'}, {path: 'facet>Target/AnnotationPath'}], formatter: 'AH.getDisplayNavigationIntent'}">
+				<customData>
+					<core:CustomData key="CrossNavigation"
+						value="{parts: [{path: 'listEntitySet>name'}, {path: 'parameter>/settings/subPages/'}, {path: 'facet>Target/AnnotationPath'}], formatter: 'AH.getDisplayNavigationIntent'}" />
+				</customData>
+			</template:if>
 		</Menu>
 	</template:with>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/genericUtilities/utils.js

@@ -21,7 +21,31 @@ sap.ui.define([], function() {
 			return sap.ui.require.toUrl(sAppComponentName.replace(/\./g, "/")) + "/" + sImageUrl; //replacing dots by slashes before calling sap.ui.require.toUrl method. com.xyz.abc to com/xyz/abc
 		}
 
+		// Function check is B array values is a subset of A array values.
+		// A = [], B = ["1", "2", "3"] -> true
+		// A = ["4"], B = ["1", "2", "3"] -> false
+		// A = ["1"], B = ["1", "2", "3"] -> true
+		// A = ["1", "3"], B = ["1", "2", "3"] -> true
+		// A = ["3", "2", "1"], B = ["1", "2", "3"] -> true
+		// A = ["1", "4"], B = ["1", "2", "3"] -> false
+		// A = ["1", "2", "3", "4"], B = ["1", "2", "3"] -> false
+		function fnIsASubsetOfB(a, b) {
+			if (a === b) {
+				return true;
+			}
+			if (!a || !b) {
+				return false;
+			}
+			if (a.length > b.length) {
+				return false;
+			}
+			return a.every(function(entry) {
+				return b.includes(entry);
+			});
+		}
+
 	return {
-		adjustImageUrlPath: fnAdjustImageUrlPath
+		adjustImageUrlPath: fnAdjustImageUrlPath,
+		isASubsetOfB: fnIsASubsetOfB
 	};
 });

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

@@ -460,6 +460,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var oContextSet = oInterface.getInterface(0);
 			var oModel = oInterface.getInterface(1).getModel();
 			// p13nData for Semantically Connected Columns
+			var sLeadingPropertyForSCColumn = "";
 			var aNavigationPropertiesForSCColumn = [];
 			var aAdditionalPropertiesForSCColumn = [];
 			var aAdditionalSortPropertiesForSCColumn = [];
@@ -509,9 +510,15 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				if (sP13N) {
 					oP13N = JSON.parse(sP13N.replace(/\\/g, ""));
 				}
-				
-				oP13N.leadingProperty && (aAdditionalPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
-				oP13N.leadingProperty && (aAdditionalSortPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalSortPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
+
+				// Make the first data field's "leadingProperty" as column's "leadingProperty"
+				// Add the remaining leading properties into "additionalProperty" and "additionalSortingProperty"
+				if (!sLeadingPropertyForSCColumn && oP13N.leadingProperty) {
+					sLeadingPropertyForSCColumn = oP13N.leadingProperty;
+				} else {
+					oP13N.leadingProperty && (aAdditionalPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
+					oP13N.leadingProperty && (aAdditionalSortPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalSortPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
+				}	
 				
 				oP13N.navigationProperty && (aNavigationPropertiesForSCColumn.indexOf(oP13N.navigationProperty) === -1) ? aNavigationPropertiesForSCColumn.push(oP13N.navigationProperty) : Function.prototype;
 				// Add "additionalProperty" of current data field to the "additionalProperty" of current column's p13n
@@ -532,6 +539,12 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 			sP13N += '", "filterProperty":"' + "";
 
+			// Add the leading property to "leadingProperty" and "sortProperty" of p13n
+			if (sLeadingPropertyForSCColumn) {
+				sP13N += '", "leadingProperty":"' + sLeadingPropertyForSCColumn;
+				sP13N += '", "sortProperty":"' + sLeadingPropertyForSCColumn;
+			}
+
 			if (aNavigationPropertiesForSCColumn.length > 0) {
 				sP13N += '", "navigationProperty":"' + aNavigationPropertiesForSCColumn.join();
 			}

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

@@ -4,11 +4,6 @@ sap.ui.define([
 ], function (isEmptyObject, AnnotationHelper) {
     "use strict";
 
-    var oHiddenColumnInfo = {
-        staticHiddenColumns: [],
-        columnKeyToCellHiddenPath: undefined
-    };
-
      /*
         *  This method is called in the initialization and dataReceived phase of the specified SmartTable.
         *  It handles everything which can be done regarding hiding columns at this point in time.
@@ -28,16 +23,15 @@ sap.ui.define([
         });
         var sLineItemSuffix = (oCustomDataForLineItemQualifier && oCustomDataForLineItemQualifier.getValue()) ? ("#" + oCustomDataForLineItemQualifier.getValue()) : "";
         var aDataFields = oEntityType["com.sap.vocabularies.UI.v1.LineItem" + sLineItemSuffix] || [];
-        
+
         var aStaticHiddenColumns = []; // list of keys of columns that are always hidden
         var mColumnKeyToDynamicHiddenPath = Object.create(null); // map of column keys to pathes that determine whether the column is shown
-       
+
         aDataFields.forEach(fnAnalyzeColumnHideInfoForDataField.bind(null, aStaticHiddenColumns, mColumnKeyToDynamicHiddenPath, oMetaModel, oEntityType));
-        if (!isEmptyObject(mColumnKeyToDynamicHiddenPath) || aStaticHiddenColumns.length) { // if there is at least one column with hide info we store this analysis in the info object
-            oHiddenColumnInfo.staticHiddenColumns = aStaticHiddenColumns;
-            oHiddenColumnInfo.columnKeyToCellHiddenPath = mColumnKeyToDynamicHiddenPath;
-        }
-        return oHiddenColumnInfo;
+        return {
+            staticHiddenColumns: aStaticHiddenColumns,
+            columnKeyToCellHiddenPath: mColumnKeyToDynamicHiddenPath
+        };
     }
 
     /*

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

@@ -920,7 +920,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.124.4
+	 * @version 1.124.6
 	 * @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/CommonEventHandlers.js

@@ -2685,6 +2685,35 @@ sap.ui.define(["sap/ui/base/Object",
 			oComponentUtils.getBusyHelper().setBusy(oAIFilterQueryHandlerPromise);
 		}
 
+		/**
+		 * Performs intent based navigation and opens the given line item context in a new tab.
+		 * 
+		 * @param {object} oOutbound The target outbound intent (contains semantic object and action)
+		 * @param {sap.ui.model.Context} oLineItemContext The line item context to be opened in new tab
+		 * @param {sap.ui.comp.smartfilterbar.SmartFilterBar} oSmartFilterBar The filter bar
+		 * @param {Function} fnHandleError The error handling function
+		 */
+		function fnNavigateIntentOnNewTab(oOutbound, oLineItemContext, oSmartFilterBar, fnHandleError) {
+			var sSelectionVariant, 
+				oSelectionVariant,
+				sNavMode = "explace"; // "explace" is the navigation mode for opening in new tab
+			// Get selection variant from filter bar
+			if (oSmartFilterBar) {
+				sSelectionVariant = oSmartFilterBar.getUiState().getSelectionVariant();
+				if (typeof sSelectionVariant !== "string"){
+					sSelectionVariant = JSON.stringify(sSelectionVariant);
+				}
+			}
+			// Build the selection variant from line item context, page context and the selection variant of filter bar
+			oSelectionVariant = fnBuildSelectionVariantForNavigation(oOutbound, [oLineItemContext], oController.getView().getBindingContext(), sSelectionVariant);
+			var oObjectInfo = {
+				semanticObject: oOutbound.semanticObject,
+				action: oOutbound.action
+			};
+			oController.adaptNavigationParameterExtension(oSelectionVariant, oObjectInfo);
+			oServices.oApplication.getNavigationHandler().navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, fnHandleError, null, sNavMode);
+		}
+
 		/* eslint-disable */
 		var fnBuildSelectionVariantForNavigation = testableHelper.testable(fnBuildSelectionVariantForNavigation, "fnBuildSelectionVariantForNavigation");
 		var fnEvaluateParameters = testableHelper.testable(fnEvaluateParameters, "fnEvaluateParameters");
@@ -2736,7 +2765,8 @@ sap.ui.define(["sap/ui/base/Object",
 			onSmartFieldModeToggled: onSmartFieldModeToggled,
 			onRenderTeamsContactCollabOptions: fnRenderTeamsContactCollabOptions,
 			hideTableCells: fnHideTableCells,
-			onEasyFilterChange: fnHandleEasyFilterChange
+			onEasyFilterChange: fnHandleEasyFilterChange,
+			navigateIntentOnNewTab: fnNavigateIntentOnNewTab
 		};
 	}
 

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

@@ -728,6 +728,10 @@ sap.ui.define(["sap/ui/base/Object",
 			oComponentUtils.navigateAccordingToContext(oContext, iDisplayMode, bReplace);
 		}
 
+		function fnOpenContextInNewTabFromListItem (oContext) {
+			oComponentUtils.openContextInNewTab(oContext);
+		}
+
 		// Fix for BCP 1770053414 where error message is displayed instead of error code
 		function fnHandleError(oError) {
 			if (oError instanceof sap.fe.navigation.NavError) {
@@ -1992,7 +1996,8 @@ sap.ui.define(["sap/ui/base/Object",
 			getControlStateWrapperById: oControlStateWrapperFactory.getControlStateWrapperById,
 			handleError: fnHandleError,
 			transformTechnicalPropsOnExportedFile: fnTransformTechnicalPropsOnExportedFile,
-			includeEntitySetParametersToExportedFile: fnIncludeEntitySetParametersToExportedFile
+			includeEntitySetParametersToExportedFile: fnIncludeEntitySetParametersToExportedFile,
+			openContextInNewTabFromListItem: fnOpenContextInNewTabFromListItem
 		};
 	}
 

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

@@ -1071,6 +1071,10 @@ sap.ui.define(["sap/ui/base/Object",
 			var oTemplatePrivateGlobalModel = getTemplatePrivateGlobalModel();
 			return oTemplatePrivateGlobalModel.getProperty("/generic/ui5VersionInfo");
 		}
+
+		function fnOpenContextInNewTab (oNavigationContext) {
+			oComponentRegistryEntry.oTemplateContract.oNavigationControllerProxy.openContextInNewTab(oTreeNode, oNavigationContext);
+		}
 		
 		return {
 			getBusyHelper: function() {
@@ -1152,7 +1156,8 @@ sap.ui.define(["sap/ui/base/Object",
 			getToolbarDataFieldForIBNCommandDetails: oCommandComponentUtils.getToolbarDataFieldForIBNCommandDetails,
 			isStateHandlingSuspended: fnIsStateHandlingSuspended,
 			adjustCopyButtonSettings: fnAdjustCopyButtonSettings,
-			getUI5VersionInfo: fnGetUI5VersionInfo
+			getUI5VersionInfo: fnGetUI5VersionInfo,
+			openContextInNewTab: fnOpenContextInNewTab
 		};
 	}
 

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

@@ -1,14 +1,12 @@
 sap.ui.define([
 	"sap/base/util/extend",
 	"sap/base/util/ObjectPath",
-	"sap/f/library",
 	"sap/m/MessageBox",
 	"sap/suite/ui/generic/template/genericUtilities/controlHelper",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
 	"sap/ui/base/Object",
-	"sap/ui/base/Event",
-	"sap/ui/util/openWindow"
-], function (extend, ObjectPath, fioriLibrary, MessageBox, controlHelper, FeLogger, BaseObject, Event, openWindow) {
+	"sap/ui/base/Event"
+], function (extend, ObjectPath, MessageBox, controlHelper, FeLogger, BaseObject, Event) {
 	"use strict";
 
 	/* This class provides generic functionality for handling of the context menu for one smart control (oSourceControl).
@@ -16,9 +14,7 @@ sap.ui.define([
 	 * oConfiguration is an object which contains logic which is specific to the floorplan using this functionality.
      */
 	var oLogger = new FeLogger("lib.ContextMenuHandler").getLogger();
-	// shortcut for sap.f.LayoutType
-	var LayoutType = fioriLibrary.LayoutType;
-
+	
 	// Constants
 	var MAX_RECORDS_OPEN_IN_NEW_TAB = 10;
 	var aToolbarContentsToBeOmitted = ["btnPersonalisation", "btnExcelExport"];
@@ -65,7 +61,9 @@ sap.ui.define([
 		var bNavigationSupported = oComponentUtils.canNavigateToSubEntitySet(oSourceControl.getEntitySet());
 		var mHandlers; // maps keys of context menu entries to handler functions for the corresponding entry
 		var iCreatedMenuItemsCounter = 0; // increased whenever a new MenuItem is being created In fnAddMenuItem). Used to generate a key for mHandlers.
-
+		// Store the outbound navigation target
+		var sOutboundNavigationTarget = oSourceControl.getTable().getContextMenu().data("CrossNavigation");
+		var oOutbound = sOutboundNavigationTarget && fnGetOutboundInfoFromManifest(sOutboundNavigationTarget);
 		/**
 		 * The method does the following
 		 *  - Adds an entry (menu item) to the context menu.
@@ -306,51 +304,14 @@ sap.ui.define([
 			return !bIsEmptyRow;
 		}
 
-		/**
-		 * Constructs the app specific route for the target to be opened on new tab. The target route consists of
-		 * 1. Deep path of the context
-		 * 2. URL parameters of the current app specific route.
-		 * 
-		 * Note: All the URL parameters from source are retained in the target except the "FCLLayout". 
-		 * The target "FCLLayout" is calculated by the below logic:
-		 * 
-		 * If the app supports FCL.
-		 * 	- If the current page is LR (iViewLevel = 0), the target layout is "MidColumnFullScreen"
-		 * 	- If the current page is OP (iViewLevel > 0), the target layout is "EndColumnFullScreen"
-		 * 	
-		 * @returns {string} target path
-		 */
-		function fnConstructTargetAppSpecificRoute (oContext, oAppComponent, sSrcAppSpecificRoute) {
-			var sUrlParams = sSrcAppSpecificRoute.includes("?") ? sSrcAppSpecificRoute.substring(sSrcAppSpecificRoute.indexOf("?")) : "";
-			var oUrlParams = new URLSearchParams(sUrlParams);
-			var sDeepPath = oContext.getDeepPath();
-			var sTargetPathPrefix = sDeepPath.startsWith("/") ? "&" : "&/";
-			// If the app supports FCL, the object page should be opened in full screen mode
-			if (oAppComponent.getFlexibleColumnLayout()) {
-				var iViewLevel = oComponentUtils.getViewLevel();
-				var sTargetFCLLayout = iViewLevel === 0 ? LayoutType.MidColumnFullScreen : LayoutType.EndColumnFullScreen;
-				// Update "FCLLayout"
-				oUrlParams.set("FCLLayout", sTargetFCLLayout);
-			}
-			return sTargetPathPrefix + sDeepPath + "?" + oUrlParams.toString();
+		// Fetches the outbound target from manifest
+		function fnGetOutboundInfoFromManifest (sOutboundNavigationTarget) {
+			var oManifestEntry = oController.getOwnerComponent().getAppComponent().getManifestEntry("sap.app");
+			return oManifestEntry.crossNavigation.outbounds[sOutboundNavigationTarget];
 		}
 
-		// Opens the given context in a new tab
-		function fnOpenContextInNewTab (oContext, oUrlParser, sFLPUrl, oAppComponent) {
-			// Construct URL object from FLP URL
-			var oFLPUrl = new URL(sFLPUrl);
-			// Get the hash from URL object
-			var sHash = oFLPUrl.hash;
-			// Parse the hash and update "appSpecificRoute" with the calculated target path.
-			// Then, reconstruct the hash with updated value.
-			var oHash = oUrlParser.parseShellHash(sHash);
-			oHash.appSpecificRoute = fnConstructTargetAppSpecificRoute(oContext, oAppComponent, oHash.appSpecificRoute);
-			sHash = oUrlParser.constructShellHash(oHash);
-			// Update the hash on the FLP URL and reconstruct the URL
-			oFLPUrl.hash = sHash;
-			var sTargetUrl =  oFLPUrl.toString();
-			//Open the new window with the target URL
-			openWindow(sTargetUrl);
+		function fnCrossAppNavErrorHandler(oContext, oError) {
+			oLogger.error("Error while opening the context " + oContext.getPath() + "in new tab: " + oError);
 		}
 
 		/**
@@ -367,23 +328,17 @@ sap.ui.define([
 				return;
 			}
 
-			var oAppComponent = oController.getOwnerComponent().getAppComponent();
-			var UShellContainer = sap.ui.require("sap/ushell/Container");
-			var oUrlParsingPromise = UShellContainer.getServiceAsync("URLParsing");
-			var oFLPUrlPromise = UShellContainer.getFLPUrlAsync(true);
-			// If the table has any pending changes, synchronize the draft before navigation.
 			var oSynchronizeDraftPromise = oSourceControl.getModel().hasPendingChanges() ? oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync() : Promise.resolve();
-
-			Promise.all([oUrlParsingPromise, oFLPUrlPromise, oSynchronizeDraftPromise]).then(function (aResults) {
-				var oUrlParser = aResults[0];
-				var sFLPUrl = aResults[1];
-
+			oSynchronizeDraftPromise.then(function () {
 				aNavigableContexts.forEach(function (oContext) {
-					fnOpenContextInNewTab(oContext, oUrlParser, sFLPUrl, oAppComponent);
+					if (oOutbound) {
+						var fnHandleError = fnCrossAppNavErrorHandler.bind(null, oContext);
+						oTemplateUtils.oCommonEventHandlers.navigateIntentOnNewTab(oOutbound, oContext, oState.oSmartFilterbar, fnHandleError);
+					} else {
+						oTemplateUtils.oCommonUtils.openContextInNewTabFromListItem(oContext);
+					}
 				});
-			}).catch(function (oError) {
-				oLogger.error("Error while opening in new tab", oError);
-			});	
+			});
 		}
 
 		/**
@@ -394,7 +349,7 @@ sap.ui.define([
 		 *   a. Navigation is not supported by the table
 		 *   b. Direct edit flow (when the edit icon is pressed on row, the object is opened with draft record) is configured.  
 		 *   c. The controller is configured with onListNavigationExtension (i.e custom navigation logic written by app).
-		 * //TODO: These negative scenarios need to be revisited
+		 *   d. If ushell container is unavailable
 		 * 
 		 * @param {FocusInfo} oFocusInfo 
 		 * @returns {Promise<Function|undefined>} Promise which resolves the handler method
@@ -406,7 +361,8 @@ sap.ui.define([
 
 			var bDirectEdit = oTemplateUtils.oServices.oApplication.getEditFlowOfRoot() === "direct";
 			var bOnListNavigationExtensionFound = oController.hasOwnProperty("onListNavigationExtension");
-			if (!bNavigationSupported || bDirectEdit || bOnListNavigationExtensionFound) {
+			var UshellContainer = sap.ui.require("sap/ushell/Container");
+			if (!bNavigationSupported || bDirectEdit || bOnListNavigationExtensionFound || !UshellContainer) {
 				return;
 			}
 

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

@@ -698,7 +698,8 @@ sap.ui.define(["sap/ui/base/Object", "sap/f/FlexibleColumnLayoutSemanticHelper",
 				isListAndFirstEntryLoadedOnStartup: isListAndFirstEntryLoadedOnStartup,
 				setStoredTargetLayoutToFullscreen: setStoredTargetLayoutToFullscreen,
 				adaptAppStatesForExternalNavigation: fnAdaptAppStatesForExternalNavigation,
-				willBeOpenedInFullscreen: fnWillBeOpenedInFullscreen
+				willBeOpenedInFullscreen: fnWillBeOpenedInFullscreen,
+				getFullscreenLayout: getFullscreenLayout
 			};
 		}
 

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

@@ -76,9 +76,10 @@ sap.ui.define(["sap/ui/base/Object",
 	"sap/suite/ui/generic/template/lib/navigation/routingHelper",
 	"sap/suite/ui/generic/template/lib/navigation/startupParameterHelper",
 	"sap/suite/ui/generic/template/lib/TemplateComponent",
-	"sap/base/strings/whitespaceReplacer"
+	"sap/base/strings/whitespaceReplacer",
+	"sap/ui/util/openWindow"
 ], function(BaseObject, extend, isEmptyObject, HashChanger, History, coreLibrary, controlHelper, FeLogger, jsonHelper, oDataModelHelper, ProcessObserver, Queue, testableHelper, CRUDHelper, MessageUtils, routingHelper, startupParameterHelper,
-			TemplateComponent, whitespaceReplacer) {
+			TemplateComponent, whitespaceReplacer, openWindow) {
 	"use strict";
 	var	sClassName = "lib.navigation.NavigationController";
 	var oLogger = new FeLogger(sClassName).getLogger();
@@ -1670,6 +1671,67 @@ sap.ui.define(["sap/ui/base/Object",
 			oTemplateContract.oBusyHelper.setBusy(oRet, undefined, undefined, oTargetIdentityInfo.willShowPlaceholder);
 			return oRet;
 		}
+
+		// Opens the context in new tab
+		function fnOpenContextInNewTab(oSourceNode, oNavigationContext) {
+			var oTargetIdentityInfo = getTargetIdentityInfoForContext({ treeNode: oSourceNode }, oNavigationContext, true, false);
+			var oTargetIdentityPromise = oTargetIdentityInfo.promise;
+			return oTargetIdentityPromise.then(function(oTargetIdentity){
+				// Construct the query params
+				var mQueryParameters = {};
+				// In case FCL layout is supported by app, the target context should be opened in full screen mode.
+				// So, calculate the full screen layout type and add it as a query param.
+				var sFCLLayout = oTemplateContract.oFlexibleColumnLayoutHandler && oTemplateContract.oFlexibleColumnLayoutHandler.getFullscreenLayout(oTargetIdentity.treeNode.fCLLevel);
+				if (sFCLLayout) {
+					mQueryParameters["FCLLayout"] = sFCLLayout;
+				}
+				// Get the route information from target identity
+				var oRouterInput = fnGetRouterInput(oTargetIdentity.treeNode, oTargetIdentity.keys, mQueryParameters);
+				// Construct the app specific route URL from route name and parameters
+				var sTargetAppSpecificRoute = oNavigationControllerProxy.oRouter.getURL(oRouterInput.route, oRouterInput.parameters);
+				// Add the prefix
+				var sRoutePrefix = sTargetAppSpecificRoute.startsWith("/") ? "&" : "&/";
+				sTargetAppSpecificRoute = sRoutePrefix + sTargetAppSpecificRoute;
+				// Construct the fully qualified URL updated with the target app route
+				return fnConstructUrlFromRoute(sTargetAppSpecificRoute);
+			}).then(function (sTargetUrl) {
+				// Open the URL in new tab/window
+				openWindow(sTargetUrl);
+			}).catch(function (oError) {
+				oLogger.error("Error while opening the context '" + oNavigationContext.getPath() + "' in a new tab: " + oError);
+			});
+		}
+
+		// Constructs the fully qualified URL with the given app specific route.
+		function fnConstructUrlFromRoute(sTargetAppSpecificRoute) {
+			var UShellContainer = sap.ui.require("sap/ushell/Container");
+
+			if (!UShellContainer) {
+				return Promise.reject("Unable to proceed as 'sap/ushell/Container' is not found!");
+			}
+			//Encode the route
+			sTargetAppSpecificRoute = encodeURI(sTargetAppSpecificRoute);
+			
+			var oUrlParsingPromise = UShellContainer.getServiceAsync("URLParsing");
+			var oFLPUrlPromise = UShellContainer.getFLPUrlAsync(true);
+			return Promise.all([oUrlParsingPromise, oFLPUrlPromise]).then(function (aResults) {
+				var oUrlParser = aResults[0];
+				var sFLPUrl = aResults[1];
+
+				// Construct URL object from FLP URL
+				var oFLPUrl = new URL(sFLPUrl);
+				// Get the hash from URL object
+				var sHash = oFLPUrl.hash;
+				// Parse the hash and update "appSpecificRoute" with "sTargetAppSpecificRoute"
+				var oHash = oUrlParser.parseShellHash(sHash);
+				oHash.appSpecificRoute = sTargetAppSpecificRoute;
+				// Then, reconstruct the hash with updated value.
+				sHash = oUrlParser.constructShellHash(oHash);
+				// Update the hash on the FLP URL and reconstruct the URL
+				oFLPUrl.hash = sHash;
+				return oFLPUrl.toString();
+			});
+		}
 		
 		// This function is called when only tables could be found as focus target for the message oMessage.
 		// sFullTarget is one of the full targets defined for this message.
@@ -2834,13 +2896,44 @@ sap.ui.define(["sap/ui/base/Object",
 				return true;
 			}
 			// Now handle the case of an internal navigation which was not controlled by FE (e.g. browser back, navigation menu, bookmark){
-			var oRouteInfo = oNavigationControllerProxy.oRouter.getRouteInfoByHash(oShellContext.innerAppRoute);
+			var oRouteInfo = fnGetRouteInfoByHash(oNavigationControllerProxy.oRouter, oShellContext.innerAppRoute);
+			if (!oRouteInfo) {
+				return false;
+			}
 			var oTargetIdentity = fnRouteConfigToIdentity(oRouteInfo.name, oRouteInfo.arguments);
 			return oTargetIdentity.treeNode !== oCurrentIdentity.treeNode || oTargetIdentity.keys.some(function(sKey, i){
 				return sKey !== oCurrentIdentity.keys[i];
 			});
 		}
 
+		/**
+		 * From the given app route hash, returns the route information.
+		 * Also takes nested app route hash as input
+		 * @param {sap.m.routing.Router|sap.f.routing.Router} oRouter 
+		 * @param {string} sHash 
+		 * @returns {sap.ui.core.routing.RouteInfo|undefined} An object containing the route <code>name</code> and the <code>arguments</code> 
+		 * 	or <code>undefined</code>
+		 */
+		function fnGetRouteInfoByHash(oRouter, sHash) {
+			// If route info found by the input hash, just return it
+			var oRouteInfo = oRouter.getRouteInfoByHash(sHash);
+			if (oRouteInfo) {
+				return oRouteInfo;
+			}
+			// Nested app route: Split the hash by "&/" and get the hash belongs to inner most app route (last index)
+			// Then, check whether the route info found by inner most hash.
+			var aNestedAppRoutes = sHash.split("&/");
+			var sInnerMostHash = aNestedAppRoutes[aNestedAppRoutes.length - 1];
+			oRouteInfo = oRouter.getRouteInfoByHash(sInnerMostHash);
+			if (oRouteInfo) {
+				return oRouteInfo;
+			}
+			// In case the inner most app route is prefixed with app name, just omit the app name and try to get route info from remaining hash.
+			sInnerMostHash = sInnerMostHash.substring(sInnerMostHash.indexOf("/"));
+			oRouteInfo = oRouter.getRouteInfoByHash(sInnerMostHash);
+			return oRouteInfo;
+		}
+
 		function getEditScopeHeaderNode(oTreeNode){
 			var oMainNode = oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
 			return oMainNode.isDraft ? oMainNode : oTreeNode;                     
@@ -2952,12 +3045,13 @@ sap.ui.define(["sap/ui/base/Object",
 		oNavigationControllerProxy.userHasAcceptedDataLoss = fnUserHasAcceptedDataLoss;
 		oNavigationControllerProxy.unwantedDataLossPossible = fnUnwantedDataLossPossible;
 		oNavigationControllerProxy.isBackLeavingTheEditScope = isBackLeavingTheEditScope;
-
+		oNavigationControllerProxy.openContextInNewTab = fnOpenContextInNewTab;
 		// Make private function accessible to unit tests
 		/* eslint-disable */
 		var fnCreateTemplateComponent = testableHelper.testable(fnCreateTemplateComponent, "createTemplateComponent");
 		var getParsedShellHashFromFLP = testableHelper.testable(getParsedShellHashFromFLP, "getParsedShellHashFromFLP");
 		var fnPreloadComponent = testableHelper.testable(fnPreloadComponent, "preloadComponent");
+		var fnGetRouteInfoByHash = testableHelper.testable(fnGetRouteInfoByHash, "getRouteInfoByHash");
 		
 		// Note: Function createHostView will be added by routingHelper.
 		// Allow to mock this by unit tests
@@ -3055,7 +3149,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.124.4
+	 * @version 1.124.6
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

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

package/src/sap/suite/ui/generic/template/listTemplates/fragments/DetailSmartTable.fragment.xml

@@ -257,7 +257,9 @@
 													</ColumnListItem>
 												</items>
 												<contextMenu>
-													<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.SmartControlContextMenu" type="XML"/>
+													<template:with path="entitySet>" var="listEntitySet">
+														<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.SmartControlContextMenu" type="XML"/>
+													</template:with>
 												</contextMenu>
 												<dependents>
 													<plugins.ContextMenuSetting scope="Selection"/>