@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.macros/src/sap/fe/macros/field/FieldTemplating.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/templating/UIFormatters","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/helpers/BindingExpression","sap/fe/core/templating/PropertyHelper","sap/fe/core/formatters/ValueFormatter","sap/fe/core/templating/FieldControlHelper","sap/fe/core/converters/helpers/BindingHelper","sap/ui/model/json/JSONModel"],function(U,D,B,P,v,F,a,J){"use strict";var _={};var b=a.UI;var c=F.isReadOnlyExpression;var g=P.getAssociatedTextPropertyPath;var h=P.hasValueHelp;var d=P.isProperty;var e=P.getAssociatedCurrencyProperty;var f=P.getAssociatedUnitProperty;var j=P.isPathExpression;var o=B.or;var k=B.equal;var n=B.not;var l=B.ifElse;var m=B.and;var p=B.bindingExpression;var q=B.constant;var r=B.compileBinding;var t=B.transformRecursively;var s=B.formatResult;var u=B.annotationExpression;var w=D.getContextRelativeTargetObjectPath;var x=D.getPathRelativeLocation;var y=D.enhanceDataModelPath;var z=U.formatWithTypeInformation;var A=U.getBindingWithUnitOrCurrency;var C=U.getDisplayMode;function E(i,b1){var c1=Object.keys(i);if(Object.getOwnPropertySymbols){var d1=Object.getOwnPropertySymbols(i);if(b1){d1=d1.filter(function(e1){return Object.getOwnPropertyDescriptor(i,e1).enumerable;});}c1.push.apply(c1,d1);}return c1;}function G(b1){for(var i=1;i<arguments.length;i++){var c1=arguments[i]!=null?arguments[i]:{};if(i%2){E(Object(c1),true).forEach(function(d1){H(b1,d1,c1[d1]);});}else if(Object.getOwnPropertyDescriptors){Object.defineProperties(b1,Object.getOwnPropertyDescriptors(c1));}else{E(Object(c1)).forEach(function(d1){Object.defineProperty(b1,d1,Object.getOwnPropertyDescriptor(c1,d1));});}}return b1;}function H(i,b1,c1){if(b1 in i){Object.defineProperty(i,b1,{value:c1,enumerable:true,configurable:true,writable:true});}else{i[b1]=c1;}return i;}var I=function(p,i){return t(p,"Binding",function(b1){var c1=b1;if(b1.modelName===undefined){var d1=y(i,b1.path);c1=K(d1,b1);}return c1;});};_.addTextArrangementToBindingExpression=I;var K=function(i,b1,c1){var d1,e1;var f1=c1===null||c1===void 0?void 0:c1.displayMode;var g1=b1;var h1=i.targetObject.type==="PropertyPath"?i.targetObject.$target:i.targetObject;var i1=f1||C(h1,i);var j1=(d1=h1.annotations)===null||d1===void 0?void 0:(e1=d1.Common)===null||e1===void 0?void 0:e1.Text;var k1=x(i.contextLocation,i.navigationProperties).map(function(np){return np.name;});b1=z(h1,b1);if(i1!=="Value"&&j1){switch(i1){case"Description":g1=u(j1,k1);break;case"DescriptionValue":g1=s([u(j1,k1),b1],v.formatWithBrackets);break;case"ValueDescription":g1=s([b1,u(j1,k1)],v.formatWithBrackets);break;}}return g1;};_.getBindingWithTextArrangement=K;var L=function(p,i){return t(p,"Binding",function(b1){var c1=b1;if(b1.modelName===undefined){var d1=y(i,b1.path);c1=z(d1.targetObject,b1);}return c1;});};_.formatValueRecursively=L;var M=function(i,b1){var c1,d1,e1,f1,g1,h1,i1,j1,k1,l1;var m1=arguments.length>2&&arguments[2]!==undefined?arguments[2]:false;if(((c1=i.targetObject)===null||c1===void 0?void 0:c1.$Type)==="com.sap.vocabularies.UI.v1.DataField"||((d1=i.targetObject)===null||d1===void 0?void 0:d1.$Type)==="com.sap.vocabularies.UI.v1.DataPointType"||((e1=i.targetObject)===null||e1===void 0?void 0:e1.$Type)==="com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath"||((f1=i.targetObject)===null||f1===void 0?void 0:f1.$Type)==="com.sap.vocabularies.UI.v1.DataFieldWithUrl"){var n1=i.targetObject.Value||"";return r(q(n1));}if(j(i.targetObject)&&i.targetObject.$target){var o1=i.targetEntityType.resolvePath(i.targetObject.path,true);i.targetObject=o1.target;o1.visitedObjects.forEach(function(r1){if((r1===null||r1===void 0?void 0:r1._type)==="NavigationProperty"){i.navigationProperties.push(r1);}});}var p1=p(w(i));var q1;if((g1=i.targetObject)!==null&&g1!==void 0&&(h1=g1.annotations)!==null&&h1!==void 0&&(i1=h1.Measures)!==null&&i1!==void 0&&i1.Unit||(j1=i.targetObject)!==null&&j1!==void 0&&(k1=j1.annotations)!==null&&k1!==void 0&&(l1=k1.Measures)!==null&&l1!==void 0&&l1.ISOCurrency){q1=A(i,p1);if((b1===null||b1===void 0?void 0:b1.measureDisplayMode)==="Hidden"){q1.formatOptions=G(G({},q1.formatOptions),{},{showMeasure:false});}}else{q1=K(i,p1,b1);}if(m1){return q1;}return r(q1);};_.getTextBinding=M;var N=function(i,b1){var c1=arguments.length>2&&arguments[2]!==undefined?arguments[2]:false;var d1=arguments.length>3&&arguments[3]!==undefined?arguments[3]:false;var e1=arguments.length>4?arguments[4]:undefined;var f1=arguments.length>5?arguments[5]:undefined;var g1=arguments.length>6&&arguments[6]!==undefined?arguments[6]:false;if(j(i.targetObject)&&i.targetObject.$target){var h1=i.targetEntityType.resolvePath(i.targetObject.path,true);i.targetObject=h1.target;h1.visitedObjects.forEach(function(o1){if(o1&&o1._type==="NavigationProperty"){i.navigationProperties.push(o1);}});}var i1=i.targetObject;if(d(i1)){var j1,k1;var l1=p(w(i));if((j1=i1.annotations)!==null&&j1!==void 0&&(k1=j1.Communication)!==null&&k1!==void 0&&k1.IsEmailAddress){l1.type="sap.fe.core.type.Email";}else{var m1=f(i.targetObject);var n1=e(i.targetObject);if(!c1&&(m1||n1)){l1=A(i,l1);if(m1&&!h(m1)||n1&&!h(n1)||(b1===null||b1===void 0?void 0:b1.measureDisplayMode)==="Hidden"){if(!l1.formatOptions){l1.formatOptions={};}if(g1){l1.formatOptions.showNumber=false;}else{l1.formatOptions.showMeasure=false;}}}else{l1=z(i1,l1);if(l1.type==="sap.ui.model.odata.type.String"){l1.formatOptions={parseKeepsEmptyString:true};}}}if(d1){delete l1.formatOptions;delete l1.constraints;delete l1.type;}if(e1){l1.parameters=e1;}if(f1){l1.targetType="any";}return r(l1);}else{if((i1===null||i1===void 0?void 0:i1.$Type)==="com.sap.vocabularies.UI.v1.DataFieldWithUrl"||(i1===null||i1===void 0?void 0:i1.$Type)==="com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath"){return r(u(i1.Value));}else{return"";}}};_.getValueBinding=N;var O=function(i){var b1,c1,d1,e1;var f1=i.targetObject;var g1=(b1=f1.annotations)===null||b1===void 0?void 0:(c1=b1.Measures)===null||c1===void 0?void 0:c1.Unit;var h1=x(i.contextLocation,i.navigationProperties).map(function(np){return np.name;});g1=g1?g1:(d1=f1.annotations)===null||d1===void 0?void 0:(e1=d1.Measures)===null||e1===void 0?void 0:e1.ISOCurrency;return g1?r(u(g1,h1)):undefined;};_.getUnitBinding=O;var Q=function(i,b1){var c1=g(i.targetObject);if(c1){var d1=y(i,c1);var e1=N(d1,b1,true,true,{$$noPatch:true});return e1;}return undefined;};_.getAssociatedTextBinding=Q;var R=function(i,b1){var c1;var d1=(i===null||i===void 0?void 0:(c1=i.targetEntityType)===null||c1===void 0?void 0:c1.navigationProperties)||[];var e1=false;d1.forEach(function(f1){if(f1.referentialConstraint&&f1.referentialConstraint.length){f1.referentialConstraint.forEach(function(g1){if((g1===null||g1===void 0?void 0:g1.sourceProperty)===b1.name){var h1,i1,j1;if(f1!==null&&f1!==void 0&&(h1=f1.targetType)!==null&&h1!==void 0&&(i1=h1.annotations)!==null&&i1!==void 0&&(j1=i1.UI)!==null&&j1!==void 0&&j1.QuickViewFacets){e1=true;}}});}});return e1;};_.isUsedInNavigationWithQuickViewFacets=R;var S=function(i,b1){var c1,d1,e1;var f1=j(i)&&i.$target||i;if(!(b1.displayMode==="Value")&&!((c1=f1.annotations)!==null&&c1!==void 0&&(d1=c1.Common)!==null&&d1!==void 0&&d1.Text)&&!((e1=f1.annotations)!==null&&e1!==void 0&&e1.Measures)&&P.hasValueHelp(f1)&&b1.textAlignMode==="Form"){return true;}return false;};_.isRetrieveTextFromValueListEnabled=S;var T=function(i,b1,c1,d1,e1){var f1,g1,h1,i1,j1,k1,l1,m1,n1,o1,p1,q1,r1,s1,t1,u1,v1,w1,x1,y1,z1,A1,B1,C1,D1;var E1=j(i)&&i.$target||i;if(e1&&!((f1=E1.annotations)!==null&&f1!==void 0&&(g1=f1.UI)!==null&&g1!==void 0&&g1.IsImageURL)&&!(E1.type==="Edm.Stream")&&!((h1=E1.annotations)!==null&&h1!==void 0&&(i1=h1.Communication)!==null&&i1!==void 0&&i1.IsEmailAddress||(j1=E1.annotations)!==null&&j1!==void 0&&(k1=j1.Communication)!==null&&k1!==void 0&&k1.IsPhoneNumber)){return"LinkWithQuickViewForm";}if(!i||typeof i==="string"){return"Text";}if(E1.type==="Edm.Stream"){return"File";}if((l1=E1.annotations)!==null&&l1!==void 0&&(m1=l1.UI)!==null&&m1!==void 0&&m1.IsImageURL){return"Avatar";}switch(b1.$Type){case"com.sap.vocabularies.UI.v1.DataPointType":return"DataPoint";case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":if(((n1=b1.Target)===null||n1===void 0?void 0:(o1=n1.$target)===null||o1===void 0?void 0:o1.$Type)==="com.sap.vocabularies.UI.v1.DataPointType"){return"DataPoint";}else if(((p1=b1.Target)===null||p1===void 0?void 0:(q1=p1.$target)===null||q1===void 0?void 0:q1.$Type)==="com.sap.vocabularies.Communication.v1.ContactType"){return"Contact";}break;case"com.sap.vocabularies.UI.v1.DataFieldForAction":case"com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation":return"Button";case"com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":return"Link";}if(c1!==null&&c1!==void 0&&(r1=c1.targetEntityType)!==null&&r1!==void 0&&(s1=r1.annotations)!==null&&s1!==void 0&&(t1=s1.Common)!==null&&t1!==void 0&&t1.SemanticKey){var F1=c1.targetEntityType.annotations.Common.SemanticKey;var G1=!F1.every(function(K1){var L1;return(K1===null||K1===void 0?void 0:(L1=K1.$target)===null||L1===void 0?void 0:L1.name)!==E1.name;});if(G1&&d1.semanticKeyStyle){var H1,I1,J1;if((H1=c1.targetEntitySet)!==null&&H1!==void 0&&(I1=H1.annotations)!==null&&I1!==void 0&&(J1=I1.Common)!==null&&J1!==void 0&&J1.DraftRoot){return"SemanticKeyWithDraftIndicator";}return d1.semanticKeyStyle==="ObjectIdentifier"?"ObjectIdentifier":"LabelSemanticKey";}}if(b1.Criticality){return"ObjectStatus";}if((u1=E1.annotations)!==null&&u1!==void 0&&(v1=u1.Measures)!==null&&v1!==void 0&&v1.ISOCurrency&&String(d1.isCurrencyAligned)==="true"){if(d1.measureDisplayMode==="Hidden"){return"Text";}return"AmountWithCurrency";}if((w1=E1.annotations)!==null&&w1!==void 0&&(x1=w1.Communication)!==null&&x1!==void 0&&x1.IsEmailAddress||(y1=E1.annotations)!==null&&y1!==void 0&&(z1=y1.Communication)!==null&&z1!==void 0&&z1.IsPhoneNumber){return"Link";}if((A1=E1.annotations)!==null&&A1!==void 0&&(B1=A1.UI)!==null&&B1!==void 0&&B1.MultiLineText){return"ExpandableText";}if(R(c1,E1)){return"LinkWithQuickViewForm";}if((C1=E1.annotations)!==null&&C1!==void 0&&(D1=C1.Common)!==null&&D1!==void 0&&D1.SemanticObject){return"LinkWrapper";}if(b1.$Type==="com.sap.vocabularies.UI.v1.DataFieldWithUrl"){return"Link";}if(d1.retrieveTextFromValueList===true){return"MdcFieldWithValueHelp";}return"Text";};_.getDisplayStyle=T;var V=function(i,b1,c1){var d1,e1,f1,g1,h1,i1,j1,k1,l1,m1,n1;if(!i||typeof i==="string"){return null;}var o1=j(i)&&i.$target||i;if(o1.type==="Edm.Stream"){return"File";}switch(b1.$Type){case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":if(((d1=b1.Target)===null||d1===void 0?void 0:(e1=d1.$target)===null||e1===void 0?void 0:e1.$Type)==="com.sap.vocabularies.Communication.v1.ContactType"){return null;}else if(((f1=b1.Target)===null||f1===void 0?void 0:(g1=f1.$target)===null||g1===void 0?void 0:g1.Visualization)==="UI.VisualizationType/Rating"){return"RatingIndicator";}break;case"com.sap.vocabularies.UI.v1.DataPointType":if((b1===null||b1===void 0?void 0:b1.Visualization)==="UI.VisualizationType/Rating"){return"RatingIndicator";}break;case"com.sap.vocabularies.UI.v1.DataFieldForAction":case"com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":case"com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation":return null;}var p1=f(o1);var q1=e(o1);if(P.hasValueHelp(o1)&&o1.type!=="Edm.Boolean"||p1&&P.hasValueHelp(p1)||q1&&P.hasValueHelp(q1)){if((c1===null||c1===void 0?void 0:c1.measureDisplayMode)==="Hidden"){return"Input";}return"InputWithValueHelp";}if((h1=o1.annotations)!==null&&h1!==void 0&&(i1=h1.UI)!==null&&i1!==void 0&&(j1=i1.MultiLineText)!==null&&j1!==void 0&&j1.valueOf()&&o1.type==="Edm.String"){return"TextArea";}switch(o1.type){case"Edm.Date":return"DatePicker";case"Edm.Time":case"Edm.TimeOfDay":return"TimePicker";case"Edm.DateTime":case"Edm.DateTimeOffset":return"DateTimePicker";case"Edm.Boolean":return"CheckBox";}if((k1=o1.annotations)!==null&&k1!==void 0&&(l1=k1.Measures)!==null&&l1!==void 0&&l1.ISOCurrency||(m1=o1.annotations)!==null&&m1!==void 0&&(n1=m1.Measures)!==null&&n1!==void 0&&n1.Unit){return"InputWithUnit";}return"Input";};_.getEditStyle=V;var W=function(i,b1){var c1,d1,e1,f1,g1,h1;var i1=i.targetObject;var j1;if(i1){switch(i1.$Type){case"com.sap.vocabularies.UI.v1.DataField":case"com.sap.vocabularies.UI.v1.DataFieldWithUrl":case"com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":case"com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation":case"com.sap.vocabularies.UI.v1.DataFieldWithAction":case"com.sap.vocabularies.UI.v1.DataPointType":j1=i1.Value.$target;break;case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":if((i1===null||i1===void 0?void 0:(c1=i1.Target)===null||c1===void 0?void 0:(d1=c1.$target)===null||d1===void 0?void 0:d1.$Type)==="com.sap.vocabularies.UI.v1.DataPointType"){var k1;j1=(k1=i1.Target.$target)===null||k1===void 0?void 0:k1.Value.$target;break;}case"com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation":case"com.sap.vocabularies.UI.v1.DataFieldForAction":default:j1=undefined;}}var l1=b1!==null&&b1!==void 0&&b1.isAnalytics?b.IsExpanded:q(false);var m1=b1!==null&&b1!==void 0&&b1.isAnalytics?k(b.NodeLevel,0):q(false);return r(m.apply(void 0,[n(k(u(i1===null||i1===void 0?void 0:(e1=i1.annotations)===null||e1===void 0?void 0:(f1=e1.UI)===null||f1===void 0?void 0:f1.Hidden),true)),l(!!j1,j1&&n(k(u((g1=j1.annotations)===null||g1===void 0?void 0:(h1=g1.UI)===null||h1===void 0?void 0:h1.Hidden),true)),true),o(n(l1),m1)]));};_.getVisibleExpression=W;var X=function(i,b1){var c1=j(i)&&i.$target||i;var d1=e(c1)||f(c1);if(!d1){return r("");}var e1=m(n(c(d1)),n(P.isComputed(d1)));return r(l(e1,"",b1));};_.getInputDescription=X;var Y=function(i,b1,c1){var d1=arguments.length>3&&arguments[3]!==undefined?arguments[3]:false;var e1=N(i,c1,d1);if(e1===""){e1=M(b1,c1,d1);}return e1;};_.QVTextBinding=Y;var Z=function(i){var b1,c1,d1,e1,f1,g1;var h1=i.targetObject;if(h1!==null&&h1!==void 0&&(b1=h1.$target)!==null&&b1!==void 0&&(c1=b1.annotations)!==null&&c1!==void 0&&(d1=c1.Communication)!==null&&d1!==void 0&&d1.IsEmailAddress){return"email";}if(h1!==null&&h1!==void 0&&(e1=h1.$target)!==null&&e1!==void 0&&(f1=e1.annotations)!==null&&f1!==void 0&&(g1=f1.Communication)!==null&&g1!==void 0&&g1.IsPhoneNumber){return"phone";}return"text";};_.getQuickViewType=Z;var $=function(i){var b1=[];if(i){var c1=Object.keys(i).filter(function(f1){return f1==="SemanticObject"||f1.startsWith("SemanticObject#");});for(var d1=0;d1<c1.length;d1++){var e1=r(u(i[c1[d1]]));b1.push({key:(e1===null||e1===void 0?void 0:e1.indexOf("{"))===-1?e1:e1===null||e1===void 0?void 0:e1.split("{")[1].split("}")[0],value:e1});}}return b1;};_.getSemanticObjectExpressionToResolve=$;var a1=function(i){if(i.length>0){var b1="";var c1="";var d1=[];for(var e1=0;e1<i.length;e1++){b1=i[e1].key;c1=r(u(i[e1].value));d1.push({key:b1,value:c1});}var f1=new J(d1);f1.$$valueAsPromise=true;var g1=f1.createBindingContext("/");return g1;}else{return new J([]).createBindingContext("/");}};_.getSemanticObjects=a1;return _;},false);
+sap.ui.define(["sap/fe/core/templating/UIFormatters","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/helpers/BindingExpression","sap/fe/core/templating/PropertyHelper","sap/fe/core/formatters/ValueFormatter","sap/fe/core/templating/FieldControlHelper","sap/fe/core/converters/helpers/BindingHelper","sap/ui/model/json/JSONModel"],function(U,D,B,P,v,F,a,J){"use strict";var _={};var b=a.UI;var c=F.isReadOnlyExpression;var g=P.getAssociatedTextPropertyPath;var h=P.hasValueHelp;var d=P.isProperty;var e=P.getAssociatedCurrencyProperty;var f=P.getAssociatedUnitProperty;var j=P.isPathExpression;var r=B.resolveBindingString;var o=B.or;var k=B.equal;var n=B.not;var l=B.ifElse;var m=B.and;var p=B.bindingExpression;var q=B.constant;var s=B.compileBinding;var t=B.transformRecursively;var u=B.formatResult;var w=B.annotationExpression;var x=D.getContextRelativeTargetObjectPath;var y=D.getPathRelativeLocation;var z=D.enhanceDataModelPath;var A=U.formatWithTypeInformation;var C=U.getBindingWithUnitOrCurrency;var E=U.getDisplayMode;function G(i,f1){var g1=Object.keys(i);if(Object.getOwnPropertySymbols){var h1=Object.getOwnPropertySymbols(i);if(f1){h1=h1.filter(function(i1){return Object.getOwnPropertyDescriptor(i,i1).enumerable;});}g1.push.apply(g1,h1);}return g1;}function H(f1){for(var i=1;i<arguments.length;i++){var g1=arguments[i]!=null?arguments[i]:{};if(i%2){G(Object(g1),true).forEach(function(h1){I(f1,h1,g1[h1]);});}else if(Object.getOwnPropertyDescriptors){Object.defineProperties(f1,Object.getOwnPropertyDescriptors(g1));}else{G(Object(g1)).forEach(function(h1){Object.defineProperty(f1,h1,Object.getOwnPropertyDescriptor(g1,h1));});}}return f1;}function I(i,f1,g1){if(f1 in i){Object.defineProperty(i,f1,{value:g1,enumerable:true,configurable:true,writable:true});}else{i[f1]=g1;}return i;}var K=function(p,i){return t(p,"Binding",function(f1){var g1=f1;if(f1.modelName===undefined){var h1=z(i,f1.path);g1=L(h1,f1);}return g1;});};_.addTextArrangementToBindingExpression=K;var L=function(i,f1,g1){var h1,i1;var j1=g1===null||g1===void 0?void 0:g1.displayMode;var k1=f1;var l1=i.targetObject.type==="PropertyPath"?i.targetObject.$target:i.targetObject;var m1=j1||E(l1,i);var n1=(h1=l1.annotations)===null||h1===void 0?void 0:(i1=h1.Common)===null||i1===void 0?void 0:i1.Text;var o1=y(i.contextLocation,i.navigationProperties).map(function(np){return np.name;});f1=A(l1,f1);if(m1!=="Value"&&n1){switch(m1){case"Description":k1=w(n1,o1);break;case"DescriptionValue":k1=u([w(n1,o1),f1],v.formatWithBrackets);break;case"ValueDescription":k1=u([f1,w(n1,o1)],v.formatWithBrackets);break;}}return k1;};_.getBindingWithTextArrangement=L;var M=function(p,i){return t(p,"Binding",function(f1){var g1=f1;if(f1.modelName===undefined){var h1=z(i,f1.path);g1=A(h1.targetObject,f1);}return g1;});};_.formatValueRecursively=M;var N=function(i,f1){var g1,h1,i1,j1,k1,l1,m1,n1,o1,p1,q1,r1;var s1=arguments.length>2&&arguments[2]!==undefined?arguments[2]:false;if(((g1=i.targetObject)===null||g1===void 0?void 0:g1.$Type)==="com.sap.vocabularies.UI.v1.DataField"||((h1=i.targetObject)===null||h1===void 0?void 0:h1.$Type)==="com.sap.vocabularies.UI.v1.DataPointType"||((i1=i.targetObject)===null||i1===void 0?void 0:i1.$Type)==="com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath"||((j1=i.targetObject)===null||j1===void 0?void 0:j1.$Type)==="com.sap.vocabularies.UI.v1.DataFieldWithUrl"||((k1=i.targetObject)===null||k1===void 0?void 0:k1.$Type)==="com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation"||((l1=i.targetObject)===null||l1===void 0?void 0:l1.$Type)==="com.sap.vocabularies.UI.v1.DataFieldWithAction"){var t1=i.targetObject.Value||"";return s(q(t1));}if(j(i.targetObject)&&i.targetObject.$target){i=z(i,i.targetObject.path);}var u1=p(x(i));var v1;if((m1=i.targetObject)!==null&&m1!==void 0&&(n1=m1.annotations)!==null&&n1!==void 0&&(o1=n1.Measures)!==null&&o1!==void 0&&o1.Unit||(p1=i.targetObject)!==null&&p1!==void 0&&(q1=p1.annotations)!==null&&q1!==void 0&&(r1=q1.Measures)!==null&&r1!==void 0&&r1.ISOCurrency){v1=C(i,u1);if((f1===null||f1===void 0?void 0:f1.measureDisplayMode)==="Hidden"){v1.formatOptions=H(H({},v1.formatOptions),{},{showMeasure:false});}}else{v1=L(i,u1,f1);}if(s1){return v1;}return s(v1);};_.getTextBinding=N;var O=function(i,f1){var g1=arguments.length>2&&arguments[2]!==undefined?arguments[2]:false;var h1=arguments.length>3&&arguments[3]!==undefined?arguments[3]:false;var i1=arguments.length>4?arguments[4]:undefined;var j1=arguments.length>5?arguments[5]:undefined;var k1=arguments.length>6&&arguments[6]!==undefined?arguments[6]:false;if(j(i.targetObject)&&i.targetObject.$target){var l1=i.targetEntityType.resolvePath(i.targetObject.path,true);i.targetObject=l1.target;l1.visitedObjects.forEach(function(s1){if(s1&&s1._type==="NavigationProperty"){i.navigationProperties.push(s1);}});}var m1=i.targetObject;if(d(m1)){var n1,o1;var p1=p(x(i));if((n1=m1.annotations)!==null&&n1!==void 0&&(o1=n1.Communication)!==null&&o1!==void 0&&o1.IsEmailAddress){p1.type="sap.fe.core.type.Email";}else{var q1=f(i.targetObject);var r1=e(i.targetObject);if(!g1&&(q1||r1)){p1=C(i,p1,!k1);if(q1&&!h(q1)||r1&&!h(r1)||(f1===null||f1===void 0?void 0:f1.measureDisplayMode)==="Hidden"){if(!p1.formatOptions){p1.formatOptions={};}if(k1){p1.formatOptions.showNumber=false;}else{p1.formatOptions.showMeasure=false;}}}else{p1=A(m1,p1);if(p1.type==="sap.ui.model.odata.type.String"){p1.formatOptions={parseKeepsEmptyString:true};}}}if(h1){delete p1.formatOptions;delete p1.constraints;delete p1.type;}if(i1){p1.parameters=i1;}if(j1){p1.targetType="any";}return s(p1);}else{if((m1===null||m1===void 0?void 0:m1.$Type)==="com.sap.vocabularies.UI.v1.DataFieldWithUrl"||(m1===null||m1===void 0?void 0:m1.$Type)==="com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath"){return s(w(m1.Value));}else{return"";}}};_.getValueBinding=O;var Q=function(i){var f1,g1,h1,i1;var j1=i.targetObject;var k1=(f1=j1.annotations)===null||f1===void 0?void 0:(g1=f1.Measures)===null||g1===void 0?void 0:g1.Unit;var l1=y(i.contextLocation,i.navigationProperties).map(function(np){return np.name;});k1=k1?k1:(h1=j1.annotations)===null||h1===void 0?void 0:(i1=h1.Measures)===null||i1===void 0?void 0:i1.ISOCurrency;return k1?s(w(k1,l1)):undefined;};_.getUnitBinding=Q;var R=function(i,f1){var g1=g(i.targetObject);if(g1){var h1=z(i,g1);var i1=O(h1,f1,true,true,{$$noPatch:true});return i1;}return undefined;};_.getAssociatedTextBinding=R;var S=function(i,f1){var g1;var h1=(i===null||i===void 0?void 0:(g1=i.targetEntityType)===null||g1===void 0?void 0:g1.navigationProperties)||[];var i1=false;h1.forEach(function(j1){if(j1.referentialConstraint&&j1.referentialConstraint.length){j1.referentialConstraint.forEach(function(k1){if((k1===null||k1===void 0?void 0:k1.sourceProperty)===f1.name){var l1,m1,n1;if(j1!==null&&j1!==void 0&&(l1=j1.targetType)!==null&&l1!==void 0&&(m1=l1.annotations)!==null&&m1!==void 0&&(n1=m1.UI)!==null&&n1!==void 0&&n1.QuickViewFacets){i1=true;}}});}});return i1;};_.isUsedInNavigationWithQuickViewFacets=S;var T=function(i,f1){var g1,h1,i1;var j1=j(i)&&i.$target||i;if(!(f1.displayMode==="Value")&&!((g1=j1.annotations)!==null&&g1!==void 0&&(h1=g1.Common)!==null&&h1!==void 0&&h1.Text)&&!((i1=j1.annotations)!==null&&i1!==void 0&&i1.Measures)&&P.hasValueHelp(j1)&&f1.textAlignMode==="Form"){return true;}return false;};_.isRetrieveTextFromValueListEnabled=T;var V=function(i,f1,g1,h1,i1){var j1,k1,l1,m1,n1,o1,p1,q1,r1,s1,t1,u1,v1,w1,x1,y1,z1,A1,B1,C1,D1,E1,F1,G1,H1;var I1=j(i)&&i.$target||i;if(i1&&!((j1=I1.annotations)!==null&&j1!==void 0&&(k1=j1.UI)!==null&&k1!==void 0&&k1.IsImageURL)&&!(I1.type==="Edm.Stream")&&!((l1=I1.annotations)!==null&&l1!==void 0&&(m1=l1.Communication)!==null&&m1!==void 0&&m1.IsEmailAddress||(n1=I1.annotations)!==null&&n1!==void 0&&(o1=n1.Communication)!==null&&o1!==void 0&&o1.IsPhoneNumber)){return"LinkWithQuickViewForm";}if(!i||typeof i==="string"){return"Text";}if(I1.type==="Edm.Stream"){return"File";}if((p1=I1.annotations)!==null&&p1!==void 0&&(q1=p1.UI)!==null&&q1!==void 0&&q1.IsImageURL){return"Avatar";}switch(f1.$Type){case"com.sap.vocabularies.UI.v1.DataPointType":return"DataPoint";case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":if(((r1=f1.Target)===null||r1===void 0?void 0:(s1=r1.$target)===null||s1===void 0?void 0:s1.$Type)==="com.sap.vocabularies.UI.v1.DataPointType"){return"DataPoint";}else if(((t1=f1.Target)===null||t1===void 0?void 0:(u1=t1.$target)===null||u1===void 0?void 0:u1.$Type)==="com.sap.vocabularies.Communication.v1.ContactType"){return"Contact";}break;case"com.sap.vocabularies.UI.v1.DataFieldForAction":case"com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation":return"Button";case"com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":case"com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation":case"com.sap.vocabularies.UI.v1.DataFieldWithAction":return"Link";}if(g1!==null&&g1!==void 0&&(v1=g1.targetEntityType)!==null&&v1!==void 0&&(w1=v1.annotations)!==null&&w1!==void 0&&(x1=w1.Common)!==null&&x1!==void 0&&x1.SemanticKey){var J1=g1.targetEntityType.annotations.Common.SemanticKey;var K1=!J1.every(function(O1){var P1;return(O1===null||O1===void 0?void 0:(P1=O1.$target)===null||P1===void 0?void 0:P1.name)!==I1.name;});if(K1&&h1.semanticKeyStyle){var L1,M1,N1;if((L1=g1.targetEntitySet)!==null&&L1!==void 0&&(M1=L1.annotations)!==null&&M1!==void 0&&(N1=M1.Common)!==null&&N1!==void 0&&N1.DraftRoot){return"SemanticKeyWithDraftIndicator";}return h1.semanticKeyStyle==="ObjectIdentifier"?"ObjectIdentifier":"LabelSemanticKey";}}if(f1.Criticality){return"ObjectStatus";}if((y1=I1.annotations)!==null&&y1!==void 0&&(z1=y1.Measures)!==null&&z1!==void 0&&z1.ISOCurrency&&String(h1.isCurrencyAligned)==="true"){if(h1.measureDisplayMode==="Hidden"){return"Text";}return"AmountWithCurrency";}if((A1=I1.annotations)!==null&&A1!==void 0&&(B1=A1.Communication)!==null&&B1!==void 0&&B1.IsEmailAddress||(C1=I1.annotations)!==null&&C1!==void 0&&(D1=C1.Communication)!==null&&D1!==void 0&&D1.IsPhoneNumber){return"Link";}if((E1=I1.annotations)!==null&&E1!==void 0&&(F1=E1.UI)!==null&&F1!==void 0&&F1.MultiLineText){return"ExpandableText";}if(S(g1,I1)){return"LinkWithQuickViewForm";}if((G1=I1.annotations)!==null&&G1!==void 0&&(H1=G1.Common)!==null&&H1!==void 0&&H1.SemanticObject){return"LinkWrapper";}if(f1.$Type==="com.sap.vocabularies.UI.v1.DataFieldWithUrl"){return"Link";}if(h1.retrieveTextFromValueList===true){return"MdcFieldWithValueHelp";}return"Text";};_.getDisplayStyle=V;var W=function(i,f1,g1){var h1,i1,j1,k1,l1,m1,n1,o1,p1,q1,r1;if(!i||typeof i==="string"){return null;}var s1=j(i)&&i.$target||i;if(s1.type==="Edm.Stream"){return"File";}switch(f1.$Type){case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":if(((h1=f1.Target)===null||h1===void 0?void 0:(i1=h1.$target)===null||i1===void 0?void 0:i1.$Type)==="com.sap.vocabularies.Communication.v1.ContactType"){return null;}else if(((j1=f1.Target)===null||j1===void 0?void 0:(k1=j1.$target)===null||k1===void 0?void 0:k1.Visualization)==="UI.VisualizationType/Rating"){return"RatingIndicator";}break;case"com.sap.vocabularies.UI.v1.DataPointType":if((f1===null||f1===void 0?void 0:f1.Visualization)==="UI.VisualizationType/Rating"){return"RatingIndicator";}break;case"com.sap.vocabularies.UI.v1.DataFieldForAction":case"com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":case"com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation":return null;}var t1=f(s1);var u1=e(s1);if(P.hasValueHelp(s1)&&s1.type!=="Edm.Boolean"||t1&&P.hasValueHelp(t1)||u1&&P.hasValueHelp(u1)){if((g1===null||g1===void 0?void 0:g1.measureDisplayMode)==="Hidden"){return"Input";}return"InputWithValueHelp";}if((l1=s1.annotations)!==null&&l1!==void 0&&(m1=l1.UI)!==null&&m1!==void 0&&(n1=m1.MultiLineText)!==null&&n1!==void 0&&n1.valueOf()&&s1.type==="Edm.String"){return"TextArea";}switch(s1.type){case"Edm.Date":return"DatePicker";case"Edm.Time":case"Edm.TimeOfDay":return"TimePicker";case"Edm.DateTime":case"Edm.DateTimeOffset":return"DateTimePicker";case"Edm.Boolean":return"CheckBox";}if((o1=s1.annotations)!==null&&o1!==void 0&&(p1=o1.Measures)!==null&&p1!==void 0&&p1.ISOCurrency||(q1=s1.annotations)!==null&&q1!==void 0&&(r1=q1.Measures)!==null&&r1!==void 0&&r1.Unit){return"InputWithUnit";}return"Input";};_.getEditStyle=W;var X=function(i,f1){var g1,h1,i1,j1,k1,l1;var m1=i.targetObject;var n1;if(m1){switch(m1.$Type){case"com.sap.vocabularies.UI.v1.DataField":case"com.sap.vocabularies.UI.v1.DataFieldWithUrl":case"com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":case"com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation":case"com.sap.vocabularies.UI.v1.DataFieldWithAction":case"com.sap.vocabularies.UI.v1.DataPointType":n1=m1.Value.$target;break;case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":if((m1===null||m1===void 0?void 0:(g1=m1.Target)===null||g1===void 0?void 0:(h1=g1.$target)===null||h1===void 0?void 0:h1.$Type)==="com.sap.vocabularies.UI.v1.DataPointType"){var o1;n1=(o1=m1.Target.$target)===null||o1===void 0?void 0:o1.Value.$target;break;}case"com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation":case"com.sap.vocabularies.UI.v1.DataFieldForAction":default:n1=undefined;}}var p1=f1!==null&&f1!==void 0&&f1.isAnalytics?b.IsExpanded:q(false);var q1=f1!==null&&f1!==void 0&&f1.isAnalytics?k(b.NodeLevel,0):q(false);return s(m.apply(void 0,[n(k(w(m1===null||m1===void 0?void 0:(i1=m1.annotations)===null||i1===void 0?void 0:(j1=i1.UI)===null||j1===void 0?void 0:j1.Hidden),true)),l(!!n1,n1&&n(k(w((k1=n1.annotations)===null||k1===void 0?void 0:(l1=k1.UI)===null||l1===void 0?void 0:l1.Hidden),true)),true),o(n(p1),q1)]));};_.getVisibleExpression=X;var Y=function(i,f1){var g1=j(i)&&i.$target||i;var h1=e(g1)||f(g1);if(!h1){return s("");}var i1=m(n(c(h1)),n(P.isComputed(h1)));return s(l(i1,"",f1));};_.getInputDescription=Y;var Z=function(i,f1,g1){var h1=arguments.length>3&&arguments[3]!==undefined?arguments[3]:false;var i1=O(i,g1,h1);if(i1===""){i1=N(f1,g1,h1);}return i1;};_.QVTextBinding=Z;var $=function(i){var f1,g1,h1,i1,j1,k1;var l1=i.targetObject;if(l1!==null&&l1!==void 0&&(f1=l1.$target)!==null&&f1!==void 0&&(g1=f1.annotations)!==null&&g1!==void 0&&(h1=g1.Communication)!==null&&h1!==void 0&&h1.IsEmailAddress){return"email";}if(l1!==null&&l1!==void 0&&(i1=l1.$target)!==null&&i1!==void 0&&(j1=i1.annotations)!==null&&j1!==void 0&&(k1=j1.Communication)!==null&&k1!==void 0&&k1.IsPhoneNumber){return"phone";}return"text";};_.getQuickViewType=$;var a1=function(i){var f1=[];if(i){var g1=Object.keys(i).filter(function(j1){return j1==="SemanticObject"||j1.startsWith("SemanticObject#");});for(var h1=0;h1<g1.length;h1++){var i1=s(w(i[g1[h1]]));f1.push({key:(i1===null||i1===void 0?void 0:i1.indexOf("{"))===-1?i1:i1===null||i1===void 0?void 0:i1.split("{")[1].split("}")[0],value:i1});}}return f1;};_.getSemanticObjectExpressionToResolve=a1;var b1=function(i){if(i.length>0){var f1="";var g1="";var h1=[];for(var i1=0;i1<i.length;i1++){f1=i[i1].key;g1=s(w(i[i1].value));h1.push({key:f1,value:g1});}var j1=new J(h1);j1.$$valueAsPromise=true;var k1=j1.createBindingContext("/");return k1;}else{return new J([]).createBindingContext("/");}};_.getSemanticObjects=b1;var c1=function(i,f1,g1){if(i.wrap==="false"){return false;}if(f1!=="Edm.String"){return g1;}if(i.editMode==="Display"){return true;}if(i.editMode.indexOf("{")>-1){return s(o(k(p("/editMode","ui"),q("Display")),g1));}return g1;};_.getMultipleLinesForDataField=c1;var d1=function(i,f1){return i.requestObject("/"+f1+"/DraftAdministrativeData/");};_._getDraftAdministrativeDataType=d1;var e1=function(i,f1){return d1(i.getModel(),f1).then(function(g1){var h1=[];if(g1.InProcessByUserDescription){h1.push(p("DraftAdministrativeData/InProcessByUserDescription"));}h1.push(p("DraftAdministrativeData/InProcessByUser"));if(g1.LastChangedByUserDescription){h1.push(p("DraftAdministrativeData/LastChangedByUserDescription"));}h1.push(p("DraftAdministrativeData/LastChangedByUser"));return s(l(p("HasDraftEntity"),o.apply(void 0,h1),r("")));});};e1.requiresIContext=true;_.getBindingForDraftAdminBlockInline=e1;return _;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/field/FieldTemplating.ts

@@ -27,7 +27,8 @@ import {
 	not,
 	ComplexTypeExpression,
 	equal,
-	or
+	or,
+	resolveBindingString
 } from "sap/fe/core/helpers/BindingExpression";
 import {
 	isPathExpression,
@@ -174,20 +175,16 @@ export const getTextBinding = function(
 		oPropertyDataModelObjectPath.targetObject?.$Type === "com.sap.vocabularies.UI.v1.DataField" ||
 		oPropertyDataModelObjectPath.targetObject?.$Type === "com.sap.vocabularies.UI.v1.DataPointType" ||
 		oPropertyDataModelObjectPath.targetObject?.$Type === "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath" ||
-		oPropertyDataModelObjectPath.targetObject?.$Type === "com.sap.vocabularies.UI.v1.DataFieldWithUrl"
+		oPropertyDataModelObjectPath.targetObject?.$Type === "com.sap.vocabularies.UI.v1.DataFieldWithUrl" ||
+		oPropertyDataModelObjectPath.targetObject?.$Type === "com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation" ||
+		oPropertyDataModelObjectPath.targetObject?.$Type === "com.sap.vocabularies.UI.v1.DataFieldWithAction"
 	) {
 		// If there is no resolved property, the value is returned as a constant
 		const fieldValue = oPropertyDataModelObjectPath.targetObject.Value || "";
 		return compileBinding(constant(fieldValue));
 	}
 	if (isPathExpression(oPropertyDataModelObjectPath.targetObject) && oPropertyDataModelObjectPath.targetObject.$target) {
-		const oNavPath = oPropertyDataModelObjectPath.targetEntityType.resolvePath(oPropertyDataModelObjectPath.targetObject.path, true);
-		oPropertyDataModelObjectPath.targetObject = oNavPath.target;
-		oNavPath.visitedObjects.forEach((oNavObj: any) => {
-			if (oNavObj?._type === "NavigationProperty") {
-				oPropertyDataModelObjectPath.navigationProperties.push(oNavObj);
-			}
-		});
+		oPropertyDataModelObjectPath = enhanceDataModelPath(oPropertyDataModelObjectPath, oPropertyDataModelObjectPath.targetObject.path);
 	}
 	const oBindingExpression = bindingExpression(getContextRelativeTargetObjectPath(oPropertyDataModelObjectPath));
 	let oTargetBinding;
@@ -243,7 +240,11 @@ export const getValueBinding = function(
 			const oPropertyUnit = getAssociatedUnitProperty(oPropertyDataModelObjectPath.targetObject);
 			const oPropertyCurrency = getAssociatedCurrencyProperty(oPropertyDataModelObjectPath.targetObject);
 			if (!ignoreUnit && (oPropertyUnit || oPropertyCurrency)) {
-				oBindingExpression = getBindingWithUnitOrCurrency(oPropertyDataModelObjectPath, oBindingExpression) as any;
+				oBindingExpression = getBindingWithUnitOrCurrency(
+					oPropertyDataModelObjectPath,
+					oBindingExpression,
+					!showMeasureOnly
+				) as any;
 				if (
 					(oPropertyUnit && !hasValueHelp(oPropertyUnit)) ||
 					(oPropertyCurrency && !hasValueHelp(oPropertyCurrency)) ||
@@ -391,6 +392,8 @@ export const getDisplayStyle = function(
 		case "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation":
 			return "Button";
 		case "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":
+		case "com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation":
+		case "com.sap.vocabularies.UI.v1.DataFieldWithAction":
 			return "Link";
 	}
 	if (oDataModelPath?.targetEntityType?.annotations?.Common?.SemanticKey) {
@@ -637,3 +640,57 @@ export const getSemanticObjects = function(aSemObjExprToResolve: any[]): any {
 		return new JSONModel([]).createBindingContext("/");
 	}
 };
+
+/**
+ * Method to get MultipleLines for a DataField.
+ *
+ * @name getMultipleLinesForDataField
+ * @param {any} oThis The current object
+ * @param {string} sPropertyType The property type
+ * @param {boolean} isMultiLineText The property isMultiLineText
+ * @returns {BindingExpression<string>} The binding expression to determine if a data field should be a MultiLineText or not
+ *
+ * @public
+ */
+
+export const getMultipleLinesForDataField = function(oThis: any, sPropertyType: string, isMultiLineText: boolean): any {
+	if (oThis.wrap === "false") {
+		return false;
+	}
+	if (sPropertyType !== "Edm.String") {
+		return isMultiLineText;
+	}
+	if (oThis.editMode === "Display") {
+		return true;
+	}
+	if (oThis.editMode.indexOf("{") > -1) {
+		// If the editMode is computed then we just care about the page editMode to determine if the multiline property should be taken into account
+		return compileBinding(or(equal(bindingExpression("/editMode", "ui"), constant("Display")), isMultiLineText));
+	}
+	return isMultiLineText;
+};
+
+export const _getDraftAdministrativeDataType = function(oMetaModel: any, sEntityType: string) {
+	return oMetaModel.requestObject("/" + sEntityType + "/DraftAdministrativeData/");
+};
+
+export const getBindingForDraftAdminBlockInline = function(iContext: any, sEntityType: string): BindingExpression<string> {
+	return _getDraftAdministrativeDataType(iContext.getModel(), sEntityType).then(function(oDADEntityType: any) {
+		const aBindings = [];
+
+		if (oDADEntityType.InProcessByUserDescription) {
+			aBindings.push(bindingExpression("DraftAdministrativeData/InProcessByUserDescription"));
+		}
+
+		aBindings.push(bindingExpression("DraftAdministrativeData/InProcessByUser"));
+
+		if (oDADEntityType.LastChangedByUserDescription) {
+			aBindings.push(bindingExpression("DraftAdministrativeData/LastChangedByUserDescription"));
+		}
+
+		aBindings.push(bindingExpression("DraftAdministrativeData/LastChangedByUser"));
+
+		return compileBinding(ifElse(bindingExpression("HasDraftEntity"), or(...aBindings), resolveBindingString("")));
+	});
+};
+getBindingForDraftAdminBlockInline.requiresIContext = true;

package/packages/sap.fe.macros/src/sap/fe/macros/field/QuickViewLinkDelegate-dbg.js

@@ -476,7 +476,6 @@ sap.ui.define(
 						);
 					}
 					return newLinksPromise.then(function(aLinks) {
-						var oContext;
 						aLinkItems = aLinks;
 						var oNavigationService = oAppComponent.getNavigationService();
 						var oController = oView.getController();
@@ -487,8 +486,10 @@ sap.ui.define(
 							SapBaseLog.error("QuickViewLinkDelegate: Service 'URLParsing' could not be obtained");
 							return Promise.reject();
 						}
-						if (oView.getAggregation("content")[0] && oView.getAggregation("content")[0].getBindingContext()) {
-							oContext = oView.getAggregation("content")[0].getBindingContext();
+						if (!mLineContext) {
+							if (oView.getAggregation("content")[0] && oView.getAggregation("content")[0].getBindingContext()) {
+								mLineContext = oView.getAggregation("content")[0].getBindingContext();
+							}
 						}
 						var sMetaPath = oMetaModel.getMetaPath(mLineContext.getPath());
 						mLineContextData = oController._intentBasedNavigation.removeSensitiveData(mLineContext.getObject(), sMetaPath);
@@ -519,20 +520,12 @@ sap.ui.define(
 										aLinkItems.map(function(oLinkItem) {
 											return oShellServices.expandCompactHash(oLinkItem.getHref()).then(function(sHash) {
 												oShellHash = oShellServices.parseShellHash(sHash);
-												var _oContext = oContext === undefined ? mLineContext : oContext;
-												var aNewParams = [
-													{
-														contextData: oShellHash.params,
-														entitySet: oMetaModel.getMetaPath(_oContext.getPath()).replace(/^\/*/, "")
-													}
-												];
-												aNewParams = CommonUtils.removeSensitiveData(aNewParams, oMetaModel);
 												oNewShellHash = {
 													target: {
 														semanticObject: oShellHash.semanticObject,
 														action: oShellHash.action
 													},
-													params: Object.assign(oParams, aNewParams[0]),
+													params: oParams,
 													appStateKey: sAppStateKey
 												};
 												delete oNewShellHash.params["sap-xapp-state"];

package/packages/sap.fe.macros/src/sap/fe/macros/field/QuickViewLinkDelegate.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/link/Panel","sap/ui/mdc/link/PanelItem","sap/ui/mdc/LinkDelegate","sap/ui/mdc/link/LinkItem","sap/ui/mdc/link/Factory","sap/ui/mdc/link/Log","sap/base/Log","sap/ui/core/util/XMLPreprocessor","sap/ui/core/XMLTemplateProcessor","sap/ui/core/Fragment","sap/fe/macros/field/FieldHelper","sap/base/util/isPlainObject","sap/ui/mdc/link/SemanticObjectMapping","sap/ui/mdc/link/SemanticObjectMappingItem","sap/ui/mdc/link/SemanticObjectUnavailableAction","sap/base/util/merge","sap/fe/navigation/SelectionVariant","sap/fe/core/CommonUtils","sap/ui/model/json/JSONModel","sap/ui/fl/Utils","sap/ui/util/openWindow","sap/fe/macros/CommonHelper","sap/fe/core/helpers/KeepAliveHelper"],function(P,a,L,b,F,c,S,X,d,e,f,g,h,k,l,m,o,C,J,U,p,q,K){"use strict";var r=Object.assign({},L);var s={iLinksShownInPopup:3,sapmLink:"sap.m.Link",sapuimdcLink:"sap.ui.mdc.Link",sapmObjectIdentifier:"sap.m.ObjectIdentifier"};r.getConstants=function(){return s;};r._getEntityType=function(i,M){if(M){return M.createBindingContext(i.entityType);}else{return undefined;}};r._getSemanticsModel=function(i,M){if(M){return new J(i);}else{return undefined;}};r._getDataField=function(i,M){return M.createBindingContext(i.dataField);};r._getContact=function(i,M){return M.createBindingContext(i.contact);};r.fnTemplateFragment=function(){var t=this;var i;var j={};var n;if(this.resolvedpayload){n=this.resolvedpayload;}else{n=this.payLoad;}if(n&&!n.LinkId){n.LinkId=this.oControl&&this.oControl.isA(s.sapuimdcLink)?this.oControl.getId():undefined;}var u=this._getSemanticsModel(n,this.oMetaModel);if(n.entityType&&this._getEntityType(n,this.oMetaModel)){i="sap.fe.macros.field.QuickViewLinkForEntity";j.bindingContexts={"entityType":this._getEntityType(n,this.oMetaModel),"semantic":u.createBindingContext("/")};j.models={"entityType":this.oMetaModel,"semantic":u};}else if(n.dataField&&this._getDataField(n,this.oMetaModel)){i="sap.fe.macros.field.QuickViewLinkForDataField";j.bindingContexts={"dataField":this._getDataField(n,this.oMetaModel),"semantic":u.createBindingContext("/")};j.models={"dataField":this.oMetaModel,"semantic":u};}else if(n.contact&&this._getContact(n,this.oMetaModel)){i="sap.fe.macros.field.QuickViewLinkForContact";j.bindingContexts={"contact":this._getContact(n,this.oMetaModel)};j.models={"contact":this.oMetaModel};}j.models.entitySet=this.oMetaModel;j.models.metaModel=this.oMetaModel;if(this.oControl&&this.oControl.getModel("viewData")){j.models.viewData=this.oControl.getModel("viewData");j.bindingContexts.viewData=this.oControl.getModel("viewData").createBindingContext("/");}var v=d.loadTemplate(i,"fragment");return Promise.resolve(X.process(v,{name:i},j)).then(function(_){return e.load({definition:_,controller:t});}).then(function(w){if(w){if(j.models&&j.models.semantic){w.setModel(j.models.semantic,"semantic");w.setBindingContext(j.bindingContexts.semantic,"semantic");}if(j.bindingContexts&&j.bindingContexts.entityType){w.setModel(j.models.entityType,"entityType");w.setBindingContext(j.bindingContexts.entityType,"entityType");}}t.resolvedpayload=undefined;return w;});};r.onPressTitleLink=function(E){if(E.getParameter("target")!=="_blank"){var u=F.getService("URLParsing");var t=E.getSource();var H=t.getHref();var T=H?u.parseShellHash(H):undefined;var I=T&&T.semanticObject&&T.action&&T.semanticObject+"-"+T.action;var j=E.getSource().getCustomData()[0].getValue();for(var i=0;i<j.length;i++){if(j[i].key===I){t.setHref(j[i].href);break;}}var v=sap.ui.fl.Utils.getViewForControl(t);var A=C.getAppComponent(v);var n=v.getController();var w=n&&n.getView();E.preventDefault();this.beforeNavigationCallback(E).then(function(N){if(N){var x=u.parseShellHash(H);var y=A.getShellServices();var z={target:{semanticObject:x.semanticObject,action:x.action},params:x.params};if(C.isStickyEditMode(w)!==true){y.toExternal(z,A);}else{var B=y.hrefForExternal(z,A,false);p(B);}}}).catch(function(x){S.error("Error while resolving field value",x);});}};r.fetchAdditionalContent=function(i,B,j){this.oControl=j||B;this.payLoad=i;if(B&&(B.isA("sap.ui.model.odata.v4.Context")||B.isA(s.sapuimdcLink))){this.oMetaModel=B.getModel().getMetaModel();return this.fnTemplateFragment().then(function(n){return[n];});}return Promise.resolve([]);};r._fetchLinkCustomData=function(_){if(_.isA(s.sapuimdcLink)&&(_.getParent().isA(s.sapmLink)||_.getParent().isA(s.sapmObjectIdentifier))){return _.getParent().getCustomData();}else{return undefined;}};r.fetchLinkItems=function(i,B,I){if(B&&r._getSemanticObjects(i)){var j=B.getObject();if(I){I.initialize(r._getSemanticObjects(i));}this.aLinkCustomData=this._link&&this._fetchLinkCustomData(this._link).map(function(v){return v.mProperties.value;});var n=r._calculateSemanticAttributes(j,i,I,this._link);var t=n.results;var u=n.payload;return r._retrieveNavigationTargets("",t,u,I,this._link).then(function(v,O){return v.length===0?null:v;});}else{return Promise.resolve(null);}};r.fetchLinkType=function(j,n){var t=this;var _=n;var u=[];var v={semanticObjects:[],semanticObjectsResolved:[]};var w=Object.assign({},j);var D={initialType:{type:2,directLink:undefined},runtimeType:undefined};return new Promise(function(x){if(w){if(w.semanticObjects){t._link=n;var y,z,A,B={};var E=function(I){v.semanticObjects.push(I);return v;};var G=n.getParent().getCustomData();for(var H=0;H<G.length;H++){y=G[H].getKey();B[y]={value:G[H].getValue()};}for(var i=0;i<w.semanticObjects.length;i++){A=w.semanticObjects[i];if(A&&A.indexOf("{")===0&&A.indexOf("}")===A.length-1){z=A.substr(1,A.indexOf("}")-1);if(B[z]){A=B[z].value;u.push(Promise.resolve(A));}}u.push(Promise.resolve(A));}return Promise.all(u).then(function(I){if(I&&I.length>0){I.forEach(E);}return _.retrieveLinkItems();}).then(function(I){var M=I;var N;var O;if(M&&M.length===1){N=new b({text:M[0].getText(),href:M[0].getHref()});}if(M.length===1&&N){O=1;}else if(w.entityType&&w.navigationPath){O=2;}else if(M.length===0){O=0;}else{O=2;}x({initialType:{type:O,directLink:N?N:undefined},runtimeType:undefined});});}else if(w.contact&&w.contact.length>0){x(D);}else if(w.entityType&&w.navigationPath){x(D);}}else{throw new Error("no payload or semanticObjects found");}return undefined;}).catch(function(E){S.error("Error in SimpleLinkDelegate.fetchLinkType",E);});};r.modifyLinkItems=function(i,B,j){if(j.length!==0){var n=j[0].getParent();var v=sap.ui.fl.Utils.getViewForControl(n);var M=v.getModel().getMetaModel();var A=C.getAppComponent(v);var t=n.getBindingContext();var u;var T={semanticObject:i.mainSemanticObject,action:""};var w=this;return new Promise(function(x){var y=Promise.resolve(j);var N=n&&w._fetchLinkCustomData(n).map(function(G){return G.mProperties.value;});if(N&&w.aLinkCustomData&&w.aLinkCustomData.filter(function(G){return(N.filter(function(H){return H!==G;}).length>0);}).length>0){var z=r._calculateSemanticAttributes(B.getObject(),i,undefined,w._link);var D=z.results;var E=z.payload;y=r._retrieveNavigationTargets("",D,E,undefined,w._link);}return y.then(function(G){var H;j=G;var I=A.getNavigationService();var O=v.getController();var Q;var R;u=A.getShellServices();if(!u.hasUShell()){S.error("QuickViewLinkDelegate: Service 'URLParsing' could not be obtained");return Promise.reject();}if(v.getAggregation("content")[0]&&v.getAggregation("content")[0].getBindingContext()){H=v.getAggregation("content")[0].getBindingContext();}var V=M.getMetaPath(t.getPath());R=O._intentBasedNavigation.removeSensitiveData(t.getObject(),V);R=O._intentBasedNavigation.prepareContextForExternalNavigation(R,t);Q=I.mixAttributesAndSelectionVariant(R.semanticAttributes,new o());T.propertiesWithoutConflict=R.propertiesWithoutConflict;v.getController().intentBasedNavigation.adaptNavigationContext(Q,T);r._removeTechnicalParameters(Q);if(v.getViewData().entitySet&&Q){var W=I.constructContextUrl(v.getViewData().entitySet,v.getModel());Q.setFilterContextUrl(W);}return I.getAppStateKeyAndUrlParameters(Q.toJSONString()).then(function(Y,Z){var $=Z;i.aSemanticLinks=[];var _,a1;x(Promise.all(j.map(function(b1){return u.expandCompactHash(b1.getHref()).then(function(c1){_=u.parseShellHash(c1);var d1=H===undefined?t:H;var e1=[{contextData:_.params,entitySet:M.getMetaPath(d1.getPath()).replace(/^\/*/,"")}];e1=C.removeSensitiveData(e1,M);a1={target:{semanticObject:_.semanticObject,action:_.action},params:Object.assign(Y,e1[0]),appStateKey:$};delete a1.params["sap-xapp-state"];b1.setHref("#"+u.constructShellHash(a1));i.aSemanticLinks.push(b1.getHref());return b1;});})));});});}).catch(function(E){S.error("Error while getting the navigation service",E);});}else{return Promise.resolve(j);}};r.beforeNavigationCallback=function(i,E){var j=E.getSource(),H=E.getParameter("href"),u=F.getService("URLParsing"),n=H&&u.parseShellHash(H);K.storeControlRefreshStrategyForHash(j,n);return Promise.resolve(true);};r._removeTechnicalParameters=function(i){i.removeSelectOption("@odata.context");i.removeSelectOption("@odata.metadataEtag");i.removeSelectOption("SAP__Messages");};r._calculateSemanticAttributes=function(n,t,I,u){var v,w,_,x={};var y={semanticObjects:[],semanticObjectsResolved:[]};var O,z;var A=u&&this._fetchLinkCustomData(u);if(t.semanticObjects){if(A&&A.length>0){for(var B=0;B<A.length;B++){v=A[B].getKey();z=A[B].getValue();x[v]={value:z};}for(var i=0;i<t.semanticObjects.length;i++){w=t.semanticObjects[i];if(w&&w.indexOf("{")===0&&w.indexOf("}")===w.length-1){_=w.substr(1,w.indexOf("}")-1);w=x[_].value;if(t.mainSemanticObject&&t.mainSemanticObject.split(_).length===2&&t.mainSemanticObject.split(_)[0]==="{"&&t.mainSemanticObject.split(_)[1]==="}"){if(w){y.mainSemanticObject=w;}else{y.mainSemanticObject=undefined;}}if(w&&typeof w==="string"){y.semanticObjectsResolved.push(w?w:undefined);y.semanticObjects.push(w?w:undefined);}else if(Array.isArray(w)){for(var j=0;j<w.length;j++){y.semanticObjectsResolved.push(w[j]?w[j]:undefined);y.semanticObjects.push(w[j]?w[j]:undefined);}}}else{y.semanticObjects.push(w);}}if(y.semanticObjectsResolved.length>0){O={};O.entityType=t.entityType;O.dataField=t.dataField;O.contact=t.contact;O.mainSemanticObject=t.mainSemanticObject;O.navigationPath=t.navigationPath;O.propertyPathLabel=t.propertyPathLabel;O.semanticObjectMappings=t.semanticObjectMappings.slice();O.semanticObjectUnavailableActions=t.semanticObjectUnavailableActions.slice();O.semanticObjects=y.semanticObjects;O.semanticPrimaryActions=t.semanticPrimaryActions.slice();if(y.mainSemanticObject){O.mainSemanticObject=y.mainSemanticObject;}else{O.mainSemanticObject=undefined;}for(var N=0;N<y.semanticObjects.length;N++){if(O.mainSemanticObject===y.semanticObjectsResolved[N]){O.mainSemanticObject=y.semanticObjects[N];}if(!!O.semanticObjectMappings&&O.semanticObjectMappings.length>0){O.semanticObjectMappings[N]={semanticObject:y.semanticObjects[N],items:O.semanticObjectMappings[N].items};}if(O.semanticObjects[N]){O.semanticObjects[N]=y.semanticObjects[N];}else{O.semanticObjects.splice(N,1);}}for(var M=0;M<O.semanticObjectMappings.length;M++){if(O.semanticObjectMappings[M]&&O.semanticObjectMappings[M].semanticObject===undefined){O.semanticObjectMappings.splice(M,1);}}this.resolvedpayload=Object.assign({},O);}}}var D=O?O:t;var E=r._getSemanticObjects(D);var G=r._convertSemanticObjectMapping(r._getSemanticObjectMappings(D));if(!E.length){E.push("");}var R={};E.forEach(function(H){if(I){I.addContextObject(H,n);}R[H]={};for(var Q in n){var T=null,V=null;if(I){T=I.getSemanticObjectAttribute(H,Q);if(!T){T=I.createAttributeStructure();I.addSemanticObjectAttribute(H,Q,T);}}if(n[Q]===undefined||n[Q]===null){if(T){T.transformations.push({value:undefined,description:"\u2139 Undefined and null values have been removed in SimpleLinkDelegate."});}continue;}if(g(n[Q])){if(G&&G[H]){var W=Object.keys(G[H]);var Y,Z,$,a1;for(var b1=0;b1<W.length;b1++){a1=W[b1];if(a1.indexOf(Q)===0){Y=G[H][a1];Z=a1.split("/")[a1.split("/").length-1];$=n[Q][Z];if(Y&&Z&&$){R[H][Y]=$;}}}}if(T){T.transformations.push({value:undefined,description:"\u2139 Plain objects has been removed in SimpleLinkDelegate."});}continue;}var c1=G&&G[H]&&G[H][Q]?G[H][Q]:Q;if(T&&Q!==c1){V={value:undefined,description:"\u2139 The attribute "+Q+" has been renamed to "+c1+" in SimpleLinkDelegate.",reason:"\ud83d\udd34 A com.sap.vocabularies.Common.v1.SemanticObjectMapping annotation is defined for semantic object "+H+" with source attribute "+Q+" and target attribute "+c1+". You can modify the annotation if the mapping result is not what you expected."};}if(R[H][c1]){S.error("SimpleLinkDelegate: The attribute "+Q+" can not be renamed to the attribute "+c1+" due to a clash situation. This can lead to wrong navigation later on.");}R[H][c1]=n[Q];if(T){if(V){T.transformations.push(V);var d1=I.createAttributeStructure();d1.transformations.push({value:n[Q],description:"\u2139 The attribute "+c1+" with the value "+n[Q]+" has been added due to a mapping rule regarding the attribute "+Q+" in SimpleLinkDelegate."});I.addSemanticObjectAttribute(H,c1,d1);}}}});return{payload:D,results:R};};r._retrieveNavigationTargets=function(A,t,u,I,v){if(!u.semanticObjects){return Promise.resolve([]);}var T=this;var w=u.semanticObjects;var N={ownNavigation:undefined,availableActions:[]};var x=0;return sap.ui.getCore().loadLibrary("sap.ui.fl",{async:true}).then(function(){return new Promise(function(y){sap.ui.require(["sap/ui/fl/Utils"],function(U){var z=U.getAppComponentForControl(v===undefined?T.oControl:v);var B=z?z.getShellServices():null;if(!B){return y(N.availableActions,N.ownNavigation);}if(!B.hasUShell()){S.error("SimpleLinkDelegate: Service 'CrossApplicationNavigation' or 'URLParsing' could not be obtained");return y(N.availableActions,N.ownNavigation);}var D=w.map(function(i){return[{semanticObject:i,params:t?t[i]:undefined,appStateKey:A,sortResultsBy:"text"}];});return B.getLinks(D).then(function(E){var H=false;for(var i=0;i<E.length;i++){for(var j=0;j<E[i].length;j++){if(E[i][j].length>0){H=true;break;}if(H){break;}}}if(!E||!E.length||!H){return y(N.availableActions,N.ownNavigation);}var G=r._getSemanticObjectUnavailableActions(u);var M=r._convertSemanticObjectUnavailableAction(G);var O=C.getHash();if(O&&O.indexOf("?")!==-1){O=O.split("?")[0];}if(O){O+="?";}var Q=function(W,Y){return(!!M&&!!M[W]&&M[W].indexOf(Y)>-1);};var R=function(_){var W=B.parseShellHash(_.intent);if(Q(W.semanticObject,W.action)){return;}var Y="#"+B.constructShellHash({target:{shellHash:_.intent}});if(_.intent&&_.intent.indexOf(O)===0){N.ownNavigation=new b({href:Y,text:_.text});return;}var Z=new b({key:W.semanticObject&&W.action?W.semanticObject+"-"+W.action:undefined,text:_.text,description:undefined,href:Y,icon:undefined,initiallyVisible:_.tags&&_.tags.indexOf("superiorAction")>-1});if(Z.getProperty("initiallyVisible")){x++;}N.availableActions.push(Z);if(I){I.addSemanticObjectIntent(W.semanticObject,{intent:Z.getHref(),text:Z.getText()});}};for(var n=0;n<w.length;n++){E[n][0].forEach(R);}if(x===0){for(var V=0;V<N.availableActions.length;V++){if(V<T.getConstants().iLinksShownInPopup){N.availableActions[V].setProperty("initiallyVisible",true);}else{break;}}}return y(N.availableActions,N.ownNavigation);},function(){S.error("SimpleLinkDelegate: '_retrieveNavigationTargets' failed executing getLinks method");return y(N.availableActions,N.ownNavigation);});});});});};r._getSemanticObjects=function(i){return i.semanticObjects?i.semanticObjects:[];};r._getSemanticObjectUnavailableActions=function(i){var j=[];if(i.semanticObjectUnavailableActions){i.semanticObjectUnavailableActions.forEach(function(n){j.push(new l({semanticObject:n.semanticObject,actions:n.actions}));});}return j;};r._getSemanticObjectMappings=function(i){var j=[];var n=[];if(i.semanticObjectMappings){i.semanticObjectMappings.forEach(function(t){n=[];if(t.items){t.items.forEach(function(u){n.push(new k({key:u.key,value:u.value}));});}j.push(new h({semanticObject:t.semanticObject,items:n}));});}return j;};r._convertSemanticObjectMapping=function(i){if(!i.length){return undefined;}var j={};i.forEach(function(n){if(!n.getSemanticObject()){throw Error("SimpleLinkDelegate: 'semanticObject' property with value '"+n.getSemanticObject()+"' is not valid");}j[n.getSemanticObject()]=n.getItems().reduce(function(M,I){M[I.getKey()]=I.getValue();return M;},{});});return j;};r._convertSemanticObjectUnavailableAction=function(i){if(!i.length){return undefined;}var j={};i.forEach(function(n){if(!n.getSemanticObject()){throw Error("SimpleLinkDelegate: 'semanticObject' property with value '"+n.getSemanticObject()+"' is not valid");}j[n.getSemanticObject()]=n.getActions();});return j;};return r;},true);
+sap.ui.define(["sap/ui/mdc/link/Panel","sap/ui/mdc/link/PanelItem","sap/ui/mdc/LinkDelegate","sap/ui/mdc/link/LinkItem","sap/ui/mdc/link/Factory","sap/ui/mdc/link/Log","sap/base/Log","sap/ui/core/util/XMLPreprocessor","sap/ui/core/XMLTemplateProcessor","sap/ui/core/Fragment","sap/fe/macros/field/FieldHelper","sap/base/util/isPlainObject","sap/ui/mdc/link/SemanticObjectMapping","sap/ui/mdc/link/SemanticObjectMappingItem","sap/ui/mdc/link/SemanticObjectUnavailableAction","sap/base/util/merge","sap/fe/navigation/SelectionVariant","sap/fe/core/CommonUtils","sap/ui/model/json/JSONModel","sap/ui/fl/Utils","sap/ui/util/openWindow","sap/fe/macros/CommonHelper","sap/fe/core/helpers/KeepAliveHelper"],function(P,a,L,b,F,c,S,X,d,e,f,g,h,k,l,m,o,C,J,U,p,q,K){"use strict";var r=Object.assign({},L);var s={iLinksShownInPopup:3,sapmLink:"sap.m.Link",sapuimdcLink:"sap.ui.mdc.Link",sapmObjectIdentifier:"sap.m.ObjectIdentifier"};r.getConstants=function(){return s;};r._getEntityType=function(i,M){if(M){return M.createBindingContext(i.entityType);}else{return undefined;}};r._getSemanticsModel=function(i,M){if(M){return new J(i);}else{return undefined;}};r._getDataField=function(i,M){return M.createBindingContext(i.dataField);};r._getContact=function(i,M){return M.createBindingContext(i.contact);};r.fnTemplateFragment=function(){var t=this;var i;var j={};var n;if(this.resolvedpayload){n=this.resolvedpayload;}else{n=this.payLoad;}if(n&&!n.LinkId){n.LinkId=this.oControl&&this.oControl.isA(s.sapuimdcLink)?this.oControl.getId():undefined;}var u=this._getSemanticsModel(n,this.oMetaModel);if(n.entityType&&this._getEntityType(n,this.oMetaModel)){i="sap.fe.macros.field.QuickViewLinkForEntity";j.bindingContexts={"entityType":this._getEntityType(n,this.oMetaModel),"semantic":u.createBindingContext("/")};j.models={"entityType":this.oMetaModel,"semantic":u};}else if(n.dataField&&this._getDataField(n,this.oMetaModel)){i="sap.fe.macros.field.QuickViewLinkForDataField";j.bindingContexts={"dataField":this._getDataField(n,this.oMetaModel),"semantic":u.createBindingContext("/")};j.models={"dataField":this.oMetaModel,"semantic":u};}else if(n.contact&&this._getContact(n,this.oMetaModel)){i="sap.fe.macros.field.QuickViewLinkForContact";j.bindingContexts={"contact":this._getContact(n,this.oMetaModel)};j.models={"contact":this.oMetaModel};}j.models.entitySet=this.oMetaModel;j.models.metaModel=this.oMetaModel;if(this.oControl&&this.oControl.getModel("viewData")){j.models.viewData=this.oControl.getModel("viewData");j.bindingContexts.viewData=this.oControl.getModel("viewData").createBindingContext("/");}var v=d.loadTemplate(i,"fragment");return Promise.resolve(X.process(v,{name:i},j)).then(function(_){return e.load({definition:_,controller:t});}).then(function(w){if(w){if(j.models&&j.models.semantic){w.setModel(j.models.semantic,"semantic");w.setBindingContext(j.bindingContexts.semantic,"semantic");}if(j.bindingContexts&&j.bindingContexts.entityType){w.setModel(j.models.entityType,"entityType");w.setBindingContext(j.bindingContexts.entityType,"entityType");}}t.resolvedpayload=undefined;return w;});};r.onPressTitleLink=function(E){if(E.getParameter("target")!=="_blank"){var u=F.getService("URLParsing");var t=E.getSource();var H=t.getHref();var T=H?u.parseShellHash(H):undefined;var I=T&&T.semanticObject&&T.action&&T.semanticObject+"-"+T.action;var j=E.getSource().getCustomData()[0].getValue();for(var i=0;i<j.length;i++){if(j[i].key===I){t.setHref(j[i].href);break;}}var v=sap.ui.fl.Utils.getViewForControl(t);var A=C.getAppComponent(v);var n=v.getController();var w=n&&n.getView();E.preventDefault();this.beforeNavigationCallback(E).then(function(N){if(N){var x=u.parseShellHash(H);var y=A.getShellServices();var z={target:{semanticObject:x.semanticObject,action:x.action},params:x.params};if(C.isStickyEditMode(w)!==true){y.toExternal(z,A);}else{var B=y.hrefForExternal(z,A,false);p(B);}}}).catch(function(x){S.error("Error while resolving field value",x);});}};r.fetchAdditionalContent=function(i,B,j){this.oControl=j||B;this.payLoad=i;if(B&&(B.isA("sap.ui.model.odata.v4.Context")||B.isA(s.sapuimdcLink))){this.oMetaModel=B.getModel().getMetaModel();return this.fnTemplateFragment().then(function(n){return[n];});}return Promise.resolve([]);};r._fetchLinkCustomData=function(_){if(_.isA(s.sapuimdcLink)&&(_.getParent().isA(s.sapmLink)||_.getParent().isA(s.sapmObjectIdentifier))){return _.getParent().getCustomData();}else{return undefined;}};r.fetchLinkItems=function(i,B,I){if(B&&r._getSemanticObjects(i)){var j=B.getObject();if(I){I.initialize(r._getSemanticObjects(i));}this.aLinkCustomData=this._link&&this._fetchLinkCustomData(this._link).map(function(v){return v.mProperties.value;});var n=r._calculateSemanticAttributes(j,i,I,this._link);var t=n.results;var u=n.payload;return r._retrieveNavigationTargets("",t,u,I,this._link).then(function(v,O){return v.length===0?null:v;});}else{return Promise.resolve(null);}};r.fetchLinkType=function(j,n){var t=this;var _=n;var u=[];var v={semanticObjects:[],semanticObjectsResolved:[]};var w=Object.assign({},j);var D={initialType:{type:2,directLink:undefined},runtimeType:undefined};return new Promise(function(x){if(w){if(w.semanticObjects){t._link=n;var y,z,A,B={};var E=function(I){v.semanticObjects.push(I);return v;};var G=n.getParent().getCustomData();for(var H=0;H<G.length;H++){y=G[H].getKey();B[y]={value:G[H].getValue()};}for(var i=0;i<w.semanticObjects.length;i++){A=w.semanticObjects[i];if(A&&A.indexOf("{")===0&&A.indexOf("}")===A.length-1){z=A.substr(1,A.indexOf("}")-1);if(B[z]){A=B[z].value;u.push(Promise.resolve(A));}}u.push(Promise.resolve(A));}return Promise.all(u).then(function(I){if(I&&I.length>0){I.forEach(E);}return _.retrieveLinkItems();}).then(function(I){var M=I;var N;var O;if(M&&M.length===1){N=new b({text:M[0].getText(),href:M[0].getHref()});}if(M.length===1&&N){O=1;}else if(w.entityType&&w.navigationPath){O=2;}else if(M.length===0){O=0;}else{O=2;}x({initialType:{type:O,directLink:N?N:undefined},runtimeType:undefined});});}else if(w.contact&&w.contact.length>0){x(D);}else if(w.entityType&&w.navigationPath){x(D);}}else{throw new Error("no payload or semanticObjects found");}return undefined;}).catch(function(E){S.error("Error in SimpleLinkDelegate.fetchLinkType",E);});};r.modifyLinkItems=function(i,B,j){if(j.length!==0){var n=j[0].getParent();var v=sap.ui.fl.Utils.getViewForControl(n);var M=v.getModel().getMetaModel();var A=C.getAppComponent(v);var t=n.getBindingContext();var u;var T={semanticObject:i.mainSemanticObject,action:""};var w=this;return new Promise(function(x){var y=Promise.resolve(j);var N=n&&w._fetchLinkCustomData(n).map(function(G){return G.mProperties.value;});if(N&&w.aLinkCustomData&&w.aLinkCustomData.filter(function(G){return(N.filter(function(H){return H!==G;}).length>0);}).length>0){var z=r._calculateSemanticAttributes(B.getObject(),i,undefined,w._link);var D=z.results;var E=z.payload;y=r._retrieveNavigationTargets("",D,E,undefined,w._link);}return y.then(function(G){j=G;var H=A.getNavigationService();var I=v.getController();var O;var Q;u=A.getShellServices();if(!u.hasUShell()){S.error("QuickViewLinkDelegate: Service 'URLParsing' could not be obtained");return Promise.reject();}if(!t){if(v.getAggregation("content")[0]&&v.getAggregation("content")[0].getBindingContext()){t=v.getAggregation("content")[0].getBindingContext();}}var R=M.getMetaPath(t.getPath());Q=I._intentBasedNavigation.removeSensitiveData(t.getObject(),R);Q=I._intentBasedNavigation.prepareContextForExternalNavigation(Q,t);O=H.mixAttributesAndSelectionVariant(Q.semanticAttributes,new o());T.propertiesWithoutConflict=Q.propertiesWithoutConflict;v.getController().intentBasedNavigation.adaptNavigationContext(O,T);r._removeTechnicalParameters(O);if(v.getViewData().entitySet&&O){var V=H.constructContextUrl(v.getViewData().entitySet,v.getModel());O.setFilterContextUrl(V);}return H.getAppStateKeyAndUrlParameters(O.toJSONString()).then(function(W,Y){var Z=Y;i.aSemanticLinks=[];var $,_;x(Promise.all(j.map(function(a1){return u.expandCompactHash(a1.getHref()).then(function(b1){$=u.parseShellHash(b1);_={target:{semanticObject:$.semanticObject,action:$.action},params:W,appStateKey:Z};delete _.params["sap-xapp-state"];a1.setHref("#"+u.constructShellHash(_));i.aSemanticLinks.push(a1.getHref());return a1;});})));});});}).catch(function(E){S.error("Error while getting the navigation service",E);});}else{return Promise.resolve(j);}};r.beforeNavigationCallback=function(i,E){var j=E.getSource(),H=E.getParameter("href"),u=F.getService("URLParsing"),n=H&&u.parseShellHash(H);K.storeControlRefreshStrategyForHash(j,n);return Promise.resolve(true);};r._removeTechnicalParameters=function(i){i.removeSelectOption("@odata.context");i.removeSelectOption("@odata.metadataEtag");i.removeSelectOption("SAP__Messages");};r._calculateSemanticAttributes=function(n,t,I,u){var v,w,_,x={};var y={semanticObjects:[],semanticObjectsResolved:[]};var O,z;var A=u&&this._fetchLinkCustomData(u);if(t.semanticObjects){if(A&&A.length>0){for(var B=0;B<A.length;B++){v=A[B].getKey();z=A[B].getValue();x[v]={value:z};}for(var i=0;i<t.semanticObjects.length;i++){w=t.semanticObjects[i];if(w&&w.indexOf("{")===0&&w.indexOf("}")===w.length-1){_=w.substr(1,w.indexOf("}")-1);w=x[_].value;if(t.mainSemanticObject&&t.mainSemanticObject.split(_).length===2&&t.mainSemanticObject.split(_)[0]==="{"&&t.mainSemanticObject.split(_)[1]==="}"){if(w){y.mainSemanticObject=w;}else{y.mainSemanticObject=undefined;}}if(w&&typeof w==="string"){y.semanticObjectsResolved.push(w?w:undefined);y.semanticObjects.push(w?w:undefined);}else if(Array.isArray(w)){for(var j=0;j<w.length;j++){y.semanticObjectsResolved.push(w[j]?w[j]:undefined);y.semanticObjects.push(w[j]?w[j]:undefined);}}}else{y.semanticObjects.push(w);}}if(y.semanticObjectsResolved.length>0){O={};O.entityType=t.entityType;O.dataField=t.dataField;O.contact=t.contact;O.mainSemanticObject=t.mainSemanticObject;O.navigationPath=t.navigationPath;O.propertyPathLabel=t.propertyPathLabel;O.semanticObjectMappings=t.semanticObjectMappings.slice();O.semanticObjectUnavailableActions=t.semanticObjectUnavailableActions.slice();O.semanticObjects=y.semanticObjects;O.semanticPrimaryActions=t.semanticPrimaryActions.slice();if(y.mainSemanticObject){O.mainSemanticObject=y.mainSemanticObject;}else{O.mainSemanticObject=undefined;}for(var N=0;N<y.semanticObjects.length;N++){if(O.mainSemanticObject===y.semanticObjectsResolved[N]){O.mainSemanticObject=y.semanticObjects[N];}if(!!O.semanticObjectMappings&&O.semanticObjectMappings.length>0){O.semanticObjectMappings[N]={semanticObject:y.semanticObjects[N],items:O.semanticObjectMappings[N].items};}if(O.semanticObjects[N]){O.semanticObjects[N]=y.semanticObjects[N];}else{O.semanticObjects.splice(N,1);}}for(var M=0;M<O.semanticObjectMappings.length;M++){if(O.semanticObjectMappings[M]&&O.semanticObjectMappings[M].semanticObject===undefined){O.semanticObjectMappings.splice(M,1);}}this.resolvedpayload=Object.assign({},O);}}}var D=O?O:t;var E=r._getSemanticObjects(D);var G=r._convertSemanticObjectMapping(r._getSemanticObjectMappings(D));if(!E.length){E.push("");}var R={};E.forEach(function(H){if(I){I.addContextObject(H,n);}R[H]={};for(var Q in n){var T=null,V=null;if(I){T=I.getSemanticObjectAttribute(H,Q);if(!T){T=I.createAttributeStructure();I.addSemanticObjectAttribute(H,Q,T);}}if(n[Q]===undefined||n[Q]===null){if(T){T.transformations.push({value:undefined,description:"\u2139 Undefined and null values have been removed in SimpleLinkDelegate."});}continue;}if(g(n[Q])){if(G&&G[H]){var W=Object.keys(G[H]);var Y,Z,$,a1;for(var b1=0;b1<W.length;b1++){a1=W[b1];if(a1.indexOf(Q)===0){Y=G[H][a1];Z=a1.split("/")[a1.split("/").length-1];$=n[Q][Z];if(Y&&Z&&$){R[H][Y]=$;}}}}if(T){T.transformations.push({value:undefined,description:"\u2139 Plain objects has been removed in SimpleLinkDelegate."});}continue;}var c1=G&&G[H]&&G[H][Q]?G[H][Q]:Q;if(T&&Q!==c1){V={value:undefined,description:"\u2139 The attribute "+Q+" has been renamed to "+c1+" in SimpleLinkDelegate.",reason:"\ud83d\udd34 A com.sap.vocabularies.Common.v1.SemanticObjectMapping annotation is defined for semantic object "+H+" with source attribute "+Q+" and target attribute "+c1+". You can modify the annotation if the mapping result is not what you expected."};}if(R[H][c1]){S.error("SimpleLinkDelegate: The attribute "+Q+" can not be renamed to the attribute "+c1+" due to a clash situation. This can lead to wrong navigation later on.");}R[H][c1]=n[Q];if(T){if(V){T.transformations.push(V);var d1=I.createAttributeStructure();d1.transformations.push({value:n[Q],description:"\u2139 The attribute "+c1+" with the value "+n[Q]+" has been added due to a mapping rule regarding the attribute "+Q+" in SimpleLinkDelegate."});I.addSemanticObjectAttribute(H,c1,d1);}}}});return{payload:D,results:R};};r._retrieveNavigationTargets=function(A,t,u,I,v){if(!u.semanticObjects){return Promise.resolve([]);}var T=this;var w=u.semanticObjects;var N={ownNavigation:undefined,availableActions:[]};var x=0;return sap.ui.getCore().loadLibrary("sap.ui.fl",{async:true}).then(function(){return new Promise(function(y){sap.ui.require(["sap/ui/fl/Utils"],function(U){var z=U.getAppComponentForControl(v===undefined?T.oControl:v);var B=z?z.getShellServices():null;if(!B){return y(N.availableActions,N.ownNavigation);}if(!B.hasUShell()){S.error("SimpleLinkDelegate: Service 'CrossApplicationNavigation' or 'URLParsing' could not be obtained");return y(N.availableActions,N.ownNavigation);}var D=w.map(function(i){return[{semanticObject:i,params:t?t[i]:undefined,appStateKey:A,sortResultsBy:"text"}];});return B.getLinks(D).then(function(E){var H=false;for(var i=0;i<E.length;i++){for(var j=0;j<E[i].length;j++){if(E[i][j].length>0){H=true;break;}if(H){break;}}}if(!E||!E.length||!H){return y(N.availableActions,N.ownNavigation);}var G=r._getSemanticObjectUnavailableActions(u);var M=r._convertSemanticObjectUnavailableAction(G);var O=C.getHash();if(O&&O.indexOf("?")!==-1){O=O.split("?")[0];}if(O){O+="?";}var Q=function(W,Y){return(!!M&&!!M[W]&&M[W].indexOf(Y)>-1);};var R=function(_){var W=B.parseShellHash(_.intent);if(Q(W.semanticObject,W.action)){return;}var Y="#"+B.constructShellHash({target:{shellHash:_.intent}});if(_.intent&&_.intent.indexOf(O)===0){N.ownNavigation=new b({href:Y,text:_.text});return;}var Z=new b({key:W.semanticObject&&W.action?W.semanticObject+"-"+W.action:undefined,text:_.text,description:undefined,href:Y,icon:undefined,initiallyVisible:_.tags&&_.tags.indexOf("superiorAction")>-1});if(Z.getProperty("initiallyVisible")){x++;}N.availableActions.push(Z);if(I){I.addSemanticObjectIntent(W.semanticObject,{intent:Z.getHref(),text:Z.getText()});}};for(var n=0;n<w.length;n++){E[n][0].forEach(R);}if(x===0){for(var V=0;V<N.availableActions.length;V++){if(V<T.getConstants().iLinksShownInPopup){N.availableActions[V].setProperty("initiallyVisible",true);}else{break;}}}return y(N.availableActions,N.ownNavigation);},function(){S.error("SimpleLinkDelegate: '_retrieveNavigationTargets' failed executing getLinks method");return y(N.availableActions,N.ownNavigation);});});});});};r._getSemanticObjects=function(i){return i.semanticObjects?i.semanticObjects:[];};r._getSemanticObjectUnavailableActions=function(i){var j=[];if(i.semanticObjectUnavailableActions){i.semanticObjectUnavailableActions.forEach(function(n){j.push(new l({semanticObject:n.semanticObject,actions:n.actions}));});}return j;};r._getSemanticObjectMappings=function(i){var j=[];var n=[];if(i.semanticObjectMappings){i.semanticObjectMappings.forEach(function(t){n=[];if(t.items){t.items.forEach(function(u){n.push(new k({key:u.key,value:u.value}));});}j.push(new h({semanticObject:t.semanticObject,items:n}));});}return j;};r._convertSemanticObjectMapping=function(i){if(!i.length){return undefined;}var j={};i.forEach(function(n){if(!n.getSemanticObject()){throw Error("SimpleLinkDelegate: 'semanticObject' property with value '"+n.getSemanticObject()+"' is not valid");}j[n.getSemanticObject()]=n.getItems().reduce(function(M,I){M[I.getKey()]=I.getValue();return M;},{});});return j;};r._convertSemanticObjectUnavailableAction=function(i){if(!i.length){return undefined;}var j={};i.forEach(function(n){if(!n.getSemanticObject()){throw Error("SimpleLinkDelegate: 'semanticObject' property with value '"+n.getSemanticObject()+"' is not valid");}j[n.getSemanticObject()]=n.getActions();});return j;};return r;},true);

