Skip to content

Scheduler — Popup keep resource state between openings #32915

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
aleksei-semikozov merged 6 commits into from
Mar 18, 2026
+20 −147
Merged

Scheduler — Popup keep resource state between openings #32915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06a34bc
Scheduler - Fix appointment form state between popup openings
aleksei-semikozov Mar 15, 2026
2245863
Scheduler - Remove assigneeId workaround from ReactJs demo
aleksei-semikozov Mar 15, 2026
e475ef2
Scheduler - Remove obsolete state isolation tests (T832711)
aleksei-semikozov Mar 17, 2026
f44237b
Scheduler - Remove redundant state isolation tests
aleksei-semikozov Mar 17, 2026
5741a54
Scheduler - Remove weekly recurrence state isolation test
aleksei-semikozov Mar 18, 2026
809e99d
Scheduler - Revert unrelated selectbox close fix from state isolation…
aleksei-semikozov Mar 18, 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
1 change: 0 additions & 1 deletion apps/demos/Demos/Scheduler/ResolveTimeConflicts/Angular/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export class AppComponent {
onInitialized: (e: DxPopupTypes.InitializedEvent) => { this.popup = e.component; },
onHidden: () => {
this.setConflictError(false);
this.form?.updateData('assigneeId', []);
},
};

Expand Down
1 change: 0 additions & 1 deletion apps/demos/Demos/Scheduler/ResolveTimeConflicts/React/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ const App = () => {
},
onHidden: () => {
setConflictError(false);
formRef.current?.updateData('assigneeId', []);
},
}), [setConflictError]);

