@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.macros/src/sap/fe/macros/table/Utils-dbg.js

@@ -204,7 +204,7 @@ sap.ui.define(
 		}
 
 		function getFilterInfo(oTable) {
-			var isAnalyticalEnabled = DelegateUtil.getCustomData(oTable, "enableAnalytics"),
+			var oTableDefinition = oTable.getParent().getTableDefinition(),
 				aIgnoreProperties = [];
 
 			function _getRelativePathArrayFromAggregates(oTable) {
@@ -214,8 +214,13 @@ sap.ui.define(
 				});
 			}
 
-			if (isAnalyticalEnabled === "true" || isAnalyticalEnabled === true) {
-				aIgnoreProperties = aIgnoreProperties.concat(["search"]).concat(_getRelativePathArrayFromAggregates(oTable));
+			if (oTableDefinition.enableAnalytics) {
+				aIgnoreProperties = aIgnoreProperties.concat(_getRelativePathArrayFromAggregates(oTable));
+
+				if (!oTableDefinition.enableAnalyticsSearch) {
+					// Search isn't allow as a $apply transformation for this table
+					aIgnoreProperties = aIgnoreProperties.concat(["search"]);
+				}
 			}
 			var oFilter = FilterUtils.getFilterInfo(oTable.getFilter(), {
 				ignoredProperties: aIgnoreProperties,
@@ -317,7 +322,7 @@ sap.ui.define(
 					var oAppComponent = sap.ui.core.Component.getOwnerComponentFor(oComponent);
 					var oMetaModel = oAppComponent.getMetaModel();
 					var oShellServiceHelper = CommonUtils.getShellServices(oAppComponent);
-					var sCurrentHash = oShellServiceHelper.hrefForExternal();
+					var sCurrentHash = CommonUtils.getHash();
 					var oColumns = DelegateUtil.getCustomData(oTable, "columns");
 					var aSemanticObjectsForGetLinks = [];
 					var aSemanticObjects = [];

package/packages/sap.fe.macros/src/sap/fe/macros/table/Utils.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/model/Filter","sap/ui/core/format/NumberFormat","sap/fe/core/CommonUtils","sap/fe/macros/CommonHelper","sap/fe/macros/filter/FilterUtils","sap/base/Log","sap/fe/macros/DelegateUtil","sap/fe/core/helpers/ModelHelper","sap/fe/core/converters/MetaModelConverter","sap/fe/core/converters/ConverterContext","sap/base/util/merge","sap/fe/core/helpers/BindingExpression"],function(F,N,C,a,b,L,D,M,c,d,m,B){"use strict";function g(T,s){var E=T.data("entityType"),i=C.getAppComponent(T).getMetaModel(),S=i.getObject(E+"@"+s),P={},v=[],x=[],y="";if(S){y=S.Text;(S.SelectOptions||[]).filter(function(j){return j&&j.PropertyName&&j.PropertyName.$PropertyPath;}).forEach(function(A){var H=A.PropertyName.$PropertyPath;if(!x.includes(H)){x.push(H);}for(var j in A.Ranges){var R=A.Ranges[j];P[H]=(P[H]||[]).concat(new F(H,R.Option.$EnumMember.split("/").pop(),R.Low,R.High));}});for(var z in P){v.push(new F({filters:P[z],and:false}));}}return{properties:x,filters:v,text:y};}function e(T){var i=[],j=T.data("hiddenFilters");if(j&&Array.isArray(j.paths)){j.paths.forEach(function(P){var s=g(T,P.annotationPath);i=i.concat(s.filters);});}return i;}function f(T){var i=[],Q=D.getCustomData(T,"quickFilterKey");if(Q){i=i.concat(g(T,Q).filters);}return i;}function h(T){return f(T).concat(e(T));}function k(T,P,i){var j=T.data("rowsBindingInfo"),s=T.getModel(),v,x,y=i.batchGroupId||"",z=n(T),A=Array.isArray(i.additionalFilters)?i.additionalFilters:[],E=z.bindingPath?z.bindingPath:j.path;A=A.concat(z.filters).concat(o(T));x=new F({filters:A,and:true});v=s.bindList((P?P.getPath()+"/":"")+E,T.getBindingContext(),null,x,{$count:true,$$groupId:y||"$auto",$search:z.search});return v.requestContexts(0,1).then(function(H){var I=H&&H.length?H[0].getBinding().getLength():0;v.destroy();return I;});}function l(i){var j=N.getIntegerInstance({groupingEnabled:true});return j.format(i);}function n(T){var i=D.getCustomData(T,"enableAnalytics"),I=[];function j(T){var A=a.parseCustomData(D.getCustomData(T,"aggregates")||{});return Object.keys(A).map(function(v){return A[v].relativePath;});}if(i==="true"||i===true){I=I.concat(["search"]).concat(j(T));}var s=b.getFilterInfo(T.getFilter(),{ignoredProperties:I,targetControl:T});return s;}function o(T){var P=T.getP13nMode();if(P&&P.indexOf("Filter")>-1){var i=(D.getCustomData(T,"sap_fe_TableDelegate_propertyInfoMap")||[]).filter(function(s){return s&&!(s.filterable===false);}),j=b.getFilterInfo(T,{propertiesMetadata:i});if(j&&j.filters){return j.filters;}}return[];}function p(T){var i=n(T);return{filters:i.filters.concat(h(T),o(T)),search:i.search,bindingPath:i.bindingPath};}function w(T){return _(T).promise;}function q(T){var i=_(T);if(i.resolve){i.resolve(T);T.data("boundPromiseResolve",null);}}function _(T){if(!T.data("boundPromise")){var R;T.data("boundPromise",new Promise(function(i){R=i;}));if(T.isBound()){R(T);}else{T.data("boundPromiseResolve",R);}}return{promise:T.data("boundPromise"),resolve:T.data("boundPromiseResolve")};}function u(i,j,s){i.filters=s;if(j.search){i.parameters.$search=C.normalizeSearchTerm(j.search);}else{i.parameters.$search=undefined;}}function G(s,T){var v=s.getView();var I=v.getBindingContext("internal");if(I){var E=D.getCustomData(T,"targetCollectionPath");if(E){var x=s.getOwnerComponent();var A=sap.ui.core.Component.getOwnerComponentFor(x);var y=A.getMetaModel();var S=C.getShellServices(A);var z=S.hrefForExternal();var H=D.getCustomData(T,"columns");var J=[];var K=[];var P,O,Q,R=[];var U;var V=[];if(z&&z.indexOf("?")!==-1){z=z.split("?")[0];}for(var i=0;i<H.customData.length;i++){O=H.customData[i].annotationPath;if(O){Q=y.getObject(O);if(Q&&Q.$kind==="Property"){P=H.customData[i].annotationPath;}else if(Q&&Q.$Type==="com.sap.vocabularies.UI.v1.DataField"){P=E+"/"+y.getObject(O+"/Value/$Path");}}if(P){if(!(y.getObject(P+"@com.sap.vocabularies.Common.v1.SemanticObject")===undefined)){if(R.indexOf(P)===-1){R.push(P);V.push(C.getSemanticObjectPromise(A,v,y,P));}}}P=undefined;}if(V.length===0){return Promise.resolve();}else{Promise.all(V).then(function(W){var X=[],Y;var Z=W.filter(function($){if($.semanticObject&&typeof $.semanticObject.semanticObject==="object"){Y=B.compileBinding(B.bindingExpression($.semanticObject.semanticObject.$Path));$.semanticObject.semanticObject=Y;$.semanticObjectForGetLinks[0].semanticObject=Y;return true;}else if($){return $.semanticObject!==undefined;}else{return false;}});for(var j=0;j<Z.length;j++){U=Z[j];if(U&&U.semanticObject&&!(U.semanticObject.semanticObject.indexOf("{")===0)){J.push(U.semanticObjectForGetLinks);K.push({semanticObject:U.semanticObject&&U.semanticObject.semanticObject,unavailableActions:U.unavailableActions,path:Z[j].semanticObjectPath});X.push(S.getLinksWithCache([U.semanticObjectForGetLinks]));}}return C.updateSemanticTargets(X,K,I,z);}).catch(function(j){L.error("fnGetSemanticTargetsFromTable: Cannot get Semantic Objects",j);});}}}}function r(T){T.clearSelection();var i=T.getBindingContext("internal");if(i){i.setProperty("deleteEnabled",false);i.setProperty("numberOfSelectedContexts",0);i.setProperty("selectedContexts",[]);i.setProperty("deletableContexts",[]);}}var t={getCountFormatted:l,getHiddenFilters:e,getFiltersInfoForSV:g,getTableFilters:h,getListBindingForCount:k,getFilterInfo:n,getP13nFilters:o,getAllFilterInfo:p,whenBound:w,onTableBound:q,getSemanticTargetsFromTable:G,updateBindingInfo:u,clearSelection:r};return t;});
+sap.ui.define(["sap/ui/model/Filter","sap/ui/core/format/NumberFormat","sap/fe/core/CommonUtils","sap/fe/macros/CommonHelper","sap/fe/macros/filter/FilterUtils","sap/base/Log","sap/fe/macros/DelegateUtil","sap/fe/core/helpers/ModelHelper","sap/fe/core/converters/MetaModelConverter","sap/fe/core/converters/ConverterContext","sap/base/util/merge","sap/fe/core/helpers/BindingExpression"],function(F,N,C,a,b,L,D,M,c,d,m,B){"use strict";function g(T,s){var E=T.data("entityType"),i=C.getAppComponent(T).getMetaModel(),S=i.getObject(E+"@"+s),P={},v=[],x=[],y="";if(S){y=S.Text;(S.SelectOptions||[]).filter(function(j){return j&&j.PropertyName&&j.PropertyName.$PropertyPath;}).forEach(function(A){var H=A.PropertyName.$PropertyPath;if(!x.includes(H)){x.push(H);}for(var j in A.Ranges){var R=A.Ranges[j];P[H]=(P[H]||[]).concat(new F(H,R.Option.$EnumMember.split("/").pop(),R.Low,R.High));}});for(var z in P){v.push(new F({filters:P[z],and:false}));}}return{properties:x,filters:v,text:y};}function e(T){var i=[],j=T.data("hiddenFilters");if(j&&Array.isArray(j.paths)){j.paths.forEach(function(P){var s=g(T,P.annotationPath);i=i.concat(s.filters);});}return i;}function f(T){var i=[],Q=D.getCustomData(T,"quickFilterKey");if(Q){i=i.concat(g(T,Q).filters);}return i;}function h(T){return f(T).concat(e(T));}function k(T,P,i){var j=T.data("rowsBindingInfo"),s=T.getModel(),v,x,y=i.batchGroupId||"",z=n(T),A=Array.isArray(i.additionalFilters)?i.additionalFilters:[],E=z.bindingPath?z.bindingPath:j.path;A=A.concat(z.filters).concat(o(T));x=new F({filters:A,and:true});v=s.bindList((P?P.getPath()+"/":"")+E,T.getBindingContext(),null,x,{$count:true,$$groupId:y||"$auto",$search:z.search});return v.requestContexts(0,1).then(function(H){var I=H&&H.length?H[0].getBinding().getLength():0;v.destroy();return I;});}function l(i){var j=N.getIntegerInstance({groupingEnabled:true});return j.format(i);}function n(T){var i=T.getParent().getTableDefinition(),I=[];function j(T){var A=a.parseCustomData(D.getCustomData(T,"aggregates")||{});return Object.keys(A).map(function(v){return A[v].relativePath;});}if(i.enableAnalytics){I=I.concat(j(T));if(!i.enableAnalyticsSearch){I=I.concat(["search"]);}}var s=b.getFilterInfo(T.getFilter(),{ignoredProperties:I,targetControl:T});return s;}function o(T){var P=T.getP13nMode();if(P&&P.indexOf("Filter")>-1){var i=(D.getCustomData(T,"sap_fe_TableDelegate_propertyInfoMap")||[]).filter(function(s){return s&&!(s.filterable===false);}),j=b.getFilterInfo(T,{propertiesMetadata:i});if(j&&j.filters){return j.filters;}}return[];}function p(T){var i=n(T);return{filters:i.filters.concat(h(T),o(T)),search:i.search,bindingPath:i.bindingPath};}function w(T){return _(T).promise;}function q(T){var i=_(T);if(i.resolve){i.resolve(T);T.data("boundPromiseResolve",null);}}function _(T){if(!T.data("boundPromise")){var R;T.data("boundPromise",new Promise(function(i){R=i;}));if(T.isBound()){R(T);}else{T.data("boundPromiseResolve",R);}}return{promise:T.data("boundPromise"),resolve:T.data("boundPromiseResolve")};}function u(i,j,s){i.filters=s;if(j.search){i.parameters.$search=C.normalizeSearchTerm(j.search);}else{i.parameters.$search=undefined;}}function G(s,T){var v=s.getView();var I=v.getBindingContext("internal");if(I){var E=D.getCustomData(T,"targetCollectionPath");if(E){var x=s.getOwnerComponent();var A=sap.ui.core.Component.getOwnerComponentFor(x);var y=A.getMetaModel();var S=C.getShellServices(A);var z=C.getHash();var H=D.getCustomData(T,"columns");var J=[];var K=[];var P,O,Q,R=[];var U;var V=[];if(z&&z.indexOf("?")!==-1){z=z.split("?")[0];}for(var i=0;i<H.customData.length;i++){O=H.customData[i].annotationPath;if(O){Q=y.getObject(O);if(Q&&Q.$kind==="Property"){P=H.customData[i].annotationPath;}else if(Q&&Q.$Type==="com.sap.vocabularies.UI.v1.DataField"){P=E+"/"+y.getObject(O+"/Value/$Path");}}if(P){if(!(y.getObject(P+"@com.sap.vocabularies.Common.v1.SemanticObject")===undefined)){if(R.indexOf(P)===-1){R.push(P);V.push(C.getSemanticObjectPromise(A,v,y,P));}}}P=undefined;}if(V.length===0){return Promise.resolve();}else{Promise.all(V).then(function(W){var X=[],Y;var Z=W.filter(function($){if($.semanticObject&&typeof $.semanticObject.semanticObject==="object"){Y=B.compileBinding(B.bindingExpression($.semanticObject.semanticObject.$Path));$.semanticObject.semanticObject=Y;$.semanticObjectForGetLinks[0].semanticObject=Y;return true;}else if($){return $.semanticObject!==undefined;}else{return false;}});for(var j=0;j<Z.length;j++){U=Z[j];if(U&&U.semanticObject&&!(U.semanticObject.semanticObject.indexOf("{")===0)){J.push(U.semanticObjectForGetLinks);K.push({semanticObject:U.semanticObject&&U.semanticObject.semanticObject,unavailableActions:U.unavailableActions,path:Z[j].semanticObjectPath});X.push(S.getLinksWithCache([U.semanticObjectForGetLinks]));}}return C.updateSemanticTargets(X,K,I,z);}).catch(function(j){L.error("fnGetSemanticTargetsFromTable: Cannot get Semantic Objects",j);});}}}}function r(T){T.clearSelection();var i=T.getBindingContext("internal");if(i){i.setProperty("deleteEnabled",false);i.setProperty("numberOfSelectedContexts",0);i.setProperty("selectedContexts",[]);i.setProperty("deletableContexts",[]);}}var t={getCountFormatted:l,getHiddenFilters:e,getFiltersInfoForSV:g,getTableFilters:h,getListBindingForCount:k,getFilterInfo:n,getP13nFilters:o,getAllFilterInfo:p,whenBound:w,onTableBound:q,getSemanticTargetsFromTable:G,updateBindingInfo:u,clearSelection:r};return t;});

package/packages/sap.fe.macros/src/sap/fe/macros/table/delegates/ALPTableDelegateBaseMixin-dbg.js

@@ -46,7 +46,7 @@ sap.ui.define(
 		 * otherwise, the filterbar filters must be considered.
 		 */
 		var ALPTableDelegateBaseMixin = {
-			_internalUpdateBindingInfo: function(oTable, oMetadataInfo, oBindingInfo) {
+			_internalUpdateBindingInfo: function(oTable, oBindingInfo) {
 				var oFilterInfo, oFilter;
 				var oChartFilterInfo = {},
 					oTableFilterInfo = {};
@@ -85,11 +85,11 @@ sap.ui.define(
 			_getDelegateParentClass: function() {
 				return undefined;
 			},
-			rebindTable: function(oTable, oBindingInfo) {
+			rebind: function(oTable, oBindingInfo) {
 				var oInternalModelContext = oTable.getBindingContext("pageInternal");
 				var sTemplateContentView = oInternalModelContext.getProperty(oInternalModelContext.getPath() + "/alpContentView");
 				if (sTemplateContentView !== "Chart") {
-					this._getDelegateParentClass().rebindTable(oTable, oBindingInfo);
+					this._getDelegateParentClass().rebind(oTable, oBindingInfo);
 				}
 			}
 		};

package/packages/sap.fe.macros/src/sap/fe/macros/table/delegates/ALPTableDelegateBaseMixin.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/macros/chart/ChartUtils","sap/fe/macros/table/Utils","sap/ui/model/Filter","sap/fe/macros/DelegateUtil","sap/base/util/deepClone"],function(C,T,F,D,d){"use strict";function _(t){var v=sap.ui.fl.Utils.getViewForControl(t);var c=v.getContent()[0].data("singleChartId");return v.byId(c);}var A={_internalUpdateBindingInfo:function(t,m,b){var f,o;var c={},a={};var e,g;Object.assign(b,d(D.getCustomData(t,"rowsBindingInfo")));if(t.getRowBinding()){b.suspended=false;}var M=_(t);var h=C.getChartSelectionsExist(M,t);a=T.getAllFilterInfo(t);e=a&&a.filters;f=a;if(h){c=C.getAllFilterInfo(M);g=c&&c.filters;f=c;}var i=e&&g?e.concat(g):g||e;o=new F({filters:i,and:true});if(f.bindingPath){b.path=f.bindingPath;}T.updateBindingInfo(b,f,o);},_getDelegateParentClass:function(){return undefined;},rebindTable:function(t,b){var i=t.getBindingContext("pageInternal");var s=i.getProperty(i.getPath()+"/alpContentView");if(s!=="Chart"){this._getDelegateParentClass().rebindTable(t,b);}}};return A;},false);
+sap.ui.define(["sap/fe/macros/chart/ChartUtils","sap/fe/macros/table/Utils","sap/ui/model/Filter","sap/fe/macros/DelegateUtil","sap/base/util/deepClone"],function(C,T,F,D,d){"use strict";function _(t){var v=sap.ui.fl.Utils.getViewForControl(t);var c=v.getContent()[0].data("singleChartId");return v.byId(c);}var A={_internalUpdateBindingInfo:function(t,b){var f,o;var c={},a={};var e,g;Object.assign(b,d(D.getCustomData(t,"rowsBindingInfo")));if(t.getRowBinding()){b.suspended=false;}var m=_(t);var h=C.getChartSelectionsExist(m,t);a=T.getAllFilterInfo(t);e=a&&a.filters;f=a;if(h){c=C.getAllFilterInfo(m);g=c&&c.filters;f=c;}var i=e&&g?e.concat(g):g||e;o=new F({filters:i,and:true});if(f.bindingPath){b.path=f.bindingPath;}T.updateBindingInfo(b,f,o);},_getDelegateParentClass:function(){return undefined;},rebind:function(t,b){var i=t.getBindingContext("pageInternal");var s=i.getProperty(i.getPath()+"/alpContentView");if(s!=="Chart"){this._getDelegateParentClass().rebind(t,b);}}};return A;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/table/delegates/TableDelegate-dbg.js

@@ -24,7 +24,10 @@ sap.ui.define(
 		"sap/fe/macros/table/TableHelper",
 		"sap/fe/macros/ResourceModel",
 		"sap/base/util/deepClone",
-		"sap/ui/mdc/odata/v4/TableDelegate"
+		"sap/base/util/deepEqual",
+		"sap/ui/mdc/odata/v4/TableDelegate",
+		"sap/base/util/deepExtend",
+		"sap/fe/macros/SizeHelper"
 	],
 	function(
 		JSONModel,
@@ -41,7 +44,10 @@ sap.ui.define(
 		TableHelper,
 		ResourceModel,
 		deepClone,
-		TableDelegateBase
+		deepEqual,
+		TableDelegateBase,
+		deepExtend,
+		SizeHelper
 	) {
 		"use strict";
 
@@ -82,6 +88,73 @@ sap.ui.define(
 		 * @alias sap.fe.macros.TableDelegate
 		 */
 		var ODataTableDelegate = Object.assign({}, TableDelegateBase, {
+			/**
+			 * This function loops over all properties and calculates the width for fieldgroup columns.
+			 * The width of the fieldgroup is the width of the widest property contained in the fieldgroup (including the label if showDataFieldsLabel is true)
+			 * The result of this calculation is stored in visualSettings.widthCalculation.minWidth property which is used by the MDCtable to set the final width of the column.
+			 *
+			 * @param {object} oTable Instance of the mdc Table
+			 * @param {Array} aProperties Array of properties
+			 * @private
+			 * @alias sap.fe.macros.TableDelegate
+			 * @returns {Array} Array of properties with updated visualSettings from fieldgroup columns
+			 */
+			_computePropertyVisualSettingsForFieldGroup: function(oTable, aProperties) {
+				aProperties.forEach(function(oProperty) {
+					if (oProperty.name.indexOf("DataFieldForAnnotation::FieldGroup::") === 0) {
+						var oColumn = oTable.getColumns().find(function(oColumn) {
+							return oColumn.getDataProperty() === oProperty.name;
+						});
+						var bShowDataFieldsLabel = oColumn.data("showDataFieldsLabel") === "true";
+						var oMetaModel = oTable.getModel().getMetaModel();
+						var oContext = oMetaModel.createBindingContext(oProperty.metadataPath.replace(/@.*/, ""), oMetaModel);
+						var oDataField = oMetaModel.getObject(oProperty.metadataPath);
+						var oFieldGroup = oDataField.Target ? oContext.getObject(oDataField.Target.$AnnotationPath) : null;
+						var aFieldWidth = [];
+						oFieldGroup.Data.forEach(function(oData) {
+							var oDataFieldWidth;
+							switch (oData.$Type) {
+								case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation":
+									oDataFieldWidth = SizeHelper.getWidthForDataFieldForAnnotation(
+										oData,
+										bShowDataFieldsLabel,
+										aProperties,
+										oContext
+									);
+									break;
+								case "com.sap.vocabularies.UI.v1.DataField":
+									oDataFieldWidth = SizeHelper.getWidthForDataField(
+										oData,
+										bShowDataFieldsLabel,
+										aProperties,
+										oContext,
+										oTable
+									);
+									break;
+								case "com.sap.vocabularies.UI.v1.DataFieldForAction":
+									oDataFieldWidth = {
+										labelWidth: 0,
+										propertyWidth: SizeHelper.getButtonWidth(oData.Label)
+									};
+									break;
+								default:
+							}
+							aFieldWidth.push(oDataFieldWidth.labelWidth + oDataFieldWidth.propertyWidth);
+						});
+						var nWidest = aFieldWidth.reduce(function(nWidest, value) {
+							return Math.max(nWidest, value);
+						}, 0);
+						oProperty.visualSettings = deepExtend(oProperty.visualSettings, {
+							widthCalculation: {
+								verticalArrangement: true,
+								minWidth: nWidest
+							}
+						});
+					}
+				});
+				return aProperties;
+			},
+
 			getColumnsFor: function(oTable) {
 				return CommonHelper.parseCustomData(DelegateUtil.getCustomData(oTable, "columns"));
 			},
@@ -103,7 +176,7 @@ sap.ui.define(
 									oColumnInfo.typeConfig.oFormatOptions,
 									oColumnInfo.typeConfig.oConstraints
 							  )
-							: undefined,
+							: {},
 					sDescription = null, // TODO this was erroneous - better having it empty for now
 					bFilterable = CommonHelper.isPropertyFilterable(oColumnInfo.relativePath, { context: oNavigationContext }, oDataField),
 					bComplexType = oColumnInfo.typeConfig && oColumnInfo.typeConfig.className.indexOf("Edm.") !== 0,
@@ -151,6 +224,7 @@ sap.ui.define(
 					groupLabel: oColumnInfo.groupLabel,
 					group: oColumnInfo.group,
 					label: sLabel,
+					tooltip: oColumnInfo.tooltip,
 					description: sDescription || sLabel,
 					maxLength: oNavigationContext.$MaxLength,
 					precision: oNavigationContext.$Precision,
@@ -166,8 +240,15 @@ sap.ui.define(
 					oPropertyInfo.visualSettings = oColumnInfo.visualSettings;
 				}
 				if (exportFormat) {
+					var _oView = sap.ui.fl.Utils.getViewForControl(oTable);
 					// For properties with date/time/dateTime data types, a gap needs to be added to properly render the column width on edit mode
-					oPropertyInfo.visualSettings = { widthCalculation: { gap: 3 } };
+					oPropertyInfo.visualSettings = {
+						widthCalculation: {
+							// a gap of 0.1 is still needed because of the padding of the cell
+							// BCP: 2180413431
+							gap: _oView && _oView.getViewData().converterType === "ListReport" ? 0.1 : 3
+						}
+					};
 				}
 
 				// MDC expects  'propertyInfos' only for complex properties.
@@ -241,71 +322,81 @@ sap.ui.define(
 					mAllowedExpressions = oFR[FilterRestrictions.ALLOWED_EXPRESSIONS],
 					that = this;
 
-				return Promise.resolve(that.getColumnsFor(oTable)).then(function(aColumns) {
-					// DraftAdministrativeData does not work via 'entitySet/$NavigationPropertyBinding/DraftAdministrativeData'
-					if (!aColumns) {
-						return Promise.resolve([]);
-					}
-					var oPropertyInfo;
-					aColumns.forEach(function(oColumnInfo) {
-						if (oColumnInfo.formatOptions && oColumnInfo.formatOptions.hasDraftIndicator) {
-							var oInternalBindingContext = oTable.getBindingContext("internal");
-							var sInternalPath = oInternalBindingContext && oInternalBindingContext.getPath();
-							if (
-								oInternalBindingContext &&
-								oInternalBindingContext.getProperty(sInternalPath + "/semanticKeyHasDraftIndicator") === undefined
-							) {
-								oInternalBindingContext.setProperty(sInternalPath + "/semanticKeyHasDraftIndicator", oColumnInfo.name);
-							}
+				return Promise.resolve(that.getColumnsFor(oTable))
+					.then(function(aColumns) {
+						// DraftAdministrativeData does not work via 'entitySet/$NavigationPropertyBinding/DraftAdministrativeData'
+						if (!aColumns) {
+							return Promise.resolve([]);
 						}
+						var oPropertyInfo;
+						aColumns.forEach(function(oColumnInfo) {
+							if (oColumnInfo.formatOptions && oColumnInfo.formatOptions.hasDraftIndicator) {
+								var oInternalBindingContext = oTable.getBindingContext("internal");
+								var sInternalPath = oInternalBindingContext && oInternalBindingContext.getPath();
+								if (
+									oInternalBindingContext &&
+									oInternalBindingContext.getProperty(sInternalPath + "/semanticKeyHasDraftIndicator") === undefined
+								) {
+									oInternalBindingContext.setProperty(sInternalPath + "/semanticKeyHasDraftIndicator", oColumnInfo.name);
+								}
+							}
 
-						switch (oColumnInfo.type) {
-							case "Annotation":
-								oPropertyInfo = that._fetchPropertyInfo(
-									oMetaModel,
-									oColumnInfo,
-									oTable,
-									oAppComponent,
-									bUseAdditionalProperties
-								);
-								if (oPropertyInfo && aNonFilterableProps.indexOf(oPropertyInfo.name) === -1) {
-									if (mAllowedExpressions[oPropertyInfo.name]) {
-										oPropertyInfo.filterExpression = CommonUtils.getSpecificAllowedExpression(
-											mAllowedExpressions[oPropertyInfo.name]
-										);
-									} else {
-										oPropertyInfo.filterExpression = "auto"; // default
+							switch (oColumnInfo.type) {
+								case "Annotation":
+									oPropertyInfo = that._fetchPropertyInfo(
+										oMetaModel,
+										oColumnInfo,
+										oTable,
+										oAppComponent,
+										bUseAdditionalProperties
+									);
+									if (oPropertyInfo && aNonFilterableProps.indexOf(oPropertyInfo.name) === -1) {
+										if (mAllowedExpressions[oPropertyInfo.name]) {
+											oPropertyInfo.filterExpression = CommonUtils.getSpecificAllowedExpression(
+												mAllowedExpressions[oPropertyInfo.name]
+											);
+										} else {
+											oPropertyInfo.filterExpression = "auto"; // default
+										}
+										oPropertyInfo.maxConditions = DelegateUtil.isMultiValue(oPropertyInfo) ? -1 : 1;
 									}
-									oPropertyInfo.maxConditions = DelegateUtil.isMultiValue(oPropertyInfo) ? -1 : 1;
-								}
-								break;
-							case "Slot":
-							case "Default":
-								oPropertyInfo = that._fetchCustomPropertyInfo(oColumnInfo, oTable, oAppComponent);
-								break;
-							default:
-								throw new Error("unhandled switch case " + oColumnInfo.type);
-						}
-						aFetchedProperties.push(oPropertyInfo);
-					});
+									break;
+								case "Slot":
+								case "Default":
+									oPropertyInfo = that._fetchCustomPropertyInfo(oColumnInfo, oTable, oAppComponent);
+									break;
+								default:
+									throw new Error("unhandled switch case " + oColumnInfo.type);
+							}
+							aFetchedProperties.push(oPropertyInfo);
+						});
 
-					// Set the 'unit' property on the propertyInfos that need one
-					aFetchedProperties.forEach(function(oPropertyInfo) {
-						var sUnitName =
-							oPropertyInfo.path && oPropertyInfo.exportSettings ? oPropertyInfo.exportSettings.unitProperty : undefined;
-						if (sUnitName) {
-							// Find the propertyInfo corresponding to the unit
-							var oUnitPropertyInfo = aFetchedProperties.find(function(oProp) {
-								return oProp.path === sUnitName;
-							});
-							if (oUnitPropertyInfo) {
-								oPropertyInfo.unit = oUnitPropertyInfo.name;
+						// Set the 'unit' property on the propertyInfos that need one
+						aFetchedProperties.forEach(function(oPropertyInfo) {
+							var sUnitName =
+								oPropertyInfo.path && oPropertyInfo.exportSettings ? oPropertyInfo.exportSettings.unitProperty : undefined;
+							if (sUnitName) {
+								// Find the propertyInfo corresponding to the unit
+								var oUnitPropertyInfo = aFetchedProperties.find(function(oProp) {
+									return oProp.path === sUnitName;
+								});
+								if (oUnitPropertyInfo) {
+									oPropertyInfo.unit = oUnitPropertyInfo.name;
+								}
 							}
-						}
+						});
+					})
+					.then(
+						function() {
+							aFetchedProperties = this._computePropertyVisualSettingsForFieldGroup(oTable, aFetchedProperties);
+						}.bind(this)
+					)
+					.catch(function() {
+						Log.error("An error occurs while computing Visual Settings for fieldgroup columns");
+					})
+					.then(function() {
+						return aFetchedProperties;
 					});
-
-					return aFetchedProperties;
-				});
 			},
 
 			_getCachedOrFetchPropertiesForEntity: function(oTable, sEntityTypePath, oMetaModel, oAppComponent, bUseAdditionalProperties) {
@@ -386,10 +477,10 @@ sap.ui.define(
 				}
 			},
 
-			rebindTable: function(oTable, oBindingInfo) {
+			rebind: function(oTable, oBindingInfo) {
 				if (!oTable.data("controlHidden")) {
 					TableUtils.clearSelection(oTable);
-					TableDelegateBase.rebindTable.apply(this, [oTable, oBindingInfo]);
+					TableDelegateBase.rebind.apply(this, [oTable, oBindingInfo]);
 					TableUtils.onTableBound(oTable);
 					this._setTableNoDataText(oTable, oBindingInfo);
 					TableUtils.whenBound(oTable)
@@ -421,13 +512,23 @@ sap.ui.define(
 				});
 			},
 
-			updateBindingInfo: function(oTable, oMetadataInfo, oBindingInfo) {
-				TableDelegateBase.updateBindingInfo.apply(this, [oTable, oMetadataInfo, oBindingInfo]);
+			updateBindingInfo: function(oTable, oBindingInfo) {
+				TableDelegateBase.updateBindingInfo.apply(this, [oTable, oBindingInfo]);
 				if (!oTable.data("controlHidden")) {
-					this._internalUpdateBindingInfo(oTable, oMetadataInfo, oBindingInfo);
+					this._internalUpdateBindingInfo(oTable, oBindingInfo);
 
 					this._setTableNoDataText(oTable, oBindingInfo);
 				}
+
+				/**
+				 * We have to set the binding context to null for every fast creation row to avoid it inheriting
+				 * the wrong context and requesting the table columns on the parent entity
+				 * The correct binding context is set in ObjectPageController.enableFastCreationRow()
+				 */
+				var oFastCreationRow = oTable.getCreationRow();
+				if (oFastCreationRow) {
+					oFastCreationRow.setBindingContext(null);
+				}
 			},
 
 			_manageSemanticTargets: function(oMDCTable) {
@@ -445,14 +546,40 @@ sap.ui.define(
 			},
 
 			updateBinding: function(oTable, oBindingInfo, oBinding) {
+				var bNeedManualRefresh = false;
+				var oInternalBindingContext = oTable.getBindingContext("internal");
+				var sManualUpdatePropertyKey = "pendingManualBindingUpdate";
+				var bPendingManualUpdate = oInternalBindingContext.getProperty(sManualUpdatePropertyKey);
+				var oRowBinding = oTable.getRowBinding();
+				if (oRowBinding) {
+					/**
+					 * Manual refresh if filters are not changed by binding.refresh() since updating the bindingInfo
+					 * is not enough to trigger a batch request.
+					 * Removing columns creates one batch request that was not executed before
+					 */
+					var oldFilters = oRowBinding.getFilters("Application");
+					bNeedManualRefresh =
+						deepEqual(oBindingInfo.filters, oldFilters[0]) &&
+						oRowBinding.getQueryOptionsFromParameters().$search === oBindingInfo.parameters.$search &&
+						!bPendingManualUpdate;
+				}
 				TableDelegateBase.updateBinding.apply(this, [oTable, oBindingInfo, oBinding]);
+				if (bNeedManualRefresh && oTable.getFilter() && oBinding) {
+					oRowBinding
+						.requestRefresh(oRowBinding.getGroupId())
+						.finally(function() {
+							oInternalBindingContext.setProperty(sManualUpdatePropertyKey, false);
+						})
+						.catch(function(oError) {
+							Log.error("Error while refreshing the table", oError);
+						});
+					oInternalBindingContext.setProperty(sManualUpdatePropertyKey, true);
+				}
 				oTable.fireEvent("bindingUpdated");
 				this._manageSemanticTargets(oTable);
-				var oTableAPI = oTable.getParent();
-				oTableAPI.fireStateChanged();
 			},
 
-			_internalUpdateBindingInfo: function(oTable, oMetadataInfo, oBindingInfo) {
+			_internalUpdateBindingInfo: function(oTable, oBindingInfo) {
 				// We need to deepClone the info we get from the custom data, otherwise some of its subobjects (e.g. parameters) will
 				// be shared with oBindingInfo and modified later (Object.assign only does a shallow clone)
 				Object.assign(oBindingInfo, deepClone(DelegateUtil.getCustomData(oTable, "rowsBindingInfo")));

package/packages/sap.fe.macros/src/sap/fe/macros/table/delegates/TableDelegate.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/model/json/JSONModel","sap/fe/macros/CommonHelper","sap/fe/macros/table/Utils","sap/fe/core/CommonUtils","sap/fe/core/helpers/ModelHelper","sap/fe/macros/DelegateUtil","sap/ui/model/Filter","sap/base/Log","sap/ui/mdc/odata/v4/TypeUtil","sap/fe/macros/FilterBarDelegate","sap/fe/core/helpers/ExcelFormatHelper","sap/fe/macros/table/TableHelper","sap/fe/macros/ResourceModel","sap/base/util/deepClone","sap/ui/mdc/odata/v4/TableDelegate"],function(J,C,T,a,M,D,F,L,b,c,E,d,R,e,f){"use strict";var g="sap_fe_TableDelegate_propertyInfoMap";var h=a.FilterRestrictions;function _(p){return p&&p.metadataPath.includes("@com.sap.vocabularies.UI.v1.LineItem");}function k(t,i,u){if(t instanceof window.Element){return;}var j=u?g+"_add":g;D.setCustomData(t,j,i);}function l(t,u){if(t instanceof window.Element){return null;}var i=u?g+"_add":g;return D.getCustomData(t,i);}var O=Object.assign({},f,{getColumnsFor:function(t){return C.parseCustomData(D.getCustomData(t,"columns"));},_getAggregatedPropertyMap:function(t){return C.parseCustomData(D.getCustomData(t,"aggregates")||{});},_fetchPropertyInfo:function(m,o,t,A,u){var s=o.annotationPath,i=m.getObject(o.annotationPath),n=m.createBindingContext(s),j=o.typeConfig&&o.typeConfig.className&&D.isTypeFilterable(o.typeConfig.className)?b.getTypeConfig(o.typeConfig.className,o.typeConfig.oFormatOptions,o.typeConfig.oConstraints):undefined,p=null,q=C.isPropertyFilterable(o.relativePath,{context:n},i),r=o.typeConfig&&o.typeConfig.className.indexOf("Edm.")!==0,v=o.isDataPointFakeTargetProperty?R.getText("TargetValue"):D.getLocalizedText(o.label,A||t),I=D.getCustomData(t,"enableAnalytics")==="true",w=I?this._getAggregatedPropertyMap(t):{},x=o.exportSettings,y=o.typeConfig&&o.typeConfig.className?this._getExportFormat(o.typeConfig.className):undefined;if(x){if(y){x.format=y;}if(x.template){x.template=o.exportSettings.template;}if(x.label){var z=x.label?D.getLocalizedText(o.exportSettings.label,t):undefined;if(z!==undefined&&!sap.ui.getCore().getConfiguration().getRTL()){v=z+" - "+v;}else{v=v+" - "+z;}}}var P={name:o.name,metadataPath:s,groupLabel:o.groupLabel,group:o.group,label:v,description:p||v,maxLength:n.$MaxLength,precision:n.$Precision,scale:n.$Scale,typeConfig:j,visible:o.availability!=="Hidden"&&!r,exportSettings:x,unit:o.unit};if(o.visualSettings&&Object.keys(o.visualSettings).length>0){P.visualSettings=o.visualSettings;}if(y){P.visualSettings={widthCalculation:{gap:3}};}if(o.propertyInfos&&o.propertyInfos.length){P.propertyInfos=o.propertyInfos;P.exportSettings.wrap=o.exportSettings.wrap;if(u&&o.additionalPropertyInfos&&o.additionalPropertyInfos.length){P.propertyInfos=P.propertyInfos.concat(o.additionalPropertyInfos);}}else{P.path=o.relativePath;P.sortable=o.sortable;P.filterable=!o.isDataPointFakeTargetProperty&&q&&!o.relativePath.includes("/")&&(!I||!w[P.name]);P.key=o.isKey;P.groupable=o.isGroupable;P.text=o.textArrangement&&o.textArrangement.textProperty;P.caseSensitive=o.caseSensitive;}return P;},_fetchCustomPropertyInfo:function(o,t,A){var s=D.getLocalizedText(o.header,A||t);var p={name:o.name,groupLabel:null,group:null,label:s,description:s,maxLength:undefined,precision:undefined,scale:undefined,type:"Edm.String",visible:o.availability!=="Hidden",exportSettings:{template:o.exportSettings.template}};if(o.propertyInfos&&o.propertyInfos.length){p.propertyInfos=o.propertyInfos;p.exportSettings.wrap=o.exportSettings.wrap;}else{p.path=o.name;p.sortable=false;p.filterable=false;}return p;},_fetchPropertiesForEntity:function(t,s,m,A,u){var B=M.getEntitySetPath(s),i=[],o=a.getFilterRestrictionsByPath(B,m),n=o[h.NON_FILTERABLE_PROPERTIES],j=o[h.ALLOWED_EXPRESSIONS],p=this;return Promise.resolve(p.getColumnsFor(t)).then(function(q){if(!q){return Promise.resolve([]);}var P;q.forEach(function(r){if(r.formatOptions&&r.formatOptions.hasDraftIndicator){var I=t.getBindingContext("internal");var v=I&&I.getPath();if(I&&I.getProperty(v+"/semanticKeyHasDraftIndicator")===undefined){I.setProperty(v+"/semanticKeyHasDraftIndicator",r.name);}}switch(r.type){case"Annotation":P=p._fetchPropertyInfo(m,r,t,A,u);if(P&&n.indexOf(P.name)===-1){if(j[P.name]){P.filterExpression=a.getSpecificAllowedExpression(j[P.name]);}else{P.filterExpression="auto";}P.maxConditions=D.isMultiValue(P)?-1:1;}break;case"Slot":case"Default":P=p._fetchCustomPropertyInfo(r,t,A);break;default:throw new Error("unhandled switch case "+r.type);}i.push(P);});i.forEach(function(P){var U=P.path&&P.exportSettings?P.exportSettings.unitProperty:undefined;if(U){var r=i.find(function(v){return v.path===U;});if(r){P.unit=r.name;}}});return i;});},_getCachedOrFetchPropertiesForEntity:function(t,s,m,A,u){var i=l(t,u);if(i){return Promise.resolve(i);}return this._fetchPropertiesForEntity(t,s,m,A,u).then(function(i){k(t,i,u);return i;});},_setTableNoDataText:function(t,B){var n="",o=T.getAllFilterInfo(t),s=B.path.substr(1);var i=function(){if(t.data("hiddenFilters")||t.data("quickFilterKey")){return"M_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER_MULTI_VIEW";}else{return"T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER";}};var j=t.getFilter();if(j&&!/BasicSearch$/.test(j)){if(o.search||(o.filters&&o.filters.length)){n=i();}else{n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT";}}else{if(o.search||(o.filters&&o.filters.length)){n=i();}else{n="M_OP_TABLE_AND_CHART_OP_NO_FILTERS_NO_DATA_TEXT";}}if(n==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER"||n==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT"){return t.getModel("sap.fe.i18n").getResourceBundle().then(function(r){t.setNoDataText(a.getTranslatedText(n,r,null,s));}).catch(function(m){L.error(m);});}else{if(R){t.setNoDataText(R.getText(n));}}},handleTableDataReceived:function(t,i){var B=t&&t.getRowBinding(),j=i&&i.getProperty("dataReceivedAttached");if(i&&!j){B.attachDataReceived(function(){d.handleTableDeleteEnablementForSideEffects(t,i);i.setProperty("selectedContexts",[]);var s=t.getSelectedContexts();i.setProperty("selectedContexts",s);i.setProperty("numberOfSelectedContexts",s.length);});i.setProperty("dataReceivedAttached",true);}},rebindTable:function(t,B){if(!t.data("controlHidden")){T.clearSelection(t);f.rebindTable.apply(this,[t,B]);T.onTableBound(t);this._setTableNoDataText(t,B);T.whenBound(t).then(this.handleTableDataReceived(t,t.getBindingContext("internal"))).catch(function(o){L.error("Error while waiting for the table to be bound",o);});}},fetchProperties:function(t){var i=this;return D.fetchModel(t).then(function(m){if(!m){return[];}return i._getCachedOrFetchPropertiesForEntity(t,D.getCustomData(t,"entityType"),m.getMetaModel());});},updateBindingInfo:function(t,m,B){f.updateBindingInfo.apply(this,[t,m,B]);if(!t.data("controlHidden")){this._internalUpdateBindingInfo(t,m,B);this._setTableNoDataText(t,B);}},_manageSemanticTargets:function(m){var r=m.getRowBinding();if(r){r.attachEventOnce("dataRequested",function(){setTimeout(function(){var i=sap.ui.fl.Utils.getViewForControl(m);if(i){T.getSemanticTargetsFromTable(i.getController(),m);}},0);});}},updateBinding:function(t,B,o){f.updateBinding.apply(this,[t,B,o]);t.fireEvent("bindingUpdated");this._manageSemanticTargets(t);var i=t.getParent();i.fireStateChanged();},_internalUpdateBindingInfo:function(t,m,B){Object.assign(B,e(D.getCustomData(t,"rowsBindingInfo")));if(t.getRowBinding()){B.suspended=false;}var o;var i=T.getAllFilterInfo(t);if(i.filters.length>0){o=new F({filters:i.filters,and:true});}if(i.bindingPath){B.path=i.bindingPath;}var j=t.getDataStateIndicator();if(j&&j.isFiltering()){if(B.filters.length>0){o=new F({filters:B.filters.concat(i.filters),and:true});T.updateBindingInfo(B,i,o);}}else{T.updateBindingInfo(B,i,o);}},_templateCustomColumnFragment:function(o,v,m,t){var i=new J(o),j=new J({id:t}),p={bindingContexts:{"this":j.createBindingContext("/"),"column":i.createBindingContext("/")},models:{"this":j,"column":i}};return D.templateControlFragment("sap.fe.macros.table.CustomColumn",p,{view:v},m).then(function(I){i.destroy();return I;});},_getExportFormat:function(i){switch(i){case"Edm.Date":return E.getExcelDatefromJSDate();case"Edm.DateTimeOffset":return E.getExcelDateTimefromJSDateTime();case"Edm.TimeOfDay":return E.getExcelTimefromJSTime();default:return undefined;}},_getVHRelevantFields:function(m,s,B){var i=[],o=m.getObject(s),t=this;if(o.$kind&&o.$kind==="Property"){o=m.getObject(s+"@com.sap.vocabularies.UI.v1.DataFieldDefault");s=s+"@com.sap.vocabularies.UI.v1.DataFieldDefault";}switch(o.$Type){case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":if(m.getObject(s+"/Target/$AnnotationPath").includes("com.sap.vocabularies.UI.v1.FieldGroup")){m.getObject(s+"/Target/$AnnotationPath/Data").forEach(function(v,I){i=i.concat(t._getVHRelevantFields(m,s+"/Target/$AnnotationPath/Data/"+I));});}break;case"com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":case"com.sap.vocabularies.UI.v1.DataFieldWithUrl":case"com.sap.vocabularies.UI.v1.DataField":i.push(m.getObject(s+"/Value/$Path"));break;case"com.sap.vocabularies.UI.v1.DataFieldForAction":case"com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation":break;default:if(s.indexOf(B)===0){i.push(s.substring(B.length+1));break;}i.push(C.getNavigationPath(s,true));break;}return i;},_setDraftIndicatorOnVisibleColumn:function(t,o){var m=this.getColumnsFor(t);if(m){var I=t.getBindingContext("internal");var s=I.getPath();var n=m.filter(function(r){return r.formatOptions&&r.formatOptions.hasDraftIndicator;});var v=t.getColumns();var A,V,p,q;for(var i=0;i<v.length;i++){V=v[i].getDataProperty();for(var j=0;j<n.length;j++){q=n[j].name;if(V===q){p=true;break;}if(o&&o.name===q){A=o.name;}}if(p){I.setProperty(s+"/semanticKeyHasDraftIndicator",V);break;}}if(!p&&A){I.setProperty(s+"/semanticKeyHasDraftIndicator",A);}}},removeItem:function(p,t,P){var i=true;var m=P.modifier;var s=m.getProperty(p,"dataProperty");if(s&&s.indexOf&&s.indexOf("InlineXML")!==-1){m.insertAggregation(t,"dependents",p);i=false;}this._setDraftIndicatorOnVisibleColumn(t);return Promise.resolve(i);},addItem:function(p,t,P){var m=P.appComponent&&P.appComponent.getModel().getMetaModel(),o=P.modifier,s=o.getId(t),i,G,j,n,q,r,u,v,V,w,x=this.getColumnsFor(t),y=this;q=x.find(function(B){return B.name===p;});if(!q){L.error(p+" not found while adding column");return Promise.resolve(null);}this._setDraftIndicatorOnVisibleColumn(t,q);if(q.type==="Default"){return this._templateCustomColumnFragment(q,P.view,o,s);}if(q.type==="Slot"){var z=o.getAggregation(t,"dependents");var A;z.forEach(function(B){var H=o.getProperty(B,"dataProperty");if(p===H){A=B;}});if(A){return Promise.resolve(A);}}if(!m){return Promise.resolve(null);}return Promise.resolve().then(D.getCustomData.bind(D,t,"metaPath",o)).then(function(B){i=B;return D.getCustomData(t,"entityType",o);}).then(function(B){w=B;return D.getCustomData(t,"requestGroupId",o);}).then(function(B){G=B||undefined;n=m.createBindingContext(i);return this._getCachedOrFetchPropertiesForEntity(t,w,m,P.appComponent).then(function(H){u=H.find(function(N){return N.name===p;});r=m.createBindingContext(u.metadataPath);V=y._getVHRelevantFields(m,u.metadataPath,i);v={sBindingPath:i,sValueHelpType:"TableValueHelp",oControl:t,oMetaModel:m,oModifier:o,oPropertyInfo:u};j=Promise.all(V.map(function(N){var Q=Object.assign({},v,{sPropertyName:N});return Promise.all([D.isValueHelpRequired(Q),D.doesValueHelpExist(Q)]).then(function(S){var U=S[0],W=S[1];if(U&&!W){return I("sap.fe.macros.table.ValueHelp");}return Promise.resolve();});}));function I(N){var Q=new J({id:s,requestGroupId:G}),S={bindingContexts:{"this":Q.createBindingContext("/"),"dataField":r},models:{"this":Q,"dataField":m,metaModel:m}};return D.templateControlFragment(N,S,{},o).then(function(U){if(U){return o.insertAggregation(t,"dependents",U,0);}}).catch(function(U){L.error("ValueHelp not loaded : "+U.message);return Promise.resolve(null);}).finally(function(){Q.destroy();});}function K(u,N){var Q=_(u)?"sap.fe.macros.table.Column":"sap.fe.macros.table.ColumnProperty";var S;var U;var W;var X;return Promise.all([D.getCustomData(t,"displayModePropertyBinding",o),D.getCustomData(t,"tableType",o),D.getCustomData(t,"onChange",o),D.getCustomData(t,"creationMode",o)]).then(function(Y){S=Y[0];U=Y[1];W=Y[2];X=Y[3];var Z;if(S!==undefined){S=typeof S==="boolean"?S:S==="true";Z=S?"Display":"Editable";}var $=new J({readOnly:S,columnEditMode:Z,tableType:U,onChange:W,id:s,navigationPropertyPath:p,columnInfo:q,collection:{sPath:i,oModel:m},creationMode:X}),a1={bindingContexts:{"entitySet":n,"collection":n,"dataField":r,"this":$.createBindingContext("/"),"column":$.createBindingContext("/columnInfo")},models:{"this":$,"entitySet":m,"collection":m,"dataField":m,metaModel:m,"column":$}};return D.templateControlFragment(Q,a1,{view:N},o).finally(function(){$.destroy();});});}return j.then(K.bind(this,u,P.view));});}.bind(this));},getFilterDelegate:function(){return Object.assign({},c,{addItem:function(p,P){if(p.indexOf("Property::")===0){p=p.replace("Property::","");}return c.addItem(p,P);}});},getTypeUtil:function(p){return b;}});return O;},false);
+sap.ui.define(["sap/ui/model/json/JSONModel","sap/fe/macros/CommonHelper","sap/fe/macros/table/Utils","sap/fe/core/CommonUtils","sap/fe/core/helpers/ModelHelper","sap/fe/macros/DelegateUtil","sap/ui/model/Filter","sap/base/Log","sap/ui/mdc/odata/v4/TypeUtil","sap/fe/macros/FilterBarDelegate","sap/fe/core/helpers/ExcelFormatHelper","sap/fe/macros/table/TableHelper","sap/fe/macros/ResourceModel","sap/base/util/deepClone","sap/base/util/deepEqual","sap/ui/mdc/odata/v4/TableDelegate","sap/base/util/deepExtend","sap/fe/macros/SizeHelper"],function(J,C,T,a,M,D,F,L,b,c,E,d,R,e,f,g,h,S){"use strict";var k="sap_fe_TableDelegate_propertyInfoMap";var l=a.FilterRestrictions;function _(p){return p&&p.metadataPath.includes("@com.sap.vocabularies.UI.v1.LineItem");}function m(t,i,u){if(t instanceof window.Element){return;}var j=u?k+"_add":k;D.setCustomData(t,j,i);}function n(t,u){if(t instanceof window.Element){return null;}var i=u?k+"_add":k;return D.getCustomData(t,i);}var O=Object.assign({},g,{_computePropertyVisualSettingsForFieldGroup:function(t,p){p.forEach(function(P){if(P.name.indexOf("DataFieldForAnnotation::FieldGroup::")===0){var o=t.getColumns().find(function(o){return o.getDataProperty()===P.name;});var s=o.data("showDataFieldsLabel")==="true";var i=t.getModel().getMetaModel();var j=i.createBindingContext(P.metadataPath.replace(/@.*/,""),i);var q=i.getObject(P.metadataPath);var r=q.Target?j.getObject(q.Target.$AnnotationPath):null;var u=[];r.Data.forEach(function(w){var x;switch(w.$Type){case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":x=S.getWidthForDataFieldForAnnotation(w,s,p,j);break;case"com.sap.vocabularies.UI.v1.DataField":x=S.getWidthForDataField(w,s,p,j,t);break;case"com.sap.vocabularies.UI.v1.DataFieldForAction":x={labelWidth:0,propertyWidth:S.getButtonWidth(w.Label)};break;default:}u.push(x.labelWidth+x.propertyWidth);});var v=u.reduce(function(v,w){return Math.max(v,w);},0);P.visualSettings=h(P.visualSettings,{widthCalculation:{verticalArrangement:true,minWidth:v}});}});return p;},getColumnsFor:function(t){return C.parseCustomData(D.getCustomData(t,"columns"));},_getAggregatedPropertyMap:function(t){return C.parseCustomData(D.getCustomData(t,"aggregates")||{});},_fetchPropertyInfo:function(o,i,t,A,u){var s=i.annotationPath,j=o.getObject(i.annotationPath),N=o.createBindingContext(s),p=i.typeConfig&&i.typeConfig.className&&D.isTypeFilterable(i.typeConfig.className)?b.getTypeConfig(i.typeConfig.className,i.typeConfig.oFormatOptions,i.typeConfig.oConstraints):{},q=null,r=C.isPropertyFilterable(i.relativePath,{context:N},j),v=i.typeConfig&&i.typeConfig.className.indexOf("Edm.")!==0,w=i.isDataPointFakeTargetProperty?R.getText("TargetValue"):D.getLocalizedText(i.label,A||t),I=D.getCustomData(t,"enableAnalytics")==="true",x=I?this._getAggregatedPropertyMap(t):{},y=i.exportSettings,z=i.typeConfig&&i.typeConfig.className?this._getExportFormat(i.typeConfig.className):undefined;if(y){if(z){y.format=z;}if(y.template){y.template=i.exportSettings.template;}if(y.label){var B=y.label?D.getLocalizedText(i.exportSettings.label,t):undefined;if(B!==undefined&&!sap.ui.getCore().getConfiguration().getRTL()){w=B+" - "+w;}else{w=w+" - "+B;}}}var P={name:i.name,metadataPath:s,groupLabel:i.groupLabel,group:i.group,label:w,tooltip:i.tooltip,description:q||w,maxLength:N.$MaxLength,precision:N.$Precision,scale:N.$Scale,typeConfig:p,visible:i.availability!=="Hidden"&&!v,exportSettings:y,unit:i.unit};if(i.visualSettings&&Object.keys(i.visualSettings).length>0){P.visualSettings=i.visualSettings;}if(z){var G=sap.ui.fl.Utils.getViewForControl(t);P.visualSettings={widthCalculation:{gap:G&&G.getViewData().converterType==="ListReport"?0.1:3}};}if(i.propertyInfos&&i.propertyInfos.length){P.propertyInfos=i.propertyInfos;P.exportSettings.wrap=i.exportSettings.wrap;if(u&&i.additionalPropertyInfos&&i.additionalPropertyInfos.length){P.propertyInfos=P.propertyInfos.concat(i.additionalPropertyInfos);}}else{P.path=i.relativePath;P.sortable=i.sortable;P.filterable=!i.isDataPointFakeTargetProperty&&r&&!i.relativePath.includes("/")&&(!I||!x[P.name]);P.key=i.isKey;P.groupable=i.isGroupable;P.text=i.textArrangement&&i.textArrangement.textProperty;P.caseSensitive=i.caseSensitive;}return P;},_fetchCustomPropertyInfo:function(o,t,A){var s=D.getLocalizedText(o.header,A||t);var p={name:o.name,groupLabel:null,group:null,label:s,description:s,maxLength:undefined,precision:undefined,scale:undefined,type:"Edm.String",visible:o.availability!=="Hidden",exportSettings:{template:o.exportSettings.template}};if(o.propertyInfos&&o.propertyInfos.length){p.propertyInfos=o.propertyInfos;p.exportSettings.wrap=o.exportSettings.wrap;}else{p.path=o.name;p.sortable=false;p.filterable=false;}return p;},_fetchPropertiesForEntity:function(t,s,o,A,u){var B=M.getEntitySetPath(s),i=[],j=a.getFilterRestrictionsByPath(B,o),N=j[l.NON_FILTERABLE_PROPERTIES],p=j[l.ALLOWED_EXPRESSIONS],q=this;return Promise.resolve(q.getColumnsFor(t)).then(function(r){if(!r){return Promise.resolve([]);}var P;r.forEach(function(v){if(v.formatOptions&&v.formatOptions.hasDraftIndicator){var I=t.getBindingContext("internal");var w=I&&I.getPath();if(I&&I.getProperty(w+"/semanticKeyHasDraftIndicator")===undefined){I.setProperty(w+"/semanticKeyHasDraftIndicator",v.name);}}switch(v.type){case"Annotation":P=q._fetchPropertyInfo(o,v,t,A,u);if(P&&N.indexOf(P.name)===-1){if(p[P.name]){P.filterExpression=a.getSpecificAllowedExpression(p[P.name]);}else{P.filterExpression="auto";}P.maxConditions=D.isMultiValue(P)?-1:1;}break;case"Slot":case"Default":P=q._fetchCustomPropertyInfo(v,t,A);break;default:throw new Error("unhandled switch case "+v.type);}i.push(P);});i.forEach(function(P){var U=P.path&&P.exportSettings?P.exportSettings.unitProperty:undefined;if(U){var v=i.find(function(w){return w.path===U;});if(v){P.unit=v.name;}}});}).then(function(){i=this._computePropertyVisualSettingsForFieldGroup(t,i);}.bind(this)).catch(function(){L.error("An error occurs while computing Visual Settings for fieldgroup columns");}).then(function(){return i;});},_getCachedOrFetchPropertiesForEntity:function(t,s,o,A,u){var i=n(t,u);if(i){return Promise.resolve(i);}return this._fetchPropertiesForEntity(t,s,o,A,u).then(function(i){m(t,i,u);return i;});},_setTableNoDataText:function(t,B){var N="",o=T.getAllFilterInfo(t),s=B.path.substr(1);var i=function(){if(t.data("hiddenFilters")||t.data("quickFilterKey")){return"M_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER_MULTI_VIEW";}else{return"T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER";}};var j=t.getFilter();if(j&&!/BasicSearch$/.test(j)){if(o.search||(o.filters&&o.filters.length)){N=i();}else{N="T_OP_TABLE_AND_CHART_NO_DATA_TEXT";}}else{if(o.search||(o.filters&&o.filters.length)){N=i();}else{N="M_OP_TABLE_AND_CHART_OP_NO_FILTERS_NO_DATA_TEXT";}}if(N==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER"||N==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT"){return t.getModel("sap.fe.i18n").getResourceBundle().then(function(r){t.setNoDataText(a.getTranslatedText(N,r,null,s));}).catch(function(p){L.error(p);});}else{if(R){t.setNoDataText(R.getText(N));}}},handleTableDataReceived:function(t,i){var B=t&&t.getRowBinding(),j=i&&i.getProperty("dataReceivedAttached");if(i&&!j){B.attachDataReceived(function(){d.handleTableDeleteEnablementForSideEffects(t,i);i.setProperty("selectedContexts",[]);var s=t.getSelectedContexts();i.setProperty("selectedContexts",s);i.setProperty("numberOfSelectedContexts",s.length);});i.setProperty("dataReceivedAttached",true);}},rebind:function(t,B){if(!t.data("controlHidden")){T.clearSelection(t);g.rebind.apply(this,[t,B]);T.onTableBound(t);this._setTableNoDataText(t,B);T.whenBound(t).then(this.handleTableDataReceived(t,t.getBindingContext("internal"))).catch(function(o){L.error("Error while waiting for the table to be bound",o);});}},fetchProperties:function(t){var i=this;return D.fetchModel(t).then(function(o){if(!o){return[];}return i._getCachedOrFetchPropertiesForEntity(t,D.getCustomData(t,"entityType"),o.getMetaModel());});},updateBindingInfo:function(t,B){g.updateBindingInfo.apply(this,[t,B]);if(!t.data("controlHidden")){this._internalUpdateBindingInfo(t,B);this._setTableNoDataText(t,B);}var o=t.getCreationRow();if(o){o.setBindingContext(null);}},_manageSemanticTargets:function(o){var r=o.getRowBinding();if(r){r.attachEventOnce("dataRequested",function(){setTimeout(function(){var i=sap.ui.fl.Utils.getViewForControl(o);if(i){T.getSemanticTargetsFromTable(i.getController(),o);}},0);});}},updateBinding:function(t,B,o){var N=false;var i=t.getBindingContext("internal");var s="pendingManualBindingUpdate";var p=i.getProperty(s);var r=t.getRowBinding();if(r){var j=r.getFilters("Application");N=f(B.filters,j[0])&&r.getQueryOptionsFromParameters().$search===B.parameters.$search&&!p;}g.updateBinding.apply(this,[t,B,o]);if(N&&t.getFilter()&&o){r.requestRefresh(r.getGroupId()).finally(function(){i.setProperty(s,false);}).catch(function(q){L.error("Error while refreshing the table",q);});i.setProperty(s,true);}t.fireEvent("bindingUpdated");this._manageSemanticTargets(t);},_internalUpdateBindingInfo:function(t,B){Object.assign(B,e(D.getCustomData(t,"rowsBindingInfo")));if(t.getRowBinding()){B.suspended=false;}var o;var i=T.getAllFilterInfo(t);if(i.filters.length>0){o=new F({filters:i.filters,and:true});}if(i.bindingPath){B.path=i.bindingPath;}var j=t.getDataStateIndicator();if(j&&j.isFiltering()){if(B.filters.length>0){o=new F({filters:B.filters.concat(i.filters),and:true});T.updateBindingInfo(B,i,o);}}else{T.updateBindingInfo(B,i,o);}},_templateCustomColumnFragment:function(o,v,i,t){var j=new J(o),p=new J({id:t}),P={bindingContexts:{"this":p.createBindingContext("/"),"column":j.createBindingContext("/")},models:{"this":p,"column":j}};return D.templateControlFragment("sap.fe.macros.table.CustomColumn",P,{view:v},i).then(function(I){j.destroy();return I;});},_getExportFormat:function(i){switch(i){case"Edm.Date":return E.getExcelDatefromJSDate();case"Edm.DateTimeOffset":return E.getExcelDateTimefromJSDateTime();case"Edm.TimeOfDay":return E.getExcelTimefromJSTime();default:return undefined;}},_getVHRelevantFields:function(o,s,B){var i=[],j=o.getObject(s),t=this;if(j.$kind&&j.$kind==="Property"){j=o.getObject(s+"@com.sap.vocabularies.UI.v1.DataFieldDefault");s=s+"@com.sap.vocabularies.UI.v1.DataFieldDefault";}switch(j.$Type){case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":if(o.getObject(s+"/Target/$AnnotationPath").includes("com.sap.vocabularies.UI.v1.FieldGroup")){o.getObject(s+"/Target/$AnnotationPath/Data").forEach(function(v,I){i=i.concat(t._getVHRelevantFields(o,s+"/Target/$AnnotationPath/Data/"+I));});}break;case"com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":case"com.sap.vocabularies.UI.v1.DataFieldWithUrl":case"com.sap.vocabularies.UI.v1.DataField":i.push(o.getObject(s+"/Value/$Path"));break;case"com.sap.vocabularies.UI.v1.DataFieldForAction":case"com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation":break;default:if(s.indexOf(B)===0){i.push(s.substring(B.length+1));break;}i.push(C.getNavigationPath(s,true));break;}return i;},_setDraftIndicatorOnVisibleColumn:function(t,o){var p=this.getColumnsFor(t);if(p){var I=t.getBindingContext("internal");var s=I.getPath();var q=p.filter(function(w){return w.formatOptions&&w.formatOptions.hasDraftIndicator;});var v=t.getColumns();var A,V,r,u;for(var i=0;i<v.length;i++){V=v[i].getDataProperty();for(var j=0;j<q.length;j++){u=q[j].name;if(V===u){r=true;break;}if(o&&o.name===u){A=o.name;}}if(r){I.setProperty(s+"/semanticKeyHasDraftIndicator",V);break;}}if(!r&&A){I.setProperty(s+"/semanticKeyHasDraftIndicator",A);}}},removeItem:function(p,t,P){var i=true;var o=P.modifier;var s=o.getProperty(p,"dataProperty");if(s&&s.indexOf&&s.indexOf("InlineXML")!==-1){o.insertAggregation(t,"dependents",p);i=false;}this._setDraftIndicatorOnVisibleColumn(t);return Promise.resolve(i);},addItem:function(p,t,P){var o=P.appComponent&&P.appComponent.getModel().getMetaModel(),i=P.modifier,s=i.getId(t),j,G,q,r,u,v,w,x,V,y,z=this.getColumnsFor(t),A=this;u=z.find(function(I){return I.name===p;});if(!u){L.error(p+" not found while adding column");return Promise.resolve(null);}this._setDraftIndicatorOnVisibleColumn(t,u);if(u.type==="Default"){return this._templateCustomColumnFragment(u,P.view,i,s);}if(u.type==="Slot"){var B=i.getAggregation(t,"dependents");var H;B.forEach(function(I){var K=i.getProperty(I,"dataProperty");if(p===K){H=I;}});if(H){return Promise.resolve(H);}}if(!o){return Promise.resolve(null);}return Promise.resolve().then(D.getCustomData.bind(D,t,"metaPath",i)).then(function(I){j=I;return D.getCustomData(t,"entityType",i);}).then(function(I){y=I;return D.getCustomData(t,"requestGroupId",i);}).then(function(I){G=I||undefined;r=o.createBindingContext(j);return this._getCachedOrFetchPropertiesForEntity(t,y,o,P.appComponent).then(function(K){w=K.find(function(U){return U.name===p;});v=o.createBindingContext(w.metadataPath);V=A._getVHRelevantFields(o,w.metadataPath,j);x={sBindingPath:j,sValueHelpType:"TableValueHelp",oControl:t,oMetaModel:o,oModifier:i,oPropertyInfo:w};q=Promise.all(V.map(function(U){var W=Object.assign({},x,{sPropertyName:U});return Promise.all([D.isValueHelpRequired(W),D.doesValueHelpExist(W)]).then(function(X){var Y=X[0],Z=X[1];if(Y&&!Z){return N("sap.fe.macros.table.ValueHelp");}return Promise.resolve();});}));function N(U){var W=new J({id:s,requestGroupId:G}),X={bindingContexts:{"this":W.createBindingContext("/"),"dataField":v},models:{"this":W,"dataField":o,metaModel:o}};return D.templateControlFragment(U,X,{},i).then(function(Y){if(Y){return i.insertAggregation(t,"dependents",Y,0);}}).catch(function(Y){L.error("ValueHelp not loaded : "+Y.message);return Promise.resolve(null);}).finally(function(){W.destroy();});}function Q(w,U){var W=_(w)?"sap.fe.macros.table.Column":"sap.fe.macros.table.ColumnProperty";var X;var Y;var Z;var $;return Promise.all([D.getCustomData(t,"displayModePropertyBinding",i),D.getCustomData(t,"tableType",i),D.getCustomData(t,"onChange",i),D.getCustomData(t,"creationMode",i)]).then(function(a1){X=a1[0];Y=a1[1];Z=a1[2];$=a1[3];var b1;if(X!==undefined){X=typeof X==="boolean"?X:X==="true";b1=X?"Display":"Editable";}var c1=new J({readOnly:X,columnEditMode:b1,tableType:Y,onChange:Z,id:s,navigationPropertyPath:p,columnInfo:u,collection:{sPath:j,oModel:o},creationMode:$}),d1={bindingContexts:{"entitySet":r,"collection":r,"dataField":v,"this":c1.createBindingContext("/"),"column":c1.createBindingContext("/columnInfo")},models:{"this":c1,"entitySet":o,"collection":o,"dataField":o,metaModel:o,"column":c1}};return D.templateControlFragment(W,d1,{view:U},i).finally(function(){c1.destroy();});});}return q.then(Q.bind(this,w,P.view));});}.bind(this));},getFilterDelegate:function(){return Object.assign({},c,{addItem:function(p,P){if(p.indexOf("Property::")===0){p=p.replace("Property::","");}return c.addItem(p,P);}});},getTypeUtil:function(p){return b;}});return O;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/valuehelp/ValueHelpFilterBar.fragment.xml

@@ -5,11 +5,11 @@
 	xmlns:mdcFbVh="sap.ui.mdc.filterbar.vh"
 	xmlns="sap.m"
 	xmlns:macro="sap.fe.macros"
+	xmlns:internalMacro="sap.fe.macros.internal"
 	xmlns:log="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:macroData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	template:require="{
 		ID: 'sap/fe/core/helpers/StableIdHelper',
-		FB: 'sap/fe/macros/FilterBarHelper',
 		COMMON: 'sap/fe/macros/CommonHelper',
 		MACRO: 'sap/fe/macros/MacroTemplating'
 	}"
@@ -65,7 +65,7 @@
 		* there is no SearchRestrictions
 		* the SearchRestrictions has Searchable === true
 		-->
-		<template:if test="{parts: [{path:'this>hideBasicSearch'}, {path:'contextPath>'}], formatter:'FB.checkIfBasicSearchIsVisible'}">
+		<template:if test="{= !${this>hideBasicSearch} }">
 			<mdc:basicSearchField>
 				<mdc:FilterField
 					placeholder="{this.i18n>M_FILTERBAR_SEARCH}"
@@ -80,7 +80,7 @@
 				<template:if test="{= ${item>availability} === 'Default'}">
 					<template:if test="{= ${item>template} === undefined}">
 						<template:then>
-							<macro:FilterField
+							<internalMacro:FilterField
 								idPrefix="{= ID.generate([${this>id}, 'FilterField', COMMON.getNavigationPath(${item>annotationPath})]) }"
 								vhIdPrefix="{= ID.generate([${this>id}, 'FilterFieldValueHelp', COMMON.getNavigationPath(${item>annotationPath})]) }"
 								contextPath="{contextPath>}"
@@ -98,7 +98,7 @@
 			</template:repeat>
 			<template:if test="{= !${contextPath>@com.sap.vocabularies.UI.v1.SelectionFields} &amp;&amp; (${this>enableFallback} === 'true') }">
 				<template:repeat list="{path:'contextPath>', filters: {path: '$kind', operator: 'EQ', value1:'Property'}}" var="selectionField">
-					<macro:FilterField
+					<internalMacro:FilterField
 						contextPath="{contextPath>}"
 						property="{selectionField>}"
 						_valueList="{_valueList>}"