@sap/open.fe 1.98.0 → 1.99.0

package/packages/sap.fe.macros/src/sap/fe/macros/FieldAPI.ts

@@ -1,9 +1,9 @@
 import { APIClass, EventHandler, Event, Property, Association } from "sap/fe/core/helpers/ClassSupport";
 import MacroAPI from "./MacroAPI";
-import { InputBase, CheckBox } from "sap/m";
-import { Field as mdcField } from "sap/ui/mdc";
+import InputBase from "sap/m/InputBase";
+import CheckBox from "sap/m/CheckBox";
 import { FieldWrapper } from "sap/fe/core/controls";
-import { Control } from "sap/ui/core";
+import Control from "sap/ui/core/Control";
 
 /**
  * Additional format options for the field.
@@ -28,6 +28,32 @@ export type FieldFormatOptions = {
 	 *  @public
 	 */
 	measureDisplayMode: string;
+	/**
+	 * Maximum number of lines for multiline texts in edit mode.<br/>
+	 *
+	 *  @public
+	 */
+	textLinesEdit: number;
+	/**
+	 * Maximum number of lines that multiline texts in edit mode can grow to.<br/>
+	 *
+	 *  @public
+	 */
+	textMaxLines: number;
+	/**
+	 * Maximum number of characters from the beginning of the text field that are shown initially.<br/>
+	 *
+	 *  @public
+	 */
+	textMaxCharactersDisplay: number;
+	/**
+	 * Defines how the full text will be displayed.<br/>
+	 *
+	 * Allowed values are "InPlace" and "Popover"
+	 *
+	 *  @public
+	 */
+	textExpandBehaviorDisplay: string;
 };
 /**
  * Building block for creating a field based on the metadata provided by OData V4.
@@ -160,12 +186,12 @@ class FieldAPI extends MacroAPI {
 			}
 		}
 
-		if (oControl.isA<CheckBox>("sap.m.CheckBox")) {
-			return oControl.getSelected();
-		} else if (oControl.isA<InputBase>("sap.m.InputBase")) {
-			return oControl.getValue();
-		} else if (oControl.isA<mdcField>("sap.ui.mdc.Field")) {
-			return oControl.getValue();
+		if (oControl.isA("sap.m.CheckBox")) {
+			return (oControl as CheckBox).getSelected();
+		} else if (oControl.isA("sap.m.InputBase")) {
+			return (oControl as InputBase).getValue();
+		} else if (oControl.isA("sap.ui.mdc.Field")) {
+			return (oControl as any).getValue();
 		} else {
 			throw "getting value not yet implemented for this field type";
 		}

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

@@ -41,11 +41,11 @@
 			showMessages="false"
 			toggleControl="{this>toggleControlId}"
 			initialLayout="{this>initialLayout}"
+			propertyInfo="{this>propertyInfo}"
 			macroData:localId="{this>id}"
 			macroData:hideBasicSearch="{this>hideBasicSearch}"
 			macroData:showDraftEditState="{this>showDraftEditState}"
 			macroData:useSemanticDateRange="{this>useSemanticDateRange}"
-			macroData:selectionFields="{= COMMON.stringifyCustomData(${this>selectionFields}) }"
 			macroData:entityType="{contextPath>@@MACRO.getPath}"
 		>
 			<control:dependents>

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

@@ -14,7 +14,8 @@ sap.ui.define(
 		"sap/fe/core/CommonUtils",
 		"sap/base/Log",
 		"sap/fe/core/converters/controls/Common/DataVisualization",
-		"sap/fe/core/templating/FilterHelper"
+		"sap/fe/core/templating/FilterHelper",
+		"sap/fe/macros/ResourceModel"
 	],
 	function(
 		MacroMetadata,
@@ -25,7 +26,8 @@ sap.ui.define(
 		CommonUtils,
 		Log,
 		DataVisualization,
-		FilterHelper
+		FilterHelper,
+		ResourceModel
 	) {
 		"use strict";
 
@@ -151,7 +153,9 @@ sap.ui.define(
 						type: "sap.ui.mdc.FilterBarP13nMode[]",
 						defaultValue: "Item,Value"
 					},
-
+					propertyInfo: {
+						type: "string"
+					},
 					/**
 					 * Specifies the Sematic Date Range option for the filter bar.
 					 */
@@ -263,15 +267,42 @@ sap.ui.define(
 					};
 				});
 
