Skip to content

Commit 7038325

Browse files
GoodDayForSurfGoodDayForSurf
authored
Replace old nested components by new ones in generated Angular app (#939)
* replace nested components according new approach
1 parent 5927783 commit 7038325

File tree

7 files changed

+96
-96
lines changed

7 files changed

+96
-96
lines changed

‎packages/devextreme-schematics/src/add-layout/files/src/app/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
(selectedItemChanged)="navigationChanged($event)"
1717
(openMenu)="navigationClick()">
1818
<dx-toolbar id="navigation-header">
19-
<dxi-item
19+
<dxi-toolbar-item
2020
*ngIf="minMenuSize !== 0"
2121
location="before"
2222
cssClass="menu-button"
@@ -26,12 +26,12 @@
2626
stylingMode: 'text',
2727
onClick: toggleMenu
2828
}">
29-
</dxi-item>
30-
<dxi-item
29+
</dxi-toolbar-item>
30+
<dxi-toolbar-item
3131
location="before"
3232
cssClass="header-title"
3333
[text]="title">
34-
</dxi-item>
34+
</dxi-toolbar-item>
3535
</dx-toolbar>
3636
</app-side-navigation-menu>
3737

‎packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/change-password-form/change-password-form.component.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<form (submit)="onSubmit($event)">
22
<dx-form [formData]="formData" [disabled]="loading">
33

4-
<dxi-item dataField="password" editorType="dxTextBox"
4+
<dxi-form-item dataField="password" editorType="dxTextBox"
55
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Password', mode: 'password' }">
6-
<dxi-validation-rule type="required" message="Password is required"></dxi-validation-rule>
7-
<dxo-label [visible]="false"></dxo-label>
8-
</dxi-item>
6+
<dxi-form-validation-rule type="required" message="Password is required"></dxi-form-validation-rule>
7+
<dxo-form-label [visible]="false"></dxo-form-label>
8+
</dxi-form-item>
99

10-
<dxi-item dataField="confirmedPassword" editorType="dxTextBox"
10+
<dxi-form-item dataField="confirmedPassword" editorType="dxTextBox"
1111
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Confirm Password', mode: 'password' }">
12-
<dxi-validation-rule type="required" message="Password is required"></dxi-validation-rule>
13-
<dxi-validation-rule type="custom" message="Passwords do not match" [validationCallback]="confirmPassword">
14-
</dxi-validation-rule>
15-
<dxo-label [visible]="false"></dxo-label>
16-
</dxi-item>
12+
<dxi-form-validation-rule type="required" message="Password is required"></dxi-form-validation-rule>
13+
<dxi-form-validation-rule type="custom" message="Passwords do not match" [validationCallback]="confirmPassword">
14+
</dxi-form-validation-rule>
15+
<dxo-form-label [visible]="false"></dxo-form-label>
16+
</dxi-form-item>
1717

18-
<dxi-item itemType="button">
19-
<dxo-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'changePasswordTemplate'">
20-
</dxo-button-options>
21-
</dxi-item>
18+
<dxi-form-item itemType="button">
19+
<dxo-form-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'changePasswordTemplate'">
20+
</dxo-form-button-options>
21+
</dxi-form-item>
2222

2323
<ng-container *dxTemplate="let item of 'changePasswordTemplate'">
2424
<div>

‎packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/create-account-form/create-account-form.component.html‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
<form class="create-account-form" (submit)="onSubmit($event)">
22
<dx-form [formData]="formData" [disabled]="loading">
33

4-
<dxi-item dataField="email" editorType="dxTextBox"
4+
<dxi-form-item dataField="email" editorType="dxTextBox"
55
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Email', mode: 'email' }">
6-
<dxi-validation-rule type="required" message="Email is required"></dxi-validation-rule>
7-
<dxi-validation-rule type="email" message="Email is invalid"></dxi-validation-rule>
8-
<dxo-label [visible]="false"></dxo-label>
9-
</dxi-item>
6+
<dxi-form-validation-rule type="required" message="Email is required"></dxi-form-validation-rule>
7+
<dxi-form-validation-rule type="email" message="Email is invalid"></dxi-form-validation-rule>
8+
<dxo-form-label [visible]="false"></dxo-form-label>
9+
</dxi-form-item>
1010

