Skip to content

Commit 5ec7a03

Browse files
VasilyStrelyaevVasilyStrelyaev
committed
fix tests
1 parent ea0e6f7 commit 5ec7a03

File tree

7 files changed

+73
-60
lines changed

7 files changed

+73
-60
lines changed

‎apps/demos/Demos/CardView/CardTemplate/Angular/app/app.component.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import { bootstrapApplication } from '@angular/platform-browser';
22
import { Component, enableProdMode, provideZoneChangeDetection } from '@angular/core';
33
import {
4-
DxButtonModule,
54
DxCardViewModule,
65
DxPopupModule,
76
} from 'devextreme-angular';
8-
import { CardInfo } from 'devextreme-angular/ui/card-view';
7+
import { DxCardViewTypes } from 'devextreme-angular/ui/card-view';
98
import { Service, Vehicle } from './app.service';
109
import { VehicleCard } from './vehicle-card/vehicle-card.component';
1110
import { LicenseInfo } from './license-info/license-info.component';
@@ -27,7 +26,6 @@ if (window && window.config?.packageConfigPaths) {
2726
imports: [
2827
DxCardViewModule,
2928
DxPopupModule,
30-
DxButtonModule,
3129
LicenseInfo,
3230
VehicleCard,
3331
],
@@ -52,7 +50,7 @@ export class AppComponent {
5250
this.popupVisible = false;
5351
}
5452

55-
getFormattedPrice(card: CardInfo): string {
53+
getFormattedPrice(card: DxCardViewTypes.CardInfo): string {
5654
const priceText = card.fields.find((f) => f?.column?.dataField === 'Price');
5755
return priceText?.text ?? '';
5856
}

‎apps/demos/Demos/CardView/CardTemplate/Angular/app/vehicle-card/vehicle-card.component.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Component, EventEmitter, Input, Output } from '@angular/core';
2+
import { DxButtonModule } from 'devextreme-angular';
23

34
let modulePrefix = '';
45
// @ts-ignore
@@ -10,6 +11,9 @@ if (window && window.config?.packageConfigPaths) {
1011
selector: 'vehicle-card',
1112
templateUrl: `.${modulePrefix}/vehicle-card/vehicle-card.component.html`,
1213
styleUrls: [`.${modulePrefix}/vehicle-card/vehicle-card.component.css`],
14+
imports: [
15+
DxButtonModule,
16+
],
1317
})
1418
export class VehicleCard {
1519
@Input() id!: number;

‎apps/demos/Demos/CardView/FieldTemplate/Angular/app/app.component.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { bootstrapApplication } from '@angular/platform-browser';
22
import { Component, enableProdMode, provideZoneChangeDetection } from '@angular/core';
33
import {
44
DxCardViewModule,
5-
DxProgressBarModule,
65
} from 'devextreme-angular';
76
import { Task, Service } from './app.service';
87
import { CardHeader } from './card-header/card-header.component';
@@ -26,7 +25,6 @@ if (window && window.config?.packageConfigPaths) {
2625
styleUrls: [`.${modulePrefix}/app.component.css`],
2726
imports: [
2827
DxCardViewModule,
29-
DxProgressBarModule,
3028
CardHeader,
3129
PriorityComponent,
3230
EmployeeComponent,

‎apps/demos/Demos/CardView/FieldTemplate/Angular/app/progress-bar/progress-bar.component.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import { Component, Input } from '@angular/core';
2+
import {
3+
DxProgressBarModule,
4+
} from 'devextreme-angular';
25

36
let modulePrefix = '';
47
// @ts-ignore
@@ -10,6 +13,9 @@ if (window && window.config?.packageConfigPaths) {
1013
selector: 'progress-bar',
1114
templateUrl: `.${modulePrefix}/progress-bar/progress-bar.component.html`,
1215
styleUrls: [`.${modulePrefix}/progress-bar/progress-bar.component.css`],
16+
imports: [
17+
DxProgressBarModule,
18+
],
1319
})
1420
export class ProgressComponent {
1521
@Input() value: number;

‎apps/demos/Demos/Sortable/Kanban/Angular/app/app.component.html‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,35 @@
1010
handle=".list-title"
1111
(onReorder)="onListReorder($event)"
1212
>
13-
@for (list of lists; track $index; let listIndex = $index) {
14-
<div class="list">
15-
<div class="list-title">{{ statuses[listIndex] }}</div>
16-
<dx-scroll-view
17-
class="scrollable-list"
18-
direction="vertical"
19-
showScrollbar="always"
13+
@for (list of lists; track $index; let listIndex = $index) {<div class="list">
14+
<div class="list-title">{{ statuses[listIndex] }}</div>
15+
<dx-scroll-view
16+
class="scrollable-list"
17+
direction="vertical"
18+
showScrollbar="always"
19+
>
20+
<dx-sortable
21+
class="sortable-cards"
22+
group="cardsGroup"
23+
[data]="list"
24+
(onDragStart)="onTaskDragStart($event)"
25+
(onReorder)="onTaskDrop($event)"
26+
(onAdd)="onTaskDrop($event)"
2027
>
21-
<dx-sortable
22-
class="sortable-cards"
23-
group="cardsGroup"
24-
[data]="list"
25-
(onDragStart)="onTaskDragStart($event)"
26-
(onReorder)="onTaskDrop($event)"
27-
(onAdd)="onTaskDrop($event)"
28-
>
29-
@for(task of list; track $index) {
30-
<div class="card dx-card">
31-
<div
32-
class="card-priority priority-{{ task.Task_Priority }}"
33-
></div>
34-
<div class="card-subject">{{ task.Task_Subject }}</div>
35-
<div class="card-assignee">{{
36-
employees[task.Task_Assigned_Employee_ID]
37-
}}</div>
38-
</div>
39-
}
40-
</dx-sortable>
41-
</dx-scroll-view>
42-
</div>
43-
}
28+
@for(task of list; track $index) {
29+
<div class="card dx-card">
30+
<div
31+
class="card-priority priority-{{ task.Task_Priority }}"
32+
></div>
33+
<div class="card-subject">{{ task.Task_Subject }}</div>
34+
<div class="card-assignee">{{
35+
employees[task.Task_Assigned_Employee_ID]
36+
}}</div>
37+
</div>
38+
}
39+
</dx-sortable>
40+
</dx-scroll-view>
41+
</div>}
4442
</dx-sortable>
4543
</dx-scroll-view>
4644
</div>

‎apps/demos/Demos/Splitter/Overview/Angular/app/app.component.html‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,29 @@
3636
></dxi-splitter-item>
3737

3838
@for (pane of paneContentTemplates; track pane.name) {
39-
<div *dxTemplate="let data of pane.name" tabindex="0">
40-
<ng-template
41-
[ngTemplateOutlet]="customPaneTemplate"
42-
[ngTemplateOutletContext]="{ data: data, title: pane.name }"
43-
>
44-
</ng-template>
45-
</div>
39+
<ng-container>
40+
<div *dxTemplate="let data of pane.name" tabindex="0">
41+
<ng-template
42+
[ngTemplateOutlet]="customPaneTemplate"
43+
[ngTemplateOutletContext]="{ data: data, title: pane.name }"
44+
>
45+
</ng-template>
46+
</div>
47+
</ng-container>
4648
}
4749
</dx-splitter>
4850
</dxi-splitter-item>
4951

5052
@for (pane of paneContentTemplates; track pane.name) {
51-
<div *dxTemplate="let data of pane.name" tabindex="0">
52-
<ng-template
53-
[ngTemplateOutlet]="customPaneTemplate"
54-
[ngTemplateOutletContext]="{ data: data, title: pane.name }"
55-
>
56-
</ng-template>
57-
</div>
53+
<ng-container>
54+
<div *dxTemplate="let data of pane.name" tabindex="0">
55+
<ng-template
56+
[ngTemplateOutlet]="customPaneTemplate"
57+
[ngTemplateOutletContext]="{ data: data, title: pane.name }"
58+
>
59+
</ng-template>
60+
</div>
61+
</ng-container>
5862
}
5963
</dx-splitter>
6064
</dxi-splitter-item>
@@ -66,13 +70,15 @@
6670
></dxi-splitter-item>
6771

6872
@for (pane of paneContentTemplates; track pane.name) {
69-
<div *dxTemplate="let data of pane.name" tabindex="0">
70-
<ng-template
71-
[ngTemplateOutlet]="customPaneTemplate"
72-
[ngTemplateOutletContext]="{ data: data, title: pane.name }"
73-
>
74-
</ng-template>
75-
</div>
73+
<ng-container>
74+
<div *dxTemplate="let data of pane.name" tabindex="0">
75+
<ng-template
76+
[ngTemplateOutlet]="customPaneTemplate"
77+
[ngTemplateOutletContext]="{ data: data, title: pane.name }"
78+
>
79+
</ng-template>
80+
</div>
81+
</ng-container>
7682
}
7783
</dx-splitter>
7884

@@ -81,7 +87,9 @@
8187
<div class="pane-title">{{ title }}</div>
8288
<div class="pane-state">{{ getPaneState(data) }}</div>
8389
@for (item of filterDimensionOptions(data); track item.key) {
84-
<div class="pane-option">{{ item.key }}: {{ item.value }}</div>
90+
<ng-container>
91+
<div class="pane-option">{{ item.key }}: {{ item.value }}</div>
92+
</ng-container>
8593
}
8694
</div>
8795
</ng-template>

‎apps/demos/Demos/Splitter/Overview/Angular/app/app.component.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { bootstrapApplication } from '@angular/platform-browser';
2-
import {
3-
ChangeDetectionStrategy, Component, enableProdMode, provideZoneChangeDetection } from '@angular/core';
2+
import { ChangeDetectionStrategy, Component, enableProdMode, provideZoneChangeDetection } from '@angular/core';
3+
import { NgTemplateOutlet } from '@angular/common';
44
import { DxSplitterModule } from 'devextreme-angular';
55

66
if (!document.location.host.includes('localhost')) {
@@ -24,6 +24,7 @@ if (window && window.config?.packageConfigPaths) {
2424
changeDetection: ChangeDetectionStrategy.OnPush,
2525
imports: [
2626
DxSplitterModule,
27+
NgTemplateOutlet,
2728
],
2829
})
2930
export class AppComponent {

0 commit comments

Comments
 (0)