Skip to content

Commit 3c826f8

Browse files
ChronosSFChronosSF
authored
Merge pull request #3795 from IgniteUI/vnext
Updating Master with changes from Vnext
2 parents b2d7209 + bdd8778 commit 3c826f8

File tree

77 files changed

+2364
-119
lines changed

Some content is hidden

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

77 files changed

+2364
-119
lines changed

‎live-editing/Routes.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import * as TreeGridDvRoutingModule from '../projects/app-lob/src/app/tree-grid/
99
import * as DataDisplayRouting from '../src/app/data-display/data-display.routes';
1010
import * as DataEntriesRouting from '../src/app/data-entries/data-entries.routes';
1111
import * as GridRouting from '../src/app/grid/grids.routes';
12+
import * as GridLiteRouting from '../src/app/grid-lite/grid-lite.routes';
1213
import * as PivotGridRouting from '../src/app/pivot-grid/pivot-grids.routes';
1314
import * as HierarchicalGridRouting from '../src/app/hierarchical-grid/hierarchical-grid.routes';
1415
import * as InteractionsRouting from '../src/app/interactions/interactions.routes';
@@ -68,6 +69,10 @@ export const MODULE_ROUTES = [
6869
path: 'grid',
6970
routes: GridRouting.GridsRoutes
7071
},
72+
{
73+
path: 'grid-lite',
74+
routes: GridLiteRouting.GridLiteRoutes
75+
},
7176
{
7277
path: 'pivot-grid',
7378
routes: PivotGridRouting.PivotGridsRoutes

‎live-editing/configs/BaseConfig.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ export const BaseAppConfig = {
77
providers: [
88
{ 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
99
],
10-
router: false
11-
}
10+
routesConfig: {
11+
router: false
12+
}
13+
}

‎live-editing/configs/GridCRMConfigGenerator.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ export class GridCRMConfigGenerator implements IConfigGenerator {
2626
],
2727
providers: [
2828
{ 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
29-
],
30-
router: true
29+
]
3130
}
3231
/*appConfig: BaseAppConfig*/
3332

‎live-editing/configs/GridConfigGenerator.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,11 +452,17 @@ export class GridConfigGenerator implements IConfigGenerator {
452452
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts',
453453
'/src/app/grid/grid-save-state/localData.ts',
454454
'/src/app/grid/grid-save-state/about.component.ts',
455-
'/src/app/grid/grid-save-state/about.component.html'
455+
'/src/app/grid/grid-save-state/about.component.html',
456+
'/src/app/grid/grid-save-state/routes.ts'
456457
],
457-
appConfig: BaseAppConfig
458+
appConfig: {
459+
...BaseAppConfig,
460+
routesConfig: {
461+
router: true,
462+
routesImportPath: './grid/grid-save-state/routes'
463+
}
464+
}
458465
});
459-
gridSaveStateSampleConfig.usesRouting = true;
460466
configs.push(gridSaveStateSampleConfig);
461467