11-
<dxi-item dataField="password" editorType="dxTextBox"
11+
<dxi-form-item dataField="password" editorType="dxTextBox"
1212
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Password', mode: 'password' }">
13-
<dxi-validation-rule type="required" message="Password is required"></dxi-validation-rule>
14-
<dxo-label [visible]="false"></dxo-label>
15-
</dxi-item>
13+
<dxi-form-validation-rule type="required" message="Password is required"></dxi-form-validation-rule>
14+
<dxo-form-label [visible]="false"></dxo-form-label>
15+
</dxi-form-item>
1616

17-
<dxi-item dataField="confirmedPassword" editorType="dxTextBox"
17+
<dxi-form-item dataField="confirmedPassword" editorType="dxTextBox"
1818
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Confirm Password', mode: 'password' }">
19-
<dxi-validation-rule type="required" message="Password is required"></dxi-validation-rule>
20-
<dxi-validation-rule type="custom" message="Passwords do not match" [validationCallback]="confirmPassword">
21-
</dxi-validation-rule>
22-
<dxo-label [visible]="false"></dxo-label>
23-
</dxi-item>
19+
<dxi-form-validation-rule type="required" message="Password is required"></dxi-form-validation-rule>
20+
<dxi-form-validation-rule type="custom" message="Passwords do not match" [validationCallback]="confirmPassword">
21+
</dxi-form-validation-rule>
22+
<dxo-form-label [visible]="false"></dxo-form-label>
23+
</dxi-form-item>
2424

25-
<dxi-item>
25+
<dxi-form-item>
2626
<div class='policy-info'>
2727
By creating an account, you agree to the <a routerLink="#">Terms of Service</a> and <a routerLink="#">Privacy
2828
Policy</a>
2929
</div>
30-
</dxi-item>
30+
</dxi-form-item>
3131

32-
<dxi-item itemType="button">
33-
<dxo-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'createAccountTemplate'">
34-
</dxo-button-options>
35-
</dxi-item>
32+
<dxi-form-item itemType="button">
33+
<dxo-form-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'createAccountTemplate'">
34+
</dxo-form-button-options>
35+
</dxi-form-item>
3636

3737
<ng-container *dxTemplate="let item of 'createAccountTemplate'">
3838
<div>

‎packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/header/header.component.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<header>
22
<dx-toolbar class="header-toolbar">
3-
<dxi-item
3+
<dxi-toolbar-item
44
*ngIf="menuToggleEnabled"
55
location="before"
66
widget="dxButton"
@@ -10,28 +10,28 @@
1010
stylingMode: 'text',
1111
onClick: toggleMenu
1212
}">
13-
</dxi-item>
14-
<dxi-item
13+
</dxi-toolbar-item>
14+
<dxi-toolbar-item
1515
location="before"
1616
cssClass="header-title"
1717
*ngIf="title"
1818
[text]="title">
19-
</dxi-item>
20-
<dxi-item
19+
</dxi-toolbar-item>
20+
<dxi-toolbar-item
2121
location="after"
2222
>
2323
<ng-container *dxTemplate>
2424
<theme-switcher></theme-switcher>
2525
</ng-container>
26-
</dxi-item>
27-
<dxi-item
26+
</dxi-toolbar-item>
27+
<dxi-toolbar-item
2828
location="after"
2929
locateInMenu="auto"
3030
menuItemTemplate="menuItem">
3131
<div *dxTemplate="let data of 'item'">
3232
<app-user-panel [menuItems]="userMenuItems"></app-user-panel>
3333
</div>
34-
</dxi-item>
34+
</dxi-toolbar-item>
3535
<div *dxTemplate="let data of 'menuItem'">
3636
<app-user-panel [menuItems]="userMenuItems" menuMode="list"></app-user-panel>
3737
</div>

