@sapui5/sap.suite.ui.generic.template 1.126.0 → 1.127.1

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

@@ -44,7 +44,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				return oListEntry.PropertyPath === oProperty;
 			});
 		};
-		
+
 		var bNotSortable = fnHasListProperty(oContextSet["Org.OData.Capabilities.V1.SortRestrictions"] && oContextSet["Org.OData.Capabilities.V1.SortRestrictions"].NonSortableProperties);
 		var oFilterRestrictions = oContextSet["Org.OData.Capabilities.V1.FilterRestrictions"];
 		var bNotFilterable = !!oFilterRestrictions && (oFilterRestrictions.Filterable === "false" || fnHasListProperty(oFilterRestrictions.NonFilterableProperties));
@@ -325,7 +325,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					return oHidden["com.sap.vocabularies.UI.v1.Hidden"].Bool !== "true";
 				}
 				return false; // <Annotation Term="UI.Hidden"/>
-			} 
+			}
 			return true;
 		},
 
@@ -510,10 +510,10 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				if (sP13N) {
 					oP13N = JSON.parse(sP13N.replace(/\\/g, ""));
 				}
-				
+
 				oP13N.leadingProperty && (aAdditionalPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
 				oP13N.leadingProperty && (aAdditionalSortPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalSortPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
-				
+
 				oP13N.navigationProperty && (aNavigationPropertiesForSCColumn.indexOf(oP13N.navigationProperty) === -1) ? aNavigationPropertiesForSCColumn.push(oP13N.navigationProperty) : Function.prototype;
 				// Add "additionalProperty" of current data field to the "additionalProperty" of current column's p13n
 				oP13N.additionalProperty && (aAdditionalPropertiesForSCColumn.indexOf(oP13N.additionalProperty) === -1) ? aAdditionalPropertiesForSCColumn.push(oP13N.additionalProperty) : Function.prototype;
@@ -1045,13 +1045,13 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var oDataField = {"Path":oSmartField.path};
 			return AnnotationHelperModel.simplePath(oInterface.getModel() ? oInterface : oInterface.getInterface(0), oDataField);
 		},
-		
+
 		// build expression binding for bread crumbs
 		buildBreadCrumbExpression: function (oContext, oTreeNode) {
 			var oHeaderInfo = oTreeNode.entityTypeDefinition && oTreeNode.entityTypeDefinition["com.sap.vocabularies.UI.v1.HeaderInfo"];
 			var oTitle = oHeaderInfo && oHeaderInfo.Title &&  oHeaderInfo.Title.Value;
 			var sBindingTitle = oTitle && AnnotationHelperModel.format(oContext, oTitle);
-			var oTypeName = oHeaderInfo && oHeaderInfo.TypeName;                         
+			var oTypeName = oHeaderInfo && oHeaderInfo.TypeName;
 			// Revisit (AncestorFeature)
 			//sBindingTitle = sBindingTitle.replace("{", "{" + oTreeNode.specificModelName + ">");
 			if (oTitle && oTitle.Path && oTypeName && oTypeName.String) {
@@ -1138,7 +1138,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		},
 
 		// Returns the creation mode that has been configured for the given facet if defined, else returns the global level creation mode
-		getCreationMode: function (oFacet, oGlobalSettings) {
+		getCreationMode: function (oFacet, oGlobalSettings, oAppSettings) {
 			var oSections = oGlobalSettings && oGlobalSettings.sections;
 			var oSettings = oSections && oSections[oAnnotationHelper.getStableIdPartFromFacet(oFacet)];
 			var sCreateMode;
@@ -1146,10 +1146,18 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				sCreateMode = oSettings.createMode;
 			} else if (oGlobalSettings && oGlobalSettings.createMode) {
 				sCreateMode = oGlobalSettings.createMode;
+			} else if (oGlobalSettings && oGlobalSettings.tableSettings && oGlobalSettings.tableSettings.createMode) {
+				sCreateMode = oGlobalSettings.tableSettings.createMode;
+			} else if (oAppSettings && oAppSettings.getTableSettings() && oAppSettings.getTableSettings().createMode){
+				sCreateMode = oAppSettings.getTableSettings().createMode;
 			} else {
 				sCreateMode = "";
 			}
-		
+			// If we have specific value -> reset to value that will enforce table create new entry default behavior
+			if (sCreateMode === "newPage") {
+				sCreateMode = "";
+			}
+
 			return sCreateMode;
 		},
 
@@ -1206,7 +1214,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				var sPostfix = "], formatter: 'formatImageUrl'}";
 				return sPrefix + sInfix + sPostfix;
 			}
-			// Apply 
+			// Apply
 			oImageUrl.Apply.Parameters[0].Value = utils.adjustImageUrlPath(oImageUrl.Apply.Parameters[0].Value, sAppComponentName);
 			return AnnotationHelperModel.format(oInterface, oImageUrl);
 		},