462468
configs.push(new Config({

‎live-editing/configs/GridLiteConfigGenerator.ts‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
import { Config, IConfigGenerator } from 'igniteui-live-editing'
2+
import { BaseAppConfig } from './BaseConfig';
3+
4+
export class GridLiteConfigGenerator implements IConfigGenerator {
5+
public additionalImports = {
6+
//GridLiteDataService: '../../src/app/grid-lite/grid-lite-data.service.ts'
7+
};
8+
9+
public generateConfigs(): Config[] {
10+
const configs = new Array<Config>();
11+
12+
configs.push(new Config({
13+
component: 'GridLiteOverviewComponent',
14+
additionalDependencies: ['igniteui-grid-lite'],
15+
additionalFiles: [
16+
'/src/app/grid-lite/grid-lite-data.service.ts'
17+
],
18+
appConfig: BaseAppConfig
19+
}));
20+
21+
configs.push(new Config({
22+
component: 'GridLiteColumnConfigSimpleComponent',
23+
additionalDependencies: ['igniteui-grid-lite'],
24+
additionalFiles: [
25+
'/src/app/grid-lite/grid-lite-data.service.ts'
26+
],
27+
appConfig: BaseAppConfig
28+
}));
29+
30+
configs.push(new Config({
31+
component: 'GridLiteColumnConfigDynamicComponent',
32+
additionalDependencies: ['igniteui-grid-lite'],
33+
additionalFiles: [
34+
'/src/app/grid-lite/grid-lite-data.service.ts'
35+
],
36+
appConfig: BaseAppConfig
37+
}));
38+
39+
configs.push(new Config({
40+
component: 'GridLiteColumnConfigHeadersComponent',
41+
additionalDependencies: ['igniteui-grid-lite'],
42+
additionalFiles: [
43+
'/src/app/grid-lite/grid-lite-data.service.ts'
44+
],
45+
appConfig: BaseAppConfig
46+
}));
47+
48+
configs.push(new Config({
49+
component: 'GridLiteDataBindingDynamicComponent',
50+
additionalDependencies: ['igniteui-grid-lite'],
51+
additionalFiles: [
52+
'/src/app/grid-lite/grid-lite-data.service.ts'
53+
],
54+
appConfig: BaseAppConfig
55+
}));
56+
57+
configs.push(new Config({
58+
component: 'GridLiteFilteringSimpleComponent',
59+
additionalDependencies: ['igniteui-grid-lite'],
60+
additionalFiles: [
61+
'/src/app/grid-lite/grid-lite-data.service.ts'
62+
],
63+
appConfig: BaseAppConfig
64+
}));
65+
66+
configs.push(new Config({
67+
component: 'GridLiteFilteringEventsComponent',
68+
additionalDependencies: ['igniteui-grid-lite'],
69+
additionalFiles: [
70+
'/src/app/grid-lite/grid-lite-data.service.ts'
71+
],
72+
appConfig: BaseAppConfig
73+
}));
74+
75+
configs.push(new Config({
76+
component: 'GridLiteFilteringPipelineComponent',
77+
additionalDependencies: ['igniteui-grid-lite'],
78+
additionalFiles: [
79+
'/src/app/grid-lite/grid-lite-data.service.ts'
80+
],
81+
appConfig: BaseAppConfig
82+
}));
83+
84+
configs.push(new Config({
85+
component: 'GridLiteSortingSimpleComponent',
86+
additionalDependencies: ['igniteui-grid-lite'],
87+
additionalFiles: [
88+
'/src/app/grid-lite/grid-lite-data.service.ts'
89+
],
90+
appConfig: BaseAppConfig
91+
}));
92+
93+
configs.push(new Config({
94+
component: 'GridLiteSortingEventsComponent',
95+
additionalDependencies: ['igniteui-grid-lite'],
96+
additionalFiles: [
97+
'/src/app/grid-lite/grid-lite-data.service.ts'
98+
],
99+
appConfig: BaseAppConfig
100+
}));
101+
102+
configs.push(new Config({
103+
component: 'GridLiteSortingGridConfigComponent',
104+
additionalDependencies: ['igniteui-grid-lite'],
105+
additionalFiles: [
106+
'/src/app/grid-lite/grid-lite-data.service.ts'
107+
],
108+
appConfig: BaseAppConfig
109+
}));
110+
111+
configs.push(new Config({
112+
component: 'GridLiteSortingPipelineComponent',
113+
additionalDependencies: ['igniteui-grid-lite'],
114+
additionalFiles: [
115+
'/src/app/grid-lite/grid-lite-data.service.ts'
116+
],
117+
appConfig: BaseAppConfig
118+
}));
119+
120+
configs.push(new Config({
121+
component: 'GridLiteStylingCustomComponent',
122+
additionalDependencies: ['igniteui-grid-lite'],
123+
additionalFiles: [
124+
'/src/app/grid-lite/grid-lite-data.service.ts'
125+
],
126+
appConfig: BaseAppConfig
127+
}));
128+
129+
configs.push(new Config({
130+
component: 'GridLiteStylingThemesComponent',
131+
additionalDependencies: ['igniteui-grid-lite'],
132+
additionalFiles: [
133+
'/src/app/grid-lite/grid-lite-data.service.ts'
134+
],
135+
appConfig: BaseAppConfig
136+
}));
137+
138+
return configs;
139+
};
140+
}

‎live-editing/configs/HierarchicalGridConfigGenerator.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable @typescript-eslint/naming-convention */
22
/* eslint-disable max-len */
3-
import {ReactiveFormsModule} from '@angular/forms';
3+
import { ReactiveFormsModule } from '@angular/forms';
44
import { HttpClientModule } from '@angular/common/http';
55
import {
66
IgxActionStripModule,
@@ -517,12 +517,18 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
517517
'/src/app/data/singersData.ts',
518518
'/src/app/hierarchical-grid/models.ts',
519519
'/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.ts',
520-
'/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html'
520+
'/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html',
521+
'/src/app/hierarchical-grid/hierarchical-grid-save-state/routes.ts'
521522
],
522-
appConfig: BaseAppConfig,
523+
appConfig: {
524+
...BaseAppConfig,
525+
routesConfig: {
526+
router: true,
527+
routesImportPath: './hierarchical-grid/hierarchical-grid-save-state/routes'
528+
}
529+
},
523530
component: 'HGridSaveStateComponent'
524531
});
525-
hGridSaveStateSampleConfig.usesRouting = true;
526532
configs.push(hGridSaveStateSampleConfig);
527533

528534
configs.push(new Config({

‎live-editing/configs/PivotGridConfigGenerator.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,21 @@ export class PivotGridConfigGenerator implements IConfigGenerator {
4242
}));
4343

4444
configs.push(new Config({
45-
additionalFiles:
45+
additionalFiles:
4646
[
4747
'/src/app/directives/prevent-scroll.directive.ts',
4848
'/src/app/data/dataToAnalyze.ts',
4949
'/src/app/pivot-grid/pivot-state-persistence/about.component.ts',
5050
'/src/app/pivot-grid/pivot-state-persistence/about.component.html',
51+
'/src/app/pivot-grid/pivot-state-persistence/routes.ts'
5152
],
52-
appConfig: BaseAppConfig,
53+
appConfig: {
54+
...BaseAppConfig,
55+
routesConfig: {
56+
router: true,
57+
routesImportPath: './pivot-grid/pivot-state-persistence/routes'
58+
}
59+
},
5360
component: 'PivotGridStatePersistenceSampleComponent'
5461
}));
5562

‎live-editing/configs/TabBarConfigGenerator.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ export class TabBarConfigGenerator implements IConfigGenerator {
3737
"/src/app/layouts/tabbar/views/view3/view3.component.ts",
3838
"/src/app/layouts/tabbar/views/view3/view3.component.html"
3939
],
40-
/* TODO: Adding the correct router config needs to be done separately */
41-
appConfig: { ...BaseAppConfig, ...{ router: true }},
40+
/* Note: the Tabbar samples are not used anymore */
41+
appConfig: { ...BaseAppConfig, ...{ routesConfig: { router: true } }},
4242
shortenComponentPathBy: "/layouts/tabbar/"
4343
}));
4444

