Skip to content

Commit b33b5b2

Browse files
GoodDayForSurfGoodDayForSurf
authored
Update angular to 19 in devextreme-schematics and update data source in tasks page (#1029)
* update angular to 19 in devextreme-schematics * remake dataSource on tasks page * update screenshots
1 parent 51bbc8d commit b33b5b2

30 files changed

+550
-664
lines changed

‎package-lock.json‎

Lines changed: 103 additions & 115 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/devextreme-cli/package-lock.json‎

Lines changed: 214 additions & 196 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/devextreme-cli/src/templates/nextjs/sample-pages/tasks/page.tsx‎

Lines changed: 30 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
'use client'
22
import React from 'react';
3-
import { DataSource } from 'devextreme-react/common/data';
3+
import { CustomStore } from 'devextreme-react/common/data';
44
import DataGrid, {
55
Column,
66
Pager,
77
Paging,
88
FilterRow,
9-
Lookup
109
} from 'devextreme-react/data-grid';
1110
import './tasks.scss';
1211

@@ -28,85 +27,61 @@ export default function Task() {
2827
<Pager showPageSizeSelector={true} showInfo={true} />
2928
<FilterRow visible={true} />
3029

31-
<Column dataField={'Task_ID'} width={90} hidingPriority={2} />
30+
<Column dataField={'id'} width={90} hidingPriority={1} />
3231
<Column
33-
dataField={'Task_Subject'}
32+
dataField={'text'}
3433
width={190}
3534
caption={'Subject'}
36-
hidingPriority={8}
35+
hidingPriority={6}
3736
/>
3837
<Column
39-
dataField={'Task_Status'}
38+
dataField={'status'}
4039
caption={'Status'}
41-
hidingPriority={6}
40+
hidingPriority={4}
4241
/>
4342
<Column
44-
dataField={'Task_Priority'}
45-
caption={'Priority'}
46-
hidingPriority={5}
47-
>
48-
<Lookup
49-
dataSource={priorities}
50-
valueExpr={'value'}
51-
displayExpr={'name'}
52-
/>
53-
</Column>
54-
<Column
55-
dataField={'ResponsibleEmployee.Employee_Full_Name'}
43+
dataField={'owner'}
5644
caption={'Assigned To'}
5745
allowSorting={false}
58-
hidingPriority={7}
46+
hidingPriority={5}
5947
/>
6048
<Column
61-
dataField={'Task_Start_Date'}
49+
dataField={'startDate'}
6250
caption={'Start Date'}
6351
dataType={'date'}
64-
hidingPriority={3}
52+
hidingPriority={2}
6553
/>
6654
<Column
67-
dataField={'Task_Due_Date'}
55+
dataField={'dueDate'}
6856
caption={'Due Date'}
6957
dataType={'date'}
70-
hidingPriority={4}
58+
hidingPriority={3}
7159
/>
7260
<Column
73-
dataField={'Task_Priority'}
61+
dataField={'priority'}
7462
caption={'Priority'}
7563
name={'Priority'}
76-
hidingPriority={1}
77-
/>
78-
<Column
79-
dataField={'Task_Completion'}
80-
caption={'Completion'}
8164
hidingPriority={0}
8265
/>
8366
</DataGrid>
8467
</React.Fragment>
8568
)}
8669

87-
const dataSource = new DataSource({
88-
store: {
89-
version: 2,
90-
type: 'odata',
91-
key: 'Task_ID',
92-
url: 'https://js.devexpress.com/Demos/DevAV/odata/Tasks'
93-
},
94-
expand: 'ResponsibleEmployee',
95-
select: [
96-
'Task_ID',
97-
'Task_Subject',
98-
'Task_Start_Date',
99-
'Task_Due_Date',
100-
'Task_Status',
101-
'Task_Priority',
102-
'Task_Completion',
103-
'ResponsibleEmployee/Employee_Full_Name'
104-
]
105-
});
70+
const dataSource = {
71+
store: new CustomStore({
72+
key: 'id',
73+
async load() {
74+
try {
75+
const response = await fetch(`https://js.devexpress.com/Demos/RwaService/api/Employees/AllTasks`);
76+
77+
const result = await response.json();
10678

107-
const priorities = [
108-
{ name: 'High', value: 4 },
109-
{ name: 'Urgent', value: 3 },
110-
{ name: 'Normal', value: 2 },
111-
{ name: 'Low', value: 1 }
112-
];
79+
return {
80+
data: result,
81+
};
82+
} catch (err) {
83+
throw new Error('Data Loading Error');
84+
}
85+
},
86+
}),
87+
};

