@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.core/src/sap/fe/core/converters/controls/ListReport/FilterBar.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["../../ManifestSettings","sap/fe/core/converters/controls/Common/Table","sap/fe/core/converters/helpers/ConfigurableObject","sap/fe/core/converters/controls/ListReport/VisualFilters","sap/fe/core/helpers/BindingExpression","../Common/DataVisualization","sap/fe/core/converters/helpers/Key","sap/fe/core/converters/helpers/IssueManager","sap/fe/core/templating/PropertyHelper"],function(M,T,C,V,B,D,K,I,P){"use strict";var _={};var h=P.hasValueHelp;var c=I.IssueCategory;var d=I.IssueSeverity;var e=I.IssueType;var f=K.KeyHelper;var g=D.getSelectionVariant;var j=B.compileBinding;var k=B.annotationExpression;var l=V.getVisualFilters;var m=C.Placement;var n=C.insertCustomElements;var o=T.getTypeConfig;var p=T.isFilteringCaseSensitive;var q=T.getSelectionVariantConfiguration;var A=M.AvailabilityType;function r(a,b){var i=Object.keys(a);if(Object.getOwnPropertySymbols){var g1=Object.getOwnPropertySymbols(a);if(b){g1=g1.filter(function(h1){return Object.getOwnPropertyDescriptor(a,h1).enumerable;});}i.push.apply(i,g1);}return i;}function s(a){for(var i=1;i<arguments.length;i++){var b=arguments[i]!=null?arguments[i]:{};if(i%2){r(Object(b),true).forEach(function(g1){t(a,g1,b[g1]);});}else if(Object.getOwnPropertyDescriptors){Object.defineProperties(a,Object.getOwnPropertyDescriptors(b));}else{r(Object(b)).forEach(function(g1){Object.defineProperty(a,g1,Object.getOwnPropertyDescriptor(b,g1));});}}return a;}function t(a,b,i){if(b in a){Object.defineProperty(a,b,{value:i,enumerable:true,configurable:true,writable:true});}else{a[b]=i;}return a;}var u;(function(u){u["Default"]="Default";u["Slot"]="Slot";})(u||(u={}));function v(a){var b={};a.Data.forEach(function(i){if(i.$Type==="com.sap.vocabularies.UI.v1.DataField"){var g1,h1;b[i.Value.path]={group:a.fullyQualifiedName,groupLabel:j(k(a.Label||((g1=a.annotations)===null||g1===void 0?void 0:(h1=g1.Common)===null||h1===void 0?void 0:h1.Label)||a.qualifier))||a.qualifier};}});return b;}function w(a){return a.reduce(function(b,i){i.propertyNames.forEach(function(g1){b[g1]=true;});return b;},{});}function x(a,b){if(b&&a.length>0){return a.every(function(i){return i.enableAnalytics&&b===i.annotation.collection;});}return false;}function y(a,b){var i=[];return a.map(function(g1){var h1=g1.control.filters;var i1=[];for(var j1 in h1){if(Array.isArray(h1[j1].paths)){var k1=h1[j1].paths;k1.forEach(function(l1){if(l1&&l1.annotationPath&&i.indexOf(l1.annotationPath)===-1){i.push(l1.annotationPath);var m1=q(l1.annotationPath,b);if(m1){i1.push(m1);}}});}}return i1;}).reduce(function(g1,h1){return g1.concat(h1);},[]);}var z=function(a,b){var i=b.split("/");var g1;var h1="";while(i.length){var i1=i.shift();g1=g1?g1+"/"+i1:i1;var j1=a.resolvePath(g1);if(j1._type==="NavigationProperty"&&j1.isCollection){i1+="*";}h1=h1?h1+"/"+i1:i1;}return h1;};var E=function(a,b,i,g1,h1){var i1,j1,k1;if(b!==undefined&&b.targetType===undefined&&(g1||((i1=b.annotations)===null||i1===void 0?void 0:(j1=i1.UI)===null||j1===void 0?void 0:(k1=j1.Hidden)===null||k1===void 0?void 0:k1.valueOf())!==true)){var l1,m1,n1,o1,p1,q1,r1,s1;var t1=h1.getAnnotationEntityType(b);return{key:f.getSelectionFieldKeyFromPath(i),annotationPath:h1.getAbsoluteAnnotationPath(i),conditionPath:z(a,i),availability:((l1=b.annotations)===null||l1===void 0?void 0:(m1=l1.UI)===null||m1===void 0?void 0:(n1=m1.HiddenFilter)===null||n1===void 0?void 0:n1.valueOf())===true?A.Hidden:A.Adaptation,label:j(k(((o1=b.annotations.Common)===null||o1===void 0?void 0:(p1=o1.Label)===null||p1===void 0?void 0:p1.valueOf())||b.name)),group:t1.name,groupLabel:j(k((t1===null||t1===void 0?void 0:(q1=t1.annotations)===null||q1===void 0?void 0:(r1=q1.Common)===null||r1===void 0?void 0:(s1=r1.Label)===null||s1===void 0?void 0:s1.valueOf())||t1.name))};}return undefined;};function F(a){var b={"Edm.Boolean":{modelType:"Bool"},"Edm.Byte":{modelType:"Int"},"Edm.Date":{modelType:"Date"},"Edm.DateTime":{modelType:"Date"},"Edm.DateTimeOffset":{modelType:"DateTimeOffset"},"Edm.Decimal":{modelType:"Decimal"},"Edm.Double":{modelType:"Float"},"Edm.Float":{modelType:"Float"},"Edm.Guid":{modelType:"Guid"},"Edm.Int16":{modelType:"Int"},"Edm.Int32":{modelType:"Int"},"Edm.Int64":{modelType:"Int"},"Edm.SByte":{modelType:"Int"},"Edm.Single":{modelType:"Float"},"Edm.String":{modelType:"String"},"Edm.Time":{modelType:"TimeOfDay"},"Edm.TimeOfDay":{modelType:"TimeOfDay"},"Edm.Stream":{}};return a&&a in b&&b[a].modelType;}_.getModelType=F;var G=function(a,b,i,g1,h1){var i1={};if(i){i.forEach(function(j1){var k1=j1.name;var l1=(b?b+"/":"")+k1;var m1=E(a,j1,l1,g1,h1);if(m1){i1[l1]=m1;}});}return i1;};var H=function(a,b,i,g1){var h1={};if(b){b.forEach(function(i1){var j1;var k1=a.resolvePath(i1);if(k1===undefined){return;}if(k1._type==="NavigationProperty"){j1=G(a,i1,k1.targetType.entityProperties,i,g1);}else if(k1.targetType!==undefined&&k1.targetType._type==="ComplexType"){j1=G(a,i1,k1.targetType.properties,i,g1);}else{var l1=i1.includes("/")?i1.split("/").splice(0,1).join("/"):"";j1=G(a,l1,[k1],i,g1);}h1=s(s({},h1),j1);});}return h1;};var J=function(a,b,i,g1){var h1=a[b];if(h1){delete a[b];}else{h1=E(g1,g1.resolvePath(b),b,true,i);}if(!h1){var i1;(i1=i.getDiagnostics())===null||i1===void 0?void 0:i1.addIssue(c.Annotation,d.High,e.MISSING_SELECTIONFIELD);}if(h1){var j1,k1;h1.availability=A.Default;h1.isParameter=!!((j1=g1.annotations)!==null&&j1!==void 0&&(k1=j1.Common)!==null&&k1!==void 0&&k1.ResultContext);}return h1;};var L=function(a,b,i,g1,h1,i1){var j1=[];var k1={};var l1=i.entityProperties;i1===null||i1===void 0?void 0:i1.forEach(function(m1){k1[m1.value]=true;});if(b&&b.length>0){b===null||b===void 0?void 0:b.forEach(function(m1){var n1=m1.PropertyName;var o1=n1.value;var k1={};i1===null||i1===void 0?void 0:i1.forEach(function(q1){k1[q1.value]=true;});if(!(o1 in h1)){if(!(o1 in k1)){var p1=J(a,o1,g1,i);if(p1){j1.push(p1);}}}});}else if(l1){l1.forEach(function(m1){var n1,o1;var p1=(n1=m1.annotations)===null||n1===void 0?void 0:(o1=n1.Common)===null||o1===void 0?void 0:o1.FilterDefaultValue;var q1=m1.name;if(!(q1 in h1)){if(p1&&!(q1 in k1)){var r1=J(a,q1,g1,i);if(r1){j1.push(r1);}}}});}return j1;};function N(a){var b,i;var g1=a.getDataModelObjectPath();var h1=g1.startingEntitySet.entityType;var i1=!!((b=h1.annotations)!==null&&b!==void 0&&(i=b.Common)!==null&&i!==void 0&&i.ResultContext);var j1=i1&&a.getConverterContextFor("/"+g1.startingEntitySet.name);var k1=j1?h1.entityProperties.map(function(l1){return J({},l1.name,j1,h1);}):[];return k1;}var O=function(a,b,i){var g1=b.length===0||b.every(function(j1){return!j1.applySupported.enableSearch;});var h1=a.length===0||a.every(function(j1){return j1.enableAnalytics&&!j1.enableAnalyticsSearch;});var i1=i.getContextPath();if(i1&&g1&&h1){return true;}else{return false;}};_.getFilterBarhideBasicSearch=O;var Q=function(a,b){var i=b.getManifestWrapper().getFilterConfiguration();var g1=(i===null||i===void 0?void 0:i.filterFields)||{};var h1=H(a,Object.keys(g1).map(function(p1){return f.getPathFromSelectionFieldKey(p1);}),true,b);var i1={};for(var j1 in g1){var k1=g1[j1];var l1=f.getPathFromSelectionFieldKey(j1);var m1=h1[l1];var n1=k1.type==="Slot"?u.Slot:u.Default;var o1=k1&&k1!==null&&k1!==void 0&&k1.visualFilter?l(a,b,j1,g1):undefined;i1[j1]={key:j1,type:n1,annotationPath:m1===null||m1===void 0?void 0:m1.annotationPath,conditionPath:(m1===null||m1===void 0?void 0:m1.conditionPath)||l1,template:k1.template,label:k1.label,position:k1.position||{placement:m.After},availability:k1.availability||A.Default,settings:k1.settings,visualFilter:o1};}return i1;};_.getManifestFilterFields=Q;var R=function(a,b,i){return J({},a,b,i);};_.getFilterField=R;var S=function(a,b){if(b==="RequiredProperties"||b==="NonFilterableProperties"){var i=[];if(a&&a[b]){i=a[b].map(function(h1){return h1.$PropertyPath||h1.value;});}return i;}else if(b==="FilterAllowedExpressions"){var g1={};if(a&&a.FilterExpressionRestrictions){a.FilterExpressionRestrictions.forEach(function(h1){if(g1[h1.Property.value]){g1[h1.Property.value].push(h1.AllowedExpressions);}else{g1[h1.Property.value]=[h1.AllowedExpressions];}});}return g1;}return a;};_.getFilterRestrictions=S;var U=function(){return{name:"$search",path:"$search",dataType:"Edm.String",maxConditions:1};};var W=function(){return{name:"$editState",path:"$editState",groupLabel:"",group:"",dataType:"Edm.String",tooltip:null,hiddenFilter:false};};var X=function(a){var b,i,g1;return(b=a.getEntitySet())===null||b===void 0?void 0:(i=b.annotations)===null||i===void 0?void 0:(g1=i.Capabilities)===null||g1===void 0?void 0:g1.SearchRestrictions;};var Y=function(a,b){var i,g1,h1;var i1=(i=a.getEntitySet())===null||i===void 0?void 0:(g1=i.annotations)===null||g1===void 0?void 0:(h1=g1.Capabilities)===null||h1===void 0?void 0:h1.NavigationRestrictions;var j1=i1&&i1.RestrictedProperties;return j1&&j1.find(function(k1){return k1&&k1.NavigationProperty&&(k1.NavigationProperty.$NavigationPropertyPath===b||k1.NavigationProperty.value===b);});};_.getNavigationRestrictions=Y;var Z=function(a){return{key:a.key,annotationPath:a.annotationPath,conditionPath:a.conditionPath,name:a.conditionPath,path:a.conditionPath,groupLabel:a.groupLabel,group:a.group,label:a.label,tooltip:null,hiddenFilter:a.availability==="Hidden",removeFromAppState:false,hasValueHelp:false,display:"Value",isParameter:a.isParameter,caseSensitive:a.caseSensitive,availability:a.availability,position:a.position,type:a.type};};var $=function(i){var g1=["SingleValue","MultiValue","SingleRange","MultiRange","SearchExpression","MultiRangeOrSearchExpression"];i.sort(function(a,b){return g1.indexOf(a)-g1.indexOf(b);});return i[0];};_.getSpecificAllowedExpression=$;var a1=function(a,b){var i,g1,h1,i1,j1,k1;var l1=a===null||a===void 0?void 0:(i=a.Common)===null||i===void 0?void 0:i.Text,m1=l1&&(a&&(a===null||a===void 0?void 0:(g1=a.Common)===null||g1===void 0?void 0:(h1=g1.Text)===null||h1===void 0?void 0:(i1=h1.annotations)===null||i1===void 0?void 0:(j1=i1.UI)===null||j1===void 0?void 0:j1.TextArrangement)||b&&(b===null||b===void 0?void 0:(k1=b.UI)===null||k1===void 0?void 0:k1.TextArrangement));if(m1){if(m1.valueOf()==="UI.TextArrangementType/TextOnly"){return"Description";}else if(m1.valueOf()==="UI.TextArrangementType/TextLast"){return"ValueDescription";}return"DescriptionValue";}return l1?"DescriptionValue":"Value";};_.displayMode=a1;var b1=function(a,b,i){var g1,h1,i1,j1,k1,l1;var m1=Z(b);var n1=b.annotationPath;if(!n1){return m1;}var o1=a.getConverterContextFor(n1).getDataModelObjectPath().targetObject;var p1={$MaxLength:o1.maxLength,$Type:o1.type,$kind:o1._type};var q1=o1===null||o1===void 0?void 0:o1.annotations;var r1=a===null||a===void 0?void 0:(g1=a.getDataModelObjectPath().targetObject)===null||g1===void 0?void 0:g1.annotations;var s1;var t1=i.formatOptions;var u1=i.constraints;var v1=(q1===null||q1===void 0?void 0:(h1=q1.PersonalData)===null||h1===void 0?void 0:h1.IsPotentiallySensitive)||(q1===null||q1===void 0?void 0:q1.ExcludeFromNavigationContext)||(q1===null||q1===void 0?void 0:(i1=q1.Analytics)===null||i1===void 0?void 0:i1.Measure);var w1=q1===null||q1===void 0?void 0:(j1=q1.Common)===null||j1===void 0?void 0:j1.FilterDefaultValue;if(w1){s1=w1["$"+F(p1.$Type)];}m1=Object.assign(m1,{tooltip:(q1===null||q1===void 0?void 0:(k1=q1.Common)===null||k1===void 0?void 0:(l1=k1.QuickInfo)===null||l1===void 0?void 0:l1.valueOf())||undefined,removeFromAppState:v1,hasValueHelp:h(o1),formatOptions:t1,constraints:u1,display:a1(q1,r1),defaultFilterConditions:s1?[{fieldPath:b.conditionPath,operator:"EQ",values:[s1]}]:undefined});return m1;};var c1=function(a){var i=true;switch(a.filterExpression){case"SearchExpression":case"SingleRange":case"SingleValue":i=false;break;default:break;}if(a.type&&a.type.indexOf("Boolean")>0){i=false;}return i;};_.isMultiValue=c1;var d1=function(a){var b,i,g1;var h1=arguments.length>1&&arguments[1]!==undefined?arguments[1]:[];var i1=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"";var j1=y(h1,a);var k1=w(j1);var l1=a.getEntityType();var m1=i1&&((b=a.getEntityTypeAnnotation(i1))===null||b===void 0?void 0:b.annotation)||((i=l1.annotations)===null||i===void 0?void 0:(g1=i.UI)===null||g1===void 0?void 0:g1.SelectionFields)||[];var n1=s(s({},G(l1,"",l1.entityProperties,false,a)),H(l1,a.getManifestWrapper().getFilterConfiguration().navigationProperties,false,a));var o1=(m1===null||m1===void 0?void 0:m1.reduce(function(p1,q1){var r1=q1.value;if(!(r1 in k1)){var s1=J(n1,r1,a,l1);if(s1){s1.group="";s1.groupLabel="";p1.push(s1);}}return p1;},[]))||[];return{excludedFilterProperties:k1,entityType:l1,annotatedSelectionFields:m1,filterFields:n1,propertyInfoFields:o1};};var e1=function(a){var b;var g1=arguments.length>1&&arguments[1]!==undefined?arguments[1]:[];var h1=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"";var i1=d1(a,g1,h1);var j1=i1.excludedFilterProperties;var k1=i1.entityType;var l1=(b=k1.annotations.UI)===null||b===void 0?void 0:b.FilterFacets;var m1={};var n1=a.getAnnotationsByTerm("UI","com.sap.vocabularies.UI.v1.FieldGroup");if(l1===undefined||l1.length<0){for(var i in n1){m1=s(s({},m1),v(n1[i]));}}else{m1=l1.reduce(function(B1,C1){for(var _i=0;_i<C1.Target.$target.Data.length;_i++){var E1,F1;B1[C1.Target.$target.Data[_i].Value.path]={group:C1===null||C1===void 0?void 0:(E1=C1.ID)===null||E1===void 0?void 0:E1.toString(),groupLabel:C1===null||C1===void 0?void 0:(F1=C1.Label)===null||F1===void 0?void 0:F1.toString()};}return B1;},{});}var o1=[];var p1=g(k1,a);if(p1){o1=p1.SelectOptions;}var q1=i1.filterFields;var r1=i1.annotatedSelectionFields;var s1=L(q1,o1,k1,a,j1,r1);var t1=N(a);var u1=(r1===null||r1===void 0?void 0:r1.reduce(function(z1,B1){var C1=B1.value;if(!(C1 in j1)){var D1=J(q1,C1,a,k1);if(D1){D1.group="";D1.groupLabel="";z1.push(D1);}}return z1;},[]))||[];var v1=t1.concat(u1).concat(s1||[]).concat(Object.keys(q1).filter(function(B1){return!(B1 in j1);}).map(function(B1){return Object.assign(q1[B1],m1[B1]);}));var w1=a.getContextPath();if(x(g1,w1)){var x1=g1[0].aggregates;if(x1){var y1=Object.keys(x1).map(function(B1){return x1[B1].relativePath;});v1=v1.filter(function(B1){return y1.indexOf(B1.key)===-1;});}}var z1=n(v1,Q(k1,a),{"availability":"overwrite",label:"overwrite",type:"overwrite",position:"overwrite",template:"overwrite",settings:"overwrite",visualFilter:"overwrite"});var A1=p(a);z1.forEach(function(B1){B1.caseSensitive=A1;});return z1;};_.getSelectionFields=e1;var f1=function(i){var g1,h1,i1,j1,k1,l1;var m1=arguments.length>1&&arguments[1]!==undefined?arguments[1]:[];var n1=arguments.length>2&&arguments[2]!==undefined?arguments[2]:[];var o1=arguments.length>3&&arguments[3]!==undefined?arguments[3]:"";var p1=d1(i,m1,o1);var q1=[];var r1=p(i);var s1=[];var t1=function(a){var b=o(a,undefined);q1.push(a===null||a===void 0?void 0:a.type);if((a===null||a===void 0?void 0:a.type)==="Edm.String"&&(!b.constraints.nullable||b.constraints.nullable===true)){b.formatOptions.parseKeepsEmptyString=false;}s1.push(b);};var u1=p1.propertyInfoFields;var v1=N(i);u1=u1.concat(v1);u1=n(u1,Q(i.getEntityType(),i),{"availability":"overwrite",label:"overwrite",type:"overwrite",position:"overwrite",template:"overwrite",settings:"overwrite",visualFilter:"overwrite"});u1.forEach(function(a){if(a.annotationPath){var b=i.getConverterContextFor(a.annotationPath);var L1=b.getDataModelObjectPath().targetObject;t1(L1);}else{q1.push("Edm.String");s1.push({});}});var w1=(g1=i.getEntitySet())===null||g1===void 0?void 0:(h1=g1.annotations)===null||h1===void 0?void 0:(i1=h1.Capabilities)===null||i1===void 0?void 0:i1.FilterRestrictions;var x1={};x1["RequiredProperties"]=S(w1,"RequiredProperties")||[];x1["NonFilterableProperties"]=S(w1,"NonFilterableProperties")||[];x1["FilterAllowedExpressions"]=S(w1,"FilterAllowedExpressions")||{};var y1=i.getContextPath();var z1=y1.split("/");if(z1.length>2){var A1=z1[z1.length-1];z1.splice(-1,1);var B1=Y(i,A1);var C1=B1&&B1.FilterRestrictions;x1.RequiredProperties.concat(S(C1,"RequiredProperties")||[]);x1.NonFilterableProperties.concat(S(C1,"NonFilterableProperties")||[]);x1.FilterAllowedExpressions=s(s({},S(C1,"FilterAllowedExpressions")||{}),x1.FilterAllowedExpressions);}var D1=x1.RequiredProperties;var E1=x1.NonFilterableProperties;var F1=x1.FilterAllowedExpressions;var G1;var H1=[],I1=[];Object.keys(u1).forEach(function(a){var b=u1[a];var L1=b.conditionPath.replace(/\+|\*/g,"");if(E1.indexOf(L1)===-1){G1=b1(i,b,s1[a]);if(G1){if(F1[L1]&&F1[L1].length>0){G1=Object.assign(G1,{filterExpression:$(F1[L1])});}else{G1=Object.assign(G1,{filterExpression:"auto"});}G1=Object.assign(G1,{maxConditions:!G1.isParameter&&c1(G1)?-1:1,required:G1.isParameter||D1.indexOf(L1)>=0,caseSensitive:r1,visible:b.availability==="Default",dataType:q1[a]});H1.push(G1);if(G1.isParameter){I1.push(L1);}}}});if((j1=i.getDataModelObjectPath().targetObject)!==null&&j1!==void 0&&(k1=j1.annotations)!==null&&k1!==void 0&&(l1=k1.Common)!==null&&l1!==void 0&&l1.DraftRoot){H1.push(W());}if(y1&&O(m1,n1,i)!==true){var J1=X(i);if(!J1||J1!==null&&J1!==void 0&&J1.Searchable){H1.push(U());}}H1.sort(function(a,b){if(a.groupLabel===undefined||a.groupLabel===null){return-1;}if(b.groupLabel===undefined||b.groupLabel===null){return 1;}return a.groupLabel.localeCompare(b.groupLabel);});var K1=JSON.stringify(H1);K1=K1.replace(/\{/g,"\\{");K1=K1.replace(/\}/g,"\\}");return K1;};_.getPropertyInfoFields=f1;return _;},false);
+sap.ui.define(["../../ManifestSettings","sap/fe/core/converters/controls/Common/Table","sap/fe/core/converters/helpers/ConfigurableObject","sap/fe/core/converters/controls/ListReport/VisualFilters","sap/fe/core/helpers/BindingExpression","../Common/DataVisualization","sap/fe/core/converters/helpers/Key","sap/fe/core/converters/helpers/IssueManager"],function(M,T,C,V,B,D,K,I){"use strict";var _={};var c=I.IssueCategory;var d=I.IssueSeverity;var e=I.IssueType;var f=K.KeyHelper;var g=D.getSelectionVariant;var h=B.compileBinding;var j=B.annotationExpression;var k=V.getVisualFilters;var P=C.Placement;var l=C.insertCustomElements;var m=T.getTypeConfig;var n=T.isFilteringCaseSensitive;var o=T.getSelectionVariantConfiguration;var A=M.AvailabilityType;function p(a,b){var i=Object.keys(a);if(Object.getOwnPropertySymbols){var h1=Object.getOwnPropertySymbols(a);if(b){h1=h1.filter(function(i1){return Object.getOwnPropertyDescriptor(a,i1).enumerable;});}i.push.apply(i,h1);}return i;}function q(a){for(var i=1;i<arguments.length;i++){var b=arguments[i]!=null?arguments[i]:{};if(i%2){p(Object(b),true).forEach(function(h1){r(a,h1,b[h1]);});}else if(Object.getOwnPropertyDescriptors){Object.defineProperties(a,Object.getOwnPropertyDescriptors(b));}else{p(Object(b)).forEach(function(h1){Object.defineProperty(a,h1,Object.getOwnPropertyDescriptor(b,h1));});}}return a;}function r(a,b,i){if(b in a){Object.defineProperty(a,b,{value:i,enumerable:true,configurable:true,writable:true});}else{a[b]=i;}return a;}var s;(function(s){s["Default"]="Default";s["Slot"]="Slot";})(s||(s={}));var E="Edm.String";var S="sap.ui.model.odata.type.String";function t(a){var b={};a.Data.forEach(function(i){if(i.$Type==="com.sap.vocabularies.UI.v1.DataField"){var h1,i1;b[i.Value.path]={group:a.fullyQualifiedName,groupLabel:h(j(a.Label||((h1=a.annotations)===null||h1===void 0?void 0:(i1=h1.Common)===null||i1===void 0?void 0:i1.Label)||a.qualifier))||a.qualifier};}});return b;}function u(a){return a.reduce(function(b,i){i.propertyNames.forEach(function(h1){b[h1]=true;});return b;},{});}function v(a,b){if(b&&a.length>0){return a.every(function(i){return i.enableAnalytics&&b===i.annotation.collection;});}return false;}function w(a,b){var i=[];return a.map(function(h1){var i1=h1.control.filters;var j1=[];for(var k1 in i1){if(Array.isArray(i1[k1].paths)){var l1=i1[k1].paths;l1.forEach(function(m1){if(m1&&m1.annotationPath&&i.indexOf(m1.annotationPath)===-1){i.push(m1.annotationPath);var n1=o(m1.annotationPath,b);if(n1){j1.push(n1);}}});}}return j1;}).reduce(function(h1,i1){return h1.concat(i1);},[]);}var x=function(a,b){var i=b.split("/");var h1;var i1="";while(i.length){var j1=i.shift();h1=h1?h1+"/"+j1:j1;var k1=a.resolvePath(h1);if(k1._type==="NavigationProperty"&&k1.isCollection){j1+="*";}i1=i1?i1+"/"+j1:j1;}return i1;};var y=function(a,b,i,h1,i1){var j1,k1,l1;if(b!==undefined&&b.targetType===undefined&&(h1||((j1=b.annotations)===null||j1===void 0?void 0:(k1=j1.UI)===null||k1===void 0?void 0:(l1=k1.Hidden)===null||l1===void 0?void 0:l1.valueOf())!==true)){var m1,n1,o1,p1,q1,r1,s1,t1;var u1=i1.getAnnotationEntityType(b);return{key:f.getSelectionFieldKeyFromPath(i),annotationPath:i1.getAbsoluteAnnotationPath(i),conditionPath:x(a,i),availability:((m1=b.annotations)===null||m1===void 0?void 0:(n1=m1.UI)===null||n1===void 0?void 0:(o1=n1.HiddenFilter)===null||o1===void 0?void 0:o1.valueOf())===true?A.Hidden:A.Adaptation,label:h(j(((p1=b.annotations.Common)===null||p1===void 0?void 0:(q1=p1.Label)===null||q1===void 0?void 0:q1.valueOf())||b.name)),group:u1.name,groupLabel:h(j((u1===null||u1===void 0?void 0:(r1=u1.annotations)===null||r1===void 0?void 0:(s1=r1.Common)===null||s1===void 0?void 0:(t1=s1.Label)===null||t1===void 0?void 0:t1.valueOf())||u1.name))};}return undefined;};function z(a){var b={"Edm.Boolean":{modelType:"Bool"},"Edm.Byte":{modelType:"Int"},"Edm.Date":{modelType:"Date"},"Edm.DateTime":{modelType:"Date"},"Edm.DateTimeOffset":{modelType:"DateTimeOffset"},"Edm.Decimal":{modelType:"Decimal"},"Edm.Double":{modelType:"Float"},"Edm.Float":{modelType:"Float"},"Edm.Guid":{modelType:"Guid"},"Edm.Int16":{modelType:"Int"},"Edm.Int32":{modelType:"Int"},"Edm.Int64":{modelType:"Int"},"Edm.SByte":{modelType:"Int"},"Edm.Single":{modelType:"Float"},"Edm.String":{modelType:"String"},"Edm.Time":{modelType:"TimeOfDay"},"Edm.TimeOfDay":{modelType:"TimeOfDay"},"Edm.Stream":{}};return a&&a in b&&b[a].modelType;}_.getModelType=z;var F=function(a,b,i,h1,i1){var j1={};if(i){i.forEach(function(k1){var l1=k1.name;var m1=(b?b+"/":"")+l1;var n1=y(a,k1,m1,h1,i1);if(n1){j1[m1]=n1;}});}return j1;};var G=function(a,b,i,h1){var i1={};if(b){b.forEach(function(j1){var k1;var l1=a.resolvePath(j1);if(l1===undefined){return;}if(l1._type==="NavigationProperty"){k1=F(a,j1,l1.targetType.entityProperties,i,h1);}else if(l1.targetType!==undefined&&l1.targetType._type==="ComplexType"){k1=F(a,j1,l1.targetType.properties,i,h1);}else{var m1=j1.includes("/")?j1.split("/").splice(0,1).join("/"):"";k1=F(a,m1,[l1],i,h1);}i1=q(q({},i1),k1);});}return i1;};var H=function(a,b,i,h1){var i1=a[b];if(i1){delete a[b];}else{i1=y(h1,h1.resolvePath(b),b,true,i);}if(!i1){var j1;(j1=i.getDiagnostics())===null||j1===void 0?void 0:j1.addIssue(c.Annotation,d.High,e.MISSING_SELECTIONFIELD);}if(i1){var k1,l1;i1.availability=A.Default;i1.isParameter=!!((k1=h1.annotations)!==null&&k1!==void 0&&(l1=k1.Common)!==null&&l1!==void 0&&l1.ResultContext);}return i1;};var J=function(a,b,i,h1,i1,j1){var k1=[];var l1={};var m1=i.entityProperties;j1===null||j1===void 0?void 0:j1.forEach(function(n1){l1[n1.value]=true;});if(b&&b.length>0){b===null||b===void 0?void 0:b.forEach(function(n1){var o1=n1.PropertyName;var p1=o1.value;var l1={};j1===null||j1===void 0?void 0:j1.forEach(function(r1){l1[r1.value]=true;});if(!(p1 in i1)){if(!(p1 in l1)){var q1=H(a,p1,h1,i);if(q1){k1.push(q1);}}}});}else if(m1){m1.forEach(function(n1){var o1,p1;var q1=(o1=n1.annotations)===null||o1===void 0?void 0:(p1=o1.Common)===null||p1===void 0?void 0:p1.FilterDefaultValue;var r1=n1.name;if(!(r1 in i1)){if(q1&&!(r1 in l1)){var s1=H(a,r1,h1,i);if(s1){k1.push(s1);}}}});}return k1;};function L(a){var b,i;var h1=a.getDataModelObjectPath();var i1=h1.startingEntitySet.entityType;var j1=!!((b=i1.annotations)!==null&&b!==void 0&&(i=b.Common)!==null&&i!==void 0&&i.ResultContext);var k1=j1&&a.getConverterContextFor("/"+h1.startingEntitySet.name);var l1=k1?i1.entityProperties.map(function(m1){return H({},m1.name,k1,i1);}):[];return l1;}var N=function(a,b,i){var h1=b.length===0||b.every(function(k1){return!k1.applySupported.enableSearch;});var i1=a.length===0||a.every(function(k1){return k1.enableAnalytics&&!k1.enableAnalyticsSearch;});var j1=i.getContextPath();if(j1&&h1&&i1){return true;}else{return false;}};_.getFilterBarhideBasicSearch=N;var O=function(a,b){var i=b.getManifestWrapper().getFilterConfiguration();var h1=(i===null||i===void 0?void 0:i.filterFields)||{};var i1=G(a,Object.keys(h1).map(function(q1){return f.getPathFromSelectionFieldKey(q1);}),true,b);var j1={};for(var k1 in h1){var l1=h1[k1];var m1=f.getPathFromSelectionFieldKey(k1);var n1=i1[m1];var o1=l1.type==="Slot"?s.Slot:s.Default;var p1=l1&&l1!==null&&l1!==void 0&&l1.visualFilter?k(a,b,k1,h1):undefined;j1[k1]={key:k1,type:o1,annotationPath:n1===null||n1===void 0?void 0:n1.annotationPath,conditionPath:(n1===null||n1===void 0?void 0:n1.conditionPath)||m1,template:l1.template,label:l1.label,position:l1.position||{placement:P.After},availability:l1.availability||A.Default,settings:l1.settings,visualFilter:p1};}return j1;};_.getManifestFilterFields=O;var Q=function(a,b,i){return H({},a,b,i);};_.getFilterField=Q;var R=function(a,b){if(b==="RequiredProperties"||b==="NonFilterableProperties"){var i=[];if(a&&a[b]){i=a[b].map(function(i1){return i1.$PropertyPath||i1.value;});}return i;}else if(b==="FilterAllowedExpressions"){var h1={};if(a&&a.FilterExpressionRestrictions){a.FilterExpressionRestrictions.forEach(function(i1){if(h1[i1.Property.value]){h1[i1.Property.value].push(i1.AllowedExpressions);}else{h1[i1.Property.value]=[i1.AllowedExpressions];}});}return h1;}return a;};_.getFilterRestrictions=R;var U=function(){return{name:"$search",path:"$search",dataType:S,maxConditions:1};};var W=function(){return{name:"$editState",path:"$editState",groupLabel:"",group:"",dataType:S,hiddenFilter:false};};var X=function(a){var b,i,h1;return(b=a.getEntitySet())===null||b===void 0?void 0:(i=b.annotations)===null||i===void 0?void 0:(h1=i.Capabilities)===null||h1===void 0?void 0:h1.SearchRestrictions;};var Y=function(a,b){var i,h1,i1;var j1=(i=a.getEntitySet())===null||i===void 0?void 0:(h1=i.annotations)===null||h1===void 0?void 0:(i1=h1.Capabilities)===null||i1===void 0?void 0:i1.NavigationRestrictions;var k1=j1&&j1.RestrictedProperties;return k1&&k1.find(function(l1){return l1&&l1.NavigationProperty&&(l1.NavigationProperty.$NavigationPropertyPath===b||l1.NavigationProperty.value===b);});};_.getNavigationRestrictions=Y;var Z=function(a){return{key:a.key,annotationPath:a.annotationPath,conditionPath:a.conditionPath,name:a.conditionPath,label:a.label,hiddenFilter:a.availability==="Hidden",display:"Value",isParameter:a.isParameter,caseSensitive:a.caseSensitive,availability:a.availability,position:a.position,type:a.type,template:a.template,menu:a.menu};};var $=function(i){var h1=["SingleValue","MultiValue","SingleRange","MultiRange","SearchExpression","MultiRangeOrSearchExpression"];i.sort(function(a,b){return h1.indexOf(a)-h1.indexOf(b);});return i[0];};_.getSpecificAllowedExpression=$;var a1=function(a,b){var i,h1,i1,j1,k1,l1;var m1=a===null||a===void 0?void 0:(i=a.Common)===null||i===void 0?void 0:i.Text,n1=m1&&(a&&(a===null||a===void 0?void 0:(h1=a.Common)===null||h1===void 0?void 0:(i1=h1.Text)===null||i1===void 0?void 0:(j1=i1.annotations)===null||j1===void 0?void 0:(k1=j1.UI)===null||k1===void 0?void 0:k1.TextArrangement)||b&&(b===null||b===void 0?void 0:(l1=b.UI)===null||l1===void 0?void 0:l1.TextArrangement));if(n1){if(n1.valueOf()==="UI.TextArrangementType/TextOnly"){return"Description";}else if(n1.valueOf()==="UI.TextArrangementType/TextLast"){return"ValueDescription";}return"DescriptionValue";}return m1?"DescriptionValue":"Value";};_.displayMode=a1;var b1=function(a,b,i){var h1;var i1=Z(b);var j1=b.annotationPath;if(!j1){return i1;}var k1=a.getConverterContextFor(j1).getDataModelObjectPath().targetObject;var l1=k1===null||k1===void 0?void 0:k1.annotations;var m1=a===null||a===void 0?void 0:(h1=a.getDataModelObjectPath().targetObject)===null||h1===void 0?void 0:h1.annotations;var n1=i.formatOptions;var o1=i.constraints;i1=Object.assign(i1,{formatOptions:n1,constraints:o1,display:a1(l1,m1)});return i1;};var c1=function(a){var i=true;switch(a.filterExpression){case"SearchExpression":case"SingleRange":case"SingleValue":i=false;break;default:break;}if(a.type&&a.type.indexOf("Boolean")>0){i=false;}return i;};_.isMultiValue=c1;var d1=function(a){var b,i,h1;var i1=arguments.length>1&&arguments[1]!==undefined?arguments[1]:[];var j1=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"";var k1=w(i1,a);var l1=u(k1);var m1=a.getEntityType();var n1=j1&&((b=a.getEntityTypeAnnotation(j1))===null||b===void 0?void 0:b.annotation)||((i=m1.annotations)===null||i===void 0?void 0:(h1=i.UI)===null||h1===void 0?void 0:h1.SelectionFields)||[];var o1=q(q({},F(m1,"",m1.entityProperties,false,a)),G(m1,a.getManifestWrapper().getFilterConfiguration().navigationProperties,false,a));var p1=(n1===null||n1===void 0?void 0:n1.reduce(function(q1,r1){var s1=r1.value;if(!(s1 in l1)){var t1=H(o1,s1,a,m1);if(t1){t1.group="";t1.groupLabel="";q1.push(t1);}}return q1;},[]))||[];return{excludedFilterProperties:l1,entityType:m1,annotatedSelectionFields:n1,filterFields:o1,propertyInfoFields:p1};};var e1=function(a,b){var i,h1,i1,j1,k1,l1;var m1=[];var n1=[];var o1=function(D1){var E1=m(D1,undefined);n1.push(D1===null||D1===void 0?void 0:D1.type);if((D1===null||D1===void 0?void 0:D1.type)===E&&(!E1.constraints.nullable||E1.constraints.nullable===true)){E1.formatOptions.parseKeepsEmptyString=false;}m1.push(E1);};a.forEach(function(D1){if(D1.annotationPath){var E1=b.getConverterContextFor(D1.annotationPath);var F1=E1.getDataModelObjectPath().targetObject;o1(F1);}else{n1.push(E);m1.push({type:S});}});var p1=(i=b.getEntitySet())===null||i===void 0?void 0:(h1=i.annotations)===null||h1===void 0?void 0:(i1=h1.Capabilities)===null||i1===void 0?void 0:i1.FilterRestrictions;var q1={};q1["RequiredProperties"]=R(p1,"RequiredProperties")||[];q1["NonFilterableProperties"]=R(p1,"NonFilterableProperties")||[];q1["FilterAllowedExpressions"]=R(p1,"FilterAllowedExpressions")||{};var r1=b.getContextPath();var s1=r1.split("/");if(s1.length>2){var t1=s1[s1.length-1];s1.splice(-1,1);var u1=Y(b,t1);var v1=u1&&u1.FilterRestrictions;q1.RequiredProperties.concat(R(v1,"RequiredProperties")||[]);q1.NonFilterableProperties.concat(R(v1,"NonFilterableProperties")||[]);q1.FilterAllowedExpressions=q(q({},R(v1,"FilterAllowedExpressions")||{}),q1.FilterAllowedExpressions);}var w1=n(b);var x1=q1.RequiredProperties;var y1=q1.NonFilterableProperties;var z1;var A1=[];Object.keys(a).forEach(function(D1){var E1=a[D1];var F1;if(E1.conditionPath){F1=E1.conditionPath.replace(/\+|\*/g,"");}if(y1.indexOf(F1)===-1){z1=b1(b,E1,m1[D1]);if(z1){z1=Object.assign(z1,{maxConditions:!z1.isParameter&&c1(z1)?-1:1,required:z1.isParameter||x1.indexOf(F1)>=0,caseSensitive:w1,dataType:n1[D1]});A1.push(z1);}}});if((j1=b.getDataModelObjectPath().targetObject)!==null&&j1!==void 0&&(k1=j1.annotations)!==null&&k1!==void 0&&(l1=k1.Common)!==null&&l1!==void 0&&l1.DraftRoot){A1.push(W());}var B1=X(b);var C1=Boolean(B1&&!B1.Searchable);if(r1&&C1!==true){if(!B1||B1!==null&&B1!==void 0&&B1.Searchable){A1.push(U());}}return A1;};_.processSelectionFields=e1;var f1=function(a,b,i){return l(a,O(b,i),{"availability":"overwrite",label:"overwrite",type:"overwrite",position:"overwrite",template:"overwrite",settings:"overwrite",visualFilter:"overwrite"});};_.insertCustomManifestElements=f1;var g1=function(h1){var i1,j1;var k1=arguments.length>1&&arguments[1]!==undefined?arguments[1]:[];var l1=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"";var m1=d1(h1,k1,l1);var n1=L(h1);var o1=JSON.parse(JSON.stringify(m1.propertyInfoFields));var p1=m1.entityType;o1=n1.concat(o1);o1=f1(o1,p1,h1);var q1=e1(o1,h1);q1.sort(function(a,b){if(a.groupLabel===undefined||a.groupLabel===null){return-1;}if(b.groupLabel===undefined||b.groupLabel===null){return 1;}return a.groupLabel.localeCompare(b.groupLabel);});var r1=JSON.stringify(q1);r1=r1.replace(/\{/g,"\\{");r1=r1.replace(/\}/g,"\\}");var s1=r1;var t1=JSON.parse(JSON.stringify(m1.propertyInfoFields));t1=n1.concat(t1);var u1=m1.excludedFilterProperties;var v1=p1===null||p1===void 0?void 0:(i1=p1.annotations)===null||i1===void 0?void 0:(j1=i1.UI)===null||j1===void 0?void 0:j1.FilterFacets;var w1={};var x1=h1.getAnnotationsByTerm("UI","com.sap.vocabularies.UI.v1.FieldGroup");if(v1===undefined||v1.length<0){for(var i in x1){w1=q(q({},w1),t(x1[i]));}}else{w1=v1.reduce(function(a,b){for(var _i=0;_i<b.Target.$target.Data.length;_i++){var J1,K1;a[b.Target.$target.Data[_i].Value.path]={group:b===null||b===void 0?void 0:(J1=b.ID)===null||J1===void 0?void 0:J1.toString(),groupLabel:b===null||b===void 0?void 0:(K1=b.Label)===null||K1===void 0?void 0:K1.toString()};}return a;},{});}var y1=[];var z1=g(p1,h1);if(z1){y1=z1.SelectOptions;}var A1=m1.filterFields;var B1=m1.annotatedSelectionFields;var C1=J(A1,y1,p1,h1,u1,B1);var D1=t1.concat(C1||[]).concat(Object.keys(A1).filter(function(a){return!(a in u1);}).map(function(a){return Object.assign(A1[a],w1[a]);}));var E1=h1.getContextPath();if(v(k1,E1)){var F1=k1[0].aggregates;if(F1){var G1=Object.keys(F1).map(function(a){return F1[a].relativePath;});D1=D1.filter(function(a){return G1.indexOf(a.key)===-1;});}}var H1=f1(D1,p1,h1);var I1=n(h1);H1.forEach(function(a){a.caseSensitive=I1;});return{selectionFields:H1,sPropertyInfo:s1};};_.getSelectionFields=g1;return _;},false);

