@sapui5/sap.fe.macros 1.96.7 → 1.96.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.macros",
-	"version": "1.96.7",
+	"version": "1.96.8",
 	"description": "SAPUI5 Library sap.fe.macros",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",

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.96.7</version>
+    <version>1.96.8</version>
 
     <documentation>UI5 library: sap.fe.macros</documentation>
 

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

@@ -15,7 +15,7 @@ sap.ui.define(
 		"sap/ui/Device",
 		"sap/m/library"
 	],
-	function(
+	function (
 		ResourceModel,
 		ODataModelAnnotationHelper,
 		Log,
@@ -30,7 +30,7 @@ sap.ui.define(
 		"use strict";
 		var ValueColor = mobilelibrary.ValueColor;
 		var Helper = {
-			getPathToKey: function(oCtx) {
+			getPathToKey: function (oCtx) {
 				return oCtx.getObject();
 			},
 
@@ -41,7 +41,7 @@ sap.ui.define(
 			 * @param {object} oInterface Interface instance
 			 * @returns {string|boolean} Returns true, false, or expression with path, for example "{= !${IsActiveEntity} }"
 			 */
-			isVisible: function(target, oInterface) {
+			isVisible: function (target, oInterface) {
 				var oModel = oInterface.context.getModel(),
 					sPropertyPath = oInterface.context.getPath(),
 					oAnnotations = oModel.getObject(sPropertyPath + "@"),
@@ -57,7 +57,7 @@ sap.ui.define(
 			 * @param oInterface
 			 * @returns {boolean} `true` if a dialog is needed
 			 */
-			isDialog: function(oActionContext, oInterface) {
+			isDialog: function (oActionContext, oInterface) {
 				var oModel = oInterface.context.getModel(),
 					sPropertyPath = oInterface.context.getPath(),
 					isCritical = oModel.getObject(sPropertyPath + "/@$ui5.overload@com.sap.vocabularies.Common.v1.IsActionCritical");
@@ -79,7 +79,7 @@ sap.ui.define(
 			 * @param {object} oInterface Interface instance
 			 * @returns {string} A Binding Expression to determine if a field should be editable or not.
 			 */
-			getParameterEditMode: function(target, oInterface) {
+			getParameterEditMode: function (target, oInterface) {
 				var oModel = oInterface.context.getModel(),
 					sPropertyPath = oInterface.context.getPath(),
 					oAnnotations = oModel.getObject(sPropertyPath + "@"),
@@ -126,13 +126,13 @@ sap.ui.define(
 			 * @param oInterface
 			 * @returns {string | undefined}
 			 */
-			getMetaPath: function(target, oInterface) {
+			getMetaPath: function (target, oInterface) {
 				return (oInterface && oInterface.context && oInterface.context.getPath()) || undefined;
 			},
-			isDesktop: function() {
+			isDesktop: function () {
 				return Device.system.desktop === true;
 			},
-			getTargetCollection: function(oContext, navCollection) {
+			getTargetCollection: function (oContext, navCollection) {
 				var sPath = oContext.getPath(),
 					aParts,
 					entitySet,
@@ -146,13 +146,10 @@ sap.ui.define(
 				if (oContext.getModel) {
 					sPath =
 						(oContext.getModel().getMetaPath && oContext.getModel().getMetaPath(sPath)) ||
-						oContext
-							.getModel()
-							.getMetaModel()
-							.getMetaPath(sPath);
+						oContext.getModel().getMetaModel().getMetaPath(sPath);
 				}
 				//Supporting sPath of any format, either '/<entitySet>/<navigationCollection>' <OR> '/<entitySet>/$Type/<navigationCollection>'
-				aParts = sPath.split("/").filter(function(sPart) {
+				aParts = sPath.split("/").filter(function (sPart) {
 					return sPart && sPart != "$Type";
 				}); //filter out empty strings and parts referring to '$Type'
 				entitySet = "/" + aParts[0];
@@ -163,7 +160,7 @@ sap.ui.define(
 				return entitySet + "/$NavigationPropertyBinding/" + navigationCollection; // used in gotoTargetEntitySet method in the same file
 			},
 
-			isPropertyFilterable: function(property, oInterface, oDataField) {
+			isPropertyFilterable: function (property, oInterface, oDataField) {
 				var oModel = oInterface.context.getModel(),
 					sPropertyPath = oInterface.context.getPath(),
 					// LoacationPath would be the prefix of sPropertyPath, example: sPropertyPath = '/Customer/Set/Name' -> sPropertyLocationPath = '/Customer/Set'
@@ -181,7 +178,7 @@ sap.ui.define(
 				return CommonUtils.isPropertyFilterable(oModel, sPropertyLocationPath, sProperty);
 			},
 
-			getLocationForPropertyPath: function(oModel, sPropertyPath) {
+			getLocationForPropertyPath: function (oModel, sPropertyPath) {
 				var iLength;
 				var sCollectionPath = sPropertyPath.slice(0, sPropertyPath.lastIndexOf("/"));
 				if (oModel.getObject(sCollectionPath + "/$kind") === "EntityContainer") {
@@ -190,7 +187,7 @@ sap.ui.define(
 				}
 				return sCollectionPath;
 			},
-			gotoActionParameter: function(oContext) {
+			gotoActionParameter: function (oContext) {
 				var sPath = oContext.getPath(),
 					sPropertyName = oContext.getObject(sPath + "/$Name");
 				var sContext;
@@ -213,7 +210,7 @@ sap.ui.define(
 			 * @private
 			 * @ui5-restricted
 			 */
-			getEntitySetName: function(oMetaModel, sEntityType) {
+			getEntitySetName: function (oMetaModel, sEntityType) {
 				var oEntityContainer = oMetaModel.getObject("/");
 				for (var key in oEntityContainer) {
 					if (typeof oEntityContainer[key] === "object" && oEntityContainer[key].$Type === sEntityType) {
@@ -237,7 +234,7 @@ sap.ui.define(
 			 * @private
 			 * @ui5-restricted
 			 */
-			getActionPath: function(oAction, bReturnOnlyPath, sActionName, bCheckStaticValue) {
+			getActionPath: function (oAction, bReturnOnlyPath, sActionName, bCheckStaticValue) {
 				var sContextPath = oAction.getPath().split("/@")[0];
 
 				sActionName = !sActionName ? oAction.getObject(oAction.getPath()) : sActionName;
@@ -283,7 +280,7 @@ sap.ui.define(
 			 * @param {string} sPropertyPath The property path
 			 * @returns {string|boolean} A runtime binding or fixed string value for Field true/false for Rating Indicator
 			 */
-			getEditMode: function(
+			getEditMode: function (
 				oAnnotations,
 				sDataFieldType,
 				oFieldControl,
@@ -485,7 +482,7 @@ sap.ui.define(
 				return sExpression;
 			},
 
-			getNavigationContext: function(oContext) {
+			getNavigationContext: function (oContext) {
 				return ODataModelAnnotationHelper.getNavigationPath(oContext.getPath());
 			},
 
@@ -500,9 +497,9 @@ sap.ui.define(
 			 * @param bKeepProperty
 			 * @returns {string} The navigation path
 			 */
-			getNavigationPath: function(sPropertyPath, bKeepProperty) {
+			getNavigationPath: function (sPropertyPath, bKeepProperty) {
 				var bStartsWithEntityType = sPropertyPath.startsWith("/");
-				var aParts = sPropertyPath.split("/").filter(function(part) {
+				var aParts = sPropertyPath.split("/").filter(function (part) {
 					return !!part;
 				});
 				if (bStartsWithEntityType) {
@@ -531,7 +528,7 @@ sap.ui.define(
 			 * @private
 			 * @ui5-restricted
 			 **/
-			getActionContext: function(oAction) {
+			getActionContext: function (oAction) {
 				return Helper.getActionPath(oAction, true);
 			},
 			/**
@@ -548,7 +545,7 @@ sap.ui.define(
 			 * @private
 			 * @ui5-restricted
 			 **/
-			getPathToBoundActionOverload: function(oAction) {
+			getPathToBoundActionOverload: function (oAction) {
 				var sPath = Helper.getActionPath(oAction, true);
 				return sPath + "/@$ui5.overload/0";
 			},
@@ -562,7 +559,7 @@ sap.ui.define(
 			 * @param {boolean} bEscape Should the string be escaped beforehand
 			 * @returns {string} String with single quotes
 			 **/
-			addSingleQuotes: function(sValue, bEscape) {
+			addSingleQuotes: function (sValue, bEscape) {
 				if (bEscape && sValue) {
 					sValue = sValue.replace(/[']/g, "\\'");
 				}
@@ -578,7 +575,7 @@ sap.ui.define(
 			 * @param {string} sFuncName Some string for the function name
 			 * @returns {string} Function string depends on arguments passed
 			 **/
-			generateFunction: function(sFuncName) {
+			generateFunction: function (sFuncName) {
 				var sParams = "";
 				for (var i = 1; i < arguments.length; i++) {
 					sParams += arguments[i];
@@ -604,7 +601,7 @@ sap.ui.define(
 			 *
 			 */
 
-			getHeaderDataPointLinkVisibility: function(sPath, bLink, bFieldVisibility) {
+			getHeaderDataPointLinkVisibility: function (sPath, bLink, bFieldVisibility) {
 				var sVisibilityExp;
 				if (bFieldVisibility) {
 					sVisibilityExp = bLink
@@ -626,7 +623,7 @@ sap.ui.define(
 			 * @param {string} oParams Some object
 			 * @returns {string} - Object string
 			 **/
-			objectToString: function(oParams) {
+			objectToString: function (oParams) {
 				var iNumberOfKeys = Object.keys(oParams).length,
 					sParams = "";
 
@@ -654,7 +651,7 @@ sap.ui.define(
 			 * @param {string} sExpression An expression with escape characters
 			 * @returns {string} Expression string without escape characters or undefined
 			 **/
-			removeEscapeCharacters: function(sExpression) {
+			removeEscapeCharacters: function (sExpression) {
 				return sExpression ? sExpression.replace(/\\?\\([{}])/g, "$1") : undefined;
 			},
 
@@ -664,7 +661,7 @@ sap.ui.define(
 			 * @param {string} sStringified
 			 * @returns {string} The updated string representation of the object
 			 */
-			stringifyObject: function(sStringified) {
+			stringifyObject: function (sStringified) {
 				if (!sStringified) {
 					return undefined;
 				} else {
@@ -689,7 +686,7 @@ sap.ui.define(
 			 * @param {object} vData The data to stringify
 			 * @returns {string} The string representation of the data.
 			 */
-			stringifyCustomData: function(vData) {
+			stringifyCustomData: function (vData) {
 				var oObject = {
 					ui5object: true
 				};
@@ -703,7 +700,7 @@ sap.ui.define(
 			 * @param {object | string} vData The data to parse
 			 * @returns {object} The result of the data parsing
 			 */
-			parseCustomData: function(vData) {
+			parseCustomData: function (vData) {
 				var vData = typeof vData === "string" ? JSON.parse(vData) : vData;
 				if ("customData" in vData) {
 					return vData["customData"];
@@ -717,7 +714,7 @@ sap.ui.define(
 			 * @param {string} sEntityType The EntityType name
 			 * @returns {object} The DraftAdministrativeData
 			 */
-			_getDraftAdministrativeDataType: function(oMetaModel, sEntityType) {
+			_getDraftAdministrativeDataType: function (oMetaModel, sEntityType) {
 				return oMetaModel.requestObject("/" + sEntityType + "/DraftAdministrativeData/");
 			},
 			/**
@@ -727,8 +724,8 @@ sap.ui.define(
 			 * @param {string} sEntityType The EntityType name
 			 * @returns {string} The Binding Expression for the draft popover
 			 */
-			getPopoverText: function(iContext, sEntityType) {
-				return Helper._getDraftAdministrativeDataType(iContext.getModel(), sEntityType).then(function(oDADEntityType) {
+			getPopoverText: function (iContext, sEntityType) {
+				return Helper._getDraftAdministrativeDataType(iContext.getModel(), sEntityType).then(function (oDADEntityType) {
 					var sBinding =
 						"{parts: [{path: 'HasDraftEntity', targetType: 'any'}, " +
 						//"{path: 'DraftAdministrativeData/LastChangeDateTime'}, " +
@@ -745,7 +742,7 @@ sap.ui.define(
 					return sBinding;
 				});
 			},
-			getContextPath: function(oValue, oInterface) {
+			getContextPath: function (oValue, oInterface) {
 				return oInterface && oInterface.context && oInterface.context.getPath();
 			},
 			/**
@@ -754,7 +751,7 @@ sap.ui.define(
 			 * @param sPresentationVariantPath
 			 * @returns {string} Stringified JSON object
 			 */
-			getSortConditions: function(oPresentationVariant, sPresentationVariantPath) {
+			getSortConditions: function (oPresentationVariant, sPresentationVariantPath) {
 				if (
 					oPresentationVariant &&
 					this._isPresentationVariantAnnotation(sPresentationVariantPath) &&
@@ -763,7 +760,7 @@ sap.ui.define(
 					var aSortConditions = {
 						sorters: []
 					};
-					oPresentationVariant.SortOrder.forEach(function(oCondition) {
+					oPresentationVariant.SortOrder.forEach(function (oCondition) {
 						var oSorter = {};
 						oSorter.name = oCondition.Property.$PropertyPath;
 						oSorter.descending = !!oCondition.Descending;
@@ -773,13 +770,13 @@ sap.ui.define(
 				}
 				return undefined;
 			},
-			_isPresentationVariantAnnotation: function(sAnnotationPath) {
+			_isPresentationVariantAnnotation: function (sAnnotationPath) {
 				return (
 					sAnnotationPath.indexOf("@com.sap.vocabularies.UI.v1.PresentationVariant") > -1 ||
 					sAnnotationPath.indexOf("@com.sap.vocabularies.UI.v1.SelectionPresentationVariant") > -1
 				);
 			},
-			createPresentationPathContext: function(oPresentationContext) {
+			createPresentationPathContext: function (oPresentationContext) {
 				var aPaths = oPresentationContext.sPath.split("@") || [];
 				var oModel = oPresentationContext.getModel();
 				if (aPaths.length && aPaths[aPaths.length - 1].indexOf("com.sap.vocabularies.UI.v1.SelectionPresentationVariant") > -1) {
@@ -788,7 +785,7 @@ sap.ui.define(
 				}
 				return oModel.createBindingContext(oPresentationContext.sPath + "@sapui.name");
 			},
-			getPressHandlerForDataFieldForIBN: function(oDataField, sContext, bNavigateWithConfirmationDialog) {
+			getPressHandlerForDataFieldForIBN: function (oDataField, sContext, bNavigateWithConfirmationDialog) {
 				var mNavigationParameters = {
 					navigationContexts: sContext ? sContext : "${$source>/}.getBindingContext()"
 				};
@@ -811,11 +808,11 @@ sap.ui.define(
 					this.objectToString(mNavigationParameters)
 				);
 			},
-			getEntitySet: function(oContext) {
+			getEntitySet: function (oContext) {
 				var sPath = oContext.getPath();
 				return ModelHelper.getEntitySetPath(sPath);
 			},
-			_isRatingIndicator: function(oControl) {
+			_isRatingIndicator: function (oControl) {
 				if (oControl.isA("sap.fe.core.controls.FieldWrapper")) {
 					var vContentDisplay = Array.isArray(oControl.getContentDisplay())
 						? oControl.getContentDisplay()[0]
@@ -826,7 +823,7 @@ sap.ui.define(
 				}
 				return false;
 			},
-			_updateStyleClassForRatingIndicator: function(oFieldWrapper, bLast) {
+			_updateStyleClassForRatingIndicator: function (oFieldWrapper, bLast) {
 				var vContentDisplay = Array.isArray(oFieldWrapper.getContentDisplay())
 					? oFieldWrapper.getContentDisplay()[0]
 					: oFieldWrapper.getContentDisplay();
@@ -853,7 +850,7 @@ sap.ui.define(
 			 * @param {*} sVisibleValue Either static boolean values or Array of path expressions for visibility of menu button.
 			 * @returns {*} The binding expression determining the visibility of menu actions.
 			 **/
-			handleVisibilityOfMenuActions: function(sVisibleValue) {
+			handleVisibilityOfMenuActions: function (sVisibleValue) {
 				var combinedConditions = [];
 				if (Array.isArray(sVisibleValue)) {
 					for (var i = 0; i < sVisibleValue.length; i++) {
@@ -905,7 +902,7 @@ sap.ui.define(
 			 * @param {string} sDeviationHigh ExpressionBinding for Higher Deviation level
 			 * @returns {string} Returns criticality calculation as expression binding
 			 */
-			getCriticalityCalculationBinding: function(
+			getCriticalityCalculationBinding: function (
 				sImprovementDirection,
 				sValue,
 				sDeviationLow,
@@ -1058,7 +1055,7 @@ sap.ui.define(
 			 * @returns {sIndicator} Return the indicator for criticality
 			 * @private
 			 */
-			_getCriticalityFromEnum: function(sCriticality) {
+			_getCriticalityFromEnum: function (sCriticality) {
 				var sIndicator;
 				if (sCriticality === "com.sap.vocabularies.UI.v1.CriticalityType/Negative") {
 					sIndicator = ValueColor.Error;
@@ -1071,11 +1068,11 @@ sap.ui.define(
 				}
 				return sIndicator;
 			},
-			getValueCriticality: function(sDimension, aValueCriticality) {
+			getValueCriticality: function (sDimension, aValueCriticality) {
 				var sResult,
 					aValues = [];
 				if (aValueCriticality && aValueCriticality.length > 0) {
-					aValueCriticality.forEach(function(oVC) {
+					aValueCriticality.forEach(function (oVC) {
 						if (oVC.Value && oVC.Criticality.$EnumMember) {
 							var sValue =
 								"${" +
@@ -1100,13 +1097,13 @@ sap.ui.define(
 			 * @returns {string} MeasureAttribute index.
 			 * @private
 			 */
-			getMeasureAttributeIndex: function(iMeasure, oChartAnnotations) {
+			getMeasureAttributeIndex: function (iMeasure, oChartAnnotations) {
 				var aMeasures = oChartAnnotations.Measures,
 					bMeasureAttributeExists,
 					aMeasureAttributes = oChartAnnotations.MeasureAttributes,
 					sMeasurePropertyPath = aMeasures && aMeasures[iMeasure] && aMeasures[iMeasure].$PropertyPath,
 					iMeasureAttribute = -1,
-					fnCheckMeasure = function(sMeasure, oMeasureAttribute, index) {
+					fnCheckMeasure = function (sMeasure, oMeasureAttribute, index) {
 						if ((oMeasureAttribute && oMeasureAttribute.Measure && oMeasureAttribute.Measure.$PropertyPath) === sMeasure) {
 							iMeasureAttribute = index;
 							return true;
@@ -1123,13 +1120,13 @@ sap.ui.define(
 			 * @param {object} oContext Context to the measure annotation
 			 * @returns {string} Path to the measureAttribute of the measure
 			 */
-			getMeasureAttributeForMeasure: function(oContext) {
+			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) {
+				return oMetaModel.requestObject(sChartAnnotationPath).then(function (oChartAnnotations) {
 					var aMeasureAttributes = oChartAnnotations.MeasureAttributes,
 						iMeasureAttribute = Helper.getMeasureAttributeIndex(iMeasure, oChartAnnotations);
 					var sMeasureAttributePath =
@@ -1148,7 +1145,7 @@ sap.ui.define(
 			 * @param {object} oTableMetadata Table metadata for which draft support shall be checked
 			 * @returns {boolean} Returns true if draft
 			 */
-			isDraftParentEntityForContainment: function(oTargetCollectionContainsTarget, oTableMetadata) {
+			isDraftParentEntityForContainment: function (oTargetCollectionContainsTarget, oTableMetadata) {
 				if (oTargetCollectionContainsTarget) {
 					if (oTableMetadata && oTableMetadata.parentEntitySet && oTableMetadata.parentEntitySet.sPath) {
 						var sParentEntitySetPath = oTableMetadata.parentEntitySet.sPath;
@@ -1178,7 +1175,7 @@ sap.ui.define(
 			 * @param {object} dataElement The data that is currently being processed.
 			 * @returns {string} The correct path according to the template.
 			 **/
-			getDataFromTemplate: function(dataElement) {
+			getDataFromTemplate: function (dataElement) {
 				var splitPath = dataElement.getPath().split("/");
 				var dataKey = splitPath[splitPath.length - 1];
 				var connectedDataPath = "/" + splitPath.slice(1, -2).join("/") + "/@";
@@ -1190,7 +1187,12 @@ sap.ui.define(
 					var key = splitTemp[i].split("{")[1].trim();
 					tempArray.push(key);
 				}
-				var index = Object.keys(connectedObject.Data).indexOf(dataKey) - 1;
+				Object.keys(connectedObject.Data).forEach(function (sKey) {
+					if (sKey.startsWith("$")) {
+						delete connectedObject.Data[sKey];
+					}
+				});
+				var index = Object.keys(connectedObject.Data).indexOf(dataKey);
 				return "/" + splitPath.slice(1, -2).join("/") + "/Data/" + tempArray[index];
 			},
 
@@ -1203,7 +1205,7 @@ sap.ui.define(
 			 * @param {object} element The element that is currently being processed.
 			 * @returns {boolean} True or False (depending on the template index).
 			 **/
-			notLastIndex: function(target, element) {
+			notLastIndex: function (target, element) {
 				var template = target.Template;
 				var splitTemp = template.split("}");
 				var tempArray = [];
@@ -1213,7 +1215,7 @@ sap.ui.define(
 					tempArray.push(dataKey);
 				}
 
-				tempArray.forEach(function(template) {
+				tempArray.forEach(function (template) {
 					if (target.Data[template] === element && tempArray.indexOf(template) !== tempArray.length - 1) {
 						isLastIndex = true;
 					}
@@ -1229,14 +1231,11 @@ sap.ui.define(
 			 * @param {string} template The template string.
 			 * @returns {string} The delimiter in the template string.
 			 **/
-			getDelimiter: function(template) {
-				return template
-					.split("}")[1]
-					.split("{")[0]
-					.trim();
+			getDelimiter: function (template) {
+				return template.split("}")[1].split("{")[0].trim();
 			},
 
-			getParameters: function(oContext, oInterface) {
+			getParameters: function (oContext, oInterface) {
 				if (oContext) {
 					var oMetaModel = oInterface.context.getModel();
 					var sPath = oInterface.context.getPath();

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

@@ -59,7 +59,7 @@ sap.ui.define(
 			interfaces: [],
 			controls: [],
 			elements: [],
-			version: "1.96.7",
+			version: "1.96.8",
 			noLibraryCSS: true
 		});