Skip to content

Commit ccb296f

Browse files
SAndreevabkulov
authored andcommitted
Fix grid common module wrong imports (#4030)
* fix(build): grid common module mess up #4025 * fix(build): add a separate module for excel style filtering components #4025
1 parent 6130c09 commit ccb296f

File tree

5 files changed

+117
-59
lines changed

5 files changed

+117
-59
lines changed

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-column-moving.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, ChangeDetectionStrategy, Input } from '@angular/core';
22
import { IgxColumnComponent } from '../../column.component';
3-
import { IgxGridBaseComponent } from '../../grid';
3+
import { IgxGridBaseComponent } from '../../grid-base.component';
44

55
/**
66
* @hidden

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ import {
66
ChangeDetectionStrategy,
77
TemplateRef,
88
Directive,
9-
OnDestroy,
10-
ContentChild,
9+
OnDestroy
1110
} from '@angular/core';
12-
import { IgxColumnComponent } from '../../grid';
13-
import { IgxDropDownComponent, ISelectionEventArgs } from '../../../drop-down';
1411
import {
1512
HorizontalAlignment,
1613
VerticalAlignment,
@@ -37,6 +34,8 @@ import { IgxExcelStyleCustomDialogComponent } from './excel-style-custom-dialog.
3734
import { Subscription, Subject } from 'rxjs';
3835
import { IgxExcelStyleSortingComponent } from './excel-style-sorting.component';
3936
import { takeUntil } from 'rxjs/operators';
37+
import { ISelectionEventArgs, IgxDropDownComponent } from '../../../drop-down';
38+
import { IgxColumnComponent } from '../../column.component';
4039

4140
/**
4241
*@hidden
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
import { NgModule } from '@angular/core';
2+
import { CommonModule } from '@angular/common';
3+
import {
4+
IgxGridExcelStyleFilteringComponent,
5+
IgxExcelStyleSortingTemplateDirective,
6+
IgxExcelStyleHidingTemplateDirective,
7+
IgxExcelStyleMovingTemplateDirective,
8+
IgxExcelStylePinningTemplateDirective
9+
} from './grid.excel-style-filtering.component';
10+
import { IgxExcelStyleSortingComponent } from './excel-style-sorting.component';
11+
import { IgxExcelStyleColumnMovingComponent } from './excel-style-column-moving.component';
12+
import { IgxExcelStyleSearchComponent } from './excel-style-search.component';
13+
import { IgxExcelStyleCustomDialogComponent } from './excel-style-custom-dialog.component';
14+
import { IgxExcelStyleDefaultExpressionComponent } from './excel-style-default-expression.component';
15+
import { IgxExcelStyleDateExpressionComponent } from './excel-style-date-expression.component';
16+
import { IgxSelectionAPIService } from '../../../core/selection';
17+
import { FormsModule } from '@angular/forms';
18+
import { IgxGridPipesModule } from '../../grid-pipes.module';
19+
import { IgxButtonModule } from '../../../directives/button/button.directive';
20+
import { IgxButtonGroupModule } from '../../../buttonGroup/buttonGroup.component';
21+
import { IgxDatePickerModule } from '../../../date-picker/date-picker.component';
22+
import { IgxIconModule } from '../../../icon/index';
23+
import { IgxRippleModule } from '../../../directives/ripple/ripple.directive';
24+
import { IgxInputGroupModule } from '../../../input-group/input-group.component';
25+
import { IgxDropDownModule } from '../../../drop-down/index';
26+
import { IgxForOfModule } from '../../../directives/for-of/for_of.directive';
27+
import { IgxCheckboxModule } from '../../../checkbox/checkbox.component';
28+
import { IgxFilterModule } from '../../../directives/filter/filter.directive';
29+
import { IgxToggleModule } from '../../../directives/toggle/toggle.directive';
30+
import { IgxListModule } from '../../../list/list.component';
31+
32+
/**
33+
* @hidden
34+
*/
35+
@NgModule({
36+
declarations: [
37+
IgxGridExcelStyleFilteringComponent,
38+
IgxExcelStyleSortingComponent,
39+
IgxExcelStyleColumnMovingComponent,
40+
IgxExcelStyleSearchComponent,
41+
IgxExcelStyleCustomDialogComponent,
42+
IgxExcelStyleDefaultExpressionComponent,
43+
IgxExcelStyleDateExpressionComponent,
44+
IgxExcelStyleSortingTemplateDirective,
45+
IgxExcelStyleHidingTemplateDirective,
46+
IgxExcelStyleMovingTemplateDirective,
47+
IgxExcelStylePinningTemplateDirective
48+
],
49+
exports: [
50+
IgxGridExcelStyleFilteringComponent,
51+
IgxExcelStyleSortingTemplateDirective,
52+
IgxExcelStyleHidingTemplateDirective,
53+
IgxExcelStyleMovingTemplateDirective,
54+
IgxExcelStylePinningTemplateDirective
55+
],
56+
imports: [
57+
CommonModule,
58+
FormsModule,
59+
IgxGridPipesModule,
60+
IgxButtonModule,
61+
IgxButtonGroupModule,
62+
IgxDatePickerModule,
63+
IgxIconModule,
64+
IgxRippleModule,
65+
IgxInputGroupModule,
66+
IgxDropDownModule,
67+
IgxForOfModule,
68+
IgxCheckboxModule,
69+
IgxFilterModule,
70+
IgxToggleModule,
71+
IgxListModule
72+
],
73+
entryComponents: [
74+
IgxGridExcelStyleFilteringComponent
75+
],
76+
providers: [
77+
IgxSelectionAPIService
78+
]
79+
})
80+
export class IgxGridExcelStyleFilteringModule {
81+
82+
}

