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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.124.0",
+  "version": "1.124.2",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.124.0</version>
+	<version>1.124.2</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/extensionAPI/ExtensionAPI.js

@@ -15,6 +15,9 @@ sap.ui.define(["sap/ui/base/Object",
 		var oNavigationController;
 		return /** @lends sap.suite.ui.generic.template.AnalyticalListPage.extensionAPI.ExtensionAPI.prototype */ {
 			/**
+			 * Generally, this method returns the currently selected contexts in the given ui element (table, chart, or list).
+			 * In case the context menu is opened, it returns the contexts applicable to the context menu.
+			 *
 			 * Get the list entries currently selected
 			 * @param {string} sUiElementId the id identifying the ui element the selected context is requested for
 			 * @return {sap.ui.model.Context[]} contains the entries selected
@@ -26,7 +29,13 @@ sap.ui.define(["sap/ui/base/Object",
 				if (sUiElementId) {
 					oControl = oController.byId(sUiElementId);
 				}
-				return oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oTemplateUtils.oCommonUtils.getOwnerPresentationControl(oControl)).getSelectedContexts();
+				var oPresentationControl = oTemplateUtils.oCommonUtils.getOwnerPresentationControl(oControl);
+				// This focus info is added to state by sap.suite.ui.generic.template.lib.ContextMenuHandler when the context menu is opened
+				// If the state contains focus info, return the contexts applicable for context menu
+				if (oState.oFocusInfo && oState.oFocusInfo.smartControlId === oPresentationControl.getId()) {
+					return oState.oFocusInfo.applicableContexts;
+				}
+				return oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oPresentationControl).getSelectedContexts();
 			},
 			/**
 			 * Triggers rebinding on the list

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.124.0"
+			"version": "1.124.2"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.124.0"
+			"version": "1.124.2"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.124.0"
+			"version": "1.124.2"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -2584,6 +2584,10 @@ sap.ui.define([
 						oTemplateUtils.oCommonEventHandlers.handleUploadComplete(oEvent);
 					},
 
+					handleTypeMismatch: function(oEvent) {
+						oTemplateUtils.oCommonEventHandlers.handleTypeMismatch(oEvent);
+					},
+
 					removeStream: function(oEvent) {
 						oTemplateUtils.oCommonEventHandlers.removeStream(oEvent);
 					},

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.124.0"
+			"version": "1.124.2"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/templateSpecificPreparationHelper.js

@@ -331,13 +331,21 @@ sap.ui.define([
 			fnSetTargetEntity(oEntitySet);
 
 			var bToolbarButtonVisible = fnGetTableToolbarButtonVisibility(oSettings, oEntitySet, oResult.type);
-			var sPathforInsertRestriction = fnGetInsertRestrictionForPasteButton(oEntitySet);
+			var oPathforRestriction = fnGetRestrictionForPasteButton(oEntitySet);
 			/* Workaround fix for non draft apps with no section settings defined in the manifest. In UI5v1.93, the export to excel button is displayed by default because of a code gap in
 			   FE which later got fixed with a change related to paste button in UI5v1.96 wherein the export button is not displayed by default. This looks like a regression issue to customers
 			   for which we have provided this temporary solution which shall get removed soon. */
 			oResult.bExportToExcel = (!oComponentUtils.isDraftEnabled() && !oSettings.sections) || bToolbarButtonVisible;
-			if (sPathforInsertRestriction) {
-				oResult.vShowPasteButton = bToolbarButtonVisible ? "{= ${ui>/editable} && ${" + sPathforInsertRestriction + "}}" : false;
+			if (oPathforRestriction) {
+				var sPathforRestriction = "";
+				if (oPathforRestriction.insertable) {
+					sPathforRestriction = "${" + oPathforRestriction.insertable + "}";
+				}
+				if (oPathforRestriction.updatable) {
+					sPathforRestriction = sPathforRestriction ? sPathforRestriction + " || ${" + oPathforRestriction.updatable + "}" : "${" + oPathforRestriction.updatable + "}";
+				}
+				sPathforRestriction = sPathforRestriction && "(" + sPathforRestriction + ")";
+				oResult.vShowPasteButton = bToolbarButtonVisible ? "{= ${ui>/editable} && " + sPathforRestriction + "}" : false;
 			} else {
 				oResult.vShowPasteButton = bToolbarButtonVisible ? "{ui>/editable}" : false;
 			}
@@ -348,21 +356,39 @@ sap.ui.define([
 			return oResult;
 		}
 		
-		function fnGetInsertRestrictionForPasteButton(oEntitySet) {
+		// fnGetRestrictionForPasteButton return object contains updatable and insertable restriction for the given Entity Set.
+		function fnGetRestrictionForPasteButton(oEntitySet) {
 			var oLeadingEntitySet = oMetaModel.getODataEntitySet(sLeadingEntitySet);
-			var oInsertableAnnotation, oSectionInsertRestriction;
-			var oRestrictionSetViaNavRestrictions = AnnotationHelper.handleNavigationRestrictions(oMetaModel, oLeadingEntitySet, oEntitySet, 'Insertable');
-			if (oRestrictionSetViaNavRestrictions) {
-				oInsertableAnnotation = oRestrictionSetViaNavRestrictions['Insertable'];
+			var oInsertableAnnotation, oUpdatableAnnotation;
+			
+			var oInsertRestrictionSetViaNavRestrictions = AnnotationHelper.handleNavigationRestrictions(oMetaModel, oLeadingEntitySet, oEntitySet, 'Insertable');
+			if (oInsertRestrictionSetViaNavRestrictions) {
+				oInsertableAnnotation = oInsertRestrictionSetViaNavRestrictions['Insertable'];
 			} else {
-				oSectionInsertRestriction = oEntitySet['Org.OData.Capabilities.V1.InsertRestrictions'];
+				var oSectionInsertRestriction = oEntitySet['Org.OData.Capabilities.V1.InsertRestrictions'];
 				oInsertableAnnotation = oSectionInsertRestriction && oSectionInsertRestriction['Insertable'];
 			}
-			if (oInsertableAnnotation && oInsertableAnnotation.Path) {
-				return oInsertableAnnotation.Path;
+
+			var oUpdateRestrictionSetViaNavRestrictions = AnnotationHelper.handleNavigationRestrictions(oMetaModel, oLeadingEntitySet, oEntitySet, 'Updatable');
+			if (oUpdateRestrictionSetViaNavRestrictions) {
+				oUpdatableAnnotation = oUpdateRestrictionSetViaNavRestrictions['Updatable'];
+			} else {
+				var oSectionUpdatableRestriction = oEntitySet['Org.OData.Capabilities.V1.UpdateRestrictions'];
+				oUpdatableAnnotation = oSectionUpdatableRestriction && oSectionUpdatableRestriction['Updatable'];
+			}
+
+			var sInsertablePath = oInsertableAnnotation ? oInsertableAnnotation.Path : "";
+			var sUpdatablePath = oUpdatableAnnotation ? oUpdatableAnnotation.Path : "";
+			
+			if (sInsertablePath || sUpdatablePath) {
+				return {
+					insertable: sInsertablePath,
+					updatable: sUpdatablePath
+				};
 			}
-			return false;
+			return null;
 		}
+		
 		// used in the process of determining the visibility of export to excel and paste button depending on certain restrictions/conditions.
 		function fnGetTableToolbarButtonVisibility(oSettings, oEntitySet, sTableType) {	
 			var oInsertableAnnotation, sEntityType, oSectionInsertRestriction;

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.124.0"
+			"version": "1.124.2"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.124.0"
+		"version": "1.124.2"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -43,8 +43,6 @@ sap.ui.define(["sap/suite/ui/generic/template/lib/TemplateAssembler",
 		},
 
 		/**
-		 * @deprecated As of version 1.124, please refer the {@link topic:4120052d90374ce8b1cea24a0d8bd317 documentation} for the migration steps.
-		 * 
 		 * This method can be used to define specific controller extension(s) for a template which is used more than once within a SAP Fiori elements application.
 		 * More precisely: In the manifest of a SAP Fiori elements application, you can register a controller extension.
 		 * This controller extension is defined at <code>sap.ui5/extends/extensions/sap.ui.controllerExtensions/{template}</code>.
@@ -64,6 +62,7 @@ sap.ui.define(["sap/suite/ui/generic/template/lib/TemplateAssembler",
 		 * @param mEntitySetToImplementation a map. As a key, use the name of the entity set for which the (controller of the) page should be extended. As a value, use an
 		 * instance of the corresponding class as described above.
 		 * @public
+		 * @deprecated As of version 1.120, please refer the {@link topic:4120052d90374ce8b1cea24a0d8bd317 documentation} for the migration steps.
 		 */
 		registerControllerExtensions: function(sControllerExtensionName, mEntitySetToImplementation){
 			var oControllerDefinition = {

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

@@ -1,7 +1,6 @@
 <core:FragmentDefinition
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
-	xmlns:fesr="http://schemas.sap.com/sapui5/extension/sap.ui.core.FESR/1"
 	xmlns:macrodata="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1">
 	<Popover
 		id="quickView-popover"
@@ -10,7 +9,8 @@
 		initialFocus="action"
 		showHeader="false"
 		contentWidth="20rem"
-		afterClose="afterClose">
+		afterClose="afterClose"
+		afterOpen="afterOpen">
         <VBox>
             <HBox class="sapUiSmallMarginBottom">
                 <Avatar
@@ -18,6 +18,7 @@
 					displaySize="S"
 					displayShape="Circle"
 					class="sapUiTinyMarginEnd"
+					tooltip="{contact>/contactStatus/badgeTooltip}"
 					badgeValueState="{contact>/contactStatus/badgeValueState}" badgeIcon="{contact>/contactStatus/badgeIcon}" badgeTooltip="{contact>/contactStatus/badgeTooltip}"
 					macrodata:type="{contact>/teamsCollabOptions/0/key}"
 					macrodata:email="{contact>/email}"
@@ -33,8 +34,8 @@
 			<VBox visible="{= ${contact>/teamsCollabOptions} !== undefined &amp;&amp; ${contact>/teamsCollabOptions}.length > 0 }" class="sapUiSmallMarginBottom">
 				<Toolbar width="100%" height="1px"/>
 				<Toolbar >
-					 <Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
-					 <ToolbarSpacer/>
+					<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
+					<ToolbarSpacer/>
 					<Button
 						icon="{contact>/teamsCollabOptions/0/icon}"
 						tooltip="{contact>/teamsCollabOptions/0/tooltip}"
@@ -42,8 +43,7 @@
 						macrodata:email="{contact>/email}"
 						press=".onTeamsCollabOptionPress"
 						class="sapUiTinyMarginEnd sapUiTinyMarginBegin"
-						type="Ghost"
-						fesr:press="{contact>/teamsCollabOptions/0/fesrStepName}">
+						type="Ghost">
 					</Button>
 					<Button
 						icon="{contact>/teamsCollabOptions/1/icon}"
@@ -51,16 +51,14 @@
 						macrodata:email="{contact>/email}"
 						press=".onTeamsCollabOptionPress"
 						class="sapUiTinyMarginEnd"
-						type="Ghost"
-						fesr:press="{contact>/teamsCollabOptions/1/fesrStepName}">
+						type="Ghost">
 					</Button>
 					<Button
 						icon="{contact>/teamsCollabOptions/2/icon}"
 						macrodata:type="{contact>/teamsCollabOptions/2/key}"
 						macrodata:email="{contact>/email}"
 						press=".onTeamsCollabOptionPress"
-						type="Ghost"
-						fesr:press="{contact>/teamsCollabOptions/2/fesrStepName}">
+						type="Ghost">
 					</Button>
 				</Toolbar>
 			</VBox>

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

@@ -79,6 +79,7 @@
                                     sendXHR="true" useMultipart="false" sameFilenameAllowed="true" uploadOnChange="false" httpRequestMethod="Put"
                                     uploadUrl="{parts: [{path: 'entitySet>'}, {path: 'dataField>'}], formatter: 'AHStream.getURLForStream'}"
                                     change="._templateEventHandlers.uploadStream" uploadComplete="._templateEventHandlers.handleUploadComplete"
+                                    typeMissmatch="._templateEventHandlers.handleTypeMismatch"
                                     visible="{parts: [{path:'parameter>/isDraftEnabled'}, {path: 'entitySet>'}], formatter: 'AHStream.getFileUploaderVisibility'}"
                                     mimeType="{parts: [{path: 'entitySet>'}], formatter: 'AHStream.getAcceptableMimeTypes'}"
                                     ariaLabelledBy="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageSection', subType: 'FileUploaderLabel', sFacet: ${facetId>id}})}">

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

@@ -53,9 +53,11 @@ sap.ui.define([
                     // don't create UiState (managed object) from scratch, but fetch it from control and only apply known properties from state - thus, if any other properties would be added, we don't
                     // interfere with them
                     var oUiState = oControl.getUiState();
-                    oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
-                    oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
-                    oControl.setUiState(oUiState);
+                    if (!oUiState.getProperty("variantName")){
+                        oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
+                        oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
+                        oControl.setUiState(oUiState);
+                    }
                     bIsApplying = false;
                 } else {
                     // set standard variant to overcome "implicit personalization" (esp. for OP when navigating to different object in discovery mode)
@@ -198,7 +200,7 @@ sap.ui.define([
             setState: fnSetState,
             setControl: fnSetControl,
             attachStateChanged: fnAttachStateChanged,
-            bVMConnection: bVariantManagementActive
+            bVMConnection: oSmartControl && oSmartControl.getSmartVariant && !!oSmartControl.getSmartVariant()
         };
     }
 

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,7 +102,7 @@ sap.ui.define([
 			}
 			propLen--;
 		}
-		return undefined;
+		return { edmType: undefined, sSemantic: undefined, sSapUnit: undefined };
 	};
 
 	var fnExtractDataFromDataPoint = function (item, controller) {
@@ -121,7 +126,10 @@ sap.ui.define([
 			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();
 
@@ -228,7 +236,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 +285,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 +333,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 +352,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() {

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

@@ -919,7 +919,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @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/CRUDHelper.js

@@ -523,15 +523,18 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 									aTransientErrors.push(oMessage);
 								}
 							});
-							var bHasStateError = aCurrentStateMessages.some(function(oMessage){
+							var bHasStateError = aCurrentStateMessages.some(function(oMessage) {
 								return oMessage.type === "Error";
 							});
 							var bIsWarning = bIs412 && !bHasStateError;
-							if (bIsWarning){
+							if (bIsWarning) {
 								// Only show transient warnings in the confirmation popup if no state warning is available (note that backend sometimes sends warnings redundantly as transient and state message)
-								var aMessagesForUserDecision = aCurrentStateMessages.length > 0 ? aCurrentStateMessages : aTransientWarnings;
+								var bHasStateWarning = aCurrentStateMessages.some(function(oMessage) {
+									return oMessage.type === "Warning";
+								});
+								var aMessagesForUserDecision = bHasStateWarning ? aCurrentStateMessages : aTransientWarnings;
 								var oCustomMessageProvider = aCurrentStateMessages.length === 0 && { // if confirmation popup is to show transient messages these messages should be excluded from the
-									isCustomMessage: function(oMessage){                             // normal handling of transient messages (until the confirmation popup is closed)
+									isCustomMessage: function (oMessage) {                             // normal handling of transient messages (until the confirmation popup is closed)
 										return aTransientWarnings.indexOf(oMessage) >= 0;
 									}
 								};

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

@@ -1998,6 +1998,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 +2688,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/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/ShareUtils.js

@@ -1,7 +1,7 @@
 sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkButton",
 	"sap/suite/ui/commons/collaboration/ServiceContainer", "sap/ui/core/CustomData", 'sap/ui/performance/trace/FESRHelper', "sap/ui/core/Component",
-	"sap/suite/ui/generic/template/lib/AdaptiveCardHelper", "sap/m/MenuItem", "sap/ui/core/Lib"
-], function (ObjectPath, AddBookmarkButton, ServiceContainer, CustomData, FESRHelper, Component, AdaptiveCardHelper, MenuItem, Library) {
+	"sap/suite/ui/generic/template/lib/AdaptiveCardHelper", "sap/m/MenuItem", "sap/ui/core/Lib", "sap/suite/ui/commons/windowmessages/CollaborationMessageConsumer"
+], function (ObjectPath, AddBookmarkButton, ServiceContainer, CustomData, FESRHelper, Component, AdaptiveCardHelper, MenuItem, Library, CollaborationMessageConsumer) {
 	"use strict";
 
 	var ShareUtils = {};
@@ -19,127 +19,6 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 		}) : Promise.resolve(document.URL);
 	}
 
-	function getMSTeamsConfigFromMessageBroker () {
-		return getCurrentUrl().then(function(sCurrentUrl){
-			var sHostName = sCurrentUrl.split(sCurrentUrl.getHash(sCurrentUrl))[0].split('/')[2];
-			return new Promise(function (fnResolve) {
-				var MY_CLIENT_ID = "sap-suite-ui-commons-collaboration-client-appruntime";
-				var PLUGIN_CLIENT_ID = "sap-suite-ui-commons-collaboration-message-broker";
-				var CHANNEL_ID = "collaboration-channel";
-				var MSG_NAME = "get-provider-config";
-				var aSubscribedChannels = [
-					{
-						channelId: CHANNEL_ID,
-						version: "1.0"
-					}
-				];
-				var oFLPWindow = window.parent;
-				var failTimerId;
-				var bResponseReturned = false;
-	
-				//callback function to get messages from the message broker in the outer shell
-				function processMessages (oMessage) {
-					var oMessageData;
-					if (typeof oMessage.data === "string" && oMessage.data.indexOf("sap.ushell.services.MessageBroker") > 0) {
-						try {
-							oMessageData = JSON.parse(oMessage.data);
-							//connection accepted, now subscribe to the channel
-							if (oMessageData.service === "sap.ushell.services.MessageBroker" &&
-								oMessageData.type === "response" &&
-								oMessageData.body.channelId === "sap.ushell.MessageBroker" &&
-								oMessageData.body.clientId === MY_CLIENT_ID &&
-								oMessageData.body.messageName === "connect" &&
-								oMessageData.body.status === "accepted") {
-								setTimeout(function () {
-									oFLPWindow.postMessage(JSON.stringify({
-										type: "request",
-										service: "sap.ushell.services.MessageBroker",
-										request_id: Date.now().toString(),
-										body: {
-											channelId: "sap.ushell.MessageBroker",
-											clientId: MY_CLIENT_ID,
-											messageName: "subscribe",
-											subscribedChannels: aSubscribedChannels
-										}
-									}), sHostName);
-								}, 0);
-							}
-							//subscription is ok, get the teams config from the shell plugin
-							if (oMessageData.service === "sap.ushell.services.MessageBroker" &&
-								oMessageData.type === "response" &&
-								oMessageData.body.channelId === "sap.ushell.MessageBroker" &&
-								oMessageData.body.clientId === MY_CLIENT_ID &&
-								oMessageData.body.messageName == "subscribe" &&
-								oMessageData.body.status === "accepted") {
-								setTimeout(function () {
-									oFLPWindow.postMessage(JSON.stringify({
-										type: "request",
-										service: "sap.ushell.services.MessageBroker",
-										request_id: Date.now().toString(),
-										body: {
-											channelId: CHANNEL_ID,
-											targetClientIds: [PLUGIN_CLIENT_ID],
-											data: {},
-											clientId: MY_CLIENT_ID,
-											messageName: MSG_NAME
-										}
-									}), sHostName);
-								}, 0);
-							}
-							if (oMessageData.service === "sap.ushell.services.MessageBroker" &&
-								oMessageData.type === "request" &&
-								oMessageData.body.channelId === CHANNEL_ID &&
-								oMessageData.body.clientId === PLUGIN_CLIENT_ID &&
-								oMessageData.body.messageName == MSG_NAME) {
-								if (failTimerId) {
-									clearTimeout(failTimerId);
-								}
-								if (!bResponseReturned) {
-									fnResolve(JSON.parse(oMessageData.body.data));
-								}
-							}
-						} catch (e) {
-							fnResolve({});
-						}
-					}
-				}
-				window.addEventListener("message", processMessages);
-				//connect to the message broker
-				oFLPWindow.postMessage(JSON.stringify({
-					"type": "request",
-					"service": "sap.ushell.services.MessageBroker",
-					"request_id": Date.now().toString(),
-					"body": {
-						"channelId": "sap.ushell.MessageBroker",
-						"clientId": MY_CLIENT_ID,
-						"messageName": "connect"
-					}
-				}), sHostName);
-	
-				//disconnect to the message broker after 2 seconds
-				setTimeout(function () {
-					oFLPWindow.postMessage(JSON.stringify({
-						"type": "request",
-						"service": "sap.ushell.services.MessageBroker",
-						"request_id": Date.now().toString(),
-						"body": {
-							"channelId": "sap.ushell.MessageBroker",
-							"clientId": MY_CLIENT_ID,
-							"messageName": "disconnect"
-						}
-					}), sHostName);
-					window.removeEventListener("message", processMessages);
-				}, 2000);
-	
-				//if the outer shell did not answer within 1.5 seconds, assume there is no plugin
-				failTimerId = setTimeout(function () {
-					bResponseReturned = true;
-					fnResolve({});
-				}, 1500);
-			});
-		});
-	}
-
 	ShareUtils.getCurrentUrl = getCurrentUrl;
 
 	/**
@@ -212,8 +91,7 @@ sap.ui.define(["sap/base/util/ObjectPath", "sap/ushell/ui/footerbar/AddBookmarkB
 			oFragmentController.getModelData().then(function (oFragmentModelData) {
 				oShareModel.setData(oFragmentModelData, true);
 				if (oUshellContainer && oUshellContainer.inAppRuntime()) {
-					var oMessageBrokerPromise = getMSTeamsConfigFromMessageBroker();
-					oMessageBrokerPromise.then(function(oProviderConfiguration){
+					CollaborationMessageConsumer.getProviderConfiguration().then(function(oProviderConfiguration){
 						ServiceContainer.getServiceAsyncForAppRuntime(oProviderConfiguration).then(function (oTeamsHelper) {
 							that.addMenuItem(oShareModel, oTeamsHelper, oShareActionSheet, oControlToOpenBy);
 						});

package/src/sap/suite/ui/generic/template/lib/i18n/i18n.properties

@@ -67,6 +67,9 @@ ST_UNSAVED_CHANGES_TITLE=Unsaved Changes
 # XTIT, 30
 ST_STREAM_OPEN_FILE=Open File
 
+# XMSG
+ST_STREAM_TYPE_MISMATCH=Selected file type is not supported.
+
 #XFLD: this text will be used to add additional information to the draft type in the list report for locked objects or objects with unsaved changes it will read like "Unsaved Changes by User" the "Unsaved Changes" part is provided by the control itself
 ST_DRAFT_OWNER=by {0}
 

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

@@ -844,7 +844,17 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 						}
 					}
 
-					oColumnObject['title'] = (oProperty['com.sap.vocabularies.Common.v1.Label'] && oProperty['com.sap.vocabularies.Common.v1.Label'].String) || oProperty['sap:label'];
+					if (oProperty['com.sap.vocabularies.Common.v1.Label'] && oProperty['com.sap.vocabularies.Common.v1.Label'].String) {
+						var sLabel = oProperty['com.sap.vocabularies.Common.v1.Label'].String,
+						oRB = oCardDefinition['component'].getModel('i18n').getResourceBundle();
+						if (sLabel.match(/{@i18n>.+}/gi) && oRB) {
+							oColumnObject['title'] = oRB.getText(sLabel.substring(sLabel.indexOf(">") + 1, sLabel.length - 1));
+						} else {
+							oColumnObject['title'] = sLabel;
+						}
+					} else {
+						oColumnObject['title'] = oProperty['sap:label'];
+					}
 					if (oProperty.type === 'Edm.DateTime' || oProperty.type === 'Edm.DateTimeOffset') {
 						var oFormatOption = JSON.stringify(oColumnData.typeInstance.oFormat.oFormatOptions).replace(/"/g, "'");
 						oColumnObject['value'] = "{=$" + sColumnValue + " ? format.dateTime($" + sColumnValue + ", " + oFormatOption + ") : ''}";

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

@@ -4,8 +4,9 @@ sap.ui.define([
     "sap/m/MessageBox",
     "sap/suite/ui/generic/template/lib/insights/InsightsCardHelper",
     "sap/suite/ui/generic/template/lib/cards/DTCardHelper",
-    "sap/base/util/merge"
-], function(BaseObject, extend, MessageBox, InsightsCardHelper, DTCardHelper, merge) {
+    "sap/base/util/merge",
+    "sap/base/util/deepClone"
+], function(BaseObject, extend, MessageBox, InsightsCardHelper, DTCardHelper, merge, deepClone) {
     'use strict';
     function getMethods(oState, oController, oTemplateUtils) {
 
@@ -58,37 +59,36 @@ sap.ui.define([
             };
 
             // updating the same card to the global model so that the additional details can be used when card detail is requested from a card consumer.
-            var oShareCardInfo = Object.create(null);
+            var oShareCardInfo = deepClone(oCardInfo);
 
             var fnGetCardInfoPromise = new Promise(function (fnResolve) {
                 if (sType === InsightsCardHelper.CardTypes.DT_CARD) {
                     oState.oDTCardHelper.getCardManifest(DTCardHelper.CardTypes.INTEGRATION)
-                        .then(function (oCardManifest) {
-                            if (!oCardManifest) {
-                                fnResolve(null);
-                                return;
-                            }
-                            oCardInfo.descriptorContent = merge(
-                                oCardManifest,
-                                oCardInfo.descriptorContent
-                            );
-                            fnResolve(oCardInfo);
-                    })
-                        .catch(function (oError) {
+                    .then(function (oCardManifest) {
+                        if (!oCardManifest) {
                             fnResolve(null);
-                        });
+                            return;
+                        }
+                        oShareCardInfo.descriptorContent = merge(
+                            oShareCardInfo.descriptorContent,
+                            oCardManifest
+                        );
+                        fnResolve(oShareCardInfo);
+                    })
+                    .catch(function (oError) {
+                        fnResolve(null);
+                    });
                 } else {
-                    fnResolve(oCardInfo);
+                    fnResolve(oShareCardInfo);
                 }
             });
-            return fnGetCardInfoPromise.then(function (oCardInfo) {
-                if (oCardInfo) {
-                    extend(oShareCardInfo, oCardInfo);
+            return fnGetCardInfoPromise.then(function (oShareCardInfo) {
+                if (oShareCardInfo) {
                     oShareCardInfo.cardType = sType;
                     oShareCardInfo.viewId = sViewId;
                     oTemplatePrivateGlobalModel.setProperty("/generic/insights/shareCards/" + iViewLevel, [oShareCardInfo]);
                 }
-                return oCardInfo ? [oCardInfo] : [];
+                return oShareCardInfo ? [oCardInfo] : [];
             });
             
         }

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3055,7 +3055,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.124.0
+	 * @version 1.124.2
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

@@ -62,7 +62,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.124.0",
+		version: "1.124.2",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {

package/src/sap/suite/ui/generic/template/listTemplates/controller/DetailController.js

@@ -812,7 +812,7 @@ sap.ui.define([
 			 */
 			_getSelParamsFromChart: function(chart) {
 				var dpList = [];
-				dpList = chart.getSelectedDataPoints().dataPoints;
+				dpList = this.oState.oTemplateUtils.oCommonUtils.getSelectionPoints(chart).dataPoints;
 				return this._getSelParamsFromDPList(dpList);
 			},
 			/**

package/src/sap/suite/ui/generic/template/listTemplates/controller/IappStateHandler.js

@@ -247,6 +247,8 @@ sap.ui.define(["sap/ui/base/Object",
 				sNavType = sap.fe.navigation.NavType.iAppState;
 			}
 			oState.oSmartFilterbar.setSuppressSelection(false);
+			//Pref Improvement - Resume SetFilterData
+			oState.oSmartFilterbar.resumeSetFilterData();
 			var sAppStateKey = oAppData.appStateKey || "";
 			//Make sure that no two resolve functions are executing at the same time.
 			if (bIsTransferringUrlStateToPageState){
@@ -260,8 +262,6 @@ sap.ui.define(["sap/ui/base/Object",
 			bIsTransferringUrlStateToPageState = true;
 			oState.sNavType = sNavType;
 			var oNewUrlParameters = (!sAppStateKey && oURLParameters) || {};
-			//Pref Improvement - Resume SetFilterData
-			oState.oSmartFilterbar.resumeSetFilterData();
 			handleVariantIdPassedViaURLParams(oNewUrlParameters);
 			//Apply sort order coming from the XAppState to the smart table.
 			if (sNavType !== sap.fe.navigation.NavType.iAppState && oAppData.presentationVariant !== undefined) {

package/src/sap/suite/ui/generic/template/listTemplates/controller/SmartChartController.js

@@ -283,7 +283,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller",
 				var oEvent = deepExtend({}, ev);
 				setTimeout(function() { // due to the selection data points not being updated during the deselectData event, must check again asynchronously
 					var chart = me.oChart;
-					if (chart.getSelectedDataPoints().count == 0) {// Clear the filter if no selections remain.  If a selection exists it would have come through the SelectData event
+					if (me.oState.oTemplateUtils.oCommonUtils.getSelectionPoints(chart).count == 0) {// Clear the filter if no selections remain.  If a selection exists it would have come through the SelectData event
 						me._updateTable();
 					} else if (chart.getSelectionMode() == "MULTIPLE") {// Treat an unselect with remaining selection points as a select
 						me._onChartSelectData(oEvent);