@sapui5/sap.suite.ui.generic.template 1.132.0 → 1.134.1

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

@@ -263,7 +263,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var iEntitySetName = sSmartControlId.indexOf("::" + oComponent.getEntitySet() + "--") + 2; //Ensure only Entity set is picked up for processing
 			var sI18nKey = sSmartControlId.substring(iEntitySetName, sSmartControlId.lastIndexOf("::")),
 				sI18nKey = sI18nKey.replace(/--/g, "|").replace(/::/g, "|"); //sId = "STTA_C_MP_Product|to_ProductText|com.sap.vocabularies.UI.v1.LineItem"
-			
+
 			return sI18nKey;
 		}
 
@@ -311,9 +311,9 @@ sap.ui.define(["sap/ui/base/Object",
 
 		/*
 			* Sets the enabled value for Toolbar buttons
-			* 
-			* Currently, the property applicablePath (resp. sap:applicable-path) is only evaluated for buttons in header and 
-			* footer (influencing the visibility) and for toolbar buttons which require a context (influencing the enablement). 
+			*
+			* Currently, the property applicablePath (resp. sap:applicable-path) is only evaluated for buttons in header and
+			* footer (influencing the visibility) and for toolbar buttons which require a context (influencing the enablement).
 			* For static toolbar buttons (i.e. toolbar buttons that do not require a selection) the property is ignored.
 			* TO DO : make sure the properties applicablePath/sap:applicable-path influence the visibility of static toolbar buttons as well
 			*
@@ -368,11 +368,11 @@ sap.ui.define(["sap/ui/base/Object",
 				oComponentUtils.getTemplatePrivateModel().setProperty("/listReport/multiEditEnabled", aContexts.filter(fnIsContextEditable).length > 0);
 			}
 			if (oEnabledPromise){
-				// check if "enabled" is bound to the path '/generic/controlProperties/' in the model - otherwise it's bound to another path or has a hard coded true/false				
+				// check if "enabled" is bound to the path '/generic/controlProperties/' in the model - otherwise it's bound to another path or has a hard coded true/false
 				if (oEnabledPromise && !/generic\/controlProperties/.test(oButton.getBindingPath("enabled"))) {
 					oEnabledPromise = null;
 					bEnabled = oButton.getEnabled();
-				}								
+				}
 			}
 			return {
 				enabledPromise: oEnabledPromise,
@@ -568,21 +568,21 @@ sap.ui.define(["sap/ui/base/Object",
 			// This method is invoked twice in ALP. Once for smart table and once again for smart chart.
 			// In the first iteration (smart table actions), the calculated enablement value is stored on "mBreakoutActionEnabled".
 			// In the second iteration (smart chart actions), the enablement should be calculated only for the chart actions (oBreakoutAction.filter = "chart").
-			// As the previously calculated value for the table actions should be retained, the value stored on "mBreakoutActionEnabled" is used as the default value. 
+			// As the previously calculated value for the table actions should be retained, the value stored on "mBreakoutActionEnabled" is used as the default value.
 			var bDefaultValue = !bIsAnalyticalListPage || !!mBreakOutActionEnabled[sControlId].enabled;
 			var bEnabled = fnIsBreakoutActionEnabled(oBreakoutAction, aContexts, oModel, oControl, bDefaultValue, bIsAnalyticalListPage);
-			
+
 			mBreakOutActionEnabled[sControlId] = {
 					enabled: bEnabled
-			};			
+			};
 		}
-		
+
 		/**
 		 * This method analyzes the applicable contexts and tells whether the breakout action should be enabled.
-		 * 
-		 * If the context based analysis is not required (i.e the action doesn't require selection), 
+		 *
+		 * If the context based analysis is not required (i.e the action doesn't require selection),
 		 * it will simply return the default value <code>bDefaultValue</code>.
-		 * 
+		 *
 		 * @param {object} oBreakoutAction Manifest information about the breakout action
 		 * @param {Array<sap.ui.model.Context>} aContexts Applicable contexts
 		 * @param {sap.ui.model.Model} oModel Model of the smart control
@@ -603,14 +603,14 @@ sap.ui.define(["sap/ui/base/Object",
 							// check if applicablePath is true for this context
 							var oObject = oModel.getObject(oContext.getPath() + oApplicablePathInfo.navigationPath);
 							return oObject[oApplicablePathInfo.property] === true;
-						});							
+						});
 					} else {
 						bEnabled = bEnabled || (bFilterIsChart ? controlHelper.isSmartChart(oControl) : controlHelper.isSmartTable(oControl));
 					}
 				} else if (controlHelper.isSmartChart(oControl)) {
 					//table button chart ondata received
 					// For LR/OP, directly evaluate the drill stack filters and enable the action accordingly.
-					// For ALP, evaluate the drill stack filters only when oBreakoutAction.filter is "chart" and skip the evaluation for table based actions. 
+					// For ALP, evaluate the drill stack filters only when oBreakoutAction.filter is "chart" and skip the evaluation for table based actions.
 					if (!bIsAnalyticalListPage || bFilterIsChart) {
 						// If enabled Selection is made on the chart but drilldown is performed later.
 						bEnabled = oControl.getDrillStackFilters().length > 0;
@@ -621,7 +621,7 @@ sap.ui.define(["sap/ui/base/Object",
 				}
 			}
 			return bEnabled;
-			
+
 		}
 
 		function fnUpdateBreakoutEnablement(mBreakOutActionEnabled, mBreakoutActions, aContexts, oModel, sSelectedTabKey, oControl) {
@@ -853,13 +853,13 @@ sap.ui.define(["sap/ui/base/Object",
 
 		/**
 		 * Provides the Navigation Context about the smart link clicked by the user
-		 * 
+		 *
 		 * @param {Array} aKeys - Array of Navigation Key Properties Object
 		 * @param {object} oResponse - response of oDataModel's GET request
 		 * @returns {string} route string for Context Navigation
 		 * @private
 		 */
-		
+
 		function fnMergeNavigationKeyPropertiesWithValues(aKeys, oResponse) {
 			var sKeySeparator, sRoute;
 			for (var i = 0, ilength = aKeys.length; i < ilength; i++) {
@@ -929,7 +929,7 @@ sap.ui.define(["sap/ui/base/Object",
 
 		/**
 		 * Provides the information about the smart link clicked by user
-		 * 
+		 *
 		 * @param {*} oEvent beforePopoverOpens event
 		 * @returns {object} oSourceInfo - object contains the smart link info
 		 * oSourceInfo.smartLink - The clicked smart link
@@ -941,9 +941,9 @@ sap.ui.define(["sap/ui/base/Object",
 				oSmartLink = Element.getElementById(sSmartLinkId),
 				oOwnerControl = getOwnerControl(oSmartLink, true),
 				oSourceInfo = Object.create(null);
-			
+
 			oSourceInfo.smartLink = oSmartLink;
-				
+
 			if (controlHelper.isSmartTable(oOwnerControl)) {
 				var oSmartTableHandler = oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oOwnerControl);
 				oSourceInfo.smartTable = oOwnerControl;
@@ -1026,7 +1026,7 @@ sap.ui.define(["sap/ui/base/Object",
 				// call extension
 				oController.adaptNavigationParameterExtension(oSelectionVariant, oObjectInfo);
 				sSelectionVariantPrepared = oSelectionVariant.toJSONString();
-			}			
+			}
 			delete oEventParameters.semanticAttributes;
 			oNavigationHandler.processBeforeSmartLinkPopoverOpens(oEventParameters, sSelectionVariantPrepared);
 		}
@@ -1050,7 +1050,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var sOwnerComponentEntitySet = oController.getOwnerComponent().getEntitySet();
 			if (controlHelper.isSemanticObjectController(oControl) || controlHelper.isSmartTable(oControl)) {
 				sControlEntitySet = oControl.getEntitySet();
-			} else {	
+			} else {
 				// When navigation from table is triggered from an OP Table, oControl is not a smart table but a link or a button in the table.
 				var oOwnerControl = getOwnerControl(oControl);
 				var oParentControl = oOwnerControl && oOwnerControl.getParent();
@@ -1112,7 +1112,7 @@ sap.ui.define(["sap/ui/base/Object",
 				fnHandleMandatoryField("HasActiveEntity");
 			}
 		}
-		
+
 		function isMultiViewMultiEntity() {
 			return !!(oComponentUtils && oComponentUtils.getSettings() && oComponentUtils.getSettings().quickVariantSelectionX);
 		}
@@ -1437,7 +1437,7 @@ sap.ui.define(["sap/ui/base/Object",
 									// add the value to the model
 								var sSemObj = aInternalLinks[j].semanticObject;
 								var sAction = aInternalLinks[j].action;
-	
+
 								var oSemObjProp = oTemplatePrivateModel.getProperty("/generic/supportedIntents/" + sSemObj);									if (!oSemObjProp) {  // no semantic object in the model yet
 									oSupportedIntents[sSemObj] = {};
 									oSupportedIntents[sSemObj][sAction] =
@@ -1458,7 +1458,7 @@ sap.ui.define(["sap/ui/base/Object",
 						});
 					});
 				});
-				
+
 			}
 		}
 
@@ -1632,10 +1632,10 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 
 		/**
-		 * While exporting data from a table, this function removes the technical properties 
-		 * (like "IsActiveEntity", "HasActiveEntity") and adds the actual value of "Editing Status" select box 
-		 * into the exported file. 
-		 * 
+		 * While exporting data from a table, this function removes the technical properties
+		 * (like "IsActiveEntity", "HasActiveEntity") and adds the actual value of "Editing Status" select box
+		 * into the exported file.
+		 *
 		 * @param {sap.ui.export.util.Filter[]} aFilterSettings Filters in the exported file
 		 */
 		function fnTransformTechnicalPropsOnExportedFile (aFilterSettings) {
@@ -1650,7 +1650,7 @@ sap.ui.define(["sap/ui/base/Object",
 			// Find the technical props for the selected draft state value
 			var sDraftStateValue = oEditStateControl.getSelectedKey(),
 				aTechnicalProps = oDraftStateToTechnicalProps[sDraftStateValue];
-			
+
 			aTechnicalProps.forEach(function (oTechnicalProp){
 				// Find the index of filter settings to be removed
 				var iIndexOfFilterSettingsToBeRemoved = aFilterSettings.findIndex(function (oFilterSettings){
@@ -1664,7 +1664,7 @@ sap.ui.define(["sap/ui/base/Object",
 					aFilterSettings.splice(iIndexOfFilterSettingsToBeRemoved, 1);
 				}
 			});
-			
+
 			//Create a new filter with the value retrieved from "editStateFilter" select control
 			var sEditStateLabel = oEditStateControl.getLabels().at(0).getText(),
 				sEditStateValue = oEditStateControl.getSelectedItem().getText(),
@@ -1676,9 +1676,9 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 
 		/**
-		 * This method reads the values of analytical parameters from the smart filter bar 
+		 * This method reads the values of analytical parameters from the smart filter bar
 		 * and adds them to the list of filters in the exported file
-		 * 
+		 *
 		 * @param {sap.ui.comp.smarttable.SmartTable} oSmartTable The smart table which has the data to be exported
 		 * @param {sap.ui.export.util.Filter[]} aFilterSettings Current filters in the exported file
 		 */
@@ -1780,7 +1780,7 @@ sap.ui.define(["sap/ui/base/Object",
 												}, fnReject);
 											});
 										};
-										
+
 										var fnIsFieldModified = function(oSourceControl) {
 											var oInnerControl = oSourceControl.getFirstInnerControl && oSourceControl.getFirstInnerControl();
 											if (oInnerControl.getValue() !== oInnerControl.getLastValue()) {
@@ -1805,7 +1805,7 @@ sap.ui.define(["sap/ui/base/Object",
 													if (!fnIsFieldModified(oSourceControl)) {
 														mAdditionalParameters.callPreparationOnly = true;
 													}
-													fnCallExecuteSideEffect();													
+													fnCallExecuteSideEffect();
 													// Resolve the promise and exit the loop for Inactive transient row
 													return fnResolve();
 												}
@@ -2006,6 +2006,11 @@ sap.ui.define(["sap/ui/base/Object",
 							var bSetToDirty = oResponseContext && (!oResponse.actionContext || sResponseContextPath !== oResponse.actionContext.getPath());
 							if (bSetToDirty) {
 								oServices.oViewDependencyHelper.setMeToDirty(oController.getOwnerComponent(), sEntitySet, false, sResponseContextPath === "/undefined" || aContexts.length > 1);
+								if (oCustomData.ActionType === "determining") {
+									// Determining action detected. This type of action can activate draft.
+									// As activated draft is different object it also necessary to refresh parent page (LR).
+									oServices.oViewDependencyHelper.setParentToDirty(oController.getOwnerComponent(), sEntitySet, 1);
+								}
 							}
 						}
 					});

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

@@ -770,6 +770,11 @@ sap.ui.define([
 			oComponentRegistryEntry.oTemplateContract.oNavigationControllerProxy.navigateFromNodeAccordingToContext(oTreeNode, oNavigationContext, iDisplayMode, bReplace);
 		}
 
+		function getAppTitle(){
+			var oManifest = oComponent.getAppComponent().getManifestEntry("sap.app");
+			return oManifest.title ?? "";
+		}
+
 		function getTitle(){
 			return oTreeNode.headerTitle;
 		}
@@ -1106,7 +1111,11 @@ sap.ui.define([
 		function fnOpenContextInNewTab (oNavigationContext) {
 			oComponentRegistryEntry.oTemplateContract.oNavigationControllerProxy.openContextInNewTab(oTreeNode, oNavigationContext);
 		}
-		
+
+		function fnGetTargetIdentityForContext(oNavigationContext){
+			return oComponentRegistryEntry.oTemplateContract.oNavigationControllerProxy.getTargetIdentityForContext(oTreeNode, oNavigationContext);
+		}
+
 		return {
 			getBusyHelper: function() {
 				return oComponentRegistryEntry.oApplication.getBusyHelper();
@@ -1145,6 +1154,7 @@ sap.ui.define([
 			getCommunicationObject: getCommunicationObject,
 			navigateRoute: fnNavigateRoute,
 			navigateAccordingToContext: fnNavigateAccordingToContext,
+			getAppTitle: getAppTitle,
 			getTitle: getTitle,
 			setText: setText,
 			onBeforeDraftTransfer: onBeforeDraftTransfer,
@@ -1187,7 +1197,8 @@ sap.ui.define([
 			getToolbarDataFieldForIBNCommandDetails: oCommandComponentUtils.getToolbarDataFieldForIBNCommandDetails,
 			isStateHandlingSuspended: fnIsStateHandlingSuspended,
 			getUI5VersionInfo: fnGetUI5VersionInfo,
-			openContextInNewTab: fnOpenContextInNewTab
+			openContextInNewTab: fnOpenContextInNewTab,
+			getTargetIdentityForContext: fnGetTargetIdentityForContext
 		};
 	}
 

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

@@ -871,6 +871,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 				activationStarted: activationStarted,
 				cancellationStarted: cancellationStarted,
 				editingStarted: editingStarted,
+				createDraftSiblingPromise: createDraftSiblingPromise,
 				getDraftSiblingPromise: getDraftSiblingPromise,
 				getSiblingPromise: getSiblingPromise,
 				getAlternativeIdentityPromise: getAlternativeIdentityPromise,

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

@@ -2,11 +2,12 @@ sap.ui.define([
 	"sap/base/util/extend",
 	"sap/base/util/ObjectPath",
 	"sap/m/MessageBox",
+	"sap/suite/ui/commons/collaboration/ServiceContainer",
 	"sap/suite/ui/generic/template/genericUtilities/controlHelper",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
 	"sap/ui/base/Object",
 	"sap/ui/base/Event"
-], function (extend, ObjectPath, MessageBox, controlHelper, FeLogger, BaseObject, Event) {
+], function (extend, ObjectPath, MessageBox, ServiceContainer, controlHelper, FeLogger, BaseObject, Event) {
 	"use strict";
 
 	/* This class provides generic functionality for handling of the context menu for one smart control (oSourceControl).
@@ -17,6 +18,7 @@ sap.ui.define([
 	
 	// Constants
 	var MAX_RECORDS_OPEN_IN_NEW_TAB = 10;
+	var MAX_RECORDS_SHARE_TO_CM = 1;
 	var aToolbarContentsToBeOmitted = ["btnPersonalisation", "btnExcelExport"];
 
 	function getMethods(oController, oTemplateUtils, oState, oSourceControl, oConfiguration) {
@@ -64,6 +66,9 @@ sap.ui.define([
 		// Store the outbound navigation target
 		var sOutboundNavigationTarget = oSourceControl.getTable().getContextMenu().data("CrossNavigation");
 		var oOutbound = sOutboundNavigationTarget && fnGetOutboundInfoFromManifest(sOutboundNavigationTarget);
+		// SAP Collaboration Manager service
+		var oCollaborationManager;
+
 		/**
 		 * The method does the following
 		 *  - Adds an entry (menu item) to the context menu.
@@ -385,6 +390,121 @@ sap.ui.define([
 			}
 		}
 
+		/**
+		 * Initialize the SAP Collaboration Manager service
+		 * 
+		 * @returns {Promise<{sap.suite.ui.commons.collaboration.CollaborationManagerService|undefined}>} Returns the promise that is resolved to the SAP Collaboration Manager service
+		 */
+		function fnInitToCollaborationManager() {
+			var { promise, resolve, reject } = Promise.withResolvers();
+
+			if (!oCollaborationManager) {
+				ServiceContainer.getCollaborationServices().then(function (mResults) {
+					if (mResults && mResults.oCMHelperService) {
+						var oCMOptions = mResults.oCMHelperService.getOptions();
+						if (oCMOptions) {
+							oCollaborationManager = mResults.oCMHelperService;
+							resolve(oCollaborationManager);
+						} else {
+							reject();
+						}
+					} else {
+						reject();
+					}
+				});
+			} else {
+				resolve(oCollaborationManager);
+			}
+
+			return promise;
+		}
+
+		/**
+		 * Returns the promise which resolves the event handler for "Share to SAP Collaboration Manager" entry.
+		 * 
+		 * Negative scenario: It just returns without any value when anyone of the following condition met.
+		 * So that, "Share to SAP Collaboration Manager" option isn't added in context menu:
+		 *   a. SAP Collaboration Manager service is unavailable
+		 *   b. Navigation is not supported by the table
+		 *   c. Table is configured with onListNavigationExtension
+		 *   d. Navigation target is a draft without an active version
+		 *   e. Navigation target is a child of own draft in edit mode
+		 *   f. Navigation target is outbound
+		 *   g. Direct edit flow is enabled
+		 * 
+		 * @param {sap.suite.ui.generic.template.lib.ContextMenuHandler.FocusInfo} oFocusInfo 
+		 * @param {sap.suite.ui.commons.collaboration.CollaborationManagerService} oCMHelperService
+		 * @returns {Promise<Function|undefined>} Promise which resolves the handler method
+		 */
+		function getSharePromiseForCollaborationManager (oFocusInfo, oCMHelperService) {
+			// Enable the context menu entry only if at least one navigable context is available
+			var aNavigableContexts = oFocusInfo.applicableContexts.filter(fnIsContextNavigable);
+			if (!aNavigableContexts.length) {
+				return;
+			}
+
+			var oActiveEntity = aNavigableContexts[0].getObject();
+			var bIsDraftSupported = oComponentUtils.isDraftEnabled();
+			var bIsDraft = bIsDraftSupported && oActiveEntity.IsActiveEntity === false;
+			var bHasActiveEntity = bIsDraft ? oActiveEntity.HasActiveEntity === true : true;
+			var bIsOwnDraftChild = bIsDraft ? oFocusInfo.focussedBindingContext.sPath !== oFocusInfo.focussedBindingContext.sDeepPath : false;
+			var bDirectEdit = oTemplateUtils.oServices.oApplication.getEditFlowOfRoot() === "direct";
+			var bOnListNavigationExtensionFound = oController.hasOwnProperty("onListNavigationExtension");
+
+			if (!oCMHelperService || !bNavigationSupported || bOnListNavigationExtensionFound || !bHasActiveEntity || bIsOwnDraftChild || oOutbound || bDirectEdit) {
+				return;
+			}
+
+			return Promise.resolve(function () {
+				if (aNavigableContexts.length > MAX_RECORDS_SHARE_TO_CM) {
+					var sWarningMessage = oCommonUtils.getText("T_TABLE_SHARE_TO_COLLABORATION_MANAGER_TOO_MANY_ITEMS_SELECTED", [MAX_RECORDS_SHARE_TO_CM]);
+					MessageBox.warning(sWarningMessage);
+					return;
+				}
+				var sAppTitle = oComponentUtils.getAppTitle();
+				if (bIsDraft) {
+					var oBusyHelper = oTemplateUtils.oServices.oApplication.getBusyHelper();
+					if (oBusyHelper.isBusy()) {
+						return; // Ignore user interaction while the app is busy.
+					}
+					var oSiblingContextPromise = oTemplateUtils.oServices.oApplication.createDraftSiblingPromise(oFocusInfo.focussedBindingContext.oModel, oFocusInfo.focussedBindingContext.sPath);
+					var URLParser = new sap.ushell.services.URLParsing();
+					oBusyHelper.setBusy(oSiblingContextPromise.then(function(oSiblingContext) {
+						var sPath = document.URL.split(URLParser.getHash(document.URL))[0] + URLParser.getShellHash(document.URL) + "&" + oSiblingContext.sPath;
+						var sSiblingURL = sPath.replace(/\(/g, '%28').replace(/\)/g, '%29');
+						oCMHelperService.publishData({
+							sAppTitle: sAppTitle,
+							sCurrentURL: sSiblingURL
+						});
+					}));
+				} else {
+					var sTargetURLPromise = oComponentUtils.getTargetIdentityForContext(oFocusInfo.focussedBindingContext);
+					sTargetURLPromise.then(function (sTargetURL) {
+						oCMHelperService.publishData({
+							sAppTitle: sAppTitle,
+							sCurrentURL: sTargetURL
+						});
+					});
+				}
+			});
+		}
+
+		/**
+		 * Adds "Share to SAP Collaboration Manager" entry to context menu
+		 * @param {sap.suite.ui.generic.template.lib.ContextMenuHandler.FocusInfo} oFocusInfo 
+		 * @param {Array<sap.suite.ui.generic.template.lib.ContextMenuHandler.ContextMenuEntry>} aItems 
+		 */
+		function fnAddShareToCollaborationManager(oFocusInfo, aItems) {
+			fnInitToCollaborationManager().then(function (oCMHelperService) {
+				var oSharePromise = getSharePromiseForCollaborationManager(oFocusInfo, oCMHelperService);
+				if (oSharePromise) {
+					fnAddMainMenuItem(aItems, oCommonUtils.getText("ST_SHARE_TO_COLLABORATION_MANAGER"), null, false, oSharePromise);
+				}
+			}).catch(function (oError) {
+				oLogger.error("SAP Collaboration Manager is unavailable" + oError);
+			});
+		}
+
 		/************************************************************
 		 * End of methods related to "Open in new tab" functionality
 		 ************************************************************/
@@ -395,8 +515,10 @@ sap.ui.define([
 			var aRet = [];
 			// Add the toolbar buttons to context menu
 			fnAddToolbarButtonsToContextMenu(oFocusInfo, aRet);
-			//Add an entry for "Open in new tab or window"
+			// Add an entry for "Open in new tab or window"
 			fnAddOpenInNewTabToContextMenu(oFocusInfo, aRet);
+			// Add an entry for "Share to SAP Collaboration Manager"
+			fnAddShareToCollaborationManager(oFocusInfo, aRet);
 			return aRet;
 		}
 

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

@@ -81,6 +81,10 @@ sap.ui.define([
 			var sRet = (bIsPopoverOpen && sMsgId && aControlIds && oCurrentMessageSupportFunctions) ? oCurrentMessageSupportFunctions.getSubtitle(sMsgId, sAdditionalText) : sAdditionalText;		
 			return sRet;
 		}
+
+		function getDescription(sMsgId, aControlIds, sAdditionalText, bIsPopoverOpen){		
+			return (bIsPopoverOpen && sMsgId && aControlIds && oCurrentMessageSupportFunctions) ? oCurrentMessageSupportFunctions.getDescription(sMsgId, sAdditionalText) : sAdditionalText;
+		}
 		
 		// function that determines whether we are currently in the Non-draft create case
 		var getIsNonDraftCreate = (bIsODataBased && !bIsDraftEnabled) ?  oUiModel.getProperty.bind(oUiModel, "/createMode") : function(){ return false; };
@@ -101,8 +105,10 @@ sap.ui.define([
 				ErrorExplanationHelper.generateErrorExplanation(oEvent, oController, oTemplateUtils);
 			},
 			getSubtitle: getSubtitle,
+			getDescription: getDescription,
 			titlePressed: function (oEvent) { // the user wants to navigate from the message to the corresponding control
 				MessageUtils.navigateFromMessageTitleEvent(oTemplateUtils, oEvent, oComponent, bIsDraftEnabled, sCurrentBindingPath);
+				oMessagePopover.close();
 			}
 		}).then(function (oMPopover) {
 			oMessagePopover = oMPopover;

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

@@ -79,7 +79,7 @@ sap.ui.define([
 
 		// This is the public method that can be used to set or remove the message which is currently displayed for a tab or a collection of tabs.
 		// oMessage: The object which represents the message that should currently be displayed. If it is faulty no message should be shown for the specified tabs.
-		//           Otherwise it should be an object containing properties message (text of the message) and type (instance of sap.ui.core.message.MessageType).
+		//           Otherwise it should be an object containing properties message (text of the message) and type (instance of sap/ui/core/message/MessageType).
 		// vTab: Specifies the affected tabs: faulty -> all tabs affected, string -> identifies the affected tab, array -> lists the affected tabs
 		//       If more than one tab is specified in this way these tabs will be considered to belong together for the close feature of the message strip.
 		//       This means, that the message will be removed for all these tabs when the user closes the message strip.

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

@@ -3,6 +3,7 @@ sap.ui.define(["sap/ui/base/Object",
     "sap/base/i18n/Formatting",
     "sap/m/Button",
     "sap/m/Dialog",
+    "sap/m/IllustratedMessageType",
     "sap/m/ProgressIndicator",
     "sap/m/Text",
     "sap/m/library",
@@ -13,7 +14,7 @@ sap.ui.define(["sap/ui/base/Object",
     "sap/ui/model/FilterOperator",
     "sap/ui/model/json/JSONModel",
     "sap/suite/ui/generic/template/genericUtilities/testableHelper"
-], function (BaseObject, extend, Formatting, Button, Dialog, ProgressIndicator, Text, mobileLibrary, DateFormat, coreLibrary, 
+], function (BaseObject, extend, Formatting, Button, Dialog, IllustratedMessageType, ProgressIndicator, Text, mobileLibrary, DateFormat, coreLibrary, 
     Messaging, Filter, FilterOperator, JSONModel, testableHelper) {
 	"use strict";
 
@@ -63,8 +64,6 @@ sap.ui.define(["sap/ui/base/Object",
         var ButtonType = mobileLibrary.ButtonType;
         // Shortcut for sap.m.DialogType
 	    var DialogType = mobileLibrary.DialogType;
-        // Shortcut for sap.m.IllustratedMessageType
-        var IllustratedMessageType = mobileLibrary.IllustratedMessageType;
 	    // Shortcut for sap.ui.core.ValueState
 	    var ValueState = coreLibrary.ValueState;
         //  Shortcut for getting i18n text

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

@@ -209,7 +209,6 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 
 	/**
 	* Configures a side effect for custom field.
-	* @param {Object} oView - The view instance of the object page.
 	* @param {Object} oControl - The control object for the custom field.
 	* @param {String} sProperty - The name of the property associated with the custom field.
 	* @param {String} sEntitySet - The entity set to which the custom field belongs.
@@ -260,12 +259,50 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 		}
 	}
 
+	/**
+	* Configures a side effect for custom column.
+	* @param {Object} oTable - The controller for the custom column.
+	* @param {String} sProperty - The name of the property associated with the custom column.
+	* @param {String} sEntitySet - The entity set to which the custom column belongs.
+	* @param {String} oController - Object page controller.
+	*/
+	function registerCustomColumnForSideEffect(oTable, sProperty, sEntitySet, oController) {
+		var aRows;
+		if (oTable.isA("sap.m.Table")) {
+			aRows = oTable.getAggregation("items");
+		} else if (oTable.isA("sap.ui.table.Table")) {
+			aRows = oTable.getAggregation("rows");
+		}
+		var oMetaModel = oController.getView().getModel().getMetaModel();
+		var oEntitySet = oMetaModel.getODataEntitySet(sEntitySet);
+		var oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
+		var oProperty = oMetaModel.getODataProperty(oEntityType, sProperty);
+		let columnIndex = oTable.getAggregation("columns").findIndex(oCol => {
+			return oCol.data("p13nData").leadingProperty == sProperty;
+
+		});
+		//The method SharedUtil.applyFieldGroupIDs takes in the control and its metadata, reads the Side Effect annotations configured for it 
+		//and assigns the fieldGroupID accordingly.
+		aRows.forEach(oRows => {
+			var aCells = oRows.getCells();
+			SharedUtil.applyFieldGroupIDs(aCells[columnIndex], {
+				entitySet: oEntitySet,
+				entityType: oEntityType,
+				path: sProperty,
+				property: {
+					property: oProperty
+				}
+			});
+		});
+	}
+
 	return {
 		handleSideEffectForField : fnHandleSideEffectForField,
 		assignFieldGroupIds: fnAssignFieldGroupIds,
 		getPropsForLinkFields: fnGetPropsForLinkFields,
 		assignFieldGroupIdsToLinkField: fnAssignFieldGroupIdsToLinkField,
 		registerCustomFieldForSideEffect: registerCustomFieldForSideEffect,
-		fieldGroupChangeRegister: fieldGroupChangeRegister
+		fieldGroupChangeRegister: fieldGroupChangeRegister,
+		registerCustomColumnForSideEffect: registerCustomColumnForSideEffect
 	};
 });

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

@@ -1,4 +1,5 @@
-sap.ui.define(["sap/ui/core/library",
+sap.ui.define([
+	"sap/ui/core/mvc/ViewType",
 	"sap/ui/core/Component",
 	"sap/ui/core/UIComponent",
 	"sap/ui/model/json/JSONModel",
@@ -18,7 +19,7 @@ sap.ui.define(["sap/ui/core/library",
 	"sap/m/IllustratedMessageType",
 	"sap/ui/core/Element"
 ], function (
-	coreLibrary,
+	ViewType,
 	Component,
 	UIComponent,
 	JSONModel,
@@ -41,8 +42,6 @@ sap.ui.define(["sap/ui/core/library",
 		"use strict";
         var	sClassName = "lib.TemplateComponent";
 	    var oLogger = new FeLogger(sClassName).getLogger();
-		// shortcut for sap.ui.core.mvc.ViewType
-		var ViewType = coreLibrary.mvc.ViewType;
 
 		// This method enhances the i18n model which has been attached to the template component via the manifest.
 		// For this purpose the following enhancement chain is built: