@sap/open.fe 1.96.0 → 1.97.0

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/macros/ResourceModel","sap/ui/model/odata/v4/AnnotationHelper","sap/base/Log","sap/fe/core/CommonUtils","sap/fe/navigation/SelectionVariant","sap/fe/core/helpers/StableIdHelper","sap/fe/core/helpers/ModelHelper","sap/ui/model/Context","sap/ui/Device","sap/m/library"],function(R,O,L,C,S,a,M,b,D,m){"use strict";var V=m.ValueColor;var H={getPathToKey:function(c){return c.getObject();},isVisible:function(t,i){var o=i.context.getModel(),p=i.context.getPath(),A=o.getObject(p+"@"),h=A["@com.sap.vocabularies.UI.v1.Hidden"];return typeof h==="object"?"{= !${"+h.$Path+"} }":!h;},isDialog:function(A,i){var o=i.context.getModel(),p=i.context.getPath(),c=o.getObject(p+"/@$ui5.overload@com.sap.vocabularies.Common.v1.IsActionCritical");if(c){return"Dialog";}else if(A){var d=Array.isArray(A)?A[0]:A;if(d.$Parameter&&d.$Parameter.length>1){return"Dialog";}else{return"None";}}},getParameterEditMode:function(t,i){var o=i.context.getModel(),p=i.context.getPath(),A=o.getObject(p+"@"),f=A["@com.sap.vocabularies.Common.v1.FieldControl"],c=A["@Org.OData.Core.V1.Immutable"],d=A["@Org.OData.Core.V1.Computed"];if(f&&f.$Path){if(f.$Path==="ReadOnly"){return sap.ui.mdc.enum.EditMode.ReadOnly;}else{return("{= %{"+f.$Path+"} ? "+"'"+sap.ui.mdc.enum.EditMode.ReadOnly+"'"+" : "+"'"+sap.ui.mdc.enum.EditMode.Editable+"'"+" }");}}if(f&&f.$EnumMember){if(f.$EnumMember==="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly"){return sap.ui.mdc.enum.EditMode.ReadOnly;}}if(c||d){return sap.ui.mdc.enum.EditMode.ReadOnly;}return sap.ui.mdc.enum.EditMode.Editable;},getMetaPath:function(t,i){return(i&&i.context&&i.context.getPath())||undefined;},isDesktop:function(){return D.system.desktop===true;},getTargetCollection:function(c,n){var p=c.getPath(),P,e,d;if(c.getMetadata().getName()==="sap.ui.model.Context"&&(c.getObject("$kind")==="EntitySet"||c.getObject("$ContainsTarget")===true)){return p;}if(c.getModel){p=(c.getModel().getMetaPath&&c.getModel().getMetaPath(p))||c.getModel().getMetaModel().getMetaPath(p);}P=p.split("/").filter(function(s){return s&&s!="$Type";});e="/"+P[0];if(P.length===1){return e;}d=n===undefined?P.slice(1).join("/$NavigationPropertyBinding/"):n;return e+"/$NavigationPropertyBinding/"+d;},isPropertyFilterable:function(p,i,d){var o=i.context.getModel(),P=i.context.getPath(),s=H.getLocationForPropertyPath(o,P),c=P.replace(s+"/","");if(d&&(d.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAction"||d.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation")){return false;}return C.isPropertyFilterable(o,s,c);},getLocationForPropertyPath:function(o,p){var l;var c=p.slice(0,p.lastIndexOf("/"));if(o.getObject(c+"/$kind")==="EntityContainer"){l=c.length+1;c=p.slice(l,p.indexOf("/",l));}return c;},gotoActionParameter:function(c){var p=c.getPath(),P=c.getObject(p+"/$Name");var s;if(p.indexOf("@$ui5.overload")>-1){s=p.split("@$ui5.overload")[0];}else{var A=p.split("/0/")[0].split(".");s="/"+A[A.length-1]+"/";}return s+P;},getEntitySetName:function(o,e){var E=o.getObject("/");for(var k in E){if(typeof E[k]==="object"&&E[k].$Type===e){return k;}}},getActionPath:function(A,r,s,c){var d=A.getPath().split("/@")[0];s=!s?A.getObject(A.getPath()):s;if(s&&s.indexOf("(")>-1){s=s.split("(")[0];}else{var e=A.getObject(d).$Type;var E=this.getEntitySetName(A.getModel(),e);if(E){d="/"+E;}}if(c){return A.getObject(d+"/"+s+"@Org.OData.Core.V1.OperationAvailable");}if(r){return d+"/"+s;}else{return{sContextPath:d,sProperty:A.getObject(d+"/"+s+"@Org.OData.Core.V1.OperationAvailable/$Path"),sBindingParameter:A.getObject(d+"/"+s+"/@$ui5.overload/0/$Parameter/0/$Name")};}},getEditMode:function(A,d,f,e,c,u,E,p){if(e==="Display"||e==="ReadOnly"||e==="Disabled"){return e;}var g,i,s,h,j,k,F,l,n,I,o,q=E&&E.$Key.indexOf(p)>-1;if(d==="com.sap.vocabularies.UI.v1.DataFieldWithUrl"||(A&&A["@com.sap.vocabularies.Common.v1.SemanticObject"]&&!(A["@com.sap.vocabularies.Common.v1.ValueListReferences"]||A["@com.sap.vocabularies.Common.v1.ValueListMapping"]||A["@com.sap.vocabularies.Common.v1.ValueList"]||A["@com.sap.vocabularies.Common.v1.ValueListWithFixedValues"]))){return"Display";}if(A&&A["@Org.OData.Core.V1.Computed"]){g=A["@Org.OData.Core.V1.Computed"].Bool?A["@Org.OData.Core.V1.Computed"].Bool=="true":true;}if(A&&A["@Org.OData.Core.V1.Immutable"]){i=A["@Org.OData.Core.V1.Immutable"].Bool?A["@Org.OData.Core.V1.Immutable"].Bool=="true":true;}if(q&&!g&&i){return"{= %{@$ui5.context.isTransient} === true ? 'Editable' : 'Display'}";}j=g||i||q;if(c&&c.indexOf("{")===0){c="$"+c;}n=typeof g==="undefined"?typeof i==="undefined":!g;if(f){if(f.indexOf("{")===0){I="$"+f+" === '1'";o="$"+f+" === '0'";}else{j=j||f=="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";}}var r;var t;var v;var w;if(I){w=e==="Editable"?"'ReadOnly'":"$"+e+" === 'Editable' ? 'ReadOnly'  : 'Display'";if(n){t=e==="Editable"?c+" ? 'Editable' : 'ReadOnly'":"$"+e+" === 'Editable' ? "+c+"? 'Editable' : 'ReadOnly'  : 'Display'";v=e==="Editable"?"'Disabled'":"$"+e+" === 'Editable' ? 'Disabled' : 'Display'";}else{t=e==="Editable"?"'ReadOnly'":"$"+e+" === 'Editable' ? 'ReadOnly' : 'Display'";v=e==="Editable"?"'Disabled'":"$"+e+" === 'Editable' ? 'Disabled' : 'Display'";}}else{t="'Display'";v="'Display'";w="'Display'";}k=e&&e.indexOf("{")===0?"$"+e:"'"+e+"'";if(j){if(!n){if(e&&e.indexOf("{")===0){return"{= "+t+"}";}t=t.split("'")&&t.split("'")[1];return t;}else{if(I){if(c&&c.indexOf("$")===0){return("{= "+c+" ? ("+o+"? "+"'Disabled'"+" : "+I+"? "+"'ReadOnly'"+" : "+k+") : "+t+"}");}else if(c=="true"){return("{= "+o+"? "+"'Disabled'"+" : "+I+"? "+"'ReadOnly'"+" : "+"${ui>/editMode} === 'Editable'"+"}");}else{return"{= "+t+"}";}}else if(f=="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly"){k="'ReadOnly'";}if(c&&c.indexOf("$")===0){return"{= "+c+" ?"+"${ui>/editMode} === 'Editable'"+" : "+t+"}";}else if(c=="true"){return"{= "+k+"}";}else{return"{= "+t+"}";}}}if(I){if(u&&u.indexOf("{")===0){k="$"+u+" === '1' ? 'EditableReadOnly' : "+k;}else if(u==="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly"){k="EditableReadOnly";}s=o+" ? "+v+" :"+I+" ? "+w+" :"+k;r="{= "+s+"}";}else if(u&&(u.indexOf("{")===0||u==="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly")){F=u.indexOf("{")===0?"$"+u+" === '1'":undefined;l=e==="Editable"?"'EditableReadOnly'":"$"+e+" === 'Editable' ? 'EditableReadOnly' : 'Display'";if(F){s=F+" ? "+l+" :"+k;}else{s=l;}r="{= "+s+"}";}else{s=k;r=e;}var x;if(c&&c.indexOf("$")===0){x="{= "+c+" ? "+t+" : "+s+"}";}else if(c=="true"){x="{= "+t+"}";}else{x="{= "+s+"}";}h=n?r:x;return h;},getNavigationContext:function(c){return O.getNavigationPath(c.getPath());},getNavigationPath:function(p,k){var s=p.startsWith("/");var P=p.split("/").filter(function(c){return!!c;});if(s){P.shift();}if(!k){P.pop();}return P.join("/");},getActionContext:function(A){return H.getActionPath(A,true);},getPathToBoundActionOverload:function(A){var p=H.getActionPath(A,true);return p+"/@$ui5.overload/0";},addSingleQuotes:function(v){return"'"+v+"'";},generateFunction:function(f){var p="";for(var i=1;i<arguments.length;i++){p+=arguments[i];if(i<arguments.length-1){p+=", ";}}var F=f+"()";if(p){F=f+"("+p+")";}return F;},getHeaderDataPointLinkVisibility:function(p,l,f){var v;if(f){v=l?"{= ${internal>isHeaderDPLinkVisible/"+p+"} === true && "+f+"}":"{= ${internal>isHeaderDPLinkVisible/"+p+"} !== true && "+f+"}";}else{v=l?"{= ${internal>isHeaderDPLinkVisible/"+p+"} === true}":"{= ${internal>isHeaderDPLinkVisible/"+p+"} !== true}";}return v;},objectToString:function(p){var n=Object.keys(p).length,P="";for(var k in p){var v=p[k];if(v&&typeof v==="object"){v=this.objectToString(v);}P+=k+": "+v;if(n>1){--n;P+=", ";}}var o="{ "+P+"}";return o;},removeEscapeCharacters:function(e){return e?e.replace(/\\?\\([{}])/g,"$1"):undefined;},stringifyObject:function(s){if(!s){return undefined;}else{var o=JSON.parse(s);if(typeof o==="object"&&!Array.isArray(o)){var u={ui5object:true};Object.assign(u,o);return JSON.stringify(u);}else{var t=Array.isArray(o)?"Array":typeof o;L.error("Unexpected object type in stringifyObject ("+t+") - only works with object");throw new Error("stringifyObject only works with objects!");}}},stringifyCustomData:function(d){var o={ui5object:true};o["customData"]=d instanceof b?d.getObject():d;return JSON.stringify(o);},parseCustomData:function(d){var d=typeof d==="string"?JSON.parse(d):d;if("customData"in d){return d["customData"];}return d;},_getDraftAdministrativeDataType:function(o,e){return o.requestObject("/"+e+"/DraftAdministrativeData/");},getPopoverText:function(c,e){return H._getDraftAdministrativeDataType(c.getModel(),e).then(function(d){var B="{parts: [{path: 'HasDraftEntity', targetType: 'any'}, "+"{path: 'DraftAdministrativeData/InProcessByUser'}, "+"{path: 'DraftAdministrativeData/LastChangedByUser'} ";if(d.InProcessByUserDescription){B+=" ,{path: 'DraftAdministrativeData/InProcessByUserDescription'}";}if(d.LastChangedByUserDescription){B+=", {path: 'DraftAdministrativeData/LastChangedByUserDescription'}";}B+="], formatter: 'sap.fe.macros.field.FieldRuntime.formatDraftOwnerTextInPopover'}";return B;});},getContextPath:function(v,i){return i&&i.context&&i.context.getPath();},getSortConditions:function(p,P){if(p&&this._isPresentationVariantAnnotation(P)&&p.SortOrder){var s={sorters:[]};p.SortOrder.forEach(function(c){var o={};o.name=c.Property.$PropertyPath;o.descending=!!c.Descending;s.sorters.push(o);});return JSON.stringify(s);}return undefined;},_isPresentationVariantAnnotation:function(A){return(A.indexOf("@com.sap.vocabularies.UI.v1.PresentationVariant")>-1||A.indexOf("@com.sap.vocabularies.UI.v1.SelectionPresentationVariant")>-1);},createPresentationPathContext:function(p){var P=p.sPath.split("@")||[];var o=p.getModel();if(P.length&&P[P.length-1].indexOf("com.sap.vocabularies.UI.v1.SelectionPresentationVariant")>-1){var s=p.sPath.split("/PresentationVariant")[0];return o.createBindingContext(s+"@sapui.name");}return o.createBindingContext(p.sPath+"@sapui.name");},getPressHandlerForDataFieldForIBN:function(d,c,n){var N={navigationContexts:c?c:"${$source>/}.getBindingContext()"};if(d.RequiresContext&&!d.Inline&&n){N.applicableContexts="${internal>ibn/"+d.SemanticObject+"-"+d.Action+"/aApplicable/}";N.notApplicableContexts="${internal>ibn/"+d.SemanticObject+"-"+d.Action+"/aNotApplicable/}";N.label="'"+d.Label+"'";}if(d.Mapping){N.semanticObjectMapping=this.addSingleQuotes(JSON.stringify(d.Mapping));}return this.generateFunction(n?"._intentBasedNavigation.navigateWithConfirmationDialog":"._intentBasedNavigation.navigate",this.addSingleQuotes(d.SemanticObject),this.addSingleQuotes(d.Action),this.objectToString(N));},getEntitySet:function(c){var p=c.getPath();return M.getEntitySetPath(p);},_isRatingIndicator:function(c){if(c.isA("sap.fe.core.controls.FieldWrapper")){var v=Array.isArray(c.getContentDisplay())?c.getContentDisplay()[0]:c.getContentDisplay();if(v&&v.isA("sap.m.RatingIndicator")){return true;}}return false;},_updateStyleClassForRatingIndicator:function(f,l){var c=Array.isArray(f.getContentDisplay())?f.getContentDisplay()[0]:f.getContentDisplay();var v=Array.isArray(f.getContentEdit())?f.getContentEdit()[0]:f.getContentEdit();if(l){c.addStyleClass("sapUiNoMarginBottom");c.addStyleClass("sapUiNoMarginTop");v.removeStyleClass("sapUiTinyMarginBottom");}else{c.addStyleClass("sapUiNoMarginBottom");c.removeStyleClass("sapUiNoMarginTop");v.addStyleClass("sapUiTinyMarginBottom");}},handleVisibilityOfMenuActions:function(v){var c=[];if(Array.isArray(v)){for(var i=0;i<v.length;i++){if(v[i].split("{=").length>0){v[i]=v[i].split("{=")[1].slice(0,-1);}c.push("("+v[i]+")");}}return c.length>0?"{= "+c.join(" || ")+"}":v;},getCriticalityCalculationBinding:function(i,v,d,t,A,s,T,c){var e=V.Neutral;v="%"+v;d=d||-Infinity;t=t||d;A=A||t;c=c||Infinity;T=T||c;s=s||T;d=d&&(+d?+d:"%"+d);t=t&&(+t?+t:"%"+t);A=A&&(+A?+A:"%"+A);s=s&&(+s?+s:"%"+s);T=T&&(+T?+T:"%"+T);c=c&&(+c?+c:"%"+c);if(i.indexOf("Minimize")>-1){e="{= "+v+" <= "+s+" ? '"+V.Good+"' : "+v+" <= "+T+" ? '"+V.Neutral+"' : "+"("+c+" && "+v+" <= "+c+") ? '"+V.Critical+"' : '"+V.Error+"' }";}else if(i.indexOf("Maximize")>-1){e="{= "+v+" >= "+A+" ? '"+V.Good+"' : "+v+" >= "+t+" ? '"+V.Neutral+"' : "+"("+d+" && "+v+" >= "+d+") ? '"+V.Critical+"' : '"+V.Error+"' }";}else if(i.indexOf("Target")>-1){e="{= ("+v+" <= "+s+" && "+v+" >= "+A+") ? '"+V.Good+"' : "+"(("+v+" >= "+t+" && "+v+" < "+A+") || ("+v+" > "+s+" && "+v+" <= "+T+")) ? '"+V.Neutral+"' : "+"(("+d+" && ("+v+" >= "+d+") && ("+v+" < "+t+")) || (("+v+" > "+T+") && "+c+" && ("+v+" <= "+c+"))) ? '"+V.Critical+"' : '"+V.Error+"' }";}else{L.warning("Case not supported, returning the default Value Neutral");}return e;},_getCriticalityFromEnum:function(c){var i;if(c==="com.sap.vocabularies.UI.v1.CriticalityType/Negative"){i=V.Error;}else if(c==="com.sap.vocabularies.UI.v1.CriticalityType/Positive"){i=V.Good;}else if(c==="com.sap.vocabularies.UI.v1.CriticalityType/Critical"){i=V.Critical;}else{i=V.Neutral;}return i;},getValueCriticality:function(d,v){var r,c=[];if(v&&v.length>0){v.forEach(function(o){if(o.Value&&o.Criticality.$EnumMember){var s="${"+d+"} === '"+o.Value+"' ? '"+H._getCriticalityFromEnum(o.Criticality.$EnumMember)+"'";c.push(s);}});r=c.length>0&&c.join(" : ")+" : undefined";}return r?"{= "+r+" }":undefined;},getMeasureAttributeIndex:function(i,c){var d=c.Measures,e,f=c.MeasureAttributes,s=d&&d[i]&&d[i].$PropertyPath,g=-1,h=function(j,o,k){if((o&&o.Measure&&o.Measure.$PropertyPath)===j){g=k;return true;}};if(f){e=f.some(h.bind(null,s));}return e&&g>-1&&g;},getMeasureAttributeForMeasure:function(c){var o=c.getModel(),s=c.getPath(),d=s.substring(0,s.lastIndexOf("Measure")),i=s.replace(/.*\//,"");return o.requestObject(d).then(function(e){var f=e.MeasureAttributes,g=H.getMeasureAttributeIndex(i,e);var h=g>-1&&f[g]&&f[g].DataPoint?d+"MeasureAttributes/"+g+"/":L.warning("DataPoint missing for the measure")&&undefined;return h?h+"DataPoint/$AnnotationPath/":h;});},isDraftParentEntityForContainment:function(t,T){if(t){if(T&&T.parentEntitySet&&T.parentEntitySet.sPath){var p=T.parentEntitySet.sPath;var d=T.parentEntitySet.oModel.getObject(p+"@com.sap.vocabularies.Common.v1.DraftRoot");var o=T.parentEntitySet.oModel.getObject(p+"@com.sap.vocabularies.Common.v1.DraftNode");if(d||o){return true;}else{return false;}}}else{return false;}},getDataFromTemplate:function(d){var s=d.getPath().split("/");var c=s[s.length-1];var e="/"+s.slice(1,-2).join("/")+"/@";var f=d.getObject(e);var t=f.Template;var g=t.split("}");var h=[];for(var i=0;i<g.length-1;i++){var k=g[i].split("{")[1].trim();h.push(k);}var j=Object.keys(f.Data).indexOf(c)-1;return"/"+s.slice(1,-2).join("/")+"/Data/"+h[j];},notLastIndex:function(t,e){var c=t.Template;var s=c.split("}");var d=[];var f=false;for(var i=0;i<s.length-1;i++){var g=s[i].split("{")[1].trim();d.push(g);}d.forEach(function(c){if(t.Data[c]===e&&d.indexOf(c)!==d.length-1){f=true;}});return f;},getDelimiter:function(t){return t.split("}")[1].split("{")[0].trim();},getParameters:function(c,i){if(c){var o=i.context.getModel();var p=i.context.getPath();var P=C.getParameterInfo(o,p);if(P.parameterProperties){return Object.keys(P.parameterProperties);}}return[];}};H.isPropertyFilterable.requiresIContext=true;H.getPopoverText.requiresIContext=true;return H;},true);
+sap.ui.define(["sap/fe/macros/ResourceModel","sap/ui/model/odata/v4/AnnotationHelper","sap/base/Log","sap/fe/core/CommonUtils","sap/fe/navigation/SelectionVariant","sap/fe/core/helpers/StableIdHelper","sap/fe/core/helpers/ModelHelper","sap/ui/model/Context","sap/ui/Device","sap/m/library"],function(R,O,L,C,S,a,M,b,D,m){"use strict";var V=m.ValueColor;var H={getPathToKey:function(c){return c.getObject();},isVisible:function(t,i){var o=i.context.getModel(),p=i.context.getPath(),A=o.getObject(p+"@"),h=A["@com.sap.vocabularies.UI.v1.Hidden"];return typeof h==="object"?"{= !${"+h.$Path+"} }":!h;},isDialog:function(A,i){var o=i.context.getModel(),p=i.context.getPath(),c=o.getObject(p+"/@$ui5.overload@com.sap.vocabularies.Common.v1.IsActionCritical");if(c){return"Dialog";}else if(A){var d=Array.isArray(A)?A[0]:A;if(d.$Parameter&&d.$Parameter.length>1){return"Dialog";}else{return"None";}}},getParameterEditMode:function(t,i){var o=i.context.getModel(),p=i.context.getPath(),A=o.getObject(p+"@"),f=A["@com.sap.vocabularies.Common.v1.FieldControl"],c=A["@Org.OData.Core.V1.Immutable"],d=A["@Org.OData.Core.V1.Computed"];if(f&&f.$Path){if(f.$Path==="ReadOnly"){return sap.ui.mdc.enum.EditMode.ReadOnly;}else{return("{= %{"+f.$Path+"} ? "+"'"+sap.ui.mdc.enum.EditMode.ReadOnly+"'"+" : "+"'"+sap.ui.mdc.enum.EditMode.Editable+"'"+" }");}}if(f&&f.$EnumMember){if(f.$EnumMember==="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly"){return sap.ui.mdc.enum.EditMode.ReadOnly;}}if(c||d){return sap.ui.mdc.enum.EditMode.ReadOnly;}return sap.ui.mdc.enum.EditMode.Editable;},getMetaPath:function(t,i){return(i&&i.context&&i.context.getPath())||undefined;},isDesktop:function(){return D.system.desktop===true;},getTargetCollection:function(c,n){var p=c.getPath(),P,e,d;if(c.getMetadata().getName()==="sap.ui.model.Context"&&(c.getObject("$kind")==="EntitySet"||c.getObject("$ContainsTarget")===true)){return p;}if(c.getModel){p=(c.getModel().getMetaPath&&c.getModel().getMetaPath(p))||c.getModel().getMetaModel().getMetaPath(p);}P=p.split("/").filter(function(s){return s&&s!="$Type";});e="/"+P[0];if(P.length===1){return e;}d=n===undefined?P.slice(1).join("/$NavigationPropertyBinding/"):n;return e+"/$NavigationPropertyBinding/"+d;},isPropertyFilterable:function(p,i,d){var o=i.context.getModel(),P=i.context.getPath(),s=H.getLocationForPropertyPath(o,P),c=P.replace(s+"/","");if(d&&(d.$Type==="com.sap.vocabularies.UI.v1.DataFieldForAction"||d.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation")){return false;}return C.isPropertyFilterable(o,s,c);},getLocationForPropertyPath:function(o,p){var l;var c=p.slice(0,p.lastIndexOf("/"));if(o.getObject(c+"/$kind")==="EntityContainer"){l=c.length+1;c=p.slice(l,p.indexOf("/",l));}return c;},gotoActionParameter:function(c){var p=c.getPath(),P=c.getObject(p+"/$Name");var s;if(p.indexOf("@$ui5.overload")>-1){s=p.split("@$ui5.overload")[0];}else{var A=p.split("/0/")[0].split(".");s="/"+A[A.length-1]+"/";}return s+P;},getEntitySetName:function(o,e){var E=o.getObject("/");for(var k in E){if(typeof E[k]==="object"&&E[k].$Type===e){return k;}}},getActionPath:function(A,r,s,c){var d=A.getPath().split("/@")[0];s=!s?A.getObject(A.getPath()):s;if(s&&s.indexOf("(")>-1){s=s.split("(")[0];}else{var e=A.getObject(d).$Type;var E=this.getEntitySetName(A.getModel(),e);if(E){d="/"+E;}}if(c){return A.getObject(d+"/"+s+"@Org.OData.Core.V1.OperationAvailable");}if(r){return d+"/"+s;}else{return{sContextPath:d,sProperty:A.getObject(d+"/"+s+"@Org.OData.Core.V1.OperationAvailable/$Path"),sBindingParameter:A.getObject(d+"/"+s+"/@$ui5.overload/0/$Parameter/0/$Name")};}},getEditMode:function(A,d,f,e,c,u,E,p){if(e==="Display"||e==="ReadOnly"||e==="Disabled"){return e;}var g,i,s,h,j,k,F,l,n,I,o,q=E&&E.$Key.indexOf(p)>-1;if(d==="com.sap.vocabularies.UI.v1.DataFieldWithUrl"||(A&&A["@com.sap.vocabularies.Common.v1.SemanticObject"]&&!(A["@com.sap.vocabularies.Common.v1.ValueListReferences"]||A["@com.sap.vocabularies.Common.v1.ValueListMapping"]||A["@com.sap.vocabularies.Common.v1.ValueList"]||A["@com.sap.vocabularies.Common.v1.ValueListWithFixedValues"]))){return"Display";}if(A&&A["@Org.OData.Core.V1.Computed"]){g=A["@Org.OData.Core.V1.Computed"].Bool?A["@Org.OData.Core.V1.Computed"].Bool=="true":true;}if(A&&A["@Org.OData.Core.V1.Immutable"]){i=A["@Org.OData.Core.V1.Immutable"].Bool?A["@Org.OData.Core.V1.Immutable"].Bool=="true":true;}if(q&&!g&&i){return"{= %{@$ui5.context.isTransient} === true ? 'Editable' : 'Display'}";}j=g||i||q;if(c&&c.indexOf("{")===0){c="$"+c;}n=typeof g==="undefined"?typeof i==="undefined":!g;if(f){if(f.indexOf("{")===0){I="$"+f+" === '1'";o="$"+f+" === '0'";}else{j=j||f=="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";}}var r;var t;var v;var w;if(I){w=e==="Editable"?"'ReadOnly'":"$"+e+" === 'Editable' ? 'ReadOnly'  : 'Display'";if(n){t=e==="Editable"?c+" ? 'Editable' : 'ReadOnly'":"$"+e+" === 'Editable' ? "+c+"? 'Editable' : 'ReadOnly'  : 'Display'";v=e==="Editable"?"'Disabled'":"$"+e+" === 'Editable' ? 'Disabled' : 'Display'";}else{t=e==="Editable"?"'ReadOnly'":"$"+e+" === 'Editable' ? 'ReadOnly' : 'Display'";v=e==="Editable"?"'Disabled'":"$"+e+" === 'Editable' ? 'Disabled' : 'Display'";}}else{t="'Display'";v="'Display'";w="'Display'";}k=e&&e.indexOf("{")===0?"$"+e:"'"+e+"'";if(j){if(!n){if(e&&e.indexOf("{")===0){return"{= "+t+"}";}t=t.split("'")&&t.split("'")[1];return t;}else{if(I){if(c&&c.indexOf("$")===0){return("{= "+c+" ? ("+o+"? "+"'Disabled'"+" : "+I+"? "+"'ReadOnly'"+" : "+k+") : "+t+"}");}else if(c=="true"){return("{= "+o+"? "+"'Disabled'"+" : "+I+"? "+"'ReadOnly'"+" : "+"${ui>/editMode} === 'Editable'"+"}");}else{return"{= "+t+"}";}}else if(f=="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly"){k="'ReadOnly'";}if(c&&c.indexOf("$")===0){return"{= "+c+" ?"+"${ui>/editMode} === 'Editable'"+" : "+t+"}";}else if(c=="true"){return"{= "+k+"}";}else{return"{= "+t+"}";}}}if(I){if(u&&u.indexOf("{")===0){k="$"+u+" === '1' ? 'EditableReadOnly' : "+k;}else if(u==="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly"){k="EditableReadOnly";}s=o+" ? "+v+" :"+I+" ? "+w+" :"+k;r="{= "+s+"}";}else if(u&&(u.indexOf("{")===0||u==="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly")){F=u.indexOf("{")===0?"$"+u+" === '1'":undefined;l=e==="Editable"?"'EditableReadOnly'":"$"+e+" === 'Editable' ? 'EditableReadOnly' : 'Display'";if(F){s=F+" ? "+l+" :"+k;}else{s=l;}r="{= "+s+"}";}else{s=k;r=e;}var x;if(c&&c.indexOf("$")===0){x="{= "+c+" ? "+t+" : "+s+"}";}else if(c=="true"){x="{= "+t+"}";}else{x="{= "+s+"}";}h=n?r:x;return h;},getNavigationContext:function(c){return O.getNavigationPath(c.getPath());},getNavigationPath:function(p,k){var s=p.startsWith("/");var P=p.split("/").filter(function(c){return!!c;});if(s){P.shift();}if(!k){P.pop();}return P.join("/");},getActionContext:function(A){return H.getActionPath(A,true);},getPathToBoundActionOverload:function(A){var p=H.getActionPath(A,true);return p+"/@$ui5.overload/0";},addSingleQuotes:function(v,e){if(e&&v){v=v.replace(/[']/g,"\\'");}return"'"+v+"'";},generateFunction:function(f){var p="";for(var i=1;i<arguments.length;i++){p+=arguments[i];if(i<arguments.length-1){p+=", ";}}var F=f+"()";if(p){F=f+"("+p+")";}return F;},getHeaderDataPointLinkVisibility:function(p,l,f){var v;if(f){v=l?"{= ${internal>isHeaderDPLinkVisible/"+p+"} === true && "+f+"}":"{= ${internal>isHeaderDPLinkVisible/"+p+"} !== true && "+f+"}";}else{v=l?"{= ${internal>isHeaderDPLinkVisible/"+p+"} === true}":"{= ${internal>isHeaderDPLinkVisible/"+p+"} !== true}";}return v;},objectToString:function(p){var n=Object.keys(p).length,P="";for(var k in p){var v=p[k];if(v&&typeof v==="object"){v=this.objectToString(v);}P+=k+": "+v;if(n>1){--n;P+=", ";}}var o="{ "+P+"}";return o;},removeEscapeCharacters:function(e){return e?e.replace(/\\?\\([{}])/g,"$1"):undefined;},stringifyObject:function(s){if(!s){return undefined;}else{var o=JSON.parse(s);if(typeof o==="object"&&!Array.isArray(o)){var u={ui5object:true};Object.assign(u,o);return JSON.stringify(u);}else{var t=Array.isArray(o)?"Array":typeof o;L.error("Unexpected object type in stringifyObject ("+t+") - only works with object");throw new Error("stringifyObject only works with objects!");}}},stringifyCustomData:function(d){var o={ui5object:true};o["customData"]=d instanceof b?d.getObject():d;return JSON.stringify(o);},parseCustomData:function(d){var d=typeof d==="string"?JSON.parse(d):d;if("customData"in d){return d["customData"];}return d;},_getDraftAdministrativeDataType:function(o,e){return o.requestObject("/"+e+"/DraftAdministrativeData/");},getPopoverText:function(c,e){return H._getDraftAdministrativeDataType(c.getModel(),e).then(function(d){var B="{parts: [{path: 'HasDraftEntity', targetType: 'any'}, "+"{path: 'DraftAdministrativeData/InProcessByUser'}, "+"{path: 'DraftAdministrativeData/LastChangedByUser'} ";if(d.InProcessByUserDescription){B+=" ,{path: 'DraftAdministrativeData/InProcessByUserDescription'}";}if(d.LastChangedByUserDescription){B+=", {path: 'DraftAdministrativeData/LastChangedByUserDescription'}";}B+="], formatter: 'sap.fe.macros.field.FieldRuntime.formatDraftOwnerTextInPopover'}";return B;});},getContextPath:function(v,i){return i&&i.context&&i.context.getPath();},getSortConditions:function(p,P){if(p&&this._isPresentationVariantAnnotation(P)&&p.SortOrder){var s={sorters:[]};p.SortOrder.forEach(function(c){var o={};o.name=c.Property.$PropertyPath;o.descending=!!c.Descending;s.sorters.push(o);});return JSON.stringify(s);}return undefined;},_isPresentationVariantAnnotation:function(A){return(A.indexOf("@com.sap.vocabularies.UI.v1.PresentationVariant")>-1||A.indexOf("@com.sap.vocabularies.UI.v1.SelectionPresentationVariant")>-1);},createPresentationPathContext:function(p){var P=p.sPath.split("@")||[];var o=p.getModel();if(P.length&&P[P.length-1].indexOf("com.sap.vocabularies.UI.v1.SelectionPresentationVariant")>-1){var s=p.sPath.split("/PresentationVariant")[0];return o.createBindingContext(s+"@sapui.name");}return o.createBindingContext(p.sPath+"@sapui.name");},getPressHandlerForDataFieldForIBN:function(d,c,n){var N={navigationContexts:c?c:"${$source>/}.getBindingContext()"};if(d.RequiresContext&&!d.Inline&&n){N.applicableContexts="${internal>ibn/"+d.SemanticObject+"-"+d.Action+"/aApplicable/}";N.notApplicableContexts="${internal>ibn/"+d.SemanticObject+"-"+d.Action+"/aNotApplicable/}";N.label="'"+d.Label+"'";}if(d.Mapping){N.semanticObjectMapping=this.addSingleQuotes(JSON.stringify(d.Mapping));}return this.generateFunction(n?"._intentBasedNavigation.navigateWithConfirmationDialog":"._intentBasedNavigation.navigate",this.addSingleQuotes(d.SemanticObject),this.addSingleQuotes(d.Action),this.objectToString(N));},getEntitySet:function(c){var p=c.getPath();return M.getEntitySetPath(p);},_isRatingIndicator:function(c){if(c.isA("sap.fe.core.controls.FieldWrapper")){var v=Array.isArray(c.getContentDisplay())?c.getContentDisplay()[0]:c.getContentDisplay();if(v&&v.isA("sap.m.RatingIndicator")){return true;}}return false;},_updateStyleClassForRatingIndicator:function(f,l){var c=Array.isArray(f.getContentDisplay())?f.getContentDisplay()[0]:f.getContentDisplay();var v=Array.isArray(f.getContentEdit())?f.getContentEdit()[0]:f.getContentEdit();if(l){c.addStyleClass("sapUiNoMarginBottom");c.addStyleClass("sapUiNoMarginTop");v.removeStyleClass("sapUiTinyMarginBottom");}else{c.addStyleClass("sapUiNoMarginBottom");c.removeStyleClass("sapUiNoMarginTop");v.addStyleClass("sapUiTinyMarginBottom");}},handleVisibilityOfMenuActions:function(v){var c=[];if(Array.isArray(v)){for(var i=0;i<v.length;i++){if(v[i].split("{=").length>0){v[i]=v[i].split("{=")[1].slice(0,-1);}c.push("("+v[i]+")");}}return c.length>0?"{= "+c.join(" || ")+"}":v;},getCriticalityCalculationBinding:function(i,v,d,t,A,s,T,c){var e=V.Neutral;v="%"+v;d=d||-Infinity;t=t||d;A=A||t;c=c||Infinity;T=T||c;s=s||T;d=d&&(+d?+d:"%"+d);t=t&&(+t?+t:"%"+t);A=A&&(+A?+A:"%"+A);s=s&&(+s?+s:"%"+s);T=T&&(+T?+T:"%"+T);c=c&&(+c?+c:"%"+c);if(i.indexOf("Minimize")>-1){e="{= "+v+" <= "+s+" ? '"+V.Good+"' : "+v+" <= "+T+" ? '"+V.Neutral+"' : "+"("+c+" && "+v+" <= "+c+") ? '"+V.Critical+"' : '"+V.Error+"' }";}else if(i.indexOf("Maximize")>-1){e="{= "+v+" >= "+A+" ? '"+V.Good+"' : "+v+" >= "+t+" ? '"+V.Neutral+"' : "+"("+d+" && "+v+" >= "+d+") ? '"+V.Critical+"' : '"+V.Error+"' }";}else if(i.indexOf("Target")>-1){e="{= ("+v+" <= "+s+" && "+v+" >= "+A+") ? '"+V.Good+"' : "+"(("+v+" >= "+t+" && "+v+" < "+A+") || ("+v+" > "+s+" && "+v+" <= "+T+")) ? '"+V.Neutral+"' : "+"(("+d+" && ("+v+" >= "+d+") && ("+v+" < "+t+")) || (("+v+" > "+T+") && "+c+" && ("+v+" <= "+c+"))) ? '"+V.Critical+"' : '"+V.Error+"' }";}else{L.warning("Case not supported, returning the default Value Neutral");}return e;},_getCriticalityFromEnum:function(c){var i;if(c==="com.sap.vocabularies.UI.v1.CriticalityType/Negative"){i=V.Error;}else if(c==="com.sap.vocabularies.UI.v1.CriticalityType/Positive"){i=V.Good;}else if(c==="com.sap.vocabularies.UI.v1.CriticalityType/Critical"){i=V.Critical;}else{i=V.Neutral;}return i;},getValueCriticality:function(d,v){var r,c=[];if(v&&v.length>0){v.forEach(function(o){if(o.Value&&o.Criticality.$EnumMember){var s="${"+d+"} === '"+o.Value+"' ? '"+H._getCriticalityFromEnum(o.Criticality.$EnumMember)+"'";c.push(s);}});r=c.length>0&&c.join(" : ")+" : undefined";}return r?"{= "+r+" }":undefined;},getMeasureAttributeIndex:function(i,c){var d=c.Measures,e,f=c.MeasureAttributes,s=d&&d[i]&&d[i].$PropertyPath,g=-1,h=function(j,o,k){if((o&&o.Measure&&o.Measure.$PropertyPath)===j){g=k;return true;}};if(f){e=f.some(h.bind(null,s));}return e&&g>-1&&g;},getMeasureAttributeForMeasure:function(c){var o=c.getModel(),s=c.getPath(),d=s.substring(0,s.lastIndexOf("Measure")),i=s.replace(/.*\//,"");return o.requestObject(d).then(function(e){var f=e.MeasureAttributes,g=H.getMeasureAttributeIndex(i,e);var h=g>-1&&f[g]&&f[g].DataPoint?d+"MeasureAttributes/"+g+"/":L.warning("DataPoint missing for the measure")&&undefined;return h?h+"DataPoint/$AnnotationPath/":h;});},isDraftParentEntityForContainment:function(t,T){if(t){if(T&&T.parentEntitySet&&T.parentEntitySet.sPath){var p=T.parentEntitySet.sPath;var d=T.parentEntitySet.oModel.getObject(p+"@com.sap.vocabularies.Common.v1.DraftRoot");var o=T.parentEntitySet.oModel.getObject(p+"@com.sap.vocabularies.Common.v1.DraftNode");if(d||o){return true;}else{return false;}}}else{return false;}},getDataFromTemplate:function(d){var s=d.getPath().split("/");var c=s[s.length-1];var e="/"+s.slice(1,-2).join("/")+"/@";var f=d.getObject(e);var t=f.Template;var g=t.split("}");var h=[];for(var i=0;i<g.length-1;i++){var k=g[i].split("{")[1].trim();h.push(k);}var j=Object.keys(f.Data).indexOf(c)-1;return"/"+s.slice(1,-2).join("/")+"/Data/"+h[j];},notLastIndex:function(t,e){var c=t.Template;var s=c.split("}");var d=[];var f=false;for(var i=0;i<s.length-1;i++){var g=s[i].split("{")[1].trim();d.push(g);}d.forEach(function(c){if(t.Data[c]===e&&d.indexOf(c)!==d.length-1){f=true;}});return f;},getDelimiter:function(t){return t.split("}")[1].split("{")[0].trim();},getParameters:function(c,i){if(c){var o=i.context.getModel();var p=i.context.getPath();var P=C.getParameterInfo(o,p);if(P.parameterProperties){return Object.keys(P.parameterProperties);}}return[];}};H.isPropertyFilterable.requiresIContext=true;H.getPopoverText.requiresIContext=true;return H;},true);

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

@@ -21,7 +21,8 @@ sap.ui.define(
 		"sap/fe/core/helpers/StableIdHelper",
 		"sap/fe/core/CommonUtils",
 		"sap/fe/macros/field/FieldHelper",
-		"sap/fe/macros/internal/valuehelp/ValueHelpTemplating"
+		"sap/fe/macros/internal/valuehelp/ValueHelpTemplating",
+		"sap/base/Log"
 	],
 	function(
 		TableDelegate,
@@ -35,7 +36,8 @@ sap.ui.define(
 		StableIdHelper,
 		CommonUtils,
 		FieldHelper,
-		ValueHelpTemplating
+		ValueHelpTemplating,
+		Log
 	) {
 		"use strict";
 
@@ -248,15 +250,32 @@ sap.ui.define(
 				sProperty = mParameters.sBindingPath + "/" + sPropertyName,
 				oPropertyContext = oMetaModel.createBindingContext(sProperty),
 				sValueHelpProperty = FieldHelper.valueHelpProperty(oPropertyContext, bInFilterField);
-			// TODO use PropertyFormatter.hasValueHelp () => if doing so, QUnit tests fail due to mocked model implementation
-			return Promise.all([
-				oMetaModel.requestObject(sValueHelpProperty + "@com.sap.vocabularies.Common.v1.ValueListWithFixedValues"),
-				oMetaModel.requestObject(sValueHelpProperty + "@com.sap.vocabularies.Common.v1.ValueListReferences"),
-				oMetaModel.requestObject(sValueHelpProperty + "@com.sap.vocabularies.Common.v1.ValueListMapping"),
-				oMetaModel.requestObject(sValueHelpProperty + "@com.sap.vocabularies.Common.v1.ValueList")
-			]).then(function(aResults) {
-				return aResults[0] || aResults[1] || aResults[2] || aResults[3];
-			});
+
+			return this.getCustomData(mParameters.oControl, "displayModePropertyBinding", mParameters.oModifier)
+				.then(function(bReadOnly) {
+					// Check whether the control is read-only. If yes, no need of a value help.
+					bReadOnly = typeof bReadOnly === "boolean" ? bReadOnly : bReadOnly === "true";
+					if (bReadOnly) {
+						return false;
+					}
+					// Else, check whether Value Help relevant annotation exists for the property.
+					// TODO use PropertyFormatter.hasValueHelp () => if doing so, QUnit tests fail due to mocked model implementation
+					return Promise.all([
+						oMetaModel.requestObject(sValueHelpProperty + "@com.sap.vocabularies.Common.v1.ValueListWithFixedValues"),
+						oMetaModel.requestObject(sValueHelpProperty + "@com.sap.vocabularies.Common.v1.ValueListReferences"),
+						oMetaModel.requestObject(sValueHelpProperty + "@com.sap.vocabularies.Common.v1.ValueListMapping"),
+						oMetaModel.requestObject(sValueHelpProperty + "@com.sap.vocabularies.Common.v1.ValueList")
+					])
+						.then(function(aResults) {
+							return !!aResults[0] || !!aResults[1] || !!aResults[2] || !!aResults[3];
+						})
+						.catch(function(oError) {
+							Log.warning("Error while retrieving value list annotation values", oError);
+						});
+				})
+				.catch(function(oError) {
+					Log.warning("Error while retrieving custom data", oError);
+				});
 		};
 
 		oDelegateUtil.isTypeFilterable = function(sType) {

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/TableDelegate","sap/ui/mdc/FilterBarDelegate","sap/ui/core/XMLTemplateProcessor","sap/ui/core/util/XMLPreprocessor","sap/ui/core/Fragment","sap/ui/core/Element","sap/ui/model/json/JSONModel","sap/fe/macros/CommonHelper","sap/fe/core/helpers/StableIdHelper","sap/fe/core/CommonUtils","sap/fe/macros/field/FieldHelper","sap/fe/macros/internal/valuehelp/ValueHelpTemplating"],function(T,F,X,a,b,C,J,c,S,d,e,V){"use strict";var D={},N="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1",m={"Edm.Boolean":{modelType:"Bool"},"Edm.Byte":{modelType:"Int"},"Edm.Date":{modelType:"Date"},"Edm.DateTime":{modelType:"Date"},"Edm.DateTimeOffset":{modelType:"DateTimeOffset"},"Edm.Decimal":{modelType:"Decimal"},"Edm.Double":{modelType:"Float"},"Edm.Float":{modelType:"Float"},"Edm.Guid":{modelType:"Guid"},"Edm.Int16":{modelType:"Int"},"Edm.Int32":{modelType:"Int"},"Edm.Int64":{modelType:"Int"},"Edm.SByte":{modelType:"Int"},"Edm.Single":{modelType:"Float"},"Edm.String":{modelType:"String"},"Edm.Time":{modelType:"TimeOfDay"},"Edm.TimeOfDay":{modelType:"TimeOfDay"},"Edm.Stream":{}};function _(){this.control.detachModelContextChange(_,this);var M=this.modelName,o=this.control.getModel(M);if(o){this.resolve(o);}else{this.control.attachModelContextChange(_,this);}}D.getLocalizedText=function(t,o){var M=/{([A-Za-z0-9_.|@]+)>([A-Za-z0-9_.|]+)}/.exec(t);if(M){var r=o.getModel(M[1]).getResourceBundle();return r.getText(M[2]);}return t;};D.getCustomData=function(o,p,M){if(M){var f=[];return Promise.resolve().then(M.getAggregation.bind(M,o,"customData")).then(function(r){return r.reduce(function(P,g){return P.then(M.getProperty.bind(M,g,"key")).then(function(k){if(k===p){f.push(g);}});},Promise.resolve());}).then(function(){if(f.length===1){return M.getProperty(f[0],"value");}});}else{if(o&&p){if(o instanceof window.Element){return o.getAttributeNS(N,p);}if(o.data instanceof Function){return o.data(p);}}return undefined;}};D.setCustomData=function(o,p,v){if(o&&p){if(o instanceof window.Element){return o.setAttributeNS(N,"customData:"+p,v);}if(o.data instanceof Function){return o.data(p,v);}}};D.fetchPropertiesForEntity=function(E,M){return M.requestObject(E+"/");};D.fetchAnnotationsForEntity=function(E,M){return M.requestObject(E+"@");};D.fetchModel=function(o){return new Promise(function(r,f){var M=o.getDelegate().payload&&o.getDelegate().payload.modelName,g={modelName:M,control:o,resolve:r};_.call(g);});};D.loadMacroLibrary=function(){return new Promise(function(r,f){sap.ui.require(["sap/fe/macros/macroLibrary"],function(){r();});});};D.templateControlFragment=function(f,p,o,M){return d.templateControlFragment(f,p,o,M);};D.doesValueHelpExist=function(p){var P=p.sPropertyName||"",v=p.sValueHelpType||"",M=p.oMetaModel,o=p.oModifier,O=p.sBindingPath+"/"+P,f=M.createBindingContext(O),s=e.valueHelpProperty(f),i=p.sBindingPath&&p.sBindingPath.indexOf("/")===0;if(s.indexOf("$Path")>-1){s=M.getObject(s);}if(i){s=p.sBindingPath+"/"+s;}var g=V.generateID(p.flexId,S.generate([o?o.getId(p.oControl):p.oControl.getId(),v]),c.getNavigationPath(O,true),c.getNavigationPath(s,true));return Promise.resolve().then(function(){if(o){return o.getAggregation(p.oControl,"dependents");}return p.oControl.getAggregation("dependents");}).then(function(h){return Promise.resolve(h&&h.some(function(j){return o?o.getId(j)===g:j.getId()===g;}));});};D.isValueHelpRequired=function(p,i){var P=p.sPropertyName||"",M=p.oMetaModel,s=p.sBindingPath+"/"+P,o=M.createBindingContext(s),v=e.valueHelpProperty(o,i);return Promise.all([M.requestObject(v+"@com.sap.vocabularies.Common.v1.ValueListWithFixedValues"),M.requestObject(v+"@com.sap.vocabularies.Common.v1.ValueListReferences"),M.requestObject(v+"@com.sap.vocabularies.Common.v1.ValueListMapping"),M.requestObject(v+"@com.sap.vocabularies.Common.v1.ValueList")]).then(function(r){return r[0]||r[1]||r[2]||r[3];});};D.isTypeFilterable=function(t){return t&&t in m&&!!m[t].modelType;};D.getModelType=function(t){return t&&t in m&&m[t].modelType;};D.isMultiValue=function(p){var i=true;switch(p.filterExpression){case"SearchExpression":case"SingleRange":case"SingleValue":i=false;break;default:break;}if(p.type&&p.type.indexOf("Boolean")>0){i=false;}return i;};return D;});
+sap.ui.define(["sap/ui/mdc/TableDelegate","sap/ui/mdc/FilterBarDelegate","sap/ui/core/XMLTemplateProcessor","sap/ui/core/util/XMLPreprocessor","sap/ui/core/Fragment","sap/ui/core/Element","sap/ui/model/json/JSONModel","sap/fe/macros/CommonHelper","sap/fe/core/helpers/StableIdHelper","sap/fe/core/CommonUtils","sap/fe/macros/field/FieldHelper","sap/fe/macros/internal/valuehelp/ValueHelpTemplating","sap/base/Log"],function(T,F,X,a,b,C,J,c,S,d,e,V,L){"use strict";var D={},N="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1",m={"Edm.Boolean":{modelType:"Bool"},"Edm.Byte":{modelType:"Int"},"Edm.Date":{modelType:"Date"},"Edm.DateTime":{modelType:"Date"},"Edm.DateTimeOffset":{modelType:"DateTimeOffset"},"Edm.Decimal":{modelType:"Decimal"},"Edm.Double":{modelType:"Float"},"Edm.Float":{modelType:"Float"},"Edm.Guid":{modelType:"Guid"},"Edm.Int16":{modelType:"Int"},"Edm.Int32":{modelType:"Int"},"Edm.Int64":{modelType:"Int"},"Edm.SByte":{modelType:"Int"},"Edm.Single":{modelType:"Float"},"Edm.String":{modelType:"String"},"Edm.Time":{modelType:"TimeOfDay"},"Edm.TimeOfDay":{modelType:"TimeOfDay"},"Edm.Stream":{}};function _(){this.control.detachModelContextChange(_,this);var M=this.modelName,o=this.control.getModel(M);if(o){this.resolve(o);}else{this.control.attachModelContextChange(_,this);}}D.getLocalizedText=function(t,o){var M=/{([A-Za-z0-9_.|@]+)>([A-Za-z0-9_.|]+)}/.exec(t);if(M){var r=o.getModel(M[1]).getResourceBundle();return r.getText(M[2]);}return t;};D.getCustomData=function(o,p,M){if(M){var f=[];return Promise.resolve().then(M.getAggregation.bind(M,o,"customData")).then(function(r){return r.reduce(function(P,g){return P.then(M.getProperty.bind(M,g,"key")).then(function(k){if(k===p){f.push(g);}});},Promise.resolve());}).then(function(){if(f.length===1){return M.getProperty(f[0],"value");}});}else{if(o&&p){if(o instanceof window.Element){return o.getAttributeNS(N,p);}if(o.data instanceof Function){return o.data(p);}}return undefined;}};D.setCustomData=function(o,p,v){if(o&&p){if(o instanceof window.Element){return o.setAttributeNS(N,"customData:"+p,v);}if(o.data instanceof Function){return o.data(p,v);}}};D.fetchPropertiesForEntity=function(E,M){return M.requestObject(E+"/");};D.fetchAnnotationsForEntity=function(E,M){return M.requestObject(E+"@");};D.fetchModel=function(o){return new Promise(function(r,f){var M=o.getDelegate().payload&&o.getDelegate().payload.modelName,g={modelName:M,control:o,resolve:r};_.call(g);});};D.loadMacroLibrary=function(){return new Promise(function(r,f){sap.ui.require(["sap/fe/macros/macroLibrary"],function(){r();});});};D.templateControlFragment=function(f,p,o,M){return d.templateControlFragment(f,p,o,M);};D.doesValueHelpExist=function(p){var P=p.sPropertyName||"",v=p.sValueHelpType||"",M=p.oMetaModel,o=p.oModifier,O=p.sBindingPath+"/"+P,f=M.createBindingContext(O),s=e.valueHelpProperty(f),i=p.sBindingPath&&p.sBindingPath.indexOf("/")===0;if(s.indexOf("$Path")>-1){s=M.getObject(s);}if(i){s=p.sBindingPath+"/"+s;}var g=V.generateID(p.flexId,S.generate([o?o.getId(p.oControl):p.oControl.getId(),v]),c.getNavigationPath(O,true),c.getNavigationPath(s,true));return Promise.resolve().then(function(){if(o){return o.getAggregation(p.oControl,"dependents");}return p.oControl.getAggregation("dependents");}).then(function(h){return Promise.resolve(h&&h.some(function(j){return o?o.getId(j)===g:j.getId()===g;}));});};D.isValueHelpRequired=function(p,i){var P=p.sPropertyName||"",M=p.oMetaModel,s=p.sBindingPath+"/"+P,o=M.createBindingContext(s),v=e.valueHelpProperty(o,i);return this.getCustomData(p.oControl,"displayModePropertyBinding",p.oModifier).then(function(r){r=typeof r==="boolean"?r:r==="true";if(r){return false;}return Promise.all([M.requestObject(v+"@com.sap.vocabularies.Common.v1.ValueListWithFixedValues"),M.requestObject(v+"@com.sap.vocabularies.Common.v1.ValueListReferences"),M.requestObject(v+"@com.sap.vocabularies.Common.v1.ValueListMapping"),M.requestObject(v+"@com.sap.vocabularies.Common.v1.ValueList")]).then(function(R){return!!R[0]||!!R[1]||!!R[2]||!!R[3];}).catch(function(E){L.warning("Error while retrieving value list annotation values",E);});}).catch(function(E){L.warning("Error while retrieving custom data",E);});};D.isTypeFilterable=function(t){return t&&t in m&&!!m[t].modelType;};D.getModelType=function(t){return t&&t in m&&m[t].modelType;};D.isMultiValue=function(p){var i=true;switch(p.filterExpression){case"SearchExpression":case"SingleRange":case"SingleValue":i=false;break;default:break;}if(p.type&&p.type.indexOf("Boolean")>0){i=false;}return i;};return D;});

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

@@ -166,7 +166,7 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI"], function (Clas
         if (oControl.isA("sap.fe.core.controls.FieldWrapper")) {
           aControls = oControl.getContentEdit() || [oControl.getContentDisplay()] || [];
 
-          if (aControls.length === 1) {
+          if (aControls.length >= 1) {
             oControl = aControls[0];
           } else {
             throw "getting value not yet implemented for this field type";
@@ -175,12 +175,10 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI"], function (Clas
 
         if (oControl.isA("sap.m.CheckBox")) {
           return oControl.getSelected();
-        } else if (oControl.isA("sap.m.Input")) {
+        } else if (oControl.isA("sap.m.InputBase")) {
           return oControl.getValue();
         } else if (oControl.isA("sap.ui.mdc.Field")) {
           return oControl.getValue();
-        } else if (oControl.isA("sap.m.TextArea")) {
-          return oControl.getValue();
         } else {
           throw "getting value not yet implemented for this field type";
         }
@@ -231,4 +229,4 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI"], function (Clas
   }), _applyDecoratedDescriptor(_class2.prototype, "handleChange", [EventHandler], Object.getOwnPropertyDescriptor(_class2.prototype, "handleChange"), _class2.prototype)), _class2)) || _class);
   return FieldAPI;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["FieldAPI.ts"],"names":["FieldAPI","APIClass","Property","type","Association","multiple","singularName","oEvent","fireChange","value","getValue","isValid","getParameter","oContent","getContent","addAriaLabelledBy","aAriaLabelledBy","getAriaLabelledBy","i","length","sId","aAriaLabelledBys","indexOf","_oElement","mAriaProps","oParent","getParent","enhanceAccessibilityState","content","getAccessibilityInfo","oControl","aControls","isA","getContentEdit","getContentDisplay","getSelected","MacroAPI","Event","EventHandler"],"mappings":"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","sourceRoot":".","sourcesContent":["import { APIClass, EventHandler, Event, Property, Association } from \"sap/fe/core/helpers/ClassSupport\";\nimport MacroAPI from \"./MacroAPI\";\nimport { Input, CheckBox, TextArea } from \"sap/m\";\nimport { Field as mdcField } from \"sap/ui/mdc\";\nimport { FieldWrapper } from \"sap/fe/core/controls\";\nimport { Control } from \"sap/ui/core\";\n\n/**\n * Additional format options for the field.\n *\n * @alias sap.fe.macros.FieldFormatOptions\n * @public\n */\nexport type FieldFormatOptions = {\n\t/**\n\t *  Defines how the field value and associated text will be displayed together.<br/>\n\t *\n\t *  Allowed values are \"Value\", \"Description\", \"ValueDescription\" and \"DescriptionValue\"\n\t *\n\t *  @public\n\t */\n\tdisplayMode: string;\n\t/**\n\t * Defines if and how the field measure will be displayed.<br/>\n\t *\n\t * Allowed values are \"Hidden\" and \"ReadOnly\"\n\t *\n\t *  @public\n\t */\n\tmeasureDisplayMode: string;\n};\n/**\n * Building block for creating a field based on the metadata provided by OData V4.\n * <br>\n * Usually, a DataField or DataPoint annotation is expected, but the field can also be used to display a property from the entity type.\n *\n *\n * Usage example:\n * <pre>\n * &lt;macro:Field id=\"MyField\" metaPath=\"MyProperty\" /&gt;\n * </pre>\n *\n * @alias sap.fe.macros.Field\n * @public\n */\n@APIClass(\"sap.fe.macros.FieldAPI\")\nclass FieldAPI extends MacroAPI {\n\t/**\n\t * An expression that allows you to control the editable state of the field.\n\t *\n\t * If you do not set any expression, SAP Fiori elements hooks into the standard lifecycle to determine if the page is currently editable.\n\t * Please note that you cannot set a field to editable if it has been defined in the annotation as not editable.\n\t *\n\t * @private\n\t * @deprecated\n\t */\n\t@Property({ type: \"boolean\" })\n\teditable!: boolean;\n\n\t/**\n\t * An expression that allows you to control the read-only state of the field.\n\t *\n\t * If you do not set any expression, SAP Fiori elements hooks into the standard lifecycle to determine the current state.\n\t *\n\t * @public\n\t */\n\t@Property({ type: \"boolean\" })\n\treadOnly!: boolean;\n\n\t/**\n\t * The identifier of the Field control.\n\t *\n\t * @public\n\t */\n\t@Property({ type: \"string\" })\n\tid!: string;\n\n\t/**\n\t * An event containing details is triggered when the value of the field is changed.\n\t *\n\t * @public\n\t */\n\t@Event\n\tchange!: Function;\n\n\t@Association({ type: \"sap.ui.core.Control\", multiple: true, singularName: \"ariaLabelledBy\" })\n\tariaLabelledBy!: Control;\n\n\t@Property({ type: \"boolean\" })\n\trequired!: boolean;\n\n\t/**\n\t * A set of options that can be configured.\n\t *\n\t * @public\n\t */\n\t@Property({ type: \"sap.fe.macros.FieldFormatOptions\" })\n\tformatOptions!: FieldFormatOptions;\n\n\t/**\n\t * Option to add semantic objects to a field.\n\t * Valid options are either a single semantic object, a stringified array of semantic objects\n\t * or a single binding expression returning either a single semantic object or an array of semantic objects\n\t *\n\t * @public\n\t */\n\t@Property({ type: \"string\" })\n\tsemanticObject!: string;\n\n\t@EventHandler\n\thandleChange(oEvent: UI5Event) {\n\t\t(this as any).fireChange({ value: this.getValue(), isValid: oEvent.getParameter(\"valid\") });\n\t}\n\n\tonBeforeRendering() {\n\t\tconst oContent = (this as any).getContent();\n\t\tif (oContent && oContent.addAriaLabelledBy) {\n\t\t\tconst aAriaLabelledBy = (this as any).getAriaLabelledBy();\n\n\t\t\tfor (let i = 0; i < aAriaLabelledBy.length; i++) {\n\t\t\t\tconst sId = aAriaLabelledBy[i];\n\t\t\t\tconst aAriaLabelledBys = oContent.getAriaLabelledBy() || [];\n\t\t\t\tif (aAriaLabelledBys.indexOf(sId) === -1) {\n\t\t\t\t\toContent.addAriaLabelledBy(sId);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\tenhanceAccessibilityState(_oElement: object, mAriaProps: object): object {\n\t\tconst oParent = this.getParent();\n\n\t\tif (oParent && (oParent as any).enhanceAccessibilityState) {\n\t\t\t// use FieldWrapper as control, but aria properties of rendered inner control.\n\t\t\t(oParent as any).enhanceAccessibilityState(this, mAriaProps);\n\t\t}\n\n\t\treturn mAriaProps;\n\t}\n\tgetAccessibilityInfo(): Object {\n\t\tconst oContent = this.content;\n\t\treturn oContent && oContent.getAccessibilityInfo ? oContent.getAccessibilityInfo() : {};\n\t}\n\t/**\n\t * Retrieves the current value of the Field.\n\t *\n\t * @public\n\t * @returns The current value of the field\n\t */\n\tgetValue(): boolean | string {\n\t\tlet oControl = this.content,\n\t\t\taControls;\n\n\t\tif (oControl.isA(\"sap.fe.core.controls.FieldWrapper\")) {\n\t\t\taControls = (oControl as FieldWrapper).getContentEdit() || [(oControl as FieldWrapper).getContentDisplay()] || [];\n\t\t\tif (aControls.length === 1) {\n\t\t\t\toControl = aControls[0];\n\t\t\t} else {\n\t\t\t\tthrow \"getting value not yet implemented for this field type\";\n\t\t\t}\n\t\t}\n\n\t\tif (oControl.isA<CheckBox>(\"sap.m.CheckBox\")) {\n\t\t\treturn oControl.getSelected();\n\t\t} else if (oControl.isA<Input>(\"sap.m.Input\")) {\n\t\t\treturn oControl.getValue();\n\t\t} else if (oControl.isA<mdcField>(\"sap.ui.mdc.Field\")) {\n\t\t\treturn oControl.getValue();\n\t\t} else if (oControl.isA<TextArea>(\"sap.m.TextArea\")) {\n\t\t\treturn oControl.getValue();\n\t\t} else {\n\t\t\tthrow \"getting value not yet implemented for this field type\";\n\t\t}\n\t}\n}\n\nexport default FieldAPI;\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["FieldAPI.ts"],"names":["FieldAPI","APIClass","Property","type","Association","multiple","singularName","oEvent","fireChange","value","getValue","isValid","getParameter","oContent","getContent","addAriaLabelledBy","aAriaLabelledBy","getAriaLabelledBy","i","length","sId","aAriaLabelledBys","indexOf","_oElement","mAriaProps","oParent","getParent","enhanceAccessibilityState","content","getAccessibilityInfo","oControl","aControls","isA","getContentEdit","getContentDisplay","getSelected","MacroAPI","Event","EventHandler"],"mappings":"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","sourceRoot":".","sourcesContent":["import { APIClass, EventHandler, Event, Property, Association } from \"sap/fe/core/helpers/ClassSupport\";\nimport MacroAPI from \"./MacroAPI\";\nimport { InputBase, CheckBox } from \"sap/m\";\nimport { Field as mdcField } from \"sap/ui/mdc\";\nimport { FieldWrapper } from \"sap/fe/core/controls\";\nimport { Control } from \"sap/ui/core\";\n\n/**\n * Additional format options for the field.\n *\n * @alias sap.fe.macros.FieldFormatOptions\n * @public\n */\nexport type FieldFormatOptions = {\n\t/**\n\t *  Defines how the field value and associated text will be displayed together.<br/>\n\t *\n\t *  Allowed values are \"Value\", \"Description\", \"ValueDescription\" and \"DescriptionValue\"\n\t *\n\t *  @public\n\t */\n\tdisplayMode: string;\n\t/**\n\t * Defines if and how the field measure will be displayed.<br/>\n\t *\n\t * Allowed values are \"Hidden\" and \"ReadOnly\"\n\t *\n\t *  @public\n\t */\n\tmeasureDisplayMode: string;\n};\n/**\n * Building block for creating a field based on the metadata provided by OData V4.\n * <br>\n * Usually, a DataField or DataPoint annotation is expected, but the field can also be used to display a property from the entity type.\n *\n *\n * Usage example:\n * <pre>\n * &lt;macro:Field id=\"MyField\" metaPath=\"MyProperty\" /&gt;\n * </pre>\n *\n * @alias sap.fe.macros.Field\n * @public\n */\n@APIClass(\"sap.fe.macros.FieldAPI\")\nclass FieldAPI extends MacroAPI {\n\t/**\n\t * An expression that allows you to control the editable state of the field.\n\t *\n\t * If you do not set any expression, SAP Fiori elements hooks into the standard lifecycle to determine if the page is currently editable.\n\t * Please note that you cannot set a field to editable if it has been defined in the annotation as not editable.\n\t *\n\t * @private\n\t * @deprecated\n\t */\n\t@Property({ type: \"boolean\" })\n\teditable!: boolean;\n\n\t/**\n\t * An expression that allows you to control the read-only state of the field.\n\t *\n\t * If you do not set any expression, SAP Fiori elements hooks into the standard lifecycle to determine the current state.\n\t *\n\t * @public\n\t */\n\t@Property({ type: \"boolean\" })\n\treadOnly!: boolean;\n\n\t/**\n\t * The identifier of the Field control.\n\t *\n\t * @public\n\t */\n\t@Property({ type: \"string\" })\n\tid!: string;\n\n\t/**\n\t * An event containing details is triggered when the value of the field is changed.\n\t *\n\t * @public\n\t */\n\t@Event\n\tchange!: Function;\n\n\t@Association({ type: \"sap.ui.core.Control\", multiple: true, singularName: \"ariaLabelledBy\" })\n\tariaLabelledBy!: Control;\n\n\t@Property({ type: \"boolean\" })\n\trequired!: boolean;\n\n\t/**\n\t * A set of options that can be configured.\n\t *\n\t * @public\n\t */\n\t@Property({ type: \"sap.fe.macros.FieldFormatOptions\" })\n\tformatOptions!: FieldFormatOptions;\n\n\t/**\n\t * Option to add semantic objects to a field.\n\t * Valid options are either a single semantic object, a stringified array of semantic objects\n\t * or a single binding expression returning either a single semantic object or an array of semantic objects\n\t *\n\t * @public\n\t */\n\t@Property({ type: \"string\" })\n\tsemanticObject!: string;\n\n\t@EventHandler\n\thandleChange(oEvent: UI5Event) {\n\t\t(this as any).fireChange({ value: this.getValue(), isValid: oEvent.getParameter(\"valid\") });\n\t}\n\n\tonBeforeRendering() {\n\t\tconst oContent = (this as any).getContent();\n\t\tif (oContent && oContent.addAriaLabelledBy) {\n\t\t\tconst aAriaLabelledBy = (this as any).getAriaLabelledBy();\n\n\t\t\tfor (let i = 0; i < aAriaLabelledBy.length; i++) {\n\t\t\t\tconst sId = aAriaLabelledBy[i];\n\t\t\t\tconst aAriaLabelledBys = oContent.getAriaLabelledBy() || [];\n\t\t\t\tif (aAriaLabelledBys.indexOf(sId) === -1) {\n\t\t\t\t\toContent.addAriaLabelledBy(sId);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\tenhanceAccessibilityState(_oElement: object, mAriaProps: object): object {\n\t\tconst oParent = this.getParent();\n\n\t\tif (oParent && (oParent as any).enhanceAccessibilityState) {\n\t\t\t// use FieldWrapper as control, but aria properties of rendered inner control.\n\t\t\t(oParent as any).enhanceAccessibilityState(this, mAriaProps);\n\t\t}\n\n\t\treturn mAriaProps;\n\t}\n\tgetAccessibilityInfo(): Object {\n\t\tconst oContent = this.content;\n\t\treturn oContent && oContent.getAccessibilityInfo ? oContent.getAccessibilityInfo() : {};\n\t}\n\t/**\n\t * Retrieves the current value of the Field.\n\t *\n\t * @public\n\t * @returns The current value of the field\n\t */\n\tgetValue(): boolean | string {\n\t\tlet oControl = this.content,\n\t\t\taControls;\n\n\t\tif (oControl.isA(\"sap.fe.core.controls.FieldWrapper\")) {\n\t\t\taControls = (oControl as FieldWrapper).getContentEdit() || [(oControl as FieldWrapper).getContentDisplay()] || [];\n\t\t\tif (aControls.length >= 1) {\n\t\t\t\toControl = aControls[0];\n\t\t\t} else {\n\t\t\t\tthrow \"getting value not yet implemented for this field type\";\n\t\t\t}\n\t\t}\n\n\t\tif (oControl.isA<CheckBox>(\"sap.m.CheckBox\")) {\n\t\t\treturn oControl.getSelected();\n\t\t} else if (oControl.isA<InputBase>(\"sap.m.InputBase\")) {\n\t\t\treturn oControl.getValue();\n\t\t} else if (oControl.isA<mdcField>(\"sap.ui.mdc.Field\")) {\n\t\t\treturn oControl.getValue();\n\t\t} else {\n\t\t\tthrow \"getting value not yet implemented for this field type\";\n\t\t}\n\t}\n}\n\nexport default FieldAPI;\n"]}

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

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/helpers/ClassSupport","./MacroAPI"],function(C,M){"use strict";var _,a,b,c,d,f,g,h,j,k,l,m,n,q,r,s,t,u;var A=C.Association;var P=C.Property;var E=C.Event;var v=C.EventHandler;var w=C.APIClass;function x(e,p,i,o){if(!i)return;Object.defineProperty(e,p,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0});}function y(i,e){if(!(i instanceof e)){throw new TypeError("Cannot call a class as a function");}}function z(e,p){for(var i=0;i<p.length;i++){var o=p[i];o.enumerable=o.enumerable||false;o.configurable=true;if("value"in o)o.writable=true;Object.defineProperty(e,o.key,o);}}function B(e,p,i){if(p)z(e.prototype,p);if(i)z(e,i);return e;}function D(e,i){if(typeof i!=="function"&&i!==null){throw new TypeError("Super expression must either be null or a function");}e.prototype=Object.create(i&&i.prototype,{constructor:{value:e,writable:true,configurable:true}});if(i)F(e,i);}function F(o,p){F=Object.setPrototypeOf||function F(o,p){o.__proto__=p;return o;};return F(o,p);}function G(e){var i=J();return function R(){var S=K(e),o;if(i){var p=K(this).constructor;o=Reflect.construct(S,arguments,p);}else{o=S.apply(this,arguments);}return H(this,o);};}function H(e,i){if(i&&(typeof i==="object"||typeof i==="function")){return i;}return I(e);}function I(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return e;}function J(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true;}catch(e){return false;}}function K(o){K=Object.setPrototypeOf?Object.getPrototypeOf:function K(o){return o.__proto__||Object.getPrototypeOf(o);};return K(o);}function L(o,e,i){if(e in o){Object.defineProperty(o,e,{value:i,enumerable:true,configurable:true,writable:true});}else{o[e]=i;}return o;}function N(e,p,i,o,R){var S={};Object.keys(o).forEach(function(T){S[T]=o[T];});S.enumerable=!!S.enumerable;S.configurable=!!S.configurable;if('value'in S||S.initializer){S.writable=true;}S=i.slice().reverse().reduce(function(S,T){return T(e,p,S)||S;},S);if(R&&S.initializer!==void 0){S.value=S.initializer?S.initializer.call(R):void 0;S.initializer=undefined;}if(S.initializer===void 0){Object.defineProperty(e,p,S);S=null;}return S;}function O(e,i){throw new Error('Decorating class property failed. Please ensure that '+'proposal-class-properties is enabled and runs after the decorators transform.');}var Q=(_=w("sap.fe.macros.FieldAPI"),a=P({type:"boolean"}),b=P({type:"boolean"}),c=P({type:"string"}),d=A({type:"sap.ui.core.Control",multiple:true,singularName:"ariaLabelledBy"}),f=P({type:"boolean"}),g=P({type:"sap.fe.macros.FieldFormatOptions"}),h=P({type:"string"}),_(j=(k=function(e){D(Q,e);var o=G(Q);function Q(){var i;y(this,Q);for(var p=arguments.length,R=new Array(p),S=0;S<p;S++){R[S]=arguments[S];}i=o.call.apply(o,[this].concat(R));x(I(i),"editable",l,I(i));x(I(i),"readOnly",m,I(i));x(I(i),"id",n,I(i));x(I(i),"change",q,I(i));x(I(i),"ariaLabelledBy",r,I(i));x(I(i),"required",s,I(i));x(I(i),"formatOptions",t,I(i));x(I(i),"semanticObject",u,I(i));return i;}B(Q,[{key:"handleChange",value:function p(i){this.fireChange({value:this.getValue(),isValid:i.getParameter("valid")});}},{key:"onBeforeRendering",value:function U(){var p=this.getContent();if(p&&p.addAriaLabelledBy){var R=this.getAriaLabelledBy();for(var i=0;i<R.length;i++){var S=R[i];var T=p.getAriaLabelledBy()||[];if(T.indexOf(S)===-1){p.addAriaLabelledBy(S);}}}}},{key:"enhanceAccessibilityState",value:function S(i,p){var R=this.getParent();if(R&&R.enhanceAccessibilityState){R.enhanceAccessibilityState(this,p);}return p;}},{key:"getAccessibilityInfo",value:function p(){var i=this.content;return i&&i.getAccessibilityInfo?i.getAccessibilityInfo():{};}},{key:"getValue",value:function R(){var i=this.content,p;if(i.isA("sap.fe.core.controls.FieldWrapper")){p=i.getContentEdit()||[i.getContentDisplay()]||[];if(p.length===1){i=p[0];}else{throw"getting value not yet implemented for this field type";}}if(i.isA("sap.m.CheckBox")){return i.getSelected();}else if(i.isA("sap.m.Input")){return i.getValue();}else if(i.isA("sap.ui.mdc.Field")){return i.getValue();}else if(i.isA("sap.m.TextArea")){return i.getValue();}else{throw"getting value not yet implemented for this field type";}}}]);return Q;}(M),(l=N(k.prototype,"editable",[a],{configurable:true,enumerable:true,writable:true,initializer:null}),m=N(k.prototype,"readOnly",[b],{configurable:true,enumerable:true,writable:true,initializer:null}),n=N(k.prototype,"id",[c],{configurable:true,enumerable:true,writable:true,initializer:null}),q=N(k.prototype,"change",[E],{configurable:true,enumerable:true,writable:true,initializer:null}),r=N(k.prototype,"ariaLabelledBy",[d],{configurable:true,enumerable:true,writable:true,initializer:null}),s=N(k.prototype,"required",[f],{configurable:true,enumerable:true,writable:true,initializer:null}),t=N(k.prototype,"formatOptions",[g],{configurable:true,enumerable:true,writable:true,initializer:null}),u=N(k.prototype,"semanticObject",[h],{configurable:true,enumerable:true,writable:true,initializer:null}),N(k.prototype,"handleChange",[v],Object.getOwnPropertyDescriptor(k.prototype,"handleChange"),k.prototype)),k))||j);return Q;},false);
+sap.ui.define(["sap/fe/core/helpers/ClassSupport","./MacroAPI"],function(C,M){"use strict";var _,a,b,c,d,f,g,h,j,k,l,m,n,q,r,s,t,u;var A=C.Association;var P=C.Property;var E=C.Event;var v=C.EventHandler;var w=C.APIClass;function x(e,p,i,o){if(!i)return;Object.defineProperty(e,p,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0});}function y(i,e){if(!(i instanceof e)){throw new TypeError("Cannot call a class as a function");}}function z(e,p){for(var i=0;i<p.length;i++){var o=p[i];o.enumerable=o.enumerable||false;o.configurable=true;if("value"in o)o.writable=true;Object.defineProperty(e,o.key,o);}}function B(e,p,i){if(p)z(e.prototype,p);if(i)z(e,i);return e;}function D(e,i){if(typeof i!=="function"&&i!==null){throw new TypeError("Super expression must either be null or a function");}e.prototype=Object.create(i&&i.prototype,{constructor:{value:e,writable:true,configurable:true}});if(i)F(e,i);}function F(o,p){F=Object.setPrototypeOf||function F(o,p){o.__proto__=p;return o;};return F(o,p);}function G(e){var i=J();return function R(){var S=K(e),o;if(i){var p=K(this).constructor;o=Reflect.construct(S,arguments,p);}else{o=S.apply(this,arguments);}return H(this,o);};}function H(e,i){if(i&&(typeof i==="object"||typeof i==="function")){return i;}return I(e);}function I(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return e;}function J(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true;}catch(e){return false;}}function K(o){K=Object.setPrototypeOf?Object.getPrototypeOf:function K(o){return o.__proto__||Object.getPrototypeOf(o);};return K(o);}function L(o,e,i){if(e in o){Object.defineProperty(o,e,{value:i,enumerable:true,configurable:true,writable:true});}else{o[e]=i;}return o;}function N(e,p,i,o,R){var S={};Object.keys(o).forEach(function(T){S[T]=o[T];});S.enumerable=!!S.enumerable;S.configurable=!!S.configurable;if('value'in S||S.initializer){S.writable=true;}S=i.slice().reverse().reduce(function(S,T){return T(e,p,S)||S;},S);if(R&&S.initializer!==void 0){S.value=S.initializer?S.initializer.call(R):void 0;S.initializer=undefined;}if(S.initializer===void 0){Object.defineProperty(e,p,S);S=null;}return S;}function O(e,i){throw new Error('Decorating class property failed. Please ensure that '+'proposal-class-properties is enabled and runs after the decorators transform.');}var Q=(_=w("sap.fe.macros.FieldAPI"),a=P({type:"boolean"}),b=P({type:"boolean"}),c=P({type:"string"}),d=A({type:"sap.ui.core.Control",multiple:true,singularName:"ariaLabelledBy"}),f=P({type:"boolean"}),g=P({type:"sap.fe.macros.FieldFormatOptions"}),h=P({type:"string"}),_(j=(k=function(e){D(Q,e);var o=G(Q);function Q(){var i;y(this,Q);for(var p=arguments.length,R=new Array(p),S=0;S<p;S++){R[S]=arguments[S];}i=o.call.apply(o,[this].concat(R));x(I(i),"editable",l,I(i));x(I(i),"readOnly",m,I(i));x(I(i),"id",n,I(i));x(I(i),"change",q,I(i));x(I(i),"ariaLabelledBy",r,I(i));x(I(i),"required",s,I(i));x(I(i),"formatOptions",t,I(i));x(I(i),"semanticObject",u,I(i));return i;}B(Q,[{key:"handleChange",value:function p(i){this.fireChange({value:this.getValue(),isValid:i.getParameter("valid")});}},{key:"onBeforeRendering",value:function U(){var p=this.getContent();if(p&&p.addAriaLabelledBy){var R=this.getAriaLabelledBy();for(var i=0;i<R.length;i++){var S=R[i];var T=p.getAriaLabelledBy()||[];if(T.indexOf(S)===-1){p.addAriaLabelledBy(S);}}}}},{key:"enhanceAccessibilityState",value:function S(i,p){var R=this.getParent();if(R&&R.enhanceAccessibilityState){R.enhanceAccessibilityState(this,p);}return p;}},{key:"getAccessibilityInfo",value:function p(){var i=this.content;return i&&i.getAccessibilityInfo?i.getAccessibilityInfo():{};}},{key:"getValue",value:function R(){var i=this.content,p;if(i.isA("sap.fe.core.controls.FieldWrapper")){p=i.getContentEdit()||[i.getContentDisplay()]||[];if(p.length>=1){i=p[0];}else{throw"getting value not yet implemented for this field type";}}if(i.isA("sap.m.CheckBox")){return i.getSelected();}else if(i.isA("sap.m.InputBase")){return i.getValue();}else if(i.isA("sap.ui.mdc.Field")){return i.getValue();}else{throw"getting value not yet implemented for this field type";}}}]);return Q;}(M),(l=N(k.prototype,"editable",[a],{configurable:true,enumerable:true,writable:true,initializer:null}),m=N(k.prototype,"readOnly",[b],{configurable:true,enumerable:true,writable:true,initializer:null}),n=N(k.prototype,"id",[c],{configurable:true,enumerable:true,writable:true,initializer:null}),q=N(k.prototype,"change",[E],{configurable:true,enumerable:true,writable:true,initializer:null}),r=N(k.prototype,"ariaLabelledBy",[d],{configurable:true,enumerable:true,writable:true,initializer:null}),s=N(k.prototype,"required",[f],{configurable:true,enumerable:true,writable:true,initializer:null}),t=N(k.prototype,"formatOptions",[g],{configurable:true,enumerable:true,writable:true,initializer:null}),u=N(k.prototype,"semanticObject",[h],{configurable:true,enumerable:true,writable:true,initializer:null}),N(k.prototype,"handleChange",[v],Object.getOwnPropertyDescriptor(k.prototype,"handleChange"),k.prototype)),k))||j);return Q;},false);

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

@@ -1,6 +1,6 @@
 import { APIClass, EventHandler, Event, Property, Association } from "sap/fe/core/helpers/ClassSupport";
 import MacroAPI from "./MacroAPI";
-import { Input, CheckBox, TextArea } from "sap/m";
+import { InputBase, CheckBox } from "sap/m";
 import { Field as mdcField } from "sap/ui/mdc";
 import { FieldWrapper } from "sap/fe/core/controls";
 import { Control } from "sap/ui/core";
@@ -153,7 +153,7 @@ class FieldAPI extends MacroAPI {
 
 		if (oControl.isA("sap.fe.core.controls.FieldWrapper")) {
 			aControls = (oControl as FieldWrapper).getContentEdit() || [(oControl as FieldWrapper).getContentDisplay()] || [];
-			if (aControls.length === 1) {
+			if (aControls.length >= 1) {
 				oControl = aControls[0];
 			} else {
 				throw "getting value not yet implemented for this field type";
@@ -162,12 +162,10 @@ class FieldAPI extends MacroAPI {
 
 		if (oControl.isA<CheckBox>("sap.m.CheckBox")) {
 			return oControl.getSelected();
-		} else if (oControl.isA<Input>("sap.m.Input")) {
+		} else if (oControl.isA<InputBase>("sap.m.InputBase")) {
 			return oControl.getValue();
 		} else if (oControl.isA<mdcField>("sap.ui.mdc.Field")) {
 			return oControl.getValue();
-		} else if (oControl.isA<TextArea>("sap.m.TextArea")) {
-			return oControl.getValue();
 		} else {
 			throw "getting value not yet implemented for this field type";
 		}

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

@@ -10,8 +10,8 @@
 // ---------------------------------------------------------------------------------------
 /* eslint-disable no-console */
 sap.ui.define(
-	["sap/ui/mdc/odata/v4/FieldValueHelpDelegate", "sap/fe/macros/internal/valuehelp/ValueListHelper"],
-	function(FieldValueHelpDelegate, ValueListHelper) {
+	["sap/ui/mdc/odata/v4/FieldValueHelpDelegate", "sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/fe/core/CommonUtils"],
+	function(FieldValueHelpDelegate, ValueListHelper, CommonUtils) {
 		"use strict";
 
 		var ODataFieldValueHelpDelegate = Object.assign({}, FieldValueHelpDelegate);
@@ -39,7 +39,7 @@ sap.ui.define(
 		 * Once they are assigned and the data is set, the returned <code>Promise</code> needs to be resolved.
 		 * Only then does the field help continue opening or reading data.
 		 *
-		 * @param {object} oPayload Payload for delegate
+		 * @param {object} oPayload Payload for the delegate
 		 * @param {sap.ui.mdc.base.FieldHelpBase} oFieldHelp Field help instance
 		 * @param {boolean} bSuggestion Field help is called for suggestion
 		 * @param {object} oProperties Properties contains the key (collectiveSearchKey) of the selected FieldValueHelp in case of multiple FieldValueHelp
@@ -49,6 +49,20 @@ sap.ui.define(
 			return ValueListHelper.showValueListInfo(oPayload.propertyPath, oFieldHelp, bSuggestion, oPayload.conditionModel, oProperties);
 		};
 
+		/**
+		 * Changes the search string
+		 *
+		 * If <code>$search</code> is used, depending on the back end, the search string might need to be adapted.
+		 *
+		 * @param {object} oPayload Payload for the delegate
+		 * @param {boolean} bTypeahead True if the search is called for a type-ahead
+		 * @param {string} sSearch Search string
+		 * @returns {string|undefined} Search string to be used
+		 */
+		ODataFieldValueHelpDelegate.adjustSearch = function(oPayload, bTypeahead, sSearch) {
+			return CommonUtils.normalizeSearchTerm(sSearch);
+		};
+
 		return ODataFieldValueHelpDelegate;
 	},
 	/* bExport= */ false

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/odata/v4/FieldValueHelpDelegate","sap/fe/macros/internal/valuehelp/ValueListHelper"],function(F,V){"use strict";var O=Object.assign({},F);O.determineSearchSupported=function(p,f){return V.setValueListFilterFields(p.propertyPath,f,true,p.conditionModel);};O.contentRequest=function(p,f,s,P){return V.showValueListInfo(p.propertyPath,f,s,p.conditionModel,P);};return O;},false);
+sap.ui.define(["sap/ui/mdc/odata/v4/FieldValueHelpDelegate","sap/fe/macros/internal/valuehelp/ValueListHelper","sap/fe/core/CommonUtils"],function(F,V,C){"use strict";var O=Object.assign({},F);O.determineSearchSupported=function(p,f){return V.setValueListFilterFields(p.propertyPath,f,true,p.conditionModel);};O.contentRequest=function(p,f,s,P){return V.showValueListInfo(p.propertyPath,f,s,p.conditionModel,P);};O.adjustSearch=function(p,t,s){return C.normalizeSearchTerm(s);};return O;},false);

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

@@ -128,4 +128,4 @@ sap.ui.define(["sap/fe/core/helpers/ClassSupport", "./MacroAPI", "sap/base/util/
   }), _applyDecoratedDescriptor(_class2.prototype, "handleSearch", [EventHandler], Object.getOwnPropertyDescriptor(_class2.prototype, "handleSearch"), _class2.prototype), _applyDecoratedDescriptor(_class2.prototype, "handleFilterChanged", [EventHandler], Object.getOwnPropertyDescriptor(_class2.prototype, "handleFilterChanged"), _class2.prototype)), _class2)) || _class);
   return FilterBarAPI;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZpbHRlckJhckFQSS50cyJdLCJuYW1lcyI6WyJGaWx0ZXJCYXJBUEkiLCJBUElDbGFzcyIsIlByb3BlcnR5IiwidHlwZSIsIm9FdmVudCIsIm9GaWx0ZXJCYXIiLCJnZXRTb3VyY2UiLCJvRXZlbnRQYXJhbWV0ZXJzIiwiZ2V0UGFyYW1ldGVycyIsIm9Db25kaXRpb25zIiwiZ2V0RmlsdGVyQ29uZGl0aW9ucyIsImZpcmVTZWFyY2giLCJtZXJnZSIsImNvbmRpdGlvbnMiLCJmaXJlRmlsdGVyQ2hhbmdlZCIsIk1hY3JvQVBJIiwiRXZlbnQiLCJFdmVudEhhbmRsZXIiXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7TUFFTUEsWSxXQURMQyxRQUFRLENBQUMsNEJBQUQsQyxVQU9QQyxRQUFRLENBQUM7QUFBRUMsSUFBQUEsSUFBSSxFQUFFO0FBQVIsR0FBRCxDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7YUFvQlQsc0JBQ2FDLE1BRGIsRUFDK0I7QUFDOUIsWUFBTUMsVUFBVSxHQUFHRCxNQUFNLENBQUNFLFNBQVAsRUFBbkI7QUFDQSxZQUFNQyxnQkFBZ0IsR0FBR0gsTUFBTSxDQUFDSSxhQUFQLEVBQXpCOztBQUNBLFlBQUlILFVBQUosRUFBZ0I7QUFDZixjQUFNSSxXQUFXLEdBQUdKLFVBQVUsQ0FBQ0ssbUJBQVgsRUFBcEI7QUFDQyxjQUFELENBQWNDLFVBQWQsQ0FBeUJDLEtBQUssQ0FBQztBQUFFQyxZQUFBQSxVQUFVLEVBQUVKO0FBQWQsV0FBRCxFQUE4QkYsZ0JBQTlCLENBQTlCO0FBQ0E7QUFDRDs7O2FBRUQsNkJBQ29CSCxNQURwQixFQUNzQztBQUNyQyxZQUFNQyxVQUFVLEdBQUdELE1BQU0sQ0FBQ0UsU0FBUCxFQUFuQjtBQUNBLFlBQU1DLGdCQUFnQixHQUFHSCxNQUFNLENBQUNJLGFBQVAsRUFBekI7O0FBQ0EsWUFBSUgsVUFBSixFQUFnQjtBQUNmLGNBQU1JLFdBQVcsR0FBR0osVUFBVSxDQUFDSyxtQkFBWCxFQUFwQjtBQUNDLGNBQUQsQ0FBY0ksaUJBQWQsQ0FBZ0NGLEtBQUssQ0FBQztBQUFFQyxZQUFBQSxVQUFVLEVBQUVKO0FBQWQsV0FBRCxFQUE4QkYsZ0JBQTlCLENBQXJDO0FBQ0E7QUFDRDs7OztJQTVDeUJRLFE7Ozs7OzZFQWN6QkMsSzs7Ozs7b0ZBU0FBLEs7Ozs7O29FQUdBQyxZLGdLQVVBQSxZO1NBV2FqQixZIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBUElDbGFzcywgUHJvcGVydHksIEV2ZW50SGFuZGxlciwgRXZlbnQgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCBNYWNyb0FQSSBmcm9tIFwiLi9NYWNyb0FQSVwiO1xuaW1wb3J0IHsgbWVyZ2UgfSBmcm9tIFwic2FwL2Jhc2UvdXRpbFwiO1xuXG4vKipcbiAqIEJ1aWxkaW5nIGJsb2NrIGZvciBjcmVhdGluZyBhIEZpbHRlckJhciBiYXNlZCBvbiB0aGUgbWV0YWRhdGEgcHJvdmlkZWQgYnkgT0RhdGEgVjQuXG4gKiA8YnI+XG4gKiBVc3VhbGx5LCBhIFNlbGVjdGlvbkZpZWxkcyBhbm5vdGF0aW9uIGlzIGV4cGVjdGVkLlxuICpcbiAqXG4gKiBVc2FnZSBleGFtcGxlOlxuICogPHByZT5cbiAqICZsdDttYWNybzpGaWx0ZXJCYXIgaWQ9XCJNeUZpbHRlckJhclwiIG1ldGFQYXRoPVwiQGNvbS5zYXAudm9jYWJ1bGFyaWVzLlVJLnYxLlNlbGVjdGlvbkZpZWxkc1wiIC8mZ3Q7XG4gKiA8L3ByZT5cbiAqXG4gKiBAYWxpYXMgc2FwLmZlLm1hY3Jvcy5GaWx0ZXJCYXJcbiAqIEBwdWJsaWNcbiAqL1xuQEFQSUNsYXNzKFwic2FwLmZlLm1hY3Jvcy5GaWx0ZXJCYXJBUElcIilcbmNsYXNzIEZpbHRlckJhckFQSSBleHRlbmRzIE1hY3JvQVBJIHtcblx0LyoqXG5cdCAqIFRoZSBpZGVudGlmaWVyIG9mIHRoZSBmaWx0ZXJiYXIgY29udHJvbC5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QFByb3BlcnR5KHsgdHlwZTogXCJzdHJpbmdcIiB9KVxuXHRpZCE6IHN0cmluZztcblxuXHQvKipcblx0ICogVGhpcyBldmVudCBpcyBmaXJlZCB3aGVuIHRoZSBHbyBidXR0b24gaXMgcHJlc3NlZCBvciBhZnRlciBhIGNvbmRpdGlvbiBjaGFuZ2UuXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdEBFdmVudFxuXHRzZWFyY2ghOiBGdW5jdGlvbjtcblxuXHQvKipcblx0ICogVGhpcyBldmVudCBpcyBmaXJlZCBhZnRlciBlaXRoZXIgYSBmaWx0ZXIgdmFsdWUgb3IgdGhlIHZpc2liaWxpdHkgb2YgYSBmaWx0ZXIgaXRlbSBoYXMgYmVlbiBjaGFuZ2VkLlxuXHQgKiBUaGUgZXZlbnQgY29udGFpbnMgY29uZGl0aW9ucyB0aGF0IHdpbGwgYmUgdXNlZCBhcyBmaWx0ZXJzLlxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRARXZlbnRcblx0ZmlsdGVyQ2hhbmdlZCE6IEZ1bmN0aW9uO1xuXG5cdEBFdmVudEhhbmRsZXJcblx0aGFuZGxlU2VhcmNoKG9FdmVudDogVUk1RXZlbnQpIHtcblx0XHRjb25zdCBvRmlsdGVyQmFyID0gb0V2ZW50LmdldFNvdXJjZSgpO1xuXHRcdGNvbnN0IG9FdmVudFBhcmFtZXRlcnMgPSBvRXZlbnQuZ2V0UGFyYW1ldGVycygpO1xuXHRcdGlmIChvRmlsdGVyQmFyKSB7XG5cdFx0XHRjb25zdCBvQ29uZGl0aW9ucyA9IG9GaWx0ZXJCYXIuZ2V0RmlsdGVyQ29uZGl0aW9ucygpO1xuXHRcdFx0KHRoaXMgYXMgYW55KS5maXJlU2VhcmNoKG1lcmdlKHsgY29uZGl0aW9uczogb0NvbmRpdGlvbnMgfSwgb0V2ZW50UGFyYW1ldGVycykpO1xuXHRcdH1cblx0fVxuXG5cdEBFdmVudEhhbmRsZXJcblx0aGFuZGxlRmlsdGVyQ2hhbmdlZChvRXZlbnQ6IFVJNUV2ZW50KSB7XG5cdFx0Y29uc3Qgb0ZpbHRlckJhciA9IG9FdmVudC5nZXRTb3VyY2UoKTtcblx0XHRjb25zdCBvRXZlbnRQYXJhbWV0ZXJzID0gb0V2ZW50LmdldFBhcmFtZXRlcnMoKTtcblx0XHRpZiAob0ZpbHRlckJhcikge1xuXHRcdFx0Y29uc3Qgb0NvbmRpdGlvbnMgPSBvRmlsdGVyQmFyLmdldEZpbHRlckNvbmRpdGlvbnMoKTtcblx0XHRcdCh0aGlzIGFzIGFueSkuZmlyZUZpbHRlckNoYW5nZWQobWVyZ2UoeyBjb25kaXRpb25zOiBvQ29uZGl0aW9ucyB9LCBvRXZlbnRQYXJhbWV0ZXJzKSk7XG5cdFx0fVxuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IEZpbHRlckJhckFQSTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZpbHRlckJhckFQSS50cyJdLCJuYW1lcyI6WyJGaWx0ZXJCYXJBUEkiLCJBUElDbGFzcyIsIlByb3BlcnR5IiwidHlwZSIsIm9FdmVudCIsIm9GaWx0ZXJCYXIiLCJnZXRTb3VyY2UiLCJvRXZlbnRQYXJhbWV0ZXJzIiwiZ2V0UGFyYW1ldGVycyIsIm9Db25kaXRpb25zIiwiZ2V0RmlsdGVyQ29uZGl0aW9ucyIsImZpcmVTZWFyY2giLCJtZXJnZSIsImNvbmRpdGlvbnMiLCJmaXJlRmlsdGVyQ2hhbmdlZCIsIk1hY3JvQVBJIiwiRXZlbnQiLCJFdmVudEhhbmRsZXIiXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7TUFFTUEsWSxXQURMQyxRQUFRLENBQUMsNEJBQUQsQyxVQU9QQyxRQUFRLENBQUM7QUFBRUMsSUFBQUEsSUFBSSxFQUFFO0FBQVIsR0FBRCxDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7YUFtQlQsc0JBQ2FDLE1BRGIsRUFDK0I7QUFDOUIsWUFBTUMsVUFBVSxHQUFHRCxNQUFNLENBQUNFLFNBQVAsRUFBbkI7QUFDQSxZQUFNQyxnQkFBZ0IsR0FBR0gsTUFBTSxDQUFDSSxhQUFQLEVBQXpCOztBQUNBLFlBQUlILFVBQUosRUFBZ0I7QUFDZixjQUFNSSxXQUFXLEdBQUdKLFVBQVUsQ0FBQ0ssbUJBQVgsRUFBcEI7QUFDQyxjQUFELENBQWNDLFVBQWQsQ0FBeUJDLEtBQUssQ0FBQztBQUFFQyxZQUFBQSxVQUFVLEVBQUVKO0FBQWQsV0FBRCxFQUE4QkYsZ0JBQTlCLENBQTlCO0FBQ0E7QUFDRDs7O2FBRUQsNkJBQ29CSCxNQURwQixFQUNzQztBQUNyQyxZQUFNQyxVQUFVLEdBQUdELE1BQU0sQ0FBQ0UsU0FBUCxFQUFuQjtBQUNBLFlBQU1DLGdCQUFnQixHQUFHSCxNQUFNLENBQUNJLGFBQVAsRUFBekI7O0FBQ0EsWUFBSUgsVUFBSixFQUFnQjtBQUNmLGNBQU1JLFdBQVcsR0FBR0osVUFBVSxDQUFDSyxtQkFBWCxFQUFwQjtBQUNDLGNBQUQsQ0FBY0ksaUJBQWQsQ0FBZ0NGLEtBQUssQ0FBQztBQUFFQyxZQUFBQSxVQUFVLEVBQUVKO0FBQWQsV0FBRCxFQUE4QkYsZ0JBQTlCLENBQXJDO0FBQ0E7QUFDRDs7OztJQTNDeUJRLFE7Ozs7OzZFQWN6QkMsSzs7Ozs7b0ZBUUFBLEs7Ozs7O29FQUdBQyxZLGdLQVVBQSxZO1NBV2FqQixZIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBUElDbGFzcywgUHJvcGVydHksIEV2ZW50SGFuZGxlciwgRXZlbnQgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCBNYWNyb0FQSSBmcm9tIFwiLi9NYWNyb0FQSVwiO1xuaW1wb3J0IHsgbWVyZ2UgfSBmcm9tIFwic2FwL2Jhc2UvdXRpbFwiO1xuXG4vKipcbiAqIEJ1aWxkaW5nIGJsb2NrIGZvciBjcmVhdGluZyBhIEZpbHRlckJhciBiYXNlZCBvbiB0aGUgbWV0YWRhdGEgcHJvdmlkZWQgYnkgT0RhdGEgVjQuXG4gKiA8YnI+XG4gKiBVc3VhbGx5LCBhIFNlbGVjdGlvbkZpZWxkcyBhbm5vdGF0aW9uIGlzIGV4cGVjdGVkLlxuICpcbiAqXG4gKiBVc2FnZSBleGFtcGxlOlxuICogPHByZT5cbiAqICZsdDttYWNybzpGaWx0ZXJCYXIgaWQ9XCJNeUZpbHRlckJhclwiIG1ldGFQYXRoPVwiQGNvbS5zYXAudm9jYWJ1bGFyaWVzLlVJLnYxLlNlbGVjdGlvbkZpZWxkc1wiIC8mZ3Q7XG4gKiA8L3ByZT5cbiAqXG4gKiBAYWxpYXMgc2FwLmZlLm1hY3Jvcy5GaWx0ZXJCYXJcbiAqIEBwdWJsaWNcbiAqL1xuQEFQSUNsYXNzKFwic2FwLmZlLm1hY3Jvcy5GaWx0ZXJCYXJBUElcIilcbmNsYXNzIEZpbHRlckJhckFQSSBleHRlbmRzIE1hY3JvQVBJIHtcblx0LyoqXG5cdCAqIFRoZSBpZGVudGlmaWVyIG9mIHRoZSBmaWx0ZXJiYXIgY29udHJvbC5cblx0ICpcblx0ICogQHB1YmxpY1xuXHQgKi9cblx0QFByb3BlcnR5KHsgdHlwZTogXCJzdHJpbmdcIiB9KVxuXHRpZCE6IHN0cmluZztcblxuXHQvKipcblx0ICogVGhpcyBldmVudCBpcyBmaXJlZCB3aGVuIHRoZSBHbyBidXR0b24gaXMgcHJlc3NlZCBvciBhZnRlciBhIGNvbmRpdGlvbiBjaGFuZ2UuXG5cdCAqXG5cdCAqIEBwdWJsaWNcblx0ICovXG5cdEBFdmVudFxuXHRzZWFyY2ghOiBGdW5jdGlvbjtcblxuXHQvKipcblx0ICogVGhpcyBldmVudCBpcyBmaXJlZCBhZnRlciBlaXRoZXIgYSBmaWx0ZXIgdmFsdWUgb3IgdGhlIHZpc2liaWxpdHkgb2YgYSBmaWx0ZXIgaXRlbSBoYXMgYmVlbiBjaGFuZ2VkLiB0aGUgZXZlbnQgY29udGFpbnMgY29uZGl0aW9ucyB0aGF0IHdpbGwgYmUgdXNlZCBhcyBmaWx0ZXJzLlxuXHQgKlxuXHQgKiBAcHVibGljXG5cdCAqL1xuXHRARXZlbnRcblx0ZmlsdGVyQ2hhbmdlZCE6IEZ1bmN0aW9uO1xuXG5cdEBFdmVudEhhbmRsZXJcblx0aGFuZGxlU2VhcmNoKG9FdmVudDogVUk1RXZlbnQpIHtcblx0XHRjb25zdCBvRmlsdGVyQmFyID0gb0V2ZW50LmdldFNvdXJjZSgpO1xuXHRcdGNvbnN0IG9FdmVudFBhcmFtZXRlcnMgPSBvRXZlbnQuZ2V0UGFyYW1ldGVycygpO1xuXHRcdGlmIChvRmlsdGVyQmFyKSB7XG5cdFx0XHRjb25zdCBvQ29uZGl0aW9ucyA9IG9GaWx0ZXJCYXIuZ2V0RmlsdGVyQ29uZGl0aW9ucygpO1xuXHRcdFx0KHRoaXMgYXMgYW55KS5maXJlU2VhcmNoKG1lcmdlKHsgY29uZGl0aW9uczogb0NvbmRpdGlvbnMgfSwgb0V2ZW50UGFyYW1ldGVycykpO1xuXHRcdH1cblx0fVxuXG5cdEBFdmVudEhhbmRsZXJcblx0aGFuZGxlRmlsdGVyQ2hhbmdlZChvRXZlbnQ6IFVJNUV2ZW50KSB7XG5cdFx0Y29uc3Qgb0ZpbHRlckJhciA9IG9FdmVudC5nZXRTb3VyY2UoKTtcblx0XHRjb25zdCBvRXZlbnRQYXJhbWV0ZXJzID0gb0V2ZW50LmdldFBhcmFtZXRlcnMoKTtcblx0XHRpZiAob0ZpbHRlckJhcikge1xuXHRcdFx0Y29uc3Qgb0NvbmRpdGlvbnMgPSBvRmlsdGVyQmFyLmdldEZpbHRlckNvbmRpdGlvbnMoKTtcblx0XHRcdCh0aGlzIGFzIGFueSkuZmlyZUZpbHRlckNoYW5nZWQobWVyZ2UoeyBjb25kaXRpb25zOiBvQ29uZGl0aW9ucyB9LCBvRXZlbnRQYXJhbWV0ZXJzKSk7XG5cdFx0fVxuXHR9XG59XG5cbmV4cG9ydCBkZWZhdWx0IEZpbHRlckJhckFQSTtcbiJdfQ==

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

@@ -35,8 +35,7 @@ class FilterBarAPI extends MacroAPI {
 	search!: Function;
 
 	/**
-	 * This event is fired after either a filter value or the visibility of a filter item has been changed.
-	 * The event contains conditions that will be used as filters.
+	 * This event is fired after either a filter value or the visibility of a filter item has been changed. the event contains conditions that will be used as filters.
 	 *
 	 * @public
 	 */

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

@@ -142,7 +142,7 @@ sap.ui.define(
 			});
 		}
 
-		function _fetchBasicPropertyInfo(oFilterFieldInfo) {
+		ODataFilterBarDelegate._fetchBasicPropertyInfo = function(oFilterFieldInfo) {
 			return {
 				name: oFilterFieldInfo.conditionPath,
 				path: oFilterFieldInfo.conditionPath,
@@ -158,10 +158,10 @@ sap.ui.define(
 				isParameter: oFilterFieldInfo.isParameter,
 				caseSensitive: oFilterFieldInfo.caseSensitive
 			};
-		}
+		};
 
 		function _fetchPropertyInfo(oMetaModel, oFilterFieldInfo) {
-			var oPropertyInfo = _fetchBasicPropertyInfo(oFilterFieldInfo),
+			var oPropertyInfo = ODataFilterBarDelegate._fetchBasicPropertyInfo(oFilterFieldInfo),
 				sAnnotationPath = oFilterFieldInfo.annotationPath;
 
 			// no annotationPath => transient filter field
@@ -386,7 +386,7 @@ sap.ui.define(
 				}
 			});
 
-			if (oFilterControl.data("showDraftEditState")) {
+			if (oFilterControl.data("showDraftEditState") === "true") {
 				aFetchedProperties.push(_getEditStateFilterPropertyInfo());
 			}
 

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

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/FilterBarDelegate","sap/ui/model/json/JSONModel","sap/fe/core/TemplateModel","sap/fe/macros/CommonHelper","sap/fe/core/CommonUtils","sap/fe/core/helpers/ModelHelper","sap/fe/core/helpers/StableIdHelper","sap/fe/macros/field/FieldHelper","sap/fe/macros/filter/FilterFieldHelper","sap/fe/macros/filter/FilterUtils","sap/ui/mdc/odata/v4/TypeUtil","sap/fe/macros/ResourceModel","sap/base/util/merge","sap/fe/macros/DelegateUtil","sap/fe/macros/FilterBarHelper","sap/base/Log","sap/base/util/JSTokenizer","sap/fe/core/templating/PropertyFormatters"],function(F,J,T,C,c,M,S,d,e,f,g,R,m,D,h,L,i,P){"use strict";var O=Object.assign({},F),E="$editState",j="$search",V="FilterFieldValueHelp",k="sap_fe_FilterBarDelegate_propertyInfoMap",l=/\+|\*/g;var n=c.FilterRestrictions;function _(){return{name:j,path:j,typeConfig:g.getTypeConfig("sap.ui.model.odata.type.String"),maxConditions:1};}function o(){return{name:E,path:E,groupLabel:"",group:"",label:R.getText("M_COMMON_FILTERBAR_EDITING_STATUS"),tooltip:null,hiddenFilter:false,typeConfig:g.getTypeConfig("sap.ui.model.odata.type.String")};}function p(I,a){var b=new J({id:I}),B={bindingContexts:{"this":b.createBindingContext("/")},models:{"this.i18n":R.getModel(),"this":b}};return D.templateControlFragment("sap.fe.macros.filter.DraftEditState",B,undefined,a).finally(function(){b.destroy();});}function q(a,I,b,B,G){var H=new J({id:I}),K=new T(b,B),N={bindingContexts:{"this":H.createBindingContext("/"),"item":K.createBindingContext("/")},models:{"this":H,"item":K}};return D.templateControlFragment("sap.fe.macros.filter.CustomFilter",N,undefined,G).finally(function(){H.destroy();K.destroy();});}function r(a){return a.replace(l,"");}function s(a,b){return a.find(function(B){return B.conditionPath===b&&B.availability!=="Hidden";});}function t(a){return{name:a.conditionPath,path:a.conditionPath,groupLabel:a.groupLabel,group:a.group,label:a.label,tooltip:null,hiddenFilter:a.availability==="Hidden",removeFromAppState:false,hasValueHelp:false,display:"Value",typeConfig:g.getTypeConfig("String"),isParameter:a.isParameter,caseSensitive:a.caseSensitive};}function u(a,b){var B=t(b),G=b.annotationPath;if(!G){return B;}var H=G.substr(0,G.lastIndexOf("/")),I=a.getObject(G),K=a.getObject(G+"@"),N=a.getObject(H+"/@"),Q,U,W=a.createBindingContext(G),X=i.parseJS(e.formatOptions(I,{context:W})||"{}"),Y=i.parseJS(e.constraints(I,{context:W})||"{}"),Z=K["@com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive"]||K["@com.sap.vocabularies.UI.v1.ExcludeFromNavigationContext"]||K["@com.sap.vocabularies.Analytics.v1.Measure"];var $=C.getLocationForPropertyPath(a,b.annotationPath);var a1=b.annotationPath.replace($+"/","");if(!c.isPropertyFilterable(a,$,r(a1),true)){return null;}U=K["@com.sap.vocabularies.Common.v1.FilterDefaultValue"];if(U){Q=U["$"+D.getModelType(I.$Type)];}B=Object.assign(B,{tooltip:K["@com.sap.vocabularies.Common.v1.QuickInfo"]||undefined,removeFromAppState:Z,hasValueHelp:P.hasValueHelp(W.getObject(),{context:W}),formatOptions:X,constraints:Y,typeConfig:g.getTypeConfig(I.$Type,X,Y),display:d.displayMode(K,N),defaultFilterConditions:Q?[{fieldPath:b.conditionPath,operator:"EQ",values:[Q]}]:undefined});return B;}function v(a,b,N){return N?S.generate([a,b,N]):S.generate([a,b]);}function w(a,b){return Promise.resolve().then(function(){var B=new J({idPrefix:b.sVhIdPrefix,conditionModel:"$filters",navigationPrefix:b.sNavigationPrefix?"/"+b.sNavigationPrefix:"",filterFieldValueHelp:true,useSemanticDateRange:b.bUseSemanticDateRange}),G=m({},a,{bindingContexts:{"this":B.createBindingContext("/")},models:{"this":B}});return D.templateControlFragment("sap.fe.macros.internal.valuehelp.ValueHelp",G,{isXML:a.isXML}).then(function(H){if(H){var I="dependents";if(H.length){H.forEach(function(K){if(b.oModifier){return b.oModifier.insertAggregation(b.oControl,I,K,0);}else{b.oControl.insertAggregation(I,K,0,false);}});}else if(b.oModifier){return b.oModifier.insertAggregation(b.oControl,I,H,0);}else{b.oControl.insertAggregation(I,H,0,false);}}}).finally(function(){B.destroy();});}).catch(function(B){L.error("Error while evaluating DelegateUtil.isValueHelpRequired",B);});}function x(a,b){var B=new J({idPrefix:b.sIdPrefix,vhIdPrefix:b.sVhIdPrefix,propertyPath:b.sPropertyName,navigationPrefix:b.sNavigationPrefix?"/"+b.sNavigationPrefix:"",useSemanticDateRange:b.bUseSemanticDateRange,settings:b.oSettings,visualFilter:b.visualFilter});var G=b.oMetaModel;var H=new T(b.visualFilter,G);var I=m({},a,{bindingContexts:{"this":B.createBindingContext("/"),"visualFilter":H.createBindingContext("/")},models:{"this":B,"visualFilter":H,"metaModel":G}});return D.templateControlFragment("sap.fe.macros.FilterField",I,{isXML:a.isXML}).finally(function(){B.destroy();});}O.addItem=function(a,b,B){if(!B){return O._addP13nItem(a,b);}var G=B.appComponent&&B.appComponent.getModel().getMetaModel();if(!G){return Promise.resolve(null);}return O._addFlexItem(a,b,G,B.modifier);};O._addP13nItem=function(a,b){return D.fetchModel(b).then(function(B){return O._addFlexItem(a,b,B.getMetaModel(),undefined);}).catch(function(B){L.error("Model could not be resolved",B);return null;});};O.fetchPropertiesForEntity=function(a,b,B){var G=b.getObject(a);if(!B||!G){return[];}var H=M.getEntitySetPath(a),I=f.getConvertedFilterFields(B,a),K,N=[],Q=[],U=c.getFilterRestrictionsByPath(H,b),W=U[n.REQUIRED_PROPERTIES],X=U[n.NON_FILTERABLE_PROPERTIES],Y=U[n.ALLOWED_EXPRESSIONS];Object.keys(I).forEach(function($){var a1=I[$];var b1=r(a1.conditionPath);if(X.indexOf(b1)===-1){K=u(b,a1);if(K){if(Y[b1]&&Y[b1].length>0){K.filterExpression=c.getSpecificAllowedExpression(Y[b1]);}else{K.filterExpression="auto";}K.maxConditions=!K.isParameter&&D.isMultiValue(K)?-1:1;K.required=K.isParameter||W.indexOf(b1)>=0;K.visible=a1.availability==="Default";K.label=D.getLocalizedText(a1.label,B);N.push(K);if(K.isParameter){Q.push(b1);}}}});if(B.data("showDraftEditState")){N.push(o());}if(H&&B.data("hideBasicSearch")!=="true"){var Z=c.getSearchRestrictions(H,b);if(!Z||Z.Searchable){N.push(_());}}D.setCustomData(B,"parameters",Q);return N;};O._addFlexItem=function(a,b,B,G){var H=G?G.getId(b):b.getId(),I=G?"":"Adaptation",K=f.getConvertedFilterFields(b),N=s(K,a),Q=r(a),U=!!G&&G.targets==="xmlTree";if(a===E){return p(H,G);}else if(a===j){return Promise.resolve(null);}else if(N&&N.template){return q(b,v(H,I+"FilterField"),N,B,G);}var W=C.getNavigationPath(Q),X=N.annotationPath,Y,Z,$,a1,b1;return Promise.resolve().then(function(){if(N.isParameter){return X.substr(0,X.lastIndexOf("/")+1);}return D.getCustomData(b,"entityType",G);}).then(function(c1){Y=c1;return D.getCustomData(b,"useSemanticDateRange",G);}).then(function(c1){Z=c1;var d1=B.createBindingContext(Y+Q);var H=G?G.getId(b):b.getId();$={bindingContexts:{"contextPath":B.createBindingContext(Y),"property":d1},models:{"contextPath":B,"property":B},isXML:U};a1="/"+M.getEntitySetPath(Y).split("/").filter(M.filterOutNavPropBinding).join("/");b1={sPropertyName:Q,sBindingPath:a1,sValueHelpType:I+V,oControl:b,oMetaModel:B,oModifier:G,sIdPrefix:v(H,I+"FilterField",W),sVhIdPrefix:v(H,I+V),sNavigationPrefix:W,bUseSemanticDateRange:Z,oSettings:N?N.settings:{},visualFilter:N?N.visualFilter:undefined};return D.doesValueHelpExist(b1);}).then(function(c1){if(!c1){return w($,b1);}return Promise.resolve();}).then(function(){return x($,b1);});};function y(a){if(a instanceof window.Element){return null;}return D.getCustomData(a,k);}function z(a,b){if(a instanceof window.Element){return;}D.setCustomData(a,k,b);}function A(B,G,H){var I=y(H);var K;if(!I){I=O.fetchPropertiesForEntity(B,G,H);I.forEach(function(a){K=null;if(a.groupLabel){K=D.getLocalizedText(a.groupLabel,H);a.groupLabel=K===null?a.groupLabel:K;}});I.sort(function(a,b){if(a.groupLabel===undefined||a.groupLabel===null){return-1;}if(b.groupLabel===undefined||b.groupLabel===null){return 1;}return a.groupLabel.localeCompare(b.groupLabel);});z(H,I);}return I;}O.fetchProperties=function(a){var b=D.getCustomData(a,"entityType");return D.fetchModel(a).then(function(B){if(!B){return[];}return A(b,B.getMetaModel(),a);});};O.getTypeUtil=function(a){return g;};return O;},false);
+sap.ui.define(["sap/ui/mdc/FilterBarDelegate","sap/ui/model/json/JSONModel","sap/fe/core/TemplateModel","sap/fe/macros/CommonHelper","sap/fe/core/CommonUtils","sap/fe/core/helpers/ModelHelper","sap/fe/core/helpers/StableIdHelper","sap/fe/macros/field/FieldHelper","sap/fe/macros/filter/FilterFieldHelper","sap/fe/macros/filter/FilterUtils","sap/ui/mdc/odata/v4/TypeUtil","sap/fe/macros/ResourceModel","sap/base/util/merge","sap/fe/macros/DelegateUtil","sap/fe/macros/FilterBarHelper","sap/base/Log","sap/base/util/JSTokenizer","sap/fe/core/templating/PropertyFormatters"],function(F,J,T,C,c,M,S,d,e,f,g,R,m,D,h,L,i,P){"use strict";var O=Object.assign({},F),E="$editState",j="$search",V="FilterFieldValueHelp",k="sap_fe_FilterBarDelegate_propertyInfoMap",l=/\+|\*/g;var n=c.FilterRestrictions;function _(){return{name:j,path:j,typeConfig:g.getTypeConfig("sap.ui.model.odata.type.String"),maxConditions:1};}function o(){return{name:E,path:E,groupLabel:"",group:"",label:R.getText("M_COMMON_FILTERBAR_EDITING_STATUS"),tooltip:null,hiddenFilter:false,typeConfig:g.getTypeConfig("sap.ui.model.odata.type.String")};}function p(I,a){var b=new J({id:I}),A={bindingContexts:{"this":b.createBindingContext("/")},models:{"this.i18n":R.getModel(),"this":b}};return D.templateControlFragment("sap.fe.macros.filter.DraftEditState",A,undefined,a).finally(function(){b.destroy();});}function q(a,I,b,A,B){var G=new J({id:I}),H=new T(b,A),K={bindingContexts:{"this":G.createBindingContext("/"),"item":H.createBindingContext("/")},models:{"this":G,"item":H}};return D.templateControlFragment("sap.fe.macros.filter.CustomFilter",K,undefined,B).finally(function(){G.destroy();H.destroy();});}function r(a){return a.replace(l,"");}function s(a,b){return a.find(function(A){return A.conditionPath===b&&A.availability!=="Hidden";});}O._fetchBasicPropertyInfo=function(a){return{name:a.conditionPath,path:a.conditionPath,groupLabel:a.groupLabel,group:a.group,label:a.label,tooltip:null,hiddenFilter:a.availability==="Hidden",removeFromAppState:false,hasValueHelp:false,display:"Value",typeConfig:g.getTypeConfig("String"),isParameter:a.isParameter,caseSensitive:a.caseSensitive};};function t(a,b){var A=O._fetchBasicPropertyInfo(b),B=b.annotationPath;if(!B){return A;}var G=B.substr(0,B.lastIndexOf("/")),H=a.getObject(B),I=a.getObject(B+"@"),K=a.getObject(G+"/@"),N,Q,U=a.createBindingContext(B),W=i.parseJS(e.formatOptions(H,{context:U})||"{}"),X=i.parseJS(e.constraints(H,{context:U})||"{}"),Y=I["@com.sap.vocabularies.PersonalData.v1.IsPotentiallySensitive"]||I["@com.sap.vocabularies.UI.v1.ExcludeFromNavigationContext"]||I["@com.sap.vocabularies.Analytics.v1.Measure"];var Z=C.getLocationForPropertyPath(a,b.annotationPath);var $=b.annotationPath.replace(Z+"/","");if(!c.isPropertyFilterable(a,Z,r($),true)){return null;}Q=I["@com.sap.vocabularies.Common.v1.FilterDefaultValue"];if(Q){N=Q["$"+D.getModelType(H.$Type)];}A=Object.assign(A,{tooltip:I["@com.sap.vocabularies.Common.v1.QuickInfo"]||undefined,removeFromAppState:Y,hasValueHelp:P.hasValueHelp(U.getObject(),{context:U}),formatOptions:W,constraints:X,typeConfig:g.getTypeConfig(H.$Type,W,X),display:d.displayMode(I,K),defaultFilterConditions:N?[{fieldPath:b.conditionPath,operator:"EQ",values:[N]}]:undefined});return A;}function u(a,b,N){return N?S.generate([a,b,N]):S.generate([a,b]);}function v(a,b){return Promise.resolve().then(function(){var A=new J({idPrefix:b.sVhIdPrefix,conditionModel:"$filters",navigationPrefix:b.sNavigationPrefix?"/"+b.sNavigationPrefix:"",filterFieldValueHelp:true,useSemanticDateRange:b.bUseSemanticDateRange}),B=m({},a,{bindingContexts:{"this":A.createBindingContext("/")},models:{"this":A}});return D.templateControlFragment("sap.fe.macros.internal.valuehelp.ValueHelp",B,{isXML:a.isXML}).then(function(G){if(G){var H="dependents";if(G.length){G.forEach(function(I){if(b.oModifier){return b.oModifier.insertAggregation(b.oControl,H,I,0);}else{b.oControl.insertAggregation(H,I,0,false);}});}else if(b.oModifier){return b.oModifier.insertAggregation(b.oControl,H,G,0);}else{b.oControl.insertAggregation(H,G,0,false);}}}).finally(function(){A.destroy();});}).catch(function(A){L.error("Error while evaluating DelegateUtil.isValueHelpRequired",A);});}function w(a,b){var A=new J({idPrefix:b.sIdPrefix,vhIdPrefix:b.sVhIdPrefix,propertyPath:b.sPropertyName,navigationPrefix:b.sNavigationPrefix?"/"+b.sNavigationPrefix:"",useSemanticDateRange:b.bUseSemanticDateRange,settings:b.oSettings,visualFilter:b.visualFilter});var B=b.oMetaModel;var G=new T(b.visualFilter,B);var H=m({},a,{bindingContexts:{"this":A.createBindingContext("/"),"visualFilter":G.createBindingContext("/")},models:{"this":A,"visualFilter":G,"metaModel":B}});return D.templateControlFragment("sap.fe.macros.FilterField",H,{isXML:a.isXML}).finally(function(){A.destroy();});}O.addItem=function(a,b,A){if(!A){return O._addP13nItem(a,b);}var B=A.appComponent&&A.appComponent.getModel().getMetaModel();if(!B){return Promise.resolve(null);}return O._addFlexItem(a,b,B,A.modifier);};O._addP13nItem=function(a,b){return D.fetchModel(b).then(function(A){return O._addFlexItem(a,b,A.getMetaModel(),undefined);}).catch(function(A){L.error("Model could not be resolved",A);return null;});};O.fetchPropertiesForEntity=function(a,b,A){var B=b.getObject(a);if(!A||!B){return[];}var G=M.getEntitySetPath(a),H=f.getConvertedFilterFields(A,a),I,K=[],N=[],Q=c.getFilterRestrictionsByPath(G,b),U=Q[n.REQUIRED_PROPERTIES],W=Q[n.NON_FILTERABLE_PROPERTIES],X=Q[n.ALLOWED_EXPRESSIONS];Object.keys(H).forEach(function(Z){var $=H[Z];var a1=r($.conditionPath);if(W.indexOf(a1)===-1){I=t(b,$);if(I){if(X[a1]&&X[a1].length>0){I.filterExpression=c.getSpecificAllowedExpression(X[a1]);}else{I.filterExpression="auto";}I.maxConditions=!I.isParameter&&D.isMultiValue(I)?-1:1;I.required=I.isParameter||U.indexOf(a1)>=0;I.visible=$.availability==="Default";I.label=D.getLocalizedText($.label,A);K.push(I);if(I.isParameter){N.push(a1);}}}});if(A.data("showDraftEditState")==="true"){K.push(o());}if(G&&A.data("hideBasicSearch")!=="true"){var Y=c.getSearchRestrictions(G,b);if(!Y||Y.Searchable){K.push(_());}}D.setCustomData(A,"parameters",N);return K;};O._addFlexItem=function(a,b,A,B){var G=B?B.getId(b):b.getId(),I=B?"":"Adaptation",H=f.getConvertedFilterFields(b),K=s(H,a),N=r(a),Q=!!B&&B.targets==="xmlTree";if(a===E){return p(G,B);}else if(a===j){return Promise.resolve(null);}else if(K&&K.template){return q(b,u(G,I+"FilterField"),K,A,B);}var U=C.getNavigationPath(N),W=K.annotationPath,X,Y,Z,$,a1;return Promise.resolve().then(function(){if(K.isParameter){return W.substr(0,W.lastIndexOf("/")+1);}return D.getCustomData(b,"entityType",B);}).then(function(b1){X=b1;return D.getCustomData(b,"useSemanticDateRange",B);}).then(function(b1){Y=b1;var c1=A.createBindingContext(X+N);var G=B?B.getId(b):b.getId();Z={bindingContexts:{"contextPath":A.createBindingContext(X),"property":c1},models:{"contextPath":A,"property":A},isXML:Q};$="/"+M.getEntitySetPath(X).split("/").filter(M.filterOutNavPropBinding).join("/");a1={sPropertyName:N,sBindingPath:$,sValueHelpType:I+V,oControl:b,oMetaModel:A,oModifier:B,sIdPrefix:u(G,I+"FilterField",U),sVhIdPrefix:u(G,I+V),sNavigationPrefix:U,bUseSemanticDateRange:Y,oSettings:K?K.settings:{},visualFilter:K?K.visualFilter:undefined};return D.doesValueHelpExist(a1);}).then(function(b1){if(!b1){return v(Z,a1);}return Promise.resolve();}).then(function(){return w(Z,a1);});};function x(a){if(a instanceof window.Element){return null;}return D.getCustomData(a,k);}function y(a,b){if(a instanceof window.Element){return;}D.setCustomData(a,k,b);}function z(A,B,G){var H=x(G);var I;if(!H){H=O.fetchPropertiesForEntity(A,B,G);H.forEach(function(a){I=null;if(a.groupLabel){I=D.getLocalizedText(a.groupLabel,G);a.groupLabel=I===null?a.groupLabel:I;}});H.sort(function(a,b){if(a.groupLabel===undefined||a.groupLabel===null){return-1;}if(b.groupLabel===undefined||b.groupLabel===null){return 1;}return a.groupLabel.localeCompare(b.groupLabel);});y(G,H);}return H;}O.fetchProperties=function(a){var b=D.getCustomData(a,"entityType");return D.fetchModel(a).then(function(A){if(!A){return[];}return z(b,A.getMetaModel(),a);});};O.getTypeUtil=function(a){return g;};return O;},false);

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

@@ -1,24 +1,15 @@
-<core:FragmentDefinition xmlns:core="sap.ui.core" xmlns="sap.m" xmlns:fe="sap.fe.templates.controls">
-	<fe:OverflowToolbarButtonHover
+<core:FragmentDefinition xmlns:core="sap.ui.core" xmlns="sap.m">
+	<OverflowToolbarButton
 		type="Transparent"
-		icon="sap-icon://full-screen"
-		visible="{= ${fclhelper>/actionButtonsInfo/fullScreen} !== null }"
-		press="._routing.enterFullScreen()"
-		hover="._routing.overflowToolbarButtonHover()"
+		icon="{fclhelper>/actionButtonsInfo/switchIcon}"
+		visible="{fclhelper>/actionButtonsInfo/switchVisible}"
+		press="._routing.switchFullScreen()"
 	/>
-	<fe:OverflowToolbarButtonHover
-		type="Transparent"
-		icon="sap-icon://exit-full-screen"
-		visible="{= ${fclhelper>/actionButtonsInfo/exitFullScreen} !== null }"
-		press="._routing.exitFullScreen()"
-		hover="._routing.overflowToolbarButtonHover()"
-	/>
-	<fe:OverflowToolbarButtonHover
+	<OverflowToolbarButton
 		type="Transparent"
 		icon="sap-icon://decline"
 		tooltip="{= ${sap.fe.i18n>C_COMMON_SAPFE_CLOSE} }"
 		visible="{= ${fclhelper>/actionButtonsInfo/closeColumn} !== null }"
 		press="._routing.closeColumn()"
-		hover="._routing.overflowToolbarButtonHover()"
 	/>
 </core:FragmentDefinition>