@sap/open.fe 1.96.0 → 1.97.0

package/packages/sap.fe.macros/src/sap/fe/macros/table/Actions.fragment.xml

@@ -36,6 +36,7 @@
 					<mdcat:ActionToolbarAction>
 							<MenuButton
 							text="{action>text}"
+							type="Transparent"
 							menuPosition="BeginBottom"
 							id="{= ID.generate([${this>id},${action>id}])}"
 							visible="{action>visible}"
@@ -100,6 +101,7 @@
 													text="{dataField>Label}"
 													ariaHasPopup="{actionContext>@@COMMON.isDialog}"
 													press="{= TABLE.pressEventDataFieldForActionButton(${this>}, ${dataField>}, ${collection>@sapui.name}, ${tableDefinition>operationAvailableMap}, ${actionContext>},${action>isNavigable}, ${action>enableAutoScroll}, ${action>defaultValuesExtensionFunction}) }"
+													type="Transparent"
 													enabled="{= ${action>enabled} !== undefined ? ${action>enabled} : TABLE.isDataFieldForActionEnabled(${this>},${dataField>},${isBound>$IsBound}, false, ${actionContext>}, ${action>enableOnSelect})}"
 													visible="{action>visible}"
 												>
@@ -116,6 +118,7 @@
 										id="{= ID.generate([${this>id}, ${dataField>}])}"
 										text="{dataField>Label}"
 										press="{= COMMON.getPressHandlerForDataFieldForIBN(${dataField>}, '${internal>selectedContexts}', !${tableDefinition>enableAnalytics} )}"
+										type="Transparent"
 										enabled="{= ${action>enabled} !== undefined ? ${action>enabled} : TABLE.isDataFieldForActionEnabled(${this>}, ${dataField>}, ${dataField>RequiresContext}, true, undefined, ${dataField>NavigationAvailable@@MODEL.value})}"
 										visible="{action>visible}"
 										macrodata:IBNData="{= !${dataField>RequiresContext} ? '{semanticObject: \'' +  ${dataField>SemanticObject} + '\' , action : \'' + ${dataField>Action} + '\'}' : undefined}"

package/packages/sap.fe.macros/src/sap/fe/macros/table/ColumnContent.fragment.xml

@@ -37,39 +37,79 @@
 			test="{= (${dataField>$Type}.indexOf('DataFieldForAnnotation') > -1) && (${dataField>Target/$AnnotationPath}.indexOf('FieldGroup') > -1)}"
 		>
 			<template:with path="dataField>Target/$AnnotationPath/Data/" var="dataFieldCollections">
-				<VBox visible="{= TABLE.getVBoxVisibility( ${dataFieldCollections>}) }">
+				<VBox visible="{= TABLE.getVBoxVisibility( ${dataFieldCollections>}, ${column>FieldGroupHiddenExpressions} ) }">
 						<template:repeat list="{dataFieldCollections>}" var="fieldGroupDataField">
-							<internalMacro:Field
-							vhIdPrefix="{= ID.generate([${this>id}, 'TableValueHelp']) }"
-							editMode="{this>columnEditMode}"
-							entitySet="{collection>}"
-							dataField="{fieldGroupDataField>}"
-							wrap="{= ${this>tableType} === 'ResponsiveTable' ? true : false }"
-							class="{= TABLE.getMarginClass( ${dataFieldCollections>}  , ${fieldGroupDataField>} , ${fieldGroupDataField>Target/$AnnotationPath/Visualization/$EnumMember}) }"
-							onChange="{this>onChange}"
-							ariaLabelledBy="{= TABLE.getColumnStableId(${this>id},${dataField>}) }"
-							navigateAfterAction="{column>isNavigable}"
-						>
+						<template:if test="{= ${column>showDataFieldsLabel} &amp;&amp; !!${fieldGroupDataField>@@FIELD.computeLabelText} }">
+							<template:then>
+								<HBox>
+									<Label text="{= ${fieldGroupDataField>@@FIELD.computeLabelText} + ':' }" class="sapUiTinyMarginEnd" />
+									<internalMacro:Field
+										vhIdPrefix="{= ID.generate([${this>id}, 'TableValueHelp']) }"
+										editMode="{this>columnEditMode}"
+										entitySet="{collection>}"
+										dataField="{fieldGroupDataField>}"
+										wrap="{= ${this>tableType} === 'ResponsiveTable' ? true : false }"
+										class="{= TABLE.getMarginClass( ${dataFieldCollections>}  , ${fieldGroupDataField>} , ${fieldGroupDataField>Target/$AnnotationPath/Visualization/$EnumMember}, ${column>FieldGroupHiddenExpressions/}) }"
+										onChange="{this>onChange}"
+										ariaLabelledBy="{= TABLE.getColumnStableId(${this>id},${dataField>}) }"
+										navigateAfterAction="{column>isNavigable}"
+									>
+									<internalMacro:formatOptions
+											textLinesEdit="{column>formatOptions/textLinesEdit}"
+											textMaxLines="{column>formatOptions/textMaxLines}"
+											textMaxCharactersDisplay="{column>formatOptions/textMaxCharactersDisplay}"
+											textExpandBehaviorDisplay="{column>formatOptions/textExpandBehaviorDisplay}"
+											textAlignMode="Table"
+											showEmptyIndicator="true"
+											semanticKeyStyle="{= ${this>tableType} === 'ResponsiveTable' ? 'ObjectIdentifier' : 'Label' }"
+											hasDraftIndicator="{column>formatOptions/hasDraftIndicator}"
+											showIconUrl="{= ${fieldGroupDataField>Inline} &amp;&amp; ${fieldGroupDataField>IconUrl} }"
+											ignoreNavigationAvailable="{= ${tableDefinition>enableAnalytics} ? true : false }"
+											isAnalytics="{tableDefinition>enableAnalytics}"
+										/>
+									<internalMacro:customData>
+										<core:CustomData
+												key="extraProperty"
+												value="{=FIELD.getBindingInfoForTextArrangement(${this>}, ${dataField>Value/$Path@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${dataField>}) }"
+											/>
+									</internalMacro:customData>
+									</internalMacro:Field>
+								</HBox>
+							</template:then>
+							<template:else>
+								<internalMacro:Field
+									vhIdPrefix="{= ID.generate([${this>id}, 'TableValueHelp']) }"
+									editMode="{this>columnEditMode}"
+									entitySet="{collection>}"
+									dataField="{fieldGroupDataField>}"
+									wrap="{= ${this>tableType} === 'ResponsiveTable' ? true : false }"
+									class="{= TABLE.getMarginClass( ${dataFieldCollections>}  , ${fieldGroupDataField>} , ${fieldGroupDataField>Target/$AnnotationPath/Visualization/$EnumMember}, ${column>FieldGroupHiddenExpressions/}) }"
+									onChange="{this>onChange}"
+									ariaLabelledBy="{= TABLE.getColumnStableId(${this>id},${dataField>}) }"
+									navigateAfterAction="{column>isNavigable}"
+								>
 								<internalMacro:formatOptions
-								textLinesEdit="{column>formatOptions/textLinesEdit}"
-								textMaxLines="{column>formatOptions/textMaxLines}"
-								textMaxCharactersDisplay="{column>formatOptions/textMaxCharactersDisplay}"
-								textExpandBehaviorDisplay="{column>formatOptions/textExpandBehaviorDisplay}"
-								textAlignMode="Table"
-								semanticKeyStyle="{= ${this>tableType} === 'ResponsiveTable' ? 'ObjectIdentifier' : 'Label' }"
-								hasDraftIndicator="{column>formatOptions/hasDraftIndicator}"
-								showIconUrl="{= ${fieldGroupDataField>Inline} &amp;&amp; ${fieldGroupDataField>IconUrl} }"
-								ignoreNavigationAvailable="{= ${tableDefinition>enableAnalytics} ? true : false }"
-								isAnalytics="{tableDefinition>enableAnalytics}"
-							/>
+										fieldMode="{this>fieldMode}"
+										textLinesEdit="{column>formatOptions/textLinesEdit}"
+										textMaxLines="{column>formatOptions/textMaxLines}"
+										textMaxCharactersDisplay="{column>formatOptions/textMaxCharactersDisplay}"
+										textExpandBehaviorDisplay="{column>formatOptions/textExpandBehaviorDisplay}"
+										textAlignMode="Table"
+										semanticKeyStyle="{= ${this>tableType} === 'ResponsiveTable' ? 'ObjectIdentifier' : 'Label' }"
+										hasDraftIndicator="{column>formatOptions/hasDraftIndicator}"
+										showIconUrl="{= ${fieldGroupDataField>Inline} &amp;&amp; ${fieldGroupDataField>IconUrl} }"
+										ignoreNavigationAvailable="{= ${tableDefinition>enableAnalytics} ? true : false }"
+										isAnalytics="{tableDefinition>enableAnalytics}"
+									/>
 								<internalMacro:customData>
 									<core:CustomData