‎packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/login-form/login-form.component.html‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<form class="login-form" (submit)="onSubmit($event)">
22
<dx-form [formData]="formData" [disabled]="loading">
33

4-
<dxi-item dataField="email" editorType="dxTextBox"
4+
<dxi-form-item dataField="email" editorType="dxTextBox"
55
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Email', mode: 'email' }">
6-
<dxi-validation-rule type="required" message="Email is required"></dxi-validation-rule>
7-
<dxi-validation-rule type="email" message="Email is invalid"></dxi-validation-rule>
8-
<dxo-label [visible]="false"></dxo-label>
9-
</dxi-item>
6+
<dxi-form-validation-rule type="required" message="Email is required"></dxi-form-validation-rule>
7+
<dxi-form-validation-rule type="email" message="Email is invalid"></dxi-form-validation-rule>
8+
<dxo-form-label [visible]="false"></dxo-form-label>
9+
</dxi-form-item>
1010

11-
<dxi-item dataField="password" editorType="dxTextBox"
11+
<dxi-form-item dataField="password" editorType="dxTextBox"
1212
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Password', mode: 'password' }">
13-
<dxi-validation-rule type="required" message="Password is required"></dxi-validation-rule>
14-
<dxo-label [visible]="false"></dxo-label>
15-
</dxi-item>
13+
<dxi-form-validation-rule type="required" message="Password is required"></dxi-form-validation-rule>
14+
<dxo-form-label [visible]="false"></dxo-form-label>
15+
</dxi-form-item>
1616

17-
<dxi-item dataField="rememberMe" editorType="dxCheckBox"
17+
<dxi-form-item dataField="rememberMe" editorType="dxCheckBox"
1818
[editorOptions]="{ text: 'Remember me', elementAttr: { class: 'form-text' } }">
19-
<dxo-label [visible]="false"></dxo-label>
20-
</dxi-item>
19+
<dxo-form-label [visible]="false"></dxo-form-label>
20+
</dxi-form-item>
2121

22-
<dxi-item itemType="button">
23-
<dxo-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'signInTemplate'">
24-
</dxo-button-options>
25-
</dxi-item>
22+
<dxi-form-item itemType="button">
23+
<dxo-form-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'signInTemplate'">
24+
</dxo-form-button-options>
25+
</dxi-form-item>
2626

2727
<ng-container *dxTemplate="let item of 'signInTemplate'">
2828
<div>

‎packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/reset-password-form/reset-password-form.component.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<form class="reset-password-form" (submit)="onSubmit($event)">
22
<dx-form [formData]="formData" [disabled]="loading">
33

4-
<dxi-item dataField="email" editorType="dxTextBox"
4+
<dxi-form-item dataField="email" editorType="dxTextBox"
55
[editorOptions]="{ stylingMode: 'filled', placeholder: 'Email', mode: 'email' }">
6-
<dxi-validation-rule type="required" message="Email is required"></dxi-validation-rule>
7-
<dxi-validation-rule type="email" message="Email is invalid"></dxi-validation-rule>
8-
<dxo-label [visible]="false"></dxo-label>
9-
</dxi-item>
6+
<dxi-form-validation-rule type="required" message="Email is required"></dxi-form-validation-rule>
7+
<dxi-form-validation-rule type="email" message="Email is invalid"></dxi-form-validation-rule>
8+
<dxo-form-label [visible]="false"></dxo-form-label>
9+
</dxi-form-item>
1010

11-
<dxi-item itemType="button">
12-
<dxo-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'resetPasswordTemplate'"
11+
<dxi-form-item itemType="button">
12+
<dxo-form-button-options width="100%" type="default" [useSubmitBehavior]="true" [template]="'resetPasswordTemplate'"
1313
[elementAttr]="{ class: 'submit-button' }">
14-
</dxo-button-options>
15-
</dxi-item>
14+
</dxo-form-button-options>
15+
</dxi-form-item>
1616

