Scheduler: move view model files to one folder

Author: Ambrozy

packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts

@@ -35,10 +35,10 @@ import { getAppointmentGroupValues } from '../utils/resource_manager/appointment
 import { getGroupTexts } from '../utils/resource_manager/group_utils';
 import { AgendaAppointment } from './appointment/agenda_appointment';
 import { Appointment } from './appointment/m_appointment';
-import { getAppointmentTakesSeveralDays, sortAppointmentsByStartDate } from './data_provider/m_utils';
 import { createAgendaAppointmentLayout, createAppointmentLayout } from './m_appointment_layout';
 import { getAppointmentDateRange } from './resizing/m_core';
 import { countVisibleAppointments } from './utils/countVisibleAppointments';
+import { getAppointmentTakesSeveralDays, sortAppointmentsByStartDate } from './utils/m_utils';
 
 const COMPONENT_CLASS = 'dx-scheduler-scrollable-appointments';
 
@@ -577,9 +577,6 @@ class SchedulerAppointments extends CollectionWidget {
     this._applyResourceDataAttr(element);
     const rawAppointment = (this as any)._getItemData(element);
     const geometry = this.invoke('getAppointmentGeometry', settings);
-    const allowResize = this.option('allowResize') && (!isDefined(settings.skipResizing) || isString(settings.skipResizing));
-    const allowDrag = this.option('allowDrag');
-    const { allDay } = settings;
 
     if (settings.virtual) {
       const appointmentConfig = {
@@ -592,6 +589,9 @@ class SchedulerAppointments extends CollectionWidget {
 
       this._processVirtualAppointment(settings, element, rawAppointment, deferredColor);
     } else {
+      const allowResize = this.option('allowResize') && (!isDefined(settings.skipResizing) || isString(settings.skipResizing));
+      const allowDrag = this.option('allowDrag');
+      const { allDay } = settings;
       const { groups, groupsLeafs, resourceById } = this.option('getResourceManager')();
       const config: any = {
         data: rawAppointment,

…er/appointments/data_provider/m_utils.ts …/scheduler/appointments/utils/m_utils.tspackages/devextreme/js/__internal/scheduler/appointments/data_provider/m_utils.ts renamed to packages/devextreme/js/__internal/scheduler/appointments/utils/m_utils.ts packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_utils.ts renamed to packages/devextreme/js/__internal/scheduler/appointments/utils/m_utils.ts

@@ -31,16 +31,15 @@ import { custom as customDialog } from '@js/ui/dialog';
 import type { Appointment, AppointmentTooltipShowingEvent } from '@js/ui/scheduler';
 import errors from '@js/ui/widget/ui.errors';
 import { dateUtilsTs } from '@ts/core/utils/date';
+import { AppointmentDataProvider } from '@ts/scheduler/view_model/generate_view_model/data_provider/m_appointment_data_provider';
 
 import { createA11yStatusContainer } from './a11y_status/a11y_status_render';
 import { getA11yStatusText } from './a11y_status/a11y_status_text';
 import { AppointmentForm } from './appointment_popup/m_form';
 import { ACTION_TO_APPOINTMENT, AppointmentPopup } from './appointment_popup/m_popup';
-import { AppointmentDataProvider } from './appointments/data_provider/m_appointment_data_provider';
 import AppointmentCollection from './appointments/m_appointment_collection';
 import { SchedulerHeader } from './header/m_header';
 import type { HeaderOptions } from './header/types';
-import AppointmentLayoutManager from './m_appointments_layout_manager';
 import { CompactAppointmentsHelper } from './m_compact_appointments_helper';
 import { AppointmentTooltipInfo } from './m_data_structures';
 import { hide as hideLoading, show as showLoading } from './m_loading';
@@ -51,7 +50,6 @@ import timeZoneUtils, { type TimezoneLabel } from './m_utils_time_zone';
 import { createTimeZoneCalculator } from './r1/timezone_calculator/index';
 import {
   excludeFromRecurrence,
-  getAppointmentDataItems,
   getToday,
   isAppointmentTakesAllDay,
   isDateAndTimeView,
@@ -60,11 +58,7 @@ import {
 import { SchedulerOptionsBaseWidget } from './scheduler_options_base_widget';
 import { DesktopTooltipStrategy } from './tooltip_strategies/m_desktop_tooltip_strategy';
 import { MobileTooltipStrategy } from './tooltip_strategies/m_mobile_tooltip_strategy';
-import type {
-  AppointmentDataItem,
-  AppointmentViewModel,
-  SafeAppointment,
-} from './types';
+import type { AppointmentViewModel } from './types';
 import { AppointmentAdapter } from './utils/appointment_adapter/appointment_adapter';
 import { AppointmentDataAccessor } from './utils/data_accessor/appointment_data_accessor';
 import type { IFieldExpr } from './utils/index';
@@ -76,6 +70,7 @@ import { setAppointmentGroupValues } from './utils/resource_manager/appointment_
 import { getLeafGroupValues } from './utils/resource_manager/group_utils';
 import { createResourceEditorModel } from './utils/resource_manager/popup_utils';
 import { ResourceManager } from './utils/resource_manager/resource_manager';
+import AppointmentLayoutManager from './view_model/m_appointments_layout_manager';
 import SchedulerAgenda from './workspaces/m_agenda';
 import SchedulerTimelineDay from './workspaces/m_timeline_day';
 import SchedulerTimelineMonth from './workspaces/m_timeline_month';
@@ -156,10 +151,6 @@ const RECURRENCE_EDITING_MODE = {
 class Scheduler extends SchedulerOptionsBaseWidget {
   // NOTE: Do not initialize variables here, because `_initMarkup` function runs before constructor,
   // and initialization in constructor will erase the data
-  filteredItems!: SafeAppointment[];
-
-  preparedItems!: AppointmentDataItem[];
-
   _timeZoneCalculator!: any;
 
   postponedOperations: any;
@@ -204,7 +195,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
 
   _recurrenceDialog: any;
 
-  _layoutManager: any;
+  _layoutManager!: AppointmentLayoutManager;
 
   _appointmentForm: any;
 
@@ -558,7 +549,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
   }
 
   _isAgenda() {
-    return this.getLayoutManager().appointmentRenderingStrategyName === 'agenda';
+    return this._layoutManager.appointmentRenderingStrategyName === 'agenda';
   }
 
   _allowDragging() {
@@ -578,10 +569,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
   }
 
   _isAllDayExpanded() {
-    return this.option('showAllDayPanel') && this.appointmentDataProvider.hasAllDayAppointments(
-      this.filteredItems,
-      this.preparedItems,
-    );
+    return this.option('showAllDayPanel') && this._layoutManager.hasAllDayAppointments();
   }
 
   _filterAppointmentsByDate() {
@@ -661,14 +649,14 @@ class Scheduler extends SchedulerOptionsBaseWidget {
 
     if (
       !this._isAgenda()
-      && this.filteredItems
+      && this._layoutManager
       && workspace
       && !isAgendaWorkspaceComponent(workspace)
     ) {
       if (isForce || (!isFixedHeight || !isFixedWidth)) {
         workspace.option('allDayExpanded', this._isAllDayExpanded());
         workspace._dimensionChanged();
-        const appointments = this.getLayoutManager().createAppointmentsMap(this.filteredItems);
+        const appointments = this._layoutManager.createAppointmentsMap();
 
         this._appointments.option('items', appointments);
       }
@@ -849,22 +837,13 @@ class Scheduler extends SchedulerOptionsBaseWidget {
     this._renderContentImpl();
   }
 
-  _updatePreparedItems(items?: Appointment[]): void {
-    this.preparedItems = getAppointmentDataItems(
-      items,
-      this._dataAccessors,
-      this.getViewOption('cellDuration'),
-      this.timeZoneCalculator,
-    );
-  }
-
   _dataSourceChangedHandler(result?: Appointment[]) {
     if (this._readyToRenderAppointments) {
       this._workSpaceRecalculation.done(() => {
-        this._updatePreparedItems(result);
+        this._layoutManager.prepareItems(result);
         this._renderAppointments();
         this._updateA11yStatus();
-        this.getWorkSpace().onDataSourceChanged(this.filteredItems);
+        this.getWorkSpace().onDataSourceChanged(this._layoutManager.filteredItems);
       });
     }
   }
@@ -881,13 +860,9 @@ class Scheduler extends SchedulerOptionsBaseWidget {
     return scrolling?.mode === 'virtual';
   }
 
-  _filterAppointments() {
-    this.filteredItems = this.appointmentDataProvider.filter(this.preparedItems);
-  }
-
   _renderAppointments() {
     const workspace = this.getWorkSpace();
-    this._filterAppointments();
+    this._layoutManager.filterAppointments();
 
     workspace.option('allDayExpanded', this._isAllDayExpanded());
 
@@ -901,11 +876,9 @@ class Scheduler extends SchedulerOptionsBaseWidget {
   }
 
   _getAppointmentsToRepaint(): AppointmentViewModel[] {
-    const layoutManager = this.getLayoutManager();
-
-    const appointmentsMap = layoutManager.createAppointmentsMap(this.filteredItems);
+    const appointmentsMap = this._layoutManager.createAppointmentsMap();
 
-    return layoutManager.getRepaintedAppointments(
+    return this._layoutManager.getRepaintedAppointments(
       appointmentsMap,
       this.getAppointmentsInstance().option('items'),
     );
@@ -1183,8 +1156,6 @@ class Scheduler extends SchedulerOptionsBaseWidget {
   }
 
   _initMarkupCore() {
-    this.filteredItems = [];
-    this.preparedItems = [];
     this._readyToRenderAppointments = hasWindow();
 
     this._workSpace && this._cleanWorkspace();
@@ -1357,7 +1328,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
     const result = extend({
       resources: this.option('resources'),
       getResourceManager: () => this.resourceManager,
-      getFilteredItems: () => this.filteredItems,
+      getFilteredItems: () => this._layoutManager.filteredItems,
 
       noDataText: this.option('noDataText'),
       firstDayOfWeek: this.option('firstDayOfWeek'),
@@ -1868,7 +1839,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
   }
 
   getRenderingStrategyInstance() {
-    return this.getLayoutManager().getRenderingStrategyInstance();
+    return this._layoutManager.getRenderingStrategyInstance();
   }
 
   getActions() {
@@ -1924,7 +1895,7 @@ class Scheduler extends SchedulerOptionsBaseWidget {
     if (groups?.length) {
       const { resourceById, groupsLeafs } = this.resourceManager;
       const appointmentSettings = this._isAgenda()
-        ? this.getLayoutManager()._positionMap[appointmentIndex][0]
+        ? this._layoutManager._positionMap[appointmentIndex][0]
         : utils.dataAccessors.getAppointmentSettings(element) || {};
       const cellGroups = getLeafGroupValues(groupsLeafs, appointmentSettings.groupIndex);
 

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

@@ -17,7 +17,7 @@ import {
 } from '../index';
 
 jest.mock(
-  '../../../appointments/data_provider/m_appointment_filter',
+  '@ts/scheduler/view_model/filtering/m_appointment_filter',
   () => ({
     AppointmentFilterBaseStrategy: jest.fn(() => ({ strategy: 'base' })),
     AppointmentFilterVirtualStrategy: jest.fn(() => ({ strategy: 'virtual' })),

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

@@ -84,9 +84,6 @@ export {
   formatWeekday,
   formatWeekdayAndDay,
 } from './format_weekday';
-export {
-  getAppointmentDataItems,
-} from './get_appointment_data_items';
 
 export const agendaUtils = {
   calculateStartViewDate,

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

@@ -28,21 +28,50 @@ export interface AppointmentDataItem {
   rawAppointment: SafeAppointment;
 }
 
-// TODO: add correct types here. Agenda and other views have different types
-export interface BaseAppointmentViewModelSettings extends Record<string, unknown> {
+export interface BaseAppointmentViewModelSettings {
   allDay?: boolean;
   direction: string;
-  height: number | string;
-  width: number | string;
   groupIndex: number;
   sortedIndex: number;
 }
 
+export interface AppointmentViewModelSettings extends BaseAppointmentViewModelSettings {
+  index: number; // current level in stack
+  count: number; // max level including appointments not in stack
+  info: {
+    sourceAppointment: {
+      startDate: Date;
+      endDate: Date;
+    };
+    appointment: {
+      startDate: Date;
+      endDate: Date;
+    };
+  };
+  left: number;
+  top: number;
+  height: number;
+  width: number;
+  isCompact: boolean;
+  appointmentReduced: 'head' | 'body' | 'tail' | undefined;
+  partIndex: number;
+  partTotalCount: number;
+}
+
+export interface AgendaViewModelSettings extends BaseAppointmentViewModelSettings {
+  agendaSettings: {
+    startDate: Date;
+    endDate: Date;
+  };
+  height: number;
+  width: string;
+}
+
 export interface AppointmentViewModel {
   itemData: SafeAppointment;
   needRepaint: boolean;
   needRemove: boolean;
-  settings: BaseAppointmentViewModelSettings[];
+  settings: (AppointmentViewModelSettings & AgendaViewModelSettings)[];
 }
 
 export interface AppointmentGeometry {

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

@@ -8,7 +8,7 @@ import {
     getEmptyResourceManager,
     getLoadedResources,
     getWorkspaceResourceConfig
-} from '../../helpers/scheduler/mockResourceManager.js';
+} from '../../../../testing/helpers/scheduler/mockResourceManager.js';
 
 const {
     module,