-									key="extraProperty"
-									value="{=FIELD.getBindingInfoForTextArrangement(${this>}, ${dataField>Value/$Path@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${dataField>}) }"
-								/>
+											key="extraProperty"
+											value="{=FIELD.getBindingInfoForTextArrangement(${this>}, ${dataField>Value/$Path@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${dataField>}) }"
+										/>
 								</internalMacro:customData>
-							</internalMacro:Field>
-
+								</internalMacro:Field>
+							</template:else>
+						</template:if>
 						</template:repeat>
 					</VBox>
 				</template:with>
@@ -82,10 +122,11 @@
 				dataField="{dataField>}"
 				wrap="{= ${this>tableType} === 'ResponsiveTable' ? true : false }"
 				onChange="{this>onChange}"
-				ariaLabelledBy="{= TABLE.getColumnStableId(${this>id},${dataField>}) }"
+				ariaLabelledBy="{= ${column>formatOptions/hasDraftIndicator} ? TABLE.getColumnStableId(${this>id},${dataField>}) : undefined}"
 				navigateAfterAction="{column>isNavigable}"
 			>
 					<internalMacro:formatOptions
+					fieldMode="{this>fieldMode}"
 					textLinesEdit="{column>formatOptions/textLinesEdit}"
 					textMaxLines="{column>formatOptions/textMaxLines}"
 					textMaxCharactersDisplay="{column>formatOptions/textMaxCharactersDisplay}"

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