package/packages/sap.fe.core/src/sap/fe/core/converters/controls/ListReport/FilterBar.ts

@@ -18,7 +18,7 @@ import { getSelectionVariant } from "../Common/DataVisualization";
 import { KeyHelper } from "sap/fe/core/converters/helpers/Key";
 import { IssueType, IssueSeverity, IssueCategory } from "sap/fe/core/converters/helpers/IssueManager";
 import { PropertyPath } from "@sap-ux/vocabularies-types/dist/Edm";
-import { hasValueHelp } from "sap/fe/core/templating/PropertyHelper";
+//import { hasValueHelp } from "sap/fe/core/templating/PropertyHelper";
 
 export type FilterField = ConfigurableObject & {
 	type?: string;
@@ -45,6 +45,9 @@ enum filterFieldType {
 	Slot = "Slot"
 }
 
+const sEdmString = "Edm.String";
+const sStringDataType = "sap.ui.model.odata.type.String";
+
 export type CustomElementFilterField = CustomElement<FilterField>;
 
 /**
@@ -513,7 +516,7 @@ const getSearchFilterPropertyInfo = function() {
 	return {
 		name: "$search",
 		path: "$search",
-		dataType: "Edm.String",
+		dataType: sStringDataType,
 		maxConditions: 1
 	};
 };
@@ -524,8 +527,7 @@ const getEditStateFilterPropertyInfo = function() {
 		path: "$editState",
 		groupLabel: "",
 		group: "",
-		dataType: "Edm.String",
-		tooltip: null,
+		dataType: sStringDataType,
 		hiddenFilter: false
 	};
 };
@@ -556,20 +558,16 @@ const _fetchBasicPropertyInfo = function(oFilterFieldInfo: any) {
 		annotationPath: oFilterFieldInfo.annotationPath,
 		conditionPath: oFilterFieldInfo.conditionPath,
 		name: oFilterFieldInfo.conditionPath,
-		path: oFilterFieldInfo.conditionPath,
-		groupLabel: oFilterFieldInfo.groupLabel,
-		group: oFilterFieldInfo.group,
 		label: oFilterFieldInfo.label,
-		tooltip: null,
 		hiddenFilter: oFilterFieldInfo.availability === "Hidden",
-		removeFromAppState: false,
-		hasValueHelp: false,
 		display: "Value",
 		isParameter: oFilterFieldInfo.isParameter,
 		caseSensitive: oFilterFieldInfo.caseSensitive,
 		availability: oFilterFieldInfo.availability,
 		position: oFilterFieldInfo.position,
-		type: oFilterFieldInfo.type
+		type: oFilterFieldInfo.type,
+		template: oFilterFieldInfo.template,
+		menu: oFilterFieldInfo.menu
 	};
 };
 
@@ -616,42 +614,16 @@ const _fetchPropertyInfo = function(converterContext: ConverterContext, oFilterF
 		return oPropertyInfo;
 	}
 	const targetPropertyObject = converterContext.getConverterContextFor(sAnnotationPath).getDataModelObjectPath().targetObject;
-	const oProperty = {
-		$MaxLength: targetPropertyObject.maxLength,
-		$Type: targetPropertyObject.type,
-		$kind: targetPropertyObject._type
-	};
+
 	const oPropertyAnnotations = targetPropertyObject?.annotations;
 	const oCollectionAnnotations = converterContext?.getDataModelObjectPath().targetObject?.annotations;
 
-	let oFilterDefaultValue;
 	const oFormatOptions = oTypeConfig.formatOptions;
 	const oConstraints = oTypeConfig.constraints;
-	const bRemoveFromAppState =
-		oPropertyAnnotations?.PersonalData?.IsPotentiallySensitive ||
-		oPropertyAnnotations?.ExcludeFromNavigationContext ||
-		oPropertyAnnotations?.Analytics?.Measure;
-
-	const oFilterDefaultValueAnnotation = oPropertyAnnotations?.Common?.FilterDefaultValue;
-	if (oFilterDefaultValueAnnotation) {
-		oFilterDefaultValue = oFilterDefaultValueAnnotation["$" + getModelType(oProperty.$Type)];
-	}
 	oPropertyInfo = Object.assign(oPropertyInfo, {
-		tooltip: oPropertyAnnotations?.Common?.QuickInfo?.valueOf() || undefined,
-		removeFromAppState: bRemoveFromAppState,
-		hasValueHelp: hasValueHelp(targetPropertyObject),
 		formatOptions: oFormatOptions,
 		constraints: oConstraints,
-		display: displayMode(oPropertyAnnotations, oCollectionAnnotations),
-		defaultFilterConditions: oFilterDefaultValue
-			? [
-					{
-						fieldPath: oFilterFieldInfo.conditionPath,
-						operator: "EQ",
-						values: [oFilterDefaultValue]
-					}
-			  ]
-			: undefined
+		display: displayMode(oPropertyAnnotations, oCollectionAnnotations)
 	});
 	return oPropertyInfo;
 };
@@ -725,11 +697,115 @@ const getAnnotatedSelectionFieldData = function(
 		propertyInfoFields: propertyInfoFields
 	};
 };
+export const processSelectionFields = function(propertyInfoFields: any, converterContext: ConverterContext) {
+	//get TypeConfig function
+	const aTypeConfig: any = [];
+	const selectionFieldTypes: any = [];
+	const _fnTypeConfig = function(property: Property) {
+		const oTypeConfig = getTypeConfig(property, undefined);
+		selectionFieldTypes.push(property?.type);
+		if (property?.type === sEdmString && (!oTypeConfig.constraints.nullable || oTypeConfig.constraints.nullable === true)) {
+			oTypeConfig.formatOptions.parseKeepsEmptyString = false;
+		}
+		aTypeConfig.push(oTypeConfig);
+	};
+
+	//add typeConfig
+	propertyInfoFields.forEach(function(parameterField: any) {
+		if (parameterField.annotationPath) {
+			const propertyConvertyContext = converterContext.getConverterContextFor(parameterField.annotationPath);
+			const propertyTargetObject = propertyConvertyContext.getDataModelObjectPath().targetObject;
+			_fnTypeConfig(propertyTargetObject);
+		} else {
+			selectionFieldTypes.push(sEdmString);
+			aTypeConfig.push({ type: sStringDataType });
+		}
+	});
+
+	// filterRestrictions
+	const oFilterRestrictions = converterContext.getEntitySet()?.annotations?.Capabilities?.FilterRestrictions;
+	const oRet = {} as any;
+	oRet["RequiredProperties"] = getFilterRestrictions(oFilterRestrictions, "RequiredProperties") || [];
+	oRet["NonFilterableProperties"] = getFilterRestrictions(oFilterRestrictions, "NonFilterableProperties") || [];
+	oRet["FilterAllowedExpressions"] = getFilterRestrictions(oFilterRestrictions, "FilterAllowedExpressions") || {};
+
+	const sEntitySetPath = converterContext.getContextPath();
+	const aPathParts = sEntitySetPath.split("/");
+	if (aPathParts.length > 2) {
+		const sNavigationPath = aPathParts[aPathParts.length - 1];
+		aPathParts.splice(-1, 1);
+		const oNavigationRestrictions = getNavigationRestrictions(converterContext, sNavigationPath);
+		const oNavigationFilterRestrictions = oNavigationRestrictions && oNavigationRestrictions.FilterRestrictions;
+		oRet.RequiredProperties.concat(getFilterRestrictions(oNavigationFilterRestrictions, "RequiredProperties") || []);
+		oRet.NonFilterableProperties.concat(getFilterRestrictions(oNavigationFilterRestrictions, "NonFilterableProperties") || []);
+		oRet.FilterAllowedExpressions = {
+			...(getFilterRestrictions(oNavigationFilterRestrictions, "FilterAllowedExpressions") || {}),
+			...oRet.FilterAllowedExpressions
+		};
+	}
+	const isCaseSensitive = isFilteringCaseSensitive(converterContext);
+	const aRequiredProps = oRet.RequiredProperties;
+	const aNonFilterableProps = oRet.NonFilterableProperties;
+	let oPropertyInfo;
+	const aFetchedProperties: any = [];
+
+	// process the fields to add necessary properties
+	Object.keys(propertyInfoFields).forEach(function(sFilterFieldKey: string) {
+		const oConvertedProperty = propertyInfoFields[sFilterFieldKey];
+		let sPropertyPath;
+		if (oConvertedProperty.conditionPath) {
+			sPropertyPath = oConvertedProperty.conditionPath.replace(/\+|\*/g, "");
+		}
+		if (aNonFilterableProps.indexOf(sPropertyPath) === -1) {
+			oPropertyInfo = _fetchPropertyInfo(converterContext, oConvertedProperty, aTypeConfig[sFilterFieldKey]);
+			if (oPropertyInfo) {
+				oPropertyInfo = Object.assign(oPropertyInfo, {
+					maxConditions: !oPropertyInfo.isParameter && isMultiValue(oPropertyInfo) ? -1 : 1,
+					required: oPropertyInfo.isParameter || aRequiredProps.indexOf(sPropertyPath) >= 0,
+					caseSensitive: isCaseSensitive,
+					dataType: selectionFieldTypes[sFilterFieldKey]
+				});
+
+				aFetchedProperties.push(oPropertyInfo);
+			}
+		}
+	});
+
+	//add edit
+	if (converterContext.getDataModelObjectPath().targetObject?.annotations?.Common?.DraftRoot) {
+		aFetchedProperties.push(getEditStateFilterPropertyInfo());
+	}
+	// add search
+	const searchRestrictions = getSearchRestrictions(converterContext);
+	const hideBasicSearch = Boolean(searchRestrictions && !searchRestrictions.Searchable);
+	if (sEntitySetPath && hideBasicSearch !== true) {
+		if (!searchRestrictions || searchRestrictions?.Searchable) {
+			aFetchedProperties.push(getSearchFilterPropertyInfo());
+		}
+	}
+
+	return aFetchedProperties;
+};
+
+export const insertCustomManifestElements = function(
+	filterFields: FilterField[],
+	entityType: EntityType,
+	converterContext: ConverterContext
+) {
+	return insertCustomElements(filterFields, getManifestFilterFields(entityType, converterContext), {
+		"availability": "overwrite",
+		label: "overwrite",
+		type: "overwrite",
+		position: "overwrite",
+		template: "overwrite",
+		settings: "overwrite",
+		visualFilter: "overwrite"
+	});
+};
 
 /**
  * Retrieve the configuration for the selection fields that will be used within the filter bar
  * This configuration takes into account annotation and the selection variants.
- *
  * @param {ConverterContext} converterContext
  * @param {TableVisualization[]} lrTables
  * @param {string} annotationPath
@@ -739,13 +815,39 @@ export const getSelectionFields = function(
 	converterContext: ConverterContext,
 	lrTables: TableVisualization[] = [],
 	annotationPath: string = ""
-): FilterField[] {
+): any {
 	const oAnnotatedSelectionFieldData = getAnnotatedSelectionFieldData(converterContext, lrTables, annotationPath);
+	const parameterFields = _getParameterFields(converterContext);
+	let propertyInfoFields: FilterField[] = JSON.parse(JSON.stringify(oAnnotatedSelectionFieldData.propertyInfoFields));
+	const entityType = oAnnotatedSelectionFieldData.entityType;
+
+	propertyInfoFields = parameterFields.concat(propertyInfoFields);
 
+	propertyInfoFields = insertCustomManifestElements(propertyInfoFields, entityType, converterContext);
+
+	const aFetchedProperties = processSelectionFields(propertyInfoFields, converterContext);
+	aFetchedProperties.sort(function(a: any, b: any) {
+		if (a.groupLabel === undefined || a.groupLabel === null) {
+			return -1;
+		}
+		if (b.groupLabel === undefined || b.groupLabel === null) {
+			return 1;
+		}
+		return a.groupLabel.localeCompare(b.groupLabel);
+	});
+
+	let sFetchProperties = JSON.stringify(aFetchedProperties);
+	sFetchProperties = sFetchProperties.replace(/\{/g, "\\{");
+	sFetchProperties = sFetchProperties.replace(/\}/g, "\\}");
+	const sPropertyInfo = sFetchProperties;
+	// end of propertyFields processing
+
+	// to populate selection fields
+	let propSelectionFields: FilterField[] = JSON.parse(JSON.stringify(oAnnotatedSelectionFieldData.propertyInfoFields));
+	propSelectionFields = parameterFields.concat(propSelectionFields);
 	// create a map of properties to be used in selection variants
 	const excludedFilterProperties: Record<string, boolean> = oAnnotatedSelectionFieldData.excludedFilterProperties;
-	const entityType = oAnnotatedSelectionFieldData.entityType;
-	const filterFacets = entityType.annotations.UI?.FilterFacets;
+	const filterFacets = entityType?.annotations?.UI?.FilterFacets;
 	let filterFacetMap: Record<string, FilterGroup> = {};
 
 	const aFieldGroups = converterContext.getAnnotationsByTerm("UI", UIAnnotationTerms.FieldGroup);
@@ -788,24 +890,9 @@ export const getSelectionFields = function(
 		excludedFilterProperties,
 		annotatedSelectionFields
 	);
-	const parameterFields = _getParameterFields(converterContext);
-	const propertyInfoFields: any =
-		annotatedSelectionFields?.reduce((selectionFields: FilterField[], selectionField) => {
-			const propertyPath = selectionField.value;
-			if (!(propertyPath in excludedFilterProperties)) {
-				const filterField: FilterField | undefined = _getFilterField(filterFields, propertyPath, converterContext, entityType);
-				if (filterField) {
-					filterField.group = "";
-					filterField.groupLabel = "";
-					selectionFields.push(filterField);
-				}
-			}
-			return selectionFields;
-		}, []) || [];
 
 	// finally create final list of filter fields by adding the SelectionFields first (order matters)...
-	let allFilters = parameterFields
-		.concat(propertyInfoFields)
+	let allFilters = propSelectionFields
 		// To add the FilterField which is not part of the Selection Fields but the property is mentioned in the Selection Variant
 		.concat(defaultFilters || [])
 		// ...and adding remaining filter fields, that are not used in a SelectionVariant (order doesn't matter)
@@ -832,15 +919,7 @@ export const getSelectionFields = function(
 		}
 	}
 
-	const selectionFields = insertCustomElements(allFilters, getManifestFilterFields(entityType, converterContext), {
-		"availability": "overwrite",
-		label: "overwrite",
-		type: "overwrite",
-		position: "overwrite",
-		template: "overwrite",
-		settings: "overwrite",
-		visualFilter: "overwrite"
-	});
+	const selectionFields = insertCustomManifestElements(allFilters, entityType, converterContext);
 
 	// Add caseSensitive property to all selection fields.
 	const isCaseSensitive = isFilteringCaseSensitive(converterContext);
@@ -848,142 +927,5 @@ export const getSelectionFields = function(
 		filterField.caseSensitive = isCaseSensitive;
 	});
 
-	return selectionFields;
-};
-
-export const getPropertyInfoFields = function(
-	converterContext: ConverterContext,
-	lrTables: TableVisualization[] = [],
-	lrCharts: ChartVisualization[] = [],
-	annotationPath: string = ""
-) {
-	const oAnnotatedSelectionFieldData = getAnnotatedSelectionFieldData(converterContext, lrTables, annotationPath);
-	//const annotatedSelectionFields: any = oAnnotatedSelectionFieldData.annotatedSelectionFields;
-	const selectionFieldTypes: any = [];
-	const isCaseSensitive = isFilteringCaseSensitive(converterContext);
-	const aTypeConfig: any = [];
-	const _fnTypeConfig = function(property: Property) {
-		const oTypeConfig = getTypeConfig(property, undefined);
-		selectionFieldTypes.push(property?.type);
-		if (property?.type === "Edm.String" && (!oTypeConfig.constraints.nullable || oTypeConfig.constraints.nullable === true)) {
-			oTypeConfig.formatOptions.parseKeepsEmptyString = false;
-		}
-		aTypeConfig.push(oTypeConfig);
-	};
-
-	let propertyInfoFields: any = oAnnotatedSelectionFieldData.propertyInfoFields;
-	const parameterFields = _getParameterFields(converterContext);
-	propertyInfoFields = propertyInfoFields.concat(parameterFields);
-
-	propertyInfoFields = insertCustomElements(
-		propertyInfoFields,
-		getManifestFilterFields(converterContext.getEntityType(), converterContext),
-		{
-			"availability": "overwrite",
-			label: "overwrite",
-			type: "overwrite",
-			position: "overwrite",
-			template: "overwrite",
-			settings: "overwrite",
-			visualFilter: "overwrite"
-		}
-	);
-
-	propertyInfoFields.forEach(function(parameterField: any) {
-		if (parameterField.annotationPath) {
-			const propertyConvertyContext = converterContext.getConverterContextFor(parameterField.annotationPath);
-			const propertyTargetObject = propertyConvertyContext.getDataModelObjectPath().targetObject;
-			_fnTypeConfig(propertyTargetObject);
-		} else {
-			selectionFieldTypes.push("Edm.String");
-			aTypeConfig.push({});
-		}
-	});
-
-	const oFilterRestrictions = converterContext.getEntitySet()?.annotations?.Capabilities?.FilterRestrictions;
-	const oRet = {} as any;
-	oRet["RequiredProperties"] = getFilterRestrictions(oFilterRestrictions, "RequiredProperties") || [];
-	oRet["NonFilterableProperties"] = getFilterRestrictions(oFilterRestrictions, "NonFilterableProperties") || [];
-	oRet["FilterAllowedExpressions"] = getFilterRestrictions(oFilterRestrictions, "FilterAllowedExpressions") || {};
-
-	const sEntitySetPath = converterContext.getContextPath();
-	const aPathParts = sEntitySetPath.split("/");
-	if (aPathParts.length > 2) {
-		const sNavigationPath = aPathParts[aPathParts.length - 1];
-		aPathParts.splice(-1, 1);
-		const oNavigationRestrictions = getNavigationRestrictions(converterContext, sNavigationPath);
-		const oNavigationFilterRestrictions = oNavigationRestrictions && oNavigationRestrictions.FilterRestrictions;
-		oRet.RequiredProperties.concat(getFilterRestrictions(oNavigationFilterRestrictions, "RequiredProperties") || []);
-		oRet.NonFilterableProperties.concat(getFilterRestrictions(oNavigationFilterRestrictions, "NonFilterableProperties") || []);
-		oRet.FilterAllowedExpressions = {
-			...(getFilterRestrictions(oNavigationFilterRestrictions, "FilterAllowedExpressions") || {}),
-			...oRet.FilterAllowedExpressions
-		};
-	}
-
-	const aRequiredProps = oRet.RequiredProperties;
-	const aNonFilterableProps = oRet.NonFilterableProperties;
-	const mAllowedExpressions = oRet.FilterAllowedExpressions;
-	let oPropertyInfo;
-	const aFetchedProperties: any = [],
-		aParameterFields = [];
-	Object.keys(propertyInfoFields).forEach(function(sFilterFieldKey: string) {
-		const oConvertedProperty = propertyInfoFields[sFilterFieldKey];
-		const sPropertyPath = oConvertedProperty.conditionPath.replace(/\+|\*/g, "");
-
-		if (aNonFilterableProps.indexOf(sPropertyPath) === -1) {
-			oPropertyInfo = _fetchPropertyInfo(converterContext, oConvertedProperty, aTypeConfig[sFilterFieldKey]);
-			if (oPropertyInfo) {
-				if (mAllowedExpressions[sPropertyPath] && mAllowedExpressions[sPropertyPath].length > 0) {
-					oPropertyInfo = Object.assign(oPropertyInfo, {
-						filterExpression: getSpecificAllowedExpression(mAllowedExpressions[sPropertyPath])
-					});
-				} else {
-					oPropertyInfo = Object.assign(oPropertyInfo, {
-						filterExpression: "auto"
-					});
-				}
-				oPropertyInfo = Object.assign(oPropertyInfo, {
-					maxConditions: !oPropertyInfo.isParameter && isMultiValue(oPropertyInfo) ? -1 : 1,
-					required: oPropertyInfo.isParameter || aRequiredProps.indexOf(sPropertyPath) >= 0,
-					caseSensitive: isCaseSensitive,
-					visible: oConvertedProperty.availability === "Default",
-					dataType: selectionFieldTypes[sFilterFieldKey]
-					//label: getLocalizedText(oConvertedProperty.label)
-				});
-
-				aFetchedProperties.push(oPropertyInfo);
-				if (oPropertyInfo.isParameter) {
-					aParameterFields.push(sPropertyPath);
-				}
-			}
-		}
-	});
-
-	if (converterContext.getDataModelObjectPath().targetObject?.annotations?.Common?.DraftRoot) {
-		aFetchedProperties.push(getEditStateFilterPropertyInfo());
-	}
-
-	if (sEntitySetPath && getFilterBarhideBasicSearch(lrTables, lrCharts, converterContext) !== true) {
-		const searchRestrictions = getSearchRestrictions(converterContext);
-		if (!searchRestrictions || searchRestrictions?.Searchable) {
-			aFetchedProperties.push(getSearchFilterPropertyInfo());
-		}
-	}
-
-	aFetchedProperties.sort(function(a: any, b: any) {
-		if (a.groupLabel === undefined || a.groupLabel === null) {
-			return -1;
-		}
-		if (b.groupLabel === undefined || b.groupLabel === null) {
-			return 1;
-		}
-		return a.groupLabel.localeCompare(b.groupLabel);
-	});
-
-	let sFetchProperties = JSON.stringify(aFetchedProperties);
-	sFetchProperties = sFetchProperties.replace(/\{/g, "\\{");
-	sFetchProperties = sFetchProperties.replace(/\}/g, "\\}");
-
-	return sFetchProperties;
+	return { selectionFields, sPropertyInfo };
 };