@sap/open.fe 1.98.0 → 1.99.0

package/packages/sap.fe.macros/src/sap/fe/macros/visualfilters/InteractiveChartHelper-dbg.js

@@ -107,8 +107,7 @@ sap.ui.define(
 					sUOMExpression,
 					sTextAssociationExpression,
 					filterConditions,
-					sBindingPath,
-					entityTypeProperties;
+					sBindingPath;
 				var sCollectionName =
 					oCollection.$kind == "NavigationProperty"
 						? oInterface.getPath(1)
@@ -122,12 +121,12 @@ sap.ui.define(
 					bCustomAggregate,
 					oAggregation
 				);
-				var entitySetPath = oInterface.getInterface(1).getPath(),
+				var sEntitySetPath = oInterface.getInterface(1).getPath(),
 					oMetaModel = oInterface.getInterface(1).getModel();
 				if (selectionVariantAnnotation && selectionVariantAnnotation.getObject()) {
-					var entityTypeProperties = oMetaModel.getObject(entitySetPath + "/");
 					filterConditions = FilterHelper.getFiltersConditionsFromSelectionVariant(
-						entityTypeProperties,
+						sEntitySetPath,
+						oMetaModel,
 						selectionVariantAnnotation.getObject(),
 						VisualFilterUtils.getCustomConditions.bind(VisualFilterUtils)
 					);
@@ -144,10 +143,10 @@ sap.ui.define(
 					var aParams = [];
 					var convertedFilterConditions = VisualFilterUtils.convertFilterCondions(filterConditions);
 					var parameterProperties = CommonUtils.getParameterInfo(oMetaModel, sCollectionName).parameterProperties;
-					for (var i = 0; i < aParameters.length; i++) {
-						var oProperty = parameterProperties[aParameters[i]];
-						var sEntityPath = entitySetPath.split("/")[1];
-						var oPropertyContext = oMetaModel.createBindingContext("/" + sEntityPath + "/" + aParameters[i]);
+					for (var parameter in aParameters) {
+						var oProperty = parameterProperties[parameter];
+						var sEntityPath = sEntitySetPath.split("/")[1];
+						var oPropertyContext = oMetaModel.createBindingContext("/" + sEntityPath + "/" + parameter);
 						var oFormatOptions = JSTokenizer.parseJS(
 							FilterFieldHelper.formatOptions(oProperty, { context: oPropertyContext }) || "{}"
 						);
@@ -155,14 +154,14 @@ sap.ui.define(
 							FilterFieldHelper.constraints(oProperty, { context: oPropertyContext }) || "{}"
 						);
 						var typeConfig = TypeUtil.getTypeConfig(oProperty.$Type, oFormatOptions, oConstraints);
-						var oCondition = convertedFilterConditions[aParameters[i]];
+						var oCondition = convertedFilterConditions[parameter];
 						var oConditionInternal = oCondition ? oCondition[0] : undefined;
 						if (oConditionInternal) {
 							var mInternalParameterCondition = ConditionConverter.toType(oConditionInternal, typeConfig, TypeUtil);
 							var sEdmType = typeConfig.className;
 							var sValue = encodeURIComponent(ODataUtils.formatLiteral(mInternalParameterCondition.values[0], sEdmType));
 							sValue = sValue.replaceAll("'", "\\'");
-							aParams.push(aParameters[i] + "=" + sValue);
+							aParams.push(parameter + "=" + sValue);
 						}
 					}
 
@@ -336,9 +335,7 @@ sap.ui.define(
 				var sExpression;
 				vUOM = vUOM && (vUOM.$Path ? "${internal>uom/" + sInfoPath + "}" : "'" + vUOM + "'");
 				sScale = sScale ? "'" + sScale + "'" : "${internal>scalefactor/" + sInfoPath + "}";
-				if (sSeperator) {
-					sSeperator = sSeperator;
-				} else {
+				if (!sSeperator) {
 					sSeperator = "|";
 				}
 				sSeperator = vUOM ? "' " + sSeperator + " ' + " : "";
@@ -391,6 +388,7 @@ sap.ui.define(
 					bCustomAggregate,
 					oAggregation
 				);
+				sMeasureDimensionToolTip = CommonHelper.escapeSingleQuotes(sMeasureDimensionToolTip);
 				if (bRenderLineChart === "false" && sChartType === "com.sap.vocabularies.UI.v1.ChartType/Line") {
 					return "{= '" + sMeasureDimensionToolTip + "'}";
 				}

package/packages/sap.fe.macros/src/sap/fe/macros/visualfilters/InteractiveChartHelper.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/base/Log","sap/ui/model/odata/v4/AnnotationHelper","sap/fe/macros/CommonHelper","sap/ui/core/format/NumberFormat","sap/fe/macros/ResourceModel","sap/fe/macros/ODataMetaModelUtil","sap/fe/core/templating/FilterHelper","sap/fe/core/templating/CriticalityFormatters","sap/fe/macros/field/FieldTemplating","sap/fe/core/controls/filterbar/utils/VisualFilterUtils","sap/fe/core/helpers/StableIdHelper","sap/ui/mdc/odata/v4/TypeUtil","sap/fe/macros/filter/FilterFieldHelper","sap/ui/model/odata/v4/ODataUtils","sap/base/util/JSTokenizer","sap/ui/mdc/condition/ConditionConverter","sap/fe/core/CommonUtils"],function(L,O,C,N,R,a,F,b,c,V,S,T,d,e,J,f,g){"use strict";var I={getChartDisplayedValue:function(v,o,m){var i=S.generate([m]);return("{parts:[{path:'"+v+"',type:'sap.ui.model.odata.type.Decimal', constraints:{'nullable':false}}"+(o&&o.ScaleFactor?",{value:'"+o.ScaleFactor.$Decimal+"'}":",{path:'internal>scalefactorNumber/"+i+"'}")+(o&&o.NumberOfFractionalDigits?",{value:'"+o.NumberOfFractionalDigits+"'}":",{value:'0'}")+",{path:'internal>currency/"+i+"'}"+"], formatter:'VisualFilterRuntime.scaleVisualFilterValue'}");},getChartValue:function(v){return"{path:'"+v+"',type:'sap.ui.model.odata.type.Decimal', constraints:{'nullable':false}}";},getChart:function(m){var M=m.getModel();var p=M.getObject(m.getPath());var v=p.Visualizations;for(var i=0;i<v.length;i++){if(v[i].$AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.Chart")>-1){var s=O.getNavigationPath(m.getPath());return M.createBindingContext(s+"/"+v[i].$AnnotationPath);}}return undefined;},getChartLabel:function(){return arguments[2];},getAggregationBinding:function(o,h,j,t,D,s,k,l,A,u,p,m){var n=m.getProperty("contextPath");var E=n?n.getPath():"";var q=h.Dimensions[0].$PropertyPath;var M=h.Measures[0].$PropertyPath,B,r,v=[],w,U,x,y,z,G;var H=j.$kind=="NavigationProperty"?o.getPath(1):(j.$kind=="EntitySet"?"/":"")+o.getModel(1).getObject(o.getPath(1)+"@sapui.name");var K=I.getUoM(o,h,j,undefined,l,A);var P=o.getInterface(1).getPath(),Q=o.getInterface(1).getModel();if(k&&k.getObject()){var G=Q.getObject(P+"/");y=F.getFiltersConditionsFromSelectionVariant(G,k.getObject(),V.getCustomConditions.bind(V));for(var W in y){var X=y[W];X.forEach(function(f1){if(!f1.isParameter){v.push(f1);}});}}if(E!==H+"/"&&p&&p.length&&y){var Y=[];var Z=V.convertFilterCondions(y);var $=g.getParameterInfo(Q,H).parameterProperties;for(var i=0;i<p.length;i++){var _=$[p[i]];var a1=P.split("/")[1];var b1=Q.createBindingContext("/"+a1+"/"+p[i]);var c1=J.parseJS(d.formatOptions(_,{context:b1})||"{}");var d1=J.parseJS(d.constraints(_,{context:b1})||"{}");var e1=T.getTypeConfig(_.$Type,c1,d1);var f1=Z[p[i]];var g1=f1?f1[0]:undefined;if(g1){var h1=f.toType(g1,e1,T);var i1=e1.className;var j1=encodeURIComponent(e.formatLiteral(h1.values[0],i1));j1=j1.replaceAll("'","\\'");Y.push(p[i]+"="+j1);}}var k1=H.slice(0,H.lastIndexOf("/"));var l1=H.substring(H.lastIndexOf("/")+1);z=k1+"("+Y.toString()+")/"+l1;H=z;}if(l){if(u){w=K&&K.$Path?"{ 'unit' : '"+K.$Path+"' }":"{}";U="";}else{w="{}";U=K&&K.$Path?", '"+K.$Path+"' : {}":"";}}else if(A&&A.AggregatableProperty&&A.AggregatableProperty.value&&A.AggregationMethod){w="{ 'name' : '"+A.AggregatableProperty.value+"', 'with' : '"+A.AggregationMethod+"'}";U=K&&K.$Path?", '"+K.$Path+"' : {}":"";}x=t?"' : { 'additionally' : ['"+t.$Path+"'] }":"' : { }";r=JSON.stringify(v);B="{path: '"+H+"', templateShareable: true, suspended : true, 'filters' : "+r+",'parameters' : {"+I.getSortOrder(h,D,s)+", '$$aggregation' : {'aggregate' : {'"+M+"' : "+w+"},'group' : {'"+q+x+U+"} } }"+I.getMaxItems(h)+"}";return B;},getSortOrder:function(o,D,s){if(o.ChartType.$EnumMember==="com.sap.vocabularies.UI.v1.ChartType/Donut"||o.ChartType.$EnumMember==="com.sap.vocabularies.UI.v1.ChartType/Bar"){if(s&&s.length&&s[0].Property.$PropertyPath===o.Measures[0].$PropertyPath){return"'$orderby' : '"+s[0].Property.$PropertyPath+(s[0].Descending?" desc'":"'");}else{return"'$orderby' : '"+o.Measures[0].$PropertyPath+" desc'";}}else{if(D==="Edm.Date"||D==="Edm.Time"||D==="Edm.DateTimeOffset"){return"'$orderby' : '"+o.Dimensions[0].$PropertyPath+"'";}else{if(s&&s.length&&s[0].Property.$PropertyPath===o.Dimensions[0].$PropertyPath){return"'$orderby' : '"+s[0].Property.$PropertyPath+(s[0].Descending?" desc'":"'");}else{return"'$orderby' : '"+o.Dimensions[0].$PropertyPath+"'";}}}},getMaxItems:function(o){if(o.ChartType.$EnumMember==="com.sap.vocabularies.UI.v1.ChartType/Bar"){return",'startIndex' : 0,'length' : 3";}else if(o.ChartType.$EnumMember==="com.sap.vocabularies.UI.v1.ChartType/Line"){return",'startIndex' : 0,'length' : 6";}else{return"";}},getColorBinding:function(i,D,o){var m=i.getModel(0);var h=i.getPath(1);var v=m.getObject(h+"$PropertyPath@com.sap.vocabularies.UI.v1.ValueCriticality");D=D.targetObject;if(D.Criticality){return b.buildExpressionForCriticalityColorMicroChart(D);}else if(D.CriticalityCalculation){var j=D.CriticalityCalculation.ImprovementDirection&&D.CriticalityCalculation.ImprovementDirection.$EnumMember;var k=O.value(D.Value,{context:i.getInterface(0)});var l=O.value(D.CriticalityCalculation.DeviationRangeLowValue,{context:i.getInterface(0)});var t=O.value(D.CriticalityCalculation.ToleranceRangeLowValue,{context:i.getInterface(0)});var A=O.value(D.CriticalityCalculation.AcceptanceRangeLowValue,{context:i.getInterface(0)});var n=O.value(D.CriticalityCalculation.AcceptanceRangeHighValue,{context:i.getInterface(0)});var p=O.value(D.CriticalityCalculation.ToleranceRangeHighValue,{context:i.getInterface(0)});var q=O.value(D.CriticalityCalculation.DeviationRangeHighValue,{context:i.getInterface(0)});return C.getCriticalityCalculationBinding(j,k,l,t,A,n,p,q);}else if(v.length){return C.getValueCriticality(o.$PropertyPath,v);}else{return undefined;}},getScaleUoMTitle:function(i,o,h,m,j,A,s,k){var M=i.getModel(0);var l=M.getObject(i.getPath(0)+"/MeasureAttributes/0/DataPoint/$AnnotationPath/ValueFormat/ScaleFactor/$Decimal");var n=S.generate([m]);var p=N.getIntegerInstance({style:"short",showScale:false,shortRefNumber:l});var q=p.getScale();var u=I.getUoM(i,o,h,undefined,j,A);var E;u=u&&(u.$Path?"${internal>uom/"+n+"}":"'"+u+"'");q=q?"'"+q+"'":"${internal>scalefactor/"+n+"}";if(s){s=s;}else{s="|";}s=u?"' "+s+" ' + ":"";E=q&&u?s+q+" + ' ' + "+u:s+(q||u);return k?E:"{= "+E+"}";},getMeasureDimensionTitle:function(i,o,h,j,A){var m=i.getModel(0);var M;var s=m.getObject(i.getPath(0)+"/Measures/0/$PropertyPath");var D=m.getObject(i.getPath(0)+"/Dimensions/0/$PropertyPath");var k=I.getLabel(m,i,"Dimensions");if(!j&&A){M=A.annotations&&A.annotations.Common&&A.annotations.Common.Label;if(M===undefined){M=M=I.getLabel(m,i,"Measures");}}else{M=I.getLabel(m,i,"Measures");}if(M===undefined){M=s;}if(k===undefined){k=D;}return(R&&R.getText("M_INTERACTIVE_CHART_HELPER_VISUALFILTER_MEASURE_DIMENSION_TITLE",[M,k]));},getLabel:function(m,i,p){var l=m.getObject(i.getPath(0)+"/"+p+"/0/$PropertyPath@com.sap.vocabularies.Common.v1.Label");return l;},getToolTip:function(i,o,h,m,j,A,r){var s=o&&o["ChartType"]&&o["ChartType"]["$EnumMember"];var M=I.getMeasureDimensionTitle(i,o,h,j,A);if(r==="false"&&s==="com.sap.vocabularies.UI.v1.ChartType/Line"){return"{= '"+M+"'}";}var k=R.getText("M_INTERACTIVE_CHART_HELPER_VISUALFILTER_TOOLTIP_SEPERATOR");var l=S.generate([m]);var n=I.getScaleUoMTitle(i,o,h,l,j,A,k,true);return"{= '"+M+(n?"' + "+n:"'")+"}";},getUoM:function(i,o,h,j,k,A){var m=i.getModel(0);var v=m.getObject(i.getPath(0)+"/Measures/0/$PropertyPath@Org.OData.Measures.V1.ISOCurrency");var u=m.getObject(i.getPath(0)+"/Measures/0/$PropertyPath@Org.OData.Measures.V1.Unit");var M=m.getObject(i.getPath(0)+"/Measures/0/$PropertyPath");var s;if(!k&&A){s=A.AggregatableProperty&&A.AggregatableProperty.value;}else{s=M;}var _=function(U,l){var n=l&&l.split("V1.")[1];var p={};if(U){p[n]=U;return j&&U.$Path?JSON.stringify(p):U;}else if(s){U=i.getModel(1).getObject(i.getPath(1)+"/"+s+l);p[n]=U;return U&&j&&U.$Path?JSON.stringify(p):U;}};return _(v,"@Org.OData.Measures.V1.ISOCurrency")||_(u,"@Org.OData.Measures.V1.Unit");},getScaleFactor:function(v){if(v&&v.ScaleFactor){return v.ScaleFactor.$Decimal;}return undefined;},getUoMVisiblity:function(i,o,s){var h=o&&o["ChartType"]&&o["ChartType"]["$EnumMember"];if(s){return false;}else if(!(h==="com.sap.vocabularies.UI.v1.ChartType/Bar"||h==="com.sap.vocabularies.UI.v1.ChartType/Line")){return false;}else{return true;}},getInParameterFiltersBinding:function(i){if(i.length>0){var p=[],P="";i.forEach(function(o){if(o.localDataProperty){p.push("{path:'$filters>/conditions/"+o.localDataProperty+"'}");}});if(p.length>0){P=p.join();return("{parts:["+P+"], formatter:'sap.fe.macros.visualfilters.VisualFilterRuntime.getFiltersFromConditions'}");}else{return undefined;}}else{return undefined;}},getfilterCountBinding:function(i,o){var D=o.Dimensions[0].$PropertyPath;return("{path:'$filters>/conditions/"+D+"', formatter:'sap.fe.macros.visualfilters.VisualFilterRuntime.getFilterCounts'}");}};I.getfilterCountBinding.requiresIContext=true;I.getColorBinding.requiresIContext=true;I.getAggregationBinding.requiresIContext=true;I.getUoM.requiresIContext=true;I.getScaleUoMTitle.requiresIContext=true;I.getToolTip.requiresIContext=true;I.getMeasureDimensionTitle.requiresIContext=true;I.getUoMVisiblity.requiresIContext=true;return I;},true);
+sap.ui.define(["sap/base/Log","sap/ui/model/odata/v4/AnnotationHelper","sap/fe/macros/CommonHelper","sap/ui/core/format/NumberFormat","sap/fe/macros/ResourceModel","sap/fe/macros/ODataMetaModelUtil","sap/fe/core/templating/FilterHelper","sap/fe/core/templating/CriticalityFormatters","sap/fe/macros/field/FieldTemplating","sap/fe/core/controls/filterbar/utils/VisualFilterUtils","sap/fe/core/helpers/StableIdHelper","sap/ui/mdc/odata/v4/TypeUtil","sap/fe/macros/filter/FilterFieldHelper","sap/ui/model/odata/v4/ODataUtils","sap/base/util/JSTokenizer","sap/ui/mdc/condition/ConditionConverter","sap/fe/core/CommonUtils"],function(L,O,C,N,R,a,F,b,c,V,S,T,d,e,J,f,g){"use strict";var I={getChartDisplayedValue:function(v,o,m){var i=S.generate([m]);return("{parts:[{path:'"+v+"',type:'sap.ui.model.odata.type.Decimal', constraints:{'nullable':false}}"+(o&&o.ScaleFactor?",{value:'"+o.ScaleFactor.$Decimal+"'}":",{path:'internal>scalefactorNumber/"+i+"'}")+(o&&o.NumberOfFractionalDigits?",{value:'"+o.NumberOfFractionalDigits+"'}":",{value:'0'}")+",{path:'internal>currency/"+i+"'}"+"], formatter:'VisualFilterRuntime.scaleVisualFilterValue'}");},getChartValue:function(v){return"{path:'"+v+"',type:'sap.ui.model.odata.type.Decimal', constraints:{'nullable':false}}";},getChart:function(m){var M=m.getModel();var p=M.getObject(m.getPath());var v=p.Visualizations;for(var i=0;i<v.length;i++){if(v[i].$AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.Chart")>-1){var s=O.getNavigationPath(m.getPath());return M.createBindingContext(s+"/"+v[i].$AnnotationPath);}}return undefined;},getChartLabel:function(){return arguments[2];},getAggregationBinding:function(i,o,h,t,D,s,j,k,A,u,p,l){var m=l.getProperty("contextPath");var E=m?m.getPath():"";var n=o.Dimensions[0].$PropertyPath;var M=o.Measures[0].$PropertyPath,B,q,r=[],v,U,w,x,y;var z=h.$kind=="NavigationProperty"?i.getPath(1):(h.$kind=="EntitySet"?"/":"")+i.getModel(1).getObject(i.getPath(1)+"@sapui.name");var G=I.getUoM(i,o,h,undefined,k,A);var H=i.getInterface(1).getPath(),K=i.getInterface(1).getModel();if(j&&j.getObject()){x=F.getFiltersConditionsFromSelectionVariant(H,K,j.getObject(),V.getCustomConditions.bind(V));for(var P in x){var Q=x[P];Q.forEach(function(e1){if(!e1.isParameter){r.push(e1);}});}}if(E!==z+"/"&&p&&p.length&&x){var W=[];var X=V.convertFilterCondions(x);var Y=g.getParameterInfo(K,z).parameterProperties;for(var Z in p){var $=Y[Z];var _=H.split("/")[1];var a1=K.createBindingContext("/"+_+"/"+Z);var b1=J.parseJS(d.formatOptions($,{context:a1})||"{}");var c1=J.parseJS(d.constraints($,{context:a1})||"{}");var d1=T.getTypeConfig($.$Type,b1,c1);var e1=X[Z];var f1=e1?e1[0]:undefined;if(f1){var g1=f.toType(f1,d1,T);var h1=d1.className;var i1=encodeURIComponent(e.formatLiteral(g1.values[0],h1));i1=i1.replaceAll("'","\\'");W.push(Z+"="+i1);}}var j1=z.slice(0,z.lastIndexOf("/"));var k1=z.substring(z.lastIndexOf("/")+1);y=j1+"("+W.toString()+")/"+k1;z=y;}if(k){if(u){v=G&&G.$Path?"{ 'unit' : '"+G.$Path+"' }":"{}";U="";}else{v="{}";U=G&&G.$Path?", '"+G.$Path+"' : {}":"";}}else if(A&&A.AggregatableProperty&&A.AggregatableProperty.value&&A.AggregationMethod){v="{ 'name' : '"+A.AggregatableProperty.value+"', 'with' : '"+A.AggregationMethod+"'}";U=G&&G.$Path?", '"+G.$Path+"' : {}":"";}w=t?"' : { 'additionally' : ['"+t.$Path+"'] }":"' : { }";q=JSON.stringify(r);B="{path: '"+z+"', templateShareable: true, suspended : true, 'filters' : "+q+",'parameters' : {"+I.getSortOrder(o,D,s)+", '$$aggregation' : {'aggregate' : {'"+M+"' : "+v+"},'group' : {'"+n+w+U+"} } }"+I.getMaxItems(o)+"}";return B;},getSortOrder:function(o,D,s){if(o.ChartType.$EnumMember==="com.sap.vocabularies.UI.v1.ChartType/Donut"||o.ChartType.$EnumMember==="com.sap.vocabularies.UI.v1.ChartType/Bar"){if(s&&s.length&&s[0].Property.$PropertyPath===o.Measures[0].$PropertyPath){return"'$orderby' : '"+s[0].Property.$PropertyPath+(s[0].Descending?" desc'":"'");}else{return"'$orderby' : '"+o.Measures[0].$PropertyPath+" desc'";}}else{if(D==="Edm.Date"||D==="Edm.Time"||D==="Edm.DateTimeOffset"){return"'$orderby' : '"+o.Dimensions[0].$PropertyPath+"'";}else{if(s&&s.length&&s[0].Property.$PropertyPath===o.Dimensions[0].$PropertyPath){return"'$orderby' : '"+s[0].Property.$PropertyPath+(s[0].Descending?" desc'":"'");}else{return"'$orderby' : '"+o.Dimensions[0].$PropertyPath+"'";}}}},getMaxItems:function(o){if(o.ChartType.$EnumMember==="com.sap.vocabularies.UI.v1.ChartType/Bar"){return",'startIndex' : 0,'length' : 3";}else if(o.ChartType.$EnumMember==="com.sap.vocabularies.UI.v1.ChartType/Line"){return",'startIndex' : 0,'length' : 6";}else{return"";}},getColorBinding:function(i,D,o){var m=i.getModel(0);var h=i.getPath(1);var v=m.getObject(h+"$PropertyPath@com.sap.vocabularies.UI.v1.ValueCriticality");D=D.targetObject;if(D.Criticality){return b.buildExpressionForCriticalityColorMicroChart(D);}else if(D.CriticalityCalculation){var j=D.CriticalityCalculation.ImprovementDirection&&D.CriticalityCalculation.ImprovementDirection.$EnumMember;var k=O.value(D.Value,{context:i.getInterface(0)});var l=O.value(D.CriticalityCalculation.DeviationRangeLowValue,{context:i.getInterface(0)});var t=O.value(D.CriticalityCalculation.ToleranceRangeLowValue,{context:i.getInterface(0)});var A=O.value(D.CriticalityCalculation.AcceptanceRangeLowValue,{context:i.getInterface(0)});var n=O.value(D.CriticalityCalculation.AcceptanceRangeHighValue,{context:i.getInterface(0)});var p=O.value(D.CriticalityCalculation.ToleranceRangeHighValue,{context:i.getInterface(0)});var q=O.value(D.CriticalityCalculation.DeviationRangeHighValue,{context:i.getInterface(0)});return C.getCriticalityCalculationBinding(j,k,l,t,A,n,p,q);}else if(v.length){return C.getValueCriticality(o.$PropertyPath,v);}else{return undefined;}},getScaleUoMTitle:function(i,o,h,m,j,A,s,k){var M=i.getModel(0);var l=M.getObject(i.getPath(0)+"/MeasureAttributes/0/DataPoint/$AnnotationPath/ValueFormat/ScaleFactor/$Decimal");var n=S.generate([m]);var p=N.getIntegerInstance({style:"short",showScale:false,shortRefNumber:l});var q=p.getScale();var u=I.getUoM(i,o,h,undefined,j,A);var E;u=u&&(u.$Path?"${internal>uom/"+n+"}":"'"+u+"'");q=q?"'"+q+"'":"${internal>scalefactor/"+n+"}";if(!s){s="|";}s=u?"' "+s+" ' + ":"";E=q&&u?s+q+" + ' ' + "+u:s+(q||u);return k?E:"{= "+E+"}";},getMeasureDimensionTitle:function(i,o,h,j,A){var m=i.getModel(0);var M;var s=m.getObject(i.getPath(0)+"/Measures/0/$PropertyPath");var D=m.getObject(i.getPath(0)+"/Dimensions/0/$PropertyPath");var k=I.getLabel(m,i,"Dimensions");if(!j&&A){M=A.annotations&&A.annotations.Common&&A.annotations.Common.Label;if(M===undefined){M=M=I.getLabel(m,i,"Measures");}}else{M=I.getLabel(m,i,"Measures");}if(M===undefined){M=s;}if(k===undefined){k=D;}return(R&&R.getText("M_INTERACTIVE_CHART_HELPER_VISUALFILTER_MEASURE_DIMENSION_TITLE",[M,k]));},getLabel:function(m,i,p){var l=m.getObject(i.getPath(0)+"/"+p+"/0/$PropertyPath@com.sap.vocabularies.Common.v1.Label");return l;},getToolTip:function(i,o,h,m,j,A,r){var s=o&&o["ChartType"]&&o["ChartType"]["$EnumMember"];var M=I.getMeasureDimensionTitle(i,o,h,j,A);M=C.escapeSingleQuotes(M);if(r==="false"&&s==="com.sap.vocabularies.UI.v1.ChartType/Line"){return"{= '"+M+"'}";}var k=R.getText("M_INTERACTIVE_CHART_HELPER_VISUALFILTER_TOOLTIP_SEPERATOR");var l=S.generate([m]);var n=I.getScaleUoMTitle(i,o,h,l,j,A,k,true);return"{= '"+M+(n?"' + "+n:"'")+"}";},getUoM:function(i,o,h,j,k,A){var m=i.getModel(0);var v=m.getObject(i.getPath(0)+"/Measures/0/$PropertyPath@Org.OData.Measures.V1.ISOCurrency");var u=m.getObject(i.getPath(0)+"/Measures/0/$PropertyPath@Org.OData.Measures.V1.Unit");var M=m.getObject(i.getPath(0)+"/Measures/0/$PropertyPath");var s;if(!k&&A){s=A.AggregatableProperty&&A.AggregatableProperty.value;}else{s=M;}var _=function(U,l){var n=l&&l.split("V1.")[1];var p={};if(U){p[n]=U;return j&&U.$Path?JSON.stringify(p):U;}else if(s){U=i.getModel(1).getObject(i.getPath(1)+"/"+s+l);p[n]=U;return U&&j&&U.$Path?JSON.stringify(p):U;}};return _(v,"@Org.OData.Measures.V1.ISOCurrency")||_(u,"@Org.OData.Measures.V1.Unit");},getScaleFactor:function(v){if(v&&v.ScaleFactor){return v.ScaleFactor.$Decimal;}return undefined;},getUoMVisiblity:function(i,o,s){var h=o&&o["ChartType"]&&o["ChartType"]["$EnumMember"];if(s){return false;}else if(!(h==="com.sap.vocabularies.UI.v1.ChartType/Bar"||h==="com.sap.vocabularies.UI.v1.ChartType/Line")){return false;}else{return true;}},getInParameterFiltersBinding:function(i){if(i.length>0){var p=[],P="";i.forEach(function(o){if(o.localDataProperty){p.push("{path:'$filters>/conditions/"+o.localDataProperty+"'}");}});if(p.length>0){P=p.join();return("{parts:["+P+"], formatter:'sap.fe.macros.visualfilters.VisualFilterRuntime.getFiltersFromConditions'}");}else{return undefined;}}else{return undefined;}},getfilterCountBinding:function(i,o){var D=o.Dimensions[0].$PropertyPath;return("{path:'$filters>/conditions/"+D+"', formatter:'sap.fe.macros.visualfilters.VisualFilterRuntime.getFilterCounts'}");}};I.getfilterCountBinding.requiresIContext=true;I.getColorBinding.requiresIContext=true;I.getAggregationBinding.requiresIContext=true;I.getUoM.requiresIContext=true;I.getScaleUoMTitle.requiresIContext=true;I.getToolTip.requiresIContext=true;I.getMeasureDimensionTitle.requiresIContext=true;I.getUoMVisiblity.requiresIContext=true;return I;},true);

package/packages/sap.fe.macros/src/sap/fe/macros/visualfilters/VisualFilterRuntime-dbg.js

@@ -22,7 +22,7 @@ sap.ui.define(
 		 * @private
 		 * @experimental This module is only for internal/experimental use!
 		 */
-		var VisualFilterRuntime = {
+		return {
 			selectionChanged: function(oEvent) {
 				var oInteractiveChart = oEvent.getSource(),
 					sOutParameter = oInteractiveChart.data("outParameter"),
@@ -116,9 +116,10 @@ sap.ui.define(
 						oInteractiveChart.getBinding("segments"),
 					sPath = oInteractiveChartListBinding.getPath(),
 					oMetaModel = oInteractiveChart.getModel().getMetaModel(),
-					entityTypeProperties = oMetaModel.getObject(sPath + "/");
+					sEntitySetPath = oInteractiveChartListBinding.getPath();
 				var filterConditions = FilterHelper.getFiltersConditionsFromSelectionVariant(
-					entityTypeProperties,
+					sEntitySetPath,
+					oMetaModel,
 					oSelectionVariantAnnotation,
 					VisualFilterUtils.getCustomConditions.bind(VisualFilterUtils)
 				);
@@ -132,9 +133,9 @@ sap.ui.define(
 					});
 					var localDataProperty = inParameterForKey ? inParameterForKey.localDataProperty : sKey;
 					if (!aParameters || (aParameters && aParameters.indexOf(sKey) === -1)) {
-						for (var i = 0; i < aPropertyInfoSet.length; i++) {
-							if (localDataProperty === aPropertyInfoSet[i].name) {
-								if (aPropertyInfoSet[i].typeConfig.baseType === "DateTime") {
+						for (var propertyInfoSet in aPropertyInfoSet) {
+							if (localDataProperty === propertyInfoSet.name) {
+								if (propertyInfoSet.typeConfig.baseType === "DateTime") {
 									if (mConditions[sKey]) {
 										mConditions[sKey].forEach(function(condition) {
 											condition.values[0] = VisualFilterUtils._formatDateTime(condition.values[0]);
@@ -143,7 +144,7 @@ sap.ui.define(
 								}
 								aValueListPropertyInfoSet.push({
 									name: sKey,
-									typeConfig: aPropertyInfoSet[i].typeConfig
+									typeConfig: propertyInfoSet.typeConfig
 								});
 							}
 						}
@@ -161,10 +162,10 @@ sap.ui.define(
 							// This way conditions will be converted to sap.ui.model.Filter for the value list
 							// This works because for in parameter mapping the property from the main entity type should be of the same type as the value list entity type
 							// TODO: Follow up with MDC to check if they can provide a clean api to convert conditions into filters
-							for (var i = 0; i < aPropertyInfoSet.length; i++) {
+							for (var propertyInfoSet in aPropertyInfoSet) {
 								// store conditions with value list property since we are filtering on the value list collection path
-								if (aPropertyInfoSet[i].name === oInParameter.localDataProperty) {
-									if (aPropertyInfoSet[i].typeConfig.baseType === "DateTime") {
+								if (propertyInfoSet.name === oInParameter.localDataProperty) {
+									if (propertyInfoSet.typeConfig.baseType === "DateTime") {
 										if (mConditions[oInParameter.valueListProperty]) {
 											mConditions[oInParameter.valueListProperty].forEach(function(condition) {
 												condition.values[0] = VisualFilterUtils._formatDateTime(condition.values[0]);
@@ -173,7 +174,7 @@ sap.ui.define(
 									}
 									aValueListPropertyInfoSet.push({
 										name: oInParameter.valueListProperty,
-										typeConfig: aPropertyInfoSet[i].typeConfig
+										typeConfig: propertyInfoSet.typeConfig
 									});
 								}
 							}
@@ -209,8 +210,6 @@ sap.ui.define(
 						});
 						return;
 					} else {
-						var oMetaModel = oInteractiveChart.getModel().getMetaModel();
-						var sEntitySetPath = oInteractiveChartListBinding.getPath();
 						var sLabel =
 							oMetaModel.getObject(
 								sEntitySetPath + "/" + aNotMatchedConditions[0] + "@com.sap.vocabularies.Common.v1.Label"
@@ -291,7 +290,7 @@ sap.ui.define(
 					// No ScaleFactor and no Currency, use numberOfFractionalDigits defined in DataPoint
 				} else if (numberOfFractionalDigits > 0) {
 					// Number of fractional digits shall not exceed 2, unless required by currency
-					numberOfFractionalDigits > 2 ? 2 : numberOfFractionalDigits;
+					numberOfFractionalDigits = numberOfFractionalDigits > 2 ? 2 : numberOfFractionalDigits;
 					var nValueWithDecimals = VisualFilterUtils.getFormattedNumber(oValue, null, numberOfFractionalDigits);
 					return nValueWithDecimals;
 				} else {
@@ -307,7 +306,6 @@ sap.ui.define(
 					.fireValueHelpRequest();
 			}
 		};
-		return VisualFilterRuntime;
 	},
 	/* bExport= */ true
 );

package/packages/sap.fe.macros/src/sap/fe/macros/visualfilters/VisualFilterRuntime.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/condition/Condition","sap/base/Log","sap/ui/mdc/util/FilterUtil","sap/ui/mdc/util/DateUtil","sap/fe/macros/CommonHelper","sap/fe/core/templating/FilterHelper","sap/fe/core/controls/filterbar/utils/VisualFilterUtils","sap/fe/macros/filter/FilterUtils"],function(C,L,M,D,a,F,V,b){"use strict";var c={selectionChanged:function(e){var i=e.getSource(),o=i.data("outParameter"),d=i.data("dimension"),s=i.data("dimensionText"),m=i.data("multipleSelectionAllowed"),f=i.data("dimensionType"),S=e.getParameter("bar")||e.getParameter("point")||e.getParameter("segment"),I=e.getParameter("selected"),g=i.getModel("$field"),h=g.getProperty("/conditions");if(!o||o!==d){L.error("VisualFilter: Cannot sync values with regular filter as out parameter is not configured properly!");}else{var j=S.getBindingContext().getObject(o);if(j){var k=S.getBindingContext().getObject(s);if(typeof k!=="string"&&!(k instanceof String)){k=undefined;}if(I){if(m==="false"){h=[];}if(f==="Edm.DateTimeOffset"){j=V._parseDateTime(j);}var l=C.createItemCondition(j,k||undefined);h.push(l);}else{h=h.filter(function(l){if(f==="Edm.DateTimeOffset"){return(l.operator!=="EQ"||Date.parse(l.values[0])!==Date.parse(j));}return l.operator!=="EQ"||l.values[0]!==j;});}g.setProperty("/conditions",h);}else{L.error("VisualFilter: No vaue found for the outParameter");}}},getAggregationSelected:function(d){var s=[];if(!this.getBindingContext()){return;}for(var i=0;i<=d.length-1;i++){var o=d[i];if(o.operator==="EQ"){s.push(o.values[0]);}}var I=this.getParent(),e=I.data("dimension"),f=I.data("dimensionType"),g=this.getBindingContext().getObject(e);if(f==="Edm.DateTimeOffset"){g=V._parseDateTime(g);}return s.indexOf(g)>-1;},getFiltersFromConditions:function(){var I=this.getParent(),f=I.getParent().getParent().getParent().getParent(),d=I.data("inParameters").customData,p=f.getPropertyInfoSet(),A=[].slice.call(arguments),m={},v=[],o,P=I.data("parameters").customData,s=a.parseCustomData(I.data("selectionVariantAnnotation")),e=I.getBinding("bars")||I.getBinding("points")||I.getBinding("segments"),g=e.getPath(),h=I.getModel().getMetaModel(),j=h.getObject(g+"/");var k=F.getFiltersConditionsFromSelectionVariant(j,s,V.getCustomConditions.bind(V));var S=V.convertFilterCondions(k);Object.keys(S).forEach(function(K){m[K]=S[K];var y=d.find(function(G){return G.valueListProperty===K;});var z=y?y.localDataProperty:K;if(!P||(P&&P.indexOf(K)===-1)){for(var i=0;i<p.length;i++){if(z===p[i].name){if(p[i].typeConfig.baseType==="DateTime"){if(m[K]){m[K].forEach(function(G){G.values[0]=V._formatDateTime(G.values[0]);});}}v.push({name:K,typeConfig:p[i].typeConfig});}}}});d.forEach(function(y,z){if(A[z].length>0){m[y.valueListProperty]=A[z];if(!P||(P&&P.indexOf(y.valueListProperty)===-1)){for(var i=0;i<p.length;i++){if(p[i].name===y.localDataProperty){if(p[i].typeConfig.baseType==="DateTime"){if(m[y.valueListProperty]){m[y.valueListProperty].forEach(function(G){G.values[0]=V._formatDateTime(G.values[0]);});}}v.push({name:y.valueListProperty,typeConfig:p[i].typeConfig});}}}}});var l=I.getBindingContext("internal");var n=I.data("infoPath");var E;var r=sap.ui.getCore().getLibraryResourceBundle("sap.fe.macros");var R=a.parseCustomData(I.data("requiredProperties"));if(R.length){var q=Object.keys(m)||[];var N=[];R.forEach(function(g){if(q.indexOf(g)===-1){N.push(g);}});if(!N.length){E=l.getProperty(n+"/showError");l.setProperty(n,{"errorMessageTitle":"","errorMessage":"","showError":false});}else if(N.length>1){l.setProperty(n,{"errorMessageTitle":r.getText("M_VISUAL_FILTERS_ERROR_MESSAGE_TITLE"),"errorMessage":r.getText("M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_MULTIPLEVF"),"showError":true});return;}else{var h=I.getModel().getMetaModel();var t=e.getPath();var u=h.getObject(t+"/"+N[0]+"@com.sap.vocabularies.Common.v1.Label")||N[0];l.setProperty(n,{"errorMessageTitle":r.getText("M_VISUAL_FILTERS_ERROR_MESSAGE_TITLE"),"errorMessage":r.getText("M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_SINGLEVF",u),"showError":true});return;}}else{E=l.getProperty(n+"/showError");l.setProperty(n,{"errorMessageTitle":"","errorMessage":"","showError":false});}var w=f.data("entityType").split("/")[1];var x=g.split("/")[1].split("(")[0];if(P&&P.length&&w===x){var B=E?b.getBindingPathForParameters(f,m,p,P):undefined;if(B){e.sPath=B;}}if(P&&P.length){P.forEach(function(i){if(m[i]){delete m[i];}});}Object.keys(m).forEach(function(i){m[i].forEach(function(y){if(y.values.length>1){y.values=y.values.slice(0,1);}});});if(Object.keys(m).length>0&&v.length){o=M.getFilterInfo(f,m,v).filters;e.filter(o);}else if(!Object.keys(m).length){e.filter();}if(E&&e.isSuspended()){e.resume();}return o;},getFilterCounts:function(o){if(o.length>0){return"("+o.length+")";}else{return undefined;}},scaleVisualFilterValue:function(v,s,n,d){if(s){var e=V.getFormattedNumber(v,s,n);return e;}else if(d){var f=V.getFormattedNumber(v,null,null,d);return f;}else if(n>0){n>2?2:n;var g=V.getFormattedNumber(v,null,n);return g;}else{return v;}},fireValueHelp:function(e){e.getSource().getParent().getParent().getParent().fireValueHelpRequest();}};return c;},true);
+sap.ui.define(["sap/ui/mdc/condition/Condition","sap/base/Log","sap/ui/mdc/util/FilterUtil","sap/ui/mdc/util/DateUtil","sap/fe/macros/CommonHelper","sap/fe/core/templating/FilterHelper","sap/fe/core/controls/filterbar/utils/VisualFilterUtils","sap/fe/macros/filter/FilterUtils"],function(C,L,M,D,a,F,V,b){"use strict";return{selectionChanged:function(e){var i=e.getSource(),o=i.data("outParameter"),d=i.data("dimension"),s=i.data("dimensionText"),m=i.data("multipleSelectionAllowed"),c=i.data("dimensionType"),S=e.getParameter("bar")||e.getParameter("point")||e.getParameter("segment"),I=e.getParameter("selected"),f=i.getModel("$field"),g=f.getProperty("/conditions");if(!o||o!==d){L.error("VisualFilter: Cannot sync values with regular filter as out parameter is not configured properly!");}else{var h=S.getBindingContext().getObject(o);if(h){var j=S.getBindingContext().getObject(s);if(typeof j!=="string"&&!(j instanceof String)){j=undefined;}if(I){if(m==="false"){g=[];}if(c==="Edm.DateTimeOffset"){h=V._parseDateTime(h);}var k=C.createItemCondition(h,j||undefined);g.push(k);}else{g=g.filter(function(k){if(c==="Edm.DateTimeOffset"){return(k.operator!=="EQ"||Date.parse(k.values[0])!==Date.parse(h));}return k.operator!=="EQ"||k.values[0]!==h;});}f.setProperty("/conditions",g);}else{L.error("VisualFilter: No vaue found for the outParameter");}}},getAggregationSelected:function(c){var s=[];if(!this.getBindingContext()){return;}for(var i=0;i<=c.length-1;i++){var o=c[i];if(o.operator==="EQ"){s.push(o.values[0]);}}var I=this.getParent(),d=I.data("dimension"),e=I.data("dimensionType"),f=this.getBindingContext().getObject(d);if(e==="Edm.DateTimeOffset"){f=V._parseDateTime(f);}return s.indexOf(f)>-1;},getFiltersFromConditions:function(){var i=this.getParent(),f=i.getParent().getParent().getParent().getParent(),I=i.data("inParameters").customData,p=f.getPropertyInfoSet(),A=[].slice.call(arguments),c={},v=[],o,P=i.data("parameters").customData,s=a.parseCustomData(i.data("selectionVariantAnnotation")),d=i.getBinding("bars")||i.getBinding("points")||i.getBinding("segments"),e=d.getPath(),m=i.getModel().getMetaModel(),E=d.getPath();var g=F.getFiltersConditionsFromSelectionVariant(E,m,s,V.getCustomConditions.bind(V));var S=V.convertFilterCondions(g);Object.keys(S).forEach(function(K){c[K]=S[K];var w=I.find(function(z){return z.valueListProperty===K;});var x=w?w.localDataProperty:K;if(!P||(P&&P.indexOf(K)===-1)){for(var y in p){if(x===y.name){if(y.typeConfig.baseType==="DateTime"){if(c[K]){c[K].forEach(function(z){z.values[0]=V._formatDateTime(z.values[0]);});}}v.push({name:K,typeConfig:y.typeConfig});}}}});I.forEach(function(w,x){if(A[x].length>0){c[w.valueListProperty]=A[x];if(!P||(P&&P.indexOf(w.valueListProperty)===-1)){for(var y in p){if(y.name===w.localDataProperty){if(y.typeConfig.baseType==="DateTime"){if(c[w.valueListProperty]){c[w.valueListProperty].forEach(function(z){z.values[0]=V._formatDateTime(z.values[0]);});}}v.push({name:w.valueListProperty,typeConfig:y.typeConfig});}}}}});var h=i.getBindingContext("internal");var j=i.data("infoPath");var k;var r=sap.ui.getCore().getLibraryResourceBundle("sap.fe.macros");var R=a.parseCustomData(i.data("requiredProperties"));if(R.length){var l=Object.keys(c)||[];var n=[];R.forEach(function(e){if(l.indexOf(e)===-1){n.push(e);}});if(!n.length){k=h.getProperty(j+"/showError");h.setProperty(j,{"errorMessageTitle":"","errorMessage":"","showError":false});}else if(n.length>1){h.setProperty(j,{"errorMessageTitle":r.getText("M_VISUAL_FILTERS_ERROR_MESSAGE_TITLE"),"errorMessage":r.getText("M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_MULTIPLEVF"),"showError":true});return;}else{var q=m.getObject(E+"/"+n[0]+"@com.sap.vocabularies.Common.v1.Label")||n[0];h.setProperty(j,{"errorMessageTitle":r.getText("M_VISUAL_FILTERS_ERROR_MESSAGE_TITLE"),"errorMessage":r.getText("M_VISUAL_FILTERS_PROVIDE_FILTER_VAL_SINGLEVF",q),"showError":true});return;}}else{k=h.getProperty(j+"/showError");h.setProperty(j,{"errorMessageTitle":"","errorMessage":"","showError":false});}var t=f.data("entityType").split("/")[1];var u=e.split("/")[1].split("(")[0];if(P&&P.length&&t===u){var B=k?b.getBindingPathForParameters(f,c,p,P):undefined;if(B){d.sPath=B;}}if(P&&P.length){P.forEach(function(w){if(c[w]){delete c[w];}});}Object.keys(c).forEach(function(w){c[w].forEach(function(x){if(x.values.length>1){x.values=x.values.slice(0,1);}});});if(Object.keys(c).length>0&&v.length){o=M.getFilterInfo(f,c,v).filters;d.filter(o);}else if(!Object.keys(c).length){d.filter();}if(k&&d.isSuspended()){d.resume();}return o;},getFilterCounts:function(c){if(c.length>0){return"("+c.length+")";}else{return undefined;}},scaleVisualFilterValue:function(v,s,n,c){if(s){var d=V.getFormattedNumber(v,s,n);return d;}else if(c){var e=V.getFormattedNumber(v,null,null,c);return e;}else if(n>0){n=n>2?2:n;var f=V.getFormattedNumber(v,null,n);return f;}else{return v;}},fireValueHelp:function(e){e.getSource().getParent().getParent().getParent().fireValueHelpRequest();}};},true);

package/packages/sap.fe.macros/test/sap/fe/macros/designtime/api.json

@@ -1,6 +1,6 @@
 {
     "$schema-ref": "http://schemas.sap.com/sapui5/designtime/api.json/1.0",
-    "version": "1.98.0",
+    "version": "1.99.0",
     "library": "sap.fe.macros",
     "symbols": [
         {
@@ -406,6 +406,15 @@
                         "type": "sap.ui.model.Context",
                         "visibility": "public"
                     },
+                    {
+                        "name": "filterBar",
+                        "bindable": true,
+                        "description": "Id of the FilterBar building block associated with the chart.",
+                        "group": "Misc",
+                        "methods": [],
+                        "type": "string",
+                        "visibility": "public"
+                    },
                     {
                         "name": "id",
                         "bindable": true,
@@ -569,6 +578,38 @@
                     "methods": [],
                     "type": "string",
                     "visibility": "public"
+                },
+                {
+                    "name": "textExpandBehaviorDisplay",
+                    "description": "Defines how the full text will be displayed.<br/><br/>Allowed values are \"InPlace\" and \"Popover\"\n",
+                    "group": "Misc",
+                    "methods": [],
+                    "type": "string",
+                    "visibility": "public"
+                },
+                {
+                    "name": "textLinesEdit",
+                    "description": "Maximum number of lines for multiline texts in edit mode.<br/>",
+                    "group": "Misc",
+                    "methods": [],
+                    "type": "number",
+                    "visibility": "public"
+                },
+                {
+                    "name": "textMaxCharactersDisplay",
+                    "description": "Maximum number of characters from the beginning of the text field that are shown initially.<br/>",
+                    "group": "Misc",
+                    "methods": [],
+                    "type": "number",
+                    "visibility": "public"
+                },
+                {
+                    "name": "textMaxLines",
+                    "description": "Maximum number of lines that multiline texts in edit mode can grow to.<br/>",
+                    "group": "Misc",
+                    "methods": [],
+                    "type": "number",
+                    "visibility": "public"
                 }
             ]
         },
@@ -683,6 +724,51 @@
                 }
             ]
         },
+        {
+            "kind": "class",
+            "name": "sap.fe.macros.Form",
+            "basename": "Form",
+            "resource": "sap/fe/macros/FormAPI.ts",
+            "module": "sap/fe/macros/FormAPI",
+            "static": true,
+            "visibility": "public",
+            "description": "Building block for creating a Form based on the metadata provided by OData V4.\n<br>\nUsually, a ReferenceFacet or CollectionFacet is expected<br/>Usage example:\n<pre>\n&lt;macro:Form id=\"MyForm\" metaPath=\"@com.sap.vocabularies.UI.v1.Facets/0\" /&gt;\n</pre>\n",
+            "ui5-metadata": {
+                "stereotype": "xmlmacro",
+                "properties": [
+                    {
+                        "name": "contextPath",
+                        "bindable": true,
+                        "description": "Defines the path of the context used in the current page or block.\nThis setting is defined by the framework.",
+                        "group": "Misc",
+                        "methods": [],
+                        "type": "string",
+                        "visibility": "public"
+                    },
+                    {
+                        "name": "id",
+                        "bindable": true,
+                        "description": "The identifier of the form control.",
+                        "group": "Misc",
+                        "methods": [],
+                        "type": "string",
+                        "visibility": "public"
+                    },
+                    {
+                        "name": "metaPath",
+                        "bindable": true,
+                        "description": "Defines the relative path of the property in the metamodel, based on the current contextPath.",
+                        "group": "Misc",
+                        "methods": [],
+                        "type": "string",
+                        "visibility": "public"
+                    }
+                ],
+                "aggregations": []
+            },
+            "events": [],
+            "methods": []
+        },
         {
             "kind": "class",
             "name": "sap.fe.macros.Table",
@@ -754,6 +840,15 @@
                         "type": "boolean",
                         "visibility": "public"
                     },
+                    {
+                        "name": "filterBar",
+                        "bindable": true,
+                        "description": "Id of the FilterBar building block associated with the table.",
+                        "group": "Misc",
+                        "methods": [],
+                        "type": "string",
+                        "visibility": "public"
+                    },
                     {
                         "name": "header",
                         "bindable": true,
@@ -846,9 +941,25 @@
                     "name": "rowPress",
                     "description": "An event triggered when the user chooses a row; the event contains information about which row was chosen.<br/>You can set this in order to handle the navigation manually.\n",
                     "visibility": "public"
+                },
+                {
+                    "name": "selectionChange",
+                    "description": "An event triggered when the selection in the table changes.",
+                    "visibility": "public"
                 }
             ],
-            "methods": []
+            "methods": [
+                {
+                    "name": "getSelectedContexts",
+                    "visibility": "public",
+                    "description": "Gets contexts from the table that have been selected by the user.",
+                    "parameters": [],
+                    "returnValue": {
+                        "type": "[object Object][]",
+                        "description": "Contexts of the rows selected by the user\n"
+                    }
+                }
+            ]
         },
         {
             "kind": "typedef",