projects/igniteui-angular/src/lib/grids/grid-common.module.ts

+8-54
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ import { IgxGridHeaderComponent } from './grid-header.component';
2323
import { IgxGridToolbarComponent } from './grid-toolbar.component';
2424
import { IgxGridFilteringCellComponent } from './filtering/grid-filtering-cell.component';
2525
import { IgxGridFilteringRowComponent } from './filtering/grid-filtering-row.component';
26-
import {
27-
IgxGridExcelStyleFilteringComponent,
28-
IgxExcelStyleSortingTemplateDirective,
29-
IgxExcelStyleHidingTemplateDirective,
30-
IgxExcelStyleMovingTemplateDirective,
31-
IgxExcelStylePinningTemplateDirective
32-
} from './filtering/excel-style/grid.excel-style-filtering.component';
3326
import {
3427
IgxCellEditorTemplateDirective,
3528
IgxCellFooterTemplateDirective,
@@ -38,21 +31,14 @@ import {
3831
IgxColumnResizerDirective,
3932
IgxColumnMovingDragDirective,
4033
IgxColumnMovingDropDirective,
41-
IgxColumnMovingService,
42-
IgxDecimalPipeComponent,
43-
IgxDatePipeComponent
34+
IgxColumnMovingService
4435
} from './grid.common';
4536
import { IgxGridTransaction } from './grid-base.component';
46-
import {
47-
IgxGridFilterConditionPipe,
48-
IgxGridTransactionPipe
49-
} from './grid-common.pipes';
5037
import { IgxRowComponent } from './row.component';
5138
import { IgxChipsModule } from '../chips/chips.module';
5239
import { IgxDragDropModule } from '../directives/dragdrop/dragdrop.directive';
5340
import { IgxButtonGroupModule } from '../buttonGroup/buttonGroup.component';
5441
import { IgxColumnPinningModule } from './column-pinning.component';
55-
import { TransactionService } from '../services';
5642
import { IgxBaseTransactionService } from '../services/transaction/base-transaction';
5743
import {
5844
IgxRowEditTemplateDirective,
@@ -69,16 +55,9 @@ import { IgxSummaryCellComponent } from './summaries/summary-cell.component';
6955
import { IgxSummaryDataPipe } from './summaries/grid-root-summary.pipe';
7056
import { IgxGridSummaryService } from './summaries/grid-summary.service';
7157
import { IgxProgressBarModule } from '../progressbar/progressbar.component';
72-
import { IgxListComponent, IgxListModule } from '../list';
7358
import { IgxFilterModule } from '../directives/filter/filter.directive';
74-
import { IgxComboModule } from '../combo';
75-
import { IgxExcelStyleSortingComponent } from './filtering/excel-style/excel-style-sorting.component';
76-
import { IgxExcelStyleColumnMovingComponent } from './filtering/excel-style/excel-style-column-moving.component';
77-
import { IgxExcelStyleSearchComponent } from './filtering/excel-style/excel-style-search.component';
78-
import { IgxExcelStyleCustomDialogComponent } from './filtering/excel-style/excel-style-custom-dialog.component';
79-
import { IgxExcelStyleDefaultExpressionComponent } from './filtering/excel-style/excel-style-default-expression.component';
80-
import { IgxExcelStyleDateExpressionComponent } from './filtering/excel-style/excel-style-date-expression.component';
81-
59+
import { IgxGridPipesModule } from './grid-pipes.module';
60+
import { IgxGridExcelStyleFilteringModule } from './filtering/excel-style/grid.excel-style-filtering.module';
8261
/**
8362
* @hidden
8463
*/
@@ -101,33 +80,17 @@ import { IgxExcelStyleDateExpressionComponent } from './filtering/excel-style/ex
10180
IgxColumnResizerDirective,
10281
IgxColumnMovingDragDirective,
10382
IgxColumnMovingDropDirective,
104-
IgxGridFilterConditionPipe,
105-
IgxGridTransactionPipe,
10683
IgxGridFilteringCellComponent,
10784
IgxGridFilteringRowComponent,
108-
IgxGridExcelStyleFilteringComponent,
109-
IgxDatePipeComponent,
110-
IgxDecimalPipeComponent,
11185
IgxSummaryDataPipe,
11286
IgxRowComponent,
11387
IgxGridHeaderGroupComponent,
11488
IgxSummaryRowComponent,
115-
IgxSummaryCellComponent,
116-
IgxExcelStyleSortingComponent,
117-
IgxExcelStyleColumnMovingComponent,
118-
IgxExcelStyleSearchComponent,
119-
IgxExcelStyleCustomDialogComponent,
120-
IgxExcelStyleDefaultExpressionComponent,
121-
IgxExcelStyleDateExpressionComponent,
122-
IgxExcelStyleSortingTemplateDirective,
123-
IgxExcelStyleHidingTemplateDirective,
124-
IgxExcelStyleMovingTemplateDirective,
125-
IgxExcelStylePinningTemplateDirective
89+
IgxSummaryCellComponent
12690
],
12791
entryComponents: [
12892
IgxColumnComponent,
129-
IgxColumnGroupComponent,
130-
IgxGridExcelStyleFilteringComponent
93+
IgxColumnGroupComponent
13194
],
13295
exports: [
13396
IgxGridCellComponent,
@@ -148,11 +111,7 @@ import { IgxExcelStyleDateExpressionComponent } from './filtering/excel-style/ex
148111
IgxColumnMovingDragDirective,
149112
IgxColumnMovingDropDirective,
150113
IgxRowComponent,
151-
IgxGridFilterConditionPipe,
152-
IgxGridTransactionPipe,
153114
IgxSummaryDataPipe,
154-
IgxDatePipeComponent,
155-
IgxDecimalPipeComponent,
156115
IgxButtonModule,
157116
IgxDatePickerModule,
158117
IgxIconModule,
@@ -175,16 +134,11 @@ import { IgxExcelStyleDateExpressionComponent } from './filtering/excel-style/ex
175134
IgxProgressBarModule,
176135
IgxGridFilteringCellComponent,
177136
IgxGridFilteringRowComponent,
178-
IgxGridExcelStyleFilteringComponent,
179137
IgxGridHeaderGroupComponent,
180138
IgxSummaryRowComponent,
181139
IgxSummaryCellComponent,
182-
IgxListComponent,
183140
IgxFilterModule,
184-
IgxExcelStyleSortingTemplateDirective,
185-
IgxExcelStyleHidingTemplateDirective,
186-
IgxExcelStyleMovingTemplateDirective,
187-
IgxExcelStylePinningTemplateDirective
141+
IgxGridPipesModule
188142
],
189143
imports: [
190144
CommonModule,
@@ -209,9 +163,9 @@ import { IgxExcelStyleDateExpressionComponent } from './filtering/excel-style/ex
209163
IgxButtonGroupModule,
210164
IgxColumnPinningModule,
211165
IgxProgressBarModule,
212-
IgxListModule,
213166
IgxFilterModule,
214-
IgxComboModule
167+
IgxGridPipesModule,
168+
IgxGridExcelStyleFilteringModule
215169
],
216170
providers: [
217171
IgxSelectionAPIService,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { NgModule } from '@angular/core';
2+
import { CommonModule } from '@angular/common';
3+
import { IgxDatePipeComponent, IgxDecimalPipeComponent } from './grid.common';
4+
import { IgxGridFilterConditionPipe, IgxGridTransactionPipe } from './grid-common.pipes';
5+
6+
@NgModule({
7+
declarations: [
8+
IgxDatePipeComponent,
9+
IgxDecimalPipeComponent,
10+
IgxGridFilterConditionPipe,
11+
IgxGridTransactionPipe
12+
],
13+
exports: [
14+
IgxDatePipeComponent,
15+
IgxDecimalPipeComponent,
16+
IgxGridFilterConditionPipe,
17+
IgxGridTransactionPipe
18+
],
19+
imports: [
20+
CommonModule
21+
]
22+
})
23+
export class IgxGridPipesModule { }

0 commit comments

Comments
 (0)