@@ -1228,8 +1236,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 		getAvatarInitials: function (oInitials) {
 			return (oInitials && (oInitials.Path ? ("{" + oInitials.Path + "}") : oInitials.String) || "");
-		
-		},		
+
+		},
 
 		formatImageOrTypeUrl: function (oInterface, oInputImageUrl, oTypeImageUrl, sAppComponentName, bExpand) {
 			var oImageUrl = oInputImageUrl || oTypeImageUrl;
@@ -1238,7 +1246,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 		formatHeaderImage: function (oInterface, oHeaderInfo, sAppComponentName) {
 			return oAnnotationHelper.formatImageOrTypeUrl(oInterface, oHeaderInfo.ImageUrl, oHeaderInfo.TypeImageUrl, sAppComponentName, true);
-		},		
+		},
 
 		getPathWithExpandFromHeader: function (oInterface, oEntitySet, sNavigationProperty, oInputImageUrl, oTypeImageUrl) {
 			var sExpand, sNavigationPath;
@@ -1758,7 +1766,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			return iDraftColumnIndex;
 		},
 
-		// Calculating the column index of Draft Indicator Column for sap.ui.table based on the column index of last Semantic key available 
+		// Calculating the column index of Draft Indicator Column for sap.ui.table based on the column index of last Semantic key available
 		// or else on the 1st Index of the table.
 		_determineColumnIndexForDraftColumn: function (oContext, oLineItem) {
 			var sLineItemPath = oContext.getPath();
@@ -2099,7 +2107,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 		createP13NFileUploader: function(oInterface, oContextSet, mColumnWidthIncludingColumnHeader) {
 			var oEntityType = oInterface.getModel(0).getODataEntityType(oContextSet.entityType);
-			var sP13N = ""; 
+			var sP13N = "";
 			var oContentDisposition = oEntityType && oEntityType["Org.OData.Core.V1.ContentDisposition"];
 			var sColumnKey = oContentDisposition && oContentDisposition.Filename && oContentDisposition.Filename.Path;
 			var bIsWidthIncludingColumnHeader = calculateColumnHeader(mColumnWidthIncludingColumnHeader, sColumnKey);
@@ -2165,7 +2173,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				if (oContextProp["com.sap.vocabularies.Common.v1.Text"] && oContextProp["com.sap.vocabularies.Common.v1.Text"].Path) {
 					aAdditionalProperties.push(sNavigation + oContextProp["com.sap.vocabularies.Common.v1.Text"].Path);
 				}
-				
+
 				var oUnitAnnotation = oContextProp["Org.OData.Measures.V1.ISOCurrency"] || oContextProp["Org.OData.Measures.V1.Unit"];
 				if (oUnitAnnotation && oUnitAnnotation.Path) {
 					aAdditionalProperties.push(oUnitAnnotation.Path);
@@ -2372,7 +2380,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				return false;
 			}
 			var sImageSrc = oAnnotationHelper.formatImageUrl(oInterface, oImageUrl, sAppComponentName);
-			return !!sImageSrc; 
+			return !!sImageSrc;
 		},
 		getVisibilityForExtensionPointBeforeSimpleHeaderFacet: function (sEntitySet, oFacet, oManifestExtend, oDataField) {
 			var sSecondHalfIdPart;
@@ -2651,11 +2659,11 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		 * - Boolean value or
 		 * - Expression binding
 		 */
-		isRelatedEntityCreatable: function (oInterface, oSourceEntitySet, oRelatedEntitySet, aSubPages, oFacet, oGlobalSettings, bIsDraftEnabled, oCreateWithParameterDialog, sTableType) {
+		isRelatedEntityCreatable: function (oInterface, oSourceEntitySet, oRelatedEntitySet, aSubPages, oFacet, oGlobalSettings, bIsDraftEnabled, oCreateWithParameterDialog, sTableType, oAppSettings) {
 			var bHasSubObjectPage = oAnnotationHelper.hasSubObjectPage(oRelatedEntitySet, aSubPages),
-				sTableCreationMode = oAnnotationHelper.getCreationMode(oFacet, oGlobalSettings),
+				sTableCreationMode = oAnnotationHelper.getCreationMode(oFacet, oGlobalSettings, oAppSettings),
 				bIsInlineCreationMode = ["inline", "creationRows", "creationRowsHiddenInEditMode"].includes(sTableCreationMode);
-				
+
 			if (bHasSubObjectPage || bIsInlineCreationMode || oCreateWithParameterDialog) {
 				var aConditions = [],
 					sFinalCondition,
@@ -2708,7 +2716,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			// If the creatable path is boolean, return it
 			if (typeof vCreatablePath === "boolean") {
 				return vCreatablePath;
-			}	
+			}
 			// Return the creatable path is a valid property path (string), create an expression and return it
 			var sPrefix = (oCreatablePathObj.negate) ? "!" : "!!";
 			var sCreatablePathExp = sPrefix + "${" + vCreatablePath + "}";
@@ -2745,7 +2753,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		 * @returns {object} oResult - an object contains the creatable path info
 		 * oResult.creatable - true or false or the creatable-path (string)
 		 * oResult.negate - true when the creatable path is a non-insertable navigation property
-		 * 
+		 *
 		 */
 		getCreatablePath: function (oInterface, oSourceEntitySet, oRelatedEntitySet) {
 
@@ -2755,7 +2763,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var oSourceEntityType = oModel.getODataEntityType(oSourceEntitySet.entityType);
 			var oRestrictionSetViaNavRestrictions;
 			var sFullCreatablePath;
-			
+
 			// check if there are Insert Restrictions.
 			oRestrictionSetViaNavRestrictions = oAnnotationHelper.handleNavigationRestrictions(oModel, oSourceEntitySet, oRelatedEntitySet, "Insertable");
 			if (oRestrictionSetViaNavRestrictions && oRestrictionSetViaNavRestrictions["Insertable"]) {
@@ -2795,7 +2803,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					}
 				}
 			}
-			
+
 			return oResult;
 		},
 		/***************************************************************
@@ -3179,9 +3187,9 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		 * Responsibility, resolve paths at pre-processing
 		 * @function
 		 * @private
-		 * @parameter {sap.ui.core.util.XMLPreprocessor.IContext|sap.ui.model.Context} oInterface Callback interface object
-		 * @parameter {map} dataPoint A DataPoint map as per the vocabulary term com.sap.vocabularies.UI.v1.DataPoint
-		 * @parameter {map} [mUoM] A map containing the unit of measure as per the vocabulary term Org.OData.Measures.V1.Unit or Org.OData.Measures.V1.ISOCurrency
+		 * @param {sap.ui.core.util.XMLPreprocessor.IContext|sap.ui.model.Context} oInterface Callback interface object
+		 * @param {map} dataPoint A DataPoint map as per the vocabulary term com.sap.vocabularies.UI.v1.DataPoint
+		 * @param {map} [mUoM] A map containing the unit of measure as per the vocabulary term Org.OData.Measures.V1.Unit or Org.OData.Measures.V1.ISOCurrency
 		 * @returns {string} A binding expression containing the formula to calculate the Progress Indicator percent value
 		 */
 		buildExpressionForProgressIndicatorPercentValue: function (oInterface, dataPoint, mUoM) {
@@ -3223,9 +3231,9 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		 * This formatter is called at pre-processing time
 		 * @function
 		 * @private
-		 * @parameter {sap.ui.core.util.XMLPreprocessor.IContext|sap.ui.model.Context} oInterface Callback interface object
-		 * @parameter {map} dataPoint A DataPoint map as per the vocabulary term com.sap.vocabularies.UI.v1.DataPoint
-		 * @parameter {map} [mUoM] A map containing the unit of measure as per the vocabulary term Org.OData.Measures.V1.Unit or Org.OData.Measures.V1.ISOCurrency
+		 * @param {sap.ui.core.util.XMLPreprocessor.IContext|sap.ui.model.Context} oInterface Callback interface object
+		 * @param {map} dataPoint A DataPoint map as per the vocabulary term com.sap.vocabularies.UI.v1.DataPoint
+		 * @param {map} [mUoM] A map containing the unit of measure as per the vocabulary term Org.OData.Measures.V1.Unit or Org.OData.Measures.V1.ISOCurrency
 		 * @returns {string} A binding expression containing the formatter and parts to compute the Progress Indicator display value
 		 */
 		buildExpressionForProgressIndicatorDisplayValue: function (oInterface, dataPoint, mUoM) {
@@ -3248,8 +3256,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		 * This formatter is called at pre-processing time
 		 * @function
 		 * @private
-		 * @parameter {sap.ui.core.util.XMLPreprocessor.IContext|sap.ui.model.Context} oInterface Callback interface object
-		 * @parameter {map} [mUoM] A map containing the unit of measure as per the vocabulary term Org.OData.Measures.V1.Unit or Org.OData.Measures.V1.ISOCurrency
+		 * @param {sap.ui.core.util.XMLPreprocessor.IContext|sap.ui.model.Context} oInterface Callback interface object
+		 * @param {map} [mUoM] A map containing the unit of measure as per the vocabulary term Org.OData.Measures.V1.Unit or Org.OData.Measures.V1.ISOCurrency
 		 * @returns {string} A binding expression containing the display value for the tooltip
 		 */
 		getProgressIndicatorTooltip: function (oInterface, mUoM) {
@@ -3265,8 +3273,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		 * Step 1: Check if datapoint is annotated with CriticalityType or CriticalityCalculationType
 		 * Step 2: For CriticalityType build the binding expression to check if the property contains, Name or Value of the enumType (Example: 'UI.CriticalityType/Neutral' or '0')
 		 * Other cases are not valid and the default sap.ui.core.ValueState.None will be returned
-		 * @parameter {sap.ui.core.util.XMLPreprocessor.IContext|sap.ui.model.Context} oInterface Callback interface object
-		 * @parameter {map} dataPoint A DataPoint map as per the vocabulary term com.sap.vocabularies.UI.v1.DataPoint
+		 * @param {sap.ui.core.util.XMLPreprocessor.IContext|sap.ui.model.Context} oInterface Callback interface object
+		 * @param {map} dataPoint A DataPoint map as per the vocabulary term com.sap.vocabularies.UI.v1.DataPoint
 		 * @returns {string} A binding expression for the criticality property of the Progress Indicator
 		 */
 		buildExpressionForProgressIndicatorCriticality: function (oInterface, dataPoint) {
@@ -3383,8 +3391,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		/**
 		 * Get entity set name for Smart Chart and Smart MicroChart.
 		 * Returns the name of the main entity set (current node in the object page) or the referenced entity set (as per the target of the annotation path).
-		 * @parameter {object} refEntitySet The referenced entity set
-		 * @parameter {object} entitySet The entity set of the current object in the page
+		 * @param {object} refEntitySet The referenced entity set
+		 * @param {object} entitySet The entity set of the current object in the page
 		 * @returns {string} sEntitySetName The entity set name for the main object type or the referenced entity set
 		 */
 		getEntitySetName: function (refEntitySet, entitySet) {
@@ -3415,7 +3423,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		getActionCommandVisibility: function (sButtonId) {
 			return !sButtonId || "{= " + oAnnotationHelper.getControlVisibleTerm(sButtonId) + " && " + oAnnotationHelper.getControlEnabledTerm(sButtonId) + "}";
 		},
-		
+
 		buildVisibilityExprOfDataFieldForIntentBasedNaviButton: function (oDataField) {
 			//If UI.Hidden annotation is used, UI.Hidden gets the highest priority
 			if (oDataField["com.sap.vocabularies.UI.v1.Hidden"]) {
@@ -3743,7 +3751,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 			return sRet;
 		},
-		
+
 		// Note: This function is a temporary solution. It imitates the logic implemented by AnnotationHelperModel.simplePath and returns false exactly when that function would return a binding string but
 		// logs that this binding string is incorrect. In all other cases it returns true (even if AnnotationHelperModel.simplePath throws an exception).
 		isDataFieldRenderable: function(oInterface, oDataFieldValue){
@@ -3796,7 +3804,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 						AnnotationHelperModelBasics.expectType(oSubPathValue, "string");
 						// Note: "PropertyPath" is treated the same...
 						var oTarget = AnnotationHelperModelBasics.followPath(oSubPathValueInterface, {"Path" : sBindingPath});
-						return !!(oTarget && oTarget.resolvedPath);				
+						return !!(oTarget && oTarget.resolvedPath);
 
 				case "Bool": // 14.4.2 Expression edm:Bool
 				case "Date": // 14.4.3 Expression edm:Date
@@ -3825,7 +3833,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					return true;
 				default:
 					return true;
-			}			
+			}
 		},
 
 		setNoDataTextForSmartTable: function (sEntitySet, sSmartTableId) {
@@ -4140,13 +4148,13 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 			if (oAddress[0].locality) {
 				sAddress += (AnnotationHelperModel.format(oInterface, oAddress[0].locality) + ", ");
-			} 
+			}
 			if (oAddress[0].region) {
 				sAddress += (AnnotationHelperModel.format(oInterface, oAddress[0].region) + ", ");
-			} 
+			}
 			if (oAddress[0].country) {
 				sAddress += (AnnotationHelperModel.format(oInterface, oAddress[0].country) + ", ");
-			} 
+			}
 			return sAddress.slice(0, sAddress.length - 2);
 		},
 
@@ -4198,7 +4206,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var aIsCopyAction = (aCollection || []).filter(function (oRecord) {
 				return (oRecord.RecordType === "com.sap.vocabularies.UI.v1.DataFieldForAction" && (oRecord["com.sap.vocabularies.UI.v1.IsCopyAction"] && oRecord["com.sap.vocabularies.UI.v1.IsCopyAction"].Bool));
 			});
-		
+
 			if (aIsCopyAction.length > 1) {
 				oLogger.error("Multiple actions are annotated with isCopyAction. There can be only one standard copy action.");
 			}
@@ -4207,8 +4215,8 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 
 		/**
 		 * This method reads the insertable navigation restrictions from parent entity and builds customize config object.
-		 * The smart table reads the customize config and sets the editability of smart fields 
-		 * 
+		 * The smart table reads the customize config and sets the editability of smart fields
+		 *
 		 * @param {*} oInterface Context
 		 * @param {*} oSourceEntitySet Parent entity set (entity set of object page)
 		 * @param {*} oRelatedEntitySet Entity set of smart table
@@ -4232,7 +4240,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				}
 				//Turn off client-side mandatory check
 				oCustomizeConfig["clientSideMandatoryCheck"] = {
-					"*": false   
+					"*": false
 				};
 			}
 			if (mColumnWidthIncludingColumnHeader) {
@@ -4283,7 +4291,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 			return sActionPress;
 		},
-		
+
 		/**
 		 * A side effect should get triggered directly if a value is selected for a field like value help/combo box, checkbox, date picker, datetime picker
 		 * provided a side effect is defined on this field. However this should be only done if the side effect has only one source property (the source property must
@@ -4292,7 +4300,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		 * @param {boolean} isDraftEnabled draft or non draft scenario
 		 * @param {object} oMetaModel metamodel
 		 * @param {string} sEntityType entity type of the detail page to which property belongs
-		 * @returns side effect source property's type which represents if the field is annotated as single source property in the side effect or is also used in 
+		 * @returns side effect source property's type which represents if the field is annotated as single source property in the side effect or is also used in
 		 * combination with other field(s).
 		 */
 		getSideEffectSourcePropertyType: function(sPropertyPath, isDraftEnabled, oMetaModel, sEntityType) {
@@ -4300,7 +4308,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		},
 
 		/**
-		 * From UI5 v1.109, variant management is going to be enabled (by default) for smart table/chart and it will lead to the the issue of having multiple 
+		 * From UI5 v1.109, variant management is going to be enabled (by default) for smart table/chart and it will lead to the the issue of having multiple
 		 * duplicate implicit variants created by SVM (named as Personalization), and in order to mitigate the issue, persistencyKey has to be changed in certain scenarios.
 		 * scenarios. With this change, application(s) who has already enabled the variant management will continue to have the old persistencyKey and should have
 		 * no impact whatsoever. However, application(s) should not enable it going forward because of two reasons:
@@ -4347,7 +4355,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				: "";
 		},
 
-		getNavigationPropertyPath: function (oInterface, vRawValue) {		
+		getNavigationPropertyPath: function (oInterface, vRawValue) {
 			var sNavigationPath = AnnotationHelperModel.getNavigationPath(oInterface, vRawValue);
 			var sNavigationPropertyPath = sNavigationPath.replace("{", "").replace("}", "");
 			return sNavigationPropertyPath;
@@ -4418,6 +4426,6 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	oAnnotationHelper.getLinkTextForDFwithEmail.requiresIContext = true;
 	oAnnotationHelper.checkIsEmailAddress.requiresIContext = true;
 	oAnnotationHelper.isEmailAddressAndMuliplicity.requiresIContext = true;
-	
+
 	return oAnnotationHelper;
 }, /* bExport= */ true);

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

@@ -196,9 +196,9 @@ sap.ui.define(["sap/ui/core/format/NumberFormat", "sap/ui/core/message/MessageTy
 		},
 		
 		/**
-		 * @parameter {string} sValue A string containing the value
-		 * @parameter {string} sTarget A string containing the target value
-		 * @parameter {string} sUoM A string containing the unit of measure
+		 * @param {string} sValue A string containing the value
+		 * @param {string} sTarget A string containing the target value
+		 * @param {string} sUoM A string containing the unit of measure
 		 * @returns {string} A string containing the text that will be used in the display value of the Progress Indicator
 		 */
 		formatDisplayValueForProgressIndicator: function (sValue, sTarget, sUoM) {

package/src/sap/suite/ui/generic/template/js/formatters/formatDisplayValueForProgressIndicator.js

@@ -16,9 +16,9 @@ sap.ui.define("sap/suite/ui/generic/template/js/formatters/formatDisplayValueFor
      */
 
     /**
-     * @parameter {string} sValue A string containing the value
-     * @parameter {string} sTarget A string containing the target value
-     * @parameter {string} sUoM A string containing the unit of measure
+     * @param {string} sValue A string containing the value
+     * @param {string} sTarget A string containing the target value
+     * @param {string} sUoM A string containing the unit of measure
      * @returns {string} A string containing the text that will be used in the display value of the Progress Indicator
      */
     

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

@@ -322,7 +322,7 @@ sap.ui.define([
 	 * @returns {string} String MS accepted conditional binding
 	 */
 	var fnHandleDefaultValueForPath = function (sPath) {
-		return fnGetNullishPathCheckString(sPath) + " ? '\\\\-' : " + sPath;
+		return fnGetNullishPathCheckString(sPath) + " ? '−' : " + sPath;
 	};
 
 	/**
@@ -351,14 +351,14 @@ sap.ui.define([
 		}
 		var sValue =  oField.edmType === "Edm.Decimal" ? "formatNumber(float(" + oField.path + "), 2)" : oField.path;
 		var sDefaultPathValue = fnHandleDefaultValueForPath(oField.path);
-		var sId = "";
-		var sDescription = "";
+		var sId = null;
+		var sDescription = null;
 		var sPath;
 		var sSapUnitConditionalPath = "";
 		if (oField.semantic === oSapSemantics.unitOfMeasure) {
-			sSapUnitConditionalPath = "(" + fnGetNullishPathCheckString(oField.sapUnit) + ")" + ' ? ' + sValue + " + ' ' + '\\\\-' : " + "";
+			sSapUnitConditionalPath = "(" + fnGetNullishPathCheckString(oField.sapUnit) + ")" + ' ? ' + sValue + " + ' ' + '−' : " + "";
 		} else if (oField.semantic === oSapSemantics.currencyCode) {
-			sSapUnitConditionalPath = "(" + fnGetNullishPathCheckString(oField.sapUnit) + ")" + ' ? ' + " '\\\\-' : " + "";
+			sSapUnitConditionalPath = "(" + fnGetNullishPathCheckString(oField.sapUnit) + ")" + ' ? ' + " '−' : " + "";
 		}
 		if (aPaths.length > 1) {
 			var aDescriptionText = aPaths.filter(function(oPath) {
@@ -612,44 +612,50 @@ sap.ui.define([
 									oColumnSetClone.columns.push(oColumnClone);
 									continue;
 								}
-								// console.log(oField);
-								oFormFieldHeaderClone = deepClone(oFormFieldHeader);
-								oFormFieldHeaderClone.text = oField.label;
-								oColumnClone.items.push(oFormFieldHeaderClone);
-								oFormFieldValueClone = deepClone(oFormFieldValue);
-								oFormFieldValueClone.text = fnSetPath(oField);
-								oFormFieldValueClone.color = oField.color ? oField.color : "Default";
-								oColumnClone.items.push(oFormFieldValueClone);
-								oColumnClone["$when"] = oField.visiblePath;
-								oColumnSetClone.columns.push(oColumnClone);
+								if (oField.label) {
+									// console.log(oField);
+									oFormFieldHeaderClone = deepClone(oFormFieldHeader);
+									oFormFieldHeaderClone.text = oField.label;
+									oColumnClone.items.push(oFormFieldHeaderClone);
+									oFormFieldValueClone = deepClone(oFormFieldValue);
+									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);
 						}
 						break;
 					case "PlainTextVBox":
-						oFormTitleClone = deepClone(oFormHeading);
-						oFormTitleClone.text = element.label;
-						oAdaptiveCardJSON.body.push(oFormTitleClone);
-						oFormFieldValueClone = deepClone(oFormFieldValue);
-						oFormFieldValueClone.text = fnSetPath(element);
-						oAdaptiveCardJSON.body.push(oFormFieldValueClone);
-                                                oFormTitleClone["$when"] = element.visiblePath;
-						oFormFieldValueClone["$when"] = element.visiblePath;
+						if (element.label) {
+							oFormTitleClone = deepClone(oFormHeading);
+							oFormTitleClone.text = element.label;
+							oAdaptiveCardJSON.body.push(oFormTitleClone);
+							oFormFieldValueClone = deepClone(oFormFieldValue);
+							oFormFieldValueClone.text = fnSetPath(element);
+							oAdaptiveCardJSON.body.push(oFormFieldValueClone);
+							oFormTitleClone["$when"] = element.visiblePath;
+							oFormFieldValueClone["$when"] = element.visiblePath;
+						}
 						break;
 					case "DataPoint":
 						if (!oDataPointColumnSet) {
 							oDataPointColumnSet = deepClone(oColumSet);
 						}
-						oColumnClone = deepClone(oColumn);
-						oFormTitleClone = deepClone(oFormHeading);
-						oFormTitleClone.text = element.label;
-						oColumnClone.items.push(oFormTitleClone);
-						oFormFieldValueClone = deepClone(oFormFieldValue);
-						oFormFieldValueClone.text = fnSetPath(element);
-						oFormFieldValueClone.color = element.color ? element.color : "Default";
-						oColumnClone.items.push(oFormFieldValueClone);
-						oColumnClone["$when"] = element.visiblePath;
-						oDataPointColumnSet.columns.push(oColumnClone);
+						if (element.label) {
+							oColumnClone = deepClone(oColumn);
+							oFormTitleClone = deepClone(oFormHeading);
+							oFormTitleClone.text = element.label;
+							oColumnClone.items.push(oFormTitleClone);
+							oFormFieldValueClone = deepClone(oFormFieldValue);
+							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:
 						break;