Skip to content

Commit 3f192b3

Browse files
committed
fix(grid): when formatter is missing display icon only #8978
1 parent 668cfab commit 3f192b3

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

projects/igniteui-angular/src/lib/grids/grid/expandable-cell.component.html

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,26 @@
1313
? (value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale)
1414
: column.dataType === 'currency'
1515
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
16-
: column.dataType === 'percent' ? (value | percent:column.pipeArgs.digitsInfo:grid.locale) : value"
16+
: column.dataType === 'percent'
17+
? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
18+
: column.dataType === 'boolean' && !this.formatter
19+
? ''
20+
: value"
1721
[row]="rowData"
1822
[column]="this.column.field"
1923
[containerClass]="'igx-grid__td-text'"
2024
[metadata]="searchMetadata">{{ formatter ? (value | columnFormatter:formatter:rowData) : column.dataType === "number"
2125
? (value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime')
2226
? (value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'
2327
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent'
24-
? (value | percent:column.pipeArgs.digitsInfo:grid.locale) : value }}</div>
28+
? (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter
29+
? '' : value}}</div>
30+
31+
<igx-icon
32+
*ngIf="column.dataType === 'boolean' && !this.formatter"
33+
[ngClass]="{ 'igx-icon--success': value, 'igx-icon--error': !value }"
34+
>{{ value ? "check" : "close" }}</igx-icon
35+
>
2536
</ng-template>
2637
<ng-template #addRowCell let-cell="cell">
2738
<div igxTextHighlight class="igx-grid__td-text" style="pointer-events: none"
@@ -32,7 +43,8 @@
3243
(value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime') ?
3344
(value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'?
3445
(value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
35-
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : value"
46+
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter ? '' :
47+
value"
3648
[row]="rowData"
3749
[column]="this.column.field"
3850
[containerClass]="'igx-grid__td-text'"

projects/igniteui-angular/src/lib/grids/tree-grid/tree-cell.component.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,12 @@
4343
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
4444
: column.dataType === 'percent'
4545
? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
46+
: column.dataType === 'boolean' && !this.formatter
47+
? ''
4648
: value
4749
}}</div>
4850
<igx-icon
49-
*ngIf="column.dataType === 'boolean'"
51+
*ngIf="column.dataType === 'boolean' && !this.formatter"
5052
[ngClass]="{ 'igx-icon--success': value, 'igx-icon--error': !value }"
5153
>{{ value ? "check" : "close" }}</igx-icon
5254
>
@@ -60,7 +62,8 @@
6062
(value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime') ?
6163
(value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'?
6264
(value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
63-
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : value"
65+
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter ?
66+
'' : value"
6467
[row]="rowData"
6568
[column]="this.column.field"
6669
[containerClass]="'igx-grid__td-text'"

projects/igniteui-angular/src/lib/test-utils/grid-samples.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ export class ColumnCellFormatterComponent extends BasicGridComponent {
164164
}
165165

166166
public boolFormatter(value: boolean): string {
167-
return value ? 'true' : 'false';
167+
return value ? 'check' : 'close';
168168
}
169169
}
170170

0 commit comments

Comments
 (0)