@sap/open.fe 1.94.0

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterFieldHelper-dbg.js

@@ -0,0 +1,149 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
+ */
+sap.ui.define(["sap/fe/macros/CommonHelper", "sap/fe/core/CommonUtils", "sap/ui/model/odata/v4/AnnotationHelper"], function(
+	CommonHelper,
+	CommonUtils,
+	AnnotationHelper
+) {
+	"use strict";
+
+	var FilterFieldHelper = {
+		//FilterField
+		isRequiredInFilter: function(path, oDetails) {
+			var oModel = oDetails.context.getModel(),
+				sPropertyPath = oDetails.context.getPath(),
+				sPropertyLocationPath = CommonHelper.getLocationForPropertyPath(oModel, sPropertyPath),
+				sProperty,
+				oFilterRestrictions,
+				bIsRequired = oModel.getObject(sPropertyLocationPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
+
+			if (!bIsRequired) {
+				if (typeof path === "string") {
+					sProperty = path;
+				} else {
+					sProperty = oModel.getObject(sPropertyPath + "@sapui.name");
+				}
+				oFilterRestrictions = oModel.getObject(sPropertyLocationPath + "@Org.OData.Capabilities.V1.FilterRestrictions");
+				if (oFilterRestrictions && oFilterRestrictions.RequiredProperties) {
+					bIsRequired = oFilterRestrictions.RequiredProperties.some(function(property) {
+						return property.$PropertyPath === sProperty;
+					});
+				}
+			}
+			return bIsRequired;
+		},
+		maxConditions: function(path, oDetails) {
+			var sPropertyLocationPath,
+				sProperty,
+				oFilterRestrictions,
+				maxConditions = -1,
+				oModel = oDetails.context.getModel(),
+				sPropertyPath = oDetails.context.getPath();
+
+			sPropertyLocationPath = CommonHelper.getLocationForPropertyPath(oModel, sPropertyPath);
+			if (oModel.getObject(sPropertyLocationPath + "/@com.sap.vocabularies.Common.v1.ResultContext") === true) {
+				return 1;
+			}
+
+			if (typeof path === "string") {
+				sProperty = path;
+			} else {
+				sProperty = oModel.getObject(sPropertyPath + "@sapui.name");
+			}
+			oFilterRestrictions = CommonUtils.getFilterRestrictionsByPath(sPropertyLocationPath, oModel);
+			var oProperty = oModel.getObject(sPropertyLocationPath + "/" + sProperty);
+			if (!oProperty) {
+				oProperty = oModel.getObject(sPropertyPath);
+			}
+			if (oProperty.$Type === "Edm.Boolean") {
+				maxConditions = 1;
+			} else if (
+				oFilterRestrictions &&
+				oFilterRestrictions.FilterAllowedExpressions &&
+				oFilterRestrictions.FilterAllowedExpressions[sProperty]
+			) {
+				var sAllowedExpression = CommonUtils.getSpecificAllowedExpression(oFilterRestrictions.FilterAllowedExpressions[sProperty]);
+				if (sAllowedExpression === "SingleValue" || sAllowedExpression === "SingleRange") {
+					maxConditions = 1;
+				}
+			}
+			return maxConditions;
+		},
+		/**
+		 * To Create binding for mdc:filterfield conditions.
+		 *
+		 * @param {object} iContext An interface with context to the path to be considered for binding
+		 * @param {object | string} vProperty The property to create the condition binding for
+		 * @param {object} oEntityType The EntityType
+		 * @returns {string} Expression binding for conditions for the field
+		 */
+		getConditionsBinding: function(iContext, vProperty, oEntityType) {
+			var oPropertyInterface = iContext.getInterface(0),
+				oMetaModel = oPropertyInterface.getModel(),
+				sFullPropertyPath = oPropertyInterface.getPath(),
+				sConditionPath = "",
+				sEntityTypePath = iContext.getInterface(1).getPath(),
+				aPropertyPathParts,
+				i;
+
+			if (oEntityType && oEntityType["$kind"] === "EntityType" && sFullPropertyPath.startsWith(sEntityTypePath)) {
+				// in case:
+				// 1. sFullPropertyPath is '/SOM/Name' and sEntityTypePath is '/SOM/'(normal scenario)
+				// 2. sFullPropertyPath is '/Customer/Set/Name' and sEntityTypePath is '/Customer/Set/'(main entitytype proerty in parameterized case)
+				sEntityTypePath = iContext.getInterface(1).getPath();
+				var sPropertyPath = sFullPropertyPath.replace(sEntityTypePath, "");
+				aPropertyPathParts = sPropertyPath.split("/");
+			} else {
+				// 1. sFullPropertyPath is '/Customer/Set/Name' and sEntityTypePath is '/Customer/P_CC'(parameter proerty in parameterized case)
+				aPropertyPathParts = sFullPropertyPath.substring(1).split("/");
+				sEntityTypePath = "/" + aPropertyPathParts.shift() + "/";
+			}
+
+			for (i = 0; i < aPropertyPathParts.length; ++i) {
+				vProperty = oMetaModel.getProperty(sEntityTypePath + aPropertyPathParts.slice(0, i + 1).join("/"));
+				if (vProperty.$kind === "NavigationProperty" && vProperty.$isCollection) {
+					sConditionPath += aPropertyPathParts[i] + "*/";
+				} else if (typeof vProperty !== "string") {
+					sConditionPath += aPropertyPathParts[i] + "/";
+				}
+			}
+			// remove the last slash from the conditionPath
+			return "{$filters>/conditions/" + sConditionPath.substring(0, sConditionPath.length - 1) + "}";
+		},
+		constraints: function(oProperty, oInterface) {
+			var sValue = AnnotationHelper.format(oProperty, oInterface),
+				aMatches = sValue && sValue.match(/constraints:.*?({.*?})/),
+				sConstraints = aMatches && aMatches[1];
+			// Workaround. Add "V4: true" to DateTimeOffset constraints. AnnotationHelper is not aware of this flag.
+			if (sValue.indexOf("sap.ui.model.odata.type.DateTimeOffset") > -1) {
+				if (sConstraints) {
+					sConstraints = sConstraints.substr(0, aMatches[1].indexOf("}")) + ", V4: true}";
+				} else {
+					sConstraints = "{V4: true}";
+				}
+			}
+			// Remove {nullable:false} from the constraints as it prevents from having an empty filter field
+			// in the case of a single-value filter
+			if (sConstraints && sConstraints.indexOf("'nullable':false") >= 0) {
+				sConstraints = sConstraints.replace(/,[ ]*'nullable':false/, "").replace(/'nullable':false[, ]*/, "");
+			}
+			return sConstraints || undefined;
+		},
+		formatOptions: function(oProperty, oInterface) {
+			// as the Annotation helper always returns "parseKeepsEmptyString: true" we need to prevent this in case a property (of type string) is nullable
+			// Filling oInterface.arguments with an array where the first parameter is null, and the second contains the "expected"
+			// parseKeepsEmptyString value follows a proposal from the model colleagues to "overrule" the behavior of the AnnotationHelper
+			if (oProperty.$Type === "Edm.String" && (!oProperty.hasOwnProperty("$Nullable") || oProperty.$Nullable === true)) {
+				oInterface.arguments = [null, { parseKeepsEmptyString: false }];
+			}
+			var sValue = AnnotationHelper.format(oProperty, oInterface),
+				aMatches = sValue && sValue.match(/formatOptions:.*?({.*?})/);
+			return (aMatches && aMatches[1]) || undefined;
+		}
+	};
+	FilterFieldHelper.getConditionsBinding.requiresIContext = true;
+	return FilterFieldHelper;
+});

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterFieldHelper.js

@@ -0,0 +1,6 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
+ */
+sap.ui.define(["sap/fe/macros/CommonHelper","sap/fe/core/CommonUtils","sap/ui/model/odata/v4/AnnotationHelper"],function(C,a,A){"use strict";var F={isRequiredInFilter:function(p,d){var m=d.context.getModel(),P=d.context.getPath(),s=C.getLocationForPropertyPath(m,P),b,f,i=m.getObject(s+"/@com.sap.vocabularies.Common.v1.ResultContext");if(!i){if(typeof p==="string"){b=p;}else{b=m.getObject(P+"@sapui.name");}f=m.getObject(s+"@Org.OData.Capabilities.V1.FilterRestrictions");if(f&&f.RequiredProperties){i=f.RequiredProperties.some(function(c){return c.$PropertyPath===b;});}}return i;},maxConditions:function(p,d){var P,s,f,m=-1,M=d.context.getModel(),b=d.context.getPath();P=C.getLocationForPropertyPath(M,b);if(M.getObject(P+"/@com.sap.vocabularies.Common.v1.ResultContext")===true){return 1;}if(typeof p==="string"){s=p;}else{s=M.getObject(b+"@sapui.name");}f=a.getFilterRestrictionsByPath(P,M);var o=M.getObject(P+"/"+s);if(!o){o=M.getObject(b);}if(o.$Type==="Edm.Boolean"){m=1;}else if(f&&f.FilterAllowedExpressions&&f.FilterAllowedExpressions[s]){var c=a.getSpecificAllowedExpression(f.FilterAllowedExpressions[s]);if(c==="SingleValue"||c==="SingleRange"){m=1;}}return m;},getConditionsBinding:function(c,p,e){var P=c.getInterface(0),m=P.getModel(),f=P.getPath(),s="",E=c.getInterface(1).getPath(),b,i;if(e&&e["$kind"]==="EntityType"&&f.startsWith(E)){E=c.getInterface(1).getPath();var d=f.replace(E,"");b=d.split("/");}else{b=f.substring(1).split("/");E="/"+b.shift()+"/";}for(i=0;i<b.length;++i){p=m.getProperty(E+b.slice(0,i+1).join("/"));if(p.$kind==="NavigationProperty"&&p.$isCollection){s+=b[i]+"*/";}else if(typeof p!=="string"){s+=b[i]+"/";}}return"{$filters>/conditions/"+s.substring(0,s.length-1)+"}";},constraints:function(p,i){var v=A.format(p,i),m=v&&v.match(/constraints:.*?({.*?})/),c=m&&m[1];if(v.indexOf("sap.ui.model.odata.type.DateTimeOffset")>-1){if(c){c=c.substr(0,m[1].indexOf("}"))+", V4: true}";}else{c="{V4: true}";}}if(c&&c.indexOf("'nullable':false")>=0){c=c.replace(/,[ ]*'nullable':false/,"").replace(/'nullable':false[, ]*/,"");}return c||undefined;},formatOptions:function(p,i){if(p.$Type==="Edm.String"&&(!p.hasOwnProperty("$Nullable")||p.$Nullable===true)){i.arguments=[null,{parseKeepsEmptyString:false}];}var v=A.format(p,i),m=v&&v.match(/formatOptions:.*?({.*?})/);return(m&&m[1])||undefined;}};F.getConditionsBinding.requiresIContext=true;return F;});

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterFieldTemplating-dbg.js

@@ -0,0 +1,23 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
+ */
+sap.ui.define(["sap/fe/core/templating/UIFormatters", "sap/fe/core/templating/PropertyFormatters"], function (UIFormatters, PropertyFormatters) {
+  "use strict";
+
+  var _exports = {};
+  var getPropertyObjectPath = PropertyFormatters.getPropertyObjectPath;
+  var getProperty = PropertyFormatters.getProperty;
+  var hasValueHelp = PropertyFormatters.hasValueHelp;
+  var getDisplayMode = UIFormatters.getDisplayMode;
+
+  var getDisplayProperty = function (oContext, oInterface) {
+    var propertyPath = getPropertyObjectPath(oContext, oInterface);
+    var oProperty = getProperty(oContext, oInterface);
+    return hasValueHelp(oContext, oInterface) ? getDisplayMode(oProperty, propertyPath) : "Value";
+  };
+
+  _exports.getDisplayProperty = getDisplayProperty;
+  return _exports;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZpbHRlckZpZWxkVGVtcGxhdGluZy50cyJdLCJuYW1lcyI6WyJnZXREaXNwbGF5UHJvcGVydHkiLCJvQ29udGV4dCIsIm9JbnRlcmZhY2UiLCJwcm9wZXJ0eVBhdGgiLCJnZXRQcm9wZXJ0eU9iamVjdFBhdGgiLCJvUHJvcGVydHkiLCJnZXRQcm9wZXJ0eSIsImhhc1ZhbHVlSGVscCIsImdldERpc3BsYXlNb2RlIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7Ozs7O0FBR08sTUFBTUEsa0JBQWtCLEdBQUcsVUFBU0MsUUFBVCxFQUFxQ0MsVUFBckMsRUFBc0Y7QUFDdkgsUUFBTUMsWUFBWSxHQUFHQyxxQkFBcUIsQ0FBQ0gsUUFBRCxFQUFXQyxVQUFYLENBQTFDO0FBQ0EsUUFBTUcsU0FBbUIsR0FBR0MsV0FBVyxDQUFDTCxRQUFELEVBQVdDLFVBQVgsQ0FBdkM7QUFFQSxXQUFPSyxZQUFZLENBQUNOLFFBQUQsRUFBV0MsVUFBWCxDQUFaLEdBQXFDTSxjQUFjLENBQUNILFNBQUQsRUFBWUYsWUFBWixDQUFuRCxHQUErRSxPQUF0RjtBQUNBLEdBTE0iLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGdldERpc3BsYXlNb2RlLCBNZXRhTW9kZWxDb250ZXh0LCBDb21wdXRlZEFubm90YXRpb25JbnRlcmZhY2UgfSBmcm9tIFwic2FwL2ZlL2NvcmUvdGVtcGxhdGluZy9VSUZvcm1hdHRlcnNcIjtcbmltcG9ydCB7IGhhc1ZhbHVlSGVscCwgZ2V0UHJvcGVydHksIGdldFByb3BlcnR5T2JqZWN0UGF0aCB9IGZyb20gXCJzYXAvZmUvY29yZS90ZW1wbGF0aW5nL1Byb3BlcnR5Rm9ybWF0dGVyc1wiO1xuXG5pbXBvcnQgeyBQcm9wZXJ0eSB9IGZyb20gXCJAc2FwLXV4L3ZvY2FidWxhcmllcy10eXBlcy9kaXN0L0NvbnZlcnRlclwiO1xuXG5leHBvcnQgY29uc3QgZ2V0RGlzcGxheVByb3BlcnR5ID0gZnVuY3Rpb24ob0NvbnRleHQ6IE1ldGFNb2RlbENvbnRleHQsIG9JbnRlcmZhY2U6IENvbXB1dGVkQW5ub3RhdGlvbkludGVyZmFjZSk6IHN0cmluZyB7XG5cdGNvbnN0IHByb3BlcnR5UGF0aCA9IGdldFByb3BlcnR5T2JqZWN0UGF0aChvQ29udGV4dCwgb0ludGVyZmFjZSk7XG5cdGNvbnN0IG9Qcm9wZXJ0eTogUHJvcGVydHkgPSBnZXRQcm9wZXJ0eShvQ29udGV4dCwgb0ludGVyZmFjZSk7XG5cblx0cmV0dXJuIGhhc1ZhbHVlSGVscChvQ29udGV4dCwgb0ludGVyZmFjZSkgPyBnZXREaXNwbGF5TW9kZShvUHJvcGVydHksIHByb3BlcnR5UGF0aCkgOiBcIlZhbHVlXCI7XG59O1xuIl19

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterFieldTemplating.js

@@ -0,0 +1,5 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
+ */
+sap.ui.define(["sap/fe/core/templating/UIFormatters","sap/fe/core/templating/PropertyFormatters"],function(U,P){"use strict";var _={};var g=P.getPropertyObjectPath;var a=P.getProperty;var h=P.hasValueHelp;var b=U.getDisplayMode;var c=function(C,i){var p=g(C,i);var o=a(C,i);return h(C,i)?b(o,p):"Value";};_.getDisplayProperty=c;return _;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterFieldTemplating.ts

@@ -0,0 +1,11 @@
+import { getDisplayMode, MetaModelContext, ComputedAnnotationInterface } from "sap/fe/core/templating/UIFormatters";
+import { hasValueHelp, getProperty, getPropertyObjectPath } from "sap/fe/core/templating/PropertyFormatters";
+
+import { Property } from "@sap-ux/vocabularies-types/dist/Converter";
+
+export const getDisplayProperty = function(oContext: MetaModelContext, oInterface: ComputedAnnotationInterface): string {
+	const propertyPath = getPropertyObjectPath(oContext, oInterface);
+	const oProperty: Property = getProperty(oContext, oInterface);
+
+	return hasValueHelp(oContext, oInterface) ? getDisplayMode(oProperty, propertyPath) : "Value";
+};

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterUtils-dbg.js

@@ -0,0 +1,363 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
+ */
+
+sap.ui.define(
+	[
+		"sap/ui/mdc/util/FilterUtil",
+		"sap/ui/fl/Utils",
+		"sap/ui/core/Core",
+		"sap/fe/macros/CommonHelper",
+		"sap/fe/core/CommonUtils",
+		"sap/fe/core/helpers/ModelHelper",
+		"sap/ui/model/Filter",
+		"sap/fe/macros/DelegateUtil",
+		"sap/fe/core/converters/controls/ListReport/FilterBar",
+		"sap/fe/core/converters/ConverterContext",
+		"sap/fe/core/converters/MetaModelConverter",
+		"sap/base/util/merge",
+		"sap/ui/model/json/JSONModel",
+		"sap/ui/mdc/field/ConditionsType",
+		"sap/ui/mdc/p13n/StateUtil",
+		"sap/ui/mdc/condition/ConditionConverter",
+		"sap/ui/model/odata/v4/ODataUtils",
+		"sap/base/Log"
+	],
+	function(
+		FilterUtil,
+		FlUtils,
+		Core,
+		CommonHelper,
+		CommonUtils,
+		ModelHelper,
+		Filter,
+		DelegateUtil,
+		FilterBarConverter,
+		ConverterContext,
+		MetaModelConverter,
+		merge,
+		JSONModel,
+		ConditionsType,
+		StateUtil,
+		ConditionConverter,
+		ODataUtils,
+		Log
+	) {
+		"use strict";
+
+		var oFilterUtils = {
+			getFilter: function(vIFilter) {
+				var aFilters = oFilterUtils.getFilterInfo(vIFilter).filters;
+				return aFilters.length ? new Filter(oFilterUtils.getFilterInfo(vIFilter).filters, false) : undefined;
+			},
+			getConvertedFilterFields: function(oFilterControl, sEntityTypePath) {
+				var sFilterEntityTypePath = DelegateUtil.getCustomData(oFilterControl, "entityType"),
+					sFilterEntityPath = ModelHelper.getEntitySetPath(sFilterEntityTypePath),
+					sEntitySetPath = sEntityTypePath && ModelHelper.getEntitySetPath(sEntityTypePath),
+					sTargetEntityPath = sEntitySetPath || sFilterEntityPath,
+					sTargetEntitySetName = sTargetEntityPath ? sTargetEntityPath.slice(1) : sTargetEntityPath,
+					sCustomDataPath =
+						"selectionFields" +
+						(!sTargetEntityPath || sFilterEntityPath === sTargetEntityPath ? "" : "For" + sTargetEntitySetName),
+					aSelectionFields = DelegateUtil.getCustomData(oFilterControl, sCustomDataPath);
+
+				if (!aSelectionFields && (!sTargetEntityPath || !(oFilterControl.data instanceof Function))) {
+					return [];
+				} else if (!aSelectionFields) {
+					/**
+					 * Gets fields from
+					 * 	- direct entity properties,
+					 * 	- navigateProperties key in the manifest if these properties are known by the entity
+					 *  - annotation "SelectionFields"
+					 */
+					var oView = FlUtils.getViewForControl(oFilterControl);
+					var oMetaModel = oFilterControl.getModel().getMetaModel();
+					var oAppComponent = CommonUtils.getAppComponent(oView);
+					var oVisualizationObjectPath = MetaModelConverter.getInvolvedDataModelObjects(
+						oMetaModel.createBindingContext("/" + sTargetEntitySetName)
+					);
+
+					var oConverterContext = ConverterContext.createConverterContextForMacro(
+						oVisualizationObjectPath.startingEntitySet.name,
+						oMetaModel,
+						oAppComponent && oAppComponent.getDiagnostics(),
+						merge,
+						oVisualizationObjectPath.contextLocation,
+						oView && oView.getViewData()
+					);
+
+					aSelectionFields = FilterBarConverter.getSelectionFields(oConverterContext);
+					if (oFilterControl.isA("sap.ui.mdc.FilterBar") && sEntitySetPath !== sFilterEntityPath) {
+						/**
+						 * We are on multi entity sets scenario so we add annotation "SelectionFields"
+						 * from FilterBar entity if these properties are known by the entity
+						 */
+						var oPageContext = oConverterContext.getConverterContextFor(sFilterEntityPath);
+						var aFilterBarSelectionFieldsAnnotation =
+							oPageContext.getEntityTypeAnnotation("@com.sap.vocabularies.UI.v1.SelectionFields").annotation || [];
+						var mapSelectionFields = {};
+						aSelectionFields.forEach(function(oSelectionField) {
+							mapSelectionFields[oSelectionField.conditionPath] = true;
+						});
+
+						aFilterBarSelectionFieldsAnnotation.forEach(function(oFilterBarSelectionFieldAnnotation) {
+							var sPath = oFilterBarSelectionFieldAnnotation.value;
+							if (!mapSelectionFields[sPath]) {
+								var oFilterField = FilterBarConverter.getFilterField(
+									sPath,
+									oConverterContext,
+									oVisualizationObjectPath.startingEntitySet.entityType
+								);
+								if (oFilterField) {
+									aSelectionFields.push(oFilterField);
+								}
+							}
+						});
+					}
+
+					DelegateUtil.setCustomData(oFilterControl, sCustomDataPath, aSelectionFields);
+				}
+				return CommonHelper.parseCustomData(aSelectionFields);
+			},
+
+			getBindingPathForParameters: function(oIFilter, mConditions, aFilterPropertiesMetadata, aParameters) {
+				var sBindingPath,
+					aParams = [];
+
+				// Collecting all parameter values from conditions
+				for (var i = 0; i < aParameters.length; i++) {
+					var sFieldPath = aParameters[i];
+					if (mConditions[sFieldPath] && mConditions[sFieldPath].length > 0) {
+						// We would be using only the first condition for parameter value.
+						var oConditionInternal = merge({}, mConditions[sFieldPath][0]);
+						var oProperty = FilterUtil.getPropertyByKey(aFilterPropertiesMetadata, sFieldPath);
+						var mInternalParameterCondition = ConditionConverter.toType(
+							oConditionInternal,
+							oProperty.typeConfig,
+							oIFilter.getTypeUtil()
+						);
+						var sEdmType = oProperty.typeConfig.className;
+						aParams.push(
+							sFieldPath + "=" + encodeURIComponent(ODataUtils.formatLiteral(mInternalParameterCondition.values[0], sEdmType))
+						);
+					}
+				}
+
+				// Binding path from EntityType
+				var sEntityTypePath = oIFilter.data("entityType");
+				var sEntitySetPath = sEntityTypePath.substring(0, sEntityTypePath.length - 1);
+				var sParameterEntitySet = sEntitySetPath.slice(0, sEntitySetPath.lastIndexOf("/"));
+				var sTargetNavigation = sEntitySetPath.substring(sEntitySetPath.lastIndexOf("/") + 1);
+				// create parameter context
+				sBindingPath = sParameterEntitySet + "(" + aParams.toString() + ")/" + sTargetNavigation;
+
+				return sBindingPath;
+			},
+
+			/**
+			 * Gets all filters that originate from the MDC FilterBar.
+			 *
+			 * @param {object|string} vIFilter String or object instance related to
+			 *  - MDC FilterBar/Table/Chart
+			 * @param {object} mProperties Properties on filters that are to be retrieved. Available parameters:
+			 * 	 - ignoredProperties: Array of property names which should be not considered for filtering
+			 *	 - propertiesMetadata: Array with all the property metadata. If not provided, properties will be retrieved from vIFilter.
+			 *	 - targetControl: MDC table or chart. If provided, property names which are not relevant for the target control entitySet are not considered.
+			 * @param {map} mFilterConditions Map with externalized filter conditions.
+			 * @returns {object} FilterBar filters and basic search
+			 * @private
+			 * @ui5-restricted
+			 */
+			getFilterInfo: function(vIFilter, mProperties, mFilterConditions) {
+				var oIFilter = vIFilter,
+					sSearch,
+					sBindingPath,
+					aFilters = [],
+					aIgnoreProperties = (mProperties && mProperties.ignoredProperties) || [],
+					aPropertiesMetadata = mProperties && mProperties.propertiesMetadata,
+					oTargetControl = mProperties && mProperties.targetControl,
+					sTargetEntityPath = oTargetControl ? oTargetControl.data("entityType") : undefined;
+				if (typeof vIFilter === "string") {
+					oIFilter = Core.byId(vIFilter);
+				}
+				if (oIFilter) {
+					sSearch = oIFilter.getSearch && aIgnoreProperties.indexOf("search") === -1 ? oIFilter.getSearch() : null;
+					var mConditions = mFilterConditions || oIFilter.getConditions(),
+						aFilterPropertiesMetadata = oIFilter.getPropertyInfoSet ? oIFilter.getPropertyInfoSet() : null;
+					var aParameters = oIFilter.data("parameters") || [];
+					if (aParameters.length > 0) {
+						// Binding path changes in case of parameters.
+						sBindingPath = oFilterUtils.getBindingPathForParameters(
+							oIFilter,
+							mConditions,
+							aFilterPropertiesMetadata,
+							aParameters
+						);
+					}
+					if (mConditions) {
+						//Exclude Interface Filter properties that are not relevant for the Target control entitySet
+						if (sTargetEntityPath && oIFilter.data("entityType") !== sTargetEntityPath) {
+							var oMetaModel = oIFilter.getModel().getMetaModel();
+							var aTargetPropertiesMetadata = oIFilter
+								.getControlDelegate()
+								.fetchPropertiesForEntity(sTargetEntityPath, oMetaModel, oIFilter);
+							aPropertiesMetadata = aTargetPropertiesMetadata;
+
+							var mEntityProperties = {};
+							for (var i = 0; i < aTargetPropertiesMetadata.length; i++) {
+								var oEntityProperty = aTargetPropertiesMetadata[i];
+								mEntityProperties[oEntityProperty.name] = true;
+							}
+							aFilterPropertiesMetadata.forEach(function(oIFilterProperty) {
+								var sIFilterPropertyName = oIFilterProperty.name;
+								if (!mEntityProperties[sIFilterPropertyName]) {
+									aIgnoreProperties.push(sIFilterPropertyName);
+								}
+							});
+						} else if (!aPropertiesMetadata) {
+							aPropertiesMetadata = aFilterPropertiesMetadata;
+						}
+						var oFilter = FilterUtil.getFilterInfo(
+							oIFilter,
+							mConditions,
+							aPropertiesMetadata,
+							aIgnoreProperties.concat(aParameters)
+						).filters;
+						aFilters = oFilter ? [oFilter] : [];
+					}
+				}
+				return { filters: aFilters, search: sSearch || undefined, bindingPath: sBindingPath };
+			},
+			getNotApplicableFiltersForTable: function(oFilterBar, oTable) {
+				var sTargetEntityTypePath = oTable.data("entityType"),
+					aNotApplicable = [],
+					mConditions = oFilterBar.getConditions(),
+					oMetaModel = oFilterBar.getModel().getMetaModel(),
+					bIsFilterBarEntityType = sTargetEntityTypePath === oFilterBar.data("entityType"),
+					bIsAnalyticalTable = DelegateUtil.getCustomData(oTable, "enableAnalytics") === "true";
+
+				if (mConditions && (!bIsFilterBarEntityType || bIsAnalyticalTable)) {
+					// We don't need to calculate the difference on property Level if entity sets are identical
+					var aTargetProperties = bIsFilterBarEntityType
+							? []
+							: oFilterBar.getControlDelegate().fetchPropertiesForEntity(sTargetEntityTypePath, oMetaModel, oFilterBar),
+						mTargetProperties = aTargetProperties.reduce(function(mProp, oProp) {
+							mProp[oProp.name] = oProp;
+							return mProp;
+						}, {}),
+						mTableAggregates = CommonHelper.parseCustomData(DelegateUtil.getCustomData(oTable, "aggregates") || {}),
+						mAggregatedProperties = {};
+
+					Object.keys(mTableAggregates).forEach(function(sAggregateName) {
+						var oAggregate = mTableAggregates[sAggregateName];
+						mAggregatedProperties[oAggregate.relativePath] = oAggregate;
+					});
+
+					for (var sProperty in mConditions) {
+						// Need to check the length of mConditions[sProperty] since previous filtered properties are kept into mConditions with empty array as definition
+						var aConditionProperty = mConditions[sProperty];
+						if (
+							Array.isArray(aConditionProperty) &&
+							aConditionProperty.length > 0 &&
+							((!mTargetProperties[sProperty] && !bIsFilterBarEntityType) || mAggregatedProperties[sProperty])
+						) {
+							aNotApplicable.push(sProperty.replace(/\+|\*/g, ""));
+						}
+					}
+				}
+				if (bIsAnalyticalTable && oFilterBar.getSearch()) {
+					aNotApplicable.push("$search");
+				}
+				return aNotApplicable;
+			},
+
+			attachConditionHandling: function(oFilterBar) {
+				var oFilterModel = new JSONModel(),
+					oEventData = {
+						filterControl: oFilterBar,
+						filterModel: oFilterModel
+					},
+					that = this;
+
+				oFilterBar.setModel(oFilterModel, "filterValues");
+				return oFilterBar.initialized().then(function() {
+					var oConditionModel = oFilterBar._getConditionModel();
+					oConditionModel.attachPropertyChange(oEventData, that._handleConditionModelChange, that);
+					oFilterModel.attachPropertyChange(oEventData, that._handleFilterModelChange, that);
+				});
+			},
+			detachConditionHandling: function(oFilterBar) {
+				var oFilterModel = oFilterBar.getModel("filterValues"),
+					oConditionModel = oFilterBar._getConditionModel();
+				oConditionModel.detachPropertyChange(this._handleConditionModelChange, this);
+				oFilterModel.detachPropertyChange(this._handleFilterModelChange, this);
+				oFilterModel.destroy();
+			},
+			setFilterValues: function(oFilterControl, sConditionPath, sOperator, vValues) {
+				var oFormatOptions = {};
+				if (vValues === undefined) {
+					vValues = sOperator;
+				} else {
+					oFormatOptions.operators = [sOperator];
+				}
+
+				if (typeof vValues === "object" && vValues.operator) {
+					oFormatOptions.operators = [vValues.operator];
+					vValues = vValues.values;
+				}
+
+				var oConditionsType = new ConditionsType(oFormatOptions),
+					oClearFilter = {},
+					oFilter = {};
+
+				vValues = Array.isArray(vValues) ? vValues : [vValues];
+
+				oClearFilter[sConditionPath] = [];
+				if (sOperator) {
+					oFilter[sConditionPath] = vValues
+						.filter(function(vValue) {
+							return vValue !== undefined && vValue !== null;
+						})
+						.reduce(function(aAllFilters, vValue) {
+							return aAllFilters.concat(oConditionsType.parseValue(vValue.toString(), "any"));
+						}, []);
+				}
+
+				// needs to be cleared first, else it is just added to the already existing filters
+				return StateUtil.applyExternalState(oFilterControl, { filter: oClearFilter }).then(
+					StateUtil.applyExternalState.bind(StateUtil, oFilterControl, { filter: oFilter })
+				);
+			},
+			conditionToModelPath: function(sConditionPath) {
+				// make the path usable as model property, therefore slashes become backslashes
+				return sConditionPath.replace(/\//g, "\\");
+			},
+			modelToConditionPath: function(sConditionPath) {
+				return sConditionPath.replace(/\\/g, "/");
+			},
+			_handleConditionModelChange: function(oEvent, oData) {
+				// substring(12) => strip away "/conditions/" from the path
+				var sConditionPath = this.modelToConditionPath(oEvent.getParameter("path").substring(12)),
+					// return pure value without operator, e.g. "42" instead of "=42"
+					oConditionsType = new ConditionsType({ maxConditions: -1 }),
+					oFilterModel = oData.filterModel,
+					aValue = oEvent.getParameter("value"),
+					vValue = oConditionsType.formatValue(aValue, "any");
+				oFilterModel.setProperty("/" + this.conditionToModelPath(sConditionPath), vValue);
+			},
+			_handleFilterModelChange: function(oEvent, oData) {
+				var sPath = oEvent
+						.getParameter("context")
+						.getPath()
+						.substring(1)
+						.replace(/\\/g, "/"),
+					vValues = oEvent.getParameter("value");
+				this.setFilterValues(oData.filterControl, sPath, vValues);
+			}
+		};
+
+		return oFilterUtils;
+	}
+);

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterUtils.js

@@ -0,0 +1,6 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
+ */
+sap.ui.define(["sap/ui/mdc/util/FilterUtil","sap/ui/fl/Utils","sap/ui/core/Core","sap/fe/macros/CommonHelper","sap/fe/core/CommonUtils","sap/fe/core/helpers/ModelHelper","sap/ui/model/Filter","sap/fe/macros/DelegateUtil","sap/fe/core/converters/controls/ListReport/FilterBar","sap/fe/core/converters/ConverterContext","sap/fe/core/converters/MetaModelConverter","sap/base/util/merge","sap/ui/model/json/JSONModel","sap/ui/mdc/field/ConditionsType","sap/ui/mdc/p13n/StateUtil","sap/ui/mdc/condition/ConditionConverter","sap/ui/model/odata/v4/ODataUtils","sap/base/Log"],function(F,a,C,b,c,M,d,D,e,f,g,m,J,h,S,j,O,L){"use strict";var o={getFilter:function(i){var k=o.getFilterInfo(i).filters;return k.length?new d(o.getFilterInfo(i).filters,false):undefined;},getConvertedFilterFields:function(i,E){var s=D.getCustomData(i,"entityType"),k=M.getEntitySetPath(s),l=E&&M.getEntitySetPath(E),t=l||k,T=t?t.slice(1):t,n="selectionFields"+(!t||k===t?"":"For"+T),p=D.getCustomData(i,n);if(!p&&(!t||!(i.data instanceof Function))){return[];}else if(!p){var v=a.getViewForControl(i);var q=i.getModel().getMetaModel();var A=c.getAppComponent(v);var V=g.getInvolvedDataModelObjects(q.createBindingContext("/"+T));var r=f.createConverterContextForMacro(V.startingEntitySet.name,q,A&&A.getDiagnostics(),m,V.contextLocation,v&&v.getViewData());p=e.getSelectionFields(r);if(i.isA("sap.ui.mdc.FilterBar")&&l!==k){var P=r.getConverterContextFor(k);var u=P.getEntityTypeAnnotation("@com.sap.vocabularies.UI.v1.SelectionFields").annotation||[];var w={};p.forEach(function(x){w[x.conditionPath]=true;});u.forEach(function(x){var y=x.value;if(!w[y]){var z=e.getFilterField(y,r,V.startingEntitySet.entityType);if(z){p.push(z);}}});}D.setCustomData(i,n,p);}return b.parseCustomData(p);},getBindingPathForParameters:function(I,k,l,p){var B,P=[];for(var i=0;i<p.length;i++){var s=p[i];if(k[s]&&k[s].length>0){var n=m({},k[s][0]);var q=F.getPropertyByKey(l,s);var r=j.toType(n,q.typeConfig,I.getTypeUtil());var E=q.typeConfig.className;P.push(s+"="+encodeURIComponent(O.formatLiteral(r.values[0],E)));}}var t=I.data("entityType");var u=t.substring(0,t.length-1);var v=u.slice(0,u.lastIndexOf("/"));var T=u.substring(u.lastIndexOf("/")+1);B=v+"("+P.toString()+")/"+T;return B;},getFilterInfo:function(I,p,k){var l=I,s,B,n=[],q=(p&&p.ignoredProperties)||[],P=p&&p.propertiesMetadata,t=p&&p.targetControl,T=t?t.data("entityType"):undefined;if(typeof I==="string"){l=C.byId(I);}if(l){s=l.getSearch&&q.indexOf("search")===-1?l.getSearch():null;var r=k||l.getConditions(),u=l.getPropertyInfoSet?l.getPropertyInfoSet():null;var v=l.data("parameters")||[];if(v.length>0){B=o.getBindingPathForParameters(l,r,u,v);}if(r){if(T&&l.data("entityType")!==T){var w=l.getModel().getMetaModel();var x=l.getControlDelegate().fetchPropertiesForEntity(T,w,l);P=x;var E={};for(var i=0;i<x.length;i++){var y=x[i];E[y.name]=true;}u.forEach(function(A){var G=A.name;if(!E[G]){q.push(G);}});}else if(!P){P=u;}var z=F.getFilterInfo(l,r,P,q.concat(v)).filters;n=z?[z]:[];}}return{filters:n,search:s||undefined,bindingPath:B};},getNotApplicableFiltersForTable:function(i,t){var T=t.data("entityType"),n=[],k=i.getConditions(),l=i.getModel().getMetaModel(),I=T===i.data("entityType"),p=D.getCustomData(t,"enableAnalytics")==="true";if(k&&(!I||p)){var q=I?[]:i.getControlDelegate().fetchPropertiesForEntity(T,l,i),r=q.reduce(function(v,w){v[w.name]=w;return v;},{}),s=b.parseCustomData(D.getCustomData(t,"aggregates")||{}),A={};Object.keys(s).forEach(function(v){var w=s[v];A[w.relativePath]=w;});for(var P in k){var u=k[P];if(Array.isArray(u)&&u.length>0&&((!r[P]&&!I)||A[P])){n.push(P.replace(/\+|\*/g,""));}}}if(p&&i.getSearch()){n.push("$search");}return n;},attachConditionHandling:function(i){var k=new J(),E={filterControl:i,filterModel:k},t=this;i.setModel(k,"filterValues");return i.initialized().then(function(){var l=i._getConditionModel();l.attachPropertyChange(E,t._handleConditionModelChange,t);k.attachPropertyChange(E,t._handleFilterModelChange,t);});},detachConditionHandling:function(i){var k=i.getModel("filterValues"),l=i._getConditionModel();l.detachPropertyChange(this._handleConditionModelChange,this);k.detachPropertyChange(this._handleFilterModelChange,this);k.destroy();},setFilterValues:function(i,s,k,v){var l={};if(v===undefined){v=k;}else{l.operators=[k];}if(typeof v==="object"&&v.operator){l.operators=[v.operator];v=v.values;}var n=new h(l),p={},q={};v=Array.isArray(v)?v:[v];p[s]=[];if(k){q[s]=v.filter(function(V){return V!==undefined&&V!==null;}).reduce(function(A,V){return A.concat(n.parseValue(V.toString(),"any"));},[]);}return S.applyExternalState(i,{filter:p}).then(S.applyExternalState.bind(S,i,{filter:q}));},conditionToModelPath:function(s){return s.replace(/\//g,"\\");},modelToConditionPath:function(s){return s.replace(/\\/g,"/");},_handleConditionModelChange:function(E,i){var s=this.modelToConditionPath(E.getParameter("path").substring(12)),k=new h({maxConditions:-1}),l=i.filterModel,v=E.getParameter("value"),V=k.formatValue(v,"any");l.setProperty("/"+this.conditionToModelPath(s),V);},_handleFilterModelChange:function(E,i){var p=E.getParameter("context").getPath().substring(1).replace(/\\/g,"/"),v=E.getParameter("value");this.setFilterValues(i.filterControl,p,v);}};return o;});

package/packages/sap.fe.macros/src/sap/fe/macros/filter/type/MultiValue-dbg.js

@@ -0,0 +1,53 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
+ */
+sap.ui.define(
+	["./Value"],
+	function(Value) {
+		"use strict";
+
+		/**
+		 * Handle format/parse of multi value filters.
+		 */
+		return Value.extend("sap.fe.macros.filter.type.MultiValue", {
+			formatConditionValues: function(vValues) {
+				return vValues;
+			},
+
+			formatValue: function(vValue, sInternalType) {
+				var vResult = vValue;
+
+				if (typeof vResult === "string") {
+					vResult = vResult.split("; ");
+				}
+
+				if (Array.isArray(vResult)) {
+					vResult = vResult
+						.map(
+							function(sValue) {
+								return Value.prototype.formatValue.call(this, sValue, this.getElementTypeName(sInternalType));
+							}.bind(this)
+						)
+						.filter(function(sValue) {
+							return sValue !== undefined;
+						});
+				}
+
+				return vResult || [];
+			},
+
+			parseValue: function(vValue, sSourceType) {
+				var oOperator = this.getOperator();
+				if (!vValue) {
+					vValue = [];
+				}
+				return vValue.map(function(oValue) {
+					return oOperator.format({ values: oValue || [] });
+				});
+			}
+		});
+	},
+	true
+);

package/packages/sap.fe.macros/src/sap/fe/macros/filter/type/MultiValue.js

@@ -0,0 +1,6 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
+ */
+sap.ui.define(["./Value"],function(V){"use strict";return V.extend("sap.fe.macros.filter.type.MultiValue",{formatConditionValues:function(v){return v;},formatValue:function(v,i){var r=v;if(typeof r==="string"){r=r.split("; ");}if(Array.isArray(r)){r=r.map(function(s){return V.prototype.formatValue.call(this,s,this.getElementTypeName(i));}.bind(this)).filter(function(s){return s!==undefined;});}return r||[];},parseValue:function(v,s){var o=this.getOperator();if(!v){v=[];}return v.map(function(a){return o.format({values:a||[]});});}});},true);