Skip to content

Commit 96a3fdb

Browse files
ChronosSFChronosSF
authored
fix(*): applying changes from alpha 7 (#3802)
1 parent 80614d1 commit 96a3fdb

15 files changed

Lines changed: 301 additions & 61 deletions

File tree

‎package-lock.json‎

Lines changed: 221 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@
7171
"express": "^4.18.2",
7272
"file-saver": "^2.0.2",
7373
"hammerjs": "^2.0.8",
74-
"igniteui-angular": "^21.0.0-alpha.6",
74+
"igniteui-angular": "^21.0.0-alpha.7",
7575
"igniteui-angular-charts": "^20.2.0",
7676
"igniteui-angular-core": "^20.2.0",
7777
"igniteui-angular-extras": "^20.0.2",
78-
"igniteui-angular-i18n": "^21.0.0-alpha.6",
78+
"igniteui-angular-i18n": "^21.0.0-alpha.7",
7979
"igniteui-dockmanager": "^1.17.0",
8080
"igniteui-grid-lite": "^0.0.1",
8181
"igniteui-live-editing": "^3.2.0",
@@ -107,8 +107,8 @@
107107
"@angular/compiler": "^21.0.0"
108108
},
109109
"igniteui-angular-extras": {
110-
"igniteui-angular": "^21.0.0-alpha.6",
111-
"@infragistics/igniteui-angular": "^21.0.0-alpha.6",
110+
"igniteui-angular": "^21.0.0-alpha.7",
111+
"@infragistics/igniteui-angular": "^21.0.0-alpha.7",
112112
"@angular/core": "^21.0.0",
113113
"@angular/common": "^21.0.0",
114114
"@angular/animations": "^21.0.0"

‎projects/app-crm/src/app/grid-crm/grid-crm.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* eslint-disable no-underscore-dangle */
22
import { AfterViewInit, Component, ElementRef, OnInit, QueryList, ViewChild, inject } from '@angular/core';
33
import { ActivatedRoute } from '@angular/router';
4-
import { CloseScrollStrategy, ConnectedPositioningStrategy, HorizontalAlignment, IColumnExportingEventArgs, IgxCsvExporterService, IgxExcelExporterService, IgxSummaryResult, OverlaySettings, PositionSettings, VerticalAlignment } from 'igniteui-angular/core';
5-
import { CellType, GridSelectionMode, IgxCellTemplateDirective, IgxColumnComponent, IgxDateSummaryOperand, IgxGridToolbarActionsComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent, IgxGridToolbarTitleComponent, IgxNumberSummaryOperand } from 'igniteui-angular/grids/core';
4+
import { CloseScrollStrategy, ConnectedPositioningStrategy, HorizontalAlignment, IgxSummaryResult, OverlaySettings, PositionSettings, VerticalAlignment } from 'igniteui-angular/core';
5+
import { CellType, GridSelectionMode, IgxCellTemplateDirective, IgxColumnComponent, IgxDateSummaryOperand, IgxGridToolbarActionsComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent, IgxGridToolbarTitleComponent, IgxNumberSummaryOperand, IColumnExportingEventArgs, IgxCsvExporterService, IgxExcelExporterService } from 'igniteui-angular/grids/core';
66
import { IgxGridComponent } from 'igniteui-angular/grids/grid';
77
import { IgxIconButtonDirective, IgxRippleDirective, IgxToggleDirective } from 'igniteui-angular/directives';
88
import { IgxInputDirective, IgxInputGroupComponent, IgxPrefixDirective, IgxSuffixDirective } from 'igniteui-angular/input-group';

‎projects/app-lob/src/app/tree-grid/tree-grid-childdatakey-sample/tree-grid-childdatakey-sample.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Component, OnInit, inject } from '@angular/core';
2-
import { GridSelectionMode, IgxCSVTextDirective, IgxCellTemplateDirective, IgxColumnComponent, IgxExcelTextDirective, IgxGridToolbarActionsComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent, IgxGridToolbarTitleComponent } from 'igniteui-angular/grids/core';
3-
import { IColumnExportingEventArgs, IgxCsvExporterService, IgxExcelExporterService } from 'igniteui-angular/core';
2+
import { GridSelectionMode, IgxCSVTextDirective, IgxCellTemplateDirective, IgxColumnComponent, IgxExcelTextDirective, IgxGridToolbarActionsComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent, IgxGridToolbarTitleComponent, IColumnExportingEventArgs, IgxCsvExporterService, IgxExcelExporterService } from 'igniteui-angular/grids/core';
43
import { IgxTreeGridComponent } from 'igniteui-angular/grids/tree-grid';
54
import { IgxPaginatorComponent } from 'igniteui-angular/paginator';
65
import { EMPLOYEE_DATA } from './data';