+				var oVisualizationObjectPath = MetaModelConverter.getInvolvedDataModelObjects(oContext);
+				var sObjectPath = "@com.sap.vocabularies.UI.v1.SelectionFields";
+				var oExtraParams = {};
+				oExtraParams[sObjectPath] = {
+					filterFields: oExtraFilters
+				};
+				var oConverterContext = this.getConverterContext(oVisualizationObjectPath, undefined, mSettings, oExtraParams);
+
+				if (!oProps.propertyInfo) {
+					oProps.propertyInfo = FilterBarConverter.getPropertyInfoFields(
+						oConverterContext,
+						[],
+						[],
+						(sMetaPath && sMetaPath.replace(sContextPath, "")) || ""
+					);
+				}
+
+				var sFetchedProperties = oProps.propertyInfo;
+				if (sFetchedProperties) {
+					sFetchedProperties = sFetchedProperties.replace(/\\{/g, "{");
+					sFetchedProperties = sFetchedProperties.replace(/\\}/g, "}");
+
+					var aFetchedProperties = JSON.parse(sFetchedProperties);
+					aFetchedProperties.forEach(function(propInfo) {
+						if (propInfo.path === "$editState") {
+							propInfo.label = ResourceModel.getText("M_COMMON_FILTERBAR_EDITING_STATUS");
+						}
+					});
+					var sFetchProperties = JSON.stringify(aFetchedProperties);
+					sFetchProperties = sFetchProperties.replace(/\{/g, "\\{");
+					sFetchProperties = sFetchProperties.replace(/\}/g, "\\}");
+
+					oProps.propertyInfo = sFetchProperties;
+				}
 				//Filter Fields and values to the field are filled based on the selectionFields and this would be empty in case of macro outside the FE template
 				if (!oProps.selectionFields) {
-					var oVisualizationObjectPath = MetaModelConverter.getInvolvedDataModelObjects(oContext);
-					var sObjectPath = "@com.sap.vocabularies.UI.v1.SelectionFields";
-					var oExtraParams = {};
-					oExtraParams[sObjectPath] = {
-						filterFields: oExtraFilters
-					};
-					var oConverterContext = this.getConverterContext(oVisualizationObjectPath, undefined, mSettings, oExtraParams);
 					var oSelectionFields = FilterBarConverter.getSelectionFields(
 						oConverterContext,
 						[],

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./MacroMetadata","sap/fe/core/converters/controls/ListReport/FilterBar","sap/fe/core/converters/MetaModelConverter","sap/fe/core/TemplateModel","sap/fe/core/helpers/ModelHelper","sap/fe/core/CommonUtils","sap/base/Log","sap/fe/core/converters/controls/Common/DataVisualization","sap/fe/core/templating/FilterHelper"],function(M,F,a,T,b,C,L,D,c){"use strict";return M.extend("sap.fe.macros.FilterBar",{name:"FilterBar",namespace:"sap.fe.macros.internal",publicNamespace:"sap.fe.macros",publicName:"FilterBar",fragment:"sap.fe.macros.FilterBar",metadata:{stereotype:"xmlmacro",designtime:"sap/fe/macros/FilterBar.designtime",properties:{selectionFields:{type:"sap.ui.model.Context"},metaPath:{type:"sap.ui.model.Context",isPublic:true},contextPath:{type:"sap.ui.model.Context",isPublic:true},id:{type:"string",isPublic:true},_applyIdToContent:{type:"boolean",defaultValue:false},variantBackreference:{type:"string"},hideBasicSearch:{type:"boolean"},enableFallback:{type:"boolean",defaultValue:false},showAdaptFiltersButton:{type:"boolean",defaultValue:true},p13nMode:{type:"sap.ui.mdc.FilterBarP13nMode[]",defaultValue:"Item,Value"},useSemanticDateRange:{type:"boolean",defaultValue:true},liveMode:{type:"boolean",defaultValue:false},_valueList:{type:"sap.ui.model.Context",required:false},filterConditions:{type:"string",required:false},suspendSelection:{type:"boolean",defaultValue:false},showDraftEditState:{type:"boolean",defaultValue:false},toggleControlId:{type:"string"},initialLayout:{type:"string",defaultValue:"compact"}},events:{search:{type:"function",isPublic:true},filterChanged:{type:"function",isPublic:true},stateChanged:{type:"function"}},aggregations:{filterFields:{type:"sap.fe.macros.FilterField",isPublic:true}}},create:function(p,o,s,A){var d=p.contextPath;if(!d){L.error("Context Path not available for FilterBar Macro.");return;}var e=d.getPath();var m=p.metaPath;var f=m&&m.getPath();var E=b.getEntitySetPath(e);var g=d.getModel();var v=a.getInvolvedDataModelObjects(d);var h=this.parseAggregation(A.filterFields,function(t){var u=t.getAttribute("key");A[u]=t;return{key:u,label:t.getAttribute("label"),position:{placement:t.getAttribute("placement"),anchor:t.getAttribute("anchor")},type:"Slot"};});if(!p.selectionFields){var v=a.getInvolvedDataModelObjects(d);var O="@com.sap.vocabularies.UI.v1.SelectionFields";var i={};i[O]={filterFields:h};var j=this.getConverterContext(v,undefined,s,i);var S=F.getSelectionFields(j,[],(f&&f.replace(e,""))||"");p.selectionFields=new T(S,g).createBindingContext("/");var k=j.getEntityType(),l=D.getSelectionVariant(k,j),n=d.getModel().getContext(E),q=c.getFilterConditions(n,{selectionVariant:l});p.filterConditions=q;}if(g.getObject(E+"@com.sap.vocabularies.Common.v1.DraftRoot")||g.getObject(E+"@com.sap.vocabularies.Common.v1.DraftNode")){p.showDraftEditState=true;}if(p._applyIdToContent){p._apiId=p.id+"::FilterBar";p._contentId=p.id;}else{p._apiId=p.id;p._contentId=p.id+"-content";}if(p.hideBasicSearch!=="true"){var r=C.getSearchRestrictions(E,g);p.hideBasicSearch=Boolean(r&&!r.Searchable);}return p;}});});
+sap.ui.define(["./MacroMetadata","sap/fe/core/converters/controls/ListReport/FilterBar","sap/fe/core/converters/MetaModelConverter","sap/fe/core/TemplateModel","sap/fe/core/helpers/ModelHelper","sap/fe/core/CommonUtils","sap/base/Log","sap/fe/core/converters/controls/Common/DataVisualization","sap/fe/core/templating/FilterHelper","sap/fe/macros/ResourceModel"],function(M,F,a,T,b,C,L,D,c,R){"use strict";return M.extend("sap.fe.macros.FilterBar",{name:"FilterBar",namespace:"sap.fe.macros.internal",publicNamespace:"sap.fe.macros",publicName:"FilterBar",fragment:"sap.fe.macros.FilterBar",metadata:{stereotype:"xmlmacro",designtime:"sap/fe/macros/FilterBar.designtime",properties:{selectionFields:{type:"sap.ui.model.Context"},metaPath:{type:"sap.ui.model.Context",isPublic:true},contextPath:{type:"sap.ui.model.Context",isPublic:true},id:{type:"string",isPublic:true},_applyIdToContent:{type:"boolean",defaultValue:false},variantBackreference:{type:"string"},hideBasicSearch:{type:"boolean"},enableFallback:{type:"boolean",defaultValue:false},showAdaptFiltersButton:{type:"boolean",defaultValue:true},p13nMode:{type:"sap.ui.mdc.FilterBarP13nMode[]",defaultValue:"Item,Value"},propertyInfo:{type:"string"},useSemanticDateRange:{type:"boolean",defaultValue:true},liveMode:{type:"boolean",defaultValue:false},_valueList:{type:"sap.ui.model.Context",required:false},filterConditions:{type:"string",required:false},suspendSelection:{type:"boolean",defaultValue:false},showDraftEditState:{type:"boolean",defaultValue:false},toggleControlId:{type:"string"},initialLayout:{type:"string",defaultValue:"compact"}},events:{search:{type:"function",isPublic:true},filterChanged:{type:"function",isPublic:true},stateChanged:{type:"function"}},aggregations:{filterFields:{type:"sap.fe.macros.FilterField",isPublic:true}}},create:function(p,o,s,A){var d=p.contextPath;if(!d){L.error("Context Path not available for FilterBar Macro.");return;}var e=d.getPath();var m=p.metaPath;var f=m&&m.getPath();var E=b.getEntitySetPath(e);var g=d.getModel();var v=a.getInvolvedDataModelObjects(d);var h=this.parseAggregation(A.filterFields,function(x){var y=x.getAttribute("key");A[y]=x;return{key:y,label:x.getAttribute("label"),position:{placement:x.getAttribute("placement"),anchor:x.getAttribute("anchor")},type:"Slot"};});var v=a.getInvolvedDataModelObjects(d);var O="@com.sap.vocabularies.UI.v1.SelectionFields";var i={};i[O]={filterFields:h};var j=this.getConverterContext(v,undefined,s,i);if(!p.propertyInfo){p.propertyInfo=F.getPropertyInfoFields(j,[],[],(f&&f.replace(e,""))||"");}var k=p.propertyInfo;if(k){k=k.replace(/\\{/g,"{");k=k.replace(/\\}/g,"}");var l=JSON.parse(k);l.forEach(function(x){if(x.path==="$editState"){x.label=R.getText("M_COMMON_FILTERBAR_EDITING_STATUS");}});var n=JSON.stringify(l);n=n.replace(/\{/g,"\\{");n=n.replace(/\}/g,"\\}");p.propertyInfo=n;}if(!p.selectionFields){var S=F.getSelectionFields(j,[],(f&&f.replace(e,""))||"");p.selectionFields=new T(S,g).createBindingContext("/");var q=j.getEntityType(),r=D.getSelectionVariant(q,j),t=d.getModel().getContext(E),u=c.getFilterConditions(t,{selectionVariant:r});p.filterConditions=u;}if(g.getObject(E+"@com.sap.vocabularies.Common.v1.DraftRoot")||g.getObject(E+"@com.sap.vocabularies.Common.v1.DraftNode")){p.showDraftEditState=true;}if(p._applyIdToContent){p._apiId=p.id+"::FilterBar";p._contentId=p.id;}else{p._apiId=p.id;p._contentId=p.id+"-content";}if(p.hideBasicSearch!=="true"){var w=C.getSearchRestrictions(E,g);p.hideBasicSearch=Boolean(w&&!w.Searchable);}return p;}});});

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

@@ -166,4 +166,4 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI", "sap/base/util/
   }), _applyDecoratedDescriptor(_class2.prototype, "handleSearch", [EventHandler], Object.getOwnPropertyDescriptor(_class2.prototype, "handleSearch"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "handleFilterChanged", [EventHandler], Object.getOwnPropertyDescriptor(_class2.prototype, "handleFilterChanged"), _class2.prototype)), _class2)) || _class);
   return FilterBarAPI;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZpbHRlckJhckFQSS50cyJdLCJuYW1lcyI6WyJGaWx0ZXJCYXJBUEkiLCJBUElDbGFzcyIsIlByb3BlcnR5IiwidHlwZSIsIm9FdmVudCIsIm9GaWx0ZXJCYXIiLCJnZXRTb3VyY2UiLCJvRXZlbnRQYXJhbWV0ZXJzIiwiZ2V0UGFyYW1ldGVycyIsIm9Db25kaXRpb25zIiwiZ2V0RmlsdGVyQ29uZGl0aW9ucyIsImZpcmVTZWFyY2giLCJtZXJnZSIsImNvbmRpdGlvbnMiLCJmaXJlRmlsdGVyQ2hhbmdlZCIsInNDb25kaXRpb25QYXRoIiwic09wZXJhdG9yIiwidlZhbHVlcyIsIkZpbHRlclV0aWxzIiwic2V0RmlsdGVyVmFsdWVzIiwiY29udGVudCIsIm9Db250cm9sIiwiYXR0YWNoQ29uZGl0aW9uSGFuZGxpbmciLCJkZXRhY2hDb25kaXRpb25IYW5kbGluZyIsIk1hY3JvQVBJIiwiRXZlbnQiLCJFdmVudEhhbmRsZXIiXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQXlDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO01BRU1BLFksV0FETEMsUUFBUSxDQUFDLDRCQUFELEMsVUFPUEMsUUFBUSxDQUFDO0FBQUVDLElBQUFBLElBQUksRUFBRTtBQUFSLEdBQUQsQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7YUE2QlQsc0JBQ2FDLE1BRGIsRUFDK0I7QUFDOUIsWUFBTUMsVUFBVSxHQUFHRCxNQUFNLENBQUNFLFNBQVAsRUFBbkI7QUFDQSxZQUFNQyxnQkFBZ0IsR0FBR0gsTUFBTSxDQUFDSSxhQUFQLEVBQXpCOztBQUNBLFlBQUlILFVBQUosRUFBZ0I7QUFDZixjQUFNSSxXQUFXLEdBQUdKLFVBQVUsQ0FBQ0ssbUJBQVgsRUFBcEI7QUFDQyxjQUFELENBQWNDLFVBQWQsQ0FBeUJDLEtBQUssQ0FBQztBQUFFQyxZQUFBQSxVQUFVLEVBQUVKO0FBQWQsV0FBRCxFQUE4QkYsZ0JBQTlCLENBQTlCO0FBQ0E7QUFDRDs7O2FBRUQsNkJBQ29CSCxNQURwQixFQUNzQztBQUNyQyxZQUFNQyxVQUFVLEdBQUdELE1BQU0sQ0FBQ0UsU0FBUCxFQUFuQjtBQUNBLFlBQU1DLGdCQUFnQixHQUFHSCxNQUFNLENBQUNJLGFBQVAsRUFBekI7O0FBQ0EsWUFBSUgsVUFBSixFQUFnQjtBQUNmLGNBQU1JLFdBQVcsR0FBR0osVUFBVSxDQUFDSyxtQkFBWCxFQUFwQjtBQUNDLGNBQUQsQ0FBY0ksaUJBQWQsQ0FBZ0NGLEtBQUssQ0FBQztBQUFFQyxZQUFBQSxVQUFVLEVBQUVKO0FBQWQsV0FBRCxFQUE4QkYsZ0JBQTlCLENBQXJDO0FBQ0E7QUFDRDtBQUNEO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOzs7O2FBQ0MseUJBQWdCUSxjQUFoQixFQUF3Q0MsU0FBeEMsRUFBd0RDLE9BQXhELEVBQXNFO0FBQ3JFLGVBQU9DLFdBQVcsQ0FBQ0MsZUFBWixDQUE0QixLQUFLQyxPQUFqQyxFQUEwQ0wsY0FBMUMsRUFBMERDLFNBQTFELEVBQXFFQyxPQUFyRSxDQUFQO0FBQ0E7OzthQUVELDRCQUFtQjtBQUNsQixZQUFNSSxRQUFRLEdBQUcsS0FBS0QsT0FBdEI7QUFDQUYsUUFBQUEsV0FBVyxDQUFDSSx1QkFBWixDQUFvQ0QsUUFBcEM7QUFDQTs7O2FBRUQsZ0JBQU87QUFDTixZQUFNQSxRQUFRLEdBQUcsS0FBS0QsT0FBdEI7QUFDQUYsUUFBQUEsV0FBVyxDQUFDSyx1QkFBWixDQUFvQ0YsUUFBcEM7QUFDQTs7OztJQS9FeUJHLFE7Ozs7OzZFQWN6QkMsSzs7Ozs7b0ZBUUFBLEs7Ozs7O21GQVVBQSxLOzs7OztvRUFHQUMsWSxnS0FVQUEsWTtTQXFDYTFCLFkiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFQSUNsYXNzLCBQcm9wZXJ0eSwgRXZlbnRIYW5kbGVyLCBFdmVudCB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0NsYXNzU3VwcG9ydFwiO1xuaW1wb3J0IE1hY3JvQVBJIGZyb20gXCIuL01hY3JvQVBJXCI7XG5pbXBvcnQgeyBtZXJnZSB9IGZyb20gXCJzYXAvYmFzZS91dGlsXCI7XG5pbXBvcnQgeyBGaWx0ZXJVdGlscyB9IGZyb20gXCJzYXAvZmUvbWFjcm9zL2ZpbHRlclwiO1xuXG4vKipcbiAqIERlZmluaXRpb24gb2YgYSBjdXN0b20gZmlsdGVyIHRvIGJlIHVzZWQgaW5zaWRlIHRoZSBGaWx0ZXJCYXIuXG4gKlxuICogVGhlIHRlbXBsYXRlIGZvciB0aGUgRmlsdGVyRmllbGQgaGFzIHRvIGJlIHByb3ZpZGVkIGFzIHRoZSBkZWZhdWx0IGFnZ3JlZ2F0aW9uXG4gKlxuICogQGFsaWFzIHNhcC5mZS5tYWNyb3MuRmlsdGVyRmllbGRcbiAqIEBwdWJsaWNcbiAqIEBleHBlcmltZW50YWxcbiAqL1xuZXhwb3J0IHR5cGUgRmlsdGVyRmllbGQgPSB7XG5cdC8qKlxuXHQgKiBUaGUgcHJvcGVydHkgbmFtZSBvZiB0aGUgRmlsdGVyRmllbGRcblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0a2V5OiBzdHJpbmc7XG5cdC8qKlxuXHQgKiBUaGUgdGV4dCB0aGF0IHdpbGwgYmUgZGlzcGxheWVkIGZvciB0aGlzIEZpbHRlckZpZWxkXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdGxhYmVsOiBzdHJpbmc7XG5cdC8qKlxuXHQgKiBSZWZlcmVuY2UgdG8gdGhlIGtleSBvZiBhbm90aGVyIGZpbHRlciBhbHJlYWR5IGRpc3BsYXllZCBpbiB0aGUgdGFibGUgdG8gcHJvcGVybHkgcGxhY2UgdGhpcyBvbmVcblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0YW5jaG9yPzogc3RyaW5nO1xuXHQvKipcblx0ICogRGVmaW5lcyB3aGVyZSB0aGlzIGZpbHRlciBzaG91bGQgYmUgcGxhY2VkIHJlbGF0aXZlIHRvIHRoZSBkZWZpbmVkIGFuY2hvclxuXHQgKlxuXHQgKiBBbGxvd2VkIHZhbHVlcyBhcmUgYEJlZm9yZWAgYW5kIGBBZnRlcmBcblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0cGxhY2VtZW50Pzogc3RyaW5nO1xufTtcblxuLyoqXG4gKiBCdWlsZGluZyBibG9jayBmb3IgY3JlYXRpbmcgYSBGaWx0ZXJCYXIgYmFzZWQgb24gdGhlIG1ldGFkYXRhIHByb3ZpZGVkIGJ5IE9EYXRhIFY0LlxuICogPGJyPlxuICogVXN1YWxseSwgYSBTZWxlY3Rpb25GaWVsZHMgYW5ub3RhdGlvbiBpcyBleHBlY3RlZC5cbiAqXG4gKlxuICogVXNhZ2UgZXhhbXBsZTpcbiAqIDxwcmU+XG4gKiAmbHQ7bWFjcm86RmlsdGVyQmFyIGlkPVwiTXlGaWx0ZXJCYXJcIiBtZXRhUGF0aD1cIkBjb20uc2FwLnZvY2FidWxhcmllcy5VSS52MS5TZWxlY3Rpb25GaWVsZHNcIiAvJmd0O1xuICogPC9wcmU+XG4gKlxuICogQGFsaWFzIHNhcC5mZS5tYWNyb3MuRmlsdGVyQmFyXG4gKiBAcHVibGljXG4gKi9cbkBBUElDbGFzcyhcInNhcC5mZS5tYWNyb3MuRmlsdGVyQmFyQVBJXCIpXG5jbGFzcyBGaWx0ZXJCYXJBUEkgZXh0ZW5kcyBNYWNyb0FQSSB7XG5cdC8qKlxuXHQgKiBUaGUgaWRlbnRpZmllciBvZiB0aGUgZmlsdGVyYmFyIGNvbnRyb2wuXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdEBQcm9wZXJ0eSh7IHR5cGU6IFwic3RyaW5nXCIgfSlcblx0aWQhOiBzdHJpbmc7XG5cblx0LyoqXG5cdCAqIFRoaXMgZXZlbnQgaXMgZmlyZWQgd2hlbiB0aGUgR28gYnV0dG9uIGlzIHByZXNzZWQgb3IgYWZ0ZXIgYSBjb25kaXRpb24gY2hhbmdlLlxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRARXZlbnRcblx0c2VhcmNoITogRnVuY3Rpb247XG5cblx0LyoqXG5cdCAqIFRoaXMgZXZlbnQgaXMgZmlyZWQgYWZ0ZXIgZWl0aGVyIGEgZmlsdGVyIHZhbHVlIG9yIHRoZSB2aXNpYmlsaXR5IG9mIGEgZmlsdGVyIGl0ZW0gaGFzIGJlZW4gY2hhbmdlZC4gVGhlIGV2ZW50IGNvbnRhaW5zIGNvbmRpdGlvbnMgdGhhdCB3aWxsIGJlIHVzZWQgYXMgZmlsdGVycy5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QEV2ZW50XG5cdGZpbHRlckNoYW5nZWQhOiBGdW5jdGlvbjtcblxuXHQvKipcblx0ICogQW4gZXZlbnQgdGhhdCBpcyB0cmlnZ2VyZWQgd2hlbiB0aGUgRmlsdGVyQmFyIFN0YXRlIGNoYW5nZXMuXG5cdCAqXG5cdCAqIFlvdSBjYW4gc2V0IHRoaXMgdG8gc3RvcmUgdGhlIHN0YXRlIG9mIHRoZSBmaWx0ZXIgYmFyIGluIHRoZSBhcHAgc3RhdGUuXG5cdCAqXG5cdCAqIEBwcml2YXRlXG5cdCAqL1xuXHRARXZlbnRcblx0c3RhdGVDaGFuZ2VkITogRnVuY3Rpb247XG5cblx0QEV2ZW50SGFuZGxlclxuXHRoYW5kbGVTZWFyY2gob0V2ZW50OiBVSTVFdmVudCkge1xuXHRcdGNvbnN0IG9GaWx0ZXJCYXIgPSBvRXZlbnQuZ2V0U291cmNlKCk7XG5cdFx0Y29uc3Qgb0V2ZW50UGFyYW1ldGVycyA9IG9FdmVudC5nZXRQYXJhbWV0ZXJzKCk7XG5cdFx0aWYgKG9GaWx0ZXJCYXIpIHtcblx0XHRcdGNvbnN0IG9Db25kaXRpb25zID0gb0ZpbHRlckJhci5nZXRGaWx0ZXJDb25kaXRpb25zKCk7XG5cdFx0XHQodGhpcyBhcyBhbnkpLmZpcmVTZWFyY2gobWVyZ2UoeyBjb25kaXRpb25zOiBvQ29uZGl0aW9ucyB9LCBvRXZlbnRQYXJhbWV0ZXJzKSk7XG5cdFx0fVxuXHR9XG5cblx0QEV2ZW50SGFuZGxlclxuXHRoYW5kbGVGaWx0ZXJDaGFuZ2VkKG9FdmVudDogVUk1RXZlbnQpIHtcblx0XHRjb25zdCBvRmlsdGVyQmFyID0gb0V2ZW50LmdldFNvdXJjZSgpO1xuXHRcdGNvbnN0IG9FdmVudFBhcmFtZXRlcnMgPSBvRXZlbnQuZ2V0UGFyYW1ldGVycygpO1xuXHRcdGlmIChvRmlsdGVyQmFyKSB7XG5cdFx0XHRjb25zdCBvQ29uZGl0aW9ucyA9IG9GaWx0ZXJCYXIuZ2V0RmlsdGVyQ29uZGl0aW9ucygpO1xuXHRcdFx0KHRoaXMgYXMgYW55KS5maXJlRmlsdGVyQ2hhbmdlZChtZXJnZSh7IGNvbmRpdGlvbnM6IG9Db25kaXRpb25zIH0sIG9FdmVudFBhcmFtZXRlcnMpKTtcblx0XHR9XG5cdH1cblx0LyoqXG5cdCAqIFNldCB0aGUgZmlsdGVyIHZhbHVlcyBmb3IgdGhlIGdpdmVuIHByb3BlcnR5IGluIHRoZSBmaWx0ZXIgYmFyLlxuXHQgKiBUaGUgZmlsdGVyIHZhbHVlcyBjYW4gYmUgZWl0aGVyIGEgc2luZ2xlIHZhbHVlIG9yIGFuIGFycmF5IG9mIHZhbHVlcy5cblx0ICogRWFjaCBmaWx0ZXIgdmFsdWUgbXVzdCBiZSByZXByZXNlbnRlZCBhcyBhIHN0cmluZyBjb3JyZXNwb25kaW5nIHRvIHRoZSBnaXZlbiBvcGVyYXRvci5cblx0ICpcblx0ICogQHBhcmFtIHtzdHJpbmd9IHNDb25kaXRpb25QYXRoIFRoZSBwYXRoIHRvIHRoZSBwcm9wZXJ0eSBhcyBhIGNvbmRpdGlvbiBwYXRoXG5cdCAqIEBwYXJhbSB7c3RyaW5nfSBbc09wZXJhdG9yXSBUaGUgb3BlcmF0b3IgdG8gYmUgdXNlZCAob3B0aW9uYWwpIC0gaWYgbm90IHNldCwgdGhlIGRlZmF1bHQgb3BlcmF0b3IgKEVRKSB3aWxsIGJlIHVzZWRcblx0ICogQHBhcmFtIHtBcnJheSB8IHN0cmluZ30gdlZhbHVlcyBUaGUgdmFsdWVzIHRvIGJlIGFwcGxpZWRcblx0ICpcblx0ICogQHJldHVybnMge1Byb21pc2V9IEEgcHJvbWlzZSBmb3IgYXN5bmNocm9ub3VzIGhhbmRsaW5nXG5cdCAqIEBwdWJsaWNcblx0ICogQGV4cGVyaW1lbnRhbFxuXHQgKi9cblx0c2V0RmlsdGVyVmFsdWVzKHNDb25kaXRpb25QYXRoOiBzdHJpbmcsIHNPcGVyYXRvcjogYW55LCB2VmFsdWVzOiBhbnkpIHtcblx0XHRyZXR1cm4gRmlsdGVyVXRpbHMuc2V0RmlsdGVyVmFsdWVzKHRoaXMuY29udGVudCwgc0NvbmRpdGlvblBhdGgsIHNPcGVyYXRvciwgdlZhbHVlcyk7XG5cdH1cblxuXHRvbkFmdGVyUmVuZGVyaW5nKCkge1xuXHRcdGNvbnN0IG9Db250cm9sID0gdGhpcy5jb250ZW50O1xuXHRcdEZpbHRlclV0aWxzLmF0dGFjaENvbmRpdGlvbkhhbmRsaW5nKG9Db250cm9sKTtcblx0fVxuXG5cdGV4aXQoKSB7XG5cdFx0Y29uc3Qgb0NvbnRyb2wgPSB0aGlzLmNvbnRlbnQ7XG5cdFx0RmlsdGVyVXRpbHMuZGV0YWNoQ29uZGl0aW9uSGFuZGxpbmcob0NvbnRyb2wpO1xuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IEZpbHRlckJhckFQSTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZpbHRlckJhckFQSS50cyJdLCJuYW1lcyI6WyJGaWx0ZXJCYXJBUEkiLCJBUElDbGFzcyIsIlByb3BlcnR5IiwidHlwZSIsIm9FdmVudCIsIm9GaWx0ZXJCYXIiLCJnZXRTb3VyY2UiLCJvRXZlbnRQYXJhbWV0ZXJzIiwiZ2V0UGFyYW1ldGVycyIsIm9Db25kaXRpb25zIiwiZ2V0RmlsdGVyQ29uZGl0aW9ucyIsImZpcmVTZWFyY2giLCJtZXJnZSIsImNvbmRpdGlvbnMiLCJmaXJlRmlsdGVyQ2hhbmdlZCIsInNDb25kaXRpb25QYXRoIiwic09wZXJhdG9yIiwidlZhbHVlcyIsIkZpbHRlclV0aWxzIiwic2V0RmlsdGVyVmFsdWVzIiwiY29udGVudCIsIm9Db250cm9sIiwiYXR0YWNoQ29uZGl0aW9uSGFuZGxpbmciLCJkZXRhY2hDb25kaXRpb25IYW5kbGluZyIsIk1hY3JvQVBJIiwiRXZlbnQiLCJFdmVudEhhbmRsZXIiXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQXlDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO01BRU1BLFksV0FETEMsUUFBUSxDQUFDLDRCQUFELEMsVUFPUEMsUUFBUSxDQUFDO0FBQUVDLElBQUFBLElBQUksRUFBRTtBQUFSLEdBQUQsQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7YUE2QlQsc0JBQ2FDLE1BRGIsRUFDK0I7QUFDOUIsWUFBTUMsVUFBVSxHQUFHRCxNQUFNLENBQUNFLFNBQVAsRUFBbkI7QUFDQSxZQUFNQyxnQkFBZ0IsR0FBR0gsTUFBTSxDQUFDSSxhQUFQLEVBQXpCOztBQUNBLFlBQUlILFVBQUosRUFBZ0I7QUFDZixjQUFNSSxXQUFXLEdBQUdKLFVBQVUsQ0FBQ0ssbUJBQVgsRUFBcEI7QUFDQyxjQUFELENBQWNDLFVBQWQsQ0FBeUJDLEtBQUssQ0FBQztBQUFFQyxZQUFBQSxVQUFVLEVBQUVKO0FBQWQsV0FBRCxFQUE4QkYsZ0JBQTlCLENBQTlCO0FBQ0E7QUFDRDs7O2FBRUQsNkJBQ29CSCxNQURwQixFQUNzQztBQUNyQyxZQUFNQyxVQUFVLEdBQUdELE1BQU0sQ0FBQ0UsU0FBUCxFQUFuQjtBQUNBLFlBQU1DLGdCQUFnQixHQUFHSCxNQUFNLENBQUNJLGFBQVAsRUFBekI7O0FBQ0EsWUFBSUgsVUFBSixFQUFnQjtBQUNmLGNBQU1JLFdBQVcsR0FBR0osVUFBVSxDQUFDSyxtQkFBWCxFQUFwQjtBQUNDLGNBQUQsQ0FBY0ksaUJBQWQsQ0FBZ0NGLEtBQUssQ0FBQztBQUFFQyxZQUFBQSxVQUFVLEVBQUVKO0FBQWQsV0FBRCxFQUE4QkYsZ0JBQTlCLENBQXJDO0FBQ0E7QUFDRDtBQUNEO0FBQ0Q7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOzs7O2FBQ0MseUJBQWdCUSxjQUFoQixFQUF3Q0MsU0FBeEMsRUFBd0RDLE9BQXhELEVBQXNFO0FBQ3JFLGVBQU9DLFdBQVcsQ0FBQ0MsZUFBWixDQUE0QixLQUFLQyxPQUFqQyxFQUEwQ0wsY0FBMUMsRUFBMERDLFNBQTFELEVBQXFFQyxPQUFyRSxDQUFQO0FBQ0E7OzthQUVELDRCQUFtQjtBQUNsQixZQUFNSSxRQUFRLEdBQUcsS0FBS0QsT0FBdEI7QUFDQUYsUUFBQUEsV0FBVyxDQUFDSSx1QkFBWixDQUFvQ0QsUUFBcEM7QUFDQTs7O2FBRUQsZ0JBQU87QUFDTixZQUFNQSxRQUFRLEdBQUcsS0FBS0QsT0FBdEI7QUFDQUYsUUFBQUEsV0FBVyxDQUFDSyx1QkFBWixDQUFvQ0YsUUFBcEM7QUFDQTs7OztJQS9FeUJHLFE7Ozs7OzZFQWN6QkMsSzs7Ozs7b0ZBUUFBLEs7Ozs7O21GQVVBQSxLOzs7OztvRUFHQUMsWSxnS0FVQUEsWTtTQXFDYTFCLFkiLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFQSUNsYXNzLCBQcm9wZXJ0eSwgRXZlbnRIYW5kbGVyLCBFdmVudCB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0NsYXNzU3VwcG9ydFwiO1xuaW1wb3J0IE1hY3JvQVBJIGZyb20gXCIuL01hY3JvQVBJXCI7XG5pbXBvcnQgbWVyZ2UgZnJvbSBcInNhcC9iYXNlL3V0aWwvbWVyZ2VcIjtcbmltcG9ydCB7IEZpbHRlclV0aWxzIH0gZnJvbSBcInNhcC9mZS9tYWNyb3MvZmlsdGVyXCI7XG5cbi8qKlxuICogRGVmaW5pdGlvbiBvZiBhIGN1c3RvbSBmaWx0ZXIgdG8gYmUgdXNlZCBpbnNpZGUgdGhlIEZpbHRlckJhci5cbiAqXG4gKiBUaGUgdGVtcGxhdGUgZm9yIHRoZSBGaWx0ZXJGaWVsZCBoYXMgdG8gYmUgcHJvdmlkZWQgYXMgdGhlIGRlZmF1bHQgYWdncmVnYXRpb25cbiAqXG4gKiBAYWxpYXMgc2FwLmZlLm1hY3Jvcy5GaWx0ZXJGaWVsZFxuICogQHB1YmxpY1xuICogQGV4cGVyaW1lbnRhbFxuICovXG5leHBvcnQgdHlwZSBGaWx0ZXJGaWVsZCA9IHtcblx0LyoqXG5cdCAqIFRoZSBwcm9wZXJ0eSBuYW1lIG9mIHRoZSBGaWx0ZXJGaWVsZFxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRrZXk6IHN0cmluZztcblx0LyoqXG5cdCAqIFRoZSB0ZXh0IHRoYXQgd2lsbCBiZSBkaXNwbGF5ZWQgZm9yIHRoaXMgRmlsdGVyRmllbGRcblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0bGFiZWw6IHN0cmluZztcblx0LyoqXG5cdCAqIFJlZmVyZW5jZSB0byB0aGUga2V5IG9mIGFub3RoZXIgZmlsdGVyIGFscmVhZHkgZGlzcGxheWVkIGluIHRoZSB0YWJsZSB0byBwcm9wZXJseSBwbGFjZSB0aGlzIG9uZVxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRhbmNob3I/OiBzdHJpbmc7XG5cdC8qKlxuXHQgKiBEZWZpbmVzIHdoZXJlIHRoaXMgZmlsdGVyIHNob3VsZCBiZSBwbGFjZWQgcmVsYXRpdmUgdG8gdGhlIGRlZmluZWQgYW5jaG9yXG5cdCAqXG5cdCAqIEFsbG93ZWQgdmFsdWVzIGFyZSBgQmVmb3JlYCBhbmQgYEFmdGVyYFxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRwbGFjZW1lbnQ/OiBzdHJpbmc7XG59O1xuXG4vKipcbiAqIEJ1aWxkaW5nIGJsb2NrIGZvciBjcmVhdGluZyBhIEZpbHRlckJhciBiYXNlZCBvbiB0aGUgbWV0YWRhdGEgcHJvdmlkZWQgYnkgT0RhdGEgVjQuXG4gKiA8YnI+XG4gKiBVc3VhbGx5LCBhIFNlbGVjdGlvbkZpZWxkcyBhbm5vdGF0aW9uIGlzIGV4cGVjdGVkLlxuICpcbiAqXG4gKiBVc2FnZSBleGFtcGxlOlxuICogPHByZT5cbiAqICZsdDttYWNybzpGaWx0ZXJCYXIgaWQ9XCJNeUZpbHRlckJhclwiIG1ldGFQYXRoPVwiQGNvbS5zYXAudm9jYWJ1bGFyaWVzLlVJLnYxLlNlbGVjdGlvbkZpZWxkc1wiIC8mZ3Q7XG4gKiA8L3ByZT5cbiAqXG4gKiBAYWxpYXMgc2FwLmZlLm1hY3Jvcy5GaWx0ZXJCYXJcbiAqIEBwdWJsaWNcbiAqL1xuQEFQSUNsYXNzKFwic2FwLmZlLm1hY3Jvcy5GaWx0ZXJCYXJBUElcIilcbmNsYXNzIEZpbHRlckJhckFQSSBleHRlbmRzIE1hY3JvQVBJIHtcblx0LyoqXG5cdCAqIFRoZSBpZGVudGlmaWVyIG9mIHRoZSBmaWx0ZXJiYXIgY29udHJvbC5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QFByb3BlcnR5KHsgdHlwZTogXCJzdHJpbmdcIiB9KVxuXHRpZCE6IHN0cmluZztcblxuXHQvKipcblx0ICogVGhpcyBldmVudCBpcyBmaXJlZCB3aGVuIHRoZSBHbyBidXR0b24gaXMgcHJlc3NlZCBvciBhZnRlciBhIGNvbmRpdGlvbiBjaGFuZ2UuXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdEBFdmVudFxuXHRzZWFyY2ghOiBGdW5jdGlvbjtcblxuXHQvKipcblx0ICogVGhpcyBldmVudCBpcyBmaXJlZCBhZnRlciBlaXRoZXIgYSBmaWx0ZXIgdmFsdWUgb3IgdGhlIHZpc2liaWxpdHkgb2YgYSBmaWx0ZXIgaXRlbSBoYXMgYmVlbiBjaGFuZ2VkLiBUaGUgZXZlbnQgY29udGFpbnMgY29uZGl0aW9ucyB0aGF0IHdpbGwgYmUgdXNlZCBhcyBmaWx0ZXJzLlxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRARXZlbnRcblx0ZmlsdGVyQ2hhbmdlZCE6IEZ1bmN0aW9uO1xuXG5cdC8qKlxuXHQgKiBBbiBldmVudCB0aGF0IGlzIHRyaWdnZXJlZCB3aGVuIHRoZSBGaWx0ZXJCYXIgU3RhdGUgY2hhbmdlcy5cblx0ICpcblx0ICogWW91IGNhbiBzZXQgdGhpcyB0byBzdG9yZSB0aGUgc3RhdGUgb2YgdGhlIGZpbHRlciBiYXIgaW4gdGhlIGFwcCBzdGF0ZS5cblx0ICpcblx0ICogQHByaXZhdGVcblx0ICovXG5cdEBFdmVudFxuXHRzdGF0ZUNoYW5nZWQhOiBGdW5jdGlvbjtcblxuXHRARXZlbnRIYW5kbGVyXG5cdGhhbmRsZVNlYXJjaChvRXZlbnQ6IFVJNUV2ZW50KSB7XG5cdFx0Y29uc3Qgb0ZpbHRlckJhciA9IG9FdmVudC5nZXRTb3VyY2UoKTtcblx0XHRjb25zdCBvRXZlbnRQYXJhbWV0ZXJzID0gb0V2ZW50LmdldFBhcmFtZXRlcnMoKTtcblx0XHRpZiAob0ZpbHRlckJhcikge1xuXHRcdFx0Y29uc3Qgb0NvbmRpdGlvbnMgPSBvRmlsdGVyQmFyLmdldEZpbHRlckNvbmRpdGlvbnMoKTtcblx0XHRcdCh0aGlzIGFzIGFueSkuZmlyZVNlYXJjaChtZXJnZSh7IGNvbmRpdGlvbnM6IG9Db25kaXRpb25zIH0sIG9FdmVudFBhcmFtZXRlcnMpKTtcblx0XHR9XG5cdH1cblxuXHRARXZlbnRIYW5kbGVyXG5cdGhhbmRsZUZpbHRlckNoYW5nZWQob0V2ZW50OiBVSTVFdmVudCkge1xuXHRcdGNvbnN0IG9GaWx0ZXJCYXIgPSBvRXZlbnQuZ2V0U291cmNlKCk7XG5cdFx0Y29uc3Qgb0V2ZW50UGFyYW1ldGVycyA9IG9FdmVudC5nZXRQYXJhbWV0ZXJzKCk7XG5cdFx0aWYgKG9GaWx0ZXJCYXIpIHtcblx0XHRcdGNvbnN0IG9Db25kaXRpb25zID0gb0ZpbHRlckJhci5nZXRGaWx0ZXJDb25kaXRpb25zKCk7XG5cdFx0XHQodGhpcyBhcyBhbnkpLmZpcmVGaWx0ZXJDaGFuZ2VkKG1lcmdlKHsgY29uZGl0aW9uczogb0NvbmRpdGlvbnMgfSwgb0V2ZW50UGFyYW1ldGVycykpO1xuXHRcdH1cblx0fVxuXHQvKipcblx0ICogU2V0IHRoZSBmaWx0ZXIgdmFsdWVzIGZvciB0aGUgZ2l2ZW4gcHJvcGVydHkgaW4gdGhlIGZpbHRlciBiYXIuXG5cdCAqIFRoZSBmaWx0ZXIgdmFsdWVzIGNhbiBiZSBlaXRoZXIgYSBzaW5nbGUgdmFsdWUgb3IgYW4gYXJyYXkgb2YgdmFsdWVzLlxuXHQgKiBFYWNoIGZpbHRlciB2YWx1ZSBtdXN0IGJlIHJlcHJlc2VudGVkIGFzIGEgc3RyaW5nIGNvcnJlc3BvbmRpbmcgdG8gdGhlIGdpdmVuIG9wZXJhdG9yLlxuXHQgKlxuXHQgKiBAcGFyYW0ge3N0cmluZ30gc0NvbmRpdGlvblBhdGggVGhlIHBhdGggdG8gdGhlIHByb3BlcnR5IGFzIGEgY29uZGl0aW9uIHBhdGhcblx0ICogQHBhcmFtIHtzdHJpbmd9IFtzT3BlcmF0b3JdIFRoZSBvcGVyYXRvciB0byBiZSB1c2VkIChvcHRpb25hbCkgLSBpZiBub3Qgc2V0LCB0aGUgZGVmYXVsdCBvcGVyYXRvciAoRVEpIHdpbGwgYmUgdXNlZFxuXHQgKiBAcGFyYW0ge0FycmF5IHwgc3RyaW5nfSB2VmFsdWVzIFRoZSB2YWx1ZXMgdG8gYmUgYXBwbGllZFxuXHQgKlxuXHQgKiBAcmV0dXJucyB7UHJvbWlzZX0gQSBwcm9taXNlIGZvciBhc3luY2hyb25vdXMgaGFuZGxpbmdcblx0ICogQHB1YmxpY1xuXHQgKiBAZXhwZXJpbWVudGFsXG5cdCAqL1xuXHRzZXRGaWx0ZXJWYWx1ZXMoc0NvbmRpdGlvblBhdGg6IHN0cmluZywgc09wZXJhdG9yOiBhbnksIHZWYWx1ZXM6IGFueSkge1xuXHRcdHJldHVybiBGaWx0ZXJVdGlscy5zZXRGaWx0ZXJWYWx1ZXModGhpcy5jb250ZW50LCBzQ29uZGl0aW9uUGF0aCwgc09wZXJhdG9yLCB2VmFsdWVzKTtcblx0fVxuXG5cdG9uQWZ0ZXJSZW5kZXJpbmcoKSB7XG5cdFx0Y29uc3Qgb0NvbnRyb2wgPSB0aGlzLmNvbnRlbnQ7XG5cdFx0RmlsdGVyVXRpbHMuYXR0YWNoQ29uZGl0aW9uSGFuZGxpbmcob0NvbnRyb2wpO1xuXHR9XG5cblx0ZXhpdCgpIHtcblx0XHRjb25zdCBvQ29udHJvbCA9IHRoaXMuY29udGVudDtcblx0XHRGaWx0ZXJVdGlscy5kZXRhY2hDb25kaXRpb25IYW5kbGluZyhvQ29udHJvbCk7XG5cdH1cbn1cblxuZXhwb3J0IGRlZmF1bHQgRmlsdGVyQmFyQVBJO1xuIl19

