Skip to content

Replace old nested components by new ones in generated Angular app #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GoodDayForSurf merged 3 commits into from
Apr 1, 2025
Merged

Replace old nested components by new ones in generated Angular app #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d84aa45
fix add-view for Angular (#934)
GoodDayForSurf Mar 27, 2025
d2b620a
Merge branch 'dev' of https://github.com/DevExpress/devextreme-cli in…
GoodDayForSurf Apr 1, 2025
c608b0e
replace nested components according new approach
GoodDayForSurf Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...layout/files/src/app/layouts/side-nav-inner-toolbar/side-nav-inner-toolbar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
(selectedItemChanged)="navigationChanged($event)"
(openMenu)="navigationClick()">
<dx-toolbar id="navigation-header">
<dxi-item
<dxi-toolbar-item
*ngIf="minMenuSize !== 0"
location="before"
cssClass="menu-button"
Expand All @@ -26,12 +26,12 @@
stylingMode: 'text',
onClick: toggleMenu
}">
</dxi-item>
<dxi-item
</dxi-toolbar-item>
<dxi-toolbar-item
location="before"
cssClass="header-title"
[text]="title">
</dxi-item>
</dxi-toolbar-item>
</dx-toolbar>
</app-side-navigation-menu>

Expand Down
28 changes: 14 additions & 14 deletions .../files/src/app/shared/components/change-password-form/change-password-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<form (submit)="onSubmit($event)">
<dx-form [formData]="formData" [disabled]="loading">

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

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

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

<ng-container *dxTemplate="let item of 'changePasswordTemplate'">
<div>
Expand Down
42 changes: 21 additions & 21 deletions ...ut/files/src/app/shared/components/create-account-form/create-account-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<form class="create-account-form" (submit)="onSubmit($event)">
<dx-form [formData]="formData" [disabled]="loading">

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

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

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

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

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

<ng-container *dxTemplate="let item of 'createAccountTemplate'">
<div>
Expand Down
16 changes: 8 additions & 8 deletions ...me-schematics/src/add-layout/files/src/app/shared/components/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<header>
<dx-toolbar class="header-toolbar">
<dxi-item
<dxi-toolbar-item
*ngIf="menuToggleEnabled"
location="before"
widget="dxButton"
Expand All @@ -10,28 +10,28 @@
stylingMode: 'text',
onClick: toggleMenu
}">
</dxi-item>
<dxi-item
</dxi-toolbar-item>
<dxi-toolbar-item
location="before"
cssClass="header-title"
*ngIf="title"
[text]="title">
</dxi-item>
<dxi-item
</dxi-toolbar-item>
<dxi-toolbar-item
location="after"
>
<ng-container *dxTemplate>
<theme-switcher></theme-switcher>
</ng-container>
</dxi-item>
<dxi-item
</dxi-toolbar-item>
<dxi-toolbar-item
location="after"
locateInMenu="auto"
menuItemTemplate="menuItem">
<div *dxTemplate="let data of 'item'">
<app-user-panel [menuItems]="userMenuItems"></app-user-panel>
</div>
</dxi-item>
</dxi-toolbar-item>
<div *dxTemplate="let data of 'menuItem'">
<app-user-panel [menuItems]="userMenuItems" menuMode="list"></app-user-panel>
</div>
Expand Down
32 changes: 16 additions & 16 deletions ...atics/src/add-layout/files/src/app/shared/components/login-form/login-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<form class="login-form" (submit)="onSubmit($event)">
<dx-form [formData]="formData" [disabled]="loading">

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

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

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

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

<ng-container *dxTemplate="let item of 'signInTemplate'">
<div>
Expand Down
18 changes: 9 additions & 9 deletions ...ut/files/src/app/shared/components/reset-password-form/reset-password-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<form class="reset-password-form" (submit)="onSubmit($event)">
<dx-form [formData]="formData" [disabled]="loading">

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

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

<ng-container *dxTemplate="let item of 'resetPasswordTemplate'">
<div>
Expand Down
48 changes: 24 additions & 24 deletions packages/devextreme-schematics/src/add-sample-views/files/pages/tasks/tasks.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h2>Tasks</h2>

<dx-data-grid
<dx-data-grid
class="dx-card content-block"
[dataSource]="dataSource"
[showBorders]="false"
Expand All @@ -9,63 +9,63 @@ <h2>Tasks</h2>
[columnAutoWidth]="true"
[columnHidingEnabled]="true">

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

<dxi-column
<dxi-data-grid-column
dataField="Task_ID"
[width]="90"
[hidingPriority]="2">
</dxi-column>
<dxi-column
</dxi-data-grid-column>
<dxi-data-grid-column
dataField="Task_Subject"
[width]="190"
caption="Subject"
[hidingPriority]="8">
</dxi-column>
<dxi-column
</dxi-data-grid-column>
<dxi-data-grid-column
dataField="Task_Status"
caption="Status"
[hidingPriority]="6">
</dxi-column>
<dxi-column
</dxi-data-grid-column>
<dxi-data-grid-column
dataField="Task_Priority"
caption="Priority"
[hidingPriority]="5">
<dxo-lookup
<dxo-data-grid-lookup
[dataSource]="priority"
valueExpr="value"
displayExpr="name">
</dxo-lookup>
</dxi-column>
<dxi-column
</dxo-data-grid-lookup>
</dxi-data-grid-column>
<dxi-data-grid-column
dataField="ResponsibleEmployee.Employee_Full_Name"
caption="Assigned To"
[allowSorting]="false"
[hidingPriority]="7">
</dxi-column>
<dxi-column
</dxi-data-grid-column>
<dxi-data-grid-column
dataField="Task_Start_Date"
caption="Start Date"
dataType="date"
[hidingPriority]="3">
</dxi-column>
<dxi-column
</dxi-data-grid-column>
<dxi-data-grid-column
dataField="Task_Due_Date"
caption="Due Date"
dataType="date"
[hidingPriority]="4">
</dxi-column>
<dxi-column
</dxi-data-grid-column>
<dxi-data-grid-column
dataField="Task_Priority"
caption="Priority"
name="Priority"
[hidingPriority]="1">
</dxi-column>
<dxi-column
</dxi-data-grid-column>
<dxi-data-grid-column
dataField="Task_Completion"
caption="Completion"
[hidingPriority]="0">
</dxi-column>
</dxi-data-grid-column>
</dx-data-grid>
Loading