Skip to content

Scheduler: refactor workspaces module (TS): part 6#33965

Open
sjbur wants to merge 24 commits into
DevExpress:26_1from
sjbur:issue-4500_26_1_v2_part2
Open

Scheduler: refactor workspaces module (TS): part 6#33965
sjbur wants to merge 24 commits into
DevExpress:26_1from
sjbur:issue-4500_26_1_v2_part2

Conversation

@sjbur

@sjbur sjbur commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

No description provided.

@sjbur sjbur self-assigned this Jun 11, 2026
@sjbur sjbur marked this pull request as ready for review June 11, 2026 13:41
@sjbur sjbur requested a review from a team as a code owner June 11, 2026 13:41
Copilot AI review requested due to automatic review settings June 11, 2026 13:41

protected getToday?(): Date;

protected $allDayPanel: any;

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

protected $allDayPanel: any;
private $allDayTitle: any;

were removed because they were not being used

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

both fields you mentioned are still defined and used

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I see, think you meant
private allDayTitles!: any[];
private allDayPanels!: any[];

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR continues the Scheduler workspace refactor (TS, part 5.2) by migrating the legacy m_work_space module to the new work_space entry and tightening types across workspace implementations, grouped strategies, shaders, and related tests.

Changes:

  • Switched imports/references from m_work_space to work_space throughout scheduler workspaces, strategies, shaders, and tests.
  • Refined TypeScript typings in work_space.ts (option access patterns, action maps, renderer/scroll sync typing, drag behavior config typing).
  • Updated workspace implementations (day/week/month/timeline/agenda) to use this.option() accessors consistently and adjusted a few rendering/DOM helper behaviors.

Reviewed changes

Copilot reviewed 18 out of 19 changed files in this pull request and generated no comments.

Show a summary per file
File Description
packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup-0.tests.js Updates test import to the new workspace module path.
packages/devextreme/js/__internal/scheduler/workspaces/work_space.ts Core refactor: stronger typing, option access changes, scroll/selection/drag handling adjustments, new helper types.
packages/devextreme/js/__internal/scheduler/workspaces/work_space_week.ts Uses option().type / option().startDate accessors.
packages/devextreme/js/__internal/scheduler/workspaces/work_space_month.ts Updates imports + option accessors; minor iteration typing tweaks.
packages/devextreme/js/__internal/scheduler/workspaces/work_space_indicator.ts Updates import path + option destructuring.
packages/devextreme/js/__internal/scheduler/workspaces/work_space_grouped_strategy_vertical.ts Updates workspace import + option destructuring; adjusts element typing.
packages/devextreme/js/__internal/scheduler/workspaces/work_space_grouped_strategy_horizontal.ts Updates workspace import path.
packages/devextreme/js/__internal/scheduler/workspaces/work_space_day.ts Uses option().intervalCount.
packages/devextreme/js/__internal/scheduler/workspaces/virtual_scrolling.ts Updates workspace import path + TODO reference.
packages/devextreme/js/__internal/scheduler/workspaces/timeline.ts Updates workspace import path + option accessors + grouped strategy call signature.
packages/devextreme/js/__internal/scheduler/workspaces/timeline_week.ts Uses option().type.
packages/devextreme/js/__internal/scheduler/workspaces/timeline_month.ts Uses option() accessors for templates/dates/interval.
packages/devextreme/js/__internal/scheduler/workspaces/agenda.ts Updates workspace import path + option accessors; minor DOM collection handling changes.
packages/devextreme/js/__internal/scheduler/utils.ts Exports RenovationWidget and adds dispose to its contract.
packages/devextreme/js/__internal/scheduler/shaders/current_time_shader_vertical.ts Updates workspace import path + removes unnecessary casts.
packages/devextreme/js/__internal/scheduler/shaders/current_time_shader_horizontal.ts Updates workspace import path.
packages/devextreme/js/__internal/scheduler/m_scheduler.ts Updates TODO references from m_work_space.ts to work_space.ts.
packages/devextreme/js/__internal/scheduler/tests/workspace.base.test.ts Updates workspace import path.
packages/devextreme/js/__internal/scheduler/tests/mock/mock_scheduler.ts Updates workspace import path.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

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

Copilot AI review requested due to automatic review settings June 11, 2026 15:58
@sjbur sjbur force-pushed the issue-4500_26_1_v2_part2 branch from 74477a5 to 882cde1 Compare June 11, 2026 15:58

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

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

@sjbur sjbur force-pushed the issue-4500_26_1_v2_part2 branch from 882cde1 to 4649fda Compare June 11, 2026 16:20
@sjbur sjbur changed the title Scheduler: refactor workspaces module (TS): part 5.2 Scheduler: refactor workspaces module (TS): part 6 Jun 11, 2026
return button.id;
});

export const hasHorizontalScroll = async (container: Selector): Promise<boolean> => {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I had a failing test which was resolved by this edit.

✖ [T1225772]: should not have the horizontal scroll in horizontal views when the crossScrollingEnabled: true (view:day) (screenshots: /opt/actions-runner/_work/DevExtreme/DevExtreme/e2e/testcafe-devextreme/artifacts/failedtests/[T1225772] should not have the horizontal scroll in horizontal views when the crossScrollingEnabled true (viewday).png) (2.92s)

  1. Selector does not have test controller access. To execute Selector from a Node.js API callback, bind the test controller object to the function with the .with({ boundTestRun: t }) method. Note that you cannot execute Selector outside test code.

Link to failing job: https://github.com/DevExpress/DevExtreme/actions/runs/27351988482/job/80830001051

if (this.isVerticalGroupedWorkSpace()) {
return this.$groupTable;
}

return this.$thead;
}

private getDateHeaderContainer() {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Also removed because was not being used

Copilot AI review requested due to automatic review settings June 11, 2026 17:22
@sjbur sjbur requested review from a team as code owners June 12, 2026 10:09
@github-actions github-actions Bot added the .d.ts label Jun 12, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

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

Files not reviewed (1)
  • pnpm-lock.yaml: Generated file

Copilot AI review requested due to automatic review settings June 12, 2026 10:15
@sjbur sjbur force-pushed the issue-4500_26_1_v2_part2 branch from 2d93113 to 42c80af Compare June 12, 2026 10:15
@github-actions github-actions Bot removed the .d.ts label Jun 12, 2026
@sjbur sjbur force-pushed the issue-4500_26_1_v2_part2 branch from 42c80af to 5ac903d Compare June 12, 2026 10:20

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

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

# Conflicts:
#	packages/devextreme/js/__internal/scheduler/workspaces/work_space.ts
#	packages/devextreme/js/__internal/scheduler/workspaces/work_space_grouped_strategy_horizontal.ts
#	packages/devextreme/js/__internal/scheduler/workspaces/work_space_grouped_strategy_vertical.ts
Copilot AI review requested due to automatic review settings June 12, 2026 10:21

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

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

Copilot AI review requested due to automatic review settings June 15, 2026 08:18
@sjbur sjbur requested a review from a team June 15, 2026 08:18

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

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

web-flow added 4 commits June 15, 2026 14:34
# Conflicts:
#	packages/devextreme/js/__internal/scheduler/workspaces/timeline_week.ts
#	packages/devextreme/js/__internal/scheduler/workspaces/work_space.ts
#	packages/devextreme/js/__internal/scheduler/workspaces/work_space_week.ts
Copilot AI review requested due to automatic review settings June 15, 2026 13:31

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

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

@sjbur sjbur force-pushed the issue-4500_26_1_v2_part2 branch from 64880b1 to 894321d Compare June 15, 2026 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants