Skip to content

Commit b20cb1b

Browse files
hanastasovhanastasov
authored
Merge branch 'vNext' into snovoselski/add-sample-for-stateParsed-example-for-grid-vnext
2 parents 600edf4 + 4bcda45 commit b20cb1b

22 files changed

Lines changed: 701 additions & 14 deletions

‎angular.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"buildOptimizer": false,
3030
"optimization": false,
3131
"namedChunks": true,
32-
"sourceMap": false,
32+
"sourceMap": true,
3333
"progress": true,
3434
"stylePreprocessorOptions": {
3535
"includePaths": ["node_modules"]

‎live-editing/configs/DropDownConfigGenerator.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ export class DropDownConfigGenerator implements IConfigGenerator {
126126
}));
127127

128128
configs.push(new Config({
129+
additionalFiles: ['/src/app/data-entries/dropdown/dropdown-tree-hierarchical-selection/countries.ts'],
129130
component: 'DropdownTreeHierarchicalSelectionComponent',
130131
appModuleConfig: new AppModuleConfig({
131132
imports: ['IgxDropDownModule', 'DropdownTreeHierarchicalSelectionComponent',
@@ -137,6 +138,7 @@ export class DropDownConfigGenerator implements IConfigGenerator {
137138
}));
138139

139140
configs.push(new Config({
141+
additionalFiles: ['/src/app/data-entries/dropdown/dropdown-tree-grid-hierarchical-selection/nested-employee-data.ts'],
140142
component: 'DropdownTreeGridHierarchicalSelectionComponent',
141143
appModuleConfig: new AppModuleConfig({
142144
imports: ['IgxDropDownModule', 'DropdownTreeGridHierarchicalSelectionComponent',

‎live-editing/configs/InputGroupConfigGenerator.ts‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,48 @@ export class InputGroupConfigGenerator implements IConfigGenerator {
100100
shortenComponentPathBy: "/data-entries/"
101101
}));
102102

103+
// template-driven form validation
104+
configs.push(new Config({
105+
component: 'TemplateDrivenFormValidationComponent',
106+
additionalFiles: [
107+
"/src/app/data-entries/input-group/base-input.component.ts"
108+
],
109+
appModuleConfig: new AppModuleConfig({
110+
imports: ['IgxInputGroupModule', 'IgxButtonModule', 'IgxRippleModule', 'TemplateDrivenFormValidationComponent'],
111+
ngDeclarations: ['TemplateDrivenFormValidationComponent'],
112+
ngImports: ['IgxInputGroupModule', 'IgxButtonModule', 'IgxRippleModule']
113+
}),
114+
shortenComponentPathBy: "/data-entries/"
115+
}));
116+
117+
// reactive form validation
118+
configs.push(new Config({
119+
component: 'ReactiveFormValidationComponent',
120+
additionalFiles: [
121+
"/src/app/data-entries/input-group/base-input.component.ts"
122+
],
123+
appModuleConfig: new AppModuleConfig({
124+
imports: ['IgxInputGroupModule', 'IgxButtonModule', 'IgxRippleModule', 'ReactiveFormsModule', 'ReactiveFormValidationComponent'],
125+
ngDeclarations: ['ReactiveFormValidationComponent'],
126+
ngImports: ['IgxInputGroupModule', 'IgxButtonModule', 'IgxRippleModule', 'ReactiveFormsModule']
127+
}),
128+
shortenComponentPathBy: "/data-entries/"
129+
}));
130+
131+
// reactive form custom validation
132+
configs.push(new Config({
133+
component: 'ReactiveFormCustomValidationComponent',
134+
additionalFiles: [
135+
"/src/app/data-entries/input-group/base-input.component.ts"
136+
],
137+
appModuleConfig: new AppModuleConfig({
138+
imports: ['IgxInputGroupModule', 'IgxButtonModule', 'IgxRippleModule', 'ReactiveFormsModule', 'ReactiveFormCustomValidationComponent'],
139+
ngDeclarations: ['ReactiveFormCustomValidationComponent'],
140+
ngImports: ['IgxInputGroupModule', 'IgxButtonModule', 'IgxRippleModule', 'ReactiveFormsModule']
141+
}),
142+
shortenComponentPathBy: "/data-entries/"
143+
}));
144+
103145
return configs;
104146
}
105147
}

‎src/app/data-entries/data-entries-routes-data.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,8 @@ export const dataEntriesRoutesData = {
6060
"select-input-directives": { displayName: "Select Input Directives", parentName: "Select" },
6161
"select-header-footer": { displayName: "Select with Header&Footer Templates", parentName: "Select" },
6262
"input-text-selection": { displayName: "Input with Text Selection", parentName: "Input Group" },
63-
"typed-form": { displayName: "Typed Form", parentName: "Input Group" }
63+
"typed-form": { displayName: "Typed Form", parentName: "Input Group" },
64+
"template-driven-form-validation": { displayName: "Template Driven Form Validation", parentName: "Input Group" },
65+
"reactive-form-validation": { displayName: "Reactive Form Validation", parentName: "Input Group" },
66+
"reactive-form-custom-validation": { displayName: "Reactive Form Custom Validation", parentName: "Input Group" }
6467
};

‎src/app/data-entries/data-entries-routing.module.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ import { SwitchSample1Component } from './switch/switch-sample-1/switch-sample-1
6161
import { SwitchSample2Component } from './switch/switch-sample-2/switch-sample-2.component';
6262
import { SwitchStylingComponent } from './switch/switch-styling/switch-styling.component';
6363
import { RatingInFormComponent } from './rating/rating-form/rating-form.component';
64+
import { TemplateDrivenFormValidationComponent } from './input-group/template-driven-form-validation/template-driven-form-validation.component';
65+
import { ReactiveFormValidationComponent } from './input-group/reactive-form-validation/reactive-form-validation.component';
66+
import { ReactiveFormCustomValidationComponent } from './input-group/reactive-form-custom-validation/reactive-form-custom-validation.component';
6467

6568
export const dataEntriesRoutes: Routes = [
6669
{
@@ -362,6 +365,21 @@ export const dataEntriesRoutes: Routes = [
362365
component: TypedFormComponent,
363366
data: dataEntriesRoutesData['typed-form'],
364367
path: 'typed-form'
368+
},
369+
{
370+
component: TemplateDrivenFormValidationComponent,
371+
data: dataEntriesRoutesData['template-driven-form-validation'],
372+
path: 'template-driven-form-validation'
373+
},
374+
{
375+
component: ReactiveFormValidationComponent,
376+
data: dataEntriesRoutesData['reactive-form-validation'],
377+
path: 'reactive-form-validation'
378+
},
379+
{
380+
component: ReactiveFormCustomValidationComponent,
381+
data: dataEntriesRoutesData['reactive-form-custom-validation'],
382+
path: 'reactive-form-custom-validation'
365383
}
366384
];
367385

‎src/app/data-entries/data-entries.module.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ import { SwitchSample2Component } from './switch/switch-sample-2/switch-sample-2
7070
import { SwitchStylingComponent } from './switch/switch-styling/switch-styling.component';
7171
import { TypedFormComponent } from './input-group/typed-form/typed-form.component';
7272
import { RatingInFormComponent } from './rating/rating-form/rating-form.component';
73+
import { TemplateDrivenFormValidationComponent } from './input-group/template-driven-form-validation/template-driven-form-validation.component';
74+
import { ReactiveFormValidationComponent } from './input-group/reactive-form-validation/reactive-form-validation.component';
75+
import { ReactiveFormCustomValidationComponent } from './input-group/reactive-form-custom-validation/reactive-form-custom-validation.component';
7376

7477
@NgModule({
7578
declarations: [
@@ -133,7 +136,10 @@ import { RatingInFormComponent } from './rating/rating-form/rating-form.componen
133136
ButtonsStyleComponent,
134137
ButtonGroupStyleComponent,
135138
InputTextSelectionComponent,
136-
TypedFormComponent
139+
TypedFormComponent,
140+
TemplateDrivenFormValidationComponent,
141+
ReactiveFormValidationComponent,
142+
ReactiveFormCustomValidationComponent
137143
],
138144
imports: [
139145
CommonModule,

‎src/app/data-entries/dropdown/dropdown-tree-grid-hierarchical-selection/dropdown-tree-grid-hierarchical-selection.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, OnInit, ViewChild } from '@angular/core';
22
import { IBaseChipEventArgs, IgxTreeGridComponent, IRowSelectionEventArgs } from 'igniteui-angular';
33
import { IBaseCancelableBrowserEventArgs } from 'igniteui-angular/lib/core/utils';
4-
import { EMPLOYEE_DATA } from '../../../data/nested-employee-data';
4+
import { EMPLOYEE_DATA } from './nested-employee-data';
55
@Component({
66
// tslint:disable-next-line:component-selector
77
selector: 'app-dropdown-tree-grid-hierarchical-selection',

‎src/app/data-entries/dropdown/dropdown-tree-grid-hierarchical-selection/nested-employee-data.ts‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
/*eslint-disable*/
2+
export const EMPLOYEE_DATA = [
3+
{
4+
Age: 55,
5+
Employees: [
6+
{
7+
Age: 43,
8+
HireDate: new Date(2011, 6, 3),
9+
ID: 3,
10+
Name: "Michael Burke",
11+
Title: "Senior Software Developer"
12+
},
13+
{
14+
Age: 29,
15+
HireDate: new Date(2009, 6, 19),
16+
ID: 2,
17+
Name: "Thomas Anderson",
18+
Title: "Senior Software Developer"
19+
},
20+
{
21+
Age: 31,
22+
HireDate: new Date(2014, 8, 18),
23+
ID: 11,
24+
Name: "Monica Reyes",
25+
Title: "Software Development Team Lead"
26+
},
27+
{
28+
Age: 35,
29+
HireDate: new Date(2015, 9, 17),
30+
ID: 6,
31+
Name: "Roland Mendel",
32+
Title: "Senior Software Developer"
33+
}],
34+
HireDate: new Date(2008, 3, 20),
35+
ID: 1,
36+
Name: "John Winchester",
37+
Title: "Development Manager"
38+
},
39+
{
40+
Age: 42,
41+
Employees: [
42+
{
43+
Age: 44,
44+
HireDate: new Date(2014, 4, 4),
45+
ID: 14,
46+
Name: "Laurence Johnson",
47+
Title: "Director"
48+
},
49+
{
50+
Age: 25,
51+
HireDate: new Date(2017, 11, 9),
52+
ID: 5,
53+
Name: "Elizabeth Richards",
54+
Title: "Vice President"
55+
},
56+
{
57+
Age: 39,
58+
HireDate: new Date(2010, 3, 22),
59+
ID: 13,
60+
Name: "Trevor Ashworth",
61+
Title: "Director"
62+
}],
63+
HireDate: new Date(2014, 1, 22),
64+
ID: 4,
65+
Name: "Ana Sanders",
66+
Title: "CEO"
67+
},
68+
{
69+
Age: 49,
70+
Employees: [],
71+
HireDate: new Date(2014, 1, 22),
72+
ID: 18,
73+
Name: "Victoria Lincoln",
74+
Title: "Senior Accountant"
75+
},
76+
{
77+
Age: 61,
78+
Employees: [],
79+
HireDate: new Date(2010, 1, 1),
80+
ID: 10,
81+
Name: "Yang Wang",
82+
Title: "Localization Developer"
83+
},
84+
{
85+
Age: 35,
86+
Employees: [],
87+
HireDate: new Date(2014, 1, 22),
88+
ID: 35,
89+
Name: "Janine Munoz",
90+
Title: "HR"
91+
},
92+
{
93+
Age: 49,
94+
Employees: [],
95+
HireDate: new Date(2010, 1, 1),
96+
ID: 10,
97+
Name: "Yang Wang",
98+
Title: "Sales Manager"
99+
}
100+
];

0 commit comments

Comments
 (0)