fix(grid): fix "This condition will always return 'false' [...]" #8978

IgniteUI · Sep 27, 2021 · 66876e7 · 66876e7
1 parent 493d424
commit 66876e7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/projects/igniteui-angular/src/lib/grids/cell.component.html b/projects/igniteui-angular/src/lib/grids/cell.component.html
@@ -26,7 +26,7 @@
                 ? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
                 : column.dataType === 'percent'
                 ? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
-                : column.dataType === 'boolean' && !this.formatter
+                : column.dataType === 'boolean'
                 ? ''
                 : value
         "
@@ -45,7 +45,7 @@
                 ? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
                 : column.dataType === 'percent'
                 ? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
-                : column.dataType === 'boolean' && !this.formatter
+                : column.dataType === 'boolean'
                 ? ''
                 : value
         }}</div>
@@ -64,7 +64,7 @@
         (value | number:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'date' ?
         (value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency' ?
         (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
-        (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter ?
+        (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' ?
          '' : value"
     [row]="rowData"
     [column]="this.column.field"

diff --git a/projects/igniteui-angular/src/lib/grids/grid/expandable-cell.component.html b/projects/igniteui-angular/src/lib/grids/grid/expandable-cell.component.html
@@ -15,7 +15,7 @@
             ? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
             : column.dataType === 'percent'
             ? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
-            : column.dataType === 'boolean' && !this.formatter
+            : column.dataType === 'boolean'
             ? ''
             : value"
         [row]="rowData"
@@ -25,7 +25,7 @@
             ? (value | number:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === "date"
             ? (value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'
             ? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent'
-            ? (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter
+            ? (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean'
             ? '' : value}}</div>
 
     <igx-icon
@@ -43,8 +43,8 @@
         (value | number:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'date' ?
         (value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'?
         (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
-        (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter ? '' :
-        value"
+        (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' ?
+         '' : value"
     [row]="rowData"
     [column]="this.column.field"
     [containerClass]="'igx-grid__td-text'"

diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-cell.component.html b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-cell.component.html
@@ -8,7 +8,7 @@
     >
 </ng-template>
 <ng-template #defaultCell>
-    <div *ngIf="column.dataType !== 'boolean'"
+    <div
         igxTextHighlight
         class="igx-grid__td-text"
         style="pointer-events: none;"
@@ -43,7 +43,7 @@
                 ? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
                 : column.dataType === 'percent'
                 ? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
-                : column.dataType === 'boolean' && !this.formatter
+                : column.dataType === 'boolean'
                 ? ''
                 : value
         }}</div>
@@ -62,7 +62,7 @@
         (value | number:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'date' ?
         (value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'?
         (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
-        (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter ?
+        (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' ?
         '' : value"
     [row]="rowData"
     [column]="this.column.field"