@sapui5/sap.suite.ui.generic.template 1.128.1 → 1.129.0

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

@@ -420,20 +420,7 @@ sap.ui.define([
 				oViewDependencyHelper: new ViewDependencyHelper(oTemplateContract)
 			};
 			oTemplateContract.oViewDependencyHelper = oAppRegistryEntry.oViewDependencyHelper;
-			oTemplateContract.oShellServicePromise = oAppComponent.getService("ShellUIService").catch(function(){
-				// fallback to old generic logic if service is not defined in manifest
-				var oShellServiceFactory = ServiceFactoryRegistry.get("sap.ushell.ui5service.ShellUIService");
-				var oServiceContext = { 
-					scopeObject: oAppComponent, 
-					scopeType: "component"
-				};
-
-				if (oShellServiceFactory) {
-					return Promise.resolve(oShellServiceFactory.createInstance(oServiceContext));
-				} else {
-					return Promise.reject();
-				}
-			});
+			oTemplateContract.oShellServicePromise = oAppComponent.getService("ShellUIService");
 			oTemplateContract.oShellServicePromise.catch(function(){
 				oLogger.warning("No ShellService available");
 			});
@@ -610,6 +597,7 @@ sap.ui.define([
 				oTemplateContract.JouleContextProvider.fnUnregisterProvider();
 				oTemplateContract.JouleContextProvider.destroy();
 			}
+			
 			CommonMethods.setAppComponent(null);
 			(UIComponent.prototype.exit || Function.prototype).apply(oAppComponent, arguments);
 			fnDeregister();
@@ -943,7 +931,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.128.1
+	 * @version 1.129.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
@@ -952,18 +940,16 @@ sap.ui.define([
 				title: "SAP UI Application Component", // TODO: This should be set from App descriptor
 				fullWidth: true
 			},
+			manifest: {
+				"sap.ui5": {
+					"services": {
+						"ShellUIService": {
+							"factoryName": "sap.ushell.ui5service.ShellUIService"
+						}
+					}
+				}
+			},
 			properties: {
-				// ghostapp: { //a boolean property which is not used publicly but only used to identify the ghostapp
-				//      type: "boolean"
-				// },
-				// draftSettings : {	property which is not used publicly to influence the way the framework deals with drafts
-				//     type: "object",
-				//     properties: {
-				//         dataSaveFrequency: { // value "immediate" causes drafts to be merged immediately. All other values let draft be saved with the standard delay.
-				//             type: "string"
-				//         }
-				//     }
-				// },
 				forceGlobalRefresh: {
 					type: "boolean",
 					defaultValue: false //since the parameter is highly performance critical the default value is set to false
@@ -1038,6 +1024,10 @@ sap.ui.define([
 				mergeObjectPageSectionTitle: {
 					type: "boolean",
 					defaultValue: true
+				},
+				externalNavigationSettings: {
+					type: "object",
+					defaultValue: null
 				}
 			},
 			events: {

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

@@ -546,13 +546,11 @@ sap.ui.define(["sap/ui/base/Object",
 						var bWarningOccured = false;
 						var aNewMessages = [];
 						var aMessagesAfterSave = CRUDHelper.fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, true);
-						var bCreateAccessRestrict = false;
 						var aAllMessages = aMessagesAfterSave.map(function(oMessage){
 							if (!mMessagesBeforeSave[oMessage.getId()]) { // if this is a new message
 								oMessage.persistent = false;
 								oMessage.technical = false;
 								bWarningOccured = bWarningOccured || oMessage.technicalDetails.statusCode === "412" && oMessage.technicalDetails.headers["preference-applied"] === "handling=strict";
-								bCreateAccessRestrict = oMessage.technicalDetails.statusCode === "403" ? true : bCreateAccessRestrict;
 								aNewMessages.push(oMessage);
 							}
 							return oMessage;
@@ -571,7 +569,7 @@ sap.ui.define(["sap/ui/base/Object",
 								fnHandleWarning();
 								return;
 							}
-							if (!oCreateWithDialogFilters || (oCreateWithDialogFilters && bCreateAccessRestrict)) {
+							if (!oCreateWithDialogFilters) {
 								oServices.oTemplateCapabilities.oMessageButtonHelper.showMessagePopover();
 							}
 						}

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

@@ -27,9 +27,38 @@ sap.ui.define(["sap/ui/base/Object",
 	'sap/ui/performance/trace/FESRHelper',
 	"sap/ui/core/CustomData",
 	"sap/m/VBox",
-	"sap/m/HBox"
-], function(BaseObject, Event, MessageBox, Sorter, controlHelper, expressionHelper, testableHelper, oDataModelHelper, JSONModel, AnnotationHelper,
-	Controller, FeLogger, MessageUtils, SideEffectUtil, extend, isEmptyObject, deepExtend, CRUDHelper, XMLView, FormatUtil, FileUploaderParameter, IconPool, ServiceContainer, ContactCardDetailHelper, mLibrary, Button, FESRHelper, CustomData, VBox, HBox) {
+	"sap/suite/ui/generic/template/genericUtilities/utils"
+], function(
+	BaseObject,
+	Event,
+	MessageBox,
+	Sorter,
+	controlHelper,
+	expressionHelper,
+	testableHelper,
+	oDataModelHelper,
+	JSONModel,
+	AnnotationHelper,
+	Controller,
+	FeLogger,
+	MessageUtils,
+	SideEffectUtil,
+	extend,
+	isEmptyObject,
+	deepExtend,
+	CRUDHelper,
+	XMLView,
+	FormatUtil,
+	FileUploaderParameter,
+	IconPool,
+	ServiceContainer,
+	ContactCardDetailHelper,
+	mLibrary,
+	Button,
+	FESRHelper,
+	CustomData,
+	VBox,
+	genericUtils) {
 	"use strict";
 
 	var oLogger = new FeLogger("lib.CommonEventHandlers").getLogger();
@@ -108,8 +137,8 @@ sap.ui.define(["sap/ui/base/Object",
 			// if not determined here the threshold will be determined by PaginatorButtonHelper on demand
 			var iThreshold = oPresentationControlHandler.getThreshold && oPresentationControlHandler.getThreshold();
 
-			var oParent = oRow.getParent();
-			var sParentId = oParent.getId();
+			var oTableFromRow = oCommonUtils.getOwnerControl(oRow);
+			var sParentId = oTableFromRow.getId();
 			// bIsActive stores the information whether the object was in display mode when the paginator info was created (only used in draft scenario)
 			var bIsActive = oComponentUtils.isDraftEnabled() && !oController.getView().getModel("ui").getProperty("/editable");
 			// This function is called by the PaginatorButtonHelper.
@@ -125,7 +154,7 @@ sap.ui.define(["sap/ui/base/Object",
 						if (!oVirtualItem){
 							var bIsRowSelected = oRow.getSelected && oRow.getSelected();
 							oVirtualItem = oRow.clone();
-							oVirtualItem.setParent(oParent);
+							oVirtualItem.setParent(oTableFromRow);
 							if (bIsRowSelected){ // if oRow was selected it has possibly lost this property when oVirtualItem was added to the same parent
 								oRow.setSelected(true);
 							}
@@ -1689,7 +1718,7 @@ sap.ui.define(["sap/ui/base/Object",
 					// oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation will care for:
 					// - wait until side-effects have been executed
 					// - app is not busy (otherwise do nothing)
-					// - send a data loss popup in case needed (might also result in doing nothing)					
+					// - send a data loss popup in case needed (might also result in doing nothing)
 					oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(onListNavigateImpl.bind(null, oEventSource, oEventParameters, oState, oBindingContext, bReplace), Function.prototype, "LeaveApp");
 				} else if (!oServices.oApplication.getBusyHelper().isBusy()) { // if the app is already busy with something else stop navigation here
 					onListNavigateImpl(oEventSource, oEventParameters, oState, oBindingContext, bReplace, oViewProxy);
@@ -1927,7 +1956,11 @@ sap.ui.define(["sap/ui/base/Object",
 				}
 				if (oFileUploader.FUEl.files[0].name){
 					var headerParameterContentDispositionToken = new FileUploaderParameter();
-					var fileName = "filename=" + oFileUploader.FUEl.files[0].name;
+					var sUploadedFileName = oFileUploader.FUEl.files[0].name;
+					if (!genericUtils.isASCII(sUploadedFileName)) {
+						sUploadedFileName = encodeURIComponent(sUploadedFileName);
+					}
+					var fileName = "filename=" + sUploadedFileName;
 					headerParameterContentDispositionToken.setName("Content-Disposition");
 					headerParameterContentDispositionToken.setValue(fileName);
 					oFileUploader.addHeaderParameter(headerParameterContentDispositionToken);
@@ -1987,11 +2020,15 @@ sap.ui.define(["sap/ui/base/Object",
 					oPrivModel.setProperty("/generic/controlProperties/" + "fileUploader/" + sEntitySet, oFileUploaderSettings);
 				}
 
-				oFileUploaderSettings.fileName = oEvent.mParameters.fileName;
+				// URLEncoded filenames are decoded by Chrome, Firefox browsers but Safari doesn't do this automatically. 
+				// Therefore, FE decodes it on our side & ensure actual file name is used for further processing. 
+				oFileUploaderSettings.fileName = decodeURIComponent(oEvent.mParameters.fileName);
 				var fileType = oEvent.mParameters.requestHeaders.find(function(requestHeader) {
 					if (requestHeader.name === "Content-Type") {
 						return requestHeader;
 					}
+
+					return undefined;
 				});
 				oFileUploaderSettings.fileType = fileType.value;
 				var bIcon = IconPool.getIconForMimeType(fileType.value);
@@ -2696,6 +2733,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");
@@ -2704,6 +2770,7 @@ sap.ui.define(["sap/ui/base/Object",
 		var fnGetSelectedItemContextForDeleteMessage = testableHelper.testable(fnGetSelectedItemContextForDeleteMessage, "fnGetSelectedItemContextForDeleteMessage");
 		var getDataForDeleteDialog = testableHelper.testable(getDataForDeleteDialog, "getDataForDeleteDialog");
 		var fnNavigateIntentSmartLink = testableHelper.testable(fnNavigateIntentSmartLink, "CommonEventHandlers_fnNavigateIntentSmartLink");
+		var getPaginatorInfo = testableHelper.testable(getPaginatorInfo, "getPaginatorInfo");
 		/* eslint-enable */
 
 		return {
@@ -2747,7 +2814,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

@@ -1064,17 +1064,15 @@ sap.ui.define(["sap/ui/base/Object",
         function fnIsStateHandlingSuspended() {
 			return oComponentRegistryEntry.oTemplateContract.bStateHandlingSuspended;
         }
-
-		function fnAdjustCopyButtonSettings(oTableSettings) {
-			if (oTableSettings.copy === undefined) {	// means it's not defined in the manifest
-				oTableSettings.copy = oTableSettings.type !== "ResponsiveTable" || oTableSettings.mode !== "None";
-			}
-		}
 		
 		function fnGetUI5VersionInfo() {
 			var oTemplatePrivateGlobalModel = getTemplatePrivateGlobalModel();
 			return oTemplatePrivateGlobalModel.getProperty("/generic/ui5VersionInfo");
 		}
+
+		function fnOpenContextInNewTab (oNavigationContext) {
+			oComponentRegistryEntry.oTemplateContract.oNavigationControllerProxy.openContextInNewTab(oTreeNode, oNavigationContext);
+		}
 		
 		return {
 			getBusyHelper: function() {
@@ -1155,8 +1153,8 @@ sap.ui.define(["sap/ui/base/Object",
 			getToolbarDataFieldForActionCommandDetails: oCommandComponentUtils.getToolbarDataFieldForActionCommandDetails,
 			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);
 		}
 
 		/**
@@ -366,23 +327,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);
-			});	
+			});
 		}
 
 		/**
@@ -393,7 +348,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 {sap.suite.ui.generic.template.lib.ContextMenuHandler.FocusInfo} oFocusInfo 
 		 * @returns {Promise<Function|undefined>} Promise which resolves the handler method
@@ -405,7 +360,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

@@ -705,7 +705,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/ShareUtils.js

@@ -15,7 +15,7 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 		return UShellContainer ? new Promise(function(fnResolve){
 			UShellContainer.getFLPUrlAsync(true).done(function (sFLPUrl){
 				fnResolve(sFLPUrl);
-			}); 
+			});
 		}) : Promise.resolve(document.URL);
 	}
 
@@ -84,18 +84,18 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 		}
 
 		oCommonUtils.getDialogFragmentAsync("sap.suite.ui.generic.template.fragments.ShareSheet", oFragmentController, "share", ShareUtils.setStaticShareData, true).then(function (oFragment) {
-			oShareActionSheet = oFragment; 
+			oShareActionSheet = oFragment;
 			var oShareModel = oShareActionSheet.getModel("share");
 			oFragmentController.getModelData().then(function (oFragmentModelData) {
 				oShareModel.setData(oFragmentModelData, true);
-					ServiceContainer.getServiceAsync().then(function (oTeamsHelper) {
-					this.addMenuItem(oShareModel, oTeamsHelper, oShareActionSheet, oControlToOpenBy);
+				ServiceContainer.getCollaborationServices().then(function (mResults) {
+					this.addMenuItem(oShareModel, mResults.oTeamsHelperService, oShareActionSheet, oControlToOpenBy, mResults.oCMHelperService);
 					}.bind(this));
 			}.bind(this));
 		}.bind(this));
 	};
 
-	ShareUtils.addMenuItem = function (oShareModel, oTeamsHelper, oShareActionSheet, oControlToOpenBy) {
+	ShareUtils.addMenuItem = function (oShareModel, oTeamsHelper, oShareActionSheet, oControlToOpenBy, oCollaborationManager) {
 		var iIndexForCollaborationOptions = 2;
 			if (!oShareModel.getProperty("/jamVisible")) {
 				iIndexForCollaborationOptions = 1;
@@ -142,6 +142,17 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 				iIndexForCollaborationOptions++;
 			}.bind(this));
 		}
+		var oCMOptions = oCollaborationManager.getOptions();
+		if (oCMOptions) {
+			var oItem = new MenuItem({
+				text: oCMOptions.text,
+				icon: oCMOptions.icon,
+				press: this.CollaborationButtonPress.bind(this, oCMOptions.press, oShareModel)
+			});
+			FESRHelper.setSemanticStepname(oItem, "press", oCMOptions.fesrStepName);
+			oShareActionSheet.insertItem(oItem, iIndexForCollaborationOptions);
+			iIndexForCollaborationOptions++;
+		}
 		oBookmarkButton = new AddBookmarkButton();
 		oBookmarkButton.setCustomUrl(oShareModel.getProperty("/customUrl"));
 		oBookmarkButton.setServiceUrl(oShareModel.getProperty("/serviceUrl"));
@@ -161,6 +172,14 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 		oShareActionSheet.openBy(oControlToOpenBy);
 	};
 
+	ShareUtils.CollaborationButtonPress = function (fnCallBackHandler, oShareModel) {
+		var sCurrentURLPromise = getCurrentUrl();
+		sCurrentURLPromise.then(function (sCurrentURL) {
+			var sAppTitle = oShareModel && oShareModel.getProperty("/title");
+			fnCallBackHandler(sAppTitle, sCurrentURL);
+		});
+	};
+
 	/**
 	 * Press handler for the Collaboration Helper Option.
 	 * This method create Payload that need to pass for invoking Collaboration

package/src/sap/suite/ui/generic/template/lib/insights/InsightsCardHelper.js

@@ -819,12 +819,11 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 						if (bIsPropertySemanticKey) {
 							oColumnObject.identifier = bIsPropertySemanticKey;
 						}
-						if (bIsCriticality) {
-							oColumnObject.state = fnBuildExpressionForCriticalityColor(oCriticalityAnnotation);
-							oColumnObject.showStateIcon = oCriticalityAnnotation.CriticalityRepresentation ? (oCriticalityAnnotation.CriticalityRepresentation.EnumMember !== "com.sap.vocabularies.UI.v1.CriticalityRepresentationType/WithoutIcon") : true;
-						}
 					}
-
+					if (bIsCriticality) {
+						oColumnObject.state = fnBuildExpressionForCriticalityColor(oCriticalityAnnotation);
+						oColumnObject.showStateIcon = oCriticalityAnnotation.CriticalityRepresentation ? (oCriticalityAnnotation.CriticalityRepresentation.EnumMember !== "com.sap.vocabularies.UI.v1.CriticalityRepresentationType/WithoutIcon") : true;
+					}
 					if (oProperty['com.sap.vocabularies.Common.v1.Label'] && oProperty['com.sap.vocabularies.Common.v1.Label'].String) {
 						var sLabel = oProperty['com.sap.vocabularies.Common.v1.Label'].String,
 						oRB = oCardDefinition['component'].getModel('i18n').getResourceBundle();

package/src/sap/suite/ui/generic/template/lib/insights/InsightsFECardProvider.js

@@ -13,6 +13,30 @@ sap.ui.define([
         var aShareCards = [] , sAppComponentId, oInsightsCardProvider,
             mCardProviders = {};
         
+        function fnOnConsumerConnectedHandler() {
+            const iViewLevel = oTemplateContract.oTemplatePrivateGlobalModel.getProperty("/generic/routeLevel");
+            // DT Card is available only in Main Object page hence level = 1
+            if (iViewLevel === 1) {
+
+                const oCurrentRoutingTree = Object.values(oTemplateContract.mRoutingTree).find(oTreeNode => oTreeNode.level === 1);
+                const oController = oTemplateContract.componentRegistry[oCurrentRoutingTree.componentId]?.oController;
+                if (!oController) {
+                    return;
+                }
+                const aExistingShareCards = oTemplateContract.oTemplatePrivateGlobalModel.getProperty("/generic/insights/shareCards/" + oCurrentRoutingTree.level);
+                const oInsightsHandler = mCardProviders[oController.getView().getId()];
+                let oGetCardsPromise = Promise.resolve(aExistingShareCards);
+                // Fetch the manifest only if:
+                // 1. It is the main object page to avoid errors when called from the list report.
+                // 2. There are no existing entries in the model for the specific view level, indicating it is the first time.
+                if (aExistingShareCards === undefined) {
+                    oGetCardsPromise = oInsightsHandler.getCardsToShare("DT_CARD");
+                }
+                oGetCardsPromise.then(function (aShareCards) {
+                    oInsightsCardProvider.onViewUpdate(true, aShareCards);
+                });
+            }
+        }
         /**
          * This method creates an instance of the insights card provider and it already takes care of registering this app to the "sap-insights" channel as a card provider.
          */
@@ -20,6 +44,12 @@ sap.ui.define([
             sAppComponentId = oTemplateContract.oAppComponent.getId();
             oInsightsCardProvider = new CardProvider(sAppComponentId, aShareCards);
             oInsightsCardProvider.onCardRequested = onCardDetailsRequested;
+            const fnOriginalOnConsumerConnectedHandler = oInsightsCardProvider.onConsumerConnected;
+            oInsightsCardProvider.onConsumerConnected = function(sConsumerId) {
+                fnOnConsumerConnectedHandler();
+                fnOriginalOnConsumerConnectedHandler.call(oInsightsCardProvider, sConsumerId);
+            };
+
         }
         /**
          * Each component can individually register as a card provider within the application (ex : List Report acts as a individual provider).