@sap/open.fe 1.98.0 → 1.99.0

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

@@ -291,15 +291,8 @@ sap.ui.define(
 		SimpleLinkDelegate.fetchLinkItems = function(oPayload, oBindingContext, oInfoLog) {
 			if (oBindingContext && SimpleLinkDelegate._getSemanticObjects(oPayload)) {
 				var oContextObject = oBindingContext.getObject();
-				var aItemsToReturn = [];
 				if (oInfoLog) {
 					oInfoLog.initialize(SimpleLinkDelegate._getSemanticObjects(oPayload));
-					aItemsToReturn.forEach(function(oItem) {
-						oInfoLog.addIntent(Log.IntentType.API, {
-							text: oItem.getText(),
-							intent: oItem.getHref()
-						});
-					});
 				}
 
 				this.aLinkCustomData =

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();var n=[];if(I){I.initialize(r._getSemanticObjects(i));n.forEach(function(w){I.addIntent(c.IntentType.API,{text:w.getText(),intent:w.getHref()});});}this.aLinkCustomData=this._link&&this._fetchLinkCustomData(this._link).map(function(w){return w.mProperties.value;});var t=r._calculateSemanticAttributes(j,i,I,this._link);var u=t.results;var v=t.payload;return r._retrieveNavigationTargets("",u,v,I,this._link).then(function(w,O){return w.length===0?null:w;});}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){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);

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

@@ -3,147 +3,160 @@
         (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"], function(
-	CommonHelper,
-	CommonUtils,
-	AnnotationHelper
-) {
-	"use strict";
+sap.ui.define(
+	[
+		"sap/fe/macros/CommonHelper",
+		"sap/fe/core/CommonUtils",
+		"sap/ui/model/odata/v4/AnnotationHelper",
+		"sap/fe/core/templating/DisplayModeFormatter"
+	],
+	function(CommonHelper, CommonUtils, AnnotationHelper, DisplayModeFormatter) {
+		"use strict";
 
-	var FilterFieldHelper = {
-		//FilterField
-		isRequiredInFilter: function(path, oDetails) {
-			var oModel = oDetails.context.getModel(),
-				sPropertyPath = oDetails.context.getPath(),
-				sPropertyLocationPath = CommonHelper.getLocationForPropertyPath(oModel, sPropertyPath),
-				sProperty,
-				oFilterRestrictions,
-				bIsRequired = oModel.getObject(sPropertyLocationPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
+		var FilterFieldHelper = {
+			//FilterField
+			isRequiredInFilter: function(path, oDetails) {
+				var oModel = oDetails.context.getModel(),
+					sPropertyPath = oDetails.context.getPath(),
+					sPropertyLocationPath = CommonHelper.getLocationForPropertyPath(oModel, sPropertyPath),
+					sProperty,
+					oFilterRestrictions,
+					bIsRequired = oModel.getObject(sPropertyLocationPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
+
+				if (!bIsRequired) {
+					if (typeof path === "string") {
+						sProperty = path;
+					} else {
+						sProperty = oModel.getObject(sPropertyPath + "@sapui.name");
+					}
+					oFilterRestrictions = oModel.getObject(sPropertyLocationPath + "@Org.OData.Capabilities.V1.FilterRestrictions");
+					if (oFilterRestrictions && oFilterRestrictions.RequiredProperties) {
+						bIsRequired = oFilterRestrictions.RequiredProperties.some(function(property) {
+							return property.$PropertyPath === sProperty;
+						});
+					}
+				}
+				return bIsRequired;
+			},
+			maxConditions: function(path, oDetails) {
+				var sPropertyLocationPath,
+					sProperty,
+					oFilterRestrictions,
+					maxConditions = -1,
+					oModel = oDetails.context.getModel(),
+					sPropertyPath = oDetails.context.getPath();
+
+				sPropertyLocationPath = CommonHelper.getLocationForPropertyPath(oModel, sPropertyPath);
+				if (oModel.getObject(sPropertyLocationPath + "/@com.sap.vocabularies.Common.v1.ResultContext") === true) {
+					return 1;
+				}
 
-			if (!bIsRequired) {
 				if (typeof path === "string") {
 					sProperty = path;
 				} else {
 					sProperty = oModel.getObject(sPropertyPath + "@sapui.name");
 				}
-				oFilterRestrictions = oModel.getObject(sPropertyLocationPath + "@Org.OData.Capabilities.V1.FilterRestrictions");
-				if (oFilterRestrictions && oFilterRestrictions.RequiredProperties) {
-					bIsRequired = oFilterRestrictions.RequiredProperties.some(function(property) {
-						return property.$PropertyPath === sProperty;
-					});
+				oFilterRestrictions = CommonUtils.getFilterRestrictionsByPath(sPropertyLocationPath, oModel);
+				var oProperty = oModel.getObject(sPropertyLocationPath + "/" + sProperty);
+				if (!oProperty) {
+					oProperty = oModel.getObject(sPropertyPath);
 				}
-			}
-			return bIsRequired;
-		},
-		maxConditions: function(path, oDetails) {
-			var sPropertyLocationPath,
-				sProperty,
-				oFilterRestrictions,
-				maxConditions = -1,
-				oModel = oDetails.context.getModel(),
-				sPropertyPath = oDetails.context.getPath();
-
-			sPropertyLocationPath = CommonHelper.getLocationForPropertyPath(oModel, sPropertyPath);
-			if (oModel.getObject(sPropertyLocationPath + "/@com.sap.vocabularies.Common.v1.ResultContext") === true) {
-				return 1;
-			}
-
-			if (typeof path === "string") {
-				sProperty = path;
-			} else {
-				sProperty = oModel.getObject(sPropertyPath + "@sapui.name");
-			}
-			oFilterRestrictions = CommonUtils.getFilterRestrictionsByPath(sPropertyLocationPath, oModel);
-			var oProperty = oModel.getObject(sPropertyLocationPath + "/" + sProperty);
-			if (!oProperty) {
-				oProperty = oModel.getObject(sPropertyPath);
-			}
-			if (oProperty.$Type === "Edm.Boolean") {
-				maxConditions = 1;
-			} else if (
-				oFilterRestrictions &&
-				oFilterRestrictions.FilterAllowedExpressions &&
-				oFilterRestrictions.FilterAllowedExpressions[sProperty]
-			) {
-				var sAllowedExpression = CommonUtils.getSpecificAllowedExpression(oFilterRestrictions.FilterAllowedExpressions[sProperty]);
-				if (sAllowedExpression === "SingleValue" || sAllowedExpression === "SingleRange") {
+				if (oProperty.$Type === "Edm.Boolean") {
 					maxConditions = 1;
+				} else if (
+					oFilterRestrictions &&
+					oFilterRestrictions.FilterAllowedExpressions &&
+					oFilterRestrictions.FilterAllowedExpressions[sProperty]
+				) {
+					var sAllowedExpression = CommonUtils.getSpecificAllowedExpression(
+						oFilterRestrictions.FilterAllowedExpressions[sProperty]
+					);
+					if (sAllowedExpression === "SingleValue" || sAllowedExpression === "SingleRange") {
+						maxConditions = 1;
+					}
 				}
-			}
-			return maxConditions;
-		},
-		/**
-		 * To Create binding for mdc:filterfield conditions.
-		 *
-		 * @param {object} iContext An interface with context to the path to be considered for binding
-		 * @param {object | string} vProperty The property to create the condition binding for
-		 * @param {object} oEntityType The EntityType
-		 * @returns {string} Expression binding for conditions for the field
-		 */
-		getConditionsBinding: function(iContext, vProperty, oEntityType) {
-			var oPropertyInterface = iContext.getInterface(0),
-				oMetaModel = oPropertyInterface.getModel(),
-				sFullPropertyPath = oPropertyInterface.getPath(),
-				sConditionPath = "",
-				sEntityTypePath = iContext.getInterface(1).getPath(),
-				aPropertyPathParts,
-				i;
+				return maxConditions;
+			},
+			/**
+			 * To Create binding for mdc:filterfield conditions.
+			 *
+			 * @param {object} iContext An interface with context to the path to be considered for binding
+			 * @param {object | string} vProperty The property to create the condition binding for
+			 * @param {object} oEntityType The EntityType
+			 * @returns {string} Expression binding for conditions for the field
+			 */
+			getConditionsBinding: function(iContext, vProperty, oEntityType) {
+				var oPropertyInterface = iContext.getInterface(0),
+					oMetaModel = oPropertyInterface.getModel(),
+					sFullPropertyPath = oPropertyInterface.getPath(),
+					sConditionPath = "",
+					sEntityTypePath = iContext.getInterface(1).getPath(),
+					aPropertyPathParts,
+					i;
 
-			if (oEntityType && oEntityType["$kind"] === "EntityType" && sFullPropertyPath.startsWith(sEntityTypePath)) {
-				// in case:
-				// 1. sFullPropertyPath is '/SOM/Name' and sEntityTypePath is '/SOM/'(normal scenario)
-				// 2. sFullPropertyPath is '/Customer/Set/Name' and sEntityTypePath is '/Customer/Set/'(main entitytype proerty in parameterized case)
-				sEntityTypePath = iContext.getInterface(1).getPath();
-				var sPropertyPath = sFullPropertyPath.replace(sEntityTypePath, "");
-				aPropertyPathParts = sPropertyPath.split("/");
-			} else {
-				// 1. sFullPropertyPath is '/Customer/Set/Name' and sEntityTypePath is '/Customer/P_CC'(parameter proerty in parameterized case)
-				aPropertyPathParts = sFullPropertyPath.substring(1).split("/");
-				sEntityTypePath = "/" + aPropertyPathParts.shift() + "/";
-			}
+				if (oEntityType && oEntityType["$kind"] === "EntityType" && sFullPropertyPath.startsWith(sEntityTypePath)) {
+					// in case:
+					// 1. sFullPropertyPath is '/SOM/Name' and sEntityTypePath is '/SOM/'(normal scenario)
+					// 2. sFullPropertyPath is '/Customer/Set/Name' and sEntityTypePath is '/Customer/Set/'(main entitytype proerty in parameterized case)
+					sEntityTypePath = iContext.getInterface(1).getPath();
+					var sPropertyPath = sFullPropertyPath.replace(sEntityTypePath, "");
+					aPropertyPathParts = sPropertyPath.split("/");
+				} else {
+					// 1. sFullPropertyPath is '/Customer/Set/Name' and sEntityTypePath is '/Customer/P_CC'(parameter proerty in parameterized case)
+					aPropertyPathParts = sFullPropertyPath.substring(1).split("/");
+					sEntityTypePath = "/" + aPropertyPathParts.shift() + "/";
+				}
 
-			for (i = 0; i < aPropertyPathParts.length; ++i) {
-				vProperty = oMetaModel.getProperty(sEntityTypePath + aPropertyPathParts.slice(0, i + 1).join("/"));
-				if (vProperty.$kind === "NavigationProperty" && vProperty.$isCollection) {
-					sConditionPath += aPropertyPathParts[i] + "*/";
-				} else if (typeof vProperty !== "string") {
-					sConditionPath += aPropertyPathParts[i] + "/";
+				for (i = 0; i < aPropertyPathParts.length; ++i) {
+					vProperty = oMetaModel.getProperty(sEntityTypePath + aPropertyPathParts.slice(0, i + 1).join("/"));
+					if (vProperty.$kind === "NavigationProperty" && vProperty.$isCollection) {
+						sConditionPath += aPropertyPathParts[i] + "*/";
+					} else if (typeof vProperty !== "string") {
+						sConditionPath += aPropertyPathParts[i] + "/";
+					}
 				}
-			}
-			// remove the last slash from the conditionPath
-			return "{$filters>/conditions/" + sConditionPath.substring(0, sConditionPath.length - 1) + "}";
-		},
-		constraints: function(oProperty, oInterface) {
-			var sValue = AnnotationHelper.format(oProperty, oInterface),
-				aMatches = sValue && sValue.match(/constraints:.*?({.*?})/),
-				sConstraints = aMatches && aMatches[1];
-			// Workaround. Add "V4: true" to DateTimeOffset constraints. AnnotationHelper is not aware of this flag.
-			if (sValue.indexOf("sap.ui.model.odata.type.DateTimeOffset") > -1) {
-				if (sConstraints) {
-					sConstraints = sConstraints.substr(0, aMatches[1].indexOf("}")) + ", V4: true}";
-				} else {
-					sConstraints = "{V4: true}";
+				// remove the last slash from the conditionPath
+				return "{$filters>/conditions/" + sConditionPath.substring(0, sConditionPath.length - 1) + "}";
+			},
+			constraints: function(oProperty, oInterface) {
+				var sValue = AnnotationHelper.format(oProperty, oInterface),
+					aMatches = sValue && sValue.match(/constraints:.*?({.*?})/),
+					sConstraints = aMatches && aMatches[1];
+				// Workaround. Add "V4: true" to DateTimeOffset constraints. AnnotationHelper is not aware of this flag.
+				if (sValue.indexOf("sap.ui.model.odata.type.DateTimeOffset") > -1) {
+					if (sConstraints) {
+						sConstraints = sConstraints.substr(0, aMatches[1].indexOf("}")) + ", V4: true}";
+					} else {
+						sConstraints = "{V4: true}";
+					}
 				}
+				// Remove {nullable:false} from the constraints as it prevents from having an empty filter field
+				// in the case of a single-value filter
+				if (sConstraints && sConstraints.indexOf("'nullable':false") >= 0) {
+					sConstraints = sConstraints.replace(/,[ ]*'nullable':false/, "").replace(/'nullable':false[, ]*/, "");
+				}
+				return sConstraints || undefined;
+			},
+			formatOptions: function(oProperty, oInterface) {
+				// as the Annotation helper always returns "parseKeepsEmptyString: true" we need to prevent this in case a property (of type string) is nullable
+				// Filling oInterface.arguments with an array where the first parameter is null, and the second contains the "expected"
+				// parseKeepsEmptyString value follows a proposal from the model colleagues to "overrule" the behavior of the AnnotationHelper
+				if (oProperty.$Type === "Edm.String" && (!oProperty.hasOwnProperty("$Nullable") || oProperty.$Nullable === true)) {
+					oInterface.arguments = [null, { parseKeepsEmptyString: false }];
+				}
+				var sValue = AnnotationHelper.format(oProperty, oInterface),
+					aMatches = sValue && sValue.match(/formatOptions:.*?({.*?})/);
+				return (aMatches && aMatches[1]) || undefined;
+			},
+			getDataType: function(sPropertyType) {
+				var oTypeMapping;
+				if (sPropertyType === "Edm.Date") {
+					oTypeMapping = DisplayModeFormatter.EDM_TYPE_MAPPING[sPropertyType];
+				}
+				return oTypeMapping ? oTypeMapping.type : sPropertyType;
 			}
-			// Remove {nullable:false} from the constraints as it prevents from having an empty filter field
-			// in the case of a single-value filter
-			if (sConstraints && sConstraints.indexOf("'nullable':false") >= 0) {
-				sConstraints = sConstraints.replace(/,[ ]*'nullable':false/, "").replace(/'nullable':false[, ]*/, "");
-			}
-			return sConstraints || undefined;
-		},
-		formatOptions: function(oProperty, oInterface) {
-			// as the Annotation helper always returns "parseKeepsEmptyString: true" we need to prevent this in case a property (of type string) is nullable
-			// Filling oInterface.arguments with an array where the first parameter is null, and the second contains the "expected"
-			// parseKeepsEmptyString value follows a proposal from the model colleagues to "overrule" the behavior of the AnnotationHelper
-			if (oProperty.$Type === "Edm.String" && (!oProperty.hasOwnProperty("$Nullable") || oProperty.$Nullable === true)) {
-				oInterface.arguments = [null, { parseKeepsEmptyString: false }];
-			}
-			var sValue = AnnotationHelper.format(oProperty, oInterface),
-				aMatches = sValue && sValue.match(/formatOptions:.*?({.*?})/);
-			return (aMatches && aMatches[1]) || undefined;
-		}
-	};
-	FilterFieldHelper.getConditionsBinding.requiresIContext = true;
-	return FilterFieldHelper;
-});
+		};
+		FilterFieldHelper.getConditionsBinding.requiresIContext = true;
+		return FilterFieldHelper;
+	}
+);

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"],function(C,a,A){"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;}};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;if(p==="Edm.Date"){t=D.EDM_TYPE_MAPPING[p];}return t?t.type:p;}};F.getConditionsBinding.requiresIContext=true;return F;});