Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a182de7
update angular to 19 in devextreme-schematics
GoodDayForSurf Jan 26, 2026
67daf33
update lock
ajivanyandev Jan 26, 2026
200809c
update angular to 19 in devextreme-schematics
GoodDayForSurf Jan 26, 2026
eec79dc
Merge branch 'master_upd_ng19' of https://github.com/GoodDayForSurf/d…
GoodDayForSurf Jan 26, 2026
f09ced0
update lock
ajivanyandev Jan 26, 2026
7898dde
Merge branch 'master_upd_ng19' of https://github.com/GoodDayForSurf/d…
GoodDayForSurf Jan 26, 2026
b695231
update lock
ajivanyandev Jan 26, 2026
0a8866e
update angular to 19 in devextreme-schematics
GoodDayForSurf Jan 26, 2026
f846176
Merge branch 'master_upd_ng19' of https://github.com/GoodDayForSurf/d…
GoodDayForSurf Jan 26, 2026
90ba2cd
update angular to 19 in devextreme-schematics
GoodDayForSurf Jan 26, 2026
d77a5fe
update angular to 19 in devextreme-schematics
GoodDayForSurf Jan 26, 2026
3c6408e
update locks
GoodDayForSurf Jan 27, 2026
0622089
recover lockfiles
VasilyStrelyaev Jan 27, 2026
49f384f
increase failureThreshold for screenshots tests
GoodDayForSurf Jan 27, 2026
716f66d
increase failureThreshold for screenshots tests
GoodDayForSurf Jan 27, 2026
1ad5939
increase failureThreshold for screenshots tests
GoodDayForSurf Jan 27, 2026
0f4c902
disable Tasks view test
GoodDayForSurf Jan 27, 2026
21a4a7d
disable diff config for screenshot comparer
GoodDayForSurf Jan 27, 2026
b3b6646
update screenshots
GoodDayForSurf Jan 27, 2026
8a7bfe7
update screenshots
GoodDayForSurf Jan 27, 2026
ad1d181
remove unused config
GoodDayForSurf Jan 27, 2026
28cbf1e
enable disabled test
GoodDayForSurf Jan 27, 2026
18707b5
update lock
ajivanyandev Jan 28, 2026
36d8e0c
remake dataSource on tasks page
GoodDayForSurf Jan 28, 2026
6755773
Merge remote-tracking branch 'my/master_upd_ng19' into master_upd_ng19
GoodDayForSurf Jan 28, 2026
09e3c78
update screenshots of tasks page
GoodDayForSurf Jan 28, 2026
30722e5
fix of tasks page
GoodDayForSurf Jan 28, 2026
00bcbae
fix of tasks page
GoodDayForSurf Jan 28, 2026
57451f6
fix of tasks page
GoodDayForSurf Jan 28, 2026
d2beea0
fix of tasks page
GoodDayForSurf Jan 29, 2026
d887ce9
fix of tasks page
GoodDayForSurf Jan 29, 2026
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
218 changes: 103 additions & 115 deletions package-lock.json

Large diffs are not rendered by default.

410 changes: 214 additions & 196 deletions packages/devextreme-cli/package-lock.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
'use client'
import React from 'react';
import { DataSource } from 'devextreme-react/common/data';
import { CustomStore } from 'devextreme-react/common/data';
import DataGrid, {
Column,
Pager,
Paging,
FilterRow,
Lookup
} from 'devextreme-react/data-grid';
import './tasks.scss';

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

<Column dataField={'Task_ID'} width={90} hidingPriority={2} />
<Column dataField={'id'} width={90} hidingPriority={1} />
<Column
dataField={'Task_Subject'}
dataField={'text'}
width={190}
caption={'Subject'}
hidingPriority={8}
hidingPriority={6}
/>
<Column
dataField={'Task_Status'}
dataField={'status'}
caption={'Status'}
hidingPriority={6}
hidingPriority={4}
/>
<Column
dataField={'Task_Priority'}
caption={'Priority'}
hidingPriority={5}
>
<Lookup
dataSource={priorities}
valueExpr={'value'}
displayExpr={'name'}
/>
</Column>
<Column
dataField={'ResponsibleEmployee.Employee_Full_Name'}
dataField={'owner'}
caption={'Assigned To'}
allowSorting={false}
hidingPriority={7}
hidingPriority={5}
/>
<Column
dataField={'Task_Start_Date'}
dataField={'startDate'}
caption={'Start Date'}
dataType={'date'}
hidingPriority={3}
hidingPriority={2}
/>
<Column
dataField={'Task_Due_Date'}
dataField={'dueDate'}
caption={'Due Date'}
dataType={'date'}
hidingPriority={4}
hidingPriority={3}
/>
<Column
dataField={'Task_Priority'}
dataField={'priority'}
caption={'Priority'}
name={'Priority'}
hidingPriority={1}
/>
<Column
dataField={'Task_Completion'}
caption={'Completion'}
hidingPriority={0}
/>
</DataGrid>
</React.Fragment>
)}

const dataSource = new DataSource({
store: {
version: 2,
type: 'odata',
key: 'Task_ID',
url: 'https://js.devexpress.com/Demos/DevAV/odata/Tasks'
},
expand: 'ResponsibleEmployee',
select: [
'Task_ID',
'Task_Subject',
'Task_Start_Date',
'Task_Due_Date',
'Task_Status',
'Task_Priority',
'Task_Completion',
'ResponsibleEmployee/Employee_Full_Name'
]
});
const dataSource = {
store: new CustomStore({
key: 'id',
async load() {
try {
const response = await fetch(`https://js.devexpress.com/Demos/RwaService/api/Employees/AllTasks`);

const result = await response.json();

const priorities = [
{ name: 'High', value: 4 },
{ name: 'Urgent', value: 3 },
{ name: 'Normal', value: 2 },
{ name: 'Low', value: 1 }
];
return {
data: result,
};
} catch (err) {
throw new Error('Data Loading Error');
}
},
}),
};
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React from 'react';
import { DataSource } from 'devextreme-react/common/data';
import { CustomStore } from 'devextreme-react/common/data';
import DataGrid, {
Column,
Pager,
Paging,
FilterRow,
Lookup
} from 'devextreme-react/data-grid';
import './tasks.scss';

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

<Column dataField={'Task_ID'} width={90} hidingPriority={2} />
<Column dataField={'id'} width={90} hidingPriority={1} />
<Column
dataField={'Task_Subject'}
dataField={'text'}
width={190}
caption={'Subject'}
hidingPriority={8}
hidingPriority={6}
/>
<Column
dataField={'Task_Status'}
dataField={'status'}
caption={'Status'}
hidingPriority={6}
hidingPriority={4}
/>
<Column
dataField={'Task_Priority'}
caption={'Priority'}
hidingPriority={5}
>
<Lookup
dataSource={priorities}
valueExpr={'value'}
displayExpr={'name'}
/>
</Column>
<Column
dataField={'ResponsibleEmployee.Employee_Full_Name'}
dataField={'owner'}
caption={'Assigned To'}
allowSorting={false}
hidingPriority={7}
hidingPriority={5}
/>
<Column
dataField={'Task_Start_Date'}
dataField={'startDate'}
caption={'Start Date'}
dataType={'date'}
hidingPriority={3}
hidingPriority={2}
/>
<Column
dataField={'Task_Due_Date'}
dataField={'dueDate'}
caption={'Due Date'}
dataType={'date'}
hidingPriority={4}
hidingPriority={3}
/>
<Column
dataField={'Task_Priority'}
dataField={'priority'}
caption={'Priority'}
name={'Priority'}
hidingPriority={1}
/>
<Column
dataField={'Task_Completion'}
caption={'Completion'}
hidingPriority={0}
/>
</DataGrid>
</React.Fragment>
)}

const dataSource = new DataSource({
store: {
version: 2,
type: 'odata',
key: 'Task_ID',
url: 'https://js.devexpress.com/Demos/DevAV/odata/Tasks'
},
expand: 'ResponsibleEmployee',
select: [
'Task_ID',
'Task_Subject',
'Task_Start_Date',
'Task_Due_Date',
'Task_Status',
'Task_Priority',
'Task_Completion',
'ResponsibleEmployee/Employee_Full_Name'
]
});
const dataSource = {
store: new CustomStore({
key: 'id',
async load() {
try {
const response = await fetch(`https://js.devexpress.com/Demos/RwaService/api/Employees/AllTasks`);

const result = await response.json();

const priorities = [
{ name: 'High', value: 4 },
{ name: 'Urgent', value: 3 },
{ name: 'Normal', value: 2 },
{ name: 'Low', value: 1 }
];
return {
data: result,
};
} catch {
throw new Error(`Data Loading Error`);
}
},
})
};
Loading
Loading