@sap/open.fe 1.97.0 → 1.98.0

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

@@ -1,6 +1,45 @@
 import { APIClass, Property, EventHandler, Event } from "sap/fe/core/helpers/ClassSupport";
 import MacroAPI from "./MacroAPI";
 import { merge } from "sap/base/util";
+import { FilterUtils } from "sap/fe/macros/filter";
+
+/**
+ * Definition of a custom filter to be used inside the FilterBar.
+ *
+ * The template for the FilterField has to be provided as the default aggregation
+ *
+ * @alias sap.fe.macros.FilterField
+ * @public
+ * @experimental
+ */
+export type FilterField = {
+	/**
+	 * The property name of the FilterField
+	 *
+	 * @public
+	 */
+	key: string;
+	/**
+	 * The text that will be displayed for this FilterField
+	 *
+	 * @public
+	 */
+	label: string;
+	/**
+	 * Reference to the key of another filter already displayed in the table to properly place this one
+	 *
+	 * @public
+	 */
+	anchor?: string;
+	/**
+	 * Defines where this filter should be placed relative to the defined anchor
+	 *
+	 * Allowed values are `Before` and `After`
+	 *
+	 * @public
+	 */
+	placement?: string;
+};
 
 /**
  * Building block for creating a FilterBar based on the metadata provided by OData V4.
@@ -35,13 +74,23 @@ class FilterBarAPI extends MacroAPI {
 	search!: Function;
 
 	/**
-	 * This event is fired after either a filter value or the visibility of a filter item has been changed. the event contains conditions that will be used as filters.
+	 * This event is fired after either a filter value or the visibility of a filter item has been changed. The event contains conditions that will be used as filters.
 	 *
 	 * @public
 	 */
 	@Event
 	filterChanged!: Function;
 
+	/**
+	 * An event that is triggered when the FilterBar State changes.
+	 *
+	 * You can set this to store the state of the filter bar in the app state.
+	 *
+	 * @private
+	 */
+	@Event
+	stateChanged!: Function;
+
 	@EventHandler
 	handleSearch(oEvent: UI5Event) {
 		const oFilterBar = oEvent.getSource();
@@ -61,6 +110,32 @@ class FilterBarAPI extends MacroAPI {
 			(this as any).fireFilterChanged(merge({ conditions: oConditions }, oEventParameters));
 		}
 	}
+	/**
+	 * Set the filter values for the given property in the filter bar.
+	 * The filter values can be either a single value or an array of values.
+	 * Each filter value must be represented as a string corresponding to the given operator.
+	 *
+	 * @param {string} sConditionPath The path to the property as a condition path
+	 * @param {string} [sOperator] The operator to be used (optional) - if not set, the default operator (EQ) will be used
+	 * @param {Array | string} vValues The values to be applied
+	 *
+	 * @returns {Promise} A promise for asynchronous handling
+	 * @public
+	 * @experimental
+	 */
+	setFilterValues(sConditionPath: string, sOperator: any, vValues: any) {
+		return FilterUtils.setFilterValues(this.content, sConditionPath, sOperator, vValues);
+	}
+
+	onAfterRendering() {
+		const oControl = this.content;
+		FilterUtils.attachConditionHandling(oControl);
+	}
+
+	exit() {
+		const oControl = this.content;
+		FilterUtils.detachConditionHandling(oControl);
+	}
 }
 
 export default FilterBarAPI;

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

@@ -24,7 +24,6 @@ sap.ui.define(
 		"sap/fe/macros/ResourceModel",
 		"sap/base/util/merge",
 		"sap/fe/macros/DelegateUtil",
-		"sap/fe/macros/FilterBarHelper",
 		"sap/base/Log",
 		"sap/base/util/JSTokenizer",
 		"sap/fe/core/templating/PropertyFormatters"
@@ -44,7 +43,6 @@ sap.ui.define(
 		ResourceModel,
 		mergeObjects,
 		DelegateUtil,
-		FilterBarHelper,
 		Log,
 		JSTokenizer,
 		PropertyFormatters
@@ -276,6 +274,35 @@ sap.ui.define(
 				});
 		}
 
