Scheduler: refactor workspaces module (TS): part 1 by sjbur · Pull Request #33824 · DevExpress/DevExtreme

sjbur · 2026-06-03T14:07:54Z

No description provided.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sergei Burkatskii <sergei.burkatskii@devexpress.com>

Copilot

Pull request overview

This PR continues the Scheduler workspace TypeScript refactor by tightening typings across workspace implementations (base workspace, month/week/day, timeline variants, agenda) and aligning option/change handling with internal “safe” scheduler option types.

Changes:

Introduced and exported shared workspace typing primitives (scrollable config types, date generation options, option-changed option union) and applied stricter method signatures/return types.
Switched workspace option typing from dxSchedulerOptions to internal SafeSchedulerOptions, and updated _optionChanged signatures to use typed OptionChanged<...>.
Added skippedDays?: number[] to internal scheduler options and propagated related typing usage through render option generation.

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts	Adds exported workspace TS types, switches to `SafeSchedulerOptions`, tightens scrollable config and option-changed typing.
packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_week.ts	Adds explicit return types for overrides and tightens `startDate` typing.
packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_month.ts	Adds explicit method signatures, refines interval math typing, and exports month date-generation option typing usage.
packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts	Tightens types around the current-time indicator and option-changed handling.
packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_day.ts	Adds explicit return types for overrides and render method.
packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts	Tightens typing for timeline workspace, scroll configs, and render option generation.
packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_week.ts	Adds explicit return types for overrides and registration typing suppression.
packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_month.ts	Tightens typing for header templates, start date calculation, and render option generation.
packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_day.ts	Adds explicit return types for overrides and registration typing suppression.
packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts	Tightens Agenda workspace typing, improves some guards, and refactors several helpers to typed implementations.
packages/devextreme/js/__internal/scheduler/utils/options/types.ts	Adds `skippedDays?: number[]` to `SchedulerInternalOptions`.
packages/devextreme/js/__internal/scheduler/m_scheduler.ts	Types `_optionChanged` as `OptionChanged<SafeSchedulerOptions>`.

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Copilot

Pull request overview

Copilot reviewed 12 out of 12 changed files in this pull request and generated 4 comments.

Comments suppressed due to low confidence (1)

packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts:241

WorkspaceOptionsInternal.startDate is typed as Date, but Scheduler view startDate option is declared as Date | number | string | undefined (see js/ui/scheduler.d.ts:1161) and workspace default options set startDate: null. This narrowing can hide invalid runtime values and makes downstream code assume Date when it may be number|string|null.