Expand Down
1 change: 0 additions & 1 deletion apps/demos/Demos/Scheduler/ResolveTimeConflicts/ReactJs/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ const App = () => {
},
onHidden: () => {
setConflictError(false);
formRef.current?.updateData('assigneeId', []);
},
}),
[setConflictError],
Expand Down
1 change: 0 additions & 1 deletion apps/demos/Demos/Scheduler/ResolveTimeConflicts/Vue/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ const popupOptions = {
},
onHidden: () => {
setConflictError(false);
form?.updateData('assigneeId', []);
},
};
Expand Down
1 change: 0 additions & 1 deletion apps/demos/Demos/Scheduler/ResolveTimeConflicts/jQuery/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ $(() => {
},
onHidden: () => {
setConflictError(false);
form?.updateData('assigneeId', []);
},
},
form: {
Expand Down
140 changes: 5 additions & 135 deletions packages/devextreme/js/__internal/scheduler/appointment_popup/appointment_popup.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,79 +377,18 @@ describe('Appointment Form', () => {
});

describe('State', () => {
it('should have empty description, subject and timezone inputs when opening second common appointment', async () => {
const { scheduler, POM } = await createScheduler({
...getDefaultConfig(),
editing: {
allowUpdating: true,
allowTimeZoneEditing: true,
},
});

scheduler.showAppointmentPopup({ ...commonAppointment });

POM.popup.setInputValue('descriptionEditor', 'temp');
POM.popup.setInputValue('startDateTimeZoneEditor', 'America/Los_Angeles');
POM.popup.setInputValue('endDateTimeZoneEditor', 'America/Anchorage');
POM.popup.saveButton.click();

scheduler.showAppointmentPopup();

expect(POM.popup.getInputValue('subjectEditor')).toBe('');
expect(POM.popup.getInputValue('descriptionEditor')).toBe('');
expect(POM.popup.getInputValue('startDateTimeZoneEditor')).toBe('');
expect(POM.popup.getInputValue('endDateTimeZoneEditor')).toBe('');
});

it('should have correct form data when opening second appointment', async () => {
it('should create a new form instance on each popup opening', async () => {
const { scheduler, POM } = await createScheduler(getDefaultConfig());

scheduler.showAppointmentPopup(commonAppointment);

expect(POM.popup.dxForm.option('formData')).toMatchObject({ ...commonAppointment });
const firstFormInstance = POM.popup.dxForm;

POM.popup.cancelButton.click();

scheduler.showAppointmentPopup(allDayAppointment);

expect(POM.popup.dxForm.option('formData')).toMatchObject({ ...allDayAppointment });
});

it('should have empty resource editor value when opening second appointment', async () => {
const { scheduler, POM } = await createScheduler({
...getDefaultConfig(),
resources: [{
fieldExpr: 'roomId',
dataSource: [
{ text: 'Room 1', id: 1, color: '#00af2c' },
{ text: 'Room 2', id: 2, color: '#56ca85' },
{ text: 'Room 3', id: 3, color: '#8ecd3c' },
],
}],
});

scheduler.showAppointmentPopup({
text: 'Resource test app',
startDate: new Date(2017, 4, 9, 9, 30),
endDate: new Date(2017, 4, 9, 11),
roomId: 1,
});
POM.popup.setInputValue('roomId', 2);
scheduler.hideAppointmentPopup(true);

scheduler.showAppointmentPopup();
expect(POM.popup.getInputValue('roomId')).toBe('');
});

it('should have correct repeat editor value when opening recurring appointment after common appointment', async () => {
const { scheduler, POM } = await createScheduler(getDefaultConfig());

scheduler.showAppointmentPopup({ ...commonAppointment });
POM.popup.saveButton.click();
scheduler.showAppointmentPopup(commonAppointment);
const secondFormInstance = POM.popup.dxForm;

scheduler.showAppointmentPopup({ ...recurringAppointment });
POM.popup.editSeriesButton.click();
expect(POM.popup.getInputValue('repeatEditor')).toBe('Daily');
expect(secondFormInstance).not.toBe(firstFormInstance);
});

it('should have correct editor values when opening for empty date cell - 1', async () => {
Expand Down Expand Up @@ -939,36 +878,6 @@ describe('Appointment Form', () => {
expect(POM.popup.getInputValue('endDateEditor')).toBe('5/1/2017');
expect(POM.popup.isInputVisible('endTimeEditor')).toBeFalsy();
});

it('should show correct dates after switching off allDay and canceling changes (T832711)', async () => {
const { scheduler, POM } = await createScheduler(undefined);

scheduler.showAppointmentPopup(allDayAppointment);
POM.popup.getInput('allDayEditor').click();
POM.popup.cancelButton.click();

scheduler.showAppointmentPopup(allDayAppointment);

expect(POM.popup.getInputValue('startDateEditor')).toBe('5/1/2017');
expect(POM.popup.isInputVisible('startTimeEditor')).toBeFalsy();
expect(POM.popup.getInputValue('endDateEditor')).toBe('5/1/2017');
expect(POM.popup.isInputVisible('endTimeEditor')).toBeFalsy();
});

it('should show correct dates after switching on allDay and canceling changes (T832711)', async () => {
const { scheduler, POM } = await createScheduler(getDefaultConfig());

scheduler.showAppointmentPopup(commonAppointment);
POM.popup.getInput('allDayEditor').click();
POM.popup.cancelButton.click();

scheduler.showAppointmentPopup(commonAppointment);

expect(POM.popup.getInputValue('startDateEditor')).toBe('5/9/2017');
expect(POM.popup.getInputValue('startTimeEditor')).toBe('9:30 AM');
expect(POM.popup.getInputValue('endDateEditor')).toBe('5/9/2017');
expect(POM.popup.getInputValue('endTimeEditor')).toBe('11:00 AM');
});
Copy link
Contributor

@Tucchhaa Tucchhaa Mar 17, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

I think there are more state tests that can be removed. E.g.:

DevExtreme/packages/devextreme/js/__internal/scheduler/appointment_popup/appointment_popup.test.ts

Line 380 in d11078b

it('should have empty description, subject and timezone inputs when opening second common appointment', async () => {

Can you pls check what kind of tests are not needed anymore? Maybe also testcafe tests

Copy link
Contributor Author

@aleksei-semikozov aleksei-semikozov Mar 17, 2026

Choose a reason for hiding this comment

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

Yes remove more 4 state tests jest test.
Checked testcafe tests for state isolation patterns (close popup → reopen popup). The key indicator is tests where the popup is opened twice within a single test case.
New form (appointmentForm/): No tests open the popup twice.
Legacy form (legacyAppointmentForm/): Found 3 state isolation tests(but wont fixed this unused code)

Copy link
Contributor

@Tucchhaa Tucchhaa Mar 18, 2026

Choose a reason for hiding this comment

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

Remove this test too pls:

DevExtreme/packages/devextreme/js/__internal/scheduler/appointment_popup/appointment_popup.test.ts

Line 1531 in 0439dad

it('should have correct input values when opening second weekly recurring appointment', async () => {

Copy link
Contributor Author

@aleksei-semikozov aleksei-semikozov Mar 18, 2026

Choose a reason for hiding this comment

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

removed it

});

describe('Timezone Editors', () => {
Expand Down Expand Up @@ -1527,45 +1436,6 @@ describe('Appointment Form', () => {
expect(POM.popup.getInputValue('recurrenceRepeatEndEditor')).toBe('count');
expect(POM.popup.getInputValue('recurrenceEndCountEditor')).toBe('10 occurrence(s)');
});

it('should have correct input values when opening second weekly recurring appointment', async () => {
const { scheduler, POM } = await createScheduler(getDefaultConfig());

const appointment1 = {
text: 'Meeting',
startDate: new Date(2017, 4, 1, 10, 30),
endDate: new Date(2017, 4, 1, 11),
recurrenceRule: 'FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,WE,FR;COUNT=5',
repeatEnd: 'count',
};
const appointment2 = {
text: 'Meeting',
startDate: new Date(2017, 4, 2, 10, 30),
endDate: new Date(2017, 4, 2, 11),
recurrenceRule: 'FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,TH;COUNT=5',
repeatEnd: 'count',
};

scheduler.showAppointmentPopup(appointment1);
POM.popup.editSeriesButton.click();
POM.popup.recurrenceSettingsButton.click();

scheduler.hideAppointmentPopup();

scheduler.showAppointmentPopup(appointment2);
POM.popup.editSeriesButton.click();
POM.popup.recurrenceSettingsButton.click();

expect(POM.popup.getInputValue('repeatEditor')).toBe('Weekly');
expect(POM.popup.getInputValue('recurrenceStartDateEditor')).toBe('5/2/2017');
expect(POM.popup.getInputValue('recurrenceCountEditor')).toBe('1');
expect(POM.popup.getInputValue('recurrencePeriodEditor')).toBe('Week(s)');

const expectedWeekDaysSelection = [false, true, false, true, false, false, false];
expect(POM.popup.getWeekDaysSelection()).toEqual(expectedWeekDaysSelection);

expect(POM.popup.getInputValue('recurrenceEndCountEditor')).toBe('5 occurrence(s)');
});
});

describe('Repeat End Values Preservation', () => {
Expand Down
22 changes: 15 additions & 7 deletions packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ export class AppointmentPopup {
this.state.allowSaving = config.allowSaving;
this.state.excludeInfo = config.excludeInfo;

if (!this._popup) {
const popupConfig = this._createPopupConfig();
this._createPopup(popupConfig);
}
this._disposePopup();

const popupConfig = this._createPopupConfig();
this._createPopup(popupConfig);

this._popup!.show();
}
Expand All @@ -82,9 +82,17 @@ export class AppointmentPopup {
}

dispose() {
this.form.dispose();
this._popup?.dispose();
this._popup = undefined;
this._disposePopup();
}

private _disposePopup(): void {
if (this._popup) {
const $element = this._popup.$element();
this.form.dispose();
this._popup.dispose();
$element.remove();
this._popup = undefined;
}
}

_createPopup(options): void {
Expand Down
Loading