Skip to content

Commit 4df17c0

Browse files
kdinevkdinev
committed
chore(*): adding toolbar to groupby demo and fixing tests
1 parent decbc79 commit 4df17c0

File tree

4 files changed

+42
-32
lines changed

4 files changed

+42
-32
lines changed

‎projects/igniteui-angular/src/lib/services/pdf/pdf-exporter-grid.spec.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('PDF Grid Exporter', () => {
3333
fix.detectChanges();
3434

3535
const grid = fix.componentInstance.grid;
36-
36+
3737
exporter.exportEnded.pipe(first()).subscribe(() => {
3838
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
3939
done();
@@ -48,7 +48,7 @@ describe('PDF Grid Exporter', () => {
4848

4949
const grid = fix.componentInstance.grid;
5050
options.pageOrientation = 'landscape';
51-
51+
5252
exporter.exportEnded.pipe(first()).subscribe(() => {
5353
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
5454
done();
@@ -66,7 +66,7 @@ describe('PDF Grid Exporter', () => {
6666
options.ignoreColumnsVisibility = false;
6767

6868
fix.detectChanges();
69-
69+
7070
exporter.exportEnded.pipe(first()).subscribe(() => {
7171
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
7272
done();
@@ -82,7 +82,7 @@ describe('PDF Grid Exporter', () => {
8282
const grid = fix.componentInstance.grid;
8383
grid.data = [];
8484
fix.detectChanges();
85-
85+
8686
exporter.exportEnded.pipe(first()).subscribe(() => {
8787
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
8888
done();
@@ -97,7 +97,7 @@ describe('PDF Grid Exporter', () => {
9797

9898
const grid = fix.componentInstance.grid;
9999
options.pageOrientation = 'landscape';
100-
100+
101101
exporter.exportEnded.pipe(first()).subscribe(() => {
102102
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
103103
done();
@@ -112,7 +112,7 @@ describe('PDF Grid Exporter', () => {
112112

113113
const grid = fix.componentInstance.grid;
114114
options.showTableBorders = false;
115-
115+
116116
exporter.exportEnded.pipe(first()).subscribe(() => {
117117
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
118118
done();
@@ -127,7 +127,7 @@ describe('PDF Grid Exporter', () => {
127127

128128
const grid = fix.componentInstance.grid;
129129
options.fontSize = 14;
130-
130+
131131
exporter.exportEnded.pipe(first()).subscribe(() => {
132132
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
133133
done();
@@ -142,7 +142,7 @@ describe('PDF Grid Exporter', () => {
142142

143143
const grid = fix.componentInstance.grid;
144144
options.pageSize = 'letter';
145-
145+
146146
exporter.exportEnded.pipe(first()).subscribe(() => {
147147
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
148148
done();
@@ -157,7 +157,7 @@ describe('PDF Grid Exporter', () => {
157157

158158
const grid = fix.componentInstance.grid;
159159
options.ignoreColumnsOrder = true;
160-
160+
161161
exporter.exportEnded.pipe(first()).subscribe(() => {
162162
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
163163
done();
@@ -172,7 +172,7 @@ describe('PDF Grid Exporter', () => {
172172

173173
const grid = fix.componentInstance.grid;
174174
options.ignoreFiltering = false;
175-
175+
176176
exporter.exportEnded.pipe(first()).subscribe(() => {
177177
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
178178
done();
@@ -187,7 +187,7 @@ describe('PDF Grid Exporter', () => {
187187

188188
const grid = fix.componentInstance.grid;
189189
options.ignoreSorting = false;
190-
190+
191191
exporter.exportEnded.pipe(first()).subscribe(() => {
192192
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
193193
done();
@@ -203,10 +203,10 @@ describe('PDF Grid Exporter', () => {
203203
const grid = fix.componentInstance.grid;
204204
let exportStartedFired = false;
205205

206-
exporter.exportStarted.pipe(first()).subscribe(() => {
206+
grid.toolbarExporting.pipe(first()).subscribe(() => {
207207
exportStartedFired = true;
208208
});
209-
209+
210210
exporter.exportEnded.pipe(first()).subscribe(() => {
211211
expect(exportStartedFired).toBe(true);
212212
done();
@@ -220,7 +220,7 @@ describe('PDF Grid Exporter', () => {
220220
fix.detectChanges();
221221

222222
const grid = fix.componentInstance.grid;
223-
223+
224224
exporter.exportEnded.pipe(first()).subscribe(() => {
225225
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
226226
done();
@@ -235,7 +235,7 @@ describe('PDF Grid Exporter', () => {
235235

236236
const grid = fix.componentInstance.grid;
237237
const customOptions = new IgxPdfExporterOptions('MyCustomGrid');
238-
238+
239239
exporter.exportEnded.pipe(first()).subscribe(() => {
240240
expect(ExportUtilities.saveBlobToFile).toHaveBeenCalledTimes(1);
241241
const callArgs = (ExportUtilities.saveBlobToFile as jasmine.Spy).calls.mostRecent().args;

‎projects/igniteui-angular/src/lib/services/pdf/pdf-exporter.spec.ts‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -236,21 +236,6 @@ describe('PDF Exporter', () => {
236236
exporter.exportData(dataWithEmptyRows, options);
237237
});
238238

239-
it('should emit exportStarted event', (done) => {
240-
let exportStartedFired = false;
241-
242-
exporter.exportStarted.pipe(first()).subscribe(() => {
243-
exportStartedFired = true;
244-
});
245-
246-
exporter.exportEnded.pipe(first()).subscribe(() => {
247-
expect(exportStartedFired).toBe(true);
248-
done();
249-
});
250-
251-
exporter.exportData(SampleTestData.contactsData(), options);
252-
});
253-
254239
it('should emit exportEnded event with pdf object', (done) => {
255240
exporter.exportEnded.pipe(first()).subscribe((args) => {
256241
expect(args).toBeDefined();

‎src/app/grid-groupby/grid-groupby.sample.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@
3535
<igx-grid #grid1 [data]="data" [allowFiltering]="true" [moving]="true" [cellSelection]="'single'" [width]="'1200px'"
3636
[hideGroupedColumns]="hideGroupedColumns" [height]="'700px'" [(groupingExpansionState)]='expState' [sortingOptions]="sortingOp"
3737
[summaryCalculationMode]="summaryMode" [summaryPosition]="position" [rowDraggable]="true">
38+
<igx-grid-toolbar>
39+
<igx-grid-toolbar-actions>
40+
<igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>
41+
<igx-grid-toolbar-hiding></igx-grid-toolbar-hiding>
42+
<igx-grid-toolbar-advanced-filtering></igx-grid-toolbar-advanced-filtering>
43+
<igx-grid-toolbar-exporter></igx-grid-toolbar-exporter>
44+
</igx-grid-toolbar-actions>
45+
</igx-grid-toolbar>
3846
@for (c of columns; track c) {
3947
<igx-column [sortable]="true" [field]="c.field" [header]="c.field" [width]="c.width"
4048
[hidden]='c.hidden' [sortable]="true" [groupable]='c.groupable' [pinned]='!!c.pinned'

‎src/app/grid-groupby/grid-groupby.sample.ts‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,29 @@
11
import { Component, ViewChild, OnInit, HostBinding } from '@angular/core';
22
import { FormsModule } from '@angular/forms';
3-
import { DefaultSortingStrategy, GridSummaryCalculationMode, GridSummaryPosition, GroupMemberCountSortingStrategy, IRowSelectionEventArgs, ISortingExpression, ISortingOptions, IgxButtonDirective, IgxButtonGroupComponent, IgxColumnComponent, IgxDropDownComponent, IgxDropDownItemComponent, IgxDropDownItemNavigationDirective, IgxGridComponent, IgxSwitchComponent, IgxToggleActionDirective, SortingDirection } from 'igniteui-angular';
3+
import { DefaultSortingStrategy, GridSummaryCalculationMode, GridSummaryPosition, GroupMemberCountSortingStrategy, IRowSelectionEventArgs, ISortingExpression, ISortingOptions, IgxButtonDirective, IgxButtonGroupComponent, IgxColumnComponent, IgxDropDownComponent, IgxDropDownItemComponent, IgxDropDownItemNavigationDirective, IgxGridComponent, IgxGridToolbarActionsComponent, IgxGridToolbarAdvancedFilteringComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent, IgxSwitchComponent, IgxToggleActionDirective, SortingDirection } from 'igniteui-angular';
44

55
@Component({
66
selector: 'app-grid-sample',
77
styleUrls: ['grid-groupby.sample.scss'],
88
templateUrl: 'grid-groupby.sample.html',
9-
imports: [IgxSwitchComponent, FormsModule, IgxButtonDirective, IgxToggleActionDirective, IgxDropDownItemNavigationDirective, IgxDropDownComponent, IgxDropDownItemComponent, IgxButtonGroupComponent, IgxGridComponent, IgxColumnComponent]
9+
imports: [
10+
IgxSwitchComponent,
11+
FormsModule,
12+
IgxButtonDirective,
13+
IgxToggleActionDirective,
14+
IgxDropDownItemNavigationDirective,
15+
IgxDropDownComponent,
16+
IgxDropDownItemComponent,
17+
IgxButtonGroupComponent,
18+
IgxGridComponent,
19+
IgxColumnComponent,
20+
IgxGridToolbarComponent,
21+
IgxGridToolbarActionsComponent,
22+
IgxGridToolbarPinningComponent,
23+
IgxGridToolbarHidingComponent,
24+
IgxGridToolbarAdvancedFilteringComponent,
25+
IgxGridToolbarExporterComponent
26+
]
1027
})
1128
export class GridGroupBySampleComponent implements OnInit {
1229
@HostBinding('style.--ig-size')

0 commit comments

Comments
 (0)