package/packages/sap.fe.macros/src/sap/fe/macros/FilterBarAPI.ts

@@ -1,6 +1,6 @@
 import { APIClass, Property, EventHandler, Event } from "sap/fe/core/helpers/ClassSupport";
 import MacroAPI from "./MacroAPI";
-import { merge } from "sap/base/util";
+import merge from "sap/base/util/merge";
 import { FilterUtils } from "sap/fe/macros/filter";
 
 /**

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

@@ -26,7 +26,10 @@ sap.ui.define(
 		"sap/fe/macros/DelegateUtil",
 		"sap/base/Log",
 		"sap/base/util/JSTokenizer",
-		"sap/fe/core/templating/PropertyFormatters"
+		"sap/fe/core/templating/PropertyFormatters",
+		"sap/ui/fl/Utils",
+		"sap/fe/core/converters/MetaModelConverter",
+		"sap/fe/core/converters/ConverterContext"
 	],
 	function(
 		FilterBarDelegate,
@@ -45,7 +48,10 @@ sap.ui.define(
 		DelegateUtil,
 		Log,
 		JSTokenizer,
-		PropertyFormatters
+		PropertyFormatters,
+		FlUtils,
+		MetaModelConverter,
+		ConverterContext
 	) {
 		"use strict";
 		var ODataFilterBarDelegate = Object.assign({}, FilterBarDelegate),
@@ -401,9 +407,13 @@ sap.ui.define(
 				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 = _getPropertyPath(oConvertedProperty.conditionPath);
+				var sPropertyPath;
+				if (oConvertedProperty.conditionPath) {
+					sPropertyPath = _getPropertyPath(oConvertedProperty.conditionPath);
+				}
 				// 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);
@@ -416,7 +426,7 @@ sap.ui.define(
 						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);
+						oPropertyInfo.label = DelegateUtil.getLocalizedText(oConvertedProperty.label, oFilterControl) || "";
 						aFetchedProperties.push(oPropertyInfo);
 						if (oPropertyInfo.isParameter) {
 							aParameterFields.push(sPropertyPath);
@@ -435,6 +445,42 @@ sap.ui.define(
 					aFetchedProperties.push(_getSearchFilterPropertyInfo());
 				}
 			}
+			// 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);
+			// 		}
+			// 	});
+			// }
 
 			DelegateUtil.setCustomData(oFilterControl, "parameters", aParameterFields);
 

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"],function(F,J,T,C,c,M,S,d,e,f,g,R,m,D,L,h,P){"use strict";var O=Object.assign({},F),E="$editState",j="$search",V="FilterFieldValueHelp",k="sap_fe_FilterBarDelegate_propertyInfoMap",l=/\+|\*/g;var n=c.FilterRestrictions;function _(){return{name:j,path:j,typeConfig:g.getTypeConfig("sap.ui.model.odata.type.String"),maxConditions:1};}function o(){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 p(i,a){var b=new J({id:i}),B={bindingContexts:{"this":b.createBindingContext("/")},models:{"this.i18n":R.getModel(),"this":b}};return D.templateControlFragment("sap.fe.macros.filter.DraftEditState",B,undefined,a).finally(function(){b.destroy();});}function q(a,i,b,B,G){var H=new J({id:i}),I=new T(b,B),K={bindingContexts:{"this":H.createBindingContext("/"),"item":I.createBindingContext("/")},models:{"this":H,"item":I}};return D.templateControlFragment("sap.fe.macros.filter.CustomFilter",K,undefined,G).finally(function(){H.destroy();I.destroy();});}function r(a){return a.replace(l,"");}function s(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 t(a,b){var i=O._fetchBasicPropertyInfo(b),B=b.annotationPath;if(!B){return i;}var G=B.substr(0,B.lastIndexOf("/")),H=a.getObject(B),I=a.getObject(B+"@"),K=a.getObject(G+"/@"),N,Q,U=a.createBindingContext(B),W=h.parseJS(e.formatOptions(H,{context:U})||"{}"),X=h.parseJS(e.constraints(H,{context:U})||"{}"),Y=I["@com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive"]||I["@com.sap.vocabularies.UI.v1.ExcludeFromNavigationContext"]||I["@com.sap.vocabularies.Analytics.v1.Measure"];var Z=C.getLocationForPropertyPath(a,b.annotationPath);var $=b.annotationPath.replace(Z+"/","");if(!c.isPropertyFilterable(a,Z,r($),true)){return null;}Q=I["@com.sap.vocabularies.Common.v1.FilterDefaultValue"];if(Q){N=Q["$"+D.getModelType(H.$Type)];}i=Object.assign(i,{tooltip:I["@com.sap.vocabularies.Common.v1.QuickInfo"]||undefined,removeFromAppState:Y,hasValueHelp:P.hasValueHelp(U.getObject(),{context:U}),formatOptions:W,constraints:X,typeConfig:g.getTypeConfig(H.$Type,W,X),display:d.displayMode(I,K),defaultFilterConditions:N?[{fieldPath:b.conditionPath,operator:"EQ",values:[N]}]:undefined});return i;}function u(a,b,N){return N?S.generate([a,b,N]):S.generate([a,b]);}function v(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}),B=m({},a,{bindingContexts:{"this":i.createBindingContext("/")},models:{"this":i}});return D.templateControlFragment("sap.fe.macros.internal.valuehelp.ValueHelp",B,{isXML:a.isXML}).then(function(G){if(G){var H="dependents";if(G.length){G.forEach(function(I){if(b.oModifier){return b.oModifier.insertAggregation(b.oControl,H,I,0);}else{b.oControl.insertAggregation(H,I,0,false);}});}else if(b.oModifier){return b.oModifier.insertAggregation(b.oControl,H,G,0);}else{b.oControl.insertAggregation(H,G,0,false);}}}).finally(function(){i.destroy();});}).catch(function(i){L.error("Error while evaluating DelegateUtil.isValueHelpRequired",i);});}function w(a,b,B){return Promise.resolve().then(function(){var G=b.getAggregation(a,"dependents");return G.then(function(H){var i;if(H&&H.length>1){for(i=0;i<=H.length;i++){var I=H[i];if(I&&I.isA("sap.ui.mdc.FilterField")){var K=I.getFieldPath(),N=I.getId();if(B===K&&N.indexOf("CustomFilterField")){return Promise.resolve(I);}}}}}).catch(function(i){L.error(i);});}).catch(function(i){L.error("Filter Cannot be added",i);});}function x(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 B=b.oMetaModel;var G=new T(b.visualFilter,B);var H=m({},a,{bindingContexts:{"this":i.createBindingContext("/"),"visualFilter":G.createBindingContext("/")},models:{"this":i,"visualFilter":G,"metaModel":B}});return D.templateControlFragment("sap.fe.macros.internal.FilterField",H,{isXML:a.isXML}).finally(function(){i.destroy();});}O.addItem=function(a,b,i){if(!i){return O._addP13nItem(a,b);}var B=i.appComponent&&i.appComponent.getModel().getMetaModel();if(!B){return Promise.resolve(null);}return O._addFlexItem(a,b,B,i.modifier);};O.removeItem=function(a,b,i){var B=true;if(typeof a!=="string"&&a.isA("sap.ui.mdc.FilterField")){if(a.data("isSlot")==="true"&&i){var G=i.modifier;G.insertAggregation(b,"dependents",a);B=false;}}return Promise.resolve(B);};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 B=b.getObject(a);if(!i||!B){return[];}var G=M.getEntitySetPath(a),H=f.getConvertedFilterFields(i,a),I,K=[],N=[],Q=c.getFilterRestrictionsByPath(G,b),U=Q[n.REQUIRED_PROPERTIES],W=Q[n.NON_FILTERABLE_PROPERTIES],X=Q[n.ALLOWED_EXPRESSIONS];Object.keys(H).forEach(function(Z){var $=H[Z];var a1=r($.conditionPath);if(W.indexOf(a1)===-1){I=t(b,$);if(I){if(X[a1]&&X[a1].length>0){I.filterExpression=c.getSpecificAllowedExpression(X[a1]);}else{I.filterExpression="auto";}I.maxConditions=!I.isParameter&&D.isMultiValue(I)?-1:1;I.required=I.isParameter||U.indexOf(a1)>=0;I.visible=$.availability==="Default";I.label=D.getLocalizedText($.label,i);K.push(I);if(I.isParameter){N.push(a1);}}}});if(i.data("showDraftEditState")==="true"){K.push(o());}if(G&&i.data("hideBasicSearch")!=="true"){var Y=c.getSearchRestrictions(G,b);if(!Y||Y.Searchable){K.push(_());}}D.setCustomData(i,"parameters",N);return K;};O._addFlexItem=function(a,b,i,B){var G=B?B.getId(b):b.getId(),I=B?"":"Adaptation",H=f.getConvertedFilterFields(b),K=s(H,a),N=r(a),Q=!!B&&B.targets==="xmlTree";if(a===E){return p(G,B);}else if(a===j){return Promise.resolve(null);}else if(K&&K.template){return q(b,u(G,I+"FilterField"),K,i,B);}if(K.type==="Slot"&&B){return w(b,B,N);}var U=C.getNavigationPath(N),W=K.annotationPath,X,Y,Z,$,a1;return Promise.resolve().then(function(){if(K.isParameter){return W.substr(0,W.lastIndexOf("/")+1);}return D.getCustomData(b,"entityType",B);}).then(function(b1){X=b1;return D.getCustomData(b,"useSemanticDateRange",B);}).then(function(b1){Y=b1;var c1=i.createBindingContext(X+N);var G=B?B.getId(b):b.getId();Z={bindingContexts:{"contextPath":i.createBindingContext(X),"property":c1},models:{"contextPath":i,"property":i},isXML:Q};$="/"+M.getEntitySetPath(X).split("/").filter(M.filterOutNavPropBinding).join("/");a1={sPropertyName:N,sBindingPath:$,sValueHelpType:I+V,oControl:b,oMetaModel:i,oModifier:B,sIdPrefix:u(G,I+"FilterField",U),sVhIdPrefix:u(G,I+V),sNavigationPrefix:U,bUseSemanticDateRange:Y,oSettings:K?K.settings:{},visualFilter:K?K.visualFilter:undefined};return D.doesValueHelpExist(a1);}).then(function(b1){if(!b1){return v(Z,a1);}return Promise.resolve();}).then(function(){return x(Z,a1);});};function y(a){if(a instanceof window.Element){return null;}return D.getCustomData(a,k);}function z(a,b){if(a instanceof window.Element){return;}D.setCustomData(a,k,b);}function A(i,B,G){var H=y(G);var I;if(!H){H=O.fetchPropertiesForEntity(i,B,G);H.forEach(function(a){I=null;if(a.groupLabel){I=D.getLocalizedText(a.groupLabel,G);a.groupLabel=I===null?a.groupLabel:I;}});H.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);});z(G,H);}return H;}O.fetchProperties=function(a){var b=D.getCustomData(a,"entityType");return D.fetchModel(a).then(function(i){if(!i){return[];}return A(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/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);

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

@@ -4,95 +4,85 @@
 	xmlns:f="sap.ui.layout.form"
 	xmlns:core="sap.ui.core"
 	xmlns:fl="sap.ui.fl"
+	xmlns:macro="sap.fe.macros"
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
-	xmlns:log="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:macrodata="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	template:require="{
-		macroLibrary: 'sap/fe/macros/macroLibrary',
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
 		COMMON: 'sap/fe/macros/CommonHelper',
-		FORM: 'sap/fe/macros/form/FormHelper'
+		FORM: 'sap/fe/macros/form/FormHelper',
+		MACRO: 'sap/fe/macros/MacroTemplating'
 	}"
 >
-
 	<template:if test="{this>isVisible}">
 		<template:then>
-			<f:Form
-				unittest:id="form"
-				fl:delegate='{
-					"name": "sap/fe/macros/flexibility/FormDelegate",
-					"delegateType": "writeonly"
-				}'
-				id="{this>id}"
-				title="{this>formTitle}"
-				editable="{this>_editable}"
-				log:entitySet="{entitySet>@sapui.name}"
-				visible="{this>isVisible}"
-				class="{= FORM.getMarginClass(${this>class})}"
-				macrodata:navigationPath="{= FORM.getNavigationPath(${entitySet>}) }"
-				macrodata:onChange="{= ${this>onChange}.replace('{','\\{').replace('}','\\}') }"
-			>
-				<f:layout>
-					<template:if test="{= ${this>layoutMode} === 'ResponsiveGridLayout' }">
-						<template:then>
-							<f:ResponsiveGridLayout />
-						</template:then>
-						<template:else>
-							<f:ColumnLayout columnsM="2" columnsL="3" columnsXL="4" labelCellsLarge="12" />
-						</template:else>
-					</template:if>
-				</f:layout>
+			<macro:FormAPI id="{this>_apiId}" metaPath="{metaPath>@@MACRO.getPath}" contextPath="{contextPath>@@MACRO.getPath}">
+				<f:Form
+					unittest:id="form"
+					fl:delegate='{
+						"name": "sap/fe/macros/flexibility/FormDelegate",
+						"delegateType": "writeonly"
+					}'
+					id="{this>_contentId}"
+					title="{this>title}"
+					editable="{this>_editable}"
+					macrodata:entitySet="{contextPath>@sapui.name}"
+					visible="{this>isVisible}"
+					class="sapUxAPObjectPageSubSectionAlignContent"
+					macrodata:navigationPath="{= FORM.getNavigationPath(${contextPath>}) }"
+					macrodata:onChange="{= ${this>onChange} &amp;&amp; ${this>onChange}.replace('{','\\{').replace('}','\\}') }"
+				>
+					<f:layout>
+						<template:if test="{= ${this>layoutMode} === 'ResponsiveGridLayout' }">
+							<template:then>
+								<f:ResponsiveGridLayout />
+							</template:then>
+							<template:else>
+								<f:ColumnLayout columnsM="2" columnsL="3" columnsXL="4" labelCellsLarge="12" />
+							</template:else>
+						</template:if>
+					</f:layout>
 
