Scheduler: refactor workspaces module (TS): part 5 (DevExpress#33991)

Co-authored-by: Sergei Burkatskii <noreply@github.com>

Author: sjbur

packages/devextreme/eslint-scheduler-allowlist.mjs

@@ -78,7 +78,7 @@ const schedulerLegacyMembers = [
     // appointments/m_appointment_collection.ts
     '_renderAppointmentTemplate',
 
-    // workspaces/view_model/m_view_data_generator.ts
+    // workspaces/view_model/view_data_generator.ts
     '_getIntervalDuration',
 
     // workspaces/virtual_scrolling.ts

packages/devextreme/js/__internal/scheduler/r1/components/base/date_header.tsx

@@ -62,7 +62,6 @@ export class DateHeader extends BaseInfernoComponent<DateHeaderProps> {
               {
                 dateHeaderRow.map(({
                   colSpan,
-                  endDate,
                   groupIndex,
                   groups: cellGroups,
                   index,
@@ -77,7 +76,6 @@ export class DateHeader extends BaseInfernoComponent<DateHeaderProps> {
                     key={key}
                     viewContext={viewContext}
                     startDate={startDate}
-                    endDate={endDate}
                     groups={isHorizontalGrouping ? cellGroups : undefined}
                     groupIndex={isHorizontalGrouping ? groupIndex : undefined}
                     today={today ?? false}

packages/devextreme/js/__internal/scheduler/r1/components/base/date_header_cell.tsx

@@ -9,7 +9,7 @@ import type { CellBaseProps } from './cell';
 import { CellBaseDefaultProps } from './cell';
 import { DateHeaderText } from './date_header_text';
 
-export interface DateHeaderCellProps extends CellBaseProps {
+export interface DateHeaderCellProps extends Omit<CellBaseProps, 'endDate'> {
   today: boolean;
   colSpan: number;
   isWeekDayCell: boolean;
@@ -20,8 +20,10 @@ export interface DateHeaderCellProps extends CellBaseProps {
   dateCellTemplate?: JSXTemplate<DateTimeCellTemplateProps>;
 }
 
+const { endDate: _, ...cellBaseDefaultPropsWithoutEndDate } = CellBaseDefaultProps;
+
 export const DateHeaderCellDefaultProps: DefaultProps<DateHeaderCellProps> = {
-  ...CellBaseDefaultProps,
+  ...cellBaseDefaultPropsWithoutEndDate,
   today: false,
   colSpan: 1,
   isWeekDayCell: false,

packages/devextreme/js/__internal/scheduler/r1/components/timeline/date_header_timeline.tsx

@@ -73,7 +73,6 @@ export class TimelineDateHeaderLayout extends BaseInfernoComponent<DateHeaderPro
                 {
                   dateHeaderRow.map(({
                     colSpan,
-                    endDate,
                     groupIndex,
                     groups: cellGroups,
                     index,
@@ -88,7 +87,6 @@ export class TimelineDateHeaderLayout extends BaseInfernoComponent<DateHeaderPro
                       key={key}
                       viewContext={viewContext}
                       startDate={startDate}
-                      endDate={endDate}
                       groups={isHorizontalGrouping ? cellGroups : undefined}
                       groupIndex={isHorizontalGrouping ? groupIndex : undefined}
                       today={today ?? DateHeaderCellDefaultProps.today}

packages/devextreme/js/__internal/scheduler/r1/components/types.ts

@@ -62,23 +62,6 @@ export interface ViewCellData {
   highlighted?: boolean;
 }
 
-export interface DateHeaderCellData extends ViewCellData {
-  colSpan: number;
-}
-
-export interface DateHeaderData {
-  dataMap: DateHeaderCellData[][];
-  leftVirtualCellWidth: number;
-  rightVirtualCellWidth: number;
-  leftVirtualCellCount: number;
-  rightVirtualCellCount: number;
-  weekDayLeftVirtualCellWidth?: number;
-  weekDayRightVirtualCellWidth?: number;
-  weekDayLeftVirtualCellCount?: number;
-  weekDayRightVirtualCellCount?: number;
-  isMonthDateHeader?: boolean;
-}
-
 interface DataCellTemplateData extends BaseTemplateData {
   startDate: Date;
   endDate: Date;

packages/devextreme/js/__internal/scheduler/types.ts

@@ -111,7 +111,7 @@ export type TimePanelCellData = Omit<ViewCellData, 'endDate'>;
 export interface CountGenerationConfig {
   intervalCount: number;
   currentDate: Date;
-  viewType: string;
+  viewType: ViewType;
   hoursInterval: number;
   startDayHour: number;
   endDayHour: number;
@@ -202,7 +202,7 @@ export interface DOMMetaData {
   allDayPanelCellsMeta: CellRect[];
 }
 
-export interface DateHeaderCellData extends ViewCellData {
+export interface DateHeaderCellData extends Omit<ViewCellData, 'endDate'> {
   colSpan: number;
 }
 

packages/devextreme/js/__internal/scheduler/workspaces/agenda.ts

@@ -9,6 +9,7 @@ import dateUtils from '@js/core/utils/date';
 import { extend } from '@js/core/utils/extend';
 import { each } from '@js/core/utils/iterator';
 import { setHeight, setOuterHeight } from '@js/core/utils/size';
+import type { ViewType } from '@js/ui/scheduler';
 import type { OptionChanged } from '@ts/core/widget/types';
 import { EMPTY_ACTIVE_STATE_UNIT } from '@ts/core/widget/widget';
 
@@ -67,7 +68,7 @@ class SchedulerAgenda extends WorkSpace {
     return EMPTY_ACTIVE_STATE_UNIT;
   }
 
-  get type(): string { return VIEWS.AGENDA; }
+  get type(): ViewType { return VIEWS.AGENDA; }
 
   getStartViewDate(): Date {
     return this.startViewDate;

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

@@ -135,7 +135,8 @@ const { tableCreator } = tableCreatorModule;
 const DRAGGING_MOUSE_FAULT = 10;
 
 // @ts-expect-error Widget exposes a static abstract() helper not typed in its d.ts
-const { abstract } = Widget;
+const { abstract: widgetAbstract } = Widget;
+const abstract = widgetAbstract as () => never;
 const toMs = dateUtils.dateToMilliseconds;
 
 const COMPONENT_CLASS = 'dx-scheduler-work-space';
@@ -388,14 +389,13 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
     return CELL_SELECTOR;
   }
 
-  // eslint-disable-next-line @typescript-eslint/class-literal-property-style
-  get type(): string {
-    return '';
+  get type(): ViewType {
+    return abstract();
   }
 
   get viewDataProvider(): ViewDataProvider {
     if (!this.viewDataProviderValue) {
-      this.viewDataProviderValue = new ViewDataProvider(this.type as ViewType);
+      this.viewDataProviderValue = new ViewDataProvider(this.type);
     }
     return this.viewDataProviderValue;
   }
@@ -1360,21 +1360,21 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
     return {
       startDayHour: this.option('startDayHour'),
       endDayHour: this.option('endDayHour'),
+      hoursInterval: this.option('hoursInterval'),
       interval: this.viewDataProvider.viewDataGenerator?.getInterval(this.option('hoursInterval')),
+      intervalCount: this.option('intervalCount'),
       startViewDate: this.getStartViewDate(),
       firstDayOfWeek: this.firstDayOfWeek(),
       viewOffset: this.option('viewOffset'),
-      viewType: this.type as ViewType,
-      hoursInterval: this.option('hoursInterval'),
-      intervalCount: this.option('intervalCount'),
+      viewType: this.type,
     };
   }
 
   // TODO: refactor current time indicator
   protected getIntervalBetween(currentDate, allDay) {
     const firstViewDate = this.getStartViewDate();
 
-    const startDayTime = (this.option('startDayHour') as any) * HOUR_MS;
+    const startDayTime = this.option('startDayHour') * HOUR_MS;
     const timeZoneOffset = dateUtils.getTimezonesDifference(firstViewDate, currentDate);
     const fullInterval = currentDate.getTime() - firstViewDate.getTime() - timeZoneOffset;
     const days = this.getDaysOfInterval(fullInterval, startDayTime);
@@ -1983,7 +1983,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
   protected getR1ComponentsViewContext(): ViewContext {
     return {
       view: {
-        type: this.type as ViewType,
+        type: this.type,
       },
       crossScrollingEnabled: Boolean(this.option('crossScrollingEnabled')),
     };

packages/devextreme/js/__internal/scheduler/workspaces/timeline_day.ts

@@ -1,12 +1,13 @@
 import registerComponent from '@js/core/component_registrator';
+import type { ViewType } from '@js/ui/scheduler';
 
 import { VIEWS } from '../utils/options/constants_view';
 import SchedulerTimeline from './timeline';
 
 const TIMELINE_CLASS = 'dx-scheduler-timeline-day';
 
 class SchedulerTimelineDay extends SchedulerTimeline {
-  get type(): string { return VIEWS.TIMELINE_DAY; }
+  get type(): ViewType { return VIEWS.TIMELINE_DAY; }
 
   protected override getElementClass(): string {
     return TIMELINE_CLASS;

packages/devextreme/js/__internal/scheduler/workspaces/timeline_month.ts

@@ -1,6 +1,7 @@
 import registerComponent from '@js/core/component_registrator';
 import type { TemplateBase } from '@js/core/templates/template_base';
 import dateUtils from '@js/core/utils/date';
+import type { ViewType } from '@js/ui/scheduler';
 import { HeaderPanelComponent } from '@ts/scheduler/r1/components/index';
 import { formatWeekdayAndDay, monthUtils } from '@ts/scheduler/r1/utils/index';
 
@@ -11,7 +12,7 @@ import type { ViewDataProviderOptions } from './view_model/types';
 const TIMELINE_CLASS = 'dx-scheduler-timeline-month';
 
 class SchedulerTimelineMonth extends SchedulerTimeline {
-  get type(): string { return VIEWS.TIMELINE_MONTH; }
+  get type(): ViewType { return VIEWS.TIMELINE_MONTH; }
 
   readonly viewDirection = 'horizontal';