Skip to content

Commit 4e0f128

Browse files
Copilotkdinev
andcommitted
Move grid sorting strategies from grids to core
- Moved strategy.ts from grids/common to core/data-operations/grid-sorting-strategy.ts - IGridSortingStrategy, IGridGroupingStrategy, IgxSorting, IgxGrouping now in core - Updated all imports in grids to use igniteui-angular/core - This eliminates the runtime circular dependency between core and grids Core no longer imports from grids (except type-only for GridType) Co-authored-by: kdinev <[email protected]>
1 parent 23a712d commit 4e0f128

File tree

14 files changed

+22
-21
lines changed

14 files changed

+22
-21
lines changed

projects/igniteui-angular/core/src/data-operations/data-util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
IgxDataRecordSorting,
1818
IgxSorting,
1919
IgxGrouping
20-
} from 'igniteui-angular/grids';
20+
} from './grid-sorting-strategy';
2121
import { DefaultDataCloneStrategy, IDataCloneStrategy } from '../data-operations/data-clone-strategy';
2222
import { IGroupingExpression } from './grouping-expression.interface';
2323
import { DefaultMergeStrategy, IGridMergeStrategy } from './merge-strategy';

projects/igniteui-angular/core/src/data-operations/filtering-strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { formatNumber, formatPercent, getLocaleCurrencyCode } from '@angular/com
88
import type { IFilteringState } from './filtering-state.interface';
99
import { isTree } from './expressions-tree-util';
1010
import type { IgxHierarchicalGridComponent } from 'igniteui-angular/grids';
11-
import { IgxSorting } from 'igniteui-angular/grids';
11+
import { IgxSorting } from './grid-sorting-strategy';
1212

1313
const DateType = 'date';
1414
const DateTimeType = 'dateTime';

projects/igniteui-angular/grids/src/grids/common/strategy.ts renamed to projects/igniteui-angular/core/src/data-operations/grid-sorting-strategy.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { cloneArray, columnFieldPath, parseDate, resolveNestedPath } from '../../core/utils';
2-
import { IGroupByExpandState } from '../../data-operations/groupby-expand-state.interface';
3-
import { IGroupByRecord } from '../../data-operations/groupby-record.interface';
4-
import { IGroupingState } from '../../data-operations/groupby-state.interface';
5-
import { IGroupingExpression } from '../../data-operations/grouping-expression.interface';
6-
import { IGroupByResult } from '../../data-operations/grouping-result.interface';
7-
import { getHierarchy, isHierarchyMatch } from '../../data-operations/operations';
8-
import { DefaultSortingStrategy, ISortingExpression } from '../../data-operations/sorting-strategy';
9-
import { GridType } from './grid.interface';
1+
import { cloneArray, columnFieldPath, parseDate, resolveNestedPath } from '../core/utils';
2+
import { IGroupByExpandState } from './groupby-expand-state.interface';
3+
import { IGroupByRecord } from './groupby-record.interface';
4+
import { IGroupingState } from './groupby-state.interface';
5+
import { IGroupingExpression } from './grouping-expression.interface';
6+
import { IGroupByResult } from './grouping-result.interface';
7+
import { getHierarchy, isHierarchyMatch } from './operations';
8+
import { DefaultSortingStrategy, ISortingExpression } from './sorting-strategy';
9+
import type { GridType } from 'igniteui-angular/grids';
1010

1111
const DATE_TYPE = 'date';
1212
const TIME_TYPE = 'time';

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export * from './data-operations/groupby-record.interface';
2121
export * from './data-operations/groupby-state.interface';
2222
export * from './data-operations/grouping-expression.interface';
2323
export * from './data-operations/sorting-strategy';
24+
export * from './data-operations/grid-sorting-strategy';
2425
export * from './data-operations/paging-state.interface';
2526
export * from './data-operations/data-util';
2627