-				<f:formContainers>
-					<template:if test="{= ${facet>} &amp;&amp; ${facet>$Type}.indexOf('com.sap.vocabularies.UI.v1.CollectionFacet') >= 0 }">
-						<template:then>
-							<!-- In case of a Collection Facet -->
-							<template:repeat list="{path:'formContainers>'}" var="formContainer">
-								<template:with path="formContainer>annotationPath" var="facet">
-									<!-- Repeating  for all facets inside collection -->
-									<template:if test="{= ${formContainer>isVisible} }">
-										<template:if
-											test="{= ${facet>$Type} === 'com.sap.vocabularies.UI.v1.ReferenceFacet' &amp;&amp; FORM.isReferenceFacetPartOfPreview(${facet>}, ${this>partOfPreview}) }"
-										>
-											<template:if test="{= ${facet>Target/$AnnotationPath/$Type} === 'com.sap.vocabularies.Communication.v1.AddressType' }">
-												<template:then>
-													<core:Fragment fragmentName="sap.fe.macros.form.AddressSection" type="XML" />
-												</template:then>
-												<template:else>
-													<!-- In case of Reference Facet, and when it is assigned to the corresponding subsection -->
-													<core:Fragment fragmentName="sap.fe.macros.form.DataFieldCollection" type="XML" />
-												</template:else>
+					<f:formContainers>
+						<template:if test="{= ${metaPath>} &amp;&amp; ${metaPath>$Type}.indexOf('com.sap.vocabularies.UI.v1.CollectionFacet') >= 0 }">
+							<template:then>
+								<!-- In case of a Collection Facet -->
+								<template:repeat list="{path:'formContainers>'}" var="formContainer">
+									<template:with path="formContainer>annotationPath" var="facet">
+										<!-- Repeating  for all facets inside collection -->
+										<template:if test="{= ${formContainer>isVisible} }">
+											<template:if
+												test="{= ${facet>$Type} === 'com.sap.vocabularies.UI.v1.ReferenceFacet' &amp;&amp; FORM.isReferenceFacetPartOfPreview(${facet>}, ${this>partOfPreview}) }"
+											>
+												<template:if test="{= ${facet>Target/$AnnotationPath/$Type} === 'com.sap.vocabularies.Communication.v1.AddressType' }">
+													<template:then>
+														<core:Fragment fragmentName="sap.fe.macros.form.AddressSection" type="XML" />
+													</template:then>
+													<template:else>
+														<!-- In case of Reference Facet, and when it is assigned to the corresponding subsection -->
+														<core:Fragment fragmentName="sap.fe.macros.form.DataFieldCollection" type="XML" />
+													</template:else>
+												</template:if>
 											</template:if>
 										</template:if>