+		function _addXMLCustomFilterField(oFilterBar, oModifier, sPropertyPath) {
+			return Promise.resolve()
+				.then(function() {
+					var oDependentPromise = oModifier.getAggregation(oFilterBar, "dependents");
+					return oDependentPromise
+						.then(function(aDependents) {
+							var i;
+							if (aDependents && aDependents.length > 1) {
+								for (i = 0; i <= aDependents.length; i++) {
+									var oFilterField = aDependents[i];
+									if (oFilterField && oFilterField.isA("sap.ui.mdc.FilterField")) {
+										var sDataProperty = oFilterField.getFieldPath(),
+											sFilterFieldId = oFilterField.getId();
+										if (sPropertyPath === sDataProperty && sFilterFieldId.indexOf("CustomFilterField")) {
+											return Promise.resolve(oFilterField);
+										}
+									}
+								}
+							}
+						})
+						.catch(function(oError) {
+							Log.error(oError);
+						});
+				})
+				.catch(function(oError) {
+					Log.error("Filter Cannot be added", oError);
+				});
+		}
+
 		function _templateFilterField(oSettings, oParameters) {
 			var oThis = new JSONModel({
 				idPrefix: oParameters.sIdPrefix,
@@ -300,7 +327,7 @@ sap.ui.define(
 				}
 			});
 
-			return DelegateUtil.templateControlFragment("sap.fe.macros.FilterField", oPreprocessorSettings, {
+			return DelegateUtil.templateControlFragment("sap.fe.macros.internal.FilterField", oPreprocessorSettings, {
 				isXML: oSettings.isXML
 			}).finally(function() {
 				oThis.destroy();
@@ -329,12 +356,24 @@ sap.ui.define(
 			return ODataFilterBarDelegate._addFlexItem(sPropertyInfoName, oParentControl, oMetaModel, mPropertyBag.modifier);
 		};
 
+		ODataFilterBarDelegate.removeItem = function(oFilterFieldProperty, oParentControl, mPropertyBag) {
+			var doRemoveItem = true;
+			if (typeof oFilterFieldProperty !== "string" && oFilterFieldProperty.isA("sap.ui.mdc.FilterField")) {
+				if (oFilterFieldProperty.data("isSlot") === "true" && mPropertyBag) {
+					// Inserting into the modifier creates a change from flex also filter is been removed hence promise is resolved to false
+					var oModifier = mPropertyBag.modifier;
+					oModifier.insertAggregation(oParentControl, "dependents", oFilterFieldProperty);
+					doRemoveItem = false;
+				}
+			}
+			return Promise.resolve(doRemoveItem);
+		};
 		/**
-		 * Responsible to create Filter field in Table adaptation FilterBar.
+		 * Creates the filter field in the table adaptation of the FilterBar.
 		 *
-		 * @param {string} sPropertyInfoName Entity type property name for which the filter field needs to be created
+		 * @param {string} sPropertyInfoName The property name of the entity type for which the filter field needs to be created
 		 * @param {object} oParentControl Instance of the parent control
-		 * @returns {Promise} Once resolved a filter field definition is returned
+		 * @returns {Promise} Once resolved, a filter field definition is returned
 		 */
 		ODataFilterBarDelegate._addP13nItem = function(sPropertyInfoName, oParentControl) {
 			return DelegateUtil.fetchModel(oParentControl)
@@ -423,6 +462,10 @@ sap.ui.define(
 				);
 			}
 
+			if (oSelectionField.type === "Slot" && oModifier) {
+				return _addXMLCustomFilterField(oParentControl, oModifier, sPropertyPath);
+			}
+
 			var sNavigationPath = CommonHelper.getNavigationPath(sPropertyPath),
 				sAnnotationPath = oSelectionField.annotationPath,
 				sEntityTypePath,

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/fe/macros/FilterBarHelper","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,h,L,i,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}),A={bindingContexts:{"this":b.createBindingContext("/")},models:{"this.i18n":R.getModel(),"this":b}};return D.templateControlFragment("sap.fe.macros.filter.DraftEditState",A,undefined,a).finally(function(){b.destroy();});}function q(a,I,b,A,B){var G=new J({id:I}),H=new T(b,A),K={bindingContexts:{"this":G.createBindingContext("/"),"item":H.createBindingContext("/")},models:{"this":G,"item":H}};return D.templateControlFragment("sap.fe.macros.filter.CustomFilter",K,undefined,B).finally(function(){G.destroy();H.destroy();});}function r(a){return a.replace(l,"");}function s(a,b){return a.find(function(A){return A.conditionPath===b&&A.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 A=O._fetchBasicPropertyInfo(b),B=b.annotationPath;if(!B){return A;}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=i.parseJS(e.formatOptions(H,{context:U})||"{}"),X=i.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)];}A=Object.assign(A,{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 A;}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 A=new J({idPrefix:b.sVhIdPrefix,conditionModel:"$filters",navigationPrefix:b.sNavigationPrefix?"/"+b.sNavigationPrefix:"",filterFieldValueHelp:true,useSemanticDateRange:b.bUseSemanticDateRange}),B=m({},a,{bindingContexts:{"this":A.createBindingContext("/")},models:{"this":A}});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(){A.destroy();});}).catch(function(A){L.error("Error while evaluating DelegateUtil.isValueHelpRequired",A);});}function w(a,b){var A=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":A.createBindingContext("/"),"visualFilter":G.createBindingContext("/")},models:{"this":A,"visualFilter":G,"metaModel":B}});return D.templateControlFragment("sap.fe.macros.FilterField",H,{isXML:a.isXML}).finally(function(){A.destroy();});}O.addItem=function(a,b,A){if(!A){return O._addP13nItem(a,b);}var B=A.appComponent&&A.appComponent.getModel().getMetaModel();if(!B){return Promise.resolve(null);}return O._addFlexItem(a,b,B,A.modifier);};O._addP13nItem=function(a,b){return D.fetchModel(b).then(function(A){return O._addFlexItem(a,b,A.getMetaModel(),undefined);}).catch(function(A){L.error("Model could not be resolved",A);return null;});};O.fetchPropertiesForEntity=function(a,b,A){var B=b.getObject(a);if(!A||!B){return[];}var G=M.getEntitySetPath(a),H=f.getConvertedFilterFields(A,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,A);K.push(I);if(I.isParameter){N.push(a1);}}}});if(A.data("showDraftEditState")==="true"){K.push(o());}if(G&&A.data("hideBasicSearch")!=="true"){var Y=c.getSearchRestrictions(G,b);if(!Y||Y.Searchable){K.push(_());}}D.setCustomData(A,"parameters",N);return K;};O._addFlexItem=function(a,b,A,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,A,B);}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=A.createBindingContext(X+N);var G=B?B.getId(b):b.getId();Z={bindingContexts:{"contextPath":A.createBindingContext(X),"property":c1},models:{"contextPath":A,"property":A},isXML:Q};$="/"+M.getEntitySetPath(X).split("/").filter(M.filterOutNavPropBinding).join("/");a1={sPropertyName:N,sBindingPath:$,sValueHelpType:I+V,oControl:b,oMetaModel:A,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 w(Z,a1);});};function x(a){if(a instanceof window.Element){return null;}return D.getCustomData(a,k);}function y(a,b){if(a instanceof window.Element){return;}D.setCustomData(a,k,b);}function z(A,B,G){var H=x(G);var I;if(!H){H=O.fetchPropertiesForEntity(A,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);});y(G,H);}return H;}O.fetchProperties=function(a){var b=D.getCustomData(a,"entityType");return D.fetchModel(a).then(function(A){if(!A){return[];}return z(b,A.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"],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);

package/packages/sap.fe.macros/src/sap/fe/macros/FilterField-dbg.designtime.js

@@ -4,7 +4,7 @@
     
  */
 
-// Provides the Design Time Metadata for the sap.fe.macros.FilterField macro.
+// Provides the Design Time Metadata for the sap.fe.macros.internal.FilterField macro.
 sap.ui.define(
 	[],
 	function() {

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

@@ -15,7 +15,7 @@
 	}"
 >
 
-    <template:if test="{= ${facet>} &amp;&amp; !(${facet>./@com.sap.vocabularies.UI.v1.Hidden} === true)}">
+	<template:if test="{this>isVisible}">
 		<template:then>
 			<f:Form
 				unittest:id="form"
@@ -27,7 +27,7 @@
 				title="{this>formTitle}"
 				editable="{this>_editable}"
 				log:entitySet="{entitySet>@sapui.name}"
-				visible="{= ${facet>./@com.sap.vocabularies.UI.v1.Hidden/$Path} ? ('{= !${' + ${facet>./@com.sap.vocabularies.UI.v1.Hidden/$Path} + '} }') : true }"
+				visible="{this>isVisible}"
 				class="{= FORM.getMarginClass(${this>class})}"
 				macrodata:navigationPath="{= FORM.getNavigationPath(${entitySet>}) }"
 				macrodata:onChange="{= ${this>onChange}.replace('{','\\{').replace('}','\\}') }"
@@ -50,28 +50,32 @@
 							<template:repeat list="{path:'formContainers>'}" var="formContainer">
 								<template:with path="formContainer>annotationPath" var="facet">
 									<!-- Repeating  for all facets inside collection -->
-									<template:if
-										test="{= !(${facet>./@com.sap.vocabularies.UI.v1.Hidden} === true) &amp;&amp; ${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 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:with>
 							</template:repeat>
 						</template:then>
-                            <template:elseif test="{= ${facet>} &amp;&amp; ${facet>$Type} === 'com.sap.vocabularies.UI.v1.ReferenceFacet'}">
+						<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:with path="formContainer>annotationPath" var="facet">
-									<core:Fragment fragmentName="sap.fe.macros.form.DataFieldCollection" type="XML" />
-								</template:with>
+								<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>

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

@@ -45,6 +45,7 @@ sap.ui.define(
 		 *  formTitle="someTitle"
 		 *  useFormContainerLabels="true"
 		 *  partOfPreview="true"
+		 *  isVisible="true"
 		 *  onChange=".handlers.onFieldValueChange"
 		 * />
 		 * </pre>
@@ -142,6 +143,13 @@ sap.ui.define(
 					displayMode: {
 						type: "boolean"
 					},
+					/**
+					 * 	If set to false, the Form is not rendered.
+					 */
+					isVisible: {
+						type: "string",
+						defaultValue: "true"
+					},
 					/**
 					 * Control the rendering of the form container labels
 					 */

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;var d=M.extend("sap.fe.macros.Form",{name:"Form",namespace:"sap.fe.macros",fragment:"sap.fe.macros.Form",metadata:{stereotype:"xmlmacro",designtime:"sap/fe/macros/Form.designtime",properties:{entitySet:{type:"sap.ui.model.Context",required:true,$kind:["NavigationProperty","EntitySet"]},_editable:{type:"boolean",computed:true},facet:{type:"sap.ui.model.Context",$Type:["com.sap.vocabularies.UI.v1.CollectionFacet","com.sap.vocabularies.UI.v1.ReferenceFacet"]},facetSource:{type:"string"},id:{type:"string"},formTitle:{type:"string"},layoutMode:{type:"string",defaultValue:"ColumnLayout",allowedValues:["ColumnLayout","ResponsiveGridLayout"]},"class":{type:"string",defaultValue:""},displayMode:{type:"boolean"},useFormContainerLabels:{type:"string"},partOfPreview:{type:"boolean",defaultValue:true},formContainers:{type:"sap.ui.model.Context"}},events:{onChange:{type:"function"}}},create:function(p,o,s){if(p.facet&&p.entitySet&&(p.formContainers===undefined||p.formContainers===null)){var f;var m=p.entitySet.getModel();if(p.facet.getPath().indexOf("@com.sap.vocabularies.UI.v1.QuickViewFacets")>-1){var g=a.getInvolvedDataModelObjects(p.facet,p.entitySet);var h=this.getConverterContext(g,p.entitySet,s);var j=g.targetObject;f=[F.getFormContainer(j,h)];p.formContainers=new T(f,m).createBindingContext("/");}}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;}});return d;});
+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;var d=M.extend("sap.fe.macros.Form",{name:"Form",namespace:"sap.fe.macros",fragment:"sap.fe.macros.Form",metadata:{stereotype:"xmlmacro",designtime:"sap/fe/macros/Form.designtime",properties:{entitySet:{type:"sap.ui.model.Context",required:true,$kind:["NavigationProperty","EntitySet"]},_editable:{type:"boolean",computed:true},facet:{type:"sap.ui.model.Context",$Type:["com.sap.vocabularies.UI.v1.CollectionFacet","com.sap.vocabularies.UI.v1.ReferenceFacet"]},facetSource:{type:"string"},id:{type:"string"},formTitle:{type:"string"},layoutMode:{type:"string",defaultValue:"ColumnLayout",allowedValues:["ColumnLayout","ResponsiveGridLayout"]},"class":{type:"string",defaultValue:""},displayMode:{type:"boolean"},isVisible:{type:"string",defaultValue:"true"},useFormContainerLabels:{type:"string"},partOfPreview:{type:"boolean",defaultValue:true},formContainers:{type:"sap.ui.model.Context"}},events:{onChange:{type:"function"}}},create:function(p,o,s){if(p.facet&&p.entitySet&&(p.formContainers===undefined||p.formContainers===null)){var f;var m=p.entitySet.getModel();if(p.facet.getPath().indexOf("@com.sap.vocabularies.UI.v1.QuickViewFacets")>-1){var g=a.getInvolvedDataModelObjects(p.facet,p.entitySet);var h=this.getConverterContext(g,p.entitySet,s);var j=g.targetObject;f=[F.getFormContainer(j,h)];p.formContainers=new T(f,m).createBindingContext("/");}}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;}});return d;});

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