‎packages/devextreme-cli/src/templates/react/sample-pages/tasks/tasks.tsx‎

Lines changed: 30 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import React from 'react';
2-
import { DataSource } from 'devextreme-react/common/data';
2+
import { CustomStore } from 'devextreme-react/common/data';
33
import DataGrid, {
44
Column,
55
Pager,
66
Paging,
77
FilterRow,
8-
Lookup
98
} from 'devextreme-react/data-grid';
109
import './tasks.scss';
1110

@@ -27,85 +26,61 @@ export function Tasks() {
2726
<Pager showPageSizeSelector={true} showInfo={true} />
2827
<FilterRow visible={true} />
2928

30-
<Column dataField={'Task_ID'} width={90} hidingPriority={2} />
29+
<Column dataField={'id'} width={90} hidingPriority={1} />
3130
<Column
32-
dataField={'Task_Subject'}
31+
dataField={'text'}
3332
width={190}
3433
caption={'Subject'}
35-
hidingPriority={8}
34+
hidingPriority={6}
3635
/>
3736
<Column
38-
dataField={'Task_Status'}
37+
dataField={'status'}
3938
caption={'Status'}
40-
hidingPriority={6}
39+
hidingPriority={4}
4140
/>
4241
<Column
43-
dataField={'Task_Priority'}
44-
caption={'Priority'}
45-
hidingPriority={5}
46-
>
47-
<Lookup
48-
dataSource={priorities}
49-
valueExpr={'value'}
50-
displayExpr={'name'}
51-
/>
52-
</Column>
53-
<Column
54-
dataField={'ResponsibleEmployee.Employee_Full_Name'}
42+
dataField={'owner'}
5543
caption={'Assigned To'}
5644
allowSorting={false}
57-
hidingPriority={7}
45+
hidingPriority={5}
5846
/>
5947
<Column
60-
dataField={'Task_Start_Date'}
48+
dataField={'startDate'}
6149
caption={'Start Date'}
6250
dataType={'date'}
63-
hidingPriority={3}
51+
hidingPriority={2}
6452
/>
6553
<Column
66-
dataField={'Task_Due_Date'}
54+
dataField={'dueDate'}
6755
caption={'Due Date'}
6856
dataType={'date'}
69-
hidingPriority={4}
57+
hidingPriority={3}
7058
/>
7159
<Column
72-
dataField={'Task_Priority'}
60+
dataField={'priority'}
7361
caption={'Priority'}
7462
name={'Priority'}
75-
hidingPriority={1}
76-
/>
77-
<Column
78-
dataField={'Task_Completion'}
79-
caption={'Completion'}
8063
hidingPriority={0}
8164
/>
8265
</DataGrid>
8366
</React.Fragment>
8467
)}
8568

86-
const dataSource = new DataSource({
87-
store: {
88-
version: 2,
89-
type: 'odata',
90-
key: 'Task_ID',
91-
url: 'https://js.devexpress.com/Demos/DevAV/odata/Tasks'
92-
},
93-
expand: 'ResponsibleEmployee',
94-
select: [
95-
'Task_ID',
96-
'Task_Subject',
97-
'Task_Start_Date',
98-
'Task_Due_Date',
99-
'Task_Status',
100-
'Task_Priority',
101-
'Task_Completion',
102-
'ResponsibleEmployee/Employee_Full_Name'
103-
]
104-
});
69+
const dataSource = {
70+
store: new CustomStore({
71+
key: 'id',
72+
async load() {
73+
try {
74+
const response = await fetch(`https://js.devexpress.com/Demos/RwaService/api/Employees/AllTasks`);
75+
76+
const result = await response.json();
10577

106-
const priorities = [
107-
{ name: 'High', value: 4 },
108-
{ name: 'Urgent', value: 3 },
109-
{ name: 'Normal', value: 2 },
110-
{ name: 'Low', value: 1 }
111-
];
78+
return {
79+
data: result,
80+
};
81+
} catch {
82+
throw new Error(`Data Loading Error`);
83+
}
84+
},
85+
})
86+
};

0 commit comments

Comments
 (0)