package/packages/sap.fe.macros/src/sap/fe/macros/filter/DraftEditState.fragment.xml

@@ -14,7 +14,7 @@
 		maxConditions="1"
 		id="{= ID.generate([${this>id}, 'FilterField', 'DraftEditingStatus' ]) }"
 		operators="DRAFT_EDIT_STATE"
-		dataType="Edm.String"
+		dataType="sap.ui.model.odata.type.String"
 		conditions="{$filters>/conditions/$editState}"
 		fieldHelp="{= ID.generate([${this>id}, 'FilterFieldValueHelp', 'DraftEditingStatus' ]) }"
 		display="Description"

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterFieldHelper-dbg.js

@@ -150,9 +150,7 @@ sap.ui.define(
 			},
 			getDataType: function(sPropertyType) {
 				var oTypeMapping;
-				if (sPropertyType === "Edm.Date") {
-					oTypeMapping = DisplayModeFormatter.EDM_TYPE_MAPPING[sPropertyType];
-				}
+				oTypeMapping = DisplayModeFormatter.EDM_TYPE_MAPPING[sPropertyType];
 				return oTypeMapping ? oTypeMapping.type : sPropertyType;
 			}
 		};

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterFieldHelper.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/macros/CommonHelper","sap/fe/core/CommonUtils","sap/ui/model/odata/v4/AnnotationHelper","sap/fe/core/templating/DisplayModeFormatter"],function(C,a,A,D){"use strict";var F={isRequiredInFilter:function(p,d){var m=d.context.getModel(),P=d.context.getPath(),s=C.getLocationForPropertyPath(m,P),b,f,i=m.getObject(s+"/@com.sap.vocabularies.Common.v1.ResultContext");if(!i){if(typeof p==="string"){b=p;}else{b=m.getObject(P+"@sapui.name");}f=m.getObject(s+"@Org.OData.Capabilities.V1.FilterRestrictions");if(f&&f.RequiredProperties){i=f.RequiredProperties.some(function(c){return c.$PropertyPath===b;});}}return i;},maxConditions:function(p,d){var P,s,f,m=-1,M=d.context.getModel(),b=d.context.getPath();P=C.getLocationForPropertyPath(M,b);if(M.getObject(P+"/@com.sap.vocabularies.Common.v1.ResultContext")===true){return 1;}if(typeof p==="string"){s=p;}else{s=M.getObject(b+"@sapui.name");}f=a.getFilterRestrictionsByPath(P,M);var o=M.getObject(P+"/"+s);if(!o){o=M.getObject(b);}if(o.$Type==="Edm.Boolean"){m=1;}else if(f&&f.FilterAllowedExpressions&&f.FilterAllowedExpressions[s]){var c=a.getSpecificAllowedExpression(f.FilterAllowedExpressions[s]);if(c==="SingleValue"||c==="SingleRange"){m=1;}}return m;},getConditionsBinding:function(c,p,e){var P=c.getInterface(0),m=P.getModel(),f=P.getPath(),s="",E=c.getInterface(1).getPath(),b,i;if(e&&e["$kind"]==="EntityType"&&f.startsWith(E)){E=c.getInterface(1).getPath();var d=f.replace(E,"");b=d.split("/");}else{b=f.substring(1).split("/");E="/"+b.shift()+"/";}for(i=0;i<b.length;++i){p=m.getProperty(E+b.slice(0,i+1).join("/"));if(p.$kind==="NavigationProperty"&&p.$isCollection){s+=b[i]+"*/";}else if(typeof p!=="string"){s+=b[i]+"/";}}return"{$filters>/conditions/"+s.substring(0,s.length-1)+"}";},constraints:function(p,i){var v=A.format(p,i),m=v&&v.match(/constraints:.*?({.*?})/),c=m&&m[1];if(v.indexOf("sap.ui.model.odata.type.DateTimeOffset")>-1){if(c){c=c.substr(0,m[1].indexOf("}"))+", V4: true}";}else{c="{V4: true}";}}if(c&&c.indexOf("'nullable':false")>=0){c=c.replace(/,[ ]*'nullable':false/,"").replace(/'nullable':false[, ]*/,"");}return c||undefined;},formatOptions:function(p,i){if(p.$Type==="Edm.String"&&(!p.hasOwnProperty("$Nullable")||p.$Nullable===true)){i.arguments=[null,{parseKeepsEmptyString:false}];}var v=A.format(p,i),m=v&&v.match(/formatOptions:.*?({.*?})/);return(m&&m[1])||undefined;},getDataType:function(p){var t;if(p==="Edm.Date"){t=D.EDM_TYPE_MAPPING[p];}return t?t.type:p;}};F.getConditionsBinding.requiresIContext=true;return F;});
+sap.ui.define(["sap/fe/macros/CommonHelper","sap/fe/core/CommonUtils","sap/ui/model/odata/v4/AnnotationHelper","sap/fe/core/templating/DisplayModeFormatter"],function(C,a,A,D){"use strict";var F={isRequiredInFilter:function(p,d){var m=d.context.getModel(),P=d.context.getPath(),s=C.getLocationForPropertyPath(m,P),b,f,i=m.getObject(s+"/@com.sap.vocabularies.Common.v1.ResultContext");if(!i){if(typeof p==="string"){b=p;}else{b=m.getObject(P+"@sapui.name");}f=m.getObject(s+"@Org.OData.Capabilities.V1.FilterRestrictions");if(f&&f.RequiredProperties){i=f.RequiredProperties.some(function(c){return c.$PropertyPath===b;});}}return i;},maxConditions:function(p,d){var P,s,f,m=-1,M=d.context.getModel(),b=d.context.getPath();P=C.getLocationForPropertyPath(M,b);if(M.getObject(P+"/@com.sap.vocabularies.Common.v1.ResultContext")===true){return 1;}if(typeof p==="string"){s=p;}else{s=M.getObject(b+"@sapui.name");}f=a.getFilterRestrictionsByPath(P,M);var o=M.getObject(P+"/"+s);if(!o){o=M.getObject(b);}if(o.$Type==="Edm.Boolean"){m=1;}else if(f&&f.FilterAllowedExpressions&&f.FilterAllowedExpressions[s]){var c=a.getSpecificAllowedExpression(f.FilterAllowedExpressions[s]);if(c==="SingleValue"||c==="SingleRange"){m=1;}}return m;},getConditionsBinding:function(c,p,e){var P=c.getInterface(0),m=P.getModel(),f=P.getPath(),s="",E=c.getInterface(1).getPath(),b,i;if(e&&e["$kind"]==="EntityType"&&f.startsWith(E)){E=c.getInterface(1).getPath();var d=f.replace(E,"");b=d.split("/");}else{b=f.substring(1).split("/");E="/"+b.shift()+"/";}for(i=0;i<b.length;++i){p=m.getProperty(E+b.slice(0,i+1).join("/"));if(p.$kind==="NavigationProperty"&&p.$isCollection){s+=b[i]+"*/";}else if(typeof p!=="string"){s+=b[i]+"/";}}return"{$filters>/conditions/"+s.substring(0,s.length-1)+"}";},constraints:function(p,i){var v=A.format(p,i),m=v&&v.match(/constraints:.*?({.*?})/),c=m&&m[1];if(v.indexOf("sap.ui.model.odata.type.DateTimeOffset")>-1){if(c){c=c.substr(0,m[1].indexOf("}"))+", V4: true}";}else{c="{V4: true}";}}if(c&&c.indexOf("'nullable':false")>=0){c=c.replace(/,[ ]*'nullable':false/,"").replace(/'nullable':false[, ]*/,"");}return c||undefined;},formatOptions:function(p,i){if(p.$Type==="Edm.String"&&(!p.hasOwnProperty("$Nullable")||p.$Nullable===true)){i.arguments=[null,{parseKeepsEmptyString:false}];}var v=A.format(p,i),m=v&&v.match(/formatOptions:.*?({.*?})/);return(m&&m[1])||undefined;},getDataType:function(p){var t;t=D.EDM_TYPE_MAPPING[p];return t?t.type:p;}};F.getConditionsBinding.requiresIContext=true;return F;});

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterUtils-dbg.js