export type WorkspaceOptionsInternal = Omit<SafeSchedulerOptions, 'groups'> & {
  groups: ResourceLoader[];
  getResourceManager: () => ResourceManager;
  startDate?: Date;
  currentDate: Date;
  intervalCount: number;

sjbur · 2026-06-04T11:26:56Z

            {
-                dateTableCellsMeta: [[{}]],
-                allDayPanelCellsMeta: [{}],
+                dateTableCellsMeta: [[{


Agenda does not have any "cells", those values just mocked and does not affect anything, but for type safety reasons I changed the mocked values, because dateTableCellsMeta is array of Rect. So I just pass empty rects.

…erScrollableConfig

Copilot

Pull request overview

Copilot reviewed 13 out of 13 changed files in this pull request and generated no new comments.

Tucchhaa · 2026-06-05T02:24:05Z

    );

-    const cellTemplate: any = this.option('resourceCellTemplate');
+    const cellTemplate = this.option('resourceCellTemplate') as TemplateBase | undefined;


is it possible to remove this as by moving the type to the options type?

Moved resourceCellTemplate to workspace internal options

Tucchhaa · 2026-06-05T02:25:18Z

-  getAgendaVerticalStepHeight() {
-    return this.option('rowHeight');
+  getAgendaVerticalStepHeight(): number {
+    return this.option('rowHeight') as number;


is it possible to remove as by moving rowHeight option to the options type?

Moved rowHeight to workspace internal options

Tucchhaa · 2026-06-05T02:25:27Z

-      this.option('endDayHour') as any,
-      this.option('agendaDuration') as any,
+      this.option('endDayHour'),
+      this.option('agendaDuration') as number,


is it possible to remove as by moving agendaDuration option to the options type?

Moved agendaDuration to workspace internal options

Tucchhaa · 2026-06-05T02:27:26Z

  type?: ViewType;
 };
+
+export type WorkspaceOptionChangedOptions = WorkspaceOptionsInternal & {


Why do we need both WorkspaceOptionsInternal and WorkspaceOptionChangedOptions? Why not use a single type for workspace options?

Yes, you're right. Removed WorkspaceOptionChangedOptions. Also moved all missing options from m_scheduler workspace config to workspace internal options.

Copilot

Pull request overview

Copilot reviewed 30 out of 30 changed files in this pull request and generated 2 comments.

web-flow and others added 7 commits June 2, 2026 13:27

refactor: refactor ts

28650c3

fix: small fixes

37966ba

refactor: changes

a336d68

fix: fix build

6843e77

fix: fix type for interval var

90b3df6

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sergei Burkatskii <sergei.burkatskii@devexpress.com>

fix: copilot review

2266d69

fix: copilot review

404d3c2

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Sergei Burkatskii <sergei.burkatskii@devexpress.com>

sjbur self-assigned this Jun 3, 2026

sjbur added the 26_1 label Jun 3, 2026

sjbur marked this pull request as ready for review June 3, 2026 14:12

sjbur requested a review from a team as a code owner June 3, 2026 14:12

Copilot AI review requested due to automatic review settings June 3, 2026 14:12

Copilot started reviewing on behalf of sjbur June 3, 2026 14:12 View session

Copilot AI reviewed Jun 3, 2026

View reviewed changes

Comment thread packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts Outdated

Comment thread packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_month.ts Outdated

fix: copilot review

b2a6ae9

Tucchhaa reviewed Jun 4, 2026

View reviewed changes

Comment thread packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts Outdated

web-flow added 2 commits June 4, 2026 12:25

refactor: remove unkown type for cellTemplate

9123940

refactor: remove unknown type from agenda

decdf71

Copilot AI review requested due to automatic review settings June 4, 2026 10:36

Copilot started reviewing on behalf of sjbur June 4, 2026 10:36 View session

Copilot AI reviewed Jun 4, 2026

View reviewed changes

Comment thread packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts Outdated

web-flow added 2 commits June 4, 2026 12:43

refactor: remove unknown type from timeline

fb49212

refactor: remove unknown from WorkspaceOptionChangedOptions

96bedd0

Copilot AI review requested due to automatic review settings June 4, 2026 11:02

Copilot started reviewing on behalf of sjbur June 4, 2026 11:02 View session

refactor: remove unknown from m_work_space

dfdc39f

Copilot AI reviewed Jun 4, 2026

View reviewed changes

web-flow added 2 commits June 4, 2026 13:12

fix: copilot review

d4a8fa1

fix: copilot review

addb52b

aleksei-semikozov previously approved these changes Jun 4, 2026

View reviewed changes

fix: fix test

43c130f

sjbur dismissed aleksei-semikozov’s stale review via 43c130f June 4, 2026 11:25

sjbur commented Jun 4, 2026

View reviewed changes

Tucchhaa reviewed Jun 4, 2026

View reviewed changes

Comment thread packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts Outdated

Tucchhaa reviewed Jun 4, 2026

View reviewed changes

Comment thread packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts Outdated

Tucchhaa reviewed Jun 4, 2026

View reviewed changes

Comment thread packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts Outdated

refactor: remove WorkspaceDateTableScrollableConfig and WorkspaceHead…

fb60e91

…erScrollableConfig

Copilot AI review requested due to automatic review settings June 4, 2026 12:37

Copilot started reviewing on behalf of sjbur June 4, 2026 12:37 View session

refactor: type getHeaderPanelCellClass

7667f58

Copilot AI reviewed Jun 4, 2026

View reviewed changes

Tucchhaa previously approved these changes Jun 4, 2026

View reviewed changes

web-flow added 2 commits June 4, 2026 15:24

refactor: rename files

a3c94ff

refactor: rename files in tests

778b3e7

sjbur dismissed Tucchhaa’s stale review via 778b3e7 June 4, 2026 13:25

Tucchhaa reviewed Jun 5, 2026

View reviewed changes

refactor: review

e0289f9

Copilot AI review requested due to automatic review settings June 5, 2026 09:19

Copilot started reviewing on behalf of sjbur June 5, 2026 09:20 View session

Copilot AI reviewed Jun 5, 2026

View reviewed changes

Comment thread packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts Outdated

Comment thread packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts

fix: copilot review

d7abc5b

Tucchhaa approved these changes Jun 5, 2026

View reviewed changes

sjbur merged commit 2098d97 into DevExpress:26_1 Jun 5, 2026
128 of 129 checks passed

Conversation

sjbur commented Jun 3, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants