Skip to content

Scheduler: refactor view model output and sorted Index #30732

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
Ambrozy merged 8 commits into from
Aug 14, 2025
Merged

Scheduler: refactor view model output and sorted Index #30732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c620c56
Scheduler: refactor view model output
Ambrozy Aug 12, 2025
b4b5e64
Scheduler: fix fantom appointment removal
Ambrozy Aug 12, 2025
c320076
fix QUnits
Ambrozy Aug 13, 2025
6d1e848
fix QUnits
Ambrozy Aug 13, 2025
20be9b9
fix tests
Ambrozy Aug 13, 2025
efced2e
fix tests
Ambrozy Aug 14, 2025
4925934
fix
Ambrozy Aug 14, 2025
3c70b2a
fix
Ambrozy Aug 14, 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
2 changes: 1 addition & 1 deletion e2e/testcafe-devextreme/tests/scheduler/common/dragAndDrop/outlookDragging/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ test('Basic drag-n-drop movements from tooltip in month view', async (t) => {
.ok();

await t
.click(scheduler.collectors.find('1').element)
.click(scheduler.collectors.find('1', 1).element)
.expect(scheduler.appointmentTooltip.isVisible()).ok()
.drag(scheduler.appointmentTooltip.getListItem('Appointment 4').element, 320, 150)
.expect(await takeScreenshot('drag-n-drop-\'Appointment 4\'-from-tooltip-in-month.png', scheduler.workSpace))
Expand Down
19 changes: 14 additions & 5 deletions e2e/testcafe-devextreme/tests/scheduler/common/rerenderOnResize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ fixture.disablePageReloads`Re-render on resize`
.page(url(__dirname, '../../container.html'));

const createScheduler = async (container, options?): Promise<void> => createWidget('dxScheduler', {
...options,
currentDate: new Date(2020, 8, 7),
startDayHour: 8,
endDayHour: 20,
Expand All @@ -27,24 +26,34 @@ const createScheduler = async (container, options?): Promise<void> => createWidg
endDate: new Date(2020, 8, 7, 9),
text: 'test',
}],
...options,
}, container);

safeSizeTest('Appointment should re-rendered on window resize when width and height not set (T1139566)', async (t) => {
safeSizeTest('Appointment should re-rendered on window resize-up (T1139566)', async (t) => {
const scheduler = new Scheduler('#container');
const { element } = scheduler.getAppointment('test');

await setStyleAttribute(element, 'background-color: red;');
await t.resizeWindow(800, 400);
await t.expect(await getStyleAttribute(element)).match(/transform: translate\(0px, 0px\); width: 10\d\.\d\d\dpx; height: 50px;/);
}, [400, 400]).before(async () => createScheduler('#container', { currentView: 'workWeek' }));

safeSizeTest('Appointment should not re-rendered on window resize when width and height not set (T1139566)', async (t) => {
const scheduler = new Scheduler('#container');
const { element } = scheduler.getAppointment('test');

await setStyleAttribute(element, 'background-color: red;');
await t.resizeWindow(300, 300);
await t.expect(await getStyleAttribute(element)).eql('transform: translate(0px, 26px); width: 200px; height: 74px;');
await t.expect(await getStyleAttribute(element)).eql('transform: translate(0px, 26px); width: 200px; height: 74px; background-color: red;');
}).before(async () => createScheduler('#container'));

safeSizeTest('Appointment should re-rendered on window resize when width and height have percent value (T1139566)', async (t) => {
safeSizeTest('Appointment should not re-rendered on window resize when width and height have percent value (T1139566)', async (t) => {
const scheduler = new Scheduler('#container');
const { element } = scheduler.getAppointment('test');

await setStyleAttribute(element, 'background-color: red;');
await t.resizeWindow(300, 400);
await t.expect(await getStyleAttribute(element)).eql('transform: translate(0px, 26px); width: 200px; height: 74px;');
await t.expect(await getStyleAttribute(element)).eql('transform: translate(0px, 26px); width: 200px; height: 74px; background-color: red;');
}).before(async () => createScheduler('#container', { width: '100%', height: '100%' }));

safeSizeTest('Appointment should not re-rendered on window resize when width and height have static value (T1139566)', async (t) => {
Expand Down
25 changes: 25 additions & 0 deletions packages/devextreme/js/__internal/scheduler/__tests__/appointments.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import {
describe, expect, it,
} from '@jest/globals';

import { createScheduler } from './__mock__/create_scheduler';
import { setupSchedulerTestEnvironment } from './__mock__/m_mock_scheduler';

describe('Appointments', () => {
it('All-day appointment should not be resizable if current view is "day"', async () => {
Copy link
Copy Markdown
Contributor

@aleksei-semikozov aleksei-semikozov Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clarify? appointment should not be resizable but in assertion block appointment.classList.contains('dx-resizable') should be resizeble.
Same in test name - Appointment should **not** re-rendered on window resize when width and height have percent value (T1139566) but in the assertion block we are not checking whether it was re-rendered or not. Why was the test renamed this way

Copy link
Copy Markdown
Contributor Author

@Ambrozy Ambrozy Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The condition is correct !appointment.classList.contains('dx-resizable'). if appointment resizable it has dx-resizable class. Otherwise no class.

According to Appointment should **not** re-rendered on window resize when width and height have percent value (T1139566). Because new change detection mechanism is better track changes, this cases not trigger rerender anymore. In the ticket user complained to often rerender. S it's become better.

setupSchedulerTestEnvironment();
const { container } = await createScheduler({
dataSource: [{
text: 'Appointment 1',
startDate: new Date(2015, 1, 9, 8),
endDate: new Date(2015, 1, 9, 9),
allDay: true,
}],
currentView: 'day',
currentDate: new Date(2015, 1, 9, 8),
});

const appointment = container.querySelector('.dx-scheduler-appointment');
expect(appointment && !appointment.classList.contains('dx-resizable')).toBe(true);
});
});
Loading
Loading