@@ -19,7 +19,7 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "sap/ui/core/Control", "sap/b
 
   function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-  function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); }
+  function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
 
   function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
@@ -29,7 +29,7 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "sap/ui/core/Control", "sap/b
 
   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; } return _assertThisInitialized(self); }
+  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; }
 

package/packages/sap.fe.macros/src/sap/fe/macros/MacroAPI.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","sap/ui/core/Control","sap/base/util/merge","sap/base/util/uid","sap/fe/macros/PhantomUtil","sap/ui/core/util/XMLPreprocessor","sap/fe/core/converters/ConverterContext"],function(C,a,m,u,P,X,b){"use strict";var _,c,d,f,g,h,j,k,l,n,q;var r=C.Property;var A=C.Aggregation;var s=C.APIClass;function t(e,p,i,o){if(!i)return;Object.defineProperty(e,p,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0});}function v(i,e){if(!(i instanceof e)){throw new TypeError("Cannot call a class as a function");}}function w(e,p){for(var i=0;i<p.length;i++){var o=p[i];o.enumerable=o.enumerable||false;o.configurable=true;if("value"in o)o.writable=true;Object.defineProperty(e,o.key,o);}}function x(e,p,i){if(p)w(e.prototype,p);if(i)w(e,i);return e;}function y(e,p,i){if(typeof Reflect!=="undefined"&&Reflect.get){y=Reflect.get;}else{y=function y(e,p,i){var o=z(e,p);if(!o)return;var N=Object.getOwnPropertyDescriptor(o,p);if(N.get){return N.get.call(i);}return N.value;};}return y(e,p,i||e);}function z(o,p){while(!Object.prototype.hasOwnProperty.call(o,p)){o=I(o);if(o===null)break;}return o;}function B(e,i){if(typeof i!=="function"&&i!==null){throw new TypeError("Super expression must either be null or a function");}e.prototype=Object.create(i&&i.prototype,{constructor:{value:e,writable:true,configurable:true}});if(i)D(e,i);}function D(o,p){D=Object.setPrototypeOf||function D(o,p){o.__proto__=p;return o;};return D(o,p);}function E(e){var i=H();return function p(){var S=I(e),o;if(i){var N=I(this).constructor;o=Reflect.construct(S,arguments,N);}else{o=S.apply(this,arguments);}return F(this,o);};}function F(e,i){if(i&&(typeof i==="object"||typeof i==="function")){return i;}return G(e);}function G(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return e;}function H(){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 I(o){I=Object.setPrototypeOf?Object.getPrototypeOf:function I(o){return o.__proto__||Object.getPrototypeOf(o);};return I(o);}function J(o,e,i){if(e in o){Object.defineProperty(o,e,{value:i,enumerable:true,configurable:true,writable:true});}else{o[e]=i;}return o;}function K(e,p,i,o,N){var O={};Object.keys(o).forEach(function(Q){O[Q]=o[Q];});O.enumerable=!!O.enumerable;O.configurable=!!O.configurable;if('value'in O||O.initializer){O.writable=true;}O=i.slice().reverse().reduce(function(O,Q){return Q(e,p,O)||O;},O);if(N&&O.initializer!==void 0){O.value=O.initializer?O.initializer.call(N):void 0;O.initializer=undefined;}if(O.initializer===void 0){Object.defineProperty(e,p,O);O=null;}return O;}function L(e,i){throw new Error('Decorating class property failed. Please ensure that '+'proposal-class-properties is enabled and runs after the decorators transform.');}var M=(_=s("sap.fe.macros.MacroAPI"),c=r({type:"string"}),d=r({type:"string"}),f=A({type:"sap.ui.core.Control",multiple:false,isDefault:true}),_(g=(h=(q=n=function(e){B(M,e);var i=E(M);function M(S){var o;v(this,M);for(var p=arguments.length,N=new Array(p>1?p-1:0),O=1;O<p;O++){N[O-1]=arguments[O];}o=i.call.apply(i,[this,S].concat(N));t(G(o),"contextPath",j,G(o));t(G(o),"metaPath",k,G(o));t(G(o),"content",l,G(o));J(G(o),"modelResolved",false);M.registerInstance(G(o));return o;}x(M,[{key:"rerender",value:function o(){this.content.rerender();}},{key:"getDomRef",value:function p(){var o=this.content;return o?o.getDomRef():y(I(M.prototype),"getDomRef",this).call(this);}},{key:"getController",value:function o(){return this.getModel("$view").getObject().getController();}},{key:"propagateProperties",value:function O(N){var o=this;y(I(M.prototype),"propagateProperties",this).call(this,N);if(this.metadata.macroContexts&&!this.modelResolved){var p=this.getModel("_pageModel");if(p){Object.keys(this.metadata.macroContexts).forEach(function(Q){o[Q]=p.getObject(o[Q]);});this.modelResolved=true;}}}}],[{key:"registerInstance",value:function p(o){if(!this.instanceMap.get(o.constructor)){this.instanceMap.set(o.constructor,[]);}this.instanceMap.get(o.constructor).push(o);}},{key:"getAPI",value:function N(o){var S=o.getSource();while(S&&!S.isA("sap.fe.macros.MacroAPI")&&S.getParent){S=S.getParent();}if(!S||!S.isA("sap.fe.macros.MacroAPI")){var p=this.instanceMap.get(this);S=p[p.length-1];}return S&&S.isA("sap.fe.macros.MacroAPI")&&S;}},{key:"setDefaultValue",value:function N(p,o,O){if(p[o]===undefined){p[o]=O;}}},{key:"register",value:function o(){P.register(this);}},{key:"unregister",value:function o(){X.plugIn(null,this.namespace,this.macroName);}}]);return M;}(a),J(n,"namespace","sap.fe.macros"),J(n,"macroName","Macro"),J(n,"fragment","sap.fe.macros.Macro"),J(n,"hasValidation",true),J(n,"instanceMap",new WeakMap()),J(n,"getConverterContext",function(o,e,S){var i=S.appComponent;var p=S.models.viewData&&S.models.viewData.getData();var N=b.createConverterContextForMacro(o.startingEntitySet.name,S.models.metaModel,i&&i.getDiagnostics(),m,o.contextLocation,p);return N;}),J(n,"createBindingContext",function(o,S){var e="/"+u();S.models.converterContext.setProperty(e,o);return S.models.converterContext.createBindingContext(e);}),q),(j=K(h.prototype,"contextPath",[c],{configurable:true,enumerable:true,writable:true,initializer:null}),k=K(h.prototype,"metaPath",[d],{configurable:true,enumerable:true,writable:true,initializer:null}),l=K(h.prototype,"content",[f],{configurable:true,enumerable:true,writable:true,initializer:null})),h))||g);return M;},false);
+sap.ui.define(["sap/fe/core/helpers/ClassSupport","sap/ui/core/Control","sap/base/util/merge","sap/base/util/uid","sap/fe/macros/PhantomUtil","sap/ui/core/util/XMLPreprocessor","sap/fe/core/converters/ConverterContext"],function(C,a,m,u,P,X,b){"use strict";var _,c,d,f,g,h,j,k,l,n,q;var r=C.Property;var A=C.Aggregation;var s=C.APIClass;function t(e,p,i,o){if(!i)return;Object.defineProperty(e,p,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0});}function v(i,e){if(!(i instanceof e)){throw new TypeError("Cannot call a class as a function");}}function w(e,p){for(var i=0;i<p.length;i++){var o=p[i];o.enumerable=o.enumerable||false;o.configurable=true;if("value"in o)o.writable=true;Object.defineProperty(e,o.key,o);}}function x(e,p,i){if(p)w(e.prototype,p);if(i)w(e,i);return e;}function y(){if(typeof Reflect!=="undefined"&&Reflect.get){y=Reflect.get;}else{y=function y(e,p,i){var o=z(e,p);if(!o)return;var N=Object.getOwnPropertyDescriptor(o,p);if(N.get){return N.get.call(arguments.length<3?e:i);}return N.value;};}return y.apply(this,arguments);}function z(o,p){while(!Object.prototype.hasOwnProperty.call(o,p)){o=I(o);if(o===null)break;}return o;}function B(e,i){if(typeof i!=="function"&&i!==null){throw new TypeError("Super expression must either be null or a function");}e.prototype=Object.create(i&&i.prototype,{constructor:{value:e,writable:true,configurable:true}});if(i)D(e,i);}function D(o,p){D=Object.setPrototypeOf||function D(o,p){o.__proto__=p;return o;};return D(o,p);}function E(e){var i=H();return function p(){var S=I(e),o;if(i){var N=I(this).constructor;o=Reflect.construct(S,arguments,N);}else{o=S.apply(this,arguments);}return F(this,o);};}function F(e,i){if(i&&(typeof i==="object"||typeof i==="function")){return i;}else if(i!==void 0){throw new TypeError("Derived constructors may only return object or undefined");}return G(e);}function G(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return e;}function H(){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 I(o){I=Object.setPrototypeOf?Object.getPrototypeOf:function I(o){return o.__proto__||Object.getPrototypeOf(o);};return I(o);}function J(o,e,i){if(e in o){Object.defineProperty(o,e,{value:i,enumerable:true,configurable:true,writable:true});}else{o[e]=i;}return o;}function K(e,p,i,o,N){var O={};Object.keys(o).forEach(function(Q){O[Q]=o[Q];});O.enumerable=!!O.enumerable;O.configurable=!!O.configurable;if('value'in O||O.initializer){O.writable=true;}O=i.slice().reverse().reduce(function(O,Q){return Q(e,p,O)||O;},O);if(N&&O.initializer!==void 0){O.value=O.initializer?O.initializer.call(N):void 0;O.initializer=undefined;}if(O.initializer===void 0){Object.defineProperty(e,p,O);O=null;}return O;}function L(e,i){throw new Error('Decorating class property failed. Please ensure that '+'proposal-class-properties is enabled and runs after the decorators transform.');}var M=(_=s("sap.fe.macros.MacroAPI"),c=r({type:"string"}),d=r({type:"string"}),f=A({type:"sap.ui.core.Control",multiple:false,isDefault:true}),_(g=(h=(q=n=function(e){B(M,e);var i=E(M);function M(S){var o;v(this,M);for(var p=arguments.length,N=new Array(p>1?p-1:0),O=1;O<p;O++){N[O-1]=arguments[O];}o=i.call.apply(i,[this,S].concat(N));t(G(o),"contextPath",j,G(o));t(G(o),"metaPath",k,G(o));t(G(o),"content",l,G(o));J(G(o),"modelResolved",false);M.registerInstance(G(o));return o;}x(M,[{key:"rerender",value:function o(){this.content.rerender();}},{key:"getDomRef",value:function p(){var o=this.content;return o?o.getDomRef():y(I(M.prototype),"getDomRef",this).call(this);}},{key:"getController",value:function o(){return this.getModel("$view").getObject().getController();}},{key:"propagateProperties",value:function O(N){var o=this;y(I(M.prototype),"propagateProperties",this).call(this,N);if(this.metadata.macroContexts&&!this.modelResolved){var p=this.getModel("_pageModel");if(p){Object.keys(this.metadata.macroContexts).forEach(function(Q){o[Q]=p.getObject(o[Q]);});this.modelResolved=true;}}}}],[{key:"registerInstance",value:function p(o){if(!this.instanceMap.get(o.constructor)){this.instanceMap.set(o.constructor,[]);}this.instanceMap.get(o.constructor).push(o);}},{key:"getAPI",value:function N(o){var S=o.getSource();while(S&&!S.isA("sap.fe.macros.MacroAPI")&&S.getParent){S=S.getParent();}if(!S||!S.isA("sap.fe.macros.MacroAPI")){var p=this.instanceMap.get(this);S=p[p.length-1];}return S&&S.isA("sap.fe.macros.MacroAPI")&&S;}},{key:"setDefaultValue",value:function N(p,o,O){if(p[o]===undefined){p[o]=O;}}},{key:"register",value:function o(){P.register(this);}},{key:"unregister",value:function o(){X.plugIn(null,this.namespace,this.macroName);}}]);return M;}(a),J(n,"namespace","sap.fe.macros"),J(n,"macroName","Macro"),J(n,"fragment","sap.fe.macros.Macro"),J(n,"hasValidation",true),J(n,"instanceMap",new WeakMap()),J(n,"getConverterContext",function(o,e,S){var i=S.appComponent;var p=S.models.viewData&&S.models.viewData.getData();var N=b.createConverterContextForMacro(o.startingEntitySet.name,S.models.metaModel,i&&i.getDiagnostics(),m,o.contextLocation,p);return N;}),J(n,"createBindingContext",function(o,S){var e="/"+u();S.models.converterContext.setProperty(e,o);return S.models.converterContext.createBindingContext(e);}),q),(j=K(h.prototype,"contextPath",[c],{configurable:true,enumerable:true,writable:true,initializer:null}),k=K(h.prototype,"metaPath",[d],{configurable:true,enumerable:true,writable:true,initializer:null}),l=K(h.prototype,"content",[f],{configurable:true,enumerable:true,writable:true,initializer:null})),h))||g);return M;},false);

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

