Scheduler: refactor workspaces module (TS): part 4 (#33915)

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

Author: sjbur

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

@@ -1,5 +1,6 @@
 import type { PropsWithChildren, PropsWithClassName } from '@ts/core/r1/index';
 import { BaseInfernoComponent } from '@ts/core/r1/runtime/inferno/index';
+import type { GroupLeaf } from '@ts/scheduler/utils/resource_manager/types';
 
 import { renderUtils } from '../../utils/index';
 import type { ContentTemplateProps, DefaultProps, PropsWithViewContext } from '../types';
@@ -12,7 +13,7 @@ export interface CellBaseProps extends PropsWithClassName,
   startDate: Date;
   endDate: Date;
   allDay?: boolean;
-  groups?: Record<string, unknown>;
+  groups?: GroupLeaf['grouped'];
   groupIndex?: number;
   text?: string;
   index: number;

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

@@ -21,10 +21,7 @@ export interface TimePanelTableProps extends PropsWithViewContext {
 export const TimePanelTableDefaultProps: DefaultProps<TimePanelTableProps> = {
   timePanelData: {
     groupedData: [],
-    leftVirtualCellCount: 0,
-    rightVirtualCellCount: 0,
-    topVirtualRowCount: 0,
-    bottomVirtualRowCount: 0,
+    isGroupedAllDayPanel: false,
   },
 };
 

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

@@ -1,4 +1,5 @@
 import type { JSXTemplate } from '@ts/core/r1/types';
+import type { GroupLeaf } from '@ts/scheduler/utils/resource_manager/types';
 
 import type { GroupItem, ViewDataBase, ViewType } from '../../types';
 
@@ -7,7 +8,7 @@ export interface BaseTemplateProps {
 }
 
 interface BaseTemplateData {
-  groups?: Record<string, unknown>;
+  groups?: GroupLeaf['grouped'];
   groupIndex?: number;
   allDay?: boolean;
   text?: string;
@@ -49,7 +50,7 @@ export interface ViewCellData {
   otherMonth?: boolean;
   today?: boolean;
   allDay?: boolean;
-  groups?: Record<string, unknown>;
+  groups?: GroupLeaf['grouped'];
   groupIndex?: number;
   index: number;
   isFirstGroupCell: boolean;

packages/devextreme/js/__internal/scheduler/r1/utils/base.ts

@@ -24,6 +24,7 @@ import type { ResourceLoader } from '../../utils/loader/resource_loader';
 import type { ResourceId } from '../../utils/loader/types';
 import { VIEWS } from '../../utils/options/constants_view';
 import timeZoneUtils from '../../utils_time_zone';
+import type { TimeZoneCalculator } from '../timezone_calculator';
 
 const toMs = dateUtils.dateToMilliseconds;
 const DAY_HOURS = 24;
@@ -304,12 +305,12 @@ export const calculateCellIndex: CalculateCellIndex = (
 ) => columnIndex * rowCount + rowIndex;
 
 export const getTotalRowCountByCompleteData = (
-  completeData: unknown[][],
+  completeData: unknown[] | unknown[][],
 ): number => completeData.length;
 
 export const getDisplayedRowCount = (
   displayedRowCount: number | undefined,
-  completeData: unknown[][],
+  completeData: unknown[] | unknown[][],
 ): number => displayedRowCount ?? getTotalRowCountByCompleteData(completeData);
 
 export const getStartViewDateWithoutDST = (startViewDate: Date, startDayHour: number): Date => {
@@ -335,9 +336,10 @@ export const getKeyByGroup = (
   return '0';
 };
 
-export const getToday = (indicatorTime: Date | undefined, timeZoneCalculator: {
-  createDate: (todayDate: Date, path: unknown) => Date;
-}): Date => {
+export const getToday = (
+  indicatorTime: Date | undefined,
+  timeZoneCalculator: TimeZoneCalculator | undefined,
+): Date => {
   const todayDate = indicatorTime ?? new Date();
 
   return timeZoneCalculator?.createDate(todayDate, 'toGrid') || todayDate;

packages/devextreme/js/__internal/scheduler/r1/utils/month.ts

@@ -20,9 +20,9 @@ export const getViewStartByOptions = (
   startDate: Date | undefined,
   currentDate: Date,
   intervalCount: number,
-  startViewDate: Date,
+  startViewDate?: Date,
 ): Date => {
-  if (!startDate) {
+  if (!startDate || !startViewDate) {
     return new Date(currentDate);
   }
   let currentStartDate = new Date(startViewDate);
@@ -58,7 +58,7 @@ export const getCellText = (date: Date, intervalCount: number): string => {
 export const calculateStartViewDate = (
   currentDate: Date,
   startDayHour: number,
-  startDate: Date,
+  startDate: Date | undefined,
   intervalCount: number,
   firstDayOfWeekOption: number | undefined,
 ): Date => {

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

@@ -3,7 +3,7 @@ import type { Appointment, Properties } from '@js/ui/scheduler';
 import type { Component } from '@ts/core/widget/component';
 
 import type { ResourceLoader } from './utils/loader/resource_loader';
-import type { GroupValues, RawGroupValues } from './utils/resource_manager/types';
+import type { GroupLeaf, GroupValues, RawGroupValues } from './utils/resource_manager/types';
 import type { AppointmentItemViewModel } from './view_model/types';
 
 export type Direction = 'vertical' | 'horizontal';
@@ -82,9 +82,9 @@ export type CalculateCellIndex = (
 export type CalculateStartViewDate = (
   currentDate: Date,
   startDayHour: number,
-  startDate: Date,
+  startDate: Date | undefined,
   intervalCount: number,
-  firstDayOfWeekOption?: number,
+  firstDayOfWeekOption?: number | undefined,
   skippedDays?: number[],
 ) => Date;
 
@@ -95,7 +95,7 @@ export interface ViewCellData {
   otherMonth?: boolean;
   today?: boolean;
   allDay?: boolean;
-  groups?: Record<string, unknown>;
+  groups?: GroupLeaf['grouped'];
   groupIndex?: number;
   index: number;
   isFirstGroupCell: boolean;
@@ -107,6 +107,8 @@ export interface ViewCellData {
   highlighted?: boolean;
 }
 
+export type TimePanelCellData = Omit<ViewCellData, 'endDate'>;
+
 export interface CountGenerationConfig {
   intervalCount: number;
   currentDate: Date;
@@ -163,7 +165,7 @@ export interface ViewDataProviderOptions {
   startDate?: Date;
   firstDayOfWeek: number;
   today: Date;
-
+  skippedDays: number[];
   isGenerateTimePanelData?: boolean;
   isGenerateWeekDaysHeaderData?: boolean;
 }
@@ -173,6 +175,13 @@ export interface CellInfo {
   position: CellPositionData;
 }
 
+export interface GroupInfo {
+  allDay: boolean;
+  startDate: Date;
+  endDate: Date;
+  groupIndex: number;
+}
+
 export interface ViewDataMap {
   dateTableMap: CellInfo[][];
   allDayPanelMap: CellInfo[];
@@ -218,7 +227,7 @@ export interface GroupPanelData {
 }
 
 export interface ViewDataBase {
-  groupIndex: number;
+  groupIndex: number | undefined;
   isGroupedAllDayPanel?: boolean;
   key: string;
 }
@@ -234,12 +243,18 @@ export interface GroupedViewDataBase {
   bottomVirtualRowCount: number;
 }
 
+export interface TimePanelDataBase {
+  topVirtualRowHeight?: number;
+  bottomVirtualRowHeight?: number;
+  isGroupedAllDayPanel: boolean;
+}
+
 export interface TimePanelCellsData extends ViewDataBase {
-  dateTable: ViewCellData[];
-  allDayPanel?: ViewCellData;
+  dateTable: TimePanelCellData[];
+  allDayPanel?: TimePanelCellData;
 }
 
-export interface TimePanelData extends GroupedViewDataBase {
+export interface TimePanelData extends TimePanelDataBase {
   groupedData: TimePanelCellsData[];
 }
 

packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_filter.ts

@@ -1,5 +1,5 @@
 import timeZoneUtils from '../../../utils_time_zone';
-import type ViewDataProvider from '../../../workspaces/view_model/m_view_data_provider';
+import type ViewDataProvider from '../../../workspaces/view_model/view_data_provider';
 import { isAppointmentMatchedIntervals } from '../../common/is_appointment_matched_intervals';
 import type { ListEntity } from '../../types';
 

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

@@ -1,7 +1,7 @@
 import { isDateAndTimeView } from '@ts/scheduler/r1/utils/index';
 import type { CellPositionData, ViewCellData, ViewType } from '@ts/scheduler/types';
 
-interface EdgeIndices {
+export interface EdgeIndices {
   firstColumnIndex: number;
   lastColumnIndex: number;
   firstRowIndex: number;

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

@@ -1,7 +1,7 @@
 import type { CellPositionData, ViewCellData } from '@ts/scheduler/types';
 
-import type { CellPosition } from './view_model/m_types';
-import type ViewDataProvider from './view_model/m_view_data_provider';
+import type { CellPosition } from './view_model/types';
+import type ViewDataProvider from './view_model/view_data_provider';
 
 export default class CellsSelectionState {
   private focusedCell: ViewCellData | null = null;
@@ -28,11 +28,7 @@ export default class CellsSelectionState {
       return undefined;
     }
 
-    const { groupIndex, startDate, allDay } = focusedCell;
-    const cellInfo = {
-      groupIndex, startDate, isAllDay: allDay, index: focusedCell.index,
-    };
-    const cellPosition = this.viewDataProvider.findCellPositionInMap(cellInfo);
+    const cellPosition = this.viewDataProvider.findCellPositionInMap(focusedCell);
 
     return { coordinates: cellPosition, cellData: focusedCell };
   }

packages/devextreme/js/__internal/scheduler/workspaces/helpers/position_helper.ts

@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 
 import type { CountGenerationConfig, DOMMetaData } from '../../types';
-import type ViewDataProvider from '../view_model/m_view_data_provider';
+import type ViewDataProvider from '../view_model/view_data_provider';
 
 export interface PositionHelperOptions {
   viewDataProvider: ViewDataProvider;
@@ -68,7 +68,11 @@ const getMaxAllowedHorizontalPosition = (
 
   if (!firstRow) return 0;
 
-  const { columnIndex } = viewDataProvider.getLastGroupCellPosition(groupIndex);
+  const lastGroupCellPosition = viewDataProvider.getLastGroupCellPosition(groupIndex);
+
+  if (!lastGroupCellPosition) return 0;
+
+  const { columnIndex } = lastGroupCellPosition;
   const cellPosition = firstRow[columnIndex];
 
   if (!cellPosition) return 0;
@@ -273,7 +277,11 @@ class GroupStrategyBase {
     showAllDayPanel,
     isGroupedAllDayPanel,
   }: GroupTopOptions): number {
-    const { rowIndex } = this.viewDataProvider.getLastGroupCellPosition(groupIndex);
+    const lastGroupCellPosition = this.viewDataProvider.getLastGroupCellPosition(groupIndex);
+
+    if (!lastGroupCellPosition) return 0;
+
+    const { rowIndex } = lastGroupCellPosition;
     const { dateTableCellsMeta } = this.DOMMetaData;
     const lastGroupRow = dateTableCellsMeta[rowIndex];