@@ -96,7 +96,7 @@ <h6 class="igx-filter-empty__title">
9696 < span igxPrefix class ="igx-filter-tree__expression-condition ">
9797 {{
9898 getConditionFriendlyName(
99- expressionItem.expression.condition.name
99+ expressionItem.expression.condition? .name
100100 )
101101 }}
102102 </ span >
@@ -106,35 +106,59 @@ <h6 class="igx-filter-empty__title">
106106 </ ng-container >
107107
108108 < ng-container *ngIf ="!expressionItem.expression.searchTree ">
109- {{
110- isDate(expressionItem.expression.searchVal)
111- ? getFormatter(expressionItem.expression.fieldName)
112- ? (expressionItem.expression.searchVal
113- | fieldFormatter
114- : getFormatter(
115- expressionItem.expression.fieldName
116- )
117- : undefined)
118- : (expressionItem.expression.searchVal
119- | date
120- : getFormat(
121- expressionItem.expression.fieldName
122- )
123- : undefined
124- : this.locale)
125- : expressionItem.expression.searchVal
126- }}
109+ @if(isDate(expressionItem.expression.searchVal)) {
110+ @if(getFormatter(expressionItem.expression.fieldName)) {
111+ {{
112+ expressionItem.expression.searchVal
113+ | fieldFormatter
114+ : getFormatter(
115+ expressionItem.expression.fieldName
116+ )
117+ : undefined
118+ }}
119+ } @else {
120+ {{
121+ expressionItem.expression.searchVal
122+ | date
123+ : getFormat(
124+ expressionItem.expression.fieldName
125+ )
126+ : undefined
127+ : this.locale
128+ }}
129+ }
130+ } @else {
131+ @if(getFormatter(expressionItem.expression.fieldName)) {
132+ {{
133+ expressionItem.expression.searchVal
134+ | fieldFormatter
135+ : getFormatter(expressionItem.expression.fieldName)
136+ : (expressionItem.expression.conditionName || expressionItem.expression.condition?.name)
137+ }}
138+ } @else {
139+ {{ expressionItem.expression.searchVal }}
140+ }
141+ }
127142 </ ng-container >
128143 </ span >
129144 </ igx-chip >
130145 < div #tooltipRef ="tooltip " igxTooltip >
131- {{
132- expressionItem.expression.searchTree ?
133- expressionItem.expression.searchTree.returnFields.join(', ') :
134- expressionItem.expression.condition.isUnary ?
135- getConditionFriendlyName(expressionItem.expression.condition.name) :
146+ @if(expressionItem.expression.searchTree){
147+ {{expressionItem.expression.searchTree.returnFields.join(', ')}}
148+ } @else if (expressionItem.expression.condition.isUnary) {
149+ {{getConditionFriendlyName(expressionItem.expression.condition?.name)}}
150+ } @else {
151+ @if(getFormatter(expressionItem.expression.fieldName)) {
152+ {{
136153 expressionItem.expression.searchVal
137- }}
154+ | fieldFormatter
155+ : getFormatter(expressionItem.expression.fieldName)
156+ : (expressionItem.expression.conditionName || expressionItem.expression.condition?.name)
157+ }}
158+ } @else {
159+ {{ expressionItem.expression.searchVal }}
160+ }
161+ }
138162 </ div >
139163 < div
140164 class ="igx-filter-tree__expression-actions "
0 commit comments