@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.macros/src/sap/fe/macros/FilterBarDelegate-dbg.js

@@ -17,19 +17,14 @@ sap.ui.define(
 		"sap/fe/core/CommonUtils",
 		"sap/fe/core/helpers/ModelHelper",
 		"sap/fe/core/helpers/StableIdHelper",
-		"sap/fe/macros/field/FieldHelper",
-		"sap/fe/macros/filter/FilterFieldHelper",
 		"sap/fe/macros/filter/FilterUtils",
 		"sap/ui/mdc/odata/v4/TypeUtil",
 		"sap/fe/macros/ResourceModel",
 		"sap/base/util/merge",
 		"sap/fe/macros/DelegateUtil",
 		"sap/base/Log",
-		"sap/base/util/JSTokenizer",
-		"sap/fe/core/templating/PropertyFormatters",
-		"sap/ui/fl/Utils",
-		"sap/fe/core/converters/MetaModelConverter",
-		"sap/fe/core/converters/ConverterContext"
+		"sap/fe/core/converters/controls/ListReport/FilterBar",
+		"sap/fe/core/templating/PropertyFormatters"
 	],
 	function(
 		FilterBarDelegate,
@@ -39,19 +34,14 @@ sap.ui.define(
 		CommonUtils,
 		ModelHelper,
 		StableIdHelper,
-		FieldHelper,
-		FilterFieldHelper,
 		FilterUtils,
 		TypeUtil,
 		ResourceModel,
 		mergeObjects,
 		DelegateUtil,
 		Log,
-		JSTokenizer,
-		PropertyFormatters,
-		FlUtils,
-		MetaModelConverter,
-		ConverterContext
+		FilterBarConverter,
+		PropertyFormatters
 	) {
 		"use strict";
 		var ODataFilterBarDelegate = Object.assign({}, FilterBarDelegate),
@@ -61,30 +51,6 @@ sap.ui.define(
 			FETCHED_PROPERTIES_DATA_KEY = "sap_fe_FilterBarDelegate_propertyInfoMap",
 			CONDITION_PATH_TO_PROPERTY_PATH_REGEX = /\+|\*/g;
 
-		var FilterRestrictions = CommonUtils.FilterRestrictions;
-
-		function _getSearchFilterPropertyInfo() {
-			return {
-				name: SEARCH_PROPERTY_NAME,
-				path: SEARCH_PROPERTY_NAME,
-				typeConfig: TypeUtil.getTypeConfig("sap.ui.model.odata.type.String"),
-				maxConditions: 1
-			};
-		}
-
-		function _getEditStateFilterPropertyInfo() {
-			return {
-				name: EDIT_STATE_PROPERTY_NAME,
-				path: EDIT_STATE_PROPERTY_NAME,
-				groupLabel: "",
-				group: "",
-				label: ResourceModel.getText("M_COMMON_FILTERBAR_EDITING_STATUS"),
-				tooltip: null,
-				hiddenFilter: false,
-				typeConfig: TypeUtil.getTypeConfig("sap.ui.model.odata.type.String")
-			};
-		}
-
 		function _templateEditState(sIdPrefix, oModifier) {
 			var oThis = new JSONModel({
 					id: sIdPrefix
@@ -146,83 +112,6 @@ sap.ui.define(
 			});
 		}
 
-		ODataFilterBarDelegate._fetchBasicPropertyInfo = function(oFilterFieldInfo) {
-			return {
-				name: oFilterFieldInfo.conditionPath,
-				path: oFilterFieldInfo.conditionPath,
-				groupLabel: oFilterFieldInfo.groupLabel,
-				group: oFilterFieldInfo.group,
-				label: oFilterFieldInfo.label,
-				tooltip: null,
-				hiddenFilter: oFilterFieldInfo.availability === "Hidden",
-				removeFromAppState: false,
-				hasValueHelp: false,
-				display: "Value",
-				typeConfig: TypeUtil.getTypeConfig("String"),
-				isParameter: oFilterFieldInfo.isParameter,
-				caseSensitive: oFilterFieldInfo.caseSensitive
-			};
-		};
-
-		function _fetchPropertyInfo(oMetaModel, oFilterFieldInfo) {
-			var oPropertyInfo = ODataFilterBarDelegate._fetchBasicPropertyInfo(oFilterFieldInfo),
-				sAnnotationPath = oFilterFieldInfo.annotationPath;
-
-			// no annotationPath => transient filter field
-			if (!sAnnotationPath) {
-				return oPropertyInfo;
-			}
-
-			var sParentPath = sAnnotationPath.substr(0, sAnnotationPath.lastIndexOf("/")),
-				oProperty = oMetaModel.getObject(sAnnotationPath),
-				oPropertyAnnotations = oMetaModel.getObject(sAnnotationPath + "@"),
-				oCollectionAnnotations = oMetaModel.getObject(sParentPath + "/@"),
-				oFilterDefaultValue,
-				oFilterDefaultValueAnnotation,
-				oPropertyContext = oMetaModel.createBindingContext(sAnnotationPath),
-				oFormatOptions = JSTokenizer.parseJS(FilterFieldHelper.formatOptions(oProperty, { context: oPropertyContext }) || "{}"),
-				oConstraints = JSTokenizer.parseJS(FilterFieldHelper.constraints(oProperty, { context: oPropertyContext }) || "{}"),
-				bRemoveFromAppState =
-					oPropertyAnnotations["@com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive"] ||
-					oPropertyAnnotations["@com.sap.vocabularies.UI.v1.ExcludeFromNavigationContext"] ||
-					oPropertyAnnotations["@com.sap.vocabularies.Analytics.v1.Measure"];
-
-			// check if type can be used for filtering, unsupported types are eg. Edm.Stream, field control, messages -> they have no sap.ui.model.type correspondence
-			// So using prefix path instead of sEntitySetPath
-			var sTargetPropertyPrefix = CommonHelper.getLocationForPropertyPath(oMetaModel, oFilterFieldInfo.annotationPath);
-			var sProperty = oFilterFieldInfo.annotationPath.replace(sTargetPropertyPrefix + "/", "");
-
-			if (!CommonUtils.isPropertyFilterable(oMetaModel, sTargetPropertyPrefix, _getPropertyPath(sProperty), true)) {
-				return null;
-			}
-
-			oFilterDefaultValueAnnotation = oPropertyAnnotations["@com.sap.vocabularies.Common.v1.FilterDefaultValue"];
-			if (oFilterDefaultValueAnnotation) {
-				oFilterDefaultValue = oFilterDefaultValueAnnotation["$" + DelegateUtil.getModelType(oProperty.$Type)];
-			}
-
-			oPropertyInfo = Object.assign(oPropertyInfo, {
-				tooltip: oPropertyAnnotations["@com.sap.vocabularies.Common.v1.QuickInfo"] || undefined,
-				removeFromAppState: bRemoveFromAppState,
-				hasValueHelp: PropertyFormatters.hasValueHelp(oPropertyContext.getObject(), { context: oPropertyContext }),
-				formatOptions: oFormatOptions,
-				constraints: oConstraints,
-				typeConfig: TypeUtil.getTypeConfig(oProperty.$Type, oFormatOptions, oConstraints),
-				display: FieldHelper.displayMode(oPropertyAnnotations, oCollectionAnnotations),
-				defaultFilterConditions: oFilterDefaultValue
-					? [
-							{
-								fieldPath: oFilterFieldInfo.conditionPath,
-								operator: "EQ",
-								values: [oFilterDefaultValue]
-							}
-					  ]
-					: undefined
-			});
-
-			return oPropertyInfo;
-		}
-
 		function _generateIdPrefix(sFilterBarId, sControlType, sNavigationPrefix) {
 			return sNavigationPrefix
 				? StableIdHelper.generate([sFilterBarId, sControlType, sNavigationPrefix])
@@ -397,91 +286,122 @@ sap.ui.define(
 			if (!oFilterControl || !oEntityType) {
 				return [];
 			}
-			var sEntitySetPath = ModelHelper.getEntitySetPath(sEntityTypePath),
-				mFilterFields = FilterUtils.getConvertedFilterFields(oFilterControl, sEntityTypePath),
-				oPropertyInfo,
-				aFetchedProperties = [],
-				aParameterFields = [],
-				oFR = CommonUtils.getFilterRestrictionsByPath(sEntitySetPath, oMetaModel),
-				aRequiredProps = oFR[FilterRestrictions.REQUIRED_PROPERTIES],
-				aNonFilterableProps = oFR[FilterRestrictions.NON_FILTERABLE_PROPERTIES],
-				mAllowedExpressions = oFR[FilterRestrictions.ALLOWED_EXPRESSIONS];
-
-			//var propNames = [];
-			Object.keys(mFilterFields).forEach(function(sFilterFieldKey) {
-				var oConvertedProperty = mFilterFields[sFilterFieldKey];
-				var sPropertyPath;
-				if (oConvertedProperty.conditionPath) {
-					sPropertyPath = _getPropertyPath(oConvertedProperty.conditionPath);
+			var oConverterContext = FilterUtils.createConverterContext(oFilterControl, sEntityTypePath, oMetaModel);
+			var sEntitySetPath = ModelHelper.getEntitySetPath(sEntityTypePath);
+
+			var mFilterFields = FilterUtils.getConvertedFilterFields(oFilterControl, sEntityTypePath);
+			var aFetchedProperties = [];
+			mFilterFields.forEach(function(oFilterFieldInfo) {
+				if (oFilterFieldInfo.annotationPath) {
+					var sTargetPropertyPrefix = CommonHelper.getLocationForPropertyPath(oMetaModel, oFilterFieldInfo.annotationPath);
+					var sProperty = oFilterFieldInfo.annotationPath.replace(sTargetPropertyPrefix + "/", "");
+
+					if (CommonUtils.isPropertyFilterable(oMetaModel, sTargetPropertyPrefix, _getPropertyPath(sProperty), true)) {
+						aFetchedProperties.push(oFilterFieldInfo);
+					}
+				} else {
+					//Custom Filters
+					aFetchedProperties.push(oFilterFieldInfo);
 				}
-				// TODO double check that this is obsolete, due to additional check in _fetchPropertyInfo (by calling CommonHelper.isPropertyFilterable)
-				if (aNonFilterableProps.indexOf(sPropertyPath) === -1) {
-					oPropertyInfo = _fetchPropertyInfo(oMetaModel, oConvertedProperty);
-					if (oPropertyInfo) {
-						if (mAllowedExpressions[sPropertyPath] && mAllowedExpressions[sPropertyPath].length > 0) {
-							oPropertyInfo.filterExpression = CommonUtils.getSpecificAllowedExpression(mAllowedExpressions[sPropertyPath]);
-						} else {
-							oPropertyInfo.filterExpression = "auto"; // default
-						}
-						oPropertyInfo.maxConditions = !oPropertyInfo.isParameter && DelegateUtil.isMultiValue(oPropertyInfo) ? -1 : 1;
-						oPropertyInfo.required = oPropertyInfo.isParameter || aRequiredProps.indexOf(sPropertyPath) >= 0;
-						oPropertyInfo.visible = oConvertedProperty.availability === "Default";
-						oPropertyInfo.label = DelegateUtil.getLocalizedText(oConvertedProperty.label, oFilterControl) || "";
-						aFetchedProperties.push(oPropertyInfo);
-						if (oPropertyInfo.isParameter) {
-							aParameterFields.push(sPropertyPath);
+			});
+
+			var aParameterFields = [];
+			var processedFields = FilterBarConverter.processSelectionFields(aFetchedProperties, oConverterContext);
+			var processedFieldsKeys = [];
+			processedFields.forEach(function(oProps) {
+				oProps.key && processedFieldsKeys.push(oProps.key);
+			});
+
+			aFetchedProperties = aFetchedProperties.filter(function(oProp) {
+				return processedFieldsKeys.includes(oProp.key);
+			});
+
+			var oFR = CommonUtils.getFilterRestrictionsByPath(sEntitySetPath, oMetaModel),
+				mAllowedExpressions = oFR.FilterAllowedExpressions;
+			Object.keys(processedFields).forEach(function(sFilterFieldKey) {
+				var oProp = processedFields[sFilterFieldKey];
+				var oSelField = aFetchedProperties[sFilterFieldKey];
+				if (!oSelField || !oSelField.conditionPath) {
+					return;
+				}
+				var sPropertyPath = _getPropertyPath(oSelField.conditionPath);
+				//fetchBasic
+				oProp = Object.assign(oProp, {
+					group: oSelField.group,
+					groupLabel: oSelField.groupLabel,
+					path: oSelField.conditionPath,
+					tooltip: null,
+					removeFromAppState: false,
+					hasValueHelp: false
+				});
+
+				//fetchPropInfo
+				if (oSelField.annotationPath) {
+					var sAnnotationPath = oSelField.annotationPath;
+					var oProperty = oMetaModel.getObject(sAnnotationPath),
+						oPropertyAnnotations = oMetaModel.getObject(sAnnotationPath + "@"),
+						oPropertyContext = oMetaModel.createBindingContext(sAnnotationPath);
+
+					var bRemoveFromAppState =
+						oPropertyAnnotations["@com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive"] ||
+						oPropertyAnnotations["@com.sap.vocabularies.UI.v1.ExcludeFromNavigationContext"] ||
+						oPropertyAnnotations["@com.sap.vocabularies.Analytics.v1.Measure"];
+
+					var sTargetPropertyPrefix = CommonHelper.getLocationForPropertyPath(oMetaModel, oSelField.annotationPath);
+					var sProperty = sAnnotationPath.replace(sTargetPropertyPrefix + "/", "");
+					var oFilterDefaultValueAnnotation;
+					var oFilterDefaultValue;
+					if (CommonUtils.isPropertyFilterable(oMetaModel, sTargetPropertyPrefix, _getPropertyPath(sProperty), true)) {
+						oFilterDefaultValueAnnotation = oPropertyAnnotations["@com.sap.vocabularies.Common.v1.FilterDefaultValue"];
+						if (oFilterDefaultValueAnnotation) {
+							oFilterDefaultValue = oFilterDefaultValueAnnotation["$" + DelegateUtil.getModelType(oProperty.$Type)];
 						}
+
+						oProp = Object.assign(oProp, {
+							tooltip: oPropertyAnnotations["@com.sap.vocabularies.Common.v1.QuickInfo"] || undefined,
+							removeFromAppState: bRemoveFromAppState,
+							hasValueHelp: PropertyFormatters.hasValueHelp(oPropertyContext.getObject(), { context: oPropertyContext }),
+							defaultFilterConditions: oFilterDefaultValue
+								? [
+										{
+											fieldPath: oSelField.conditionPath,
+											operator: "EQ",
+											values: [oFilterDefaultValue]
+										}
+								  ]
+								: undefined
+						});
 					}
 				}
-			});
 
-			if (oFilterControl.data("showDraftEditState") === "true") {
-				aFetchedProperties.push(_getEditStateFilterPropertyInfo());
-			}
+				//base
 
-			if (sEntitySetPath && oFilterControl.data("hideBasicSearch") !== "true") {
-				var searchRestrictions = CommonUtils.getSearchRestrictions(sEntitySetPath, oMetaModel);
-				if (!searchRestrictions || searchRestrictions.Searchable) {
-					aFetchedProperties.push(_getSearchFilterPropertyInfo());
+				if (oProp) {
+					if (mAllowedExpressions[sPropertyPath] && mAllowedExpressions[sPropertyPath].length > 0) {
+						oProp.filterExpression = CommonUtils.getSpecificAllowedExpression(mAllowedExpressions[sPropertyPath]);
+					} else {
+						oProp.filterExpression = "auto";
+					}
+
+					oProp = Object.assign(oProp, {
+						visible: oSelField.availability === "Default"
+					});
 				}
-			}
-			// aFetchedProperties.forEach(function(fetchProp) {
-			// 	propNames.push(fetchProp.name);
-			// });
-
-			// var sFilterEntityTypePath = DelegateUtil.getCustomData(oFilterControl, "entityType"),
-			// 	sFilterEntityPath = ModelHelper.getEntitySetPath(sFilterEntityTypePath),
-			// 	sEntitySetPath = sEntityTypePath && ModelHelper.getEntitySetPath(sEntityTypePath),
-			// 	sTargetEntityPath = sEntitySetPath || sFilterEntityPath,
-			// 	sTargetEntitySetName = sTargetEntityPath ? sTargetEntityPath.slice(1) : sTargetEntityPath;
-			// var oView = FlUtils.getViewForControl(oFilterControl);
-			// var oMetaModel = oFilterControl.getModel().getMetaModel();
-			// var oAppComponent = CommonUtils.getAppComponent(oView);
-			// var oVisualizationObjectPath = MetaModelConverter.getInvolvedDataModelObjects(
-			// 	oMetaModel.createBindingContext("/" + sTargetEntitySetName)
-			// );
-			// var manifestSettings;
-			// if (!oFilterControl.isA("sap.ui.mdc.filterbar.vh.FilterBar")) {
-			// 	manifestSettings = oView && oView.getViewData();
-			// }
-			// var oConverterContext = ConverterContext.createConverterContextForMacro(
-			// 	oVisualizationObjectPath.startingEntitySet.name,
-			// 	oMetaModel,
-			// 	oAppComponent && oAppComponent.getDiagnostics(),
-			// 	mergeObjects,
-			// 	oVisualizationObjectPath.contextLocation,
-			// 	manifestSettings
-			// );
-			// if (!oConverterContext.getManifestWrapper().oManifestSettings.controlConfiguration) {
-			// 	var propertyInfoFields = oFilterControl.getPropertyInfo();
-			// 	propertyInfoFields.forEach(function(oProp) {
-			// 		if (propNames.indexOf(oProp.name) === -1) {
-			// 			oProp.typeConfig = TypeUtil.getTypeConfig(oProp.dataType, oProp.formatOptions, oProp.constraints);
-			// 			aFetchedProperties.push(oProp);
-			// 		}
-			// 	});
-			// }
 
+				processedFields[sFilterFieldKey] = oProp;
+			});
+			processedFields.forEach(function(propInfo) {
+				if (propInfo.path === "$editState") {
+					propInfo.label = ResourceModel.getText("M_COMMON_FILTERBAR_EDITING_STATUS");
+				}
+				propInfo.typeConfig = TypeUtil.getTypeConfig(propInfo.dataType, propInfo.formatOptions, propInfo.constraints);
+				propInfo.label = DelegateUtil.getLocalizedText(propInfo.label, oFilterControl) || "";
+				if (propInfo.isParameter) {
+					aParameterFields.push(propInfo);
+				}
+			});
+
+			aFetchedProperties = processedFields;
 			DelegateUtil.setCustomData(oFilterControl, "parameters", aParameterFields);
 
 			return aFetchedProperties;

package/packages/sap.fe.macros/src/sap/fe/macros/FilterBarDelegate.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/FilterBarDelegate","sap/ui/model/json/JSONModel","sap/fe/core/TemplateModel","sap/fe/macros/CommonHelper","sap/fe/core/CommonUtils","sap/fe/core/helpers/ModelHelper","sap/fe/core/helpers/StableIdHelper","sap/fe/macros/field/FieldHelper","sap/fe/macros/filter/FilterFieldHelper","sap/fe/macros/filter/FilterUtils","sap/ui/mdc/odata/v4/TypeUtil","sap/fe/macros/ResourceModel","sap/base/util/merge","sap/fe/macros/DelegateUtil","sap/base/Log","sap/base/util/JSTokenizer","sap/fe/core/templating/PropertyFormatters","sap/ui/fl/Utils","sap/fe/core/converters/MetaModelConverter","sap/fe/core/converters/ConverterContext"],function(F,J,T,C,c,M,S,d,e,f,g,R,m,D,L,h,P,j,k,l){"use strict";var O=Object.assign({},F),E="$editState",n="$search",V="FilterFieldValueHelp",o="sap_fe_FilterBarDelegate_propertyInfoMap",p=/\+|\*/g;var q=c.FilterRestrictions;function _(){return{name:n,path:n,typeConfig:g.getTypeConfig("sap.ui.model.odata.type.String"),maxConditions:1};}function r(){return{name:E,path:E,groupLabel:"",group:"",label:R.getText("M_COMMON_FILTERBAR_EDITING_STATUS"),tooltip:null,hiddenFilter:false,typeConfig:g.getTypeConfig("sap.ui.model.odata.type.String")};}function s(i,a){var b=new J({id:i}),I={bindingContexts:{"this":b.createBindingContext("/")},models:{"this.i18n":R.getModel(),"this":b}};return D.templateControlFragment("sap.fe.macros.filter.DraftEditState",I,undefined,a).finally(function(){b.destroy();});}function t(a,i,b,I,K){var N=new J({id:i}),Q=new T(b,I),U={bindingContexts:{"this":N.createBindingContext("/"),"item":Q.createBindingContext("/")},models:{"this":N,"item":Q}};return D.templateControlFragment("sap.fe.macros.filter.CustomFilter",U,undefined,K).finally(function(){N.destroy();Q.destroy();});}function u(a){return a.replace(p,"");}function v(a,b){return a.find(function(i){return i.conditionPath===b&&i.availability!=="Hidden";});}O._fetchBasicPropertyInfo=function(a){return{name:a.conditionPath,path:a.conditionPath,groupLabel:a.groupLabel,group:a.group,label:a.label,tooltip:null,hiddenFilter:a.availability==="Hidden",removeFromAppState:false,hasValueHelp:false,display:"Value",typeConfig:g.getTypeConfig("String"),isParameter:a.isParameter,caseSensitive:a.caseSensitive};};function w(a,b){var i=O._fetchBasicPropertyInfo(b),I=b.annotationPath;if(!I){return i;}var K=I.substr(0,I.lastIndexOf("/")),N=a.getObject(I),Q=a.getObject(I+"@"),U=a.getObject(K+"/@"),W,X,Y=a.createBindingContext(I),Z=h.parseJS(e.formatOptions(N,{context:Y})||"{}"),$=h.parseJS(e.constraints(N,{context:Y})||"{}"),a1=Q["@com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive"]||Q["@com.sap.vocabularies.UI.v1.ExcludeFromNavigationContext"]||Q["@com.sap.vocabularies.Analytics.v1.Measure"];var b1=C.getLocationForPropertyPath(a,b.annotationPath);var c1=b.annotationPath.replace(b1+"/","");if(!c.isPropertyFilterable(a,b1,u(c1),true)){return null;}X=Q["@com.sap.vocabularies.Common.v1.FilterDefaultValue"];if(X){W=X["$"+D.getModelType(N.$Type)];}i=Object.assign(i,{tooltip:Q["@com.sap.vocabularies.Common.v1.QuickInfo"]||undefined,removeFromAppState:a1,hasValueHelp:P.hasValueHelp(Y.getObject(),{context:Y}),formatOptions:Z,constraints:$,typeConfig:g.getTypeConfig(N.$Type,Z,$),display:d.displayMode(Q,U),defaultFilterConditions:W?[{fieldPath:b.conditionPath,operator:"EQ",values:[W]}]:undefined});return i;}function x(a,b,N){return N?S.generate([a,b,N]):S.generate([a,b]);}function y(a,b){return Promise.resolve().then(function(){var i=new J({idPrefix:b.sVhIdPrefix,conditionModel:"$filters",navigationPrefix:b.sNavigationPrefix?"/"+b.sNavigationPrefix:"",filterFieldValueHelp:true,useSemanticDateRange:b.bUseSemanticDateRange}),I=m({},a,{bindingContexts:{"this":i.createBindingContext("/")},models:{"this":i}});return D.templateControlFragment("sap.fe.macros.internal.valuehelp.ValueHelp",I,{isXML:a.isXML}).then(function(K){if(K){var N="dependents";if(K.length){K.forEach(function(Q){if(b.oModifier){return b.oModifier.insertAggregation(b.oControl,N,Q,0);}else{b.oControl.insertAggregation(N,Q,0,false);}});}else if(b.oModifier){return b.oModifier.insertAggregation(b.oControl,N,K,0);}else{b.oControl.insertAggregation(N,K,0,false);}}}).finally(function(){i.destroy();});}).catch(function(i){L.error("Error while evaluating DelegateUtil.isValueHelpRequired",i);});}function z(a,b,I){return Promise.resolve().then(function(){var K=b.getAggregation(a,"dependents");return K.then(function(N){var i;if(N&&N.length>1){for(i=0;i<=N.length;i++){var Q=N[i];if(Q&&Q.isA("sap.ui.mdc.FilterField")){var U=Q.getFieldPath(),W=Q.getId();if(I===U&&W.indexOf("CustomFilterField")){return Promise.resolve(Q);}}}}}).catch(function(i){L.error(i);});}).catch(function(i){L.error("Filter Cannot be added",i);});}function A(a,b){var i=new J({idPrefix:b.sIdPrefix,vhIdPrefix:b.sVhIdPrefix,propertyPath:b.sPropertyName,navigationPrefix:b.sNavigationPrefix?"/"+b.sNavigationPrefix:"",useSemanticDateRange:b.bUseSemanticDateRange,settings:b.oSettings,visualFilter:b.visualFilter});var I=b.oMetaModel;var K=new T(b.visualFilter,I);var N=m({},a,{bindingContexts:{"this":i.createBindingContext("/"),"visualFilter":K.createBindingContext("/")},models:{"this":i,"visualFilter":K,"metaModel":I}});return D.templateControlFragment("sap.fe.macros.internal.FilterField",N,{isXML:a.isXML}).finally(function(){i.destroy();});}O.addItem=function(a,b,i){if(!i){return O._addP13nItem(a,b);}var I=i.appComponent&&i.appComponent.getModel().getMetaModel();if(!I){return Promise.resolve(null);}return O._addFlexItem(a,b,I,i.modifier);};O.removeItem=function(a,b,i){var I=true;if(typeof a!=="string"&&a.isA("sap.ui.mdc.FilterField")){if(a.data("isSlot")==="true"&&i){var K=i.modifier;K.insertAggregation(b,"dependents",a);I=false;}}return Promise.resolve(I);};O._addP13nItem=function(a,b){return D.fetchModel(b).then(function(i){return O._addFlexItem(a,b,i.getMetaModel(),undefined);}).catch(function(i){L.error("Model could not be resolved",i);return null;});};O.fetchPropertiesForEntity=function(a,b,i){var I=b.getObject(a);if(!i||!I){return[];}var K=M.getEntitySetPath(a),N=f.getConvertedFilterFields(i,a),Q,U=[],W=[],X=c.getFilterRestrictionsByPath(K,b),Y=X[q.REQUIRED_PROPERTIES],Z=X[q.NON_FILTERABLE_PROPERTIES],$=X[q.ALLOWED_EXPRESSIONS];Object.keys(N).forEach(function(b1){var c1=N[b1];var d1;if(c1.conditionPath){d1=u(c1.conditionPath);}if(Z.indexOf(d1)===-1){Q=w(b,c1);if(Q){if($[d1]&&$[d1].length>0){Q.filterExpression=c.getSpecificAllowedExpression($[d1]);}else{Q.filterExpression="auto";}Q.maxConditions=!Q.isParameter&&D.isMultiValue(Q)?-1:1;Q.required=Q.isParameter||Y.indexOf(d1)>=0;Q.visible=c1.availability==="Default";Q.label=D.getLocalizedText(c1.label,i)||"";U.push(Q);if(Q.isParameter){W.push(d1);}}}});if(i.data("showDraftEditState")==="true"){U.push(r());}if(K&&i.data("hideBasicSearch")!=="true"){var a1=c.getSearchRestrictions(K,b);if(!a1||a1.Searchable){U.push(_());}}D.setCustomData(i,"parameters",W);return U;};O._addFlexItem=function(a,b,i,I){var K=I?I.getId(b):b.getId(),N=I?"":"Adaptation",Q=f.getConvertedFilterFields(b),U=v(Q,a),W=u(a),X=!!I&&I.targets==="xmlTree";if(a===E){return s(K,I);}else if(a===n){return Promise.resolve(null);}else if(U&&U.template){return t(b,x(K,N+"FilterField"),U,i,I);}if(U.type==="Slot"&&I){return z(b,I,W);}var Y=C.getNavigationPath(W),Z=U.annotationPath,$,a1,b1,c1,d1;return Promise.resolve().then(function(){if(U.isParameter){return Z.substr(0,Z.lastIndexOf("/")+1);}return D.getCustomData(b,"entityType",I);}).then(function(e1){$=e1;return D.getCustomData(b,"useSemanticDateRange",I);}).then(function(e1){a1=e1;var f1=i.createBindingContext($+W);var K=I?I.getId(b):b.getId();b1={bindingContexts:{"contextPath":i.createBindingContext($),"property":f1},models:{"contextPath":i,"property":i},isXML:X};c1="/"+M.getEntitySetPath($).split("/").filter(M.filterOutNavPropBinding).join("/");d1={sPropertyName:W,sBindingPath:c1,sValueHelpType:N+V,oControl:b,oMetaModel:i,oModifier:I,sIdPrefix:x(K,N+"FilterField",Y),sVhIdPrefix:x(K,N+V),sNavigationPrefix:Y,bUseSemanticDateRange:a1,oSettings:U?U.settings:{},visualFilter:U?U.visualFilter:undefined};return D.doesValueHelpExist(d1);}).then(function(e1){if(!e1){return y(b1,d1);}return Promise.resolve();}).then(function(){return A(b1,d1);});};function B(a){if(a instanceof window.Element){return null;}return D.getCustomData(a,o);}function G(a,b){if(a instanceof window.Element){return;}D.setCustomData(a,o,b);}function H(i,I,K){var N=B(K);var Q;if(!N){N=O.fetchPropertiesForEntity(i,I,K);N.forEach(function(a){Q=null;if(a.groupLabel){Q=D.getLocalizedText(a.groupLabel,K);a.groupLabel=Q===null?a.groupLabel:Q;}});N.sort(function(a,b){if(a.groupLabel===undefined||a.groupLabel===null){return-1;}if(b.groupLabel===undefined||b.groupLabel===null){return 1;}return a.groupLabel.localeCompare(b.groupLabel);});G(K,N);}return N;}O.fetchProperties=function(a){var b=D.getCustomData(a,"entityType");return D.fetchModel(a).then(function(i){if(!i){return[];}return H(b,i.getMetaModel(),a);});};O.getTypeUtil=function(a){return g;};return O;},false);
+sap.ui.define(["sap/ui/mdc/FilterBarDelegate","sap/ui/model/json/JSONModel","sap/fe/core/TemplateModel","sap/fe/macros/CommonHelper","sap/fe/core/CommonUtils","sap/fe/core/helpers/ModelHelper","sap/fe/core/helpers/StableIdHelper","sap/fe/macros/filter/FilterUtils","sap/ui/mdc/odata/v4/TypeUtil","sap/fe/macros/ResourceModel","sap/base/util/merge","sap/fe/macros/DelegateUtil","sap/base/Log","sap/fe/core/converters/controls/ListReport/FilterBar","sap/fe/core/templating/PropertyFormatters"],function(F,J,T,C,c,M,S,d,e,R,m,D,L,f,P){"use strict";var O=Object.assign({},F),E="$editState",g="$search",V="FilterFieldValueHelp",h="sap_fe_FilterBarDelegate_propertyInfoMap",j=/\+|\*/g;function _(i,a){var b=new J({id:i}),v={bindingContexts:{"this":b.createBindingContext("/")},models:{"this.i18n":R.getModel(),"this":b}};return D.templateControlFragment("sap.fe.macros.filter.DraftEditState",v,undefined,a).finally(function(){b.destroy();});}function k(a,i,b,v,w){var x=new J({id:i}),I=new T(b,v),y={bindingContexts:{"this":x.createBindingContext("/"),"item":I.createBindingContext("/")},models:{"this":x,"item":I}};return D.templateControlFragment("sap.fe.macros.filter.CustomFilter",y,undefined,w).finally(function(){x.destroy();I.destroy();});}function l(a){return a.replace(j,"");}function n(a,b){return a.find(function(i){return i.conditionPath===b&&i.availability!=="Hidden";});}function o(a,b,N){return N?S.generate([a,b,N]):S.generate([a,b]);}function p(a,b){return Promise.resolve().then(function(){var i=new J({idPrefix:b.sVhIdPrefix,conditionModel:"$filters",navigationPrefix:b.sNavigationPrefix?"/"+b.sNavigationPrefix:"",filterFieldValueHelp:true,useSemanticDateRange:b.bUseSemanticDateRange}),v=m({},a,{bindingContexts:{"this":i.createBindingContext("/")},models:{"this":i}});return D.templateControlFragment("sap.fe.macros.internal.valuehelp.ValueHelp",v,{isXML:a.isXML}).then(function(w){if(w){var A="dependents";if(w.length){w.forEach(function(x){if(b.oModifier){return b.oModifier.insertAggregation(b.oControl,A,x,0);}else{b.oControl.insertAggregation(A,x,0,false);}});}else if(b.oModifier){return b.oModifier.insertAggregation(b.oControl,A,w,0);}else{b.oControl.insertAggregation(A,w,0,false);}}}).finally(function(){i.destroy();});}).catch(function(i){L.error("Error while evaluating DelegateUtil.isValueHelpRequired",i);});}function q(a,b,v){return Promise.resolve().then(function(){var w=b.getAggregation(a,"dependents");return w.then(function(x){var i;if(x&&x.length>1){for(i=0;i<=x.length;i++){var y=x[i];if(y&&y.isA("sap.ui.mdc.FilterField")){var z=y.getFieldPath(),A=y.getId();if(v===z&&A.indexOf("CustomFilterField")){return Promise.resolve(y);}}}}}).catch(function(i){L.error(i);});}).catch(function(i){L.error("Filter Cannot be added",i);});}function r(a,b){var i=new J({idPrefix:b.sIdPrefix,vhIdPrefix:b.sVhIdPrefix,propertyPath:b.sPropertyName,navigationPrefix:b.sNavigationPrefix?"/"+b.sNavigationPrefix:"",useSemanticDateRange:b.bUseSemanticDateRange,settings:b.oSettings,visualFilter:b.visualFilter});var v=b.oMetaModel;var w=new T(b.visualFilter,v);var x=m({},a,{bindingContexts:{"this":i.createBindingContext("/"),"visualFilter":w.createBindingContext("/")},models:{"this":i,"visualFilter":w,"metaModel":v}});return D.templateControlFragment("sap.fe.macros.internal.FilterField",x,{isXML:a.isXML}).finally(function(){i.destroy();});}O.addItem=function(a,b,i){if(!i){return O._addP13nItem(a,b);}var v=i.appComponent&&i.appComponent.getModel().getMetaModel();if(!v){return Promise.resolve(null);}return O._addFlexItem(a,b,v,i.modifier);};O.removeItem=function(a,b,i){var v=true;if(typeof a!=="string"&&a.isA("sap.ui.mdc.FilterField")){if(a.data("isSlot")==="true"&&i){var w=i.modifier;w.insertAggregation(b,"dependents",a);v=false;}}return Promise.resolve(v);};O._addP13nItem=function(a,b){return D.fetchModel(b).then(function(i){return O._addFlexItem(a,b,i.getMetaModel(),undefined);}).catch(function(i){L.error("Model could not be resolved",i);return null;});};O.fetchPropertiesForEntity=function(a,b,i){var v=b.getObject(a);if(!i||!v){return[];}var w=d.createConverterContext(i,a,b);var x=M.getEntitySetPath(a);var y=d.getConvertedFilterFields(i,a);var z=[];y.forEach(function(K){if(K.annotationPath){var N=C.getLocationForPropertyPath(b,K.annotationPath);var Q=K.annotationPath.replace(N+"/","");if(c.isPropertyFilterable(b,N,l(Q),true)){z.push(K);}}else{z.push(K);}});var A=[];var B=f.processSelectionFields(z,w);var G=[];B.forEach(function(K){K.key&&G.push(K.key);});z=z.filter(function(K){return G.includes(K.key);});var H=c.getFilterRestrictionsByPath(x,b),I=H.FilterAllowedExpressions;Object.keys(B).forEach(function(K){var N=B[K];var Q=z[K];if(!Q||!Q.conditionPath){return;}var U=l(Q.conditionPath);N=Object.assign(N,{group:Q.group,groupLabel:Q.groupLabel,path:Q.conditionPath,tooltip:null,removeFromAppState:false,hasValueHelp:false});if(Q.annotationPath){var W=Q.annotationPath;var X=b.getObject(W),Y=b.getObject(W+"@"),Z=b.createBindingContext(W);var $=Y["@com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive"]||Y["@com.sap.vocabularies.UI.v1.ExcludeFromNavigationContext"]||Y["@com.sap.vocabularies.Analytics.v1.Measure"];var a1=C.getLocationForPropertyPath(b,Q.annotationPath);var b1=W.replace(a1+"/","");var c1;var d1;if(c.isPropertyFilterable(b,a1,l(b1),true)){c1=Y["@com.sap.vocabularies.Common.v1.FilterDefaultValue"];if(c1){d1=c1["$"+D.getModelType(X.$Type)];}N=Object.assign(N,{tooltip:Y["@com.sap.vocabularies.Common.v1.QuickInfo"]||undefined,removeFromAppState:$,hasValueHelp:P.hasValueHelp(Z.getObject(),{context:Z}),defaultFilterConditions:d1?[{fieldPath:Q.conditionPath,operator:"EQ",values:[d1]}]:undefined});}}if(N){if(I[U]&&I[U].length>0){N.filterExpression=c.getSpecificAllowedExpression(I[U]);}else{N.filterExpression="auto";}N=Object.assign(N,{visible:Q.availability==="Default"});}B[K]=N;});B.forEach(function(K){if(K.path==="$editState"){K.label=R.getText("M_COMMON_FILTERBAR_EDITING_STATUS");}K.typeConfig=e.getTypeConfig(K.dataType,K.formatOptions,K.constraints);K.label=D.getLocalizedText(K.label,i)||"";if(K.isParameter){A.push(K);}});z=B;D.setCustomData(i,"parameters",A);return z;};O._addFlexItem=function(a,b,i,v){var w=v?v.getId(b):b.getId(),I=v?"":"Adaptation",x=d.getConvertedFilterFields(b),y=n(x,a),z=l(a),A=!!v&&v.targets==="xmlTree";if(a===E){return _(w,v);}else if(a===g){return Promise.resolve(null);}else if(y&&y.template){return k(b,o(w,I+"FilterField"),y,i,v);}if(y.type==="Slot"&&v){return q(b,v,z);}var N=C.getNavigationPath(z),B=y.annotationPath,G,U,H,K,Q;return Promise.resolve().then(function(){if(y.isParameter){return B.substr(0,B.lastIndexOf("/")+1);}return D.getCustomData(b,"entityType",v);}).then(function(W){G=W;return D.getCustomData(b,"useSemanticDateRange",v);}).then(function(W){U=W;var X=i.createBindingContext(G+z);var w=v?v.getId(b):b.getId();H={bindingContexts:{"contextPath":i.createBindingContext(G),"property":X},models:{"contextPath":i,"property":i},isXML:A};K="/"+M.getEntitySetPath(G).split("/").filter(M.filterOutNavPropBinding).join("/");Q={sPropertyName:z,sBindingPath:K,sValueHelpType:I+V,oControl:b,oMetaModel:i,oModifier:v,sIdPrefix:o(w,I+"FilterField",N),sVhIdPrefix:o(w,I+V),sNavigationPrefix:N,bUseSemanticDateRange:U,oSettings:y?y.settings:{},visualFilter:y?y.visualFilter:undefined};return D.doesValueHelpExist(Q);}).then(function(W){if(!W){return p(H,Q);}return Promise.resolve();}).then(function(){return r(H,Q);});};function s(a){if(a instanceof window.Element){return null;}return D.getCustomData(a,h);}function t(a,b){if(a instanceof window.Element){return;}D.setCustomData(a,h,b);}function u(i,v,w){var x=s(w);var y;if(!x){x=O.fetchPropertiesForEntity(i,v,w);x.forEach(function(G){y=null;if(G.groupLabel){y=D.getLocalizedText(G.groupLabel,w);G.groupLabel=y===null?G.groupLabel:y;}});x.sort(function(a,b){if(a.groupLabel===undefined||a.groupLabel===null){return-1;}if(b.groupLabel===undefined||b.groupLabel===null){return 1;}return a.groupLabel.localeCompare(b.groupLabel);});t(w,x);}return x;}O.fetchProperties=function(a){var b=D.getCustomData(a,"entityType");return D.fetchModel(a).then(function(i){if(!i){return[];}return u(b,i.getMetaModel(),a);});};O.getTypeUtil=function(a){return e;};return O;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/Form.metadata-dbg.js

@@ -201,7 +201,7 @@ sap.ui.define(
 					oProps._contentId = oProps.id;
 				} else {
 					oProps._apiId = oProps.id;
-					oProps._contentId = oProps.id + "-content";
+					oProps._contentId = this.getContentId(oProps.id);
 				}
 				// if displayMode === true -> _editable = false
 				// if displayMode === false -> _editable = true

package/packages/sap.fe.macros/src/sap/fe/macros/Form.metadata.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./MacroMetadata","sap/fe/core/converters/ConverterContext","sap/fe/core/converters/controls/Common/Form","sap/fe/core/TemplateModel","sap/ui/model/odata/v4/AnnotationHelper","sap/fe/core/converters/MetaModelConverter","sap/fe/core/helpers/BindingExpression","sap/fe/core/converters/helpers/BindingHelper"],function(M,C,F,T,A,a,B,b){"use strict";var c=B.compileBinding;var i=B.ifElse;var e=B.equal;var r=B.resolveBindingString;return M.extend("sap.fe.macros.Form",{name:"Form",namespace:"sap.fe.macros.internal",publicNamespace:"sap.fe.macros",publicName:"Form",fragment:"sap.fe.macros.Form",metadata:{stereotype:"xmlmacro",designtime:"sap/fe/macros/Form.designtime",properties:{contextPath:{type:"sap.ui.model.Context",$kind:["EntitySet","NavigationProperty","EntityType"],required:true,isPublic:true},metaPath:{type:"sap.ui.model.Context",$Type:["com.sap.vocabularies.UI.v1.CollectionFacet","com.sap.vocabularies.UI.v1.ReferenceFacet"],isPublic:true},id:{type:"string",isPublic:true},title:{type:"string",isPublic:true},layoutMode:{type:"string",defaultValue:"ColumnLayout",allowedValues:["ColumnLayout","ResponsiveGridLayout"]},displayMode:{type:"boolean"},_editable:{type:"boolean",computed:true},isVisible:{type:"string",defaultValue:"true"},useFormContainerLabels:{type:"boolean"},partOfPreview:{type:"boolean",defaultValue:true},formContainers:{type:"sap.ui.model.Context"}},events:{onChange:{type:"function"}}},create:function(p,o,s,d,f){if(p.metaPath&&p.contextPath&&(p.formContainers===undefined||p.formContainers===null)){var m=p.contextPath.getModel();var g=a.getInvolvedDataModelObjects(p.metaPath,p.contextPath);var h=this.getConverterContext(g,p.contextPath,s);var j=g.targetObject;var k=F.createFormDefinition(j,p.isVisible,h);p.formContainers=new T(k.formContainers,m).createBindingContext("/");p.useFormContainerLabels=k.useFormContainerLabels.toString();}if(!f){p._apiId=p.id+"::Form";p._contentId=p.id;}else{p._apiId=p.id;p._contentId=p.id+"-content";}if(p.displayMode!==undefined){p._editable=c(i(e(r(p.displayMode,"boolean"),false),true,false));}else{p._editable=c(b.UI.IsEditable);}return p;}});});
+sap.ui.define(["./MacroMetadata","sap/fe/core/converters/ConverterContext","sap/fe/core/converters/controls/Common/Form","sap/fe/core/TemplateModel","sap/ui/model/odata/v4/AnnotationHelper","sap/fe/core/converters/MetaModelConverter","sap/fe/core/helpers/BindingExpression","sap/fe/core/converters/helpers/BindingHelper"],function(M,C,F,T,A,a,B,b){"use strict";var c=B.compileBinding;var i=B.ifElse;var e=B.equal;var r=B.resolveBindingString;return M.extend("sap.fe.macros.Form",{name:"Form",namespace:"sap.fe.macros.internal",publicNamespace:"sap.fe.macros",publicName:"Form",fragment:"sap.fe.macros.Form",metadata:{stereotype:"xmlmacro",designtime:"sap/fe/macros/Form.designtime",properties:{contextPath:{type:"sap.ui.model.Context",$kind:["EntitySet","NavigationProperty","EntityType"],required:true,isPublic:true},metaPath:{type:"sap.ui.model.Context",$Type:["com.sap.vocabularies.UI.v1.CollectionFacet","com.sap.vocabularies.UI.v1.ReferenceFacet"],isPublic:true},id:{type:"string",isPublic:true},title:{type:"string",isPublic:true},layoutMode:{type:"string",defaultValue:"ColumnLayout",allowedValues:["ColumnLayout","ResponsiveGridLayout"]},displayMode:{type:"boolean"},_editable:{type:"boolean",computed:true},isVisible:{type:"string",defaultValue:"true"},useFormContainerLabels:{type:"boolean"},partOfPreview:{type:"boolean",defaultValue:true},formContainers:{type:"sap.ui.model.Context"}},events:{onChange:{type:"function"}}},create:function(p,o,s,d,f){if(p.metaPath&&p.contextPath&&(p.formContainers===undefined||p.formContainers===null)){var m=p.contextPath.getModel();var g=a.getInvolvedDataModelObjects(p.metaPath,p.contextPath);var h=this.getConverterContext(g,p.contextPath,s);var j=g.targetObject;var k=F.createFormDefinition(j,p.isVisible,h);p.formContainers=new T(k.formContainers,m).createBindingContext("/");p.useFormContainerLabels=k.useFormContainerLabels.toString();}if(!f){p._apiId=p.id+"::Form";p._contentId=p.id;}else{p._apiId=p.id;p._contentId=this.getContentId(p.id);}if(p.displayMode!==undefined){p._editable=c(i(e(r(p.displayMode,"boolean"),false),true,false));}else{p._editable=c(b.UI.IsEditable);}return p;}});});

package/packages/sap.fe.macros/src/sap/fe/macros/FormAPI-dbg.js

@@ -12,24 +12,12 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI"], function (Clas
 
   function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
 
-  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
   function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
   function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-
-  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
   function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
 
   function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); }
@@ -53,20 +41,16 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI"], function (Clas
   }), _dec(_class = (_class2 = /*#__PURE__*/function (_MacroAPI) {
     _inherits(FormAPI, _MacroAPI);
 
-    var _super = _createSuper(FormAPI);
-
     function FormAPI() {
       var _this;
 
-      _classCallCheck(this, FormAPI);
-
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
 
-      _this = _super.call.apply(_super, [this].concat(args));
+      _this = _MacroAPI.call.apply(_MacroAPI, [this].concat(args)) || this;
 
-      _initializerDefineProperty(_assertThisInitialized(_this), "id", _descriptor, _assertThisInitialized(_this));
+      _initializerDefineProperty(_this, "id", _descriptor, _assertThisInitialized(_this));
 
       return _this;
     }
@@ -80,4 +64,4 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI"], function (Clas
   })), _class2)) || _class);
   return FormAPI;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZvcm1BUEkudHMiXSwibmFtZXMiOlsiRm9ybUFQSSIsIkFQSUNsYXNzIiwiUHJvcGVydHkiLCJ0eXBlIiwiTWFjcm9BUEkiXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7TUFFTUEsTyxXQURMQyxRQUFRLENBQUMsdUJBQUQsQyxVQU9QQyxRQUFRLENBQUM7QUFBRUMsSUFBQUEsSUFBSSxFQUFFO0FBQVIsR0FBRCxDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0lBTllDLFE7Ozs7OztTQVVQSixPIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBUElDbGFzcywgUHJvcGVydHkgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCBNYWNyb0FQSSBmcm9tIFwiLi9NYWNyb0FQSVwiO1xuXG4vKipcbiAqIEJ1aWxkaW5nIGJsb2NrIGZvciBjcmVhdGluZyBhIEZvcm0gYmFzZWQgb24gdGhlIG1ldGFkYXRhIHByb3ZpZGVkIGJ5IE9EYXRhIFY0LlxuICogPGJyPlxuICogVXN1YWxseSwgYSBSZWZlcmVuY2VGYWNldCBvciBDb2xsZWN0aW9uRmFjZXQgaXMgZXhwZWN0ZWRcbiAqXG4gKlxuICogVXNhZ2UgZXhhbXBsZTpcbiAqIDxwcmU+XG4gKiAmbHQ7bWFjcm86Rm9ybSBpZD1cIk15Rm9ybVwiIG1ldGFQYXRoPVwiQGNvbS5zYXAudm9jYWJ1bGFyaWVzLlVJLnYxLkZhY2V0cy8wXCIgLyZndDtcbiAqIDwvcHJlPlxuICpcbiAqIEBhbGlhcyBzYXAuZmUubWFjcm9zLkZvcm1cbiAqIEBwdWJsaWNcbiAqL1xuQEFQSUNsYXNzKFwic2FwLmZlLm1hY3Jvcy5Gb3JtQVBJXCIpXG5jbGFzcyBGb3JtQVBJIGV4dGVuZHMgTWFjcm9BUEkge1xuXHQvKipcblx0ICogVGhlIGlkZW50aWZpZXIgb2YgdGhlIGZvcm0gY29udHJvbC5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QFByb3BlcnR5KHsgdHlwZTogXCJzdHJpbmdcIiB9KVxuXHRpZCE6IHN0cmluZztcbn1cblxuZXhwb3J0IGRlZmF1bHQgRm9ybUFQSTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZvcm1BUEkudHMiXSwibmFtZXMiOlsiRm9ybUFQSSIsIkFQSUNsYXNzIiwiUHJvcGVydHkiLCJ0eXBlIiwiTWFjcm9BUEkiXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7TUFFTUEsTyxXQURMQyxRQUFRLENBQUMsdUJBQUQsQyxVQU9QQyxRQUFRLENBQUM7QUFBRUMsSUFBQUEsSUFBSSxFQUFFO0FBQVIsR0FBRCxDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFOWUMsUTs7Ozs7O1NBVVBKLE8iLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFQSUNsYXNzLCBQcm9wZXJ0eSB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0NsYXNzU3VwcG9ydFwiO1xuaW1wb3J0IE1hY3JvQVBJIGZyb20gXCIuL01hY3JvQVBJXCI7XG5cbi8qKlxuICogQnVpbGRpbmcgYmxvY2sgZm9yIGNyZWF0aW5nIGEgRm9ybSBiYXNlZCBvbiB0aGUgbWV0YWRhdGEgcHJvdmlkZWQgYnkgT0RhdGEgVjQuXG4gKiA8YnI+XG4gKiBVc3VhbGx5LCBhIFJlZmVyZW5jZUZhY2V0IG9yIENvbGxlY3Rpb25GYWNldCBpcyBleHBlY3RlZFxuICpcbiAqXG4gKiBVc2FnZSBleGFtcGxlOlxuICogPHByZT5cbiAqICZsdDttYWNybzpGb3JtIGlkPVwiTXlGb3JtXCIgbWV0YVBhdGg9XCJAY29tLnNhcC52b2NhYnVsYXJpZXMuVUkudjEuRmFjZXRzLzBcIiAvJmd0O1xuICogPC9wcmU+XG4gKlxuICogQGFsaWFzIHNhcC5mZS5tYWNyb3MuRm9ybVxuICogQHB1YmxpY1xuICovXG5AQVBJQ2xhc3MoXCJzYXAuZmUubWFjcm9zLkZvcm1BUElcIilcbmNsYXNzIEZvcm1BUEkgZXh0ZW5kcyBNYWNyb0FQSSB7XG5cdC8qKlxuXHQgKiBUaGUgaWRlbnRpZmllciBvZiB0aGUgZm9ybSBjb250cm9sLlxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRAUHJvcGVydHkoeyB0eXBlOiBcInN0cmluZ1wiIH0pXG5cdGlkITogc3RyaW5nO1xufVxuXG5leHBvcnQgZGVmYXVsdCBGb3JtQVBJO1xuIl19

package/packages/sap.fe.macros/src/sap/fe/macros/FormAPI.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/helpers/ClassSupport","./MacroAPI"],function(C,M){"use strict";var _,a,b,c,d;var P=C.Property;var A=C.APIClass;function f(t,p,e,o){if(!e)return;Object.defineProperty(t,p,{enumerable:e.enumerable,configurable:e.configurable,writable:e.writable,value:e.initializer?e.initializer.call(o):void 0});}function g(e,o){if(!(e instanceof o)){throw new TypeError("Cannot call a class as a function");}}function h(e,o){if(typeof o!=="function"&&o!==null){throw new TypeError("Super expression must either be null or a function");}e.prototype=Object.create(o&&o.prototype,{constructor:{value:e,writable:true,configurable:true}});if(o)i(e,o);}function i(o,p){i=Object.setPrototypeOf||function i(o,p){o.__proto__=p;return o;};return i(o,p);}function j(D){var e=m();return function p(){var S=n(D),o;if(e){var N=n(this).constructor;o=Reflect.construct(S,arguments,N);}else{o=S.apply(this,arguments);}return k(this,o);};}function k(e,o){if(o&&(typeof o==="object"||typeof o==="function")){return o;}else if(o!==void 0){throw new TypeError("Derived constructors may only return object or undefined");}return l(e);}function l(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return e;}function m(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true;}catch(e){return false;}}function n(o){n=Object.setPrototypeOf?Object.getPrototypeOf:function n(o){return o.__proto__||Object.getPrototypeOf(o);};return n(o);}function q(o,e,v){if(e in o){Object.defineProperty(o,e,{value:v,enumerable:true,configurable:true,writable:true});}else{o[e]=v;}return o;}function r(t,p,e,o,u){var v={};Object.keys(o).forEach(function(w){v[w]=o[w];});v.enumerable=!!v.enumerable;v.configurable=!!v.configurable;if('value'in v||v.initializer){v.writable=true;}v=e.slice().reverse().reduce(function(v,w){return w(t,p,v)||v;},v);if(u&&v.initializer!==void 0){v.value=v.initializer?v.initializer.call(u):void 0;v.initializer=undefined;}if(v.initializer===void 0){Object.defineProperty(t,p,v);v=null;}return v;}function s(e,o){throw new Error('Decorating class property failed. Please ensure that '+'proposal-class-properties is enabled and runs after the decorators transform.');}var F=(_=A("sap.fe.macros.FormAPI"),a=P({type:"string"}),_(b=(c=function(e){h(F,e);var o=j(F);function F(){var p;g(this,F);for(var t=arguments.length,u=new Array(t),v=0;v<t;v++){u[v]=arguments[v];}p=o.call.apply(o,[this].concat(u));f(l(p),"id",d,l(p));return p;}return F;}(M),(d=r(c.prototype,"id",[a],{configurable:true,enumerable:true,writable:true,initializer:null})),c))||b);return F;},false);
+sap.ui.define(["sap/fe/core/helpers/ClassSupport","./MacroAPI"],function(C,M){"use strict";var _,a,b,c,d;var P=C.Property;var A=C.APIClass;function e(t,p,k,l){if(!k)return;Object.defineProperty(t,p,{enumerable:k.enumerable,configurable:k.configurable,writable:k.writable,value:k.initializer?k.initializer.call(l):void 0});}function f(s){if(s===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return s;}function g(s,k){if(typeof k!=="function"&&k!==null){throw new TypeError("Super expression must either be null or a function");}s.prototype=Object.create(k&&k.prototype,{constructor:{value:s,writable:true,configurable:true}});if(k)h(s,k);}function h(o,p){h=Object.setPrototypeOf||function h(o,p){o.__proto__=p;return o;};return h(o,p);}function i(t,p,k,l,m){var n={};Object.keys(l).forEach(function(o){n[o]=l[o];});n.enumerable=!!n.enumerable;n.configurable=!!n.configurable;if('value'in n||n.initializer){n.writable=true;}n=k.slice().reverse().reduce(function(n,o){return o(t,p,n)||n;},n);if(m&&n.initializer!==void 0){n.value=n.initializer?n.initializer.call(m):void 0;n.initializer=undefined;}if(n.initializer===void 0){Object.defineProperty(t,p,n);n=null;}return n;}function j(k,l){throw new Error('Decorating class property failed. Please ensure that '+'proposal-class-properties is enabled and runs after the decorators transform.');}var F=(_=A("sap.fe.macros.FormAPI"),a=P({type:"string"}),_(b=(c=function(k){g(F,k);function F(){var l;for(var m=arguments.length,n=new Array(m),o=0;o<m;o++){n[o]=arguments[o];}l=k.call.apply(k,[this].concat(n))||this;e(l,"id",d,f(l));return l;}return F;}(M),(d=i(c.prototype,"id",[a],{configurable:true,enumerable:true,writable:true,initializer:null})),c))||b);return F;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/FormContainer.fragment.xml

@@ -119,7 +119,7 @@
 													visible="{= (${dataField>isPartOfPreview}) ? true : '{= ${internal>showDetails} === true}'}"
 												>
 													<f:fields>
-														<control:FieldWrapper editMode="{ui>/editMode}" emptyIndicatorTrigger="true" required="{this>requiredExpression}">
+														<control:FieldWrapper editMode="{ui>/editMode}" required="{this>requiredExpression}">
 															<control:contentDisplay>
 																<Text text="{=FormTemplating.getLabelForConnectedFields(${annotationDataField>Target@@DataField.getDataFieldObjectPath})}" />
 															</control:contentDisplay>