@sapui5/sap.suite.ui.generic.template 1.131.1 → 1.133.0

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

@@ -15,9 +15,29 @@ sap.ui.define(["sap/ui/base/Object",
 	"sap/ui/core/IconPool",
 	"sap/ui/export/util/Filter",
 	"sap/ui/model/odata/ODataUtils",
-	"sap/ui/comp/util/TableUtil"
-], function(BaseObject, ControllerExtension, MessageBox, SelectionVariant, controlHelper, metadataAnalyser,
-			testableHelper, FeLogger, odata4analytics, extend, deepExtend, FeError, ControlStateWrapperFactory, oDataModelHelper, IconPool, ExportFilter, ODataUtils, TableUtil) {
+	"sap/ui/comp/util/TableUtil",
+	"sap/ui/core/Element"
+], function (
+	BaseObject,
+	ControllerExtension,
+	MessageBox,
+	SelectionVariant,
+	controlHelper,
+	metadataAnalyser,
+	testableHelper,
+	FeLogger,
+	odata4analytics,
+	extend,
+	deepExtend,
+	FeError,
+	ControlStateWrapperFactory,
+	oDataModelHelper,
+	IconPool,
+	ExportFilter,
+	ODataUtils,
+	TableUtil,
+	Element
+) {
 	"use strict";
 	var	sClassName = "lib.CommonUtils";
 
@@ -243,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;
 		}
 
@@ -291,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
 			*
@@ -348,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,
@@ -548,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
@@ -583,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;
@@ -601,7 +621,7 @@ sap.ui.define(["sap/ui/base/Object",
 				}
 			}
 			return bEnabled;
-			
+
 		}
 
 		function fnUpdateBreakoutEnablement(mBreakOutActionEnabled, mBreakoutActions, aContexts, oModel, sSelectedTabKey, oControl) {
@@ -764,11 +784,16 @@ sap.ui.define(["sap/ui/base/Object",
 
 				setComponentRefreshBehaviour(oOutbound);
 
-				oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(),
-						null, fnHandleError);
-				//null object has to be passed to the NavigationHandler as an
-				//indicator that the state should not be overwritten
-				//if draft enabled then passing NavigateExternal else on back button passing LeavePage
+				// We now  ensure that the 'sap-ushell-navmode' parameter is passed to the NavigationHandler.navigate method
+				// and skip setting the app to busy mode when opening a new tab
+				if (oOutbound.parameters["sap-ushell-navmode"] === "explace") {
+					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, null, null, oOutbound.parameters["sap-ushell-navmode"]);
+				} else {
+					oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, fnHandleError);
+					//null object has to be passed to the NavigationHandler as an
+					//indicator that the state should not be overwritten
+					//if draft enabled then passing NavigateExternal else on back button passing LeavePage
+				}
 			}, Function.prototype, "LeaveApp");
 		}
 
@@ -828,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++) {
@@ -904,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
@@ -913,12 +938,12 @@ sap.ui.define(["sap/ui/base/Object",
 		 */
 		function fnGetSemanticObjectLinkInfo (oEvent) {
 			var sSmartLinkId = oEvent.getParameter("originalId"),
-				oSmartLink = sap.ui.getCore().byId(sSmartLinkId),
+				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;
@@ -1001,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);
 		}
@@ -1025,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();
@@ -1087,7 +1112,7 @@ sap.ui.define(["sap/ui/base/Object",
 				fnHandleMandatoryField("HasActiveEntity");
 			}
 		}
-		
+
 		function isMultiViewMultiEntity() {
 			return !!(oComponentUtils && oComponentUtils.getSettings() && oComponentUtils.getSettings().quickVariantSelectionX);
 		}
@@ -1345,7 +1370,7 @@ sap.ui.define(["sap/ui/base/Object",
 		 */
 		function fnGetSmartTableDefaultVariant(oSmartTable) {
 				var tableVariantId = oSmartTable.getId() + "-variant";
-				var oVM = sap.ui.getCore().byId(tableVariantId);
+				var oVM = Element.getElementById(tableVariantId);
 				var sVariantKey = oVM.getDefaultVariantKey();
 				return sVariantKey === oVM.STANDARDVARIANTKEY ? "" : sVariantKey;
 		}
@@ -1353,7 +1378,7 @@ sap.ui.define(["sap/ui/base/Object",
 		// Return the default variant id for SmartChart
 		function fnGetSmartChartDefaultVariant(oSmartChart) {
 			var chartVariantId = oSmartChart.getId() + "-variant";
-			var oVM = sap.ui.getCore().byId(chartVariantId);
+			var oVM = Element.getElementById(chartVariantId);
 			var sVariantKey = oVM.getDefaultVariantKey();
 			return sVariantKey === oVM.STANDARDVARIANTKEY ? "" : sVariantKey;
 		}
@@ -1412,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] =
@@ -1433,7 +1458,7 @@ sap.ui.define(["sap/ui/base/Object",
 						});
 					});
 				});
-				
+
 			}
 		}
 
