Skip to content

Commit 7d45cb4

Browse files
kdinevkdinev
authored
refactor(exporters): moving exporters under grids/core (#16519)
* refactor(exporters): moving exporters under grids/core * test(excel exporter): fixing import paths from /core
1 parent b1088db commit 7d45cb4

38 files changed

Lines changed: 125 additions & 80 deletions

‎projects/igniteui-angular/core/src/public_api.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export * from './data-operations/grid-sorting-strategy';
3535
export * from './data-operations/paging-state.interface';
3636
export * from './data-operations/data-util';
3737
export * from './data-operations/grid-types';
38+
export * from './data-operations/operations';
3839

3940
// Services
4041
export * from './services/public_api';

‎projects/igniteui-angular/core/src/services/public_api.ts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@
22
export * from './animation/angular-animation-player';
33
export * from './animation/angular-animation-service';
44
export * from './animation/animation';
5-
export * from './csv/csv-exporter';
6-
export * from './csv/csv-exporter-options';
7-
export * from './csv/char-separated-value-data';
85
export { Direction as ɵDirection, DIR_DOCUMENT as ɵDIR_DOCUMENT, IgxDirectionality as ɵIgxDirectionality } from './direction/directionality';
9-
export * from './excel/excel-exporter';
10-
export * from './excel/excel-exporter-options';
11-
export * from './pdf/pdf-exporter';
12-
export * from './pdf/pdf-exporter-options';
13-
export * from './exporter-common/base-export-service';
14-
export * from './exporter-common/exporter-options-base';
156
export * from './overlay/overlay';
167
export * from './overlay/position';
178
export * from './overlay/scroll';

‎projects/igniteui-angular/grids/core/src/common/events.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import { CancelableEventArgs, ColumnType, IBaseEventArgs, IFilteringExpressionsTree, IGroupingExpression, IgxBaseExporter, IgxExporterOptionsBase, ISortingExpression } from 'igniteui-angular/core';
1+
import { CancelableEventArgs, ColumnType, IBaseEventArgs, IFilteringExpressionsTree, IGroupingExpression, ISortingExpression } from 'igniteui-angular/core';
22
import { GridKeydownTargetType } from './enums';
33
import { CellType, GridType, RowType } from './grid.interface';
44
import { IBaseSearchInfo } from 'igniteui-angular/directives';
5+
import { IgxBaseExporter } from '../services/exporter-common/base-export-service';
6+
import { IgxExporterOptionsBase } from '../services/exporter-common/exporter-options-base';
57

68
/** The event arguments when data from a grid is being copied. */
79
export interface IGridClipboardEvent {

‎projects/igniteui-angular/grids/core/src/public_api.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,17 @@ export * from './pivot-grid.interface';
114114
export * from './pivot-grid-dimensions';
115115
export * from './pivot-grid-aggregate';
116116
export * from './watch-changes';
117+
// Exporter services (moved from core)
118+
export * from './services/exporter-common/base-export-service';
119+
export * from './services/exporter-common/exporter-options-base';
120+
export * from './services/exporter-common/export-utilities';
121+
export * from './services/csv/csv-exporter';
122+
export * from './services/csv/csv-exporter-options';
123+
export * from './services/csv/char-separated-value-data';
124+
export * from './services/excel/excel-exporter';
125+
export * from './services/excel/excel-exporter-options';
126+
export * from './services/pdf/pdf-exporter';
127+
export * from './services/pdf/pdf-exporter-options';
117128

118129
/*
119130

projects/igniteui-angular/core/src/services/csv/char-separated-value-data.ts renamed to projects/igniteui-angular/grids/core/src/services/csv/char-separated-value-data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ExportUtilities } from '../exporter-common/export-utilities';
2-
import { yieldingLoop } from '../../core/utils';
32
import { IColumnInfo } from '../exporter-common/base-export-service';
3+
import { yieldingLoop } from 'igniteui-angular/core';
44

55
/**
66
* @hidden

projects/igniteui-angular/core/src/services/csv/csv-exporter-grid.spec.ts renamed to projects/igniteui-angular/grids/core/src/services/csv/csv-exporter-grid.spec.ts

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,23 @@ import { ExportUtilities } from '../exporter-common/export-utilities';
44
import { TestMethods } from '../exporter-common/test-methods.spec';
55
import { IgxCsvExporterService } from './csv-exporter';
66
import { CsvFileTypes, IgxCsvExporterOptions } from './csv-exporter-options';
7-
import { CSVWrapper } from './csv-verification-wrapper.spec';
8-
import { IgxTreeGridPrimaryForeignKeyComponent } from '../../../../test-utils/tree-grid-components.spec';
7+
import { IgxTreeGridPrimaryForeignKeyComponent } from '../../../../../test-utils/tree-grid-components.spec';
98
import { ReorderedColumnsComponent,
109
GridIDNameJobTitleComponent,
1110
ProductsComponent,
1211
ColumnsAddedOnInitComponent,
13-
EmptyGridComponent } from '../../../../test-utils/grid-samples.spec';
14-
import { SampleTestData } from '../../../../test-utils/sample-test-data.spec';
12+
EmptyGridComponent } from '../../../../../test-utils/grid-samples.spec';
13+
import { SampleTestData } from '../../../../../test-utils/sample-test-data.spec';
1514
import { first } from 'rxjs/operators';
16-
import { DefaultSortingStrategy, SortingDirection } from '../../data-operations/sorting-strategy';
17-
import { IgxStringFilteringOperand, IgxNumberFilteringOperand } from '../../data-operations/filtering-condition';
18-
import { FilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
19-
import { FilteringLogic } from '../../data-operations/filtering-expression.interface';
2015
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
21-
import { wait } from '../../../../test-utils/ui-interactions.spec';
22-
import { IgxPivotGridTestBaseComponent } from '../../../../test-utils/pivot-grid-samples.spec';
16+
import { wait } from '../../../../../test-utils/ui-interactions.spec';
17+
import { IgxPivotGridTestBaseComponent } from '../../../../../test-utils/pivot-grid-samples.spec';
2318
import { IgxGridComponent } from 'igniteui-angular/grids/grid';
2419
import { IgxTreeGridComponent } from 'igniteui-angular/grids/tree-grid';
2520
import { IgxPivotGridComponent } from 'igniteui-angular/grids/pivot-grid';
2621
import { IgxPivotNumericAggregate } from 'igniteui-angular/grids/core';
22+
import { DefaultSortingStrategy, FilteringExpressionsTree, FilteringLogic, IgxNumberFilteringOperand, IgxStringFilteringOperand, SortingDirection } from 'igniteui-angular/core';
23+
import { CSVWrapper } from './csv-verification-wrapper.spec';
2724

2825
describe('CSV Grid Exporter', () => {
2926
let exporter: IgxCsvExporterService;

projects/igniteui-angular/core/src/services/csv/csv-exporter-options.ts renamed to projects/igniteui-angular/grids/core/src/services/csv/csv-exporter-options.ts

File renamed without changes.

projects/igniteui-angular/core/src/services/csv/csv-exporter.spec.ts renamed to projects/igniteui-angular/grids/core/src/services/csv/csv-exporter.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ExportUtilities } from '../exporter-common/export-utilities';
22
import { IgxCsvExporterService } from './csv-exporter';
33
import { CsvFileTypes, IgxCsvExporterOptions } from './csv-exporter-options';
44
import { CSVWrapper } from './csv-verification-wrapper.spec';
5-
import { SampleTestData } from '../../../../test-utils/sample-test-data.spec';
5+
import { SampleTestData } from '../../../../../test-utils/sample-test-data.spec';
66
import { first } from 'rxjs/operators';
77

88
describe('CSV exporter', () => {

projects/igniteui-angular/core/src/services/csv/csv-exporter.ts renamed to projects/igniteui-angular/grids/core/src/services/csv/csv-exporter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { DEFAULT_OWNER, ExportHeaderType, IColumnInfo, IExportRecord, IgxBaseExp
33
import { ExportUtilities } from '../exporter-common/export-utilities';
44
import { CharSeparatedValueData } from './char-separated-value-data';
55
import { CsvFileTypes, IgxCsvExporterOptions } from './csv-exporter-options';
6-
import { IBaseEventArgs } from '../../core/utils';
6+
import { IBaseEventArgs } from 'igniteui-angular/core';
77

88
export interface ICsvExportEndedEventArgs extends IBaseEventArgs {
99
csvData?: string;
@@ -51,13 +51,13 @@ export class IgxCsvExporterService extends IgxBaseExporter {
5151

5252
protected exportDataImplementation(data: IExportRecord[], options: IgxCsvExporterOptions, done: () => void) {
5353
const dimensionKeys = data[0]?.dimensionKeys;
54-
data = dimensionKeys?.length ?
54+
data = dimensionKeys?.length ?
5555
data.map((item) => item.rawData):
5656
data.map((item) => item.data);
5757
const columnList = this._ownersMap.get(DEFAULT_OWNER);
5858
const columns = columnList?.columns.filter(c => c.headerType === ExportHeaderType.ColumnHeader);
5959
if (dimensionKeys) {
60-
const dimensionCols = dimensionKeys.map((key) => {
60+
const dimensionCols = dimensionKeys.map((key) => {
6161
const columnInfo: IColumnInfo = {
6262
header: key,
6363
field: key,

projects/igniteui-angular/core/src/services/csv/csv-verification-wrapper.spec.ts renamed to projects/igniteui-angular/grids/core/src/services/csv/csv-verification-wrapper.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
export class CSVWrapper {
33
private _data: string;
4-
private _hasValues = true;
54
private _delimiter = '';
65
private _eor = '\r\n';
76

0 commit comments

Comments
 (0)