projects/igniteui-angular/grids/src/grids/common/grid.interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { IgxFilteringOperand } from '../../data-operations/filtering-condition';
3131
import { IColumnEditorOptions, IColumnPipeArgs, IFieldEditorOptions, IFieldPipeArgs, ISortingOptions, MRLResizeColumnInfo } from '../columns/interfaces';
3232
import { IgxSummaryResult } from '../summaries/grid-summary';
3333
import { ISortingExpression, ISortingStrategy, SortingDirection } from '../../data-operations/sorting-strategy';
34-
import { IGridGroupingStrategy, IGridSortingStrategy } from './strategy';
34+
import { IGridGroupingStrategy, IGridSortingStrategy } from 'igniteui-angular/core';
3535
import { IForOfState, IgxGridForOfDirective } from '../../directives/for-of/for_of.directive';
3636
import { OverlaySettings } from '../../services/overlay/utilities';
3737
import { IDimensionsChange, IPivotConfiguration, IPivotDimension, IPivotKeys, IPivotValue, IValuesChange, PivotDimensionType, IPivotUISettings } from '../pivot-grid/pivot-grid.interface';
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export * from './enums';
22
export * from './events';
33
export * from './grid.interface';
4-
export * from './strategy';
4+
export * from 'igniteui-angular/core';
55
export * from './types';

projects/igniteui-angular/grids/src/grids/grid/grid.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { IgxGridCRUDService } from '../common/crud.service';
3030
import { IgxGridRow, IgxGroupByRow, IgxSummaryRow } from '../grid-public-row';
3131
import { IgxGridCell } from '../grid-public-cell';
3232
import { ISortingExpression } from '../../data-operations/sorting-strategy';
33-
import { IGridGroupingStrategy } from '../common/strategy';
33+
import { IGridGroupingStrategy } from 'igniteui-angular/core';
3434
import { IgxGridValidationService } from './grid-validation.service';
3535
import { IgxGridDetailsPipe } from './grid.details.pipe';
3636
import { IgxGridSummaryPipe } from './grid.summary.pipe';

projects/igniteui-angular/grids/src/grids/grid/grid.pipes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IGroupingExpression } from '../../data-operations/grouping-expression.i
88
import { ColumnType, GridType, IGX_GRID_BASE } from '../common/grid.interface';
99
import { FilterUtil, IFilteringStrategy } from '../../data-operations/filtering-strategy';
1010
import { ISortingExpression } from '../../data-operations/sorting-strategy';
11-
import { IGridSortingStrategy, IGridGroupingStrategy } from '../common/strategy';
11+
import { IGridSortingStrategy, IGridGroupingStrategy } from 'igniteui-angular/core';
1212
import { GridCellMergeMode, RowPinningPosition } from '../common/enums';
1313
import { IGridMergeStrategy } from '../../data-operations/merge-strategy';
1414

projects/igniteui-angular/grids/src/grids/grid/grid.sorting.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { GridDeclaredColumnsComponent, SortByParityComponent, GridWithPrimaryKey
77
import { UIInteractions } from '../../test-utils/ui-interactions.spec';
88
import { SampleTestData } from '../../test-utils/sample-test-data.spec';
99
import { CellType } from '../common/grid.interface';
10-
import { NoopSortingStrategy } from '../common/strategy';
10+
import { NoopSortingStrategy } from 'igniteui-angular/core';
1111
import { By } from '@angular/platform-browser';
1212

1313
describe('IgxGrid - Grid Sorting #grid', () => {

projects/igniteui-angular/grids/src/grids/pivot-grid/pivot-grid.pipes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import { ISortingExpression } from '../../data-operations/sorting-strategy';
1212
import { GridBaseAPIService } from '../api.service';
1313
import { GridType, IGX_GRID_BASE, PivotGridType } from '../common/grid.interface';
14-
import { IGridSortingStrategy } from '../common/strategy';
14+
import { IGridSortingStrategy } from 'igniteui-angular/core';
1515
import { IgxGridBaseDirective } from '../grid-base.directive';
1616
import { DEFAULT_PIVOT_KEYS, IPivotConfiguration, IPivotDimension, IPivotGridColumn, IPivotGridGroupRecord, IPivotGridHorizontalGroup, IPivotGridRecord, IPivotKeys, IPivotValue } from './pivot-grid.interface';
1717
import { PivotSortUtil } from './pivot-sort-util';

0 commit comments

Comments
 (0)