‎src/app/grid/grid-paste/grid-paste-sample.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { Component, ViewChild, inject } from '@angular/core';
2-
import { IgxExcelExporterOptions, IgxExcelExporterService } from 'igniteui-angular/core';
32
import { IgxGridComponent } from 'igniteui-angular/grids/grid';
43
import { IgxButtonDirective, IgxToggleActionDirective } from 'igniteui-angular/directives';
54
import { IgxDropDownComponent, IgxDropDownItemComponent, IgxDropDownItemNavigationDirective } from 'igniteui-angular/drop-down';
6-
import { IgxColumnComponent } from 'igniteui-angular/grids/core';
5+
import { IgxColumnComponent, IgxExcelExporterOptions, IgxExcelExporterService } from 'igniteui-angular/grids/core';
76

87
import { EXCEL_DATA, LOCAL_DATA } from './data';
98

‎src/app/grid/grid-summary-export/grid-summary-export.component.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
import { Component, ViewChild, inject } from '@angular/core';
2-
import { ColumnType, IgxExcelExporterOptions, IgxExcelExporterService, IgxSummaryResult } from 'igniteui-angular/core';
2+
import { ColumnType, IgxSummaryResult } from 'igniteui-angular/core';
33
import { IgxGridComponent } from 'igniteui-angular/grids/grid';
4-
import { IgxCellHeaderTemplateDirective, IgxCellTemplateDirective, IgxColumnComponent, IgxNumberSummaryOperand } from 'igniteui-angular/grids/core';
4+
import {
5+
IgxCellHeaderTemplateDirective,
6+
IgxCellTemplateDirective,
7+
IgxColumnComponent,
8+
IgxNumberSummaryOperand,
9+
IgxExcelExporterOptions,
10+
IgxExcelExporterService
11+
} from 'igniteui-angular/grids/core';
512
import { IgxButtonDirective } from 'igniteui-angular/directives';
613
import { IgxIconComponent } from 'igniteui-angular/icon';
714
import { DATA } from '../../data/nwindData';