-									</template:if>
-								</template:with>
-							</template:repeat>
-						</template:then>
-						<template:elseif test="{= ${facet>} &amp;&amp; ${facet>$Type} === 'com.sap.vocabularies.UI.v1.ReferenceFacet'}">
-							<!-- In case of Reference Facet, and when it is assigned to the corresponding subsection -->
-							<template:repeat list="{path:'formContainers>'}" var="formContainer">
-								<template:if test="{= ${formContainer>isVisible} }">
-									<template:with path="formContainer>annotationPath" var="facet">
-										<core:Fragment fragmentName="sap.fe.macros.form.DataFieldCollection" type="XML" />
 									</template:with>
-								</template:if>
-							</template:repeat>
-						</template:elseif>
-					</template:if>
-				</f:formContainers>
+								</template:repeat>
+							</template:then>
+							<template:elseif test="{= ${metaPath>} &amp;&amp; ${metaPath>$Type} === 'com.sap.vocabularies.UI.v1.ReferenceFacet'}">
+								<!-- In case of Reference Facet, and when it is assigned to the corresponding subsection -->
+								<template:repeat list="{path:'formContainers>'}" var="formContainer">
+									<template:if test="{= ${formContainer>isVisible} }">
+										<template:with path="formContainer>annotationPath" var="facet">
+											<core:Fragment fragmentName="sap.fe.macros.form.DataFieldCollection" type="XML" />
+										</template:with>
+									</template:if>
+								</template:repeat>
+							</template:elseif>
+						</template:if>
+					</f:formContainers>
 
-			</f:Form>
+				</f:Form>
+			</macro:FormAPI>
 		</template:then>
-		<!-- 		TODO: Using 'dataFieldCollection' as direct metadata context. Still in Progress
-		<template:elseif test="{dataFieldCollection>}">
-			<f:Form id="{= ${this>id} || undefined}" title="{this>formTitle}" editable="{= ${this>editMode} === 'Editable' ? true : false }" log:entitySet="{entitySet>@sapui.name}">
-				<f:layout>
-					<f:ColumnLayout columnsM="2" columnsL="3" columnsXL="4" />
-				</f:layout>
-				<f:formContainers>
-					<core:Fragment fragmentName="sap.fe.macros.FormContainer" type="XML"/>
-				</f:formContainers>
-			</f:Form>
-		</template:elseif> -->
 	</template:if>
 </core:FragmentDefinition>