Skip to content

Commit c2bec7a

Browse files
author
MPopov
committed
fix(Grid toolbar): Fix the failing test
Signed-off-by: MPopov <[email protected]>
1 parent 4b03d39 commit c2bec7a

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ describe('IgxGrid - Advanced Filtering', () => {
357357
// Verify that the advanced filtering button indicates there are filters.
358358
advFilterBtn = GridFunctions.getAdvancedFilteringButton(fix);
359359
expect(advFilterBtn.classList.contains(ADVANCED_FILTERING_TOOLBAR_BUTTON_FILTERED_CSS_CLASS))
360-
.toBe(true, 'Button icon indicates there is no active filtering.');
360+
.toBe(true, 'Button indicates there is no active filtering.');
361361

362362
// Open Advanced Filtering dialog.
363363
GridFunctions.clickAdvancedFilteringButton(fix);
@@ -374,7 +374,7 @@ describe('IgxGrid - Advanced Filtering', () => {
374374
// Verify that the advanced filtering button indicates there are no filters.
375375
advFilterBtn = GridFunctions.getAdvancedFilteringButton(fix);
376376
expect(advFilterBtn.classList.contains(ADVANCED_FILTERING_TOOLBAR_BUTTON_FILTERED_CSS_CLASS))
377-
.toBe(false, 'Button icon indicates there is active filtering.');
377+
.toBe(false, 'Button indicates there is active filtering.');
378378
}));
379379

380380
it('Should correctly filter by a \'string\' column through UI.', fakeAsync(() => {

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99

1010
<div class="igx-grid-toolbar__actions">
1111
<div *ngIf="grid.allowAdvancedFiltering">
12-
<button igxButton="flat" [displayDensity]="grid.displayDensity" #advancedFilteringButton name="btnAdvancedFiltering" igxButton igxRipple
13-
(click)="showAdvancedFilteringUI()">
12+
<button igxButton="outlined" [displayDensity]="grid.displayDensity" #advancedFilteringButton name="btnAdvancedFiltering" igxRipple
13+
(click)="showAdvancedFilteringUI()"
14+
[ngClass]="grid.advancedFilteringExpressionsTree ? 'igx-grid-toolbar__adv-filter--filtered' : 'igx-grid-toolbar__adv-filter'">
1415
<div class="igx-grid-toolbar__button-space">
15-
<igx-icon [ngClass]="grid.advancedFilteringExpressionsTree ? 'igx-grid-toolbar__adv-filter--filtered' : 'igx-grid-toolbar__adv-filter'">
16+
<igx-icon>
1617
filter_list
1718
</igx-icon>
1819
<span>{{grid.resourceStrings.igx_grid_advanced_filter_title}}</span>
@@ -21,7 +22,7 @@
2122
</div>
2223

2324
<div *ngIf="grid.columnHiding">
24-
<button igxButton="flat" [displayDensity]="grid.displayDensity" #columnHidingButton name="btnColumnHiding" igxButton igxRipple
25+
<button igxButton="outlined" [displayDensity]="grid.displayDensity" #columnHidingButton name="btnColumnHiding" igxRipple
2526
(click)="toggleColumnHidingUI()">
2627
<div class="igx-grid-toolbar__button-space">
2728
<igx-icon *ngIf="grid.hiddenColumnsCount > 0">visibility_off</igx-icon>
@@ -41,7 +42,7 @@
4142
</igx-drop-down>
4243
</div>
4344
<div *ngIf="grid.columnPinning">
44-
<button igxButton="flat" [displayDensity]="grid.displayDensity" #columnPinningButton name="btnColumnPinning" igxButton igxRipple
45+
<button igxButton="outlined" [displayDensity]="grid.displayDensity" #columnPinningButton name="btnColumnPinning" igxRipple
4546
(click)="toggleColumnPinningUI()">
4647
<div class="igx-grid-toolbar__button-space">
4748
<igx-icon *ngIf="pinnedColumnsCount > 0">lock</igx-icon>
@@ -61,7 +62,7 @@
6162
</div>
6263

6364
<div class="igx-grid-toolbar__dropdown" *ngIf="shouldShowExportButton" id="btnExport">
64-
<button igxButton="flat" [displayDensity]="grid.displayDensity" igxRipple #btnExport
65+
<button igxButton="outlined" [displayDensity]="grid.displayDensity" igxRipple #btnExport
6566
(click)="exportClicked()">
6667
<span class="igx-grid-toolbar__button-space">
6768
<igx-icon fontSet="material">import_export</igx-icon>

0 commit comments

Comments
 (0)