1717
<ng-container *dxTemplate="let item of 'resetPasswordTemplate'">
1818
<div>

‎packages/devextreme-schematics/src/add-sample-views/files/pages/tasks/tasks.component.html‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<h2>Tasks</h2>
22

3-
<dx-data-grid
3+
<dx-data-grid
44
class="dx-card content-block"
55
[dataSource]="dataSource"
66
[showBorders]="false"
@@ -9,63 +9,63 @@ <h2>Tasks</h2>
99
[columnAutoWidth]="true"
1010
[columnHidingEnabled]="true">
1111

12-
<dxo-paging [pageSize]="10"></dxo-paging>
13-
<dxo-pager [showPageSizeSelector]="true" [showInfo]="true"></dxo-pager>
14-
<dxo-filter-row [visible]="true"></dxo-filter-row>
12+
<dxo-data-grid-paging [pageSize]="10"></dxo-data-grid-paging>
13+
<dxo-data-grid-pager [showPageSizeSelector]="true" [showInfo]="true"></dxo-data-grid-pager>
14+
<dxo-data-grid-filter-row [visible]="true"></dxo-data-grid-filter-row>
1515

16-
<dxi-column
16+
<dxi-data-grid-column
1717
dataField="Task_ID"
1818
[width]="90"
1919
[hidingPriority]="2">
20-
</dxi-column>
21-
<dxi-column
20+
</dxi-data-grid-column>
21+
<dxi-data-grid-column
2222
dataField="Task_Subject"
2323
[width]="190"
2424
caption="Subject"
2525
[hidingPriority]="8">
26-
</dxi-column>
27-
<dxi-column
26+
</dxi-data-grid-column>
27+
<dxi-data-grid-column
2828
dataField="Task_Status"
2929
caption="Status"
3030
[hidingPriority]="6">
31-
</dxi-column>
32-
<dxi-column
31+
</dxi-data-grid-column>
32+
<dxi-data-grid-column
3333
dataField="Task_Priority"
3434
caption="Priority"
3535
[hidingPriority]="5">
36-
<dxo-lookup
36+
<dxo-data-grid-lookup
3737
[dataSource]="priority"
3838
valueExpr="value"
3939
displayExpr="name">
40-
</dxo-lookup>
41-
</dxi-column>
42-
<dxi-column
40+
</dxo-data-grid-lookup>
41+
</dxi-data-grid-column>
42+
<dxi-data-grid-column
4343
dataField="ResponsibleEmployee.Employee_Full_Name"
4444
caption="Assigned To"
4545
[allowSorting]="false"
4646
[hidingPriority]="7">
47-
</dxi-column>
48-
<dxi-column
47+
</dxi-data-grid-column>
48+
<dxi-data-grid-column
4949
dataField="Task_Start_Date"
5050
caption="Start Date"
5151
dataType="date"
5252
[hidingPriority]="3">
53-
</dxi-column>
54-
<dxi-column
53+
</dxi-data-grid-column>
54+
<dxi-data-grid-column
5555
dataField="Task_Due_Date"
5656
caption="Due Date"
5757
dataType="date"
5858
[hidingPriority]="4">
59-
</dxi-column>
60-
<dxi-column
59+
</dxi-data-grid-column>
60+
<dxi-data-grid-column
6161
dataField="Task_Priority"
6262
caption="Priority"
6363
name="Priority"
6464
[hidingPriority]="1">
65-
</dxi-column>
66-
<dxi-column
65+
</dxi-data-grid-column>
66+
<dxi-data-grid-column
6767
dataField="Task_Completion"
6868
caption="Completion"
6969
[hidingPriority]="0">
70-
</dxi-column>
70+
</dxi-data-grid-column>
7171
</dx-data-grid>

0 commit comments

Comments
 (0)