Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import {
afterEach, beforeEach, describe, expect, it,
} from '@jest/globals';
import $ from '@js/core/renderer';

import fx from '../../../common/core/animation/fx';
import CustomStore from '../../../data/custom_store';
import { createScheduler } from './__mock__/create_scheduler';
import { setupSchedulerTestEnvironment } from './__mock__/m_mock_scheduler';

const CLASSES = {
scheduler: 'dx-scheduler',
workSpace: 'dx-scheduler-work-space',
};

describe('Workspace Recalculation with Async Templates (T661335)', () => {
beforeEach(() => {
fx.off = true;
setupSchedulerTestEnvironment({ height: 600 });
});

afterEach(() => {
const $scheduler = $(document.querySelector(`.${CLASSES.scheduler}`));
// @ts-expect-error
$scheduler.dxScheduler('dispose');
document.body.innerHTML = '';
fx.off = false;
});

it('should not duplicate workspace elements when resources are loaded asynchronously (T661335)', async () => {
const { scheduler, container } = await createScheduler({
templatesRenderAsynchronously: true,
currentView: 'day',
views: ['day'],
groups: ['owner'],
resources: [
{
fieldExpr: 'owner',
dataSource: [{ id: 1, text: 'Owner 1' }],
},
{
fieldExpr: 'room',
dataSource: new CustomStore({
load(): Promise<unknown> {
return new Promise((resolve) => {
setTimeout(() => {
resolve([{ id: 1, text: 'Room 1', color: '#ff0000' }]);
});
});
},
}),
},
],
dataSource: [
{
text: 'Meeting in Room 1',
startDate: new Date(2017, 4, 25, 9, 0),
endDate: new Date(2017, 4, 25, 10, 0),
roomId: 1,
},
],
startDayHour: 9,
currentDate: new Date(2017, 4, 25),
height: 600,
});

scheduler.option('groups', ['room']);

await new Promise((r) => { setTimeout(r); });

const $workSpaces = $(container).find(`.${CLASSES.workSpace}`);
const $groupHeader = $(container).find('.dx-scheduler-group-header');

expect($workSpaces.length).toBe(1);

expect($groupHeader.length).toBeGreaterThan(0);
expect($groupHeader.text()).toContain('Room 1');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -1671,8 +1671,8 @@ class Scheduler extends Widget<any> {
_recalculateWorkspace() {
// @ts-expect-error
this._workSpaceRecalculation = new Deferred();
triggerResizeEvent(this._workSpace.$element());
this._waitAsyncTemplate(() => {
triggerResizeEvent(this._workSpace.$element());
this._workSpace.renderCurrentDateTimeLineAndShader();
});
}
Expand Down
Loading