@@ -25,7 +25,9 @@ sap.ui.define(
 		"sap/ui/model/odata/v4/ODataUtils",
 		"sap/fe/macros/ODataMetaModelUtil",
 		"sap/ui/mdc/odata/v4/TypeUtil",
-		"sap/base/Log"
+		"sap/base/Log",
+		"sap/ui/mdc/condition/Condition",
+		"sap/fe/core/helpers/SemanticDateOperators"
 	],
 	function(
 		FilterUtil,
@@ -47,7 +49,9 @@ sap.ui.define(
 		ODataUtils,
 		MetaModelUtil,
 		TypeUtil,
-		Log
+		Log,
+		Condition,
+		SemanticDateOperators
 	) {
 		"use strict";
 
@@ -56,19 +60,12 @@ sap.ui.define(
 				var aFilters = oFilterUtils.getFilterInfo(vIFilter).filters;
 				return aFilters.length ? new Filter(oFilterUtils.getFilterInfo(vIFilter).filters, false) : undefined;
 			},
-			getConvertedFilterFields: function(oFilterControl, sEntityTypePath) {
+			createConverterContext: function(oFilterControl, sEntityTypePath) {
 				var sFilterEntityTypePath = DelegateUtil.getCustomData(oFilterControl, "entityType"),
 					sFilterEntityPath = ModelHelper.getEntitySetPath(sFilterEntityTypePath),
 					sEntitySetPath = sEntityTypePath && ModelHelper.getEntitySetPath(sEntityTypePath),
 					sTargetEntityPath = sEntitySetPath || sFilterEntityPath,
 					sTargetEntitySetName = sTargetEntityPath ? sTargetEntityPath.slice(1) : sTargetEntityPath;
-				var aSelectionFields;
-				/**
-				 * Gets fields from
-				 * 	- direct entity properties,
-				 * 	- navigateProperties key in the manifest if these properties are known by the entity
-				 *  - annotation "SelectionFields"
-				 */
 				var oView = FlUtils.getViewForControl(oFilterControl);
 				var oMetaModel = oFilterControl.getModel().getMetaModel();
 				var oAppComponent = CommonUtils.getAppComponent(oView);
@@ -87,6 +84,26 @@ sap.ui.define(
 					oVisualizationObjectPath.contextLocation,
 					manifestSettings
 				);
+
+				return oConverterContext;
+			},
+			getConvertedFilterFields: function(oFilterControl, sEntityTypePath) {
+				var oMetaModel = oFilterControl.getModel().getMetaModel();
+				var sFilterEntityTypePath = DelegateUtil.getCustomData(oFilterControl, "entityType"),
+					sFilterEntityPath = ModelHelper.getEntitySetPath(sFilterEntityTypePath),
+					sEntitySetPath = sEntityTypePath && ModelHelper.getEntitySetPath(sEntityTypePath),
+					sTargetEntityPath = sEntitySetPath || sFilterEntityPath,
+					sTargetEntitySetName = sTargetEntityPath ? sTargetEntityPath.slice(1) : sTargetEntityPath;
+				var aSelectionFields;
+
+				/**
+				 * Gets fields from
+				 * 	- direct entity properties,
+				 * 	- navigateProperties key in the manifest if these properties are known by the entity
+				 *  - annotation "SelectionFields"
+				 */
+				var oView = FlUtils.getViewForControl(oFilterControl);
+
 				var lrTables = [];
 				if (sEntityTypePath) {
 					var tableControls =
@@ -98,13 +115,18 @@ sap.ui.define(
 					}
 				}
 
-				aSelectionFields = FilterBarConverter.getSelectionFields(oConverterContext, lrTables);
+				var oConverterContext = this.createConverterContext(oFilterControl, sEntityTypePath);
+				aSelectionFields = FilterBarConverter.getSelectionFields(oConverterContext, lrTables).selectionFields;
+
 				//aSelectionFields = FilterBarConverter.getSelectionFields(oConverterContext);
 				if (oFilterControl.isA("sap.ui.mdc.FilterBar") && sEntitySetPath !== sFilterEntityPath) {
 					/**
 					 * We are on multi entity sets scenario so we add annotation "SelectionFields"
 					 * from FilterBar entity if these properties are known by the entity
 					 */
+					var oVisualizationObjectPath = MetaModelConverter.getInvolvedDataModelObjects(
+						oMetaModel.createBindingContext("/" + sTargetEntitySetName)
+					);
 					var oPageContext = oConverterContext.getConverterContextFor(sFilterEntityPath);
 					var aFilterBarSelectionFieldsAnnotation =
 						oPageContext.getEntityTypeAnnotation("@com.sap.vocabularies.UI.v1.SelectionFields").annotation || [];
@@ -127,33 +149,30 @@ sap.ui.define(
 						}
 					});
 				}
-				var fieldNames = [];
-				aSelectionFields.forEach(function(oField) {
-					fieldNames.push(oField.key);
-				});
-
-				var propertyInfoFields = (oFilterControl.getPropertyInfo && oFilterControl.getPropertyInfo()) || [];
-				propertyInfoFields.forEach(function(oProp) {
-					if (oProp.name === "$search" || oProp.name === "$editState") {
-						return;
-					}
-					var selField = aSelectionFields[fieldNames.indexOf(oProp.key)];
-					if (fieldNames.indexOf(oProp.key) !== -1 && selField.annotationPath) {
-						oProp.template = selField.template;
-						oProp.availability = selField.availability;
-						oProp.group = selField.group;
-						oProp.groupLabel = selField.groupLabel;
-						oProp.visualFilter = selField.visualFilter;
-						oProp.typeConfig = TypeUtil.getTypeConfig(oProp.dataType, oProp.formatOptions, oProp.constraints);
-						aSelectionFields[fieldNames.indexOf(oProp.key)] = oProp;
-					}
+				if (aSelectionFields) {
+					var fieldNames = [];
+					aSelectionFields.forEach(function(oField) {
+						fieldNames.push(oField.key);
+					});
 
-					if (fieldNames.indexOf(oProp.key) === -1 && !oProp.annotationPath) {
-						oProp.typeConfig = TypeUtil.getTypeConfig(oProp.dataType, oProp.formatOptions, oProp.constraints);
-						aSelectionFields.push(oProp);
-					}
-				});
+					var propertyInfoFields = (oFilterControl.getPropertyInfo && oFilterControl.getPropertyInfo()) || [];
+					propertyInfoFields.forEach(function(oProp) {
+						if (oProp.name === "$search" || oProp.name === "$editState") {
+							return;
+						}
+						var selField = aSelectionFields[fieldNames.indexOf(oProp.key)];
+						if (fieldNames.indexOf(oProp.key) !== -1 && selField.annotationPath) {
+							oProp.group = selField.group;
+							oProp.groupLabel = selField.groupLabel;
+							oProp.visualFilter = selField.visualFilter;
+							aSelectionFields[fieldNames.indexOf(oProp.key)] = oProp;
+						}
 
+						if (fieldNames.indexOf(oProp.key) === -1 && !oProp.annotationPath) {
+							aSelectionFields.push(oProp);
+						}
+					});
+				}
 				return aSelectionFields;
 			},
 
@@ -383,9 +402,11 @@ sap.ui.define(
 				if (!oFilterControl) {
 					return Promise.resolve();
 				}
-
 				var oFormatOptions = {};
-				if (vValues === undefined) {
+				var aSemanticDateOperators = SemanticDateOperators.getSemanticDateOperations();
+				if (vValues === undefined && aSemanticDateOperators.indexOf(sOperator) !== -1) {
+					vValues = [];
+				} else if (vValues === undefined) {
 					vValues = sOperator;
 				} else {
 					oFormatOptions.operators = [sOperator];
@@ -403,7 +424,9 @@ sap.ui.define(
 				vValues = Array.isArray(vValues) ? vValues : [vValues];
 
 				oClearFilter[sConditionPath] = [];
-				if (sOperator) {
+				if (sOperator && (aSemanticDateOperators.indexOf(sOperator) !== -1 || sOperator === "BT")) {
+					oFilter[sConditionPath] = [Condition.createCondition(sOperator, vValues)];
+				} else if (sOperator) {
 					oFilter[sConditionPath] = vValues
 						.filter(function(vValue) {
 							return vValue !== undefined && vValue !== null;

package/packages/sap.fe.macros/src/sap/fe/macros/filter/FilterUtils.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/util/FilterUtil","sap/ui/fl/Utils","sap/ui/core/Core","sap/fe/macros/CommonHelper","sap/fe/core/CommonUtils","sap/fe/core/helpers/ModelHelper","sap/ui/model/Filter","sap/fe/macros/DelegateUtil","sap/fe/core/converters/controls/ListReport/FilterBar","sap/fe/core/converters/ConverterContext","sap/fe/core/converters/MetaModelConverter","sap/base/util/merge","sap/ui/model/json/JSONModel","sap/ui/mdc/field/ConditionsType","sap/ui/mdc/p13n/StateUtil","sap/ui/mdc/condition/ConditionConverter","sap/ui/model/odata/v4/ODataUtils","sap/fe/macros/ODataMetaModelUtil","sap/ui/mdc/odata/v4/TypeUtil","sap/base/Log"],function(F,a,C,b,c,M,d,D,e,f,g,m,J,h,S,j,O,k,T,L){"use strict";var o={getFilter:function(i){var l=o.getFilterInfo(i).filters;return l.length?new d(o.getFilterInfo(i).filters,false):undefined;},getConvertedFilterFields:function(i,E){var s=D.getCustomData(i,"entityType"),l=M.getEntitySetPath(s),n=E&&M.getEntitySetPath(E),t=n||l,p=t?t.slice(1):t;var q;var v=a.getViewForControl(i);var r=i.getModel().getMetaModel();var A=c.getAppComponent(v);var V=g.getInvolvedDataModelObjects(r.createBindingContext("/"+p));var u;if(!i.isA("sap.ui.mdc.filterbar.vh.FilterBar")){u=v&&v.getViewData();}var w=f.createConverterContextForMacro(V.startingEntitySet.name,r,A&&A.getDiagnostics(),m,V.contextLocation,u);var x=[];if(E){var y=v&&v.oController&&v.oController._getControls&&v.oController._getControls("table");if(y){y.forEach(function(I){x.push(I.getParent().getTableDefinition());});}}q=e.getSelectionFields(w,x);if(i.isA("sap.ui.mdc.FilterBar")&&n!==l){var P=w.getConverterContextFor(l);var z=P.getEntityTypeAnnotation("@com.sap.vocabularies.UI.v1.SelectionFields").annotation||[];var B={};q.forEach(function(I){B[I.conditionPath]=true;});z.forEach(function(I){var K=I.value;if(!B[K]){var N=e.getFilterField(K,w,V.startingEntitySet.entityType);if(N){q.push(N);}}});}var G=[];q.forEach(function(I){G.push(I.key);});var H=(i.getPropertyInfo&&i.getPropertyInfo())||[];H.forEach(function(I){if(I.name==="$search"||I.name==="$editState"){return;}var K=q[G.indexOf(I.key)];if(G.indexOf(I.key)!==-1&&K.annotationPath){I.template=K.template;I.availability=K.availability;I.group=K.group;I.groupLabel=K.groupLabel;I.visualFilter=K.visualFilter;I.typeConfig=T.getTypeConfig(I.dataType,I.formatOptions,I.constraints);q[G.indexOf(I.key)]=I;}if(G.indexOf(I.key)===-1&&!I.annotationPath){I.typeConfig=T.getTypeConfig(I.dataType,I.formatOptions,I.constraints);q.push(I);}});return q;},getBindingPathForParameters:function(I,l,n,p){var B,P=[];for(var i=0;i<p.length;i++){var s=p[i];if(l[s]&&l[s].length>0){var q=m({},l[s][0]);var r=F.getPropertyByKey(n,s);var t=r.typeConfig||T.getTypeConfig(r.dataType,r.formatOptions,r.constraints);var u=j.toType(q,t,I.getTypeUtil());var E=t.className;P.push(s+"="+encodeURIComponent(O.formatLiteral(u.values[0],E)));}}var v=I.data("entityType");var w=v.substring(0,v.length-1);var x=w.slice(0,w.lastIndexOf("/"));var y=w.substring(w.lastIndexOf("/")+1);B=x+"("+P.toString()+")/"+y;return B;},getEditStateIsHideDraft:function(i){var I=false;if(i&&i.$editState){var l=i.$editState.find(function(n){return n.operator==="DRAFT_EDIT_STATE";});if(l&&l.values.includes("ALL_HIDING_DRAFTS")){I=true;}}return I;},getFilterInfo:function(I,p,l){var n=I,s,B,q=[],r=(p&&p.ignoredProperties)||[],P=p&&p.propertiesMetadata,t=p&&p.targetControl,u=t?t.data("entityType"):undefined;if(typeof I==="string"){n=C.byId(I);}if(n){s=n.getSearch&&r.indexOf("search")===-1?n.getSearch():null;var v=l||n.getConditions(),w=n.getPropertyInfoSet?n.getPropertyInfoSet():null;if(!(w&&w.length)){if(n.getPropertyInfo){w=n.getPropertyInfo();}else{w=null;}}var x=n.data("parameters")||[];if(x.length>0){B=o.getBindingPathForParameters(n,v,w,x);}if(v){if(u&&n.data("entityType")!==u){var y=n.getModel().getMetaModel();var z=n.getControlDelegate().fetchPropertiesForEntity(u,y,n);P=z;var E={};for(var i=0;i<z.length;i++){var A=z[i];E[A.name]=true;}w.forEach(function(H){var K=H.name;if(!E[K]){r.push(K);}});}else if(!P){P=w;}var G=F.getFilterInfo(n,v,P,r.concat(x)).filters;q=G?[G]:[];}}return{filters:q,search:s||undefined,bindingPath:B};},getNotApplicableFilters:function(i,l){var t=l.data("entityType"),n=[],p=i.getConditions(),q=i.getModel().getMetaModel(),I=t===i.data("entityType"),r=l.isA("sap.ui.mdc.Chart"),s=!r&&l.getParent().getTableDefinition().enableAnalytics,E=r?b.parseCustomData(D.getCustomData(l,"applySupported")).enableSearch:!s||l.getParent().getTableDefinition().enableAnalyticsSearch;if(p&&(!I||s||r)){var u=I?[]:i.getControlDelegate().fetchPropertiesForEntity(t,q,i),v=u.reduce(function(B,G){B[G.name]=G;return B;},{}),w=!r&&b.parseCustomData(D.getCustomData(l,"aggregates")||{}),A={};Object.keys(w).forEach(function(B){var G=w[B];A[G.relativePath]=G;});if(l.isA("sap.ui.mdc.Chart")){var x=l.getModel().getMetaModel().getObject(l.data("targetCollectionPath")+"@"),y=k.getAllCustomAggregates(x);Object.keys(y).forEach(function(B){if(!A[B]){var G=y[B];A[B]=G;}});}for(var P in p){var z=p[P];if(Array.isArray(z)&&z.length>0&&((!v[P]&&!I)||A[P])){n.push(P.replace(/\+|\*/g,""));}}}if(!E&&i.getSearch()){n.push("$search");}return n;},attachConditionHandling:function(i){if(!i){return Promise.resolve();}var l=new J(),E={filterControl:i,filterModel:l},t=this;i.setModel(l,"filterValues");return i.initialized().then(function(){var n=i._getConditionModel();n.attachPropertyChange(E,t._handleConditionModelChange,t);l.attachPropertyChange(E,t._handleFilterModelChange,t);});},detachConditionHandling:function(i){if(!i){return;}var l=i.getModel("filterValues"),n=i._getConditionModel();n.detachPropertyChange(this._handleConditionModelChange,this);l.detachPropertyChange(this._handleFilterModelChange,this);l.destroy();},setFilterValues:function(i,s,l,v){if(!i){return Promise.resolve();}var n={};if(v===undefined){v=l;}else{n.operators=[l];}if(typeof v==="object"&&v.operator){n.operators=[v.operator];v=v.values;}var p=new h(n),q={},r={};v=Array.isArray(v)?v:[v];q[s]=[];if(l){r[s]=v.filter(function(V){return V!==undefined&&V!==null;}).reduce(function(A,V){return A.concat(p.parseValue(V.toString(),"any"));},[]);}return S.applyExternalState(i,{filter:q}).then(S.applyExternalState.bind(S,i,{filter:r}));},conditionToModelPath:function(s){return s.replace(/\//g,"\\");},modelToConditionPath:function(s){return s.replace(/\\/g,"/");},_handleConditionModelChange:function(E,i){var s=this.modelToConditionPath(E.getParameter("path").substring(12)),l=new h({maxConditions:-1}),n=i.filterModel,v=E.getParameter("value"),V=l.formatValue(v,"any");n.setProperty("/"+this.conditionToModelPath(s),V);},_handleFilterModelChange:function(E,i){var p=E.getParameter("context").getPath().substring(1).replace(/\\/g,"/"),v=E.getParameter("value");this.setFilterValues(i.filterControl,p,v);}};return o;});
+sap.ui.define(["sap/ui/mdc/util/FilterUtil","sap/ui/fl/Utils","sap/ui/core/Core","sap/fe/macros/CommonHelper","sap/fe/core/CommonUtils","sap/fe/core/helpers/ModelHelper","sap/ui/model/Filter","sap/fe/macros/DelegateUtil","sap/fe/core/converters/controls/ListReport/FilterBar","sap/fe/core/converters/ConverterContext","sap/fe/core/converters/MetaModelConverter","sap/base/util/merge","sap/ui/model/json/JSONModel","sap/ui/mdc/field/ConditionsType","sap/ui/mdc/p13n/StateUtil","sap/ui/mdc/condition/ConditionConverter","sap/ui/model/odata/v4/ODataUtils","sap/fe/macros/ODataMetaModelUtil","sap/ui/mdc/odata/v4/TypeUtil","sap/base/Log","sap/ui/mdc/condition/Condition","sap/fe/core/helpers/SemanticDateOperators"],function(F,a,C,b,c,M,d,D,e,f,g,m,J,h,S,j,O,k,T,L,l,n){"use strict";var o={getFilter:function(i){var p=o.getFilterInfo(i).filters;return p.length?new d(o.getFilterInfo(i).filters,false):undefined;},createConverterContext:function(i,E){var s=D.getCustomData(i,"entityType"),p=M.getEntitySetPath(s),q=E&&M.getEntitySetPath(E),t=q||p,r=t?t.slice(1):t;var v=a.getViewForControl(i);var u=i.getModel().getMetaModel();var A=c.getAppComponent(v);var V=g.getInvolvedDataModelObjects(u.createBindingContext("/"+r));var w;if(!i.isA("sap.ui.mdc.filterbar.vh.FilterBar")){w=v&&v.getViewData();}var x=f.createConverterContextForMacro(V.startingEntitySet.name,u,A&&A.getDiagnostics(),m,V.contextLocation,w);return x;},getConvertedFilterFields:function(i,E){var p=i.getModel().getMetaModel();var s=D.getCustomData(i,"entityType"),q=M.getEntitySetPath(s),r=E&&M.getEntitySetPath(E),t=r||q,u=t?t.slice(1):t;var v;var V=a.getViewForControl(i);var w=[];if(E){var x=V&&V.oController&&V.oController._getControls&&V.oController._getControls("table");if(x){x.forEach(function(I){w.push(I.getParent().getTableDefinition());});}}var y=this.createConverterContext(i,E);v=e.getSelectionFields(y,w).selectionFields;if(i.isA("sap.ui.mdc.FilterBar")&&r!==q){var z=g.getInvolvedDataModelObjects(p.createBindingContext("/"+u));var P=y.getConverterContextFor(q);var A=P.getEntityTypeAnnotation("@com.sap.vocabularies.UI.v1.SelectionFields").annotation||[];var B={};v.forEach(function(I){B[I.conditionPath]=true;});A.forEach(function(I){var K=I.value;if(!B[K]){var N=e.getFilterField(K,y,z.startingEntitySet.entityType);if(N){v.push(N);}}});}if(v){var G=[];v.forEach(function(I){G.push(I.key);});var H=(i.getPropertyInfo&&i.getPropertyInfo())||[];H.forEach(function(I){if(I.name==="$search"||I.name==="$editState"){return;}var K=v[G.indexOf(I.key)];if(G.indexOf(I.key)!==-1&&K.annotationPath){I.group=K.group;I.groupLabel=K.groupLabel;I.visualFilter=K.visualFilter;v[G.indexOf(I.key)]=I;}if(G.indexOf(I.key)===-1&&!I.annotationPath){v.push(I);}});}return v;},getBindingPathForParameters:function(I,p,q,P){var B,r=[];for(var i=0;i<P.length;i++){var s=P[i];if(p[s]&&p[s].length>0){var t=m({},p[s][0]);var u=F.getPropertyByKey(q,s);var v=u.typeConfig||T.getTypeConfig(u.dataType,u.formatOptions,u.constraints);var w=j.toType(t,v,I.getTypeUtil());var E=v.className;r.push(s+"="+encodeURIComponent(O.formatLiteral(w.values[0],E)));}}var x=I.data("entityType");var y=x.substring(0,x.length-1);var z=y.slice(0,y.lastIndexOf("/"));var A=y.substring(y.lastIndexOf("/")+1);B=z+"("+r.toString()+")/"+A;return B;},getEditStateIsHideDraft:function(i){var I=false;if(i&&i.$editState){var p=i.$editState.find(function(q){return q.operator==="DRAFT_EDIT_STATE";});if(p&&p.values.includes("ALL_HIDING_DRAFTS")){I=true;}}return I;},getFilterInfo:function(I,p,q){var r=I,s,B,t=[],u=(p&&p.ignoredProperties)||[],P=p&&p.propertiesMetadata,v=p&&p.targetControl,w=v?v.data("entityType"):undefined;if(typeof I==="string"){r=C.byId(I);}if(r){s=r.getSearch&&u.indexOf("search")===-1?r.getSearch():null;var x=q||r.getConditions(),y=r.getPropertyInfoSet?r.getPropertyInfoSet():null;if(!(y&&y.length)){if(r.getPropertyInfo){y=r.getPropertyInfo();}else{y=null;}}var z=r.data("parameters")||[];if(z.length>0){B=o.getBindingPathForParameters(r,x,y,z);}if(x){if(w&&r.data("entityType")!==w){var A=r.getModel().getMetaModel();var E=r.getControlDelegate().fetchPropertiesForEntity(w,A,r);P=E;var G={};for(var i=0;i<E.length;i++){var H=E[i];G[H.name]=true;}y.forEach(function(N){var Q=N.name;if(!G[Q]){u.push(Q);}});}else if(!P){P=y;}var K=F.getFilterInfo(r,x,P,u.concat(z)).filters;t=K?[K]:[];}}return{filters:t,search:s||undefined,bindingPath:B};},getNotApplicableFilters:function(i,p){var t=p.data("entityType"),N=[],q=i.getConditions(),r=i.getModel().getMetaModel(),I=t===i.data("entityType"),s=p.isA("sap.ui.mdc.Chart"),u=!s&&p.getParent().getTableDefinition().enableAnalytics,E=s?b.parseCustomData(D.getCustomData(p,"applySupported")).enableSearch:!u||p.getParent().getTableDefinition().enableAnalyticsSearch;if(q&&(!I||u||s)){var v=I?[]:i.getControlDelegate().fetchPropertiesForEntity(t,r,i),w=v.reduce(function(G,H){G[H.name]=H;return G;},{}),x=!s&&b.parseCustomData(D.getCustomData(p,"aggregates")||{}),A={};Object.keys(x).forEach(function(G){var H=x[G];A[H.relativePath]=H;});if(p.isA("sap.ui.mdc.Chart")){var y=p.getModel().getMetaModel().getObject(p.data("targetCollectionPath")+"@"),z=k.getAllCustomAggregates(y);Object.keys(z).forEach(function(G){if(!A[G]){var H=z[G];A[G]=H;}});}for(var P in q){var B=q[P];if(Array.isArray(B)&&B.length>0&&((!w[P]&&!I)||A[P])){N.push(P.replace(/\+|\*/g,""));}}}if(!E&&i.getSearch()){N.push("$search");}return N;},attachConditionHandling:function(i){if(!i){return Promise.resolve();}var p=new J(),E={filterControl:i,filterModel:p},t=this;i.setModel(p,"filterValues");return i.initialized().then(function(){var q=i._getConditionModel();q.attachPropertyChange(E,t._handleConditionModelChange,t);p.attachPropertyChange(E,t._handleFilterModelChange,t);});},detachConditionHandling:function(i){if(!i){return;}var p=i.getModel("filterValues"),q=i._getConditionModel();q.detachPropertyChange(this._handleConditionModelChange,this);p.detachPropertyChange(this._handleFilterModelChange,this);p.destroy();},setFilterValues:function(i,s,p,v){if(!i){return Promise.resolve();}var q={};var r=n.getSemanticDateOperations();if(v===undefined&&r.indexOf(p)!==-1){v=[];}else if(v===undefined){v=p;}else{q.operators=[p];}if(typeof v==="object"&&v.operator){q.operators=[v.operator];v=v.values;}var t=new h(q),u={},w={};v=Array.isArray(v)?v:[v];u[s]=[];if(p&&(r.indexOf(p)!==-1||p==="BT")){w[s]=[l.createCondition(p,v)];}else if(p){w[s]=v.filter(function(V){return V!==undefined&&V!==null;}).reduce(function(A,V){return A.concat(t.parseValue(V.toString(),"any"));},[]);}return S.applyExternalState(i,{filter:u}).then(S.applyExternalState.bind(S,i,{filter:w}));},conditionToModelPath:function(s){return s.replace(/\//g,"\\");},modelToConditionPath:function(s){return s.replace(/\\/g,"/");},_handleConditionModelChange:function(E,i){var s=this.modelToConditionPath(E.getParameter("path").substring(12)),p=new h({maxConditions:-1}),q=i.filterModel,v=E.getParameter("value"),V=p.formatValue(v,"any");q.setProperty("/"+this.conditionToModelPath(s),V);},_handleFilterModelChange:function(E,i){var p=E.getParameter("context").getPath().substring(1).replace(/\\/g,"/"),v=E.getParameter("value");this.setFilterValues(i.filterControl,p,v);}};return o;});