@sapui5/sap.fe.macros 1.90.3 → 1.93.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.macros",
-	"version": "1.90.3",
+	"version": "1.93.1",
 	"description": "SAPUI5 Library sap.fe.macros",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -20,7 +20,6 @@
 	"devDependencies": {
 		"ts-node": "^9.1.1",
 		"@babel/cli": "7.8.4",
-		"@ui5/cli": "^2.10.0",
-		"yarn": "1.22.10"
+		"@ui5/cli": "^2.10.0"
 	}
 }

package/src/sap/fe/macros/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.90.3</version>
+    <version>1.93.1</version>
 
     <documentation>UI5 library: sap.fe.macros</documentation>
 
@@ -20,6 +20,9 @@
         <dependency>
             <libraryName>sap.ui.core</libraryName>
         </dependency>
+        <dependency>
+			<libraryName>sap.fe.core</libraryName>
+		</dependency>
 		<dependency>
 			<libraryName>sap.ui.layout</libraryName>
 		</dependency>
@@ -40,6 +43,12 @@
 		<jscoverage xmlns="http://www.sap.com/ui5/buildext/jscoverage">
 			<exclude name="sap.fe.macros.js."/>
 		</jscoverage>
+		    <releasenotes xmlns="http://www.sap.com/ui5/buildext/releasenotes"
+            			url="../../../../test-resources/sap/fe/macros/relnotes/changes-{major}.{minor}.json"
+            			resolve="lib" />
+         	<ownership xmlns="http://www.sap.com/ui5/buildext/ownership">
+                <component>CA-UI5-FE</component><!-- default component for library, embedded text as a shortcut for <name>text</name> -->
+            </ownership>
     </appData>
 
 </library>

package/src/sap/fe/macros/ChartDelegate.js

@@ -1,5 +1,5 @@
-/*
- * ! SAPUI5
+/*!
+ * SAPUI5
  * (c) Copyright 2009-2021 SAP SE. All rights reserved.
  */
 
@@ -72,9 +72,32 @@ sap.ui.define(
 			return this;
 		}
 
-		function handleProperty(mKnownAggregatableProps, aResults) {
-			var bGroupable = aResults[0],
+		function handleProperty(mKnownAggregatableProps, mCustomAggregates, oApplySupported, aResults) {
+			var aGroupableProperties = oApplySupported && oApplySupported.GroupableProperties;
+			var aAggregatableProperties = oApplySupported && oApplySupported.AggregatableProperties;
+			var bGroupable, bAggregatable;
+			if (aGroupableProperties && aGroupableProperties.length) {
+				for (var i = 0; i < aGroupableProperties.length; i++) {
+					if (aGroupableProperties[i].$PropertyPath === aResults[2]) {
+						bGroupable = true;
+						break;
+					}
+				}
+			}
+			if (aAggregatableProperties && aAggregatableProperties.length) {
+				for (var j = 0; j < aAggregatableProperties.length; j++) {
+					if (aAggregatableProperties[j].Property.$PropertyPath === aResults[2]) {
+						bAggregatable = true;
+						break;
+					}
+				}
+			}
+			if (!aGroupableProperties || (aGroupableProperties && !aGroupableProperties.length)) {
+				bGroupable = aResults[0];
+			}
+			if (!aAggregatableProperties || (aAggregatableProperties && !aAggregatableProperties.length)) {
 				bAggregatable = aResults[1];
+			}
 
 			var oHeadItem = {},
 				oProperty = {},
@@ -111,6 +134,19 @@ sap.ui.define(
 							oItem.default = undefined;
 							oProperty.chartItems.push(oItem);
 						}
+					} else if (Object.keys(mCustomAggregates).indexOf(oProperty.name) > -1) {
+						for (var sCustom in mCustomAggregates) {
+							if (sCustom === oProperty.name) {
+								oItem = merge({}, mCustomAggregates[sCustom], {
+									propertyPath: sCustom,
+									kind: MDCLib.ChartItemType.Measure,
+									role: MDCLib.ChartItemRoleType.axis1,
+									sortable: mCustomAggregates[sCustom].sortable
+								});
+								oProperty.chartItems.push(oItem);
+								break;
+							}
+						}
 					}
 				}
 			}