@@ -13,7 +13,9 @@ sap.ui.define(
 		"sap/ui/model/odata/v4/AnnotationHelper",
 		"sap/fe/core/converters/ConverterContext",
 		"sap/fe/macros/SizeHelper",
-		"sap/base/Log"
+		"sap/base/Log",
+		"sap/fe/core/converters/MetaModelConverter",
+		"sap/fe/macros/field/FieldTemplating"
 	],
 	function(
 		JSONModel,
@@ -24,14 +26,16 @@ sap.ui.define(
 		ODataModelAnnotationHelper,
 		ConverterContext,
 		SizeHelper,
-		Log
+		Log,
+		MetaModelConverter,
+		FieldTemplating
 	) {
 		"use strict";
 
 		var CreationMode = FELibrary.CreationMode;
 
 		/**
-		 * Helper class used by MDC controls for OData(V4) specific handling
+		 * Helper class used by the control library for OData-specific handling (OData V4)
 		 *
 		 * @private
 		 * @experimental This module is only for internal/experimental use!
@@ -390,6 +394,7 @@ sap.ui.define(
 						aSelectedFields.push(sField);
 					}
 				}
+
 				function pushFieldList(sFieldList) {
 					var aFields = sFieldList && sFieldList.split(",");
 					if (aFields && aFields.length) {
@@ -506,47 +511,51 @@ sap.ui.define(
 				}
 			},
 			/**
-			 * Method to add a margin class at the end of control.
+			 * Method to add a margin class at the control.
 			 *
 			 * @function
 			 * @name getMarginClass
-			 * @param {*} oCollection DataPoint's Title
-			 * @param {*} oDataField DataPoint's Value
+			 * @param {*} oCollection Title of the DataPoint
+			 * @param {*} oDataField Value of the DataPoint
 			 * @param sVisualization
-			 * @returns {string} The classes for adjusting margin between controls.
+			 * @param {*} sFieldGroupHiddenExpressions Hidden expression contained in FieldGroup
+			 * @returns {string} Adjusting the margin
 			 */
-			getMarginClass: function(oCollection, oDataField, sVisualization) {
-				var bAllFalse = true;
-				for (var i = 0; i < oCollection.length; i++) {
-					if (
-						oCollection[i]["@com.sap.vocabularies.UI.v1.Hidden"] !== undefined &&
-						oCollection[i]["@com.sap.vocabularies.UI.v1.Hidden"] !== false
-					) {
-						bAllFalse = false;
+			getMarginClass: function(oCollection, oDataField, sVisualization, sFieldGroupHiddenExpressions) {
+				var sBindingExpression,
+					sClass = "";
+				if (JSON.stringify(oCollection[oCollection.length - 1]) == JSON.stringify(oDataField)) {
+					//If rating indicator is last element in fieldgroup, then the 0.5rem margin added by sapMRI class of interactive rating indicator on top and bottom must be nullified.
+					if (sVisualization == "com.sap.vocabularies.UI.v1.VisualizationType/Rating") {
+						sClass = "sapUiNoMarginBottom sapUiNoMarginTop";
+					} else {
+						sClass = "";
 					}
-				}
-				if (bAllFalse) {
-					if (JSON.stringify(oCollection[oCollection.length - 1]) == JSON.stringify(oDataField)) {
-						//If rating indicator is last element in fieldgroup, then the 0.5rem margin added by sapMRI class of interactive rating indicator on top and bottom must be nullified.
-						if (sVisualization == "com.sap.vocabularies.UI.v1.VisualizationType/Rating") {
-							return "sapUiNoMarginBottom sapUiNoMarginTop";
-						}
-						return "";
+				} else {
+					//If rating indicator is NOT the last element in fieldgroup, then to maintain the 0.5rem spacing between cogetMarginClassntrols (as per UX spec),
+					//only the top margin added by sapMRI class of interactive rating indicator must be nullified.
+					if (sVisualization == "com.sap.vocabularies.UI.v1.VisualizationType/Rating") {
+						sClass = "sapUiNoMarginTop";
 					} else {
-						//If rating indicator is NOT the last element in fieldgroup, then to maintain the 0.5rem spacing between controls (as per UX spec),
-						//only the top margin added by sapMRI class of interactive rating indicator must be nullified.
-						if (sVisualization == "com.sap.vocabularies.UI.v1.VisualizationType/Rating") {
-							return "sapUiNoMarginTop";
-						}
-						return "sapUiTinyMarginBottom";
+						sClass = "sapUiTinyMarginBottom";
 					}
+				}
+
+				if (sFieldGroupHiddenExpressions) {
+					var sHiddenExpressionResult = sFieldGroupHiddenExpressions.substring(
+						sFieldGroupHiddenExpressions.indexOf("{=") + 2,
+						sFieldGroupHiddenExpressions.lastIndexOf("}")
+					);
+					sBindingExpression = "{= " + sHiddenExpressionResult + " ? '" + sClass + "' : " + "''" + " }";
+					return sBindingExpression;
 				} else {
-					return undefined;
+					return sClass;
 				}
 			},
 
-			getVBoxVisibility: function(oCollection) {
+			getVBoxVisibility: function(oCollection, fieldGroupHiddenExpressions) {
 				var bAllStatic = true;
+				var bDynamicExpressionsInFields = false;
 				var aHiddenPaths = [];
 				for (var i = 0; i < oCollection.length; i++) {
 					if (
@@ -554,8 +563,14 @@ sap.ui.define(
 						oCollection[i]["@com.sap.vocabularies.UI.v1.Hidden"] !== false
 					) {
 						if (oCollection[i]["@com.sap.vocabularies.UI.v1.Hidden"] !== true) {
-							aHiddenPaths.push(oCollection[i]["@com.sap.vocabularies.UI.v1.Hidden"].$Path);
-							bAllStatic = false;
+							if (oCollection[i]["@com.sap.vocabularies.UI.v1.Hidden"].$Path) {
+								aHiddenPaths.push(oCollection[i]["@com.sap.vocabularies.UI.v1.Hidden"].$Path);
+								bAllStatic = false;
+							} else if (typeof oCollection[i]["@com.sap.vocabularies.UI.v1.Hidden"] === "object") {
+								// Dynamic expression found in a field
+								bDynamicExpressionsInFields = true;
+								break;
+							}
 						} else {
 							aHiddenPaths.push(oCollection[i]["@com.sap.vocabularies.UI.v1.Hidden"]);
 						}
@@ -563,7 +578,7 @@ sap.ui.define(
 						aHiddenPaths.push(false);
 					}
 				}
-				if (aHiddenPaths.length > 0 && bAllStatic !== true) {
+				if (!bDynamicExpressionsInFields && aHiddenPaths.length > 0 && bAllStatic !== true) {
 					var sExpression = "{parts:[";
 					for (var j = 0; j < aHiddenPaths.length; j++) {
 						if (j !== aHiddenPaths.length - 1) {
@@ -589,6 +604,8 @@ sap.ui.define(
 						}
 					}
 					return sExpression;
+				} else if (bDynamicExpressionsInFields) {
+					return fieldGroupHiddenExpressions;
 				} else if (aHiddenPaths.length > 0 && aHiddenPaths.indexOf(false) === -1 && bAllStatic) {
 					return false;
 				} else {
@@ -597,7 +614,7 @@ sap.ui.define(
 			},
 
 			/**
-			 * Method to provide Hidden filters to Table data.
+			 * Method to provide Hidden filters to Table.
 			 *
 			 * @function
 			 * @name formatHiddenFilters
@@ -848,7 +865,7 @@ sap.ui.define(
 						prefix: CommonHelper.addSingleQuotes(oThis.id),
 						operationAvailableMap: CommonHelper.addSingleQuotes(sOperationAvailableMap),
 						model: "${$source>/}.getModel()",
-						label: CommonHelper.addSingleQuotes(oDataField.Label),
+						label: CommonHelper.addSingleQuotes(oDataField.Label, true),
 						applicableContext: "${internal>dynamicActions/" + oDataField.Action + "/aApplicable/}",
 						notApplicableContext: "${internal>dynamicActions/" + oDataField.Action + "/aNotApplicable/}",
 						isNavigable: bIsNavigable,

package/packages/sap.fe.macros/src/sap/fe/macros/table/TableHelper.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/core/library","sap/fe/core/helpers/StableIdHelper","sap/fe/core/AnnotationHelper","sap/ui/model/odata/v4/AnnotationHelper","sap/fe/core/converters/ConverterContext","sap/fe/macros/SizeHelper","sap/base/Log"],function(J,C,F,S,A,O,c,d,L){"use strict";var e=F.CreationMode;var T={_isStaticAction:function(a,s){var o;if(a){if(Array.isArray(a)){var E=this._getActionOverloadEntityType(s);if(E){o=a.find(function(b){return b.$IsBound&&b.$Parameter[0].$Type===E;});}else{o=a[0];}}else{o=a;}}return!!o&&o.$IsBound&&o.$Parameter[0].$isCollection;},_getActionOverloadEntityType:function(a){if(a&&a.indexOf("(")>-1){var p=a.split("(");return p[p.length-1].replaceAll(")","");}return undefined;},_isActionOverloadOnDifferentType:function(a,s){var E=this._getActionOverloadEntityType(a);return!!E&&s!==E;},createButtonTemplating:function(t,b){var o=t.collection,s=t.creationMode,n,N,a=t.navigationPath,f=C.getTargetCollection(t.collection,t.navigationPath),r=t.parentEntitySet.getObject(t.parentEntitySet.getPath()+"@Org.OData.Capabilities.V1.NavigationRestrictions/RestrictedProperties");for(var i in r){n=r[i];if(n.NavigationProperty.$NavigationPropertyPath===a&&n.InsertRestrictions&&n.InsertRestrictions.Insertable){N=n.InsertRestrictions.Insertable;}}if(t.showCreate==="false"){return false;}if(s===e.CreationRow&&b===false){return false;}else if(o.getObject(f+"@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction")){return(o.getObject(f+"@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction@Org.OData.Core.V1.OperationAvailable")!==false);}else if(o.getObject(f+"@com.sap.vocabularies.Common.v1.DraftRoot/NewAction")){return(o.getObject(f+"@com.sap.vocabularies.Common.v1.DraftRoot/NewAction@Org.OData.Core.V1.OperationAvailable")!==false);}else if(N===false){return false;}else if(N){return true;}else if(s===e.External){return true;}return(o.getObject(f+"@Org.OData.Capabilities.V1.InsertRestrictions/Insertable")!==false);},deleteButtonTemplating:function(t){if(t.showDelete!==undefined&&t.showDelete!==null){return t.showDelete;}else{return true;}},addPresentationVariantToSelectQuery:function(p,P){var r=[];if(!(p&&C._isPresentationVariantAnnotation(P)&&p.RequestAtLeast&&p.RequestAtLeast.length>0)){return"";}p.RequestAtLeast.forEach(function(R){r.push(R.$PropertyPath);});return r.join(",");},addNavigationAvailableFieldsToSelectQuery:function(l){var s=[],a="";l.forEach(function(r){if(r.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"&&!r.Inline&&!r.Determining&&r.NavigationAvailable&&r.NavigationAvailable.$Path){s.push(r.NavigationAvailable.$Path);}});a=s.join(",");return a;},addFieldsHavingTextArrangementToSelectQuery:function(l,o){var s=[],D=[],a="",n=0,p=o.context.getPath();l.forEach(function(r){if(r.$Type==="com.sap.vocabularies.UI.v1.DataField"||r.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation"){var f=o.context.getObject(p+"/"+n+"/Value/$Path@");if(f&&f["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"]&&f["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"].$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly"){s.push(r.Value.$Path);}else{var b=o.context.getObject(p+"/"+n+"/Target/$AnnotationPath@/Data/");if(f===undefined&&b){b.forEach(function(f,i){if(f.$Type==="com.sap.vocabularies.UI.v1.DataField"){return D.push(o.context.getObject(p+"/"+n+"/Target/$AnnotationPath@/Data/"+i+"/Value/$Path@"));}});if(D.length>0){for(var g in D){if(D[g]["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"]&&D[g]["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"].$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly"){s.push(g.Value.$Path);}}}}}}n++;});a=s.join(",");return a;},getNavigationAvailableMap:function(l){var i={};l.forEach(function(r){var k=r.SemanticObject+"-"+r.Action;if(r.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"&&!r.Inline&&r.RequiresContext){if(r.NavigationAvailable!==undefined){i[k]=r.NavigationAvailable.$Path?r.NavigationAvailable.$Path:r.NavigationAvailable;}}});return JSON.stringify(i);},getMultiSelectDisabledActions:function(l,o){var m=[],a,s,b,p,f;var g=l.filter(function(i){return i.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAction";});g.forEach(function(h){s=h.Action;a=C.getActionPath(o.context,true,s,false);f=o.context.getObject(a+"/@$ui5.overload/0");if(f&&f.$Parameter&&f.$IsBound){for(var n in f.$Parameter){b=a+"/"+f.$Parameter[n].$Name+"@";p=o.context.getObject(b);if(p&&((p["@com.sap.vocabularies.UI.v1.Hidden"]&&p["@com.sap.vocabularies.UI.v1.Hidden"].$Path)||(p["@com.sap.vocabularies.Common.v1.FieldControl"]&&p["@com.sap.vocabularies.Common.v1.FieldControl"].$Path))){m.push(s);break;}}}});return m;},getUiLineItem:function(p){var P=p.getObject(p.sPath),o=C.createPresentationPathContext(p),m=p.getModel();if(C._isPresentationVariantAnnotation(o.getPath())){var l="@com.sap.vocabularies.UI.v1.LineItem",v=P.Visualizations;if(Array.isArray(v)){for(var i=0;i<v.length;i++){if(v[i].$AnnotationPath.indexOf(l)!==-1){l=v[i].$AnnotationPath;break;}}}return m.getMetaContext(p.getPath().split("@")[0]+l);}return p;},create$Select:function(o,s,n,p,P,a){var b=T.addPresentationVariantToSelectQuery(p,P);var f=[];function g(i){if(i&&!f.includes(i)&&i.indexOf("/")!==0){f.push(i);}}function h(i){var j=i&&i.split(",");if(j&&j.length){j.forEach(g);}}h(s);h(n);h(b);if(a){a.forEach(function(i){g(i.$PropertyPath);});}if(o&&o["@Org.OData.Capabilities.V1.DeleteRestrictions"]&&o["@Org.OData.Capabilities.V1.DeleteRestrictions"].Deletable.$Path){var r=o["@Org.OData.Capabilities.V1.DeleteRestrictions"].Deletable.$Path;g(r);}return f.join(",");},getColumnWidth:function(D,a,s,f,b,n,o,g){var w,h=false;if(D){return D;}else if(C.getEditMode(a,s,f)==="Display"){h=a&&a.hasOwnProperty("@com.sap.vocabularies.Common.v1.Text");if(b==="Edm.Stream"&&!h&&a.hasOwnProperty("@Org.OData.Core.V1.MediaType")&&a["@Org.OData.Core.V1.MediaType"].includes("image/")){w="7em";}}else if(a&&((a.hasOwnProperty("@com.sap.vocabularies.UI.v1.IsImageURL")&&a.hasOwnProperty("@com.sap.vocabularies.UI.v1.IsImageURL")===true)||(a.hasOwnProperty("@Org.OData.Core.V1.MediaType")&&a["@Org.OData.Core.V1.MediaType"].includes("image/")))){w="7em";}else if(s==="com.sap.vocabularies.UI.v1.DataFieldForAction"||s==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"||s==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation"){var i,j;if(g&&g.length>=o.Label.length){i=d.getButtonWidth(g);}else if(o){i=d.getButtonWidth(o.Label);}else{i=d.getButtonWidth(a.Label);}if(n){j=n*2;}if(!isNaN(j)&&j>i){w=j+"em";}else if(g||(a&&(a.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"||a.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAction"))){i+=2;w=i+"em";}}if(w){return w;}},getMarginClass:function(o,D,v){var a=true;for(var i=0;i<o.length;i++){if(o[i]["@com.sap.vocabularies.UI.v1.Hidden"]!==undefined&&o[i]["@com.sap.vocabularies.UI.v1.Hidden"]!==false){a=false;}}if(a){if(JSON.stringify(o[o.length-1])==JSON.stringify(D)){if(v=="com.sap.vocabularies.UI.v1.VisualizationType/Rating"){return"sapUiNoMarginBottom sapUiNoMarginTop";}return"";}else{if(v=="com.sap.vocabularies.UI.v1.VisualizationType/Rating"){return"sapUiNoMarginTop";}return"sapUiTinyMarginBottom";}}else{return undefined;}},getVBoxVisibility:function(o){var a=true;var h=[];for(var i=0;i<o.length;i++){if(o[i]["@com.sap.vocabularies.UI.v1.Hidden"]!==undefined&&o[i]["@com.sap.vocabularies.UI.v1.Hidden"]!==false){if(o[i]["@com.sap.vocabularies.UI.v1.Hidden"]!==true){h.push(o[i]["@com.sap.vocabularies.UI.v1.Hidden"].$Path);a=false;}else{h.push(o[i]["@com.sap.vocabularies.UI.v1.Hidden"]);}}else{h.push(false);}}if(h.length>0&&a!==true){var E="{parts:[";for(var j=0;j<h.length;j++){if(j!==h.length-1){if(typeof h[j]==="boolean"){E=E+"{value: '"+h[j]+"'},";}else{E=E+"{path: '"+h[j]+"'},";}}else{if(typeof h[j]==="boolean"){E=E+"{value: '"+h[j]+"'}], formatter: 'sap.fe.macros.table.TableRuntime.getVBoxVisibility'}";}else{E=E+"{path: '"+h[j]+"'}], formatter: 'sap.fe.macros.table.TableRuntime.getVBoxVisibility'}";}}}return E;}else if(h.length>0&&h.indexOf(false)===-1&&a){return false;}else{return true;}},formatHiddenFilters:function(h){if(h){try{return JSON.stringify(h);}catch(a){return undefined;}}return undefined;},getColumnStableId:function(i,D){return i?S.generate([i,"C",(D.Target&&D.Target.$AnnotationPath)||(D.Value&&D.Value.$Path)||(D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"||D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAction"?D:"")]):undefined;},_filterNonApplicableProperties:function(p,o){return(p&&p.filter(function(P){return o.getObject("./"+P);}));},getRowsBindingInfo:function(t,o,s,a,b,n,p,P,f,g,E){var r={ui5object:true,suspended:false,path:C.addSingleQuotes((o.$kind==="EntitySet"?"/":"")+(t.navigationPath||s)),parameters:{$count:!E},events:{}};if(b&&t&&t.collection){var h=T._filterNonApplicableProperties(b.split(","),t.collection);b=h.join(",");}if(g&&b!==""){b=b+","+g;}else if(g){b=g;}if(!E){var i=T.create$Select(a,b,n,p,P,f);if(i){r.parameters.$select="'"+i+"'";}}r.parameters.$$groupId=C.addSingleQuotes("$auto.Workers");r.parameters.$$updateGroupId=C.addSingleQuotes("$auto");r.events.patchSent=C.addSingleQuotes(".editFlow.handlePatchSent");r.events.patchCompleted=C.addSingleQuotes(".editFlow.handlePatchCompleted");r.events.dataReceived=C.addSingleQuotes("API.onInternalDataReceived");if(t.onContextChange){r.events.change=C.addSingleQuotes(t.onContextChange);}return C.objectToString(r);},creationRowApplyEnabled:function(t,o,s,p,a){var E=A.getNavigationInsertableRestrictions(o,s,p,a,true);if(typeof E==="string"&&(t.disableAddRowButtonForEmptyData==="true"||t.disableAddRowButtonForEmptyData===true)){E=E.substring(0,E.length-1);return(E+" && ${path: 'creationRowFieldValidity' , model: 'internal', formatter: 'RUNTIME.validateCreationRowFields'}}");}return E;},creationRowVisible:function(s,a){if(s&&s==="{=  ${ui>/editMode} === 'Editable'}"){return s;}else{return s.replace(a+"/","");}},validateCreationRowFields:function(f){if(!f){return false;}return(Object.keys(f).length>0&&Object.keys(f).every(function(k){return f[k]["validity"];}));},pressEventDataFieldForActionButton:function(t,D,E,o,a,i,b,s){var f=D.Action,g=t&&t.collection.getObject("$Type"),h=this._isStaticAction(a,f)||this._isActionOverloadOnDifferentType(f,g),I=D.InvocationGrouping&&D.InvocationGrouping.$EnumMember==="com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet"?"ChangeSet":"Isolated",p={contexts:"${internal>selectedContexts}",bStaticAction:h?h:undefined,entitySetName:C.addSingleQuotes(E),invocationGrouping:C.addSingleQuotes(I),prefix:C.addSingleQuotes(t.id),operationAvailableMap:C.addSingleQuotes(o),model:"${$source>/}.getModel()",label:C.addSingleQuotes(D.Label),applicableContext:"${internal>dynamicActions/"+D.Action+"/aApplicable/}",notApplicableContext:"${internal>dynamicActions/"+D.Action+"/aNotApplicable/}",isNavigable:i,enableAutoScroll:b,defaultValuesExtensionFunction:s?"'"+s+"'":undefined};return C.generateFunction(".editFlow.invokeAction",C.addSingleQuotes(D.Action),C.objectToString(p));},isDataFieldForActionEnabled:function(t,D,r,i,a,v){var s=D.Action,b=t&&t.collection.getObject("$Type"),o=t&&t.tableDefinition&&t.tableDefinition.getObject(),f=this._isStaticAction(a,s),g=o&&o.enableAnalytics;if(!i&&this._isActionOverloadOnDifferentType(s,b)){var h=o&&JSON.parse(o.operationAvailableMap);if(h&&h.hasOwnProperty(s)){return"{= ${internal>dynamicActions/"+s+"/bEnabled} }";}return true;}if(!r||f){if(i){var E=t.collection.getPath();var m=t.collection.getModel();if(v==="false"&&!g){L.warning("NavigationAvailable as false is incorrect usage");return false;}else if(!g&&D&&D.NavigationAvailable&&D.NavigationAvailable.$Path&&m.getObject(E+"/$Partner")===D.NavigationAvailable.$Path.split("/")[0]){return"{= ${"+v.substr(v.indexOf("/")+1,v.length)+"}";}else{return true;}}return true;}var j="",n,k;if(i){if(v==="true"||g){j="%{internal>numberOfSelectedContexts} >= 1";}else if(v==="false"){L.warning("NavigationAvailable as false is incorrect usage");return false;}else{n="%{internal>numberOfSelectedContexts} >= 1";k="${internal>ibn/"+D.SemanticObject+"-"+D.Action+"/bEnabled"+"}";j=n+" && "+k;}}else{if(v==="single"){n="${internal>numberOfSelectedContexts} === 1";}else{n="${internal>numberOfSelectedContexts} > 0";}k="${internal>dynamicActions/"+D.Action+"/bEnabled"+"}";j=n+" && "+k;}return"{= "+j+"}";},pressEventForCreateButton:function(t,b){var s=t.creationMode,p,m=b?"${$source>}.getParent()":"${$source>}.getParent().getParent().getParent()",r=m+".getRowBinding() || "+m+".data('rowsBindingInfo').path";switch(s){case e.External:p={creationMode:C.addSingleQuotes(e.External),outbound:C.addSingleQuotes(t.createOutbound)};break;case e.CreationRow:p={creationMode:C.addSingleQuotes(e.CreationRow),creationRow:"${$source>}",createAtEnd:t.createAtEnd!==undefined?t.createAtEnd:false};r="${$source>}.getParent()._getRowBinding()";break;case e.NewPage:case e.Inline:p={creationMode:C.addSingleQuotes(s),createAtEnd:t.createAtEnd!==undefined?t.createAtEnd:false,tableId:C.addSingleQuotes(t.id)};if(t.createNewAction){p.newAction=C.addSingleQuotes(t.createNewAction);}break;default:return undefined;}return C.generateFunction(".editFlow.createDocument",r,C.objectToString(p));},getIBNData:function(t){var o=t.createOutboundDetail;if(o){var i={semanticObject:C.addSingleQuotes(o.semanticObject),action:C.addSingleQuotes(o.action)};return C.objectToString(i);}},isCreateButtonEnabled:function(o,s,r,i){var I=o.$kind==="EntitySet";return I?undefined:A.getNavigationInsertableRestrictions(o,s,r,i,false);},pressEventForDeleteButton:function(t,E){var D="${internal>deletableContexts}";var p={id:C.addSingleQuotes(t.id),entitySetName:C.addSingleQuotes(E),numberOfSelectedContexts:"${internal>selectedContexts}.length",unSavedContexts:"${internal>unSavedContexts}",lockedContexts:"${internal>lockedContexts}",controlId:"${internal>controlId}"};return C.generateFunction(".editFlow.deleteMultipleDocuments",D,C.objectToString(p));},isDeleteButtonEnabled:function(t){var D="%{internal>deletableContexts}",n=D+".length > 0",s="("+D+" && "+n+")",u="%{internal>unSavedContexts}",N=u+".length > 0",U="("+u+" && "+N+")",a="("+s+" || "+U+")",b="%{internal>deleteEnabled}",f="%{internal>numberOfSelectedContexts}",p=t.parentEntityDeleteEnabled;var E;if(p==="true"){E="{= "+f+" ? "+true+" : false}";}else if(p!=="false"&&typeof p==="string"){E="{= "+f+" ? "+p+": false}";}else{E="{= "+a+" ? "+b+" : false}";}return E;},getEnablementMassEdit:function(t){if(t.massEditEnabled){return t.massEditEnabled;}else{var u="%{internal>updatableContexts}",n=u+".length >= 2",N="%{internal>numberOfSelectedContexts}";return"{= "+N+" >= 2 && "+n+" }";}},handleTableDeleteEnablementForSideEffects:function(t,I){if(t&&I){var D=T.getDeletablePathForTable(t),s=t.getSelectedContexts(),a=[],E=I.getProperty("deletableContexts")||[];if(s.length===0){I.setProperty("deleteEnabled",false);}else{for(var i=0;i<s.length;i++){if(typeof D==="string"&&D!==undefined){var o=s[i];if(o&&o.getProperty(D)){I.setProperty("deleteEnabled",true);a.push(o);}else{I.setProperty("deleteEnabled",false);}}}}if(!E.length&&a.length>0){I.setProperty("deletableContexts",a);}}},getDeletablePathForTable:function(t){var m=t&&t.getModel()&&t.getModel().getMetaModel(),p=t.getRowBinding()&&t.getRowBinding().getPath();if(m&&p){var s=t.getRowBinding().getContext&&t.getRowBinding().getContext()&&t.getRowBinding().getContext().getPath();if(!s){var o=m&&m.getObject(p+"@Org.OData.Capabilities.V1.DeleteRestrictions/Deletable");if(o){return o&&o.$Path;}return;}var M=m.getMetaPath(s);var n=m.getObject(M)&&m.getObject(M)["$NavigationPropertyBinding"]&&m.getObject(M)["$NavigationPropertyBinding"][p];if(!n){return;}p="/"+n;}var D=m&&m.getObject(p+"@Org.OData.Capabilities.V1.DeleteRestrictions/Deletable");return D&&D.$Path;},setHeaderLabelVisibility:function(a,b){if(!b){if(a.$Type.indexOf("DataFieldForAction")>-1&&a.Inline){return false;}if(a.$Type.indexOf("DataFieldForIntentBasedNavigation")>-1&&a.Inline){return false;}return true;}return b.some(function(D){if((D.$Type==="com.sap.vocabularies.UI.v1.DataField"||D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation")&&D["@com.sap.vocabularies.UI.v1.Hidden"]!==true){return true;}});},getValueOnRatingField:function(D,o){if(D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation"){if(o.context.getObject("Target/$AnnotationPath").indexOf("@com.sap.vocabularies.UI.v1.DataPoint")>-1&&o.context.getObject("Target/$AnnotationPath/$Type")=="com.sap.vocabularies.UI.v1.DataPointType"&&o.context.getObject("Target/$AnnotationPath/Visualization/$EnumMember")=="com.sap.vocabularies.UI.v1.VisualizationType/Rating"){return o.context.getObject("Target/$AnnotationPath/TargetValue");}if(o.context.getObject("Target/$AnnotationPath").indexOf("@com.sap.vocabularies.UI.v1.FieldGroup")>-1){var p="Target/$AnnotationPath/Data/";for(var i in o.context.getObject(p)){if(o.context.getObject(p+i+"/$Type")==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation"&&o.context.getObject(p+i+"/Target/$AnnotationPath").indexOf("@com.sap.vocabularies.UI.v1.DataPoint")>-1&&o.context.getObject(p+i+"/Target/$AnnotationPath/$Type")=="com.sap.vocabularies.UI.v1.DataPointType"&&o.context.getObject(p+i+"/Target/$AnnotationPath/Visualization/$EnumMember")=="com.sap.vocabularies.UI.v1.VisualizationType/Rating"){return o.context.getObject(p+i+"/Target/$AnnotationPath/TargetValue");}}}}},getTextOnActionField:function(D,o){if(D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAction"||D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"){return D.Label;}if(D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation"&&o.context.getObject("Target/$AnnotationPath").indexOf("@com.sap.vocabularies.UI.v1.FieldGroup")>-1){var p="Target/$AnnotationPath/Data/";var m=[];for(var i in o.context.getObject(p)){if(o.context.getObject(p+i+"/$Type")==="com.sap.vocabularies.UI.v1.DataFieldForAction"||o.context.getObject(p+i+"/$Type")==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"){m.push(o.context.getObject(p+i+"/Label"));}}if(m.length>1){return m.reduce(function(a,b){return a.length>b.length?a:b;});}else{return m.length===0?undefined:m.toString();}}},_getResponsiveTableColumnSettings:function(t,o){if(t.tableType==="ResponsiveTable"){return o.settings;}return null;},getChartSize:function(t,o){var s=this._getResponsiveTableColumnSettings(t,o);if(s&&s.microChartSize){return s.microChartSize;}return"XS";},getShowOnlyChart:function(t,o){var s=this._getResponsiveTableColumnSettings(t,o);if(s&&s.showMicroChartLabel){return!s.showMicroChartLabel;}return true;},getDelegate:function(E,h,s){var D;if(h==="true"){D={name:E?"sap/fe/macros/table/delegates/AnalyticalALPTableDelegate":"sap/fe/macros/table/delegates/ALPTableDelegate",payload:{collectionName:s}};}else{D={name:E?"sap/fe/macros/table/delegates/AnalyticalTableDelegate":"sap/fe/macros/table/delegates/TableDelegate"};}return JSON.stringify(D);},setIBNEnablement:function(I,n,s){for(var k in n){I.setProperty("ibn/"+k,{bEnabled:false,aApplicable:[],aNotApplicable:[]});var a=[],N=[];var p=n[k];for(var i=0;i<s.length;i++){var o=s[i];if(o.getObject(p)){I.getModel().setProperty(I.getPath()+"/ibn/"+k+"/bEnabled",true);a.push(o);}else{N.push(o);}}I.getModel().setProperty(I.getPath()+"/ibn/"+k+"/aApplicable",a);I.getModel().setProperty(I.getPath()+"/ibn/"+k+"/aNotApplicable",N);}}};T.getNavigationAvailableMap.requiresIContext=true;T.addNavigationAvailableFieldsToSelectQuery.requiresIContext=true;T.addFieldsHavingTextArrangementToSelectQuery.requiresIContext=true;T.getValueOnRatingField.requiresIContext=true;T.getTextOnActionField.requiresIContext=true;return T;},true);
+sap.ui.define(["sap/ui/model/json/JSONModel","sap/fe/macros/CommonHelper","sap/fe/core/library","sap/fe/core/helpers/StableIdHelper","sap/fe/core/AnnotationHelper","sap/ui/model/odata/v4/AnnotationHelper","sap/fe/core/converters/ConverterContext","sap/fe/macros/SizeHelper","sap/base/Log","sap/fe/core/converters/MetaModelConverter","sap/fe/macros/field/FieldTemplating"],function(J,C,F,S,A,O,c,d,L,M,e){"use strict";var f=F.CreationMode;var T={_isStaticAction:function(a,s){var o;if(a){if(Array.isArray(a)){var E=this._getActionOverloadEntityType(s);if(E){o=a.find(function(b){return b.$IsBound&&b.$Parameter[0].$Type===E;});}else{o=a[0];}}else{o=a;}}return!!o&&o.$IsBound&&o.$Parameter[0].$isCollection;},_getActionOverloadEntityType:function(a){if(a&&a.indexOf("(")>-1){var p=a.split("(");return p[p.length-1].replaceAll(")","");}return undefined;},_isActionOverloadOnDifferentType:function(a,s){var E=this._getActionOverloadEntityType(a);return!!E&&s!==E;},createButtonTemplating:function(t,b){var o=t.collection,s=t.creationMode,n,N,a=t.navigationPath,g=C.getTargetCollection(t.collection,t.navigationPath),r=t.parentEntitySet.getObject(t.parentEntitySet.getPath()+"@Org.OData.Capabilities.V1.NavigationRestrictions/RestrictedProperties");for(var i in r){n=r[i];if(n.NavigationProperty.$NavigationPropertyPath===a&&n.InsertRestrictions&&n.InsertRestrictions.Insertable){N=n.InsertRestrictions.Insertable;}}if(t.showCreate==="false"){return false;}if(s===f.CreationRow&&b===false){return false;}else if(o.getObject(g+"@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction")){return(o.getObject(g+"@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction@Org.OData.Core.V1.OperationAvailable")!==false);}else if(o.getObject(g+"@com.sap.vocabularies.Common.v1.DraftRoot/NewAction")){return(o.getObject(g+"@com.sap.vocabularies.Common.v1.DraftRoot/NewAction@Org.OData.Core.V1.OperationAvailable")!==false);}else if(N===false){return false;}else if(N){return true;}else if(s===f.External){return true;}return(o.getObject(g+"@Org.OData.Capabilities.V1.InsertRestrictions/Insertable")!==false);},deleteButtonTemplating:function(t){if(t.showDelete!==undefined&&t.showDelete!==null){return t.showDelete;}else{return true;}},addPresentationVariantToSelectQuery:function(p,P){var r=[];if(!(p&&C._isPresentationVariantAnnotation(P)&&p.RequestAtLeast&&p.RequestAtLeast.length>0)){return"";}p.RequestAtLeast.forEach(function(R){r.push(R.$PropertyPath);});return r.join(",");},addNavigationAvailableFieldsToSelectQuery:function(l){var s=[],a="";l.forEach(function(r){if(r.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"&&!r.Inline&&!r.Determining&&r.NavigationAvailable&&r.NavigationAvailable.$Path){s.push(r.NavigationAvailable.$Path);}});a=s.join(",");return a;},addFieldsHavingTextArrangementToSelectQuery:function(l,o){var s=[],D=[],a="",n=0,p=o.context.getPath();l.forEach(function(r){if(r.$Type==="com.sap.vocabularies.UI.v1.DataField"||r.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation"){var b=o.context.getObject(p+"/"+n+"/Value/$Path@");if(b&&b["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"]&&b["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"].$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly"){s.push(r.Value.$Path);}else{var g=o.context.getObject(p+"/"+n+"/Target/$AnnotationPath@/Data/");if(b===undefined&&g){g.forEach(function(b,i){if(b.$Type==="com.sap.vocabularies.UI.v1.DataField"){return D.push(o.context.getObject(p+"/"+n+"/Target/$AnnotationPath@/Data/"+i+"/Value/$Path@"));}});if(D.length>0){for(var h in D){if(D[h]["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"]&&D[h]["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"].$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly"){s.push(h.Value.$Path);}}}}}}n++;});a=s.join(",");return a;},getNavigationAvailableMap:function(l){var i={};l.forEach(function(r){var k=r.SemanticObject+"-"+r.Action;if(r.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"&&!r.Inline&&r.RequiresContext){if(r.NavigationAvailable!==undefined){i[k]=r.NavigationAvailable.$Path?r.NavigationAvailable.$Path:r.NavigationAvailable;}}});return JSON.stringify(i);},getMultiSelectDisabledActions:function(l,o){var m=[],a,s,b,p,g;var h=l.filter(function(i){return i.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAction";});h.forEach(function(i){s=i.Action;a=C.getActionPath(o.context,true,s,false);g=o.context.getObject(a+"/@$ui5.overload/0");if(g&&g.$Parameter&&g.$IsBound){for(var n in g.$Parameter){b=a+"/"+g.$Parameter[n].$Name+"@";p=o.context.getObject(b);if(p&&((p["@com.sap.vocabularies.UI.v1.Hidden"]&&p["@com.sap.vocabularies.UI.v1.Hidden"].$Path)||(p["@com.sap.vocabularies.Common.v1.FieldControl"]&&p["@com.sap.vocabularies.Common.v1.FieldControl"].$Path))){m.push(s);break;}}}});return m;},getUiLineItem:function(p){var P=p.getObject(p.sPath),o=C.createPresentationPathContext(p),m=p.getModel();if(C._isPresentationVariantAnnotation(o.getPath())){var l="@com.sap.vocabularies.UI.v1.LineItem",v=P.Visualizations;if(Array.isArray(v)){for(var i=0;i<v.length;i++){if(v[i].$AnnotationPath.indexOf(l)!==-1){l=v[i].$AnnotationPath;break;}}}return m.getMetaContext(p.getPath().split("@")[0]+l);}return p;},create$Select:function(o,s,n,p,P,a){var b=T.addPresentationVariantToSelectQuery(p,P);var g=[];function h(j){if(j&&!g.includes(j)&&j.indexOf("/")!==0){g.push(j);}}function i(j){var k=j&&j.split(",");if(k&&k.length){k.forEach(h);}}i(s);i(n);i(b);if(a){a.forEach(function(j){h(j.$PropertyPath);});}if(o&&o["@Org.OData.Capabilities.V1.DeleteRestrictions"]&&o["@Org.OData.Capabilities.V1.DeleteRestrictions"].Deletable.$Path){var r=o["@Org.OData.Capabilities.V1.DeleteRestrictions"].Deletable.$Path;h(r);}return g.join(",");},getColumnWidth:function(D,a,s,b,g,n,o,h){var w,H=false;if(D){return D;}else if(C.getEditMode(a,s,b)==="Display"){H=a&&a.hasOwnProperty("@com.sap.vocabularies.Common.v1.Text");if(g==="Edm.Stream"&&!H&&a.hasOwnProperty("@Org.OData.Core.V1.MediaType")&&a["@Org.OData.Core.V1.MediaType"].includes("image/")){w="7em";}}else if(a&&((a.hasOwnProperty("@com.sap.vocabularies.UI.v1.IsImageURL")&&a.hasOwnProperty("@com.sap.vocabularies.UI.v1.IsImageURL")===true)||(a.hasOwnProperty("@Org.OData.Core.V1.MediaType")&&a["@Org.OData.Core.V1.MediaType"].includes("image/")))){w="7em";}else if(s==="com.sap.vocabularies.UI.v1.DataFieldForAction"||s==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"||s==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation"){var i,j;if(h&&h.length>=o.Label.length){i=d.getButtonWidth(h);}else if(o){i=d.getButtonWidth(o.Label);}else{i=d.getButtonWidth(a.Label);}if(n){j=n*2;}if(!isNaN(j)&&j>i){w=j+"em";}else if(h||(a&&(a.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"||a.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAction"))){i+=2;w=i+"em";}}if(w){return w;}},getMarginClass:function(o,D,v,s){var b,a="";if(JSON.stringify(o[o.length-1])==JSON.stringify(D)){if(v=="com.sap.vocabularies.UI.v1.VisualizationType/Rating"){a="sapUiNoMarginBottom sapUiNoMarginTop";}else{a="";}}else{if(v=="com.sap.vocabularies.UI.v1.VisualizationType/Rating"){a="sapUiNoMarginTop";}else{a="sapUiTinyMarginBottom";}}if(s){var h=s.substring(s.indexOf("{=")+2,s.lastIndexOf("}"));b="{= "+h+" ? '"+a+"' : "+"''"+" }";return b;}else{return a;}},getVBoxVisibility:function(o,a){var b=true;var D=false;var h=[];for(var i=0;i<o.length;i++){if(o[i]["@com.sap.vocabularies.UI.v1.Hidden"]!==undefined&&o[i]["@com.sap.vocabularies.UI.v1.Hidden"]!==false){if(o[i]["@com.sap.vocabularies.UI.v1.Hidden"]!==true){if(o[i]["@com.sap.vocabularies.UI.v1.Hidden"].$Path){h.push(o[i]["@com.sap.vocabularies.UI.v1.Hidden"].$Path);b=false;}else if(typeof o[i]["@com.sap.vocabularies.UI.v1.Hidden"]==="object"){D=true;break;}}else{h.push(o[i]["@com.sap.vocabularies.UI.v1.Hidden"]);}}else{h.push(false);}}if(!D&&h.length>0&&b!==true){var E="{parts:[";for(var j=0;j<h.length;j++){if(j!==h.length-1){if(typeof h[j]==="boolean"){E=E+"{value: '"+h[j]+"'},";}else{E=E+"{path: '"+h[j]+"'},";}}else{if(typeof h[j]==="boolean"){E=E+"{value: '"+h[j]+"'}], formatter: 'sap.fe.macros.table.TableRuntime.getVBoxVisibility'}";}else{E=E+"{path: '"+h[j]+"'}], formatter: 'sap.fe.macros.table.TableRuntime.getVBoxVisibility'}";}}}return E;}else if(D){return a;}else if(h.length>0&&h.indexOf(false)===-1&&b){return false;}else{return true;}},formatHiddenFilters:function(h){if(h){try{return JSON.stringify(h);}catch(a){return undefined;}}return undefined;},getColumnStableId:function(i,D){return i?S.generate([i,"C",(D.Target&&D.Target.$AnnotationPath)||(D.Value&&D.Value.$Path)||(D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"||D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAction"?D:"")]):undefined;},_filterNonApplicableProperties:function(p,o){return(p&&p.filter(function(P){return o.getObject("./"+P);}));},getRowsBindingInfo:function(t,o,s,a,b,n,p,P,g,h,E){var r={ui5object:true,suspended:false,path:C.addSingleQuotes((o.$kind==="EntitySet"?"/":"")+(t.navigationPath||s)),parameters:{$count:!E},events:{}};if(b&&t&&t.collection){var i=T._filterNonApplicableProperties(b.split(","),t.collection);b=i.join(",");}if(h&&b!==""){b=b+","+h;}else if(h){b=h;}if(!E){var j=T.create$Select(a,b,n,p,P,g);if(j){r.parameters.$select="'"+j+"'";}}r.parameters.$$groupId=C.addSingleQuotes("$auto.Workers");r.parameters.$$updateGroupId=C.addSingleQuotes("$auto");r.events.patchSent=C.addSingleQuotes(".editFlow.handlePatchSent");r.events.patchCompleted=C.addSingleQuotes(".editFlow.handlePatchCompleted");r.events.dataReceived=C.addSingleQuotes("API.onInternalDataReceived");if(t.onContextChange){r.events.change=C.addSingleQuotes(t.onContextChange);}return C.objectToString(r);},creationRowApplyEnabled:function(t,o,s,p,a){var E=A.getNavigationInsertableRestrictions(o,s,p,a,true);if(typeof E==="string"&&(t.disableAddRowButtonForEmptyData==="true"||t.disableAddRowButtonForEmptyData===true)){E=E.substring(0,E.length-1);return(E+" && ${path: 'creationRowFieldValidity' , model: 'internal', formatter: 'RUNTIME.validateCreationRowFields'}}");}return E;},creationRowVisible:function(s,a){if(s&&s==="{=  ${ui>/editMode} === 'Editable'}"){return s;}else{return s.replace(a+"/","");}},validateCreationRowFields:function(o){if(!o){return false;}return(Object.keys(o).length>0&&Object.keys(o).every(function(k){return o[k]["validity"];}));},pressEventDataFieldForActionButton:function(t,D,E,o,a,i,b,s){var g=D.Action,h=t&&t.collection.getObject("$Type"),j=this._isStaticAction(a,g)||this._isActionOverloadOnDifferentType(g,h),I=D.InvocationGrouping&&D.InvocationGrouping.$EnumMember==="com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet"?"ChangeSet":"Isolated",p={contexts:"${internal>selectedContexts}",bStaticAction:j?j:undefined,entitySetName:C.addSingleQuotes(E),invocationGrouping:C.addSingleQuotes(I),prefix:C.addSingleQuotes(t.id),operationAvailableMap:C.addSingleQuotes(o),model:"${$source>/}.getModel()",label:C.addSingleQuotes(D.Label,true),applicableContext:"${internal>dynamicActions/"+D.Action+"/aApplicable/}",notApplicableContext:"${internal>dynamicActions/"+D.Action+"/aNotApplicable/}",isNavigable:i,enableAutoScroll:b,defaultValuesExtensionFunction:s?"'"+s+"'":undefined};return C.generateFunction(".editFlow.invokeAction",C.addSingleQuotes(D.Action),C.objectToString(p));},isDataFieldForActionEnabled:function(t,D,r,i,a,v){var s=D.Action,b=t&&t.collection.getObject("$Type"),o=t&&t.tableDefinition&&t.tableDefinition.getObject(),g=this._isStaticAction(a,s),h=o&&o.enableAnalytics;if(!i&&this._isActionOverloadOnDifferentType(s,b)){var j=o&&JSON.parse(o.operationAvailableMap);if(j&&j.hasOwnProperty(s)){return"{= ${internal>dynamicActions/"+s+"/bEnabled} }";}return true;}if(!r||g){if(i){var E=t.collection.getPath();var m=t.collection.getModel();if(v==="false"&&!h){L.warning("NavigationAvailable as false is incorrect usage");return false;}else if(!h&&D&&D.NavigationAvailable&&D.NavigationAvailable.$Path&&m.getObject(E+"/$Partner")===D.NavigationAvailable.$Path.split("/")[0]){return"{= ${"+v.substr(v.indexOf("/")+1,v.length)+"}";}else{return true;}}return true;}var k="",n,l;if(i){if(v==="true"||h){k="%{internal>numberOfSelectedContexts} >= 1";}else if(v==="false"){L.warning("NavigationAvailable as false is incorrect usage");return false;}else{n="%{internal>numberOfSelectedContexts} >= 1";l="${internal>ibn/"+D.SemanticObject+"-"+D.Action+"/bEnabled"+"}";k=n+" && "+l;}}else{if(v==="single"){n="${internal>numberOfSelectedContexts} === 1";}else{n="${internal>numberOfSelectedContexts} > 0";}l="${internal>dynamicActions/"+D.Action+"/bEnabled"+"}";k=n+" && "+l;}return"{= "+k+"}";},pressEventForCreateButton:function(t,b){var s=t.creationMode,p,m=b?"${$source>}.getParent()":"${$source>}.getParent().getParent().getParent()",r=m+".getRowBinding() || "+m+".data('rowsBindingInfo').path";switch(s){case f.External:p={creationMode:C.addSingleQuotes(f.External),outbound:C.addSingleQuotes(t.createOutbound)};break;case f.CreationRow:p={creationMode:C.addSingleQuotes(f.CreationRow),creationRow:"${$source>}",createAtEnd:t.createAtEnd!==undefined?t.createAtEnd:false};r="${$source>}.getParent()._getRowBinding()";break;case f.NewPage:case f.Inline:p={creationMode:C.addSingleQuotes(s),createAtEnd:t.createAtEnd!==undefined?t.createAtEnd:false,tableId:C.addSingleQuotes(t.id)};if(t.createNewAction){p.newAction=C.addSingleQuotes(t.createNewAction);}break;default:return undefined;}return C.generateFunction(".editFlow.createDocument",r,C.objectToString(p));},getIBNData:function(t){var o=t.createOutboundDetail;if(o){var i={semanticObject:C.addSingleQuotes(o.semanticObject),action:C.addSingleQuotes(o.action)};return C.objectToString(i);}},isCreateButtonEnabled:function(o,s,r,i){var I=o.$kind==="EntitySet";return I?undefined:A.getNavigationInsertableRestrictions(o,s,r,i,false);},pressEventForDeleteButton:function(t,E){var D="${internal>deletableContexts}";var p={id:C.addSingleQuotes(t.id),entitySetName:C.addSingleQuotes(E),numberOfSelectedContexts:"${internal>selectedContexts}.length",unSavedContexts:"${internal>unSavedContexts}",lockedContexts:"${internal>lockedContexts}",controlId:"${internal>controlId}"};return C.generateFunction(".editFlow.deleteMultipleDocuments",D,C.objectToString(p));},isDeleteButtonEnabled:function(t){var D="%{internal>deletableContexts}",n=D+".length > 0",s="("+D+" && "+n+")",u="%{internal>unSavedContexts}",N=u+".length > 0",U="("+u+" && "+N+")",a="("+s+" || "+U+")",b="%{internal>deleteEnabled}",g="%{internal>numberOfSelectedContexts}",p=t.parentEntityDeleteEnabled;var E;if(p==="true"){E="{= "+g+" ? "+true+" : false}";}else if(p!=="false"&&typeof p==="string"){E="{= "+g+" ? "+p+": false}";}else{E="{= "+a+" ? "+b+" : false}";}return E;},getEnablementMassEdit:function(t){if(t.massEditEnabled){return t.massEditEnabled;}else{var u="%{internal>updatableContexts}",n=u+".length >= 2",N="%{internal>numberOfSelectedContexts}";return"{= "+N+" >= 2 && "+n+" }";}},handleTableDeleteEnablementForSideEffects:function(t,I){if(t&&I){var D=T.getDeletablePathForTable(t),s=t.getSelectedContexts(),a=[],E=I.getProperty("deletableContexts")||[];if(s.length===0){I.setProperty("deleteEnabled",false);}else{for(var i=0;i<s.length;i++){if(typeof D==="string"&&D!==undefined){var o=s[i];if(o&&o.getProperty(D)){I.setProperty("deleteEnabled",true);a.push(o);}else{I.setProperty("deleteEnabled",false);}}}}if(!E.length&&a.length>0){I.setProperty("deletableContexts",a);}}},getDeletablePathForTable:function(t){var m=t&&t.getModel()&&t.getModel().getMetaModel(),p=t.getRowBinding()&&t.getRowBinding().getPath();if(m&&p){var s=t.getRowBinding().getContext&&t.getRowBinding().getContext()&&t.getRowBinding().getContext().getPath();if(!s){var o=m&&m.getObject(p+"@Org.OData.Capabilities.V1.DeleteRestrictions/Deletable");if(o){return o&&o.$Path;}return;}var a=m.getMetaPath(s);var n=m.getObject(a)&&m.getObject(a)["$NavigationPropertyBinding"]&&m.getObject(a)["$NavigationPropertyBinding"][p];if(!n){return;}p="/"+n;}var D=m&&m.getObject(p+"@Org.OData.Capabilities.V1.DeleteRestrictions/Deletable");return D&&D.$Path;},setHeaderLabelVisibility:function(a,b){if(!b){if(a.$Type.indexOf("DataFieldForAction")>-1&&a.Inline){return false;}if(a.$Type.indexOf("DataFieldForIntentBasedNavigation")>-1&&a.Inline){return false;}return true;}return b.some(function(D){if((D.$Type==="com.sap.vocabularies.UI.v1.DataField"||D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation")&&D["@com.sap.vocabularies.UI.v1.Hidden"]!==true){return true;}});},getValueOnRatingField:function(D,o){if(D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation"){if(o.context.getObject("Target/$AnnotationPath").indexOf("@com.sap.vocabularies.UI.v1.DataPoint")>-1&&o.context.getObject("Target/$AnnotationPath/$Type")=="com.sap.vocabularies.UI.v1.DataPointType"&&o.context.getObject("Target/$AnnotationPath/Visualization/$EnumMember")=="com.sap.vocabularies.UI.v1.VisualizationType/Rating"){return o.context.getObject("Target/$AnnotationPath/TargetValue");}if(o.context.getObject("Target/$AnnotationPath").indexOf("@com.sap.vocabularies.UI.v1.FieldGroup")>-1){var p="Target/$AnnotationPath/Data/";for(var i in o.context.getObject(p)){if(o.context.getObject(p+i+"/$Type")==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation"&&o.context.getObject(p+i+"/Target/$AnnotationPath").indexOf("@com.sap.vocabularies.UI.v1.DataPoint")>-1&&o.context.getObject(p+i+"/Target/$AnnotationPath/$Type")=="com.sap.vocabularies.UI.v1.DataPointType"&&o.context.getObject(p+i+"/Target/$AnnotationPath/Visualization/$EnumMember")=="com.sap.vocabularies.UI.v1.VisualizationType/Rating"){return o.context.getObject(p+i+"/Target/$AnnotationPath/TargetValue");}}}}},getTextOnActionField:function(D,o){if(D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAction"||D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"){return D.Label;}if(D.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAnnotation"&&o.context.getObject("Target/$AnnotationPath").indexOf("@com.sap.vocabularies.UI.v1.FieldGroup")>-1){var p="Target/$AnnotationPath/Data/";var m=[];for(var i in o.context.getObject(p)){if(o.context.getObject(p+i+"/$Type")==="com.sap.vocabularies.UI.v1.DataFieldForAction"||o.context.getObject(p+i+"/$Type")==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"){m.push(o.context.getObject(p+i+"/Label"));}}if(m.length>1){return m.reduce(function(a,b){return a.length>b.length?a:b;});}else{return m.length===0?undefined:m.toString();}}},_getResponsiveTableColumnSettings:function(t,o){if(t.tableType==="ResponsiveTable"){return o.settings;}return null;},getChartSize:function(t,o){var s=this._getResponsiveTableColumnSettings(t,o);if(s&&s.microChartSize){return s.microChartSize;}return"XS";},getShowOnlyChart:function(t,o){var s=this._getResponsiveTableColumnSettings(t,o);if(s&&s.showMicroChartLabel){return!s.showMicroChartLabel;}return true;},getDelegate:function(E,h,s){var D;if(h==="true"){D={name:E?"sap/fe/macros/table/delegates/AnalyticalALPTableDelegate":"sap/fe/macros/table/delegates/ALPTableDelegate",payload:{collectionName:s}};}else{D={name:E?"sap/fe/macros/table/delegates/AnalyticalTableDelegate":"sap/fe/macros/table/delegates/TableDelegate"};}return JSON.stringify(D);},setIBNEnablement:function(I,n,s){for(var k in n){I.setProperty("ibn/"+k,{bEnabled:false,aApplicable:[],aNotApplicable:[]});var a=[],N=[];var p=n[k];for(var i=0;i<s.length;i++){var o=s[i];if(o.getObject(p)){I.getModel().setProperty(I.getPath()+"/ibn/"+k+"/bEnabled",true);a.push(o);}else{N.push(o);}}I.getModel().setProperty(I.getPath()+"/ibn/"+k+"/aApplicable",a);I.getModel().setProperty(I.getPath()+"/ibn/"+k+"/aNotApplicable",N);}}};T.getNavigationAvailableMap.requiresIContext=true;T.addNavigationAvailableFieldsToSelectQuery.requiresIContext=true;T.addFieldsHavingTextArrangementToSelectQuery.requiresIContext=true;T.getValueOnRatingField.requiresIContext=true;T.getTextOnActionField.requiresIContext=true;return T;},true);

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

@@ -301,7 +301,7 @@ sap.ui.define(
 		function updateBindingInfo(oBindingInfo, oFilterInfo, oFilter) {
 			oBindingInfo.filters = oFilter;
 			if (oFilterInfo.search) {
-				oBindingInfo.parameters.$search = oFilterInfo.search;
+				oBindingInfo.parameters.$search = CommonUtils.normalizeSearchTerm(oFilterInfo.search);
 			} else {
 				oBindingInfo.parameters.$search = undefined;
 			}

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=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=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;});

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

@@ -183,10 +183,7 @@ sap.ui.define(
 					// Add properties which are supported only by simple PropertyInfos.
 					oPropertyInfo.path = oColumnInfo.relativePath;
 					// TODO with the new complex property info, a lot of "Description" fields are added as filter/sort fields
-					oPropertyInfo.sortable =
-						oColumnInfo.sortable &&
-						// TODO sorting by association properties is not supported by CAP/RAP (the created query is correct OData syntax)
-						!oColumnInfo.relativePath.includes("/");
+					oPropertyInfo.sortable = oColumnInfo.sortable;
 					oPropertyInfo.filterable =
 						!oColumnInfo.isDataPointFakeTargetProperty &&
 						bFilterable &&
@@ -451,6 +448,8 @@ sap.ui.define(
 				TableDelegateBase.updateBinding.apply(this, [oTable, oBindingInfo, oBinding]);
 				oTable.fireEvent("bindingUpdated");
 				this._manageSemanticTargets(oTable);
+				var oTableAPI = oTable.getParent();
+				oTableAPI.fireStateChanged();
 			},
 
 			_internalUpdateBindingInfo: function(oTable, oMetadataInfo, oBindingInfo) {

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&&!o.relativePath.includes("/");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);},_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/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);

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.96.0",
+    "version": "1.97.0",
     "library": "sap.fe.macros",
     "symbols": [
         {
@@ -629,7 +629,7 @@
             "events": [
                 {
                     "name": "filterChanged",
-                    "description": "This event is fired after either a filter value or the visibility of a filter item has been changed.\nThe event contains conditions that will be used as filters.",
+                    "description": "This event is fired after either a filter value or the visibility of a filter item has been changed. the event contains conditions that will be used as filters.",
                     "visibility": "public"
                 },
                 {