@sapui5/sap.suite.ui.generic.template 1.124.0 → 1.125.0

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

@@ -11,6 +11,10 @@ sap.ui.define([
 	var aVisibleItemsData;
 	var iMaxColumns = 3;
 	var objectTitle, objectSubtitle, sAppUrl, sAppTitle;
+	var oSapSemantics = Object.freeze({
+		unitOfMeasure: "unit-of-measure",
+		currencyCode: "currency-code"
+	});
 
 	// function performs multiple level entity relation check to find the color
 	var fnGetColorFromAnnotations = function (sCriticalityPath) {
@@ -88,8 +92,9 @@ sap.ui.define([
 		var iLoop = 0;
 		while (propLen > 0) {
 			var oProperty =  oEntityType.property.find(findFunc.bind(null, aProperties[iLoop]));
-			if (oProperty && oProperty["type"]) {
-				return oProperty["type"];
+			if (oProperty) {
+				var oSemantic = oEntityType.property.find(findFunc.bind(null, oProperty["sap:unit"]));
+				return { sEdmType: oProperty["type"], sSapUnit: oProperty["sap:unit"], sSemantic: oSemantic ? oSemantic["sap:semantics"] : undefined };
 			} else if (propLen > 1) {
 				var oNavigationEntitySet = oMetaModel.getODataAssociationEnd(oEntityType, aProperties[iLoop]);
 				oEntityType = oMetaModel.getODataEntityType(oNavigationEntitySet.type);
@@ -97,9 +102,20 @@ sap.ui.define([
 			}
 			propLen--;
 		}
-		return undefined;
+		return { edmType: undefined, sSemantic: undefined, sSapUnit: undefined };
 	};
 
+	var fnGetVisiblePathForFC = function (oControl) {
+		var visiblePathwithFormat = "";
+		var oParent = oControl.getParent();
+		if (oControl.getBindingPath("visible")) {
+			visiblePathwithFormat = "${" + oControl.getBindingPath("visible") + " !=0}";
+		} else if (oParent.getBindingPath("visible")) {
+			visiblePathwithFormat = "${(" + oParent.getBindingPath("visible") + " == false || " + oParent.getBindingPath("visible") + " == '' || " + oParent.getBindingPath("visible") + " == 0)}";
+		}
+		return visiblePathwithFormat;
+    };
+
 	var fnExtractDataFromDataPoint = function (item, controller) {
 		if (item.getItems().length > 1) {
 			var oDataPointData = {
@@ -111,17 +127,22 @@ sap.ui.define([
 				paths: {},
 				objectStatus: "",
 				color: "",
-				edmType: ""
+				edmType: "",
+				visiblePath: ""
 			};
 			var aControls = item.getItems();
 			oDataPointData.path = aControls[1].getBindingPath("value");
+			oDataPointData.visiblePath = fnGetVisiblePathForFC(aControls[1]);
 			if (isPotentiallySensitive(oDataPointData.path, controller)) {
 				return null;
 			}
 			if (isPotentiallyPersonal(oDataPointData.path, controller)) {
 				return null;
 			}
-			oDataPointData.edmType = getEdmType(oDataPointData.path, controller);
+			var data = getEdmType(oDataPointData.path, controller);
+			oDataPointData.edmType = data.sEdmType;
+			oDataPointData.semantic = data.sSemantic;
+			oDataPointData.sapUnit = data.sSapUnit;
 			oDataPointData.label = aControls[0].getText && aControls[0].getText();
 			oDataPointData.value = aControls[1].getValue && aControls[1].getValue();
 
@@ -170,11 +191,13 @@ sap.ui.define([
 				type: "PlainTextVBox",
 				label: "",
 				value: "",
-				path: ""
+				path: "",
+				visiblePath: ""
 			};
 			var aControls = item.getItems();
 			oPlainTextData.label = aControls[0].getText && aControls[0].getText();
 			oPlainTextData.path = aControls[1].getBindingPath("text");
+			oPlainTextData.visiblePath = fnGetVisiblePathForFC(aControls[1]);
 			// if (isPotentiallySensitive(oDataPointData.path, controller)) {
 			// 	return;
 			// }
@@ -210,11 +233,12 @@ sap.ui.define([
 					expand: "",
 					objectStatus: "",
 					color: "",
-					edmType: ""
+					edmType: "",
+                    visiblePath: ""
 				};
 				var aFieldControls = element.getItems();
 				oFieldData.label = aFieldControls[0].getText && aFieldControls[0].getText();
-
+				oFieldData.visiblePath = fnGetVisiblePathForFC(aFieldControls[1]);
 				if (aFieldControls[1].getText) {
 					oFieldData.path = aFieldControls[1].getBindingPath("text");
 					oFieldData.value = aFieldControls[1].getText();
@@ -228,7 +252,10 @@ sap.ui.define([
 				if (isPotentiallyPersonal(oFieldData.path, controller)) {
 					continue;
 				}
-				oFieldData.edmType = getEdmType(oFieldData.path, controller);
+				var data = getEdmType(oFieldData.path, controller);
+				oFieldData.edmType = data.sEdmType;
+				oFieldData.sapUnit = data.sSapUnit;
+				oFieldData.semantic = data.sSemantic;
 
 				// For Value Help
 				var oObjectBinding = aFieldControls[1].getObjectBinding && aFieldControls[1].getObjectBinding();
@@ -274,6 +301,47 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Create Nullish check expression
+	 * @param {string} sPath Attribute binding to be evaluated for nullish values
+	 * @param {string | undefined} sPath Attribute binding to be evaluated for nullish values
+	 * @param {string | undefined} sPath Attribute binding to be evaluated for nullish values
+	 * @returns {string} String Nullish check expression
+	 */
+	var fnGetNullishPathCheckString = function (sPath, sEdmType, sValue) {
+		var sNullCheckPath = sPath + " == '' || " + sPath + " == null || " + sPath + " == undefined";
+		if (sEdmType === "Edm.Decimal") {
+			sNullCheckPath = sNullCheckPath + ' || ' + "formatNumber(float(" + sValue + "), 2) == '0.00'";
+		}
+		return sNullCheckPath;
+	};
+
+	/**
+	 * Creates MS accepted conditional binding which will replace nullish resolved binding values ( '', null, undefined ) to -
+	 * @param {string} sPath Attribute binding to be evaluated for nullish values 
+	 * @returns {string} String MS accepted conditional binding
+	 */
+	var fnHandleDefaultValueForPath = function (sPath) {
+		return fnGetNullishPathCheckString(sPath) + " ? '\\\\-' : " + sPath;
+	};
+
+	/**
+	 * Create generic MS accepted conditional binding based on params passed
+	 * @param {string} sDefaultPath Attribute binding to be evaluated for nullish values 
+	 * @param {string} sValue Attribute Value binding for path
+	 * @param {string | undefined} sFirstParam Attribute parameter binding for the path
+	 * @param {string | undefined} sSecondParam Attribute parameter binding for the path
+	 * @returns {string} String MS accepted conditional binding
+	 */
+	var fnHandleValueForPath = function (sDefaultPath, sValue, sFirstParam, sSecondParam) {
+		if (sFirstParam && sSecondParam) {
+			return sDefaultPath + sValue + " + ' ' + " + "(" + sFirstParam + " ? " + sFirstParam + " : '') + ' ' + (" + fnGetNullishPathCheckString(sSecondParam) + " ? " + "' ' : " + "'(' + " + sSecondParam + " + ')')";
+		} else if (sFirstParam) {
+			return sDefaultPath + sValue + " + ' ' + (" + fnGetNullishPathCheckString(sFirstParam) + " ? " + "' ' : " + "'(' + " + sFirstParam + " + ')')";
+		}
+		return "";
+	};
+
 	var fnSetPath = function (oField) {
 		var aPaths = [];
 		if (oField.paths) {
@@ -281,10 +349,17 @@ sap.ui.define([
 				return oPath !== oField.path && oPath.indexOf("##@@") === -1;
 			});
 		}
-		var sValue =  oField.edmType === "Edm.Decimal" ? "${formatNumber(float(" + oField.path + "), 2)}" : "${" + oField.path + "}";
+		var sValue =  oField.edmType === "Edm.Decimal" ? "formatNumber(float(" + oField.path + "), 2)" : oField.path;
+		var sDefaultPathValue = fnHandleDefaultValueForPath(oField.path);
 		var sId = "";
 		var sDescription = "";
 		var sPath;
+		var sSapUnitConditionalPath = "";
+		if (oField.semantic === oSapSemantics.unitOfMeasure) {
+			sSapUnitConditionalPath = "(" + fnGetNullishPathCheckString(oField.sapUnit) + ")" + ' ? ' + sValue + " + ' ' + '\\\\-' : " + "";
+		} else if (oField.semantic === oSapSemantics.currencyCode) {
+			sSapUnitConditionalPath = "(" + fnGetNullishPathCheckString(oField.sapUnit) + ")" + ' ? ' + " '\\\\-' : " + "";
+		}
 		if (aPaths.length > 1) {
 			var aDescriptionText = aPaths.filter(function(oPath) {
 				return oPath.endsWith("_Text");
@@ -293,47 +368,54 @@ sap.ui.define([
 				return !oPath.endsWith("_Text");
 			});
 			if (aDescriptionText && aDescriptionText.length > 0) {
-				sDescription = "${" + aDescriptionText[0] + "}";
+				sDescription = aDescriptionText[0];
 			}
 			if (aID && aID.length > 0){
-				sId = "${" + aID[0] + "}";
-			}
-			if (aDescriptionText && aDescriptionText.length > 0) {
-				sDescription = "${" + aDescriptionText[0] + "}";
+				sId = aID[0];
 			}
 		} else if (aPaths.length > 0) {
-			sDescription = "${" + aPaths[0] + "}";
+			sDescription = aPaths[0];
 		}
 		
 		if (oField.displayBehaviour) {
 			switch (oField.displayBehaviour) {
-				case "descriptionAndId":
-					if (sId) {
-						sPath = sValue + (sDescription ? " " + sDescription : "") + (sId ? " (" + sId + ")" : "");
-					} else if (sDescription) {
-						sPath = sDescription + (sValue ? " (" + sValue + ")" : "");
+				case "descriptionAndId": 
+					if (sId && sDescription) {
+						sPath = fnHandleValueForPath(sSapUnitConditionalPath, sValue, sDescription, sId);
+					} else if (sId && !sDescription) {
+						sPath = fnHandleValueForPath(sSapUnitConditionalPath, sValue, sId);
+					} else if (sDescription && !sId) {
+						sPath = sSapUnitConditionalPath + " (" + fnGetNullishPathCheckString(sValue) + " ? (" + fnHandleDefaultValueForPath(sDescription) + ") : (" + sDescription + " + ' ' + " +  "' (' + " + sValue + " + ')'" + "))";
 					} else {
-						sPath = sValue;
+						sPath = sDefaultPathValue;
 					}
 					break;
 				case "descriptionOnly":
-					sPath = sDescription;
+					sPath = fnHandleDefaultValueForPath(sDescription);
 					break;
 				case "idAndDescription":
-					sPath = sValue + (sId ? " " + sId : "") +  (sDescription ? " (" + sDescription + ")" : "");
+					if (sId && sDescription) {
+						sPath = fnHandleValueForPath(sSapUnitConditionalPath, sValue, sId, sDescription);
+					} else if (sId && !sDescription) {
+						sPath = sSapUnitConditionalPath + sValue + " + ' ' + (" + sId + " ? " + sId + " : '')";
+					} else if (!sId && sDescription) {
+						sPath = fnHandleValueForPath(sSapUnitConditionalPath, sValue, sDescription);
+					} else {
+						sPath = sDefaultPathValue;
+					}
 					break;
 				case "idOnly":
-					sPath = sValue || sId;
+					sPath = sDefaultPathValue || sId;
 					break;
 				default:
-					sPath = sValue;
+					sPath = sDefaultPathValue;
 					break;
 			}
 		} else {
-			sPath = sValue;
+			sPath = sDefaultPathValue;
 		}
 		sPath = sPath && sPath.indexOf('/') > -1 ? sPath.replaceAll('/', '.') : sPath;
-		return sPath;
+		return "${" + sPath + "}";
 	};
 
 	var getWebUrl = function() {
@@ -538,6 +620,7 @@ sap.ui.define([
 								oFormFieldValueClone.text = fnSetPath(oField);
 								oFormFieldValueClone.color = oField.color ? oField.color : "Default";
 								oColumnClone.items.push(oFormFieldValueClone);
+								oColumnClone["$when"] = oField.visiblePath;
 								oColumnSetClone.columns.push(oColumnClone);
 							}
 							oAdaptiveCardJSON.body.push(oColumnSetClone);
@@ -550,6 +633,8 @@ sap.ui.define([
 						oFormFieldValueClone = deepClone(oFormFieldValue);
 						oFormFieldValueClone.text = fnSetPath(element);
 						oAdaptiveCardJSON.body.push(oFormFieldValueClone);
+                                                oFormTitleClone["$when"] = element.visiblePath;
+						oFormFieldValueClone["$when"] = element.visiblePath;
 						break;
 					case "DataPoint":
 						if (!oDataPointColumnSet) {
@@ -563,6 +648,7 @@ sap.ui.define([
 						oFormFieldValueClone.text = fnSetPath(element);
 						oFormFieldValueClone.color = element.color ? element.color : "Default";
 						oColumnClone.items.push(oFormFieldValueClone);
+						oColumnClone["$when"] = element.visiblePath;
 						oDataPointColumnSet.columns.push(oColumnClone);
 						break;
 					default:
@@ -669,7 +755,7 @@ sap.ui.define([
 			oAdaptiveCardJSON.body.push(oActionSetClone);
 		}
 
-		// console.log(oAdaptiveCardJSON);
+		//console.log(oAdaptiveCardJSON);
 		return oAdaptiveCardJSON;
 	};
 

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

@@ -54,6 +54,7 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/lib/insights/InsightsFECardProvider",
 	"sap/ui/core/service/ServiceFactoryRegistry",
 	"sap/ui/VersionInfo",
+	"sap/m/IllustratedMessageType",
 	"sap/suite/ui/generic/template/js/RuntimeFormatters"  // just to make sure that this class is loaded
 ], function(
 	extend, 
@@ -88,7 +89,8 @@ sap.ui.define([
 	CardHelper,
 	InsightsFECardProvider,
 	ServiceFactoryRegistry,
-	VersionInfo) {
+	VersionInfo,
+	IllustratedMessageType) {
 	"use strict";
 	var	sClassName = "lib.AppComponent";
 
@@ -464,7 +466,7 @@ sap.ui.define([
 						oNavigationController.navigateToMessagePage({
 							title: getText("ST_GENERIC_ERROR_TITLE"),
 							text: getText("ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE"),
-							icon: "sap-icon://message-error",
+							messageType: IllustratedMessageType.UnableToLoad,
 							description: getText("ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE_DESC")
 						});
 						/* When the application's OData service's metadata document
@@ -919,7 +921,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.125.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

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

@@ -799,7 +799,7 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 
 			function fnPreloadComponent(sRouteName) {
-				oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
+				return oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
 			} 
 		
 			oTemplateContract.oApplicationProxy = { // inject own api for AppComponent into the Template Contract. Other classes (NavigationController, BusyHelper) will call these functions accordingly.

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

@@ -950,7 +950,13 @@ sap.ui.define(["sap/ui/base/Object",
 								}
 							)
 						);
-						oCreatePromise.then(function(oContext) {
+
+						// Load main object page (if not already done), as we will navigate there
+						// For sub-object pages this is not necessarily the case
+						var oPreloadComponentPromise = iViewLevel === 0 ? oServices.oApplication.preloadComponent(sEntitySet) : Promise.resolve();
+
+						Promise.all([oCreatePromise, oPreloadComponentPromise]).then(function (aResults) {
+							var oContext = aResults[0];
 							oServices.oApplication.markCurrentDraftAsModified();
 							var aKeys = oComponentUtils.getCurrentKeys();
 							aKeys.push(oDataModelHelper.analyseContext(oContext).key);
@@ -958,10 +964,6 @@ sap.ui.define(["sap/ui/base/Object",
 							oServices.oApplication.registerContext(oContext, iLevel, sEntitySet, aKeys);
 							fnResolve(oContext);
 						});
-
-						if (iViewLevel === 0){           // Load main object page (if not already done), as we will navigate there
-							oServices.oApplication.preloadComponent(sEntitySet);    // For subobject pages this is not necessarily the case
-						}
 					});
 				});
 			}

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

@@ -1350,6 +1350,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var oSmartTable = oEvent.getSource();
 			var oTable = oSmartTable.getTable();
 			var bIsMTable = controlHelper.isMTable(oTable);
+			var bIsTreeTable = controlHelper.isTreeTable(oTable);
 			var oColumns = oTable.getColumns();
 
 			if (!oCallbacks || (oCallbacks && oCallbacks.isPopinWithoutHeader) && bIsMTable) { //Setting popin display without header
@@ -1374,6 +1375,12 @@ sap.ui.define(["sap/ui/base/Object",
 				};
 			}
 
+			//For tree table, set the parameters "rootLevel" and "numberOfExpandedLevels"
+			if (bIsTreeTable) {
+				oBindingParams.parameters.rootLevel = oBindingParams.parameters.rootLevel || 0;
+				oBindingParams.parameters.numberOfExpandedLevels = oBindingParams.parameters.numberOfExpandedLevels || oCallbacks.numberOfExpandedLevels || 0;
+			}
+
 			//Get all the CustomData associated with Smarttable and create an object which is a key value pair of each custom data
 			var aCustomData = oSmartTable.getCustomData();
 			var oCustomData = {};
@@ -1942,7 +1949,8 @@ sap.ui.define(["sap/ui/base/Object",
 				oFileUploader.checkFileReadable().then(function() {
 					oFileUploader.upload();
 				}, function(error) {
-					sap.m.MessageToast.show("The file cannot be read. It may have changed.");
+					var sMessageText = oCommonUtils.getText("ST_STREAM_FILE_UNREADABLE");
+					oServices.oApplication.showMessageToast(sMessageText);
 				}).then(function() {
 					oFileUploader.clear();
 				});
@@ -1998,6 +2006,11 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 		}
 
+		function handleTypeMismatch(){
+			var sMessageText = oCommonUtils.getText("ST_STREAM_TYPE_MISMATCH");
+			oServices.oApplication.showMessageToast(sMessageText);
+		}
+
 		function removeStream(oEvent){
 				var oSource = oEvent.getSource();
 				var aPath = [oController.getView().getBindingContext().sPath + "/$value"];
@@ -2683,6 +2696,7 @@ sap.ui.define(["sap/ui/base/Object",
 			uploadStream: uploadStream,
 			removeStream: removeStream,
 			handleUploadComplete: handleUploadComplete,
+			handleTypeMismatch: handleTypeMismatch,
 			evaluateParameters: fnEvaluateParameters,
 			onBeforeExport: fnOnBeforeExport,
 			handleSideEffectForField: fnHandleSideEffectForField,

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

@@ -63,7 +63,7 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 
 		function preloadComponent(sRouteName) {
-			oComponentRegistryEntry.oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
+			return oComponentRegistryEntry.oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
 		}
 
 		function getTemplatePrivateGlobalModel() {
@@ -97,18 +97,22 @@ sap.ui.define(["sap/ui/base/Object",
 		// not yet created then we preload the component and once view registered, resolve to an object holding the Main Components's getText and getRootExpand methods
 		function getMainComponentUtils() {
 			var oMainTreeNode = oComponentRegistryEntry.oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
+			var oPreloadComponentPromise = Promise.resolve();
 			if (!oMainTreeNode.componentId) { // ensure that main component is being instantiated if not already done
-				preloadComponent(oMainTreeNode.sRouteName);
-			  }
-			return oMainTreeNode.componentCreated.then(function(oComponent) {
-				var oMainRegistryEntry = oComponentRegistryEntry.oTemplateContract.componentRegistry[oComponent.getId()];
-				return oMainRegistryEntry.viewRegistered.then(function() {
-					return {
-						getText: oMainRegistryEntry.oControllerUtils.oCommonUtils.getText,
-						getRootExpand: oMainRegistryEntry.oControllerUtils.oComponentUtils.getRootExpand,
-						entitySet: oMainTreeNode.entitySet
-					};
-				});
+				oPreloadComponentPromise = preloadComponent(oMainTreeNode.sRouteName);
+			}
+			var oMainRegistryEntry;
+			return oPreloadComponentPromise.then(function () {
+				return oMainTreeNode.componentCreated;
+			}).then(function (oComponent) {
+				oMainRegistryEntry = oComponentRegistryEntry.oTemplateContract.componentRegistry[oComponent.getId()];
+				return oMainRegistryEntry.viewRegistered;
+			}).then(function () {
+				return {
+					getText: oMainRegistryEntry.oControllerUtils.oCommonUtils.getText,
+					getRootExpand: oMainRegistryEntry.oControllerUtils.oComponentUtils.getRootExpand,
+					entitySet: oMainTreeNode.entitySet
+				};
 			});
 		}
 

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

@@ -1,6 +1,8 @@
 sap.ui.define([
-	"sap/suite/ui/commons/collaboration/ServiceContainer"
-], function(ServiceContainer) {
+	"sap/suite/ui/commons/collaboration/ServiceContainer",
+    "sap/ui/performance/trace/FESRHelper",
+    "sap/suite/ui/generic/template/genericUtilities/controlHelper"
+], function(ServiceContainer, FESRHelper, controlHelper) {
     "use strict";
 
     /**
@@ -40,7 +42,8 @@ sap.ui.define([
                     }
                 },
                 onTeamsCollabOptionPress: function(oEvent) {
-                    var sType = oEvent.getSource().data("type");
+                    var oButton = oEvent.getSource();
+                    var sType = oButton.data("type");
                     var oSelectedOption = aTeamsCollabOptions.find(function(option) {
                         return option.key === sType;
                     });
@@ -49,6 +52,21 @@ sap.ui.define([
                 afterClose: function(oEvent) {
                     var oPopover = oEvent.getSource();
                     oPopover.close();
+                },
+                afterOpen: function (oEvent) {
+                    var oPopover = oEvent.getSource();
+                    var oToolbar = oPopover.getContent()[0].getItems()[1].getItems()[1];
+                    oToolbar.getContent().forEach(function(oItem){
+                        if (controlHelper.isButton(oItem)) {
+                            var sType = oItem.data("type");
+                            if (sType) {
+                                var oSelectedOption = aTeamsCollabOptions.find(function(option) {
+                                    return option.key === sType;
+                                });
+                                FESRHelper.setSemanticStepname(oItem, "press", oSelectedOption.fesrStepName);
+                            }
+                        }
+                    });
                 }
             }, "contact").then(function (oContactPopover) {
                 var oContactModel = oContactPopover.getModel("contact");

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

@@ -281,13 +281,17 @@ sap.ui.define(["sap/ui/base/Object", "sap/f/FlexibleColumnLayoutSemanticHelper",
 			function fnHandleBeforeRouteMatched(oCurrentIdentity){
 				var sCurLayout = getFCLLayoutFromIdentity(oCurrentIdentity);
 				var bIsFullScreen = isFullscreenLayout(sCurLayout);
+				var aPromises = [];
+				var oHostViewPreparationPromise = null;
 				for (var oPredecessorNode = oCurrentIdentity.treeNode; oPredecessorNode.fCLLevel === 1 || oPredecessorNode.fCLLevel === 2; ){
 					oPredecessorNode = oTemplateContract.mRoutingTree[oPredecessorNode.parentRoute];
-					oNavigationControllerProxy.prepareHostView(oPredecessorNode, false, bIsFullScreen);
+					oHostViewPreparationPromise = oNavigationControllerProxy.prepareHostView(oPredecessorNode, false, bIsFullScreen);
+					aPromises.push(oHostViewPreparationPromise);
 				}
 				if (bLoadListAndFirstEntryOnStartup && oCurrentIdentity.treeNode.level === 0){ // master detail
 					var oSuccessorNode = oTemplateContract.mRoutingTree[sDetailRoute4MD];
-					oNavigationControllerProxy.prepareHostView(oSuccessorNode);
+					oHostViewPreparationPromise = oNavigationControllerProxy.prepareHostView(oSuccessorNode);
+					aPromises.push(oHostViewPreparationPromise);
 				}
 				var fnImpl = function(){ // implementation on what needs to be done. Relies on oFlexibleColumnLayoutSemanticHelper being ready to use
 					if (isMultipleColumn(oCurrentIdentity.treeNode)){
@@ -334,8 +338,11 @@ sap.ui.define(["sap/ui/base/Object", "sap/f/FlexibleColumnLayoutSemanticHelper",
 					fnImpl();
 					return Promise.resolve();
 				}
-				// During startup wait with execution of fnImpl until oFlexibleColumnLayoutSemanticHelper is ready to use
-				return oFlexibleColumnLayoutSemanticHelper.whenReady().then(function(){
+				// During startup wait with execution of fnImpl until all the promises are resolved
+				var oSemanticHelperReadyPromise = oFlexibleColumnLayoutSemanticHelper.whenReady();
+				aPromises.push(oSemanticHelperReadyPromise);
+
+				return Promise.all(aPromises).then(function(){
 					bSemanticHelperReady = true;
 					fnImpl();
 				});

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

@@ -7,8 +7,9 @@ sap.ui.define([
 	"sap/ui/generic/app/util/MessageUtil",
 	"sap/suite/ui/generic/template/genericUtilities/controlHelper",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
-	"sap/suite/ui/generic/template/lib/TemplateComponent"
-], function(Event, SapCoreLibrary, IconPool, MessageToast, GenericMessageUtil, controlHelper, FeLogger, TemplateComponent) {
+	"sap/suite/ui/generic/template/lib/TemplateComponent",
+	"sap/m/IllustratedMessageType"
+], function(Event, SapCoreLibrary, IconPool, MessageToast, GenericMessageUtil, controlHelper, FeLogger, TemplateComponent, IllustratedMessageType) {
 		"use strict";
 
 		// shortcut for sap.ui.core.ValueState
@@ -195,7 +196,7 @@ sap.ui.define([
 					title: oResourceBundle.getText("ST_GENERIC_ERROR_TITLE"),
 					text: sMessageText,
 					description: sMessageDescription,
-					icon: "sap-icon://message-error",
+					messageType: IllustratedMessageType.UnableToLoad,
 					viewLevel: iViewLevel
 				});
 			} else if (!oErrorResponse.containsTransientMessage && !bShowMessagePopover){