@@ -1603,14 +1628,14 @@ sap.ui.define(["sap/ui/base/Object",
 			var oEventSource = oEvent.getSource();
 			return controlHelper.isButton(oEventSource) ?
 				oEventSource.data() :
-				sap.ui.getCore().byId(oController.createId(getElementCustomData(oEventSource)["ActionId"])).data();
+				Element.getElementById(oController.createId(getElementCustomData(oEventSource)["ActionId"])).data();
 		}
 
 		/**
-		 * 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) {
@@ -1625,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){
@@ -1639,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(),
@@ -1651,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
 		 */
@@ -1755,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()) {
@@ -1780,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();
 												}
@@ -1981,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

@@ -491,7 +491,7 @@ sap.ui.define([
 				if (oComponentRegistryEntry.routingSpec && oComponentRegistryEntry.routingSpec.noOData){
 					fnPageDataLoadedOnNavigation(null, bAreKeysDifferent);
 				}
-				return;
+				return Promise.resolve();
 			}
 			var oViewReadyPromise = Promise.resolve();
 			if (oComponentRegistryEntry.oController) {
@@ -511,10 +511,10 @@ sap.ui.define([
 			}
 			var oComponentContainer = oComponent.getComponentContainer();
 			if (!oComponentContainer){
-				return;
+				return Promise.resolve();
 			}
 
-			oViewReadyPromise.then(function() {
+			return oViewReadyPromise.then(function() {
 				var oUIModel = oComponent.getModel("ui");
 				var bIsNonDraftCreate = !!oComponentRegistryEntry.nonDraftCreateContext;
 				if (bIsNonDraftCreate) {

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

@@ -126,13 +126,17 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 					var oTreeNode = oTemplateContract.mEntityTree[sEntitySet];
 					if (oTreeNode && !oTreeNode.noOData){
 						if (aKeysFromIdentity){
+							// Get the root context's info for the current draft context
+							oRootContextInfo = getRootContextInfo(oTreeNode, aKeysFromIdentity);
+							// If the current context is a draft, register context info for the active sibling as well
 							if (oContextInfo.bIsDraft){
 								var aActiveKeys = [];
 								var oActiveFoundPromise = oTemplateContract.oApplicationProxy.fillSiblingKeyPromise(oTreeNode, aKeysFromIdentity, aActiveKeys);
 								oActiveFoundPromise.then(function(oReplaceNode){
 									var sReplacePath = oReplaceNode.getPath(3, aActiveKeys);
-									if (!mPath2ContextData[sReplacePath]){
-										mPath2ContextData[sReplacePath] = {
+									var oActiveContextData = mPath2ContextData[sReplacePath];
+									if (!oActiveContextData){
+										oActiveContextData = {
 											oContextInfo: {
 												bIsDraft: false,
 												bIsDraftSupported: true,
@@ -142,30 +146,18 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 											},
 											aKeysFromIdentity: aActiveKeys
 										};
+										// Finally add the active context data to the cache
+										mPath2ContextData[sReplacePath] = oActiveContextData;
+									}
+
+									// Fill rootContextInfo for the active context's data
+									if (!oActiveContextData.oRootContextInfo) {
+										oActiveContextData.oRootContextInfo = getRootContextInfo(oReplaceNode, aActiveKeys);
+										// Add the active context's data to root context info's children
+										oActiveContextData.oRootContextInfo.childContexts[sReplacePath] = oActiveContextData;
 									}
 								});	
 							}
-							if (oTreeNode && !oTreeNode.noOData){
-								var oMainObjectNode = oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
-								var oActiveDraftInfoForDraftRoot = mActiveDraftRoots[oMainObjectNode.entitySet];
-								if (!oActiveDraftInfoForDraftRoot){
-									oActiveDraftInfoForDraftRoot = {
-										treeNode: oMainObjectNode,
-										draftRoots: Object.create(null)
-									};
-									mActiveDraftRoots[oMainObjectNode.entitySet] = oActiveDraftInfoForDraftRoot;
-								}
-								var sRootKey = aKeysFromIdentity[1];
-								oRootContextInfo = oActiveDraftInfoForDraftRoot[sRootKey];
-								if (!oRootContextInfo){
-									oRootContextInfo = {
-										treeNode: oMainObjectNode,
-										key: sRootKey,
-										childContexts: Object.create(null)
-									};
-									oActiveDraftInfoForDraftRoot[sRootKey] = oRootContextInfo;
-								}
-							}
 						}
 						var oModel = oContext.getModel();
 						var oMetaModel = oModel.getMetaModel();
@@ -201,6 +193,30 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 				return oContextInfo;
 			}
 
+			// Gets the root context's info for the given tree node
+			function getRootContextInfo(oTreeNode, aKeysFromIdentity) {
+				var oMainObjectNode = oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
+				var oActiveDraftInfoForDraftRoot = mActiveDraftRoots[oMainObjectNode.entitySet];
+				if (!oActiveDraftInfoForDraftRoot){
+					oActiveDraftInfoForDraftRoot = {
+						treeNode: oMainObjectNode,
+						draftRoots: Object.create(null)
+					};
+					mActiveDraftRoots[oMainObjectNode.entitySet] = oActiveDraftInfoForDraftRoot;
+				}
+				var sRootKey = aKeysFromIdentity[1];
+				var oRootContextInfo = oActiveDraftInfoForDraftRoot[sRootKey];
+				if (!oRootContextInfo){
+					oRootContextInfo = {
+						treeNode: oMainObjectNode,
+						key: sRootKey,
+						childContexts: Object.create(null)
+					};
+					oActiveDraftInfoForDraftRoot[sRootKey] = oRootContextInfo;
+				}
+				return oRootContextInfo;
+			}
+
 			function getPathOfLastShownDraftRoot() {
 				for (var i = aPathOfLastShownDraftRoots.length - 1; i >= 0; i--) {
 					var oContext = mPath2ContextData[aPathOfLastShownDraftRoots[i]].oContext;

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

@@ -1,5 +1,12 @@
-sap.ui.define(["sap/ui/base/Object", "sap/f/FlexibleColumnLayoutSemanticHelper", "sap/f/library", "sap/base/util/extend", "sap/suite/ui/generic/template/genericUtilities/controlHelper"],
-	function(BaseObject, FlexibleColumnLayoutSemanticHelper, fioriLibrary, extend, controlHelper) {
+sap.ui.define([
+	"sap/ui/base/Object",
+	"sap/f/FlexibleColumnLayoutSemanticHelper",
+	"sap/f/library",
+	"sap/base/util/extend",
+	"sap/suite/ui/generic/template/genericUtilities/controlHelper",
+	"sap/suite/ui/generic/template/lib/FlexibleColumnLayoutHelper"
+],
+	function(BaseObject, FlexibleColumnLayoutSemanticHelper, fioriLibrary, extend, controlHelper, FlexibleColumnLayoutHelper) {
 		"use strict";
 
 		// shortcut for sap.f.LayoutType
@@ -8,7 +15,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/f/FlexibleColumnLayoutSemanticHelper",
 		var iDefaultColumn = 2;
 
 		var aColumnNames = ["begin", "mid", "end"];
-		
+
 		var aActionButtons = ["fullScreen", "exitFullScreen", "closeColumn"];
 
 		var aMessagePageTargets = ["messagePageBeginColumn", "messagePageMidColumn", "messagePageEndColumn"];
@@ -62,7 +69,8 @@ sap.ui.define(["sap/ui/base/Object", "sap/f/FlexibleColumnLayoutSemanticHelper",
 			var oFCLSettings  = oTemplateContract.oAppComponent.getFlexibleColumnLayout();
 			var oFlexibleColumnLayoutSemanticHelper = FlexibleColumnLayoutSemanticHelper.getInstanceFor(oFlexibleColumnLayout, oFCLSettings);
 
-			oTemplateContract.setColumnDistributionModel();
+			var oFlexibleColumnLayoutHelper = new FlexibleColumnLayoutHelper(oTemplateContract);
+			oFlexibleColumnLayoutHelper.setColumnDistributionModel();
 
 			var oUiState;
 			var sCurrentLayout;
@@ -322,7 +330,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/f/FlexibleColumnLayoutSemanticHelper",
 						sCurrentLayout = oCurrentIdentity.treeNode.fCLLevel === 0 ? aDefaultLayouts[0] : LayoutType.EndColumnFullScreen;
 					}
 
-					sCurrentLayout = await oTemplateContract.getStoredLayout(sCurrentLayout);
+					sCurrentLayout = await oFlexibleColumnLayoutHelper.getStoredLayout(sCurrentLayout);
 
 					oFlexibleColumnLayout.setLayout(sCurrentLayout);
 					oFlexibleColumnLayout.setAutoFocus(false);

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

@@ -0,0 +1,168 @@
+sap.ui.define([
+  "sap/ui/base/Object",
+  "sap/base/util/extend",
+  "sap/f/FlexibleColumnLayout",
+  "sap/f/FlexibleColumnLayoutData",
+  "sap/f/FlexibleColumnLayoutDataForDesktop",
+  "sap/f/FlexibleColumnLayoutDataForTablet"
+], function (
+  BaseObject,
+  extend,
+  FlexibleColumnLayout,
+  FlexibleColumnLayoutData,
+  FlexibleColumnLayoutDataForDesktop,
+  FlexibleColumnLayoutDataForTablet
+) {
+  "use strict";
+
+  var appComponent;
+  var shellPersonalizationService;
+
+  function getMethods({ oAppComponent, oShellPersonalizationService }) {
+
+    appComponent = oAppComponent;
+    shellPersonalizationService = oShellPersonalizationService;
+
+    /**
+     * Retieves the FCL state from the personalization service.
+     * @returns The FCL state
+     */
+    async function getFCLPersonalizationData() {
+      var oEmptyFCLState = {
+        defaultLayouts: {},
+        columnsDistribution: {
+          desktop: {},
+          tablet: {}
+        }
+      };
+      return ((await shellPersonalizationService.getApplicationPersonalizationData("FCL-Personalization")) ?? oEmptyFCLState);
+    }
+
+    /**
+     * Sets the FCL state in the personalization service.
+     * @param fclState The FCL state
+     */
+    function setFCLPersonalizationData(fclState) {
+      shellPersonalizationService.setApplicationPersonalizationData("FCL-Personalization", fclState);
+    }
+
+    /**
+     * Requests the FCL state from the personalization service and sets the model accordingly.
+     */
+    async function setColumnDistributionModel() {
+      if (!shellPersonalizationService.hasInitialized()) {
+        return;
+      }
+      var oColumnsDistribution = (await getFCLPersonalizationData()).columnsDistribution;
+      if (oColumnsDistribution) {
+        var oTemplatePrivateGlobalModel = appComponent.getModel("_templPrivGlobal");
+        oTemplatePrivateGlobalModel.setProperty("/generic/FCL/FCLColumnsDistribution", oColumnsDistribution);
+      }
+    }
+
+    /**
+     * Gets the number of columns displayed in the FCL based on the layout.
+     * @param {LayoutTypeType} layout  The layout
+     * @returns {1 | 2 | 3 | null} The number of columns displayed
+     */
+    function getNumberOfColumnsFromLayout(layout) {
+      var iColumnsDisplayed = /^(One|Two|Three)Column/.exec(layout)?.[1];
+      switch (iColumnsDisplayed) {
+        case "One":
+          return 1;
+        case "Two":
+          return 2;
+        case "Three":
+          return 3;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Gets the layout stored in the personalization service based on the proposed layout.
+     * @param {LayoutTypeType | undefined } proposedLayout
+     * @returns The FCL layout stored in the personalization service
+     */
+    async function getStoredLayout(oProposedLayout) {
+      if (shellPersonalizationService.hasInitialized()) {
+        var iColumnsDisplayed = getNumberOfColumnsFromLayout(oProposedLayout);
+        if (iColumnsDisplayed) {
+          var defaultLayouts = (await getFCLPersonalizationData()).defaultLayouts;
+          return defaultLayouts?.[iColumnsDisplayed] ?? oProposedLayout;
+        }
+      }
+      return oProposedLayout;
+    }
+
+    /**
+     * Is called when the user changes the FCL columns distribution.
+     * Updates the FCL state in the personalization service.
+     * @param {Event<{ media: "tablet" | "desktop"; layout: LayoutTypeType; columnsSizes: string }>} event
+     */
+    async function onColumnsDistributionChange(event) {
+      if (!shellPersonalizationService.hasInitialized()) {
+        return;
+      }
+
+      var { media, layout, columnsSizes } = event.getParameters();
+
+      var oTemplatePrivateGlobalModel = appComponent.getModel("_templPrivGlobal");
+      oTemplatePrivateGlobalModel.setProperty(`/generic/FCL/FCLColumnsDistribution/${media}/${layout}`, columnsSizes);
+
+      var oFclState = await getFCLPersonalizationData();
+      var iColumnsDisplayed = getNumberOfColumnsFromLayout(layout);
+      if (iColumnsDisplayed) {
+        oFclState.defaultLayouts[iColumnsDisplayed] = layout;
+        oFclState.columnsDistribution[media][layout] = columnsSizes;
+        setFCLPersonalizationData(oFclState);
+      }
+    }
+
+    function initFlexibleColumnLayout() {
+      var oFCL = new FlexibleColumnLayout();
+
+      var oLayoutData = new FlexibleColumnLayoutData();
+      var oDesktopLayoutData = new FlexibleColumnLayoutDataForDesktop();
+      var oTabletLayoutData = new FlexibleColumnLayoutDataForTablet();
+
+      var sFCLColumnsDistributionPath = "_templPrivGlobal>/generic/FCL/FCLColumnsDistribution";
+      var sDesktopFCLColumnsDistributionPath = `${sFCLColumnsDistributionPath}/desktop`;
+      var sTabletFCLColumnsDistributionPath = `${sFCLColumnsDistributionPath}/tablet`;
+
+      oDesktopLayoutData.bindProperty("twoColumnsBeginExpanded", `${sDesktopFCLColumnsDistributionPath}/TwoColumnsBeginExpanded`);
+      oDesktopLayoutData.bindProperty("twoColumnsMidExpanded", `${sDesktopFCLColumnsDistributionPath}/TwoColumnsMidExpanded`);
+      oDesktopLayoutData.bindProperty("threeColumnsBeginExpandedEndHidden", `${sDesktopFCLColumnsDistributionPath}/ThreeColumnsBeginExpandedEndHidden`);
+      oDesktopLayoutData.bindProperty("threeColumnsEndExpanded", `${sDesktopFCLColumnsDistributionPath}/ThreeColumnsEndExpanded`);
+      oDesktopLayoutData.bindProperty("threeColumnsMidExpanded", `${sDesktopFCLColumnsDistributionPath}/ThreeColumnsMidExpanded`);
+      oDesktopLayoutData.bindProperty("threeColumnsMidExpandedEndHidden", `${sDesktopFCLColumnsDistributionPath}/ThreeColumnsMidExpandedEndHidden`);
+
+      oTabletLayoutData.bindProperty("twoColumnsBeginExpanded", `${sTabletFCLColumnsDistributionPath}/TwoColumnsBeginExpanded`);
+      oTabletLayoutData.bindProperty("twoColumnsMidExpanded", `${sTabletFCLColumnsDistributionPath}/TwoColumnsMidExpanded`);
+      oTabletLayoutData.bindProperty("threeColumnsBeginExpandedEndHidden", `${sTabletFCLColumnsDistributionPath}/ThreeColumnsBeginExpandedEndHidden`);
+      oTabletLayoutData.bindProperty("threeColumnsEndExpanded", `${sTabletFCLColumnsDistributionPath}/ThreeColumnsEndExpanded`);
+      oTabletLayoutData.bindProperty("threeColumnsMidExpanded", `${sTabletFCLColumnsDistributionPath}/ThreeColumnsMidExpanded`);
+      oTabletLayoutData.bindProperty("threeColumnsMidExpandedEndHidden", `${sTabletFCLColumnsDistributionPath}/ThreeColumnsMidExpandedEndHidden`);
+
+      oLayoutData.setDesktopLayoutData(oDesktopLayoutData);
+      oLayoutData.setTabletLayoutData(oTabletLayoutData);
+      oFCL.setAggregation("layoutData", oLayoutData);
+
+      oFCL.attachColumnsDistributionChange(onColumnsDistributionChange);
+
+      return oFCL;
+    }
+
+    return {
+      initFlexibleColumnLayout: initFlexibleColumnLayout,
+      getStoredLayout: getStoredLayout,
+      setColumnDistributionModel: setColumnDistributionModel
+    };
+  }
+
+  return BaseObject.extend("sap.suite.ui.generic.template.lib.FlexibleColumnLayoutHelper", {
+    constructor: function (oTemplateContract) {
+      extend(this, getMethods(oTemplateContract));
+    }
+  });
+});

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;