@@ -138,13 +174,13 @@ sap.ui.define(
 				aMeasures = [],
 				aDimensions = [],
 				aChartItems = [],
-				bSetFilterable,
 				bSetSortable,
 				mKnownAggregatableProps = {},
 				oEntitySetAnnotations = mAnnos.entitySetAnnotations,
-				oEntityTypeAnnotations = mAnnos.entityTypeAnnotations;
+				oEntityTypeAnnotations = mAnnos.entityTypeAnnotations,
+				oApplySupported = mAnnos.applySupported;
 
-			var mCustomAggregates = MetaModelUtil.getAllCustomAggregates(oEntityTypeAnnotations);
+			var mCustomAggregates = MetaModelUtil.getAllCustomAggregates(oEntitySetAnnotations);
 
 			if (Object.keys(mCustomAggregates).length >= 1) {
 				aChartItems = oChart.getItems();
@@ -163,18 +199,6 @@ sap.ui.define(
 					Log.error("Dimension and Measure has the sameProperty Configured");
 				}
 			}
-			//Collect custom aggegates
-			for (var sCustom in mCustomAggregates) {
-				aItems.push(
-					merge({}, mCustomAggregates[sCustom], {
-						propertyPath: sCustom,
-						kind: MDCLib.ChartItemType.Measure,
-						role: MDCLib.ChartItemRoleType.axis1,
-						sortable: mCustomAggregates[sCustom].sortable,
-						filterable: mCustomAggregates[sCustom].filterable
-					})
-				);
-			}
 
 			var mTypeAggregatableProps = MetaModelUtil.getAllAggregatableProperties(oEntityTypeAnnotations);
 
@@ -190,9 +214,6 @@ sap.ui.define(
 			var oSortRestrictionsInfo = MetaModelUtil.getSortRestrictionsInfo(
 				oEntitySetAnnotations["@Org.OData.Capabilities.V1.SortRestrictions"]
 			);
-			var oFilterRestrictionsInfo = MetaModelUtil.getFilterRestrictionsInfo(
-				oEntitySetAnnotations["@Org.OData.Capabilities.V1.FilterRestrictions"]
-			);
 
 			function push(oProperty) {
 				var sName = oProperty.name || "",
@@ -207,43 +228,41 @@ sap.ui.define(
 					bIsNavigationText = true;
 				}
 				aProperties.push(oProperty);
-				//calculate Sortable/filterable
+				//calculate Sortable
 				MetaModelUtil.addSortInfoForProperty(oProperty, oSortRestrictionsInfo);
-				MetaModelUtil.addFilterInfoForProperty(oProperty, oFilterRestrictionsInfo);
 				if (oProperty.inChart) {
 					for (var i = 0; i < oProperty.chartItems.length; i++) {
 						var oItem = oProperty.chartItems[i];
-						oItem.propertyPath = oProperty.name;
-						oItem.type = oProperty.type;
-						oItem.timeUnit = oProperty.timeUnit;
-						oItem.criticality = oProperty.criticality;
-						if (oItem.kind == MDCLib.ChartItemType.Measure) {
-							if (
-								mKnownAggregatableProps[oItem.propertyPath] &&
-								mKnownAggregatableProps[oItem.propertyPath][oItem.aggregationMethod]
-							) {
-								oItem.name = mKnownAggregatableProps[oItem.propertyPath][oItem.aggregationMethod].name;
-								oItem.label = mKnownAggregatableProps[oItem.propertyPath][oItem.aggregationMethod].label;
+						if (!oItem.custom) {
+							oItem.propertyPath = oProperty.name;
+							oItem.type = oProperty.type;
+							oItem.timeUnit = oProperty.timeUnit;
+							oItem.criticality = oProperty.criticality;
+							if (oItem.kind == MDCLib.ChartItemType.Measure) {
+								if (
+									mKnownAggregatableProps[oItem.propertyPath] &&
+									mKnownAggregatableProps[oItem.propertyPath][oItem.aggregationMethod]
+								) {
+									oItem.name = mKnownAggregatableProps[oItem.propertyPath][oItem.aggregationMethod].name;
+									oItem.label = mKnownAggregatableProps[oItem.propertyPath][oItem.aggregationMethod].label;
+								} else {
+									oItem.name = oItem.aggregationMethod + oItem.propertyPath;
+									oItem.label = oProperty.label + " (" + oItem.aggregationMethod + ")";
+								}
+
+								oItem.customAggregate = false;
+								//in the first wave let us only sort by used items
+								oItem.sortable = oProperty.sortable;
+								oItem.sortDirection = oProperty.sortDirection;
 							} else {
-								oItem.name = oItem.aggregationMethod + oItem.propertyPath;
-								oItem.label = oProperty.label + " (" + oItem.aggregationMethod + ")";
+								oItem.name = oProperty.name;
+								oItem.textProperty = !bIsNavigationText ? oProperty.textProperty : undefined;
+								oItem.label = oProperty.label;
+								//in the first wave let us only sort by used items
+								oItem.sortable = oProperty.sortable;
+								oItem.sortDirection = oProperty.sortDirection;
+								oItem.allowedExpressions = oProperty.allowedExpressions;
 							}
-
-							oItem.customAggregate = false;
-							//in the first wave let us only sort by used items
-							oItem.sortable = true;
-							oItem.sortDirection = "both";
-							oItem.filterable = true;
-						} else {
-							oItem.name = oProperty.name;
-							oItem.textProperty = !bIsNavigationText ? oProperty.textProperty : undefined;
-							oItem.label = oProperty.label;
-							//in the first wave let us only sort by used items
-							oItem.sortable = oProperty.sortable;
-							oItem.sortDirection = oProperty.sortDirection;
-							//Allow filtering on each possible dimension
-							oItem.filterable = oProperty.filterable;
-							oItem.allowedExpressions = oProperty.allowedExpressions;
 						}
 						aItems.push(oItem);
 					}
@@ -266,7 +285,14 @@ sap.ui.define(
 									// oMetaModel.requestObject(sPrefix + ".RecommendedAggregationMethod"),
 									oMetaModel.requestObject(sPrefix + ".ContextDefiningProperties")
 								])
-									.then(handleProperty.bind(oMetaModel.getMetaContext(sPath + sKey), mKnownAggregatableProps))
+									.then(
+										handleProperty.bind(
+											oMetaModel.getMetaContext(sPath + sKey),
+											mKnownAggregatableProps,
+											mCustomAggregates,
+											oApplySupported
+										)
+									)
 
 									.then(push)
 							);
@@ -276,7 +302,7 @@ sap.ui.define(
 			}
 
 			return Promise.all(aPropertyPromise).then(function() {
-				return [bSetSortable, bSetFilterable, aProperties, aItems];
+				return [bSetSortable, aProperties, aItems];
 			});
 		}
 
@@ -352,7 +378,7 @@ sap.ui.define(
 		 * Fetches the relevant metadata for the Chart and returns property info array.
 		 *
 		 * @param {object} oChart
-		 * @returns {Promise<{filterable: *, attributes: *, sortable: *, properties: *}>} A Promise containing the property information
+		 * @returns {Promise<{attributes: *, sortable: *, properties: *}>} A Promise containing the property information
 		 */
 		ChartDelegate.retrieveAllMetadata = function(oChart) {
 			var oModelPromise = ChartDelegate.getModel(oChart);
@@ -372,19 +398,23 @@ sap.ui.define(
 				function resolve(aResult) {
 					var oMetadata = {
 						sortable: aResult[0],
-						filterable: aResult[1],
-						attributes: aResult[2],
-						properties: aResult[3]
+						attributes: aResult[1],
+						properties: aResult[2]
 					};
 
 					return oMetadata;
 				}
 
-				var aSetAndTypePromise = [oMetaModel.requestObject(sTypePath), oMetaModel.requestObject(sSetPath)];
+				var aSetAndTypePromise = [
+					oMetaModel.requestObject(sTypePath),
+					oMetaModel.requestObject(sSetPath),
+					oMetaModel.requestObject(sSetPath + AGGREGATION_ANNO + ".ApplySupported")
+				];
 
 				return Promise.all(aSetAndTypePromise)
 					.then(function(aTypeAndSet) {
 						var oEntity = aTypeAndSet[0];
+						var oApplySupported = aTypeAndSet[2];
 						var aAnnotationsPromises = [
 							MetaModelUtil.fetchAllAnnotations(oMetaModel, sTypePath),
 							MetaModelUtil.fetchAllAnnotations(oMetaModel, sSetPath)
@@ -394,7 +424,8 @@ sap.ui.define(
 							//annotations of set and type
 							var oAnnotations = {
 								entityTypeAnnotations: aAnnotations[0],
-								entitySetAnnotations: aAnnotations[1]
+								entitySetAnnotations: aAnnotations[1],
+								applySupported: oApplySupported
 							};
 							return retrieveItems(oEntity, sTypePath, oMetaModel, oAnnotations, oChart);
 						});

package/src/sap/fe/macros/CommonHelper.js

@@ -12,10 +12,23 @@ sap.ui.define(
 		"sap/fe/core/helpers/StableIdHelper",
 		"sap/fe/core/helpers/ModelHelper",
 		"sap/ui/model/Context",
-		"sap/ui/Device"
+		"sap/ui/Device",
+		"sap/m/library"
 	],
-	function(ResourceModel, ODataModelAnnotationHelper, Log, CommonUtils, SelectionVariant, StableIdHelper, ModelHelper, Context, Device) {
+	function(
+		ResourceModel,
+		ODataModelAnnotationHelper,
+		Log,
+		CommonUtils,
+		SelectionVariant,
+		StableIdHelper,
+		ModelHelper,
+		Context,
+		Device,
+		mobilelibrary
+	) {
 		"use strict";
+		var ValueColor = mobilelibrary.ValueColor;
 		var Helper = {
 			getPathToKey: function(oCtx) {
 				return oCtx.getObject();
@@ -124,7 +137,10 @@ sap.ui.define(
 					aParts,
 					entitySet,
 					navigationCollection;
-				if (oContext.getMetadata().getName() === "sap.ui.model.Context" && oContext.getObject("$kind") === "EntitySet") {
+				if (
+					oContext.getMetadata().getName() === "sap.ui.model.Context" &&
+					(oContext.getObject("$kind") === "EntitySet" || oContext.getObject("$ContainsTarget") === true)
+				) {
 					return sPath;
 				}
 				if (oContext.getModel) {
@@ -845,6 +861,306 @@ sap.ui.define(
 				}
 				return combinedConditions.length > 0 ? "{= " + combinedConditions.join(" || ") + "}" : sVisibleValue;
 			},
+			/**
+			 * Method to do the calculation of criticality in case CriticalityCalculation present in the annotation
+			 *
+			 * The calculation is done by comparing a value to the threshold values relevant for the specified improvement direction.
+			 * For improvement direction Target, the criticality is calculated using both low and high threshold values. It will be
+			 *
+			 * - Positive if the value is greater than or equal to AcceptanceRangeLowValue and lower than or equal to AcceptanceRangeHighValue
+			 * - Neutral if the value is greater than or equal to ToleranceRangeLowValue and lower than AcceptanceRangeLowValue OR greater than AcceptanceRangeHighValue and lower than or equal to ToleranceRangeHighValue
+			 * - Critical if the value is greater than or equal to DeviationRangeLowValue and lower than ToleranceRangeLowValue OR greater than ToleranceRangeHighValue and lower than or equal to DeviationRangeHighValue
+			 * - Negative if the value is lower than DeviationRangeLowValue or greater than DeviationRangeHighValue
+			 *
+			 * For improvement direction Minimize, the criticality is calculated using the high threshold values. It is
+			 * - Positive if the value is lower than or equal to AcceptanceRangeHighValue
+			 * - Neutral if the value is greater than AcceptanceRangeHighValue and lower than or equal to ToleranceRangeHighValue
+			 * - Critical if the value is greater than ToleranceRangeHighValue and lower than or equal to DeviationRangeHighValue
+			 * - Negative if the value is greater than DeviationRangeHighValue
+			 *
+			 * For improvement direction Maximize, the criticality is calculated using the low threshold values. It is
+			 *
+			 * - Positive if the value is greater than or equal to AcceptanceRangeLowValue
+			 * - Neutral if the value is less than AcceptanceRangeLowValue and greater than or equal to ToleranceRangeLowValue
+			 * - Critical if the value is lower than ToleranceRangeLowValue and greater than or equal to DeviationRangeLowValue
+			 * - Negative if the value is lower than DeviationRangeLowValue
+			 *
+			 * Thresholds are optional. For unassigned values, defaults are determined in this order:
+			 *
+			 * - For DeviationRange, an omitted LowValue translates into the smallest possible number (-INF), an omitted HighValue translates into the largest possible number (+INF)
+			 * - For ToleranceRange, an omitted LowValue will be initialized with DeviationRangeLowValue, an omitted HighValue will be initialized with DeviationRangeHighValue
+			 * - For AcceptanceRange, an omitted LowValue will be initialized with ToleranceRangeLowValue, an omitted HighValue will be initialized with ToleranceRangeHighValue.
+			 *
+			 * @param {string} sImprovementDirection ImprovementDirection to be used for creating the criticality binding
+			 * @param {string} sValue Value from Datapoint to be measured
+			 * @param {string} sDeviationLow ExpressionBinding for Lower Deviation level
+			 * @param {string} sToleranceLow ExpressionBinding for Lower Tolerance level
+			 * @param {string} sAcceptanceLow ExpressionBinding for Lower Acceptance level
+			 * @param {string} sAcceptanceHigh ExpressionBinding for Higher Acceptance level
+			 * @param {string} sToleranceHigh ExpressionBinding for Higher Tolerance level
+			 * @param {string} sDeviationHigh ExpressionBinding for Higher Deviation level
+			 * @returns {string} Returns criticality calculation as expression binding
+			 */
+			getCriticalityCalculationBinding: function(
+				sImprovementDirection,
+				sValue,
+				sDeviationLow,
+				sToleranceLow,
+				sAcceptanceLow,
+				sAcceptanceHigh,
+				sToleranceHigh,
+				sDeviationHigh
+			) {
+				var sCriticalityExpression = ValueColor.Neutral; // Default Criticality State
+
+				sValue = "%" + sValue;
+
+				// Setting Unassigned Values
+				sDeviationLow = sDeviationLow || -Infinity;
+				sToleranceLow = sToleranceLow || sDeviationLow;
+				sAcceptanceLow = sAcceptanceLow || sToleranceLow;
+				sDeviationHigh = sDeviationHigh || Infinity;
+				sToleranceHigh = sToleranceHigh || sDeviationHigh;
+				sAcceptanceHigh = sAcceptanceHigh || sToleranceHigh;
+
+				// Dealing with Decimal and Path based bingdings
+				sDeviationLow = sDeviationLow && (+sDeviationLow ? +sDeviationLow : "%" + sDeviationLow);
+				sToleranceLow = sToleranceLow && (+sToleranceLow ? +sToleranceLow : "%" + sToleranceLow);
+				sAcceptanceLow = sAcceptanceLow && (+sAcceptanceLow ? +sAcceptanceLow : "%" + sAcceptanceLow);
+				sAcceptanceHigh = sAcceptanceHigh && (+sAcceptanceHigh ? +sAcceptanceHigh : "%" + sAcceptanceHigh);
+				sToleranceHigh = sToleranceHigh && (+sToleranceHigh ? +sToleranceHigh : "%" + sToleranceHigh);
+				sDeviationHigh = sDeviationHigh && (+sDeviationHigh ? +sDeviationHigh : "%" + sDeviationHigh);
+
+				// Creating runtime expression binding from criticality calculation for Criticality State
+				if (sImprovementDirection.indexOf("Minimize") > -1) {
+					sCriticalityExpression =
+						"{= " +
+						sValue +
+						" <= " +
+						sAcceptanceHigh +
+						" ? '" +
+						ValueColor.Good +
+						"' : " +
+						sValue +
+						" <= " +
+						sToleranceHigh +
+						" ? '" +
+						ValueColor.Neutral +
+						"' : " +
+						"(" +
+						sDeviationHigh +
+						" && " +
+						sValue +
+						" <= " +
+						sDeviationHigh +
+						") ? '" +
+						ValueColor.Critical +
+						"' : '" +
+						ValueColor.Error +
+						"' }";
+				} else if (sImprovementDirection.indexOf("Maximize") > -1) {
+					sCriticalityExpression =
+						"{= " +
+						sValue +
+						" >= " +
+						sAcceptanceLow +
+						" ? '" +
+						ValueColor.Good +
+						"' : " +
+						sValue +
+						" >= " +
+						sToleranceLow +
+						" ? '" +
+						ValueColor.Neutral +
+						"' : " +
+						"(" +
+						sDeviationLow +
+						" && " +
+						sValue +
+						" >= " +
+						sDeviationLow +
+						") ? '" +
+						ValueColor.Critical +
+						"' : '" +
+						ValueColor.Error +
+						"' }";
+				} else if (sImprovementDirection.indexOf("Target") > -1) {
+					sCriticalityExpression =
+						"{= (" +
+						sValue +
+						" <= " +
+						sAcceptanceHigh +
+						" && " +
+						sValue +
+						" >= " +
+						sAcceptanceLow +
+						") ? '" +
+						ValueColor.Good +
+						"' : " +
+						"((" +
+						sValue +
+						" >= " +
+						sToleranceLow +
+						" && " +
+						sValue +
+						" < " +
+						sAcceptanceLow +
+						") || (" +
+						sValue +
+						" > " +
+						sAcceptanceHigh +
+						" && " +
+						sValue +
+						" <= " +
+						sToleranceHigh +
+						")) ? '" +
+						ValueColor.Neutral +
+						"' : " +
+						"((" +
+						sDeviationLow +
+						" && (" +
+						sValue +
+						" >= " +
+						sDeviationLow +
+						") && (" +
+						sValue +
+						" < " +
+						sToleranceLow +
+						")) || ((" +
+						sValue +
+						" > " +
+						sToleranceHigh +
+						") && " +
+						sDeviationHigh +
+						" && (" +
+						sValue +
+						" <= " +
+						sDeviationHigh +
+						"))) ? '" +
+						ValueColor.Critical +
+						"' : '" +
+						ValueColor.Error +
+						"' }";
+				} else {
+					Log.warning("Case not supported, returning the default Value Neutral");
+				}
+
+				return sCriticalityExpression;
+			},
+			/**
+			 * This function returns the criticality indicator from annotations if criticality is EnumMember.
+			 *
+			 * @param {string} sCriticality Criticality provided in the annotations
+			 * @returns {sIndicator} Return the indicator for criticality
+			 * @private
+			 */
+			_getCriticalityFromEnum: function(sCriticality) {
+				var sIndicator;
+				if (sCriticality === "com.sap.vocabularies.UI.v1.CriticalityType/Negative") {
+					sIndicator = ValueColor.Error;
+				} else if (sCriticality === "com.sap.vocabularies.UI.v1.CriticalityType/Positive") {
+					sIndicator = ValueColor.Good;
+				} else if (sCriticality === "com.sap.vocabularies.UI.v1.CriticalityType/Critical") {
+					sIndicator = ValueColor.Critical;
+				} else {
+					sIndicator = ValueColor.Neutral;
+				}
+				return sIndicator;
+			},
+			getValueCriticality: function(sDimension, aValueCriticality) {
+				var sResult,
+					aValues = [];
+				if (aValueCriticality && aValueCriticality.length > 0) {
+					aValueCriticality.forEach(function(oVC) {
+						if (oVC.Value && oVC.Criticality.$EnumMember) {
+							var sValue =
+								"${" +
+								sDimension +
+								"} === '" +
+								oVC.Value +
+								"' ? '" +
+								Helper._getCriticalityFromEnum(oVC.Criticality.$EnumMember) +
+								"'";
+							aValues.push(sValue);
+						}
+					});
+					sResult = aValues.length > 0 && aValues.join(" : ") + " : undefined";
+				}
+				return sResult ? "{= " + sResult + " }" : undefined;
+			},
+			/**
+			 * To fetch measure attribute index.
+			 *
+			 * @param {Integer} iMeasure Chart Annotations
+			 * @param {object} oChartAnnotations Chart Annotations
+			 * @returns {string} MeasureAttribute index.
+			 * @private
+			 */
+			getMeasureAttributeIndex: function(iMeasure, oChartAnnotations) {
+				var aMeasures = oChartAnnotations.Measures,
+					aMeasureAttributes = oChartAnnotations.MeasureAttributes,
+					sMeasurePropertyPath = aMeasures && aMeasures[iMeasure] && aMeasures[iMeasure].$PropertyPath,
+					iMeasureAttribute = -1,
+					fnCheckMeasure = function(sMeasure, oMeasureAttribute, index) {
+						if ((oMeasureAttribute && oMeasureAttribute.Measure && oMeasureAttribute.Measure.$PropertyPath) === sMeasure) {
+							iMeasureAttribute = index;
+							return true;
+						}
+					},
+					bMeasureAttributeExists = aMeasureAttributes.some(fnCheckMeasure.bind(null, sMeasurePropertyPath));
+				return bMeasureAttributeExists && iMeasureAttribute > -1 && iMeasureAttribute;
+			},
+			/**
+			 * This function returns the measureAttribute for the measure.
+			 *
+			 * @param {object} oContext Context to the measure annotation
+			 * @returns {string} Path to the measureAttribute of the measure
+			 */
+			getMeasureAttributeForMeasure: function(oContext) {
+				var oMetaModel = oContext.getModel(),
+					sMeasurePath = oContext.getPath(),
+					sChartAnnotationPath = sMeasurePath.substring(0, sMeasurePath.lastIndexOf("Measure")),
+					iMeasure = sMeasurePath.replace(/.*\//, "");
+
+				return oMetaModel.requestObject(sChartAnnotationPath).then(function(oChartAnnotations) {
+					var aMeasureAttributes = oChartAnnotations.MeasureAttributes,
+						iMeasureAttribute = Helper.getMeasureAttributeIndex(iMeasure, oChartAnnotations);
+					var sMeasureAttributePath =
+						iMeasureAttribute > -1 && aMeasureAttributes[iMeasureAttribute] && aMeasureAttributes[iMeasureAttribute].DataPoint
+							? sChartAnnotationPath + "MeasureAttributes/" + iMeasureAttribute + "/"
+							: Log.warning("DataPoint missing for the measure") && undefined;
+					return sMeasureAttributePath ? sMeasureAttributePath + "DataPoint/$AnnotationPath/" : sMeasureAttributePath;
+				});
+			},
+			/**
+			 * Method to determine if the contained navigation property has a draft root/node parent entitySet.
+			 *
+			 * @function
+			 * @name isDraftParentEntityForContainment
+			 * @param {object} oTargetCollectionContainsTarget Target collection has ContainsTarget property
+			 * @param {object} oTableMetadata Table metadata for which draft support shall be checked
+			 * @returns {boolean} Returns true if draft
+			 */
+			isDraftParentEntityForContainment: function(oTargetCollectionContainsTarget, oTableMetadata) {
+				if (oTargetCollectionContainsTarget) {
+					if (oTableMetadata && oTableMetadata.parentEntitySet && oTableMetadata.parentEntitySet.sPath) {
+						var sParentEntitySetPath = oTableMetadata.parentEntitySet.sPath;
+						var oDraftRoot = oTableMetadata.parentEntitySet.oModel.getObject(
+							sParentEntitySetPath + "@com.sap.vocabularies.Common.v1.DraftRoot"
+						);
+						var oDraftNode = oTableMetadata.parentEntitySet.oModel.getObject(
+							sParentEntitySetPath + "@com.sap.vocabularies.Common.v1.DraftNode"
+						);
+						if (oDraftRoot || oDraftNode) {
+							return true;
+						} else {
+							return false;
+						}
+					}
+				} else {
+					return false;
+				}
+			},
 
 			/**
 			 * Ensures the data is processed as defined in the template.

package/src/sap/fe/macros/Contact.designtime.js

@@ -1,5 +1,5 @@
-/*
- * ! SAPUI5
+/*!
+ * SAPUI5
  * (c) Copyright 2009-2021 SAP SE. All rights reserved.
  */