Skip to content

Commit 3dac621

Browse files
ChronosSFChronosSF
authored
Merge pull request #3095 from IgniteUI/vNext
updating master with vNext
2 parents ed2fc3b + 4b7761f commit 3dac621

File tree

126 files changed

+8262
-8048
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+8262
-8048
lines changed

‎angular.json‎

Lines changed: 354 additions & 354 deletions
Large diffs are not rendered by default.

‎live-editing/configs/GridConfigGenerator.ts‎

Lines changed: 122 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,45 @@
11
/* eslint-disable max-len */
22
/* eslint-disable @typescript-eslint/naming-convention */
3-
import {CommonModule} from '@angular/common';
4-
import {HttpClientModule} from '@angular/common/http';
5-
import {Router,
6-
RouterModule} from '@angular/router';
7-
import {IgxActionStripModule,
8-
IgxAvatarModule,
9-
IgxBadgeModule,
10-
IgxButtonGroupModule,
11-
IgxButtonModule,
12-
IgxCheckboxModule,
13-
IgxChipsModule,
14-
IgxComboModule,
15-
IgxCsvExporterService,
16-
IgxDatePickerModule,
17-
IgxDialogModule,
18-
IgxDividerModule,
19-
IgxDragDropModule,
20-
IgxExcelExporterService,
21-
IgxExpansionPanelModule,
22-
IgxFocusModule,
23-
IgxGridModule,
24-
IgxIconModule,
25-
IgxInputGroupModule,
26-
IgxListModule,
27-
IgxOverlayService,
28-
IgxProgressBarModule,
29-
IgxRadioModule,
30-
IgxRippleModule,
31-
IgxSelectModule,
32-
IgxSnackbarModule,
33-
IgxSwitchModule,
34-
IgxTabsModule,
35-
IgxToastModule,
36-
IgxTooltipModule,
37-
IgxToggleModule} from 'igniteui-angular';
38-
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing';
3+
import { CommonModule } from '@angular/common';
4+
import { HttpClientModule } from '@angular/common/http';
5+
import {
6+
Router,
7+
RouterModule
8+
} from '@angular/router';
9+
import {
10+
IgxActionStripModule,
11+
IgxAvatarModule,
12+
IgxBadgeModule,
13+
IgxButtonGroupModule,
14+
IgxButtonModule,
15+
IgxCheckboxModule,
16+
IgxChipsModule,
17+
IgxComboModule,
18+
IgxCsvExporterService,
19+
IgxDatePickerModule,
20+
IgxDialogModule,
21+
IgxDividerModule,
22+
IgxDragDropModule,
23+
IgxExcelExporterService,
24+
IgxExpansionPanelModule,
25+
IgxFocusModule,
26+
IgxGridModule,
27+
IgxIconModule,
28+
IgxInputGroupModule,
29+
IgxListModule,
30+
IgxOverlayService,
31+
IgxProgressBarModule,
32+
IgxRadioModule,
33+
IgxRippleModule,
34+
IgxSelectModule,
35+
IgxSnackbarModule,
36+
IgxSwitchModule,
37+
IgxTabsModule,
38+
IgxToastModule,
39+
IgxTooltipModule,
40+
IgxToggleModule
41+
} from 'igniteui-angular';
42+
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
3943
export class GridConfigGenerator implements IConfigGenerator {
4044
public additionalImports = {
4145
IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
@@ -49,7 +53,7 @@ export class GridConfigGenerator implements IConfigGenerator {
4953
RemoteServiceVirt: '../../src/app/services/remoteVirtualization.service',
5054
FinancialDataService: '../../src/app/services/financial.service',
5155
CRUDService: '../../src/app/services/crud.service'
52-
};
56+
};
5357
public generateConfigs(): Config[] {
5458
const configs = new Array<Config>();
5559

@@ -196,7 +200,7 @@ export class GridConfigGenerator implements IConfigGenerator {
196200
appModuleConfig: new AppModuleConfig({
197201
imports: ['HttpClientModule', 'IgxAvatarModule', 'IgxBadgeModule', 'IgxButtonModule', 'IgxSnackbarModule',
198202
'IgxGridModule', 'IgxIconModule', 'IgxInputGroupModule', 'IgxSwitchModule', 'GridSelectionSampleComponent', 'IgxPreventDocumentScrollModule',
199-
'FinancialDataService'],
203+
'FinancialDataService'],
200204
ngDeclarations: ['GridSelectionSampleComponent'],
201205
ngImports: ['IgxPreventDocumentScrollModule', 'IgxAvatarModule', 'IgxBadgeModule', 'IgxButtonModule', 'IgxGridModule', 'IgxSnackbarModule',
202206
'IgxIconModule', 'IgxInputGroupModule', 'IgxSwitchModule', 'HttpClientModule'],
@@ -473,6 +477,16 @@ export class GridConfigGenerator implements IConfigGenerator {
473477
})
474478
}));
475479