‎src/app/grid/grid-toolbar-sample/grid-toolbar-sample-3.component.ts‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
import { Component } from '@angular/core';
2-
import { CsvFileTypes, IColumnExportingEventArgs, IgxCsvExporterOptions, IgxExcelExporterOptions, IgxExporterOptionsBase } from 'igniteui-angular/core';
3-
import { IGridToolbarExportEventArgs, IgxCellTemplateDirective, IgxColumnComponent, IgxGridToolbarActionsComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxGridToolbarTitleComponent } from 'igniteui-angular/grids/core';
2+
import {
3+
CsvFileTypes,
4+
IColumnExportingEventArgs,
5+
IgxCsvExporterOptions,
6+
IgxExcelExporterOptions,
7+
IgxExporterOptionsBase,
8+
IGridToolbarExportEventArgs,
9+
IgxCellTemplateDirective,
10+
IgxColumnComponent,
11+
IgxGridToolbarActionsComponent,
12+
IgxGridToolbarComponent,
13+
IgxGridToolbarExporterComponent,
14+
IgxGridToolbarTitleComponent
15+
} from 'igniteui-angular/grids/core';
416
import { IgxGridComponent } from 'igniteui-angular/grids/grid';
517
import { IgxAvatarComponent } from 'igniteui-angular/avatar';
618
import { athletesData } from '../../data/athletesData';
@@ -22,8 +34,8 @@ export class GridToolbarSample3Component {
2234

2335
public configureExport(args: IGridToolbarExportEventArgs) {
2436
// You can customize the exporting from this event
25-
const options: IgxExporterOptionsBase = args.options ;
26-
37+
const options: IgxExporterOptionsBase = args.options;
38+
2739
options.fileName = `Report_${new Date().toDateString()}`;
2840

2941
if (options instanceof IgxExcelExporterOptions) {
@@ -38,7 +50,7 @@ export class GridToolbarSample3Component {
3850
args.exporter.columnExporting.subscribe((columnArgs: IColumnExportingEventArgs) => {
3951
// Don't export image fields
4052
columnArgs.cancel = columnArgs.header === 'Athlete' ||
41-
columnArgs.header === 'Country';
53+
columnArgs.header === 'Country';
4254
});
4355
}
4456
}

‎src/app/hierarchical-grid/hgrid-summary-export/hgrid-summary-export.component.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
import { Component, OnInit, ViewChild, inject } from '@angular/core';
1+
import { Component, ViewChild, inject } from '@angular/core';
22
import { SINGERS } from '../../data/singersData';
3-
import { IgxExcelExporterOptions, IgxExcelExporterService, IgxSummaryResult } from 'igniteui-angular/core';
3+
import { IgxSummaryResult } from 'igniteui-angular/core';
44
import { IgxHierarchicalGridComponent, IgxRowIslandComponent } from 'igniteui-angular/grids/hierarchical-grid';
5-
import { IgxCellTemplateDirective, IgxColumnComponent, IgxNumberSummaryOperand } from 'igniteui-angular/grids/core';
5+
import { IgxCellTemplateDirective, IgxColumnComponent, IgxNumberSummaryOperand, IgxExcelExporterOptions, IgxExcelExporterService } from 'igniteui-angular/grids/core';
66
import { IgxButtonDirective } from 'igniteui-angular/directives';
77
import { IgxPreventDocumentScrollDirective } from '../../directives/prevent-scroll.directive';
88

9-
class MySummary {
9+
class MySummary {
1010
public operate(data?: any[]): IgxSummaryResult[] {
1111
const result = [];
1212
result.push(
13-
{
14-
key: 'min',
15-
label: 'Min',
16-
summaryResult: IgxNumberSummaryOperand.min(data)
17-
},
18-
{
19-
key: 'max',
20-
label: 'Max',
21-
summaryResult: IgxNumberSummaryOperand.max(data)
22-
},
23-
{
24-
key: 'avg',
25-
label: 'Avg',
26-
summaryResult: IgxNumberSummaryOperand.average(data)
27-
});
13+
{
14+
key: 'min',
15+
label: 'Min',
16+
summaryResult: IgxNumberSummaryOperand.min(data)
17+
},
18+
{
19+
key: 'max',
20+
label: 'Max',
21+
summaryResult: IgxNumberSummaryOperand.max(data)
22+
},
23+
{
24+
key: 'avg',
25+
label: 'Avg',
26+
summaryResult: IgxNumberSummaryOperand.average(data)
27+
});
2828
return result;
2929
}
3030
}
@@ -33,11 +33,11 @@ class MyChildSummary {
3333
public operate(data?: any[]): IgxSummaryResult[] {
3434
const result = [];
3535
result.push(
36-
{
37-
key: 'count',
38-
label: 'Count',
39-
summaryResult: IgxNumberSummaryOperand.count(data)
40-
});
36+
{
37+
key: 'count',
38+
label: 'Count',
39+
summaryResult: IgxNumberSummaryOperand.count(data)
40+
});
4141
return result;
4242
}
4343
}

‎src/app/pivot-grid/pivot-export/pivot-export.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Component, ViewChild, inject } from "@angular/core";
22

3-
import { IPivotConfiguration, IgxPivotDateDimension, IgxPivotNumericAggregate, PivotAggregation } from 'igniteui-angular/grids/core';
4-
import { IgxExcelExporterOptions, IgxExcelExporterService } from 'igniteui-angular/core';
3+
import { IPivotConfiguration, IgxPivotDateDimension, IgxPivotNumericAggregate, PivotAggregation, IgxExcelExporterOptions, IgxExcelExporterService } from 'igniteui-angular/grids/core';
54
import { IgxPivotGridComponent } from 'igniteui-angular/grids/pivot-grid';
65
import { IgxButtonDirective } from 'igniteui-angular/directives';
76
import { SALES_DATA } from "../../data/dataToAnalyze";

‎src/app/services/export-csv/csv-export-sample-1/csv-export-sample-1.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
/* eslint-disable @typescript-eslint/naming-convention */
22
import { Component, ViewChild, inject } from '@angular/core';
33

4-
import { CsvFileTypes, IgxCsvExporterOptions, IgxCsvExporterService } from 'igniteui-angular/core';
54
import { IgxGridComponent } from 'igniteui-angular/grids/grid';
6-
import { IgxGridToolbarActionsComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent } from 'igniteui-angular/grids/core';
5+
import { IgxGridToolbarActionsComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxCsvExporterService } from 'igniteui-angular/grids/core';
76
import { IgxPreventDocumentScrollDirective } from '../../../directives/prevent-scroll.directive';
87

98
@Component({

0 commit comments

Comments
 (0)