‎live-editing/configs/TabsConfigGenerator.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,16 @@ export class TabsConfigGenerator implements IConfigGenerator {
4545
"/src/app/layouts/tabs/views/view2/view2.component.ts",
4646
"/src/app/layouts/tabs/views/view2/view2.component.html",
4747
"/src/app/layouts/tabs/views/view3/view3.component.ts",
48-
"/src/app/layouts/tabs/views/view3/view3.component.html"
48+
"/src/app/layouts/tabs/views/view3/view3.component.html",
49+
"/src/app/layouts/tabs/tabs-sample-4/routes.ts"
4950
],
50-
/* TODO: Adding the correct router config needs to be done separately */
51-
appConfig: { ...BaseAppConfig, ...{ router: true }},
51+
appConfig: {
52+
...BaseAppConfig,
53+
routesConfig: {
54+
router: true,
55+
routesImportPath: './tabs-sample-4/routes'
56+
}
57+
},
5258
shortenComponentPathBy: "/layouts/tabs/"
5359
}));
5460

‎live-editing/configs/TreeGridConfigGenerator.ts‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -672,12 +672,19 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
672672
'/src/app/directives/prevent-scroll.directive.ts',
673673
'/src/app/tree-grid/tree-grid-save-state/data.ts',
674674
'/src/app/tree-grid/tree-grid-save-state/about.component.ts',
675-
'/src/app/tree-grid/tree-grid-save-state/about.component.html'],
676-
appConfig: BaseAppConfig,
675+
'/src/app/tree-grid/tree-grid-save-state/about.component.html',
676+
'/src/app/tree-grid/tree-grid-save-state/routes.ts'
677+
],
678+
appConfig: {
679+
...BaseAppConfig,
680+
routesConfig: {
681+
router: true,
682+
routesImportPath: './tree-grid-save-state/routes'
683+
}
684+
},
677685
component: 'TGridSaveStateComponent',
678686
shortenComponentPathBy: '/tree-grid/'
679687
});
680-
treeGridSaveStateSampleConfig.usesRouting = true;
681688
configs.push(treeGridSaveStateSampleConfig);
682689

683690
configs.push(new Config({

0 commit comments

Comments
 (0)