480+
configs.push(new Config({
481+
component: 'GridExcelStyleEditingComponent',
482+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
483+
appModuleConfig: new AppModuleConfig({
484+
imports: ['GridExcelStyleEditingComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule'],
485+
ngDeclarations: ['GridExcelStyleEditingComponent'],
486+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
487+
})
488+
}));
489+
476490
configs.push(new Config({
477491
component: 'GridEditingStyleSampleComponent',
478492
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
@@ -785,7 +799,7 @@ export class GridConfigGenerator implements IConfigGenerator {
785799

786800
configs.push(new Config({
787801
component: 'GridNestedDataBindComponent',
788-
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nested-employee-data.ts'],
802+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nested-employee-data.ts', '/src/_variables.scss', '/src/_app-layout.scss'],
789803
appModuleConfig: new AppModuleConfig({
790804
imports: ['GridNestedDataBindComponent', 'IgxGridModule', 'IgxInputGroupModule', 'IgxExpansionPanelModule', 'IgxPreventDocumentScrollModule'],
791805
ngDeclarations: ['GridNestedDataBindComponent'],
@@ -795,7 +809,7 @@ export class GridConfigGenerator implements IConfigGenerator {
795809

796810
configs.push(new Config({
797811
component: 'GridNestedDataBindAminoacidComponent',
798-
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/amino-data.ts'],
812+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/amino-data.ts', '/src/_variables.scss', '/src/_app-layout.scss'],
799813
appModuleConfig: new AppModuleConfig({
800814
imports: ['GridNestedDataBindAminoacidComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule'],
801815
ngDeclarations: ['GridNestedDataBindAminoacidComponent'],
@@ -805,7 +819,7 @@ export class GridConfigGenerator implements IConfigGenerator {
805819

806820
configs.push(new Config({
807821
component: 'GridCompositeDataComponent',
808-
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts'],
822+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts', '/src/_variables.scss', '/src/_app-layout.scss'],
809823
appModuleConfig: new AppModuleConfig({
810824
imports: ['GridCompositeDataComponent', 'IgxGridModule', 'IgxInputGroupModule', 'IgxPreventDocumentScrollModule'],
811825
ngDeclarations: ['GridCompositeDataComponent'],
@@ -1256,7 +1270,7 @@ export class GridConfigGenerator implements IConfigGenerator {
12561270
appModuleConfig: new AppModuleConfig({
12571271
imports: ['GridAddRowSampleComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule', 'IgxActionStripModule', 'IgxInputGroupModule', 'IgxFocusModule'],
12581272
ngDeclarations: ['GridAddRowSampleComponent'],
1259-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule','IgxActionStripModule', 'IgxInputGroupModule', 'IgxFocusModule']
1273+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxActionStripModule', 'IgxInputGroupModule', 'IgxFocusModule']
12601274
})
12611275
}));
12621276

@@ -1275,7 +1289,7 @@ export class GridConfigGenerator implements IConfigGenerator {
12751289
component: 'GridSelectComponent',
12761290
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/grid/grid-select/data.ts', '/src/app/grid/grid-select/characters.ts'],
12771291
appModuleConfig: new AppModuleConfig({
1278-
imports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxSelectModule', 'GridSelectComponent' ],
1292+
imports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxSelectModule', 'GridSelectComponent'],
12791293
ngDeclarations: ['GridSelectComponent'],
12801294
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxSelectModule']
12811295
})
@@ -1317,23 +1331,85 @@ export class GridConfigGenerator implements IConfigGenerator {
13171331
component: 'GridRowClassesComponent',
13181332
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
13191333
appModuleConfig: new AppModuleConfig({
1320-
imports: [ 'IgxGridModule', 'GridRowClassesComponent', 'IgxPreventDocumentScrollModule'],
1334+
imports: ['IgxGridModule', 'GridRowClassesComponent', 'IgxPreventDocumentScrollModule'],
13211335
ngDeclarations: ['GridRowClassesComponent'],
13221336
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
13231337
})
13241338
}));
13251339

13261340
configs.push(new Config({
13271341
component: 'GridRowStylesComponent',
1328-
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/services/financial.service.ts', '/src/app/data/financialData.ts'],
1342+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/services/financial.service.ts', '/src/app/data/financialData.ts'],
13291343
appModuleConfig: new AppModuleConfig({
1330-
imports: [ 'IgxGridModule', 'GridRowStylesComponent', 'IgxPreventDocumentScrollModule', 'FinancialDataService'],
1344+
imports: ['IgxGridModule', 'GridRowStylesComponent', 'IgxPreventDocumentScrollModule', 'FinancialDataService'],
13311345
ngDeclarations: ['GridRowStylesComponent'],
13321346
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule'],
13331347
ngProviders: ['FinancialDataService']
13341348
})
13351349
}));
13361350

1351+
configs.push(new Config({
1352+
component: 'GridValidatorServiceComponent',
1353+
additionalFiles: [
1354+
'/src/app/directives/prevent-scroll.directive.ts',
1355+
'/src/app/data/employeesData.ts'
1356+
1357+
],
1358+
appModuleConfig: new AppModuleConfig({
1359+
imports: ['GridValidatorServiceComponent', 'IgxGridModule', 'IgxFocusModule', 'IgxPreventDocumentScrollModule'],
1360+
ngDeclarations: ['GridValidatorServiceComponent'],
1361+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxFocusModule']
1362+
})
1363+
}));
1364+
1365+
configs.push(new Config({
1366+
component: 'GridColumnAutosizingComponent',
1367+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts'],
1368+
appModuleConfig: new AppModuleConfig({
1369+
imports: ['IgxGridModule', 'GridColumnAutosizingComponent', 'IgxPreventDocumentScrollModule'],
1370+
ngDeclarations: ['GridColumnAutosizingComponent'],
1371+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
1372+
})
1373+
}));
1374+
1375+
configs.push(new Config({
1376+
component: 'GridValidatorServiceCrossFieldComponent',
1377+
additionalFiles: [
1378+
'/src/app/directives/prevent-scroll.directive.ts',
1379+
'/src/app/data/employeesData.ts'
1380+
1381+
],
1382+
appModuleConfig: new AppModuleConfig({
1383+
imports: ['GridValidatorServiceCrossFieldComponent', 'IgxGridModule', 'IgxTooltipModule', 'IgxFocusModule', 'IgxPreventDocumentScrollModule'],
1384+
ngDeclarations: ['GridValidatorServiceCrossFieldComponent'],
1385+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxFocusModule', 'IgxTooltipModule']
1386+
})
1387+
}));
1388+
1389+
configs.push(new Config({
1390+
component: 'GridValidationStyleComponent',
1391+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
1392+
appModuleConfig: new AppModuleConfig({
1393+
imports: ['IgxGridModule', 'GridValidationStyleComponent', 'IgxPreventDocumentScrollModule'],
1394+
ngDeclarations: ['GridValidationStyleComponent'],
1395+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
1396+
})
1397+
}));
1398+
1399+
configs.push(new Config({
1400+
component: 'GridValidatorServiceExtendedComponent',
1401+
additionalFiles: [
1402+
'/src/app/directives/prevent-scroll.directive.ts',
1403+
'/src/app/data/employeesData.ts'
1404+
1405+
],
1406+
appModuleConfig: new AppModuleConfig({
1407+
imports: ['GridValidatorServiceExtendedComponent', 'IgxGridModule', 'IgxFocusModule', 'IgxPreventDocumentScrollModule'],
1408+
ngDeclarations: ['GridValidatorServiceExtendedComponent'],
1409+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxFocusModule']
1410+
})
1411+
}));
1412+
13371413
return configs;
13381414
}
13391415
}

‎live-editing/configs/HierarchicalGridConfigGenerator.ts‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable @typescript-eslint/naming-convention */
22
/* eslint-disable max-len */
3+
import {ReactiveFormsModule} from '@angular/forms';
34
import { HttpClientModule } from '@angular/common/http';
45
import {
56
IgxActionStripModule,
@@ -934,6 +935,70 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
934935
})
935936
}));
936937

938+
configs.push(new Config({
939+
component: 'HierarchicalGridValidatorServiceComponent',
940+
additionalFiles: [
941+
'/src/app/directives/prevent-scroll.directive.ts',
942+
'/src/app/data/hierarchical-data.ts'
943+
],
944+
appModuleConfig: new AppModuleConfig({
945+
imports: ['HierarchicalGridValidatorServiceComponent', 'IgxHierarchicalGridModule', 'IgxPreventDocumentScrollModule'],
946+
ngDeclarations: ['HierarchicalGridValidatorServiceComponent'],
947+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
948+
})
949+
}));
950+
951+
952+
configs.push(new Config({
953+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/hierarchical-data.ts'],
954+
appModuleConfig: new AppModuleConfig({
955+
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridColumnAutoSizingSampleComponent'],
956+
ngDeclarations: ['HGridColumnAutoSizingSampleComponent'],
957+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule'],
958+
}),
959+
component: 'HGridColumnAutoSizingSampleComponent'
960+
}));
961+
962+
963+
configs.push(new Config({
964+
component: 'HierarchicalGridValidatorServiceCrossCellComponent',
965+
additionalFiles: [
966+
'/src/app/directives/prevent-scroll.directive.ts',
967+
'/src/app/data/hierarchical-data.ts'
968+
969+
],
970+
appModuleConfig: new AppModuleConfig({
971+
imports: ['HierarchicalGridValidatorServiceCrossCellComponent', 'IgxHierarchicalGridModule', 'IgxTooltipModule', 'ReactiveFormsModule', 'IgxPreventDocumentScrollModule'],
972+
ngDeclarations: ['HierarchicalGridValidatorServiceCrossCellComponent'],
973+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxTooltipModule', 'ReactiveFormsModule']
974+
})
975+
}));
976+
977+
configs.push(new Config({
978+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts',
979+
'/src/app/hierarchical-grid/models.ts'],
980+
appModuleConfig: new AppModuleConfig({
981+
imports: ['IgxHierarchicalGridModule', 'HGridValidationStyleComponent', 'IgxPreventDocumentScrollModule'],
982+
ngDeclarations: ['HGridValidationStyleComponent'],
983+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
984+
}),
985+
component: 'HGridValidationStyleComponent'
986+
}));
987+
988+
configs.push(new Config({
989+
component: 'HierarchicalGridValidatorServiceExtendedComponent',
990+
additionalFiles: [
991+
'/src/app/directives/prevent-scroll.directive.ts',
992+
'/src/app/data/hierarchical-data.ts'
993+
994+
],
995+
appModuleConfig: new AppModuleConfig({
996+
imports: ['HierarchicalGridValidatorServiceExtendedComponent', 'IgxHierarchicalGridModule', 'IgxPreventDocumentScrollModule'],
997+
ngDeclarations: ['HierarchicalGridValidatorServiceExtendedComponent'],
998+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
999+
})
1000+
}));
1001+
9371002
return configs;
9381003
}
9391004
}

‎live-editing/configs/ListConfigGenerator.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,19 @@ export class ListConfigGenerator implements IConfigGenerator {
133133
shortenComponentPathBy: "/lists/list/"
134134
}));
135135

136+
// list item selection
137+
configs.push(new Config({
138+
component: 'ListItemSelectionComponent',
139+
appModuleConfig: new AppModuleConfig({
140+
imports: ['IgxAvatarModule', 'IgxFilterModule', 'IgxIconModule', 'IgxListModule',
141+
'IgxInputGroupModule', 'ListItemSelectionComponent'],
142+
ngDeclarations: ['ListItemSelectionComponent'],
143+
ngImports: ['IgxAvatarModule', 'IgxFilterModule', 'IgxIconModule', 'IgxListModule',
144+
'IgxInputGroupModule']
145+
}),
146+
shortenComponentPathBy: "/lists/list/"
147+
}));
148+
136149
return configs;
137150
}
138151
}

0 commit comments

Comments
 (0)