@@ -23,8 +23,8 @@ sap.ui.define(["sap/fe/core/converters/ConverterContext", "sap/base/util/merge",
 		}
 		return oProps;
 	};
-	var fnSetDefaultValue = function(oProps, sPropName, oOverrideValue) {
-		if (oProps[sPropName] === undefined) {
+	var fnSetDefaultValue = function(oProps, sPropName, oOverrideValue, bForceUpdate) {
+		if (oProps[sPropName] === undefined || bForceUpdate) {
 			oProps[sPropName] = oOverrideValue;
 		}
 	};

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/core/converters/ConverterContext","sap/base/util/merge","sap/base/util/uid","sap/base/util/deepClone"],function(C,m,u,d){"use strict";var g=function(c,i){var p={};if(c){var o=c[i];if(o){Object.keys(o).forEach(function(a){p[a]=o[a];});}}return p;};var s=function(p,P,o){if(p[P]===undefined){p[P]=o;}};var M={metadata:{properties:{_flexId:{type:"string"}}},extend:function(n,c){c.metadata.properties._flexId=M.metadata.properties._flexId;c.hasValidation=true;c.getOverrides=g.bind(c);c.setDefaultValue=s.bind(c);c.getConverterContext=function(v,a,S,e){var A=S.appComponent;var o=S.models.viewData&&S.models.viewData.getData();var b=Object.assign({},o);delete b.resourceBundle;b=d(b);b.controlConfiguration=m(b.controlConfiguration,e);var f=C.createConverterContextForMacro(v.startingEntitySet.name,S.models.metaModel,A&&A.getDiagnostics(),m,v.contextLocation,b);return f;};c.createBindingContext=function(D,S){var a="/"+u();S.models.converterContext.setProperty(a,D);return S.models.converterContext.createBindingContext(a);};c.parseAggregation=function(a,f){var o={};if(a&&a.children.length>0){var b=a.children;for(var e=0;e<b.length;e++){var h=f(b[e],e);if(h){o[h.key]=h;}}}return o;};return c;}};return M;});
+sap.ui.define(["sap/fe/core/converters/ConverterContext","sap/base/util/merge","sap/base/util/uid","sap/base/util/deepClone"],function(C,m,u,d){"use strict";var g=function(c,i){var p={};if(c){var o=c[i];if(o){Object.keys(o).forEach(function(a){p[a]=o[a];});}}return p;};var s=function(p,P,o,f){if(p[P]===undefined||f){p[P]=o;}};var M={metadata:{properties:{_flexId:{type:"string"}}},extend:function(n,c){c.metadata.properties._flexId=M.metadata.properties._flexId;c.hasValidation=true;c.getOverrides=g.bind(c);c.setDefaultValue=s.bind(c);c.getConverterContext=function(v,a,S,e){var A=S.appComponent;var o=S.models.viewData&&S.models.viewData.getData();var b=Object.assign({},o);delete b.resourceBundle;b=d(b);b.controlConfiguration=m(b.controlConfiguration,e);var f=C.createConverterContextForMacro(v.startingEntitySet.name,S.models.metaModel,A&&A.getDiagnostics(),m,v.contextLocation,b);return f;};c.createBindingContext=function(D,S){var a="/"+u();S.models.converterContext.setProperty(a,D);return S.models.converterContext.createBindingContext(a);};c.parseAggregation=function(a,f){var o={};if(a&&a.children.length>0){var b=a.children;for(var e=0;e<b.length;e++){var h=f(b[e],e);if(h){o[h.key]=h;}}}return o;};return c;}};return M;});

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

@@ -519,9 +519,14 @@ sap.ui.define(
 					var oPromise;
 					if (oMacroDefinition.getTemplate) {
 						var oTemplate = oMacroDefinition.getTemplate(oAttributesModel.oProps);
-						oNode.replaceWith(oTemplate.firstElementChild);
-						oNode = oParent.children[iChildIndex];
-						oPromise = oContextVisitor.visitNode(oNode);
+						if (oTemplate) {
+							oNode.replaceWith(oTemplate.firstElementChild);
+							oNode = oParent.children[iChildIndex];
+							oPromise = oContextVisitor.visitNode(oNode);
+						} else {
+							oNode.remove();
+							oPromise = Promise.resolve();
+						}
 					} else {
 						oPromise = oContextVisitor.insertFragment(sFragmentName, oNode);
 					}

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/model/json/JSONModel","sap/base/Log","sap/ui/base/ManagedObject","sap/fe/macros/ResourceModel","sap/ui/core/util/XMLPreprocessor","sap/ui/base/SyncPromise","./TraceInfo","sap/base/util/ObjectPath"],function(J,L,M,R,X,S,T,O){"use strict";var p="sap.fe.macros.PhantomUtil",I=R.getModel();I.bindContext=I.bindContext||function(){return{initialize:function(){},attachChange:function(){},detachChange:function(){},attachEvents:function(){},detachEvents:function(){},updateRequired:function(){},destroy:function(){},getContext:function(){}};};function v(n,C,o,k){var a,b;if(!C[k]){if(o.required){throw new Error(n+": "+"Required metadataContext '"+k+"' is missing");}}else{a=C[k];b=a.getObject();if(b){var i=Object.assign({},o);delete i.required;delete i.computed;delete i.isPublic;delete i.type;if(b.hasOwnProperty("$kind")){delete i.$Type;}else{delete i.$kind;}Object.keys(i).forEach(function(P){var j=Array.isArray(i[P])?i[P]:[i[P]],V;if(typeof b==="object"){V=b[P];if(!V){if(b.hasOwnProperty("$Path")){V=a.getObject("$Path/"+P);}}}else if(typeof b==="string"){V=a.getObject(P);if(!V){V=j[0];}}else{V=null;}if(j.indexOf(V)===-1){throw new Error(n+": '"+k+"' must be '"+P+"' '"+j+"' but is '"+V+"': "+a.getPath());}});}}}function c(n,m,C,N){var a=(m.metadataContexts&&Object.keys(m.metadataContexts))||[],P=(m.properties&&Object.keys(m.properties))||[],A={};Object.keys(N.attributes).forEach(function(k){var K=N.attributes[k].name;if(K!=="metadataContexts"){A[K]=true;}});Object.keys(C).forEach(function(k){if(k!=="this"&&k!=="this.i18n"){A[k]=true;}});a.forEach(function(k){var o=m.metadataContexts[k];v(n,C,o,k);delete A[k];});P.forEach(function(k){var o=m.properties[k];if(!N.hasAttribute(k)){if(o.required&&!o.hasOwnProperty("defaultValue")){throw new Error(n+": "+"Required property '"+k+"' is missing");}}else{delete A[k];}});Object.keys(A).forEach(function(k){if(k.charAt(0)!=="_"&&k.indexOf(":")<0){L.warning("Unchecked parameter: "+n+": "+k,null,p);}});}function d(m,i){if(m){var P={};var a={"dependents":{type:"sap.ui.core.Element"},"customData":{type:"sap.ui.core.Element"}};var o=m.metadataContexts||{};Object.keys(m.properties).forEach(function(s){if(m.properties[s].type!=="sap.ui.model.Context"){P[s]=m.properties[s];}else{o[s]=m.properties[s];}});if(m.events){Object.keys(m.events).forEach(function(E){P[E]=m.events[E];});}if(m.aggregations){Object.keys(m.aggregations).forEach(function(s){a[s]=m.aggregations[s];});}return{properties:P,aggregations:a,metadataContexts:o};}else{return{metadataContexts:{},aggregations:{"dependents":{type:"sap.ui.core.Element"},"customData":{type:"sap.ui.core.Element"}},properties:{},events:{}};}}function w(k){return function(V){var o={};o[k]=V;return o;};}function g(n,k,D){return function(){var V=n.getAttribute(k);if(!V&&D.defaultValue){V=D.defaultValue;}return w(k)(V);};}function _(s,n,a,V,D){var m;if(!D&&n.hasAttribute(a)){var A=n.getAttribute(a),b;V.getResult(A,n);m=M.bindingParser(A);if(!m){if(a==="metaPath"&&s.currentContextPath){if(A.startsWith("/")){b=A;}else{var C=s.currentContextPath.getPath();if(!C.endsWith("/")){C+="/";}b=C+A;}m={model:"contextPath",path:b};}else if(a==="contextPath"){if(A.startsWith("/")){b=A;}else{var C=s.currentContextPath.getPath();if(!C.endsWith("/")){C+="/";}b=C+A;}m={model:"contextPath",path:b};}else{m={model:"metaModel",path:s.bindingContexts.entitySet?s.bindingContexts.entitySet.getPath(A):A};}}}else if(s.bindingContexts.hasOwnProperty(a)){m={model:a,path:""};}return m;}function e(m,n,V){return r(m,n,V,true);}function r(m,n,V,k){var F=m.fragment||m.namespace+"."+m.name,N="this",s=N+".i18n",C={},A=new J(n),l=n.getAttribute("metadataContexts"),o={},q=V.getSettings(),j;var t=d(m.metadata,k);A._getObject=function(a,b){if((a===undefined||a==="")&&this.oProps){return this.oProps;}var i=O.get(a.replace(/\//g,"."),this.oProps);if(i!==undefined){return i;}if(this.oProps&&this.oProps.hasOwnProperty(a)){return this.oProps[a];}if(a.indexOf(":")===-1&&a.indexOf("/")===-1){L.error("Missing property "+a+" on macro metadata "+m.name);}return n.getAttribute(a);};A.getContextName=function(){return N;};A.$$valueAsPromise=true;C[s]=I.getContext("/");if(!q[F]){q[F]={};}var u=null;var x=true;var y={};if(m.hasValidation){var D=t.properties;var z=t.metadataContexts;q.currentContextPath=q.bindingContexts.contextPath;var B=Object.keys(D);var E=Object.keys(z);var G=[];for(j=0;j<B.length;j++){var K=B[j];if(k&&!D[K].isPublic&&n.hasAttribute(K)){L.error("Property "+K+" was ignored as it is not intended for public usage");var H={};H[K]=D[K].defaultValue;G.push(Promise.resolve(H));}else if(n.hasAttribute(K)){G.push(V.visitAttribute(n,n.attributes[K]).then(g(n,K,D[K])));}else{var H={};H[K]=D[K].defaultValue;G.push(Promise.resolve(H));}}x=false;E=E.sort(function(a,b){return a>b?1:-1;});for(j=0;j<E.length;j++){var P=E[j];var Q=k&&!z[P].isPublic&&n.hasAttribute(P);var U=_(q,n,P,V,Q);if(U){U.name=P;f(C,V,U,o);if((P==="entitySet"&&!q.bindingContexts.hasOwnProperty(P))||(P==="contextPath"&&!q.bindingContexts.hasOwnProperty(P))){q.bindingContexts[P]=C[P];}if(P==="contextPath"){q.currentContextPath=C[P];}G.push(Promise.resolve(w(P)(C[P])));}else{y[P]=true;x=true;}}if(n.firstElementChild!==null){G.push(V.visitChildNodes(n));}u=S.all(G);}else{u=V.visitAttributes(n);}var W={};return u.then(function(a){if(a!=null){var b=a.reduce(function(c1,d1){return Object.assign(c1,d1);},{});Object.keys(t.properties).forEach(function(Z){if(t.properties[Z].type==="object"&&(!b.hasOwnProperty(Z)||b[Z]===undefined)){b[Z]={};}});var Y=n.firstElementChild;while(Y!==null){var Z=Y.localName;if(Object.keys(t.aggregations).indexOf(Z)!==-1&&(!k||t.aggregations[Z].isPublic)){W[Y.localName]=Y;}else if(Object.keys(t.properties).indexOf(Z)!==-1){b[Z]={};for(var i=0;i<Object.keys(Y.attributes).length;i++){var $=Object.keys(Y.attributes)[i];b[Z][Y.attributes[$].localName]=Y.attributes[$].value;}}Y=Y.nextElementSibling;}var a1=m.prepareMacroParameters||m.create;if(a1){var b1={};if(q.models["sap.fe.i18n"]){q.models["sap.fe.i18n"].getResourceBundle().then(function(c1){R.setApplicationI18nBundle(c1);}).catch(function(c1){L.error(c1);});}if(q.models.viewData){b1=q.models.viewData.getProperty("/controlConfiguration");}b=a1.call(m,b,b1,q,W);Object.keys(t.metadataContexts).forEach(function(c1){if(t.metadataContexts[c1].computed){C[c1]=b[c1];}});Object.keys(y).forEach(function(c1){if(b.hasOwnProperty(c1)){C[c1]=b[c1];}});}A.oProps=b;}if(x&&l){o=l?M.bindingParser(l):{parts:[]};if(!o.parts){o={parts:[o]};}for(j=0;j<o.parts.length;j++){f(C,V,o.parts[j],o);V=V["with"](C,false);}}}).then(function(){var a;C[N]=A.getContext("/");if(T.isTraceInfoActive()){var b=T.traceMacroCalls(F,t,C,n,V);if(b){a=q["_macroInfo"];q["_macroInfo"]=b.macroInfo;}}c(F,t,C,n);var i=V["with"](C,true);var Y=n.parentNode;var Z;for(Z=0;Z<Y.children.length;++Z){if(Y.children[Z]===n){break;}}var $;if(m.getTemplate){var a1=m.getTemplate(A.oProps);n.replaceWith(a1.firstElementChild);n=Y.children[Z];$=i.visitNode(n);}else{$=i.insertFragment(F,n);}return $.then(function(){var b1=Y.children[Z];if(Object.keys(W).length>0){Object.keys(W).forEach(function(d1){var e1=W[d1];if(b1!==null&&b1!==undefined){var f1=document.createElementNS(b1.namespaceURI,d1);var g1=e1.firstElementChild;while(g1){var h1=g1.nextElementSibling;f1.appendChild(g1);g1=h1;}if(d1!=="customData"&&d1!=="dependents"){var i1=(t.aggregations[d1]&&t.aggregations[d1].slot)||d1;var j1=b1.querySelector("slot[name='"+i1+"']");if(j1){j1.replaceWith.apply(j1,f1.children);}}else{b1.appendChild(f1);}}});}if(b1){var c1=b1.querySelectorAll("slot");c1.forEach(function(d1){d1.remove();});}if(a){q["_macroInfo"]=a;}else{delete q["_macroInfo"];}});});}function f(C,V,o,m){var k=o.name||o.model||undefined;if(m[k]){return;}try{var s=o.path;if(o.model!=null){s=o.model+">"+s;}C[k]=V.getContext(s);var a=V.getSettings();if(a&&a.bindingContexts&&a.bindingContexts.entitySet){C[k].$$configModelContext=V.getSettings().bindingContexts.entitySet.$$configModelContext;}m[k]=C[k];}catch(b){}}function h(m){X.plugIn(r.bind(this,m),m.namespace,m.name);if(m.publicName){X.plugIn(e.bind(this,m),m.publicNamespace,m.publicName);}}h._validateMacroSignature=c;return{register:h};});
+sap.ui.define(["sap/ui/model/json/JSONModel","sap/base/Log","sap/ui/base/ManagedObject","sap/fe/macros/ResourceModel","sap/ui/core/util/XMLPreprocessor","sap/ui/base/SyncPromise","./TraceInfo","sap/base/util/ObjectPath"],function(J,L,M,R,X,S,T,O){"use strict";var p="sap.fe.macros.PhantomUtil",I=R.getModel();I.bindContext=I.bindContext||function(){return{initialize:function(){},attachChange:function(){},detachChange:function(){},attachEvents:function(){},detachEvents:function(){},updateRequired:function(){},destroy:function(){},getContext:function(){}};};function v(n,C,o,k){var a,b;if(!C[k]){if(o.required){throw new Error(n+": "+"Required metadataContext '"+k+"' is missing");}}else{a=C[k];b=a.getObject();if(b){var i=Object.assign({},o);delete i.required;delete i.computed;delete i.isPublic;delete i.type;if(b.hasOwnProperty("$kind")){delete i.$Type;}else{delete i.$kind;}Object.keys(i).forEach(function(P){var j=Array.isArray(i[P])?i[P]:[i[P]],V;if(typeof b==="object"){V=b[P];if(!V){if(b.hasOwnProperty("$Path")){V=a.getObject("$Path/"+P);}}}else if(typeof b==="string"){V=a.getObject(P);if(!V){V=j[0];}}else{V=null;}if(j.indexOf(V)===-1){throw new Error(n+": '"+k+"' must be '"+P+"' '"+j+"' but is '"+V+"': "+a.getPath());}});}}}function c(n,m,C,N){var a=(m.metadataContexts&&Object.keys(m.metadataContexts))||[],P=(m.properties&&Object.keys(m.properties))||[],A={};Object.keys(N.attributes).forEach(function(k){var K=N.attributes[k].name;if(K!=="metadataContexts"){A[K]=true;}});Object.keys(C).forEach(function(k){if(k!=="this"&&k!=="this.i18n"){A[k]=true;}});a.forEach(function(k){var o=m.metadataContexts[k];v(n,C,o,k);delete A[k];});P.forEach(function(k){var o=m.properties[k];if(!N.hasAttribute(k)){if(o.required&&!o.hasOwnProperty("defaultValue")){throw new Error(n+": "+"Required property '"+k+"' is missing");}}else{delete A[k];}});Object.keys(A).forEach(function(k){if(k.charAt(0)!=="_"&&k.indexOf(":")<0){L.warning("Unchecked parameter: "+n+": "+k,null,p);}});}function d(m,i){if(m){var P={};var a={"dependents":{type:"sap.ui.core.Element"},"customData":{type:"sap.ui.core.Element"}};var o=m.metadataContexts||{};Object.keys(m.properties).forEach(function(s){if(m.properties[s].type!=="sap.ui.model.Context"){P[s]=m.properties[s];}else{o[s]=m.properties[s];}});if(m.events){Object.keys(m.events).forEach(function(E){P[E]=m.events[E];});}if(m.aggregations){Object.keys(m.aggregations).forEach(function(s){a[s]=m.aggregations[s];});}return{properties:P,aggregations:a,metadataContexts:o};}else{return{metadataContexts:{},aggregations:{"dependents":{type:"sap.ui.core.Element"},"customData":{type:"sap.ui.core.Element"}},properties:{},events:{}};}}function w(k){return function(V){var o={};o[k]=V;return o;};}function g(n,k,D){return function(){var V=n.getAttribute(k);if(!V&&D.defaultValue){V=D.defaultValue;}return w(k)(V);};}function _(s,n,a,V,D){var m;if(!D&&n.hasAttribute(a)){var A=n.getAttribute(a),b;V.getResult(A,n);m=M.bindingParser(A);if(!m){if(a==="metaPath"&&s.currentContextPath){if(A.startsWith("/")){b=A;}else{var C=s.currentContextPath.getPath();if(!C.endsWith("/")){C+="/";}b=C+A;}m={model:"contextPath",path:b};}else if(a==="contextPath"){if(A.startsWith("/")){b=A;}else{var C=s.currentContextPath.getPath();if(!C.endsWith("/")){C+="/";}b=C+A;}m={model:"contextPath",path:b};}else{m={model:"metaModel",path:s.bindingContexts.entitySet?s.bindingContexts.entitySet.getPath(A):A};}}}else if(s.bindingContexts.hasOwnProperty(a)){m={model:a,path:""};}return m;}function e(m,n,V){return r(m,n,V,true);}function r(m,n,V,k){var F=m.fragment||m.namespace+"."+m.name,N="this",s=N+".i18n",C={},A=new J(n),l=n.getAttribute("metadataContexts"),o={},q=V.getSettings(),j;var t=d(m.metadata,k);A._getObject=function(a,b){if((a===undefined||a==="")&&this.oProps){return this.oProps;}var i=O.get(a.replace(/\//g,"."),this.oProps);if(i!==undefined){return i;}if(this.oProps&&this.oProps.hasOwnProperty(a)){return this.oProps[a];}if(a.indexOf(":")===-1&&a.indexOf("/")===-1){L.error("Missing property "+a+" on macro metadata "+m.name);}return n.getAttribute(a);};A.getContextName=function(){return N;};A.$$valueAsPromise=true;C[s]=I.getContext("/");if(!q[F]){q[F]={};}var u=null;var x=true;var y={};if(m.hasValidation){var D=t.properties;var z=t.metadataContexts;q.currentContextPath=q.bindingContexts.contextPath;var B=Object.keys(D);var E=Object.keys(z);var G=[];for(j=0;j<B.length;j++){var K=B[j];if(k&&!D[K].isPublic&&n.hasAttribute(K)){L.error("Property "+K+" was ignored as it is not intended for public usage");var H={};H[K]=D[K].defaultValue;G.push(Promise.resolve(H));}else if(n.hasAttribute(K)){G.push(V.visitAttribute(n,n.attributes[K]).then(g(n,K,D[K])));}else{var H={};H[K]=D[K].defaultValue;G.push(Promise.resolve(H));}}x=false;E=E.sort(function(a,b){return a>b?1:-1;});for(j=0;j<E.length;j++){var P=E[j];var Q=k&&!z[P].isPublic&&n.hasAttribute(P);var U=_(q,n,P,V,Q);if(U){U.name=P;f(C,V,U,o);if((P==="entitySet"&&!q.bindingContexts.hasOwnProperty(P))||(P==="contextPath"&&!q.bindingContexts.hasOwnProperty(P))){q.bindingContexts[P]=C[P];}if(P==="contextPath"){q.currentContextPath=C[P];}G.push(Promise.resolve(w(P)(C[P])));}else{y[P]=true;x=true;}}if(n.firstElementChild!==null){G.push(V.visitChildNodes(n));}u=S.all(G);}else{u=V.visitAttributes(n);}var W={};return u.then(function(a){if(a!=null){var b=a.reduce(function(c1,d1){return Object.assign(c1,d1);},{});Object.keys(t.properties).forEach(function(Z){if(t.properties[Z].type==="object"&&(!b.hasOwnProperty(Z)||b[Z]===undefined)){b[Z]={};}});var Y=n.firstElementChild;while(Y!==null){var Z=Y.localName;if(Object.keys(t.aggregations).indexOf(Z)!==-1&&(!k||t.aggregations[Z].isPublic)){W[Y.localName]=Y;}else if(Object.keys(t.properties).indexOf(Z)!==-1){b[Z]={};for(var i=0;i<Object.keys(Y.attributes).length;i++){var $=Object.keys(Y.attributes)[i];b[Z][Y.attributes[$].localName]=Y.attributes[$].value;}}Y=Y.nextElementSibling;}var a1=m.prepareMacroParameters||m.create;if(a1){var b1={};if(q.models["sap.fe.i18n"]){q.models["sap.fe.i18n"].getResourceBundle().then(function(c1){R.setApplicationI18nBundle(c1);}).catch(function(c1){L.error(c1);});}if(q.models.viewData){b1=q.models.viewData.getProperty("/controlConfiguration");}b=a1.call(m,b,b1,q,W);Object.keys(t.metadataContexts).forEach(function(c1){if(t.metadataContexts[c1].computed){C[c1]=b[c1];}});Object.keys(y).forEach(function(c1){if(b.hasOwnProperty(c1)){C[c1]=b[c1];}});}A.oProps=b;}if(x&&l){o=l?M.bindingParser(l):{parts:[]};if(!o.parts){o={parts:[o]};}for(j=0;j<o.parts.length;j++){f(C,V,o.parts[j],o);V=V["with"](C,false);}}}).then(function(){var a;C[N]=A.getContext("/");if(T.isTraceInfoActive()){var b=T.traceMacroCalls(F,t,C,n,V);if(b){a=q["_macroInfo"];q["_macroInfo"]=b.macroInfo;}}c(F,t,C,n);var i=V["with"](C,true);var Y=n.parentNode;var Z;for(Z=0;Z<Y.children.length;++Z){if(Y.children[Z]===n){break;}}var $;if(m.getTemplate){var a1=m.getTemplate(A.oProps);if(a1){n.replaceWith(a1.firstElementChild);n=Y.children[Z];$=i.visitNode(n);}else{n.remove();$=Promise.resolve();}}else{$=i.insertFragment(F,n);}return $.then(function(){var b1=Y.children[Z];if(Object.keys(W).length>0){Object.keys(W).forEach(function(d1){var e1=W[d1];if(b1!==null&&b1!==undefined){var f1=document.createElementNS(b1.namespaceURI,d1);var g1=e1.firstElementChild;while(g1){var h1=g1.nextElementSibling;f1.appendChild(g1);g1=h1;}if(d1!=="customData"&&d1!=="dependents"){var i1=(t.aggregations[d1]&&t.aggregations[d1].slot)||d1;var j1=b1.querySelector("slot[name='"+i1+"']");if(j1){j1.replaceWith.apply(j1,f1.children);}}else{b1.appendChild(f1);}}});}if(b1){var c1=b1.querySelectorAll("slot");c1.forEach(function(d1){d1.remove();});}if(a){q["_macroInfo"]=a;}else{delete q["_macroInfo"];}});});}function f(C,V,o,m){var k=o.name||o.model||undefined;if(m[k]){return;}try{var s=o.path;if(o.model!=null){s=o.model+">"+s;}C[k]=V.getContext(s);var a=V.getSettings();if(a&&a.bindingContexts&&a.bindingContexts.entitySet){C[k].$$configModelContext=V.getSettings().bindingContexts.entitySet.$$configModelContext;}m[k]=C[k];}catch(b){}}function h(m){X.plugIn(r.bind(this,m),m.namespace,m.name);if(m.publicName){X.plugIn(e.bind(this,m),m.publicNamespace,m.publicName);}}h._validateMacroSignature=c;return{register:h};});

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

@@ -68,7 +68,8 @@ sap.ui.define(["./MacroMetadata"], function(MacroMetadata) {
 					$Type: [
 						"com.sap.vocabularies.UI.v1.DataField",
 						"com.sap.vocabularies.UI.v1.DataFieldWithUrl",
-						"com.sap.vocabularies.UI.v1.DataFieldForAnnotation"
+						"com.sap.vocabularies.UI.v1.DataFieldForAnnotation",
+						"com.sap.vocabularies.UI.v1.DataPointType"
 					]
 				},
 				semanticObject: {

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./MacroMetadata"],function(M){"use strict";var Q=M.extend("sap.fe.macros.QuickViewForm",{name:"QuickViewForm",namespace:"sap.fe.macros",fragment:"sap.fe.macros.QuickViewForm",metadata:{stereotype:"xmlmacro",designtime:"sap/fe/macros/QuickViewForm.designtime",properties:{entityType:{type:"sap.ui.model.Context"},dataField:{type:"sap.ui.model.Context",required:true,$kind:"Property",$Type:["com.sap.vocabularies.UI.v1.DataField","com.sap.vocabularies.UI.v1.DataFieldWithUrl","com.sap.vocabularies.UI.v1.DataFieldForAnnotation"]},semanticObject:{type:"string"}},events:{}}});return Q;});
+sap.ui.define(["./MacroMetadata"],function(M){"use strict";var Q=M.extend("sap.fe.macros.QuickViewForm",{name:"QuickViewForm",namespace:"sap.fe.macros",fragment:"sap.fe.macros.QuickViewForm",metadata:{stereotype:"xmlmacro",designtime:"sap/fe/macros/QuickViewForm.designtime",properties:{entityType:{type:"sap.ui.model.Context"},dataField:{type:"sap.ui.model.Context",required:true,$kind:"Property",$Type:["com.sap.vocabularies.UI.v1.DataField","com.sap.vocabularies.UI.v1.DataFieldWithUrl","com.sap.vocabularies.UI.v1.DataFieldForAnnotation","com.sap.vocabularies.UI.v1.DataPointType"]},semanticObject:{type:"string"}},events:{}}});return Q;});

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

@@ -71,18 +71,21 @@ sap.ui.define(["./MacroMetadata"], function(MacroMetadata) {
 					type: "boolean",
 					defaultValue: true,
 					isPublic: true
-				},
-				/**
-				 * Whether the share shortcut exists or not.
-				 */
-				shortCutExists: {
-					type: "boolean",
-					defaultValue: false,
-					isPublic: false
 				}
 			},
 
 			events: {}
+		},
+		create: function(oProps, oControlConfiguration, mSettings) {
+			if (mSettings.models.viewData) {
+				var oViewData = mSettings.models.viewData.getData();
+				if (oViewData.converterType && (oViewData.converterType === "ListReport" || oViewData.converterType === "ObjectPage")) {
+					oProps.shortCutExists = true;
+				} else {
+					oProps.shortCutExists = false;
+				}
+			}
+			return oProps;
 		}
 	});
 

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["./MacroMetadata"],function(M){"use strict";var S=M.extend("sap.fe.macros.Share",{name:"Share",namespace:"sap.fe.macros.internal",publicNamespace:"sap.fe.macros",publicName:"Share",fragment:"sap.fe.macros.Share",metadata:{stereotype:"xmlmacro",properties:{id:{type:"string",required:true,isPublic:true},visible:{type:"boolean",defaultValue:true,isPublic:true},shortCutExists:{type:"boolean",defaultValue:false,isPublic:false}},events:{}}});return S;});
+sap.ui.define(["./MacroMetadata"],function(M){"use strict";var S=M.extend("sap.fe.macros.Share",{name:"Share",namespace:"sap.fe.macros.internal",publicNamespace:"sap.fe.macros",publicName:"Share",fragment:"sap.fe.macros.Share",metadata:{stereotype:"xmlmacro",properties:{id:{type:"string",required:true,isPublic:true},visible:{type:"boolean",defaultValue:true,isPublic:true}},events:{}},create:function(p,c,s){if(s.models.viewData){var v=s.models.viewData.getData();if(v.converterType&&(v.converterType==="ListReport"||v.converterType==="ObjectPage")){p.shortCutExists=true;}else{p.shortCutExists=false;}}return p;}});return S;});