From b0d07c0a31774561c9f2fc24768680d5c4eaa477 Mon Sep 17 00:00:00 2001 From: Radoslav Karaivanov Date: Tue, 10 Sep 2019 13:29:44 +0300 Subject: [PATCH] refactor(igx-grid): Reworked barrel imports --- .../src/lib/grids/cell.component.ts | 4 ++- .../src/lib/grids/column.component.ts | 2 +- .../{types => common}/column.interface.ts | 0 .../src/lib/grids/{types => common}/enums.ts | 0 .../grids/{types => common}/grid.interface.ts | 0 .../grids/{types => common}/row.interface.ts | 0 .../lib/grids/{types => common}/templates.ts | 0 .../src/lib/grids/grid-base.component.ts | 5 +--- .../src/lib/grids/grid-common.module.ts | 2 +- .../src/lib/grids/grid-navigation.service.ts | 3 +- .../src/lib/grids/grid.rowEdit.directive.ts | 2 +- .../src/lib/grids/grid/column-hiding.spec.ts | 2 +- .../grids/grid/grid-cell-selection.spec.ts | 2 +- .../lib/grids/grid/grid-filtering-ui.spec.ts | 2 +- .../lib/grids/grid/grid-keyBoardNav.spec.ts | 2 +- .../lib/grids/grid/grid-row-selection.spec.ts | 2 +- .../src/lib/grids/grid/grid-summary.spec.ts | 2 +- .../src/lib/grids/grid/grid.component.spec.ts | 2 +- .../src/lib/grids/grid/grid.component.ts | 30 +------------------ .../src/lib/grids/grid/grid.groupby.spec.ts | 2 +- .../src/lib/grids/grid/grid.summary.pipe.ts | 2 +- .../lib/grids/grid/row-drag.directive.spec.ts | 2 +- .../hierarchical-grid-navigation.service.ts | 2 +- .../hierarchical-grid.integration.spec.ts | 2 +- .../hierarchical-grid.selection.spec.ts | 2 +- .../hierarchical-grid.spec.ts | 2 +- .../tree-grid/tree-grid-expanding.spec.ts | 2 +- .../tree-grid/tree-grid-keyBoardNav.spec.ts | 2 +- .../tree-grid-multi-cell-selection.spec.ts | 2 +- .../tree-grid/tree-grid-selection.spec.ts | 2 +- .../tree-grid/tree-grid.component.spec.ts | 2 +- .../grids/tree-grid/tree-grid.summary.pipe.ts | 2 +- .../src/lib/grids/types/index.ts | 5 ---- 33 files changed, 30 insertions(+), 63 deletions(-) rename projects/igniteui-angular/src/lib/grids/{types => common}/column.interface.ts (100%) rename projects/igniteui-angular/src/lib/grids/{types => common}/enums.ts (100%) rename projects/igniteui-angular/src/lib/grids/{types => common}/grid.interface.ts (100%) rename projects/igniteui-angular/src/lib/grids/{types => common}/row.interface.ts (100%) rename projects/igniteui-angular/src/lib/grids/{types => common}/templates.ts (100%) delete mode 100644 projects/igniteui-angular/src/lib/grids/types/index.ts diff --git a/projects/igniteui-angular/src/lib/grids/cell.component.ts b/projects/igniteui-angular/src/lib/grids/cell.component.ts index b486a36996e..ba7c2010609 100644 --- a/projects/igniteui-angular/src/lib/grids/cell.component.ts +++ b/projects/igniteui-angular/src/lib/grids/cell.component.ts @@ -22,7 +22,9 @@ import { IgxGridBaseComponent, IGridDataBindable } from './grid-base.component'; import { IgxGridSelectionService, ISelectionNode, IgxGridCRUDService } from '../core/grid-selection'; import { DeprecateProperty, DeprecateMethod } from '../core/deprecateDecorators'; import { HammerGesturesManager } from '../core/touch'; -import { ColumnType, RowType, GridSelectionMode } from './types'; +import { ColumnType } from './common/column.interface'; +import { RowType } from './common/row.interface'; +import { GridSelectionMode } from './common/enums'; /** * Providing reference to `IgxGridCellComponent`: diff --git a/projects/igniteui-angular/src/lib/grids/column.component.ts b/projects/igniteui-angular/src/lib/grids/column.component.ts index 2537e6adce7..2d52780d302 100644 --- a/projects/igniteui-angular/src/lib/grids/column.component.ts +++ b/projects/igniteui-angular/src/lib/grids/column.component.ts @@ -38,7 +38,7 @@ import { IgxCellHeaderTemplateDirective, IgxCellEditorTemplateDirective, IgxFilterCellTemplateDirective -} from './types'; +} from './common/templates'; /** * **Ignite UI for Angular Column** - diff --git a/projects/igniteui-angular/src/lib/grids/types/column.interface.ts b/projects/igniteui-angular/src/lib/grids/common/column.interface.ts similarity index 100% rename from projects/igniteui-angular/src/lib/grids/types/column.interface.ts rename to projects/igniteui-angular/src/lib/grids/common/column.interface.ts diff --git a/projects/igniteui-angular/src/lib/grids/types/enums.ts b/projects/igniteui-angular/src/lib/grids/common/enums.ts similarity index 100% rename from projects/igniteui-angular/src/lib/grids/types/enums.ts rename to projects/igniteui-angular/src/lib/grids/common/enums.ts diff --git a/projects/igniteui-angular/src/lib/grids/types/grid.interface.ts b/projects/igniteui-angular/src/lib/grids/common/grid.interface.ts similarity index 100% rename from projects/igniteui-angular/src/lib/grids/types/grid.interface.ts rename to projects/igniteui-angular/src/lib/grids/common/grid.interface.ts diff --git a/projects/igniteui-angular/src/lib/grids/types/row.interface.ts b/projects/igniteui-angular/src/lib/grids/common/row.interface.ts similarity index 100% rename from projects/igniteui-angular/src/lib/grids/types/row.interface.ts rename to projects/igniteui-angular/src/lib/grids/common/row.interface.ts diff --git a/projects/igniteui-angular/src/lib/grids/types/templates.ts b/projects/igniteui-angular/src/lib/grids/common/templates.ts similarity index 100% rename from projects/igniteui-angular/src/lib/grids/types/templates.ts rename to projects/igniteui-angular/src/lib/grids/common/templates.ts diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.component.ts b/projects/igniteui-angular/src/lib/grids/grid-base.component.ts index 3a6738ee2be..19affa9ff4b 100644 --- a/projects/igniteui-angular/src/lib/grids/grid-base.component.ts +++ b/projects/igniteui-angular/src/lib/grids/grid-base.component.ts @@ -90,12 +90,12 @@ import { IgxGridColumnResizerComponent } from './grid-column-resizer.component'; import { IgxGridFilteringRowComponent } from './filtering/grid-filtering-row.component'; import { IgxDragDirective } from '../directives/drag-drop/drag-drop.directive'; import { CharSeparatedValueData } from '../services/csv/char-separated-value-data'; -import { FilterMode, GridKeydownTargetType, GridSelectionMode, GridSummaryPosition, GridSummaryCalculationMode } from './types'; import { IgxColumnResizingService } from './grid-column-resizing.service'; import { IgxHeadSelectorDirective, IgxRowSelectorDirective } from './igx-row-selectors.module'; import { DeprecateProperty } from '../core/deprecateDecorators'; import { IgxRowExpandedIndicatorDirective, IgxRowCollapsedIndicatorDirective, IgxHeaderExpandIndicatorDirective, IgxHeaderCollapseIndicatorDirective } from './grid/grid.directives'; +import { GridKeydownTargetType, GridSelectionMode, GridSummaryPosition, GridSummaryCalculationMode, FilterMode } from './common/enums'; const MINIMUM_COLUMN_WIDTH = 136; const FILTER_ROW_HEIGHT = 50; @@ -2924,9 +2924,6 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements public notifyChanges(repaint = false) { this._cdrRequests = true; this._cdrRequestRepaint = repaint; - if (!this._tick) { - this._tick = Promise.resolve().then(() => this._tick = null); - } this.cdr.markForCheck(); } diff --git a/projects/igniteui-angular/src/lib/grids/grid-common.module.ts b/projects/igniteui-angular/src/lib/grids/grid-common.module.ts index 1112740b893..027901d1ce6 100644 --- a/projects/igniteui-angular/src/lib/grids/grid-common.module.ts +++ b/projects/igniteui-angular/src/lib/grids/grid-common.module.ts @@ -67,7 +67,7 @@ import { IgxCellEditorTemplateDirective, IgxCellTemplateDirective, IgxFilterCellTemplateDirective -} from './types'; +} from './common/templates'; import { IgxRowSelectorsModule } from './igx-row-selectors.module'; /** * @hidden diff --git a/projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts b/projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts index f1c7d2eeb4c..abaaeede32f 100644 --- a/projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts +++ b/projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts @@ -4,7 +4,8 @@ import { IgxColumnComponent } from './column.component'; import { IgxGridGroupByRowComponent } from './grid/groupby-row.component'; import { ISelectionNode } from '../core/grid-selection'; import { IgxForOfDirective } from '../directives/for-of/for_of.directive'; -import { GridType, FilterMode } from './types'; +import { GridType } from './common/grid.interface'; +import { FilterMode } from './common/enums'; enum MoveDirection { LEFT = 'left', diff --git a/projects/igniteui-angular/src/lib/grids/grid.rowEdit.directive.ts b/projects/igniteui-angular/src/lib/grids/grid.rowEdit.directive.ts index f509c390b70..57a5c849683 100644 --- a/projects/igniteui-angular/src/lib/grids/grid.rowEdit.directive.ts +++ b/projects/igniteui-angular/src/lib/grids/grid.rowEdit.directive.ts @@ -1,6 +1,6 @@ import { Directive, ElementRef, HostListener } from '@angular/core'; import { GridBaseAPIService } from './api.service'; -import { GridType } from './types'; +import { GridType } from './common/grid.interface'; /** @hidden */ @Directive({ diff --git a/projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts index 9e59e07358a..4a342f74284 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts @@ -16,7 +16,7 @@ import { HelperUtils } from '../../test-utils/helper-utils.spec'; import { SortingDirection } from '../../data-operations/sorting-expression.interface'; import { configureTestSuite } from '../../test-utils/configure-suite'; import { take } from 'rxjs/operators'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; describe('Column Hiding UI #grid', () => { configureTestSuite(); diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-cell-selection.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-cell-selection.spec.ts index 550bf5a2b86..28ca55b6fb9 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-cell-selection.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-cell-selection.spec.ts @@ -12,7 +12,7 @@ import { IgxStringFilteringOperand } from '../../data-operations/filtering-condi import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; import { setupGridScrollDetection, resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec'; import { DefaultSortingStrategy } from 'igniteui-angular'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; import { GridSelectionFunctions } from '../../test-utils/grid-functions.spec'; diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts index 3c9435ac679..9dd1b0dde5d 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts @@ -43,7 +43,7 @@ import { IgxGridFilteringESFLoadOnDemandComponent } from '../../test-utils/grid-samples.spec'; import { HelperUtils, resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec'; -import { GridSelectionMode, FilterMode } from '../types'; +import { GridSelectionMode, FilterMode } from '../common/enums'; const FILTER_UI_ROW = 'igx-grid-filtering-row'; const FILTER_UI_CELL = 'igx-grid-filtering-cell'; diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts index 271d0a32f9d..df5082eef47 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts @@ -22,7 +22,7 @@ import { VirtualGridComponent, ScrollsComponent, GridWithPrimaryKeyComponent, SelectionComponent } from '../../test-utils/grid-samples.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; import { GridFunctions } from '../../test-utils/grid-functions.spec'; const DEBOUNCETIME = 30; diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-row-selection.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-row-selection.spec.ts index d4a1321af25..79a867ab25a 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-row-selection.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-row-selection.spec.ts @@ -17,7 +17,7 @@ import { } from '../../test-utils/grid-samples.spec'; import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-functions.spec'; import { SampleTestData } from '../../test-utils/sample-test-data.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; import { IgxRowSelectorsModule } from '../igx-row-selectors.module'; const DEBOUNCETIME = 30; diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-summary.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-summary.spec.ts index a10c0b87df9..362e715bd4d 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-summary.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-summary.spec.ts @@ -26,7 +26,7 @@ import { setupGridScrollDetection, resizeObserverIgnoreError } from '../../test- import { SampleTestData } from '../../test-utils/sample-test-data.spec'; import { IgxStringFilteringOperand, IgxNumberFilteringOperand, SortingDirection, IgxChipComponent } from 'igniteui-angular'; import { ColumnGroupFourLevelTestComponent } from './column-group.spec'; -import { GridSummaryCalculationMode } from '../types'; +import { GridSummaryCalculationMode } from '../common/enums'; describe('IgxGrid - Summaries #grid', () => { configureTestSuite(); diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.component.spec.ts index ef4d73ae945..e6c9e8cbf95 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.component.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.component.spec.ts @@ -22,7 +22,7 @@ import { SortingDirection, ISortingExpression } from '../../data-operations/sort import { configureTestSuite } from '../../test-utils/configure-suite'; import { IgxTabsModule, IgxTabsComponent } from '../../tabs'; import { resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; describe('IgxGrid Component Tests #grid', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts index 2bf6a1b70ce..9fda32d453c 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts @@ -11,12 +11,9 @@ import { cloneArray, IBaseEventArgs } from '../../core/utils'; import { IGroupByRecord } from '../../data-operations/groupby-record.interface'; import { IgxGroupByRowTemplateDirective } from './grid.directives'; import { IgxGridGroupByRowComponent } from './groupby-row.component'; -// import { IDisplayDensityOptions, DisplayDensityToken } from '../../core/displayDensity'; import { IGroupByExpandState } from '../../data-operations/groupby-expand-state.interface'; import { IBaseChipEventArgs, IChipClickEventArgs, IChipKeyDownEventArgs } from '../../chips/chip.component'; import { IChipsAreaReorderEventArgs } from '../../chips/chips-area.component'; -// import { TransactionService, Transaction, State } from '../../services/transaction/transaction'; -// import { DOCUMENT } from '@angular/common'; import { IgxColumnComponent } from '../column.component'; import { takeUntil } from 'rxjs/operators'; import { IgxFilteringService } from '../filtering/grid-filtering.service'; @@ -24,11 +21,10 @@ import { IGroupingExpression } from '../../data-operations/grouping-expression.i import { IgxColumnResizingService } from '../grid-column-resizing.service'; import { IgxGridSummaryService } from '../summaries/grid-summary.service'; import { IgxGridSelectionService, IgxGridCRUDService } from '../../core/grid-selection'; -// import { IgxOverlayService } from '../../services/index'; import { IgxForOfSyncService } from '../../directives/for-of/for_of.sync.service'; import { IgxDragIndicatorIconDirective } from '../row-drag.directive'; import { IgxGridMRLNavigationService } from '../grid-mrl-navigation.service'; -import { FilterMode } from '../types'; +import { FilterMode } from '../common/enums'; let NEXT_ID = 0; @@ -221,30 +217,6 @@ export class IgxGridComponent extends IgxGridBaseComponent implements IGridDataB } private _filteredData = null; - // constructor( - // selectionService: IgxGridSelectionService, - // crudService: IgxGridCRUDService, - // public colResizingService: IgxColumnResizingService, - // gridAPI: GridBaseAPIService, - // @Inject(IgxGridTransaction) _transactions: TransactionService, - // elementRef: ElementRef, - // zone: NgZone, - // @Inject(DOCUMENT) public document, - // cdr: ChangeDetectorRef, - // resolver: ComponentFactoryResolver, - // differs: IterableDiffers, - // viewRef: ViewContainerRef, - // navigation: IgxGridNavigationService, - // filteringService: IgxFilteringService, - // @Inject(IgxOverlayService) protected overlayService: IgxOverlayService, - // summaryService: IgxGridSummaryService, - // @Optional() @Inject(DisplayDensityToken) protected _displayDensityOptions: IDisplayDensityOptions) { - // super(selectionService, - // crudService, gridAPI, _transactions, elementRef, zone, document, cdr, resolver, differs, viewRef, navigation, - // filteringService, overlayService, summaryService, _displayDensityOptions); - // this._gridAPI = gridAPI; - // } - /** * Returns the group by state of the `IgxGridComponent`. * ```typescript diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.groupby.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.groupby.spec.ts index 19bce93e8f9..8c870292433 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.groupby.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.groupby.spec.ts @@ -18,7 +18,7 @@ import { DataParent } from '../../test-utils/sample-test-data.spec'; import { MultiColumnHeadersWithGroupingComponent } from '../../test-utils/grid-samples.spec'; import { resizeObserverIgnoreError, HelperUtils } from '../../test-utils/helper-utils.spec'; import { GridSelectionFunctions } from '../../test-utils/grid-functions.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; describe('IgxGrid - GroupBy #grid', () => { configureTestSuite(); diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.summary.pipe.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.summary.pipe.ts index 04cf1e33cbe..8dab817d6b3 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.summary.pipe.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.summary.pipe.ts @@ -6,7 +6,7 @@ import { IgxGridComponent } from './grid.component'; import { ISummaryRecord } from '../summaries/grid-summary'; import { IGroupByRecord } from '../../data-operations/groupby-record.interface'; import { IGroupByResult } from '../../data-operations/grouping-result.interface'; -import { GridSummaryCalculationMode, GridSummaryPosition } from '../types'; +import { GridSummaryCalculationMode, GridSummaryPosition } from '../common/enums'; /** @hidden */ interface ISkipRecord { diff --git a/projects/igniteui-angular/src/lib/grids/grid/row-drag.directive.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/row-drag.directive.spec.ts index efaaf42c983..d6cd8b9a43a 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/row-drag.directive.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/row-drag.directive.spec.ts @@ -22,7 +22,7 @@ import { IgxHierarchicalGridComponent, IgxHierarchicalGridModule, IgxRowComponen import { IgxRowIslandComponent } from '../hierarchical-grid/row-island.component'; import { IgxTreeGridComponent, IgxTreeGridModule } from '../tree-grid'; import { resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; const DEBOUNCE_TIME = 50; diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-navigation.service.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-navigation.service.ts index ca2a24936ba..4e5307a8b0a 100644 --- a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-navigation.service.ts +++ b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-navigation.service.ts @@ -4,7 +4,7 @@ import { first } from 'rxjs/operators'; import { IgxColumnComponent } from '../../grids/column.component'; import { ISelectionNode } from '../../core/grid-selection'; import { isIE } from '../../core/utils'; -import { FilterMode } from '../types'; +import { FilterMode } from '../common/enums'; export class IgxHierarchicalGridNavigationService extends IgxGridNavigationService { public grid: IgxHierarchicalGridComponent; diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.integration.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.integration.spec.ts index c3696959a5b..cd098d0240a 100644 --- a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.integration.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.integration.spec.ts @@ -18,7 +18,7 @@ import { IgxHierarchicalTransactionServiceFactory } from './hierarchical-grid-ba import { IgxIconModule } from '../../icon'; import { IgxHierarchicalGridCellComponent } from './hierarchical-cell.component'; import { resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; import { GridFunctions } from '../../test-utils/grid-functions.spec'; describe('IgxHierarchicalGrid Integration #hGrid', () => { diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.selection.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.selection.spec.ts index 5223fcd5c3c..6b8576fbd1d 100644 --- a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.selection.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.selection.spec.ts @@ -16,7 +16,7 @@ import { import { IgxRowSelectorsModule } from '../igx-row-selectors.module'; import { HelperUtils } from '../../test-utils/helper-utils.spec'; import { GridSelectionFunctions } from '../../test-utils/grid-functions.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; describe('IgxHierarchicalGrid selection #hGrid', () => { configureTestSuite(); diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts index c7dfce94705..6043fa918c7 100644 --- a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.spec.ts @@ -12,7 +12,7 @@ import { IgxChildGridRowComponent } from './child-grid-row.component'; import { DisplayDensity } from '../../core/displayDensity'; import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition'; import { IGridCellEventArgs } from '../grid'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; describe('Basic IgxHierarchicalGrid #hGrid', () => { configureTestSuite(); diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-expanding.spec.ts b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-expanding.spec.ts index 71807050f37..00f7e12f41e 100644 --- a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-expanding.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-expanding.spec.ts @@ -17,7 +17,7 @@ import { wait } from '../../test-utils/ui-interactions.spec'; import { IgxGridModule } from '../grid'; import { resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec'; import { GridFunctions } from '../../test-utils/grid-functions.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; describe('IgxTreeGrid - Expanding / Collapsing #tGrid', () => { configureTestSuite(); diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-keyBoardNav.spec.ts b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-keyBoardNav.spec.ts index c965c0afebf..42884a52fc8 100644 --- a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-keyBoardNav.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-keyBoardNav.spec.ts @@ -6,7 +6,7 @@ import { TreeGridFunctions } from '../../test-utils/tree-grid-functions.spec'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; import { configureTestSuite } from '../../test-utils/configure-suite'; import { setupGridScrollDetection } from '../../test-utils/helper-utils.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; const DEBOUNCETIME = 30; const treeColumns = ['ID', 'Name', 'HireDate', 'Age', 'OnPTO']; diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-multi-cell-selection.spec.ts b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-multi-cell-selection.spec.ts index 73383b6532a..1d13b701893 100644 --- a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-multi-cell-selection.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-multi-cell-selection.spec.ts @@ -12,7 +12,7 @@ import { IgxTreeGridModule } from './tree-grid.module'; import { setupGridScrollDetection } from '../../test-utils/helper-utils.spec'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; import { GridSelectionFunctions, GridSummaryFunctions } from '../../test-utils/grid-functions.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; describe('IgxTreeGrid - Multi Cell selection #tGrid', () => { configureTestSuite(); diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-selection.spec.ts b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-selection.spec.ts index 29b5aecd157..4e501333557 100644 --- a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-selection.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-selection.spec.ts @@ -23,7 +23,7 @@ import { configureTestSuite } from '../../test-utils/configure-suite'; import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec'; import { IgxRowSelectorsModule } from '../igx-row-selectors.module'; import { GridFunctions } from '../../test-utils/grid-functions.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; describe('IgxTreeGrid - Selection #tGrid', () => { configureTestSuite(); diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.spec.ts b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.spec.ts index 1790211905d..110802e932e 100644 --- a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.spec.ts @@ -12,7 +12,7 @@ import { IgxTreeGridCellSelectionComponent } from '../../test-utils/tree-grid-components.spec'; import { wait } from '../../test-utils/ui-interactions.spec'; -import { GridSelectionMode } from '../types'; +import { GridSelectionMode } from '../common/enums'; describe('IgxTreeGrid Component Tests #tGrid', () => { configureTestSuite(); diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.summary.pipe.ts b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.summary.pipe.ts index 4b99104d6d1..758325ea308 100644 --- a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.summary.pipe.ts +++ b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.summary.pipe.ts @@ -5,7 +5,7 @@ import { IgxGridBaseComponent, IGridDataBindable } from '../grid-base.component' import { ITreeGridRecord } from './tree-grid.interfaces'; import { IgxTreeGridComponent } from './tree-grid.component'; import { ISummaryRecord } from '../summaries/grid-summary'; -import { GridSummaryCalculationMode, GridSummaryPosition } from '../types'; +import { GridSummaryCalculationMode, GridSummaryPosition } from '../common/enums'; /** @hidden */ @Pipe({ diff --git a/projects/igniteui-angular/src/lib/grids/types/index.ts b/projects/igniteui-angular/src/lib/grids/types/index.ts deleted file mode 100644 index 9090a71ef6d..00000000000 --- a/projects/igniteui-angular/src/lib/grids/types/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './templates'; -export * from './enums'; -export * from './grid.interface'; -export * from './column.interface'; -export * from './row.interface';