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

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

@@ -77,7 +77,7 @@
 						editable="{ui>/editable}" linkPress="._templateEventHandlers.onDataFieldWithNavigationPath">
 						<sfi:configuration>
 							<sfi:Configuration
-								displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+								displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 						</sfi:configuration>
 						<sfi:customData>
 							<core:CustomData key="defaultTextInEditModeSource" value="{path: 'dataFieldValue>', formatter: 'AH.setValidationForValueList'}" />
@@ -113,7 +113,7 @@
 							</sfi:semanticObjectController>
 							<sfi:configuration>
 								<sfi:Configuration
-										displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'annotation>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
+										displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
 							</sfi:configuration>
 							<template:if test="{= ${dataField>Criticality} }">
 								<sfi:controlProposal>

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

@@ -2,8 +2,9 @@
 		xmlns="sap.m"
 		xmlns:core="sap.ui.core">
 	<MessagePopover groupItems="true" items="{msg>/}" activeTitlePress="titlePressed" beforeOpen="beforeOpen" afterClose="afterClose" >
-		<MessageItem  description="{msg>description}" type="{msg>type}"  title="{msg>message}"
+		<MessageItem  type="{msg>type}"  title="{msg>message}"
 					subtitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>additionalText'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getSubtitle'}"
+					description="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>description'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getDescription'}"
 					longtextUrl="{msg>descriptionUrl}"
 					markupDescription="{helper>/isAIErrorExplanationEnabled}"
 					activeTitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'helper>/isPopoverOpen'}], formatter: '.isPositionable'}"

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

@@ -12,7 +12,7 @@
 						<smartField:SmartField value="{path: 'dataField>Value', formatter: 'AHModel.simplePath'}" editable="{= ${parameter>/treeNode/level} > 0 ? '{ui>/editable}' : 'false'}" contextEditable="{= ${parameter>/treeNode/level} > 0}" fetchValueListReadOnly="{= ${parameter>/treeNode/level} > 0}"
 												ariaLabelledBy="{columnId>id}">
 							<smartField:configuration>
-								<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}, {path: 'dataFieldTarget>Data'}], formatter: 'AH.getTextArrangementForSCFields'}"/>
+								<smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}, {path: 'dataFieldTarget>Data'}], formatter: 'AH.getTextArrangementForSCFields'}"/>
 							</smartField:configuration>
 							<template:if test="{= ${dataField>Criticality}}">
 								<smartField:controlProposal>
@@ -128,7 +128,7 @@
 				</smartField:customData>
 				<smartField:configuration>
 					<smartField:Configuration
-						displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+						displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 				</smartField:configuration>
 			</smartField:SmartField>
 		</template:elseif>

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

@@ -123,7 +123,7 @@
 									</smartField:customData>
 									<smartField:configuration>
 										<smartField:Configuration
-											displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
+											displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
 									</smartField:configuration>
 								</smartField:SmartField>
 							</table:template>

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js

@@ -105,8 +105,10 @@ sap.ui.define([
 				oControl.attachAfterVariantInitialise(function() {
 					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
 					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
-					if (sVariantId !== '*standard*' && oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
-						oControl.setCurrentVariantId(sVariantId);
+					if (sVariantId !== '*standard*') {
+						if (oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
+							oControl.setCurrentVariantId(sVariantId);
+						}
 						oSmartVariantManagement.setModified(false);
 					}
 				});

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

@@ -353,20 +353,20 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			return false;
 		},
 
-		getValueListReadOnly: function (oInterface, sEntityType, oDataField) {
+		getValueListReadOnly: function (oInterface, vEntityType, oDataField) {
 			var oMetaModel = oInterface.getInterface(1).getModel();
 			var sPath = oInterface.getInterface(1).getPath() + '/Value';
 			var sTargetPropertyPath = AnnotationHelperModel.resolvePath(oMetaModel.getContext(sPath));
-			var oDataFieldValue = oMetaModel.getObject(sTargetPropertyPath);
-			if (oDataFieldValue['com.sap.vocabularies.UI.v1.TextArrangement']) {
+			var oDataFieldValue = sTargetPropertyPath && oMetaModel.getObject(sTargetPropertyPath);
+			if (oDataFieldValue?.['com.sap.vocabularies.UI.v1.TextArrangement']) {
 				// case 1 - text arrangement defined at property level
 				return oDataFieldValue['com.sap.vocabularies.UI.v1.TextArrangement'].EnumMember !== 'com.sap.vocabularies.UI.v1.TextArrangementType/TextSeparate';
-			} else if (oDataFieldValue['com.sap.vocabularies.Common.v1.Text']) {
+			} else if (oDataFieldValue?.['com.sap.vocabularies.Common.v1.Text']) {
 				// case 2 - text arrangement defined for property via sap:text
 				return true;
 			} else {
 				// case 3 - text arrangement defined at entity level
-				var oEntityType = oMetaModel.getODataEntityType(sEntityType);
+				var oEntityType = typeof vEntityType === "object" ? vEntityType : oMetaModel.getODataEntityType(vEntityType); // vEntityType can be object or string.
 				if (oEntityType['com.sap.vocabularies.UI.v1.TextArrangement']) {
 					return oEntityType['com.sap.vocabularies.UI.v1.TextArrangement'].EnumMember !== 'com.sap.vocabularies.UI.v1.TextArrangementType/TextSeparate';
 				}
@@ -1106,7 +1106,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 		// builds the expression for the Rating Indicator aggregate Count
 		buildRatingIndicatorAggregateCountExpression: function (mValue) {
-			return "{parts: [{path: '" + mValue.Path + "'}], formatter: 'RuntimeFormatters.formatRatingIndicatorAggregateCount.bind($control)'}";
+			return "{parts: [{path: '" + mValue?.Path + "'}], formatter: 'RuntimeFormatters.formatRatingIndicatorAggregateCount.bind($control)'}";
 		},
 
 		getIdForMoreBlockContent: function (oFacet) {
@@ -1264,7 +1264,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		},
 
 		formatHeaderImage: function (oInterface, oHeaderInfo, sAppComponentName) {
-			return oAnnotationHelper.formatImageOrTypeUrl(oInterface, oHeaderInfo.ImageUrl, oHeaderInfo.TypeImageUrl, sAppComponentName, true);
+			return oAnnotationHelper.formatImageOrTypeUrl(oInterface, oHeaderInfo?.ImageUrl, oHeaderInfo?.TypeImageUrl, sAppComponentName, true);
 		},
 
 		getPathWithExpandFromHeader: function (oInterface, oEntitySet, sNavigationProperty, oInputImageUrl, oTypeImageUrl) {
@@ -2638,7 +2638,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		getColumnListItemType: function (oListEntitySet, aSubPages, oManifest, oTreeNode, bIsDraftEnabled, sAnnotationPath) {
 			var bIsRoot = !oTreeNode.level; // information, whether we are on the root page
 			// check for special feature: navigation from list report to object page via navigationProperty
-			var bIsListWithNavigationProperty = bIsRoot && aSubPages.some(function (oSubPage) {
+			var bIsListWithNavigationProperty = bIsRoot && aSubPages && aSubPages.some(function (oSubPage) {
 				return oSubPage.navigationProperty;
 			});
 			var bAllowsNavigationInEditMode = bIsDraftEnabled || bIsRoot; // in non-draft mode forward navigation is disabled in edit mode
@@ -2944,19 +2944,13 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			return sTextArrangement;
 		},
 
-		getTextArrangementForSmartControl: function (oInterface, oField, refEntitySet, oEntitySet) {
+		getTextArrangementForSmartControl: function (oInterface, oField, oEntitySet) {
 			oInterface = oInterface.getInterface(0);
-			var oEntityType;
 			var oMetaModel = oInterface.getModel();
-
-			if (refEntitySet.name == undefined) {
-				oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
-			} else {
-				oEntityType = oMetaModel.getODataEntityType(refEntitySet.entityType);
-			}
-
+			var oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
+			
 			var sTextArrangement = "descriptionAndId";
-			if (oMetaModel.getODataProperty(oEntityType, oField.Value.Path)) {
+			if (oField?.Value?.Path && oMetaModel.getODataProperty(oEntityType, oField.Value.Path)) {
 				var oPropertyTextModel = oMetaModel.getODataProperty(oEntityType, oField.Value.Path)["com.sap.vocabularies.Common.v1.Text"];
 				// 1. check TextArrangement definition for property
 				if (oPropertyTextModel && oPropertyTextModel["com.sap.vocabularies.UI.v1.TextArrangement"] && oPropertyTextModel["com.sap.vocabularies.UI.v1.TextArrangement"].EnumMember) {
@@ -3891,12 +3885,14 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					break;
 				}
 			}
+
+			aConnectedDataFields = aConnectedDataFields || [];
 			for (var j = 0; j < aConnectedDataFields.length; j++) {
 				if (aConnectedDataFields[j].RecordType === "com.sap.vocabularies.UI.v1.DataField" && aConnectedDataFields[j].Value.Path === sDescriptionField) {
 					return "idOnly";
 				}
 			}
-			sTextArrangement = oAnnotationHelper.getTextArrangementForSmartControl(oInterface, oField, {}, oEntitySet);
+			sTextArrangement = oAnnotationHelper.getTextArrangementForSmartControl(oInterface, oField, oEntitySet);
 			return sTextArrangement;
 		},
 

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

@@ -114,6 +114,9 @@ sap.ui.define([
 		getAcceptableMimeTypes: function(oInterface, oEntitySet){
 			var oEntityType = oInterface.getModel(0).getODataEntityType(oEntitySet.entityType);
 			var aAcceptableMediaTypes = oEntityType["Org.OData.Core.V1.AcceptableMediaTypes"];
+			if (!aAcceptableMediaTypes) {
+				return "";
+			}
 			var sAcceptableMimeType = new String();
 			for (var i = 0; i < aAcceptableMediaTypes.length; i++) {
 				sAcceptableMimeType = sAcceptableMimeType.concat(aAcceptableMediaTypes[i].String).concat(",");

package/src/sap/suite/ui/generic/template/js/QuickTemplates/QuickTemplateComponentFactory.js

@@ -3,7 +3,7 @@ sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/ui/core/UIComponent",
 	"sap/ui/model/resource/ResourceModel",
-	"sap/ui/core/library",
+	"sap/ui/core/mvc/ViewType",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/generic/app/ApplicationController",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
@@ -15,7 +15,7 @@ sap.ui.define([
 	BaseObject,
 	UIComponent,
 	ResourceModel,
-	coreLibrary,
+	ViewType,
 	JSONModel,
 	ApplicationController,
 	FeLogger,
@@ -27,7 +27,6 @@ sap.ui.define([
 		"use strict";
 
 		var oLogger = new FeLogger("js.QuickTemplates.QuickTemplateComponentFactory").getLogger();
-		var ViewType = coreLibrary.mvc.ViewType;
 
 		var factory = BaseObject.extend("sap.suite.ui.generic.template.js.QuickTemplates.QuickTemplateComponentFactory");
 

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

@@ -1,5 +1,24 @@
-sap.ui.define(["sap/ui/core/format/NumberFormat", "sap/ui/core/message/MessageType", "sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/suite/ui/generic/template/genericUtilities/testableHelper", "sap/suite/ui/generic/template/genericUtilities/utils"
-	], function (NumberFormat, MessageType, FeLogger, testableHelper, utils) {
+sap.ui.define([
+	"sap/base/i18n/Formatting", 
+	"sap/ui/core/Locale",
+	"sap/ui/core/format/DateFormat",
+	"sap/ui/core/format/NumberFormat", 
+	"sap/ui/core/message/MessageType", 
+	"sap/m/RatingIndicator",
+	"sap/suite/ui/generic/template/genericUtilities/FeLogger", 
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper", 
+	"sap/suite/ui/generic/template/genericUtilities/utils"
+], function (
+	Formatting,
+	Locale,
+	DateFormat,
+	NumberFormat,
+	MessageType,
+	RatingIndicator,
+	FeLogger,
+	testableHelper,
+	utils
+) {
 	"use strict";
 
 	var oLogger = new FeLogger("js.RuntimeFormatters").getLogger();
@@ -89,6 +108,34 @@ sap.ui.define(["sap/ui/core/format/NumberFormat", "sap/ui/core/message/MessageTy
 		return "None";
 	}
 
+	/** Utility methods */
+	var oLocale;
+	var oCurrencyFormatter;
+	var oDateTimeFormatter;
+
+	function getFormatLocale() {
+		if (!oLocale) {
+			oLocale = new Locale(Formatting.getLanguageTag());
+		}
+		return oLocale;
+	}
+
+	
+	function getCurrencyFormatter() {
+		if (!oCurrencyFormatter) {
+			oCurrencyFormatter = NumberFormat.getCurrencyInstance();
+		}
+		return oCurrencyFormatter;
+	}
+
+	
+	function getDateTimeFormatter() {
+		if (!oDateTimeFormatter) {
+			oDateTimeFormatter = DateFormat.getDateTimeInstance();
+		}
+		return oDateTimeFormatter;
+	}
+
 	// Expose selected private static functions to unit tests
 	/* eslint-disable */
 	var getLineItemQualifier = testableHelper.testableStatic(getLineItemQualifier, "RuntimeFormatters_getLineItemQualifier");
@@ -167,29 +214,25 @@ sap.ui.define(["sap/ui/core/format/NumberFormat", "sap/ui/core/message/MessageTy
 		// ii. if the Property TargetValue is not a Path (i.e. 'Decimal') then we get the value from the control's Custom Data
 		// iii. if neither i. or ii. apply then we use the default max value for the sap.m.RatingIndicator control
 		formatRatingIndicatorFooterText: function (value, targetValue) {
-			if (value) {
-				var oResBundle = this.getModel("i18n").getResourceBundle();
-				if (targetValue) {
-					return oResBundle.getText("RATING_INDICATOR_FOOTER", [value, targetValue]);
-				} else if (this.getCustomData().length > 0) {
-					return oResBundle.getText("RATING_INDICATOR_FOOTER", [value, this.data("Footer")]);
-				} else {
-					var iRatingIndicatorDefaultMaxValue = sap.m.RatingIndicator.getMetadata().getPropertyDefaults().maxValue;
-					return oResBundle.getText("RATING_INDICATOR_FOOTER", [value, iRatingIndicatorDefaultMaxValue]);
-				}
-			}
+			if (!value) {
+				return "";
+			}	
+			var oResBundle = this.getModel("i18n").getResourceBundle();
+			targetValue = targetValue 
+				|| this.data("Footer") 
+				|| RatingIndicator.getMetadata().getPropertyDefaults().maxValue;
+
+			return oResBundle.getText("RATING_INDICATOR_FOOTER", [value, targetValue]);
 		},
 		
 		// returns the text for the Rating Indicator aggregated count (e.g. (243))
-		formatRatingIndicatorAggregateCount: function (value) {
+		formatRatingIndicatorAggregateCount: function (vValue) {
 			var oResBundle = this.getModel("i18n").getResourceBundle();
-			var sText;
-			if (value) {
-				sText = oResBundle.getText("RATING_INDICATOR_AGGREGATE_COUNT", [value]);
-			} else if (this.getCustomData().length > 0) {
-				sText = oResBundle.getText("RATING_INDICATOR_AGGREGATE_COUNT", [this.data("AggregateCount")]);
-			} else {
-				sText = "";
+			var sText = "";
+			// If the input value is not provided, try to get value from "AggregateCount" custom data
+			vValue = vValue || this.data("AggregateCount");
+			if (vValue) {
+				sText = oResBundle.getText("RATING_INDICATOR_AGGREGATE_COUNT", [vValue]);
 			}
 
 			return sText;
@@ -213,7 +256,7 @@ sap.ui.define(["sap/ui/core/format/NumberFormat", "sap/ui/core/message/MessageTy
 				var oControl = this;
 				var oResourceBundle = oControl.getModel("i18n").getResourceBundle();
 				var aCustomData = oControl.getCustomData();
-				var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+				var oLocale = getFormatLocale();
 				sValue = NumberFormat.getInstance(oLocale).format(sValue);
 				sTarget = sTarget || aCustomData.filter(function (oObject) {
 					if (oObject.getKey() === "Target") {
@@ -252,6 +295,19 @@ sap.ui.define(["sap/ui/core/format/NumberFormat", "sap/ui/core/message/MessageTy
 			}
 
 			return sDisplayValue;
+		},
+		formatDate: function (oDate) {
+			return getDateTimeFormatter().format(oDate);
+		},
+		/**
+		 * Formats the given amount and currency
+		 * 
+		 * @param {number|string} vAmount 
+		 * @param {string} sCurrency 
+		 * @returns {string}
+		 */
+		formatCurrency: function (vAmount, sCurrency) {
+			return getCurrencyFormatter().format(vAmount, sCurrency);
 		}
 	};
 

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

@@ -951,7 +951,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.132.0
+	 * @version 1.133.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/CRUDActionHandler.js

@@ -10,10 +10,15 @@
  */
 
  sap.ui.define(["sap/ui/base/Object", "sap/ui/model/Filter", "sap/ui/model/FilterOperator", "sap/base/util/extend", "sap/suite/ui/generic/template/lib/MessageUtils", "sap/ui/model/json/JSONModel", 
- "sap/suite/ui/generic/template/genericUtilities/controlHelper", "sap/ui/core/message/MessageType"
-], function(BaseObject, Filter, FilterOperator, extend, MessageUtils, JSONModel, controlHelper, MessageType) {
+	"sap/suite/ui/generic/template/genericUtilities/controlHelper", "sap/ui/core/message/MessageType",
+	"sap/suite/ui/generic/template/genericUtilities/FeLogger"
+], function(BaseObject, Filter, FilterOperator, extend, MessageUtils, JSONModel, controlHelper, MessageType, FeLogger) {
 	"use strict";
 
+	var oFeLogger = new FeLogger("lib.CRUDActionHandler");
+	var oLogger = oFeLogger.getLogger();
+	oLogger.setLevel(oFeLogger.Level.ALL);
+
 	// A Filter that filters for messages that are at least of severity warning
 	var oAtLeastWarningFilter = new Filter({
 		filters: [new Filter({
@@ -229,7 +234,11 @@
 		// Performs an Activate/Save resp. Apply operation when all prerequisites are given
 		function fnPrepareAndRunSaveOperation(bIsActivation, fnOperation){
 			oTemplateContract.oApplicationProxy.performAfterSideEffectExecution(function(){
-				fnBeforeOperation(bIsActivation).then(fnOperation);
+				fnBeforeOperation(bIsActivation)
+					.then(fnOperation)
+					.catch(function(){
+						oLogger.info("Can't proceed with 'Save' as 'fnBeforeOperation' checks have failed");
+					});
 			}, true);
 		}
 

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

@@ -984,7 +984,16 @@ sap.ui.define(["sap/ui/base/Object",
 							onSemanticObjectLinkNavigationPressed : oController._templateEventHandlers.onSemanticObjectLinkNavigationPressed.bind(oController._templateEventHandlers),
 							onDataFieldWithIntentBasedNavigation  : oController._templateEventHandlers.onDataFieldWithIntentBasedNavigation.bind(oController._templateEventHandlers),
 							onDataFieldWithEmail: oController._templateEventHandlers.onDataFieldWithEmail.bind(oController._templateEventHandlers),
-							onTeamsCollabOptionPress: onTeamsCollabOptionPress.bind(this)
+							onTeamsCollabOptionPress: onTeamsCollabOptionPress.bind(this),
+							onContactDetails: onContactDetails.bind(this),
+							// Ignoring the below events since quick view forms don't handle side effects. Handle them if support is added in the future.
+							onSmartFieldModeToggled: Function.prototype, 
+							onSmartFieldModelValueChanged: Function.prototype,
+							// Ignoring this event as SmartMultiInput isn't rendered in the quick view smart form.
+							submitChangesForSmartMultiInput: Function.prototype,
+							// Handle the event only if it's supported in the current floor plan.
+							onDataFieldWithNavigationPath: oController._templateEventHandlers.onDataFieldWithNavigationPath?.bind(oController._templateEventHandlers) || Function.prototype,
+							onSmartFieldPress: oController._templateEventHandlers.onSmartFieldPress?.bind(oController._templateEventHandlers) || Function.prototype
 						},
 						onInit : function() {},
 						onExit : function() {},
@@ -1098,6 +1107,9 @@ sap.ui.define(["sap/ui/base/Object",
 								oMainNavigation.setDescription(oTexts.secondText);
 							}
 							sTitle = oTexts.firstText;
+							if (sTextArrangement && oTexts.secondText) {
+								sTitle = oTexts.firstText + " " + oTexts.secondText;
+							}
 						}
 					}
 					fnRenderTeamsCollabOptionsOnContactCard(oEntityType, oEventParameters, aTeamsCollabOptions, oControl, sControlBindingContextPath);