From 600f3559cad10816c3bdfbd74ed37d84bb3b97e5 Mon Sep 17 00:00:00 2001 From: Sergio Bur Date: Thu, 29 Jan 2026 13:03:42 +0100 Subject: [PATCH 1/2] refactor: move files by entity --- .../__mock__/resource_manager.mock.ts | 2 +- .../__mock__/timezone_calculator.mock.ts | 2 +- .../__tests__/__mock__/model/scheduler.ts | 2 +- .../scheduler/__tests__/performance.test.ts | 2 +- .../appointments/appointment/m_appointment.ts | 2 +- .../appointments/appointment/m_types.ts | 4 +-- .../appointments/m_appointment_collection.ts | 8 ++--- .../scheduler/appointments/resizing/types.ts | 2 +- .../a11y/status-render.ts} | 0 .../a11y/status-text.test.ts} | 2 +- .../a11y/status-text.ts} | 2 +- .../appointment_popup.test.ts | 10 +++--- .../appointment-popup}/config.ts | 0 .../customize_form_items.test.ts | 2 +- .../customize_form_items.ts} | 0 .../appointment-popup/form.ts} | 16 +++++----- .../appointment-popup}/index.ts | 0 .../appointment-popup/legacy_form.ts} | 4 +-- .../appointment-popup/legacy_popup.ts} | 8 ++--- .../appointment-popup/popup.ts} | 10 +++--- .../appointment-popup/recurrence_form.ts} | 2 +- .../appointment-popup}/types.ts | 0 .../appointment-popup}/utils.ts | 2 +- .../header/calendar.ts} | 0 .../{ => entities}/header/constants.ts | 0 .../header/date-navigator.test.ts} | 4 +-- .../header/date-navigator.ts} | 2 +- .../m_header.ts => entities/header/header.ts} | 8 ++--- .../scheduler/{ => entities}/header/types.ts | 2 +- .../m_utils.ts => entities/header/utils.ts} | 2 +- .../header/view-switcher.integration.test.ts} | 4 +-- .../header/view-switcher.ts} | 6 ++-- .../{ => entities}/recurrence/base.test.ts | 0 .../{ => entities}/recurrence/base.ts | 0 .../recurrence/days-from-by-day-rule.test.ts} | 2 +- .../recurrence/days-from-by-day-rule.ts} | 0 .../recurrence/editor.ts} | 4 +-- .../recurrence/generate-dates.test.ts} | 2 +- .../recurrence/generate-dates.ts} | 4 +-- .../recurrence/generate_dates.pacific.test.ts | 2 +- .../{ => entities}/recurrence/types.ts | 0 .../recurrence/validate-rule.test.ts} | 2 +- .../recurrence/validate-rule.ts} | 2 +- .../resource/agenda-group-utils.ts} | 2 +- .../resource/appointment-groups-utils.ts} | 4 +-- .../resource/color-utils.ts} | 8 ++--- .../resource/group-utils.test.ts} | 2 +- .../resource/group-utils.ts} | 2 +- .../resource/loader.test.ts} | 2 +- .../resource/loader.ts} | 8 ++--- .../resource/manager.test.ts} | 2 +- .../resource/manager.ts} | 14 ++++---- .../resource/popup-utils.ts} | 2 +- .../resource}/types.ts | 3 +- .../current-time-shader-horizontal.ts} | 2 +- .../shaders/current-time-shader-vertical.ts} | 2 +- .../shaders/current-time-shader.ts} | 0 .../timezone/calculator-utils.ts} | 2 +- .../timezone}/calculator.test.ts | 2 +- .../timezone}/calculator.ts | 0 .../timezone}/index.ts | 2 +- .../timezone/timezone-list.ts} | 0 .../timezone}/types.ts | 0 .../timezone/utils.santiago.test.ts} | 2 +- .../timezone/utils.test.ts} | 6 ++-- .../timezone/utils.ts} | 8 ++--- .../tooltip/base-strategy.ts} | 0 .../tooltip/desktop-strategy.ts} | 2 +- .../tooltip/mobile-strategy.ts} | 2 +- .../js/__internal/scheduler/m_scheduler.ts | 32 +++++++++---------- .../__internal/scheduler/m_table_creator.ts | 2 +- .../scheduler/r1/utils/agenda.pacific.test.ts | 2 +- .../r1/utils/agenda.santiago.test.ts | 2 +- .../__internal/scheduler/r1/utils/agenda.ts | 2 +- .../js/__internal/scheduler/r1/utils/base.ts | 4 +-- .../scheduler_options_base_widget.ts | 2 +- .../js/__internal/scheduler/types.ts | 4 +-- .../appointment_adapter.test.ts | 2 +- .../appointment_adapter.ts | 2 +- .../appointment_data_accessor.ts | 2 +- .../utils/get_targeted_appointment.ts | 6 ++-- .../agenda_group_utils.test.ts | 2 +- .../appointment_color_utils.test.ts | 2 +- .../appointment_groups_utils.test.ts | 2 +- .../resource_manager/popup_utils.test.ts | 2 +- .../view_model/common/get_compare_options.ts | 2 +- .../is_appointment_matched_resources.test.ts | 2 +- .../is_appointment_matched_resources.ts | 4 +-- .../get_filter_options.test.ts | 2 +- .../utils/split_by_group_index.test.ts | 2 +- .../filtration/utils/split_by_group_index.ts | 2 +- .../generate_recurrence_utc_dates.ts | 2 +- ...appointment_recurrence_occurrences.test.ts | 2 +- .../get_appointment_recurrence_occurrences.ts | 2 +- .../get_date_information.ts | 2 +- .../steps/virtual_screen_filter.ts | 2 +- .../view_model/get_appointment_info.ts | 2 +- .../preparation/prepare_appointments.test.ts | 2 +- .../utils/get_minimal_appointments.test.ts | 2 +- .../utils/get_minimal_appointments.ts | 2 +- .../__internal/scheduler/view_model/types.ts | 4 +-- .../scheduler/workspaces/m_agenda.ts | 4 +-- .../scheduler/workspaces/m_timeline.ts | 4 +-- .../scheduler/workspaces/m_work_space.ts | 12 +++---- .../workspaces/m_work_space_indicator.ts | 2 +- .../m_date_header_data_generator.ts | 2 +- .../view_model/m_grouped_data_map_provider.ts | 2 +- .../workspaces/view_model/m_types.ts | 6 ++-- .../view_model/m_view_data_generator.ts | 6 ++-- .../view_model/m_view_data_generator_month.ts | 2 +- .../m_view_data_generator_timeline_month.ts | 2 +- .../view_model/m_view_data_provider.ts | 2 +- .../core/environment/time_zone_utils.js | 2 +- .../devextreme/js/ui/recurrence_editor.js | 2 +- .../appointments.tests.js | 2 +- .../common.methods.tests.js | 2 +- .../dataSource.tests.js | 2 +- .../integration.appointmentsVertical.tests.js | 2 +- .../integration.dstAppointments.tests.js | 2 +- .../legacyAppointmentPopup.tests.js | 2 +- .../recurrenceEditor.tests.js | 6 ++-- .../timezones.tests.js | 2 +- 122 files changed, 191 insertions(+), 190 deletions(-) rename packages/devextreme/js/__internal/scheduler/{a11y_status/a11y_status_render.ts => entities/a11y/status-render.ts} (100%) rename packages/devextreme/js/__internal/scheduler/{a11y_status/a11y_status_text.test.ts => entities/a11y/status-text.test.ts} (98%) rename packages/devextreme/js/__internal/scheduler/{a11y_status/a11y_status_text.ts => entities/a11y/status-text.ts} (97%) rename packages/devextreme/js/__internal/scheduler/{appointment_popup => entities/appointment-popup}/appointment_popup.test.ts (99%) rename packages/devextreme/js/__internal/scheduler/{r1/appointment_popup => entities/appointment-popup}/config.ts (100%) rename packages/devextreme/js/__internal/scheduler/{appointment_popup => entities/appointment-popup}/customize_form_items.test.ts (99%) rename packages/devextreme/js/__internal/scheduler/{appointment_popup/m_customize_form_items.ts => entities/appointment-popup/customize_form_items.ts} (100%) rename packages/devextreme/js/__internal/scheduler/{appointment_popup/m_form.ts => entities/appointment-popup/form.ts} (98%) rename packages/devextreme/js/__internal/scheduler/{r1/appointment_popup => entities/appointment-popup}/index.ts (100%) rename packages/devextreme/js/__internal/scheduler/{appointment_popup/m_legacy_form.ts => entities/appointment-popup/legacy_form.ts} (99%) rename packages/devextreme/js/__internal/scheduler/{appointment_popup/m_legacy_popup.ts => entities/appointment-popup/legacy_popup.ts} (97%) rename packages/devextreme/js/__internal/scheduler/{appointment_popup/m_popup.ts => entities/appointment-popup/popup.ts} (97%) rename packages/devextreme/js/__internal/scheduler/{appointment_popup/m_recurrence_form.ts => entities/appointment-popup/recurrence_form.ts} (99%) rename packages/devextreme/js/__internal/scheduler/{r1/appointment_popup => entities/appointment-popup}/types.ts (100%) rename packages/devextreme/js/__internal/scheduler/{appointment_popup => entities/appointment-popup}/utils.ts (97%) rename packages/devextreme/js/__internal/scheduler/{header/m_calendar.ts => entities/header/calendar.ts} (100%) rename packages/devextreme/js/__internal/scheduler/{ => entities}/header/constants.ts (100%) rename packages/devextreme/js/__internal/scheduler/{header/m_date_navigator.test.ts => entities/header/date-navigator.test.ts} (97%) rename packages/devextreme/js/__internal/scheduler/{header/m_date_navigator.ts => entities/header/date-navigator.ts} (98%) rename packages/devextreme/js/__internal/scheduler/{header/m_header.ts => entities/header/header.ts} (98%) rename packages/devextreme/js/__internal/scheduler/{ => entities}/header/types.ts (93%) rename packages/devextreme/js/__internal/scheduler/{header/m_utils.ts => entities/header/utils.ts} (99%) rename packages/devextreme/js/__internal/scheduler/{header/m_view_switcher.integration.test.ts => entities/header/view-switcher.integration.test.ts} (98%) rename packages/devextreme/js/__internal/scheduler/{header/m_view_switcher.ts => entities/header/view-switcher.ts} (95%) rename packages/devextreme/js/__internal/scheduler/{ => entities}/recurrence/base.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{ => entities}/recurrence/base.ts (100%) rename packages/devextreme/js/__internal/scheduler/{recurrence/days_from_by_day_rule.test.ts => entities/recurrence/days-from-by-day-rule.test.ts} (92%) rename packages/devextreme/js/__internal/scheduler/{recurrence/days_from_by_day_rule.ts => entities/recurrence/days-from-by-day-rule.ts} (100%) rename packages/devextreme/js/__internal/scheduler/{m_recurrence_editor.ts => entities/recurrence/editor.ts} (99%) rename packages/devextreme/js/__internal/scheduler/{recurrence/generate_dates.test.ts => entities/recurrence/generate-dates.test.ts} (99%) rename packages/devextreme/js/__internal/scheduler/{recurrence/generate_dates.ts => entities/recurrence/generate-dates.ts} (98%) rename packages/devextreme/js/__internal/scheduler/{ => entities}/recurrence/generate_dates.pacific.test.ts (92%) rename packages/devextreme/js/__internal/scheduler/{ => entities}/recurrence/types.ts (100%) rename packages/devextreme/js/__internal/scheduler/{recurrence/validate_rule.test.ts => entities/recurrence/validate-rule.test.ts} (97%) rename packages/devextreme/js/__internal/scheduler/{recurrence/validate_rule.ts => entities/recurrence/validate-rule.ts} (97%) rename packages/devextreme/js/__internal/scheduler/{utils/resource_manager/agenda_group_utils.ts => entities/resource/agenda-group-utils.ts} (94%) rename packages/devextreme/js/__internal/scheduler/{utils/resource_manager/appointment_groups_utils.ts => entities/resource/appointment-groups-utils.ts} (96%) rename packages/devextreme/js/__internal/scheduler/{utils/resource_manager/appointment_color_utils.ts => entities/resource/color-utils.ts} (92%) rename packages/devextreme/js/__internal/scheduler/{utils/resource_manager/group_utils.test.ts => entities/resource/group-utils.test.ts} (99%) rename packages/devextreme/js/__internal/scheduler/{utils/resource_manager/group_utils.ts => entities/resource/group-utils.ts} (97%) rename packages/devextreme/js/__internal/scheduler/{utils/loader/resource_loader.test.ts => entities/resource/loader.test.ts} (96%) rename packages/devextreme/js/__internal/scheduler/{utils/loader/resource_loader.ts => entities/resource/loader.ts} (86%) rename packages/devextreme/js/__internal/scheduler/{utils/resource_manager/resource_manager.test.ts => entities/resource/manager.test.ts} (97%) rename packages/devextreme/js/__internal/scheduler/{utils/resource_manager/resource_manager.ts => entities/resource/manager.ts} (87%) rename packages/devextreme/js/__internal/scheduler/{utils/resource_manager/popup_utils.ts => entities/resource/popup-utils.ts} (92%) rename packages/devextreme/js/__internal/scheduler/{utils/resource_manager => entities/resource}/types.ts (74%) rename packages/devextreme/js/__internal/scheduler/{shaders/m_current_time_shader_horizontal.ts => entities/shaders/current-time-shader-horizontal.ts} (97%) rename packages/devextreme/js/__internal/scheduler/{shaders/m_current_time_shader_vertical.ts => entities/shaders/current-time-shader-vertical.ts} (98%) rename packages/devextreme/js/__internal/scheduler/{shaders/m_current_time_shader.ts => entities/shaders/current-time-shader.ts} (100%) rename packages/devextreme/js/__internal/scheduler/{r1/timezone_calculator/utils.ts => entities/timezone/calculator-utils.ts} (91%) rename packages/devextreme/js/__internal/scheduler/{r1/timezone_calculator => entities/timezone}/calculator.test.ts (98%) rename packages/devextreme/js/__internal/scheduler/{r1/timezone_calculator => entities/timezone}/calculator.ts (100%) rename packages/devextreme/js/__internal/scheduler/{r1/timezone_calculator => entities/timezone}/index.ts (73%) rename packages/devextreme/js/__internal/scheduler/{timezones/timezone_list.ts => entities/timezone/timezone-list.ts} (100%) rename packages/devextreme/js/__internal/scheduler/{r1/timezone_calculator => entities/timezone}/types.ts (100%) rename packages/devextreme/js/__internal/scheduler/{m_utils_time_zone.santiago.test.ts => entities/timezone/utils.santiago.test.ts} (92%) rename packages/devextreme/js/__internal/scheduler/{m_utils_time_zone.test.ts => entities/timezone/utils.test.ts} (94%) rename packages/devextreme/js/__internal/scheduler/{m_utils_time_zone.ts => entities/timezone/utils.ts} (98%) rename packages/devextreme/js/__internal/scheduler/{tooltip_strategies/m_tooltip_strategy_base.ts => entities/tooltip/base-strategy.ts} (100%) rename packages/devextreme/js/__internal/scheduler/{tooltip_strategies/m_desktop_tooltip_strategy.ts => entities/tooltip/desktop-strategy.ts} (97%) rename packages/devextreme/js/__internal/scheduler/{tooltip_strategies/m_mobile_tooltip_strategy.ts => entities/tooltip/mobile-strategy.ts} (97%) diff --git a/packages/devextreme/js/__internal/scheduler/__mock__/resource_manager.mock.ts b/packages/devextreme/js/__internal/scheduler/__mock__/resource_manager.mock.ts index efa7be516244..422a7d4af3f8 100644 --- a/packages/devextreme/js/__internal/scheduler/__mock__/resource_manager.mock.ts +++ b/packages/devextreme/js/__internal/scheduler/__mock__/resource_manager.mock.ts @@ -2,7 +2,7 @@ import { DataSource } from '@ts/data/data_source/m_data_source'; import CustomStore from '@ts/data/m_custom_store'; import type { ResourceConfig } from '../utils/loader/types'; -import { ResourceManager } from '../utils/resource_manager/resource_manager'; +import { ResourceManager } from '../entities/resource/manager'; export const resourceItemsByIdMock = { 'nested.priorityId': [ diff --git a/packages/devextreme/js/__internal/scheduler/__mock__/timezone_calculator.mock.ts b/packages/devextreme/js/__internal/scheduler/__mock__/timezone_calculator.mock.ts index 8daf1dcafbe0..299dc32367a0 100644 --- a/packages/devextreme/js/__internal/scheduler/__mock__/timezone_calculator.mock.ts +++ b/packages/devextreme/js/__internal/scheduler/__mock__/timezone_calculator.mock.ts @@ -1,3 +1,3 @@ -import { createTimeZoneCalculator } from '../r1/timezone_calculator/utils'; +import { createTimeZoneCalculator } from '../entities/timezone/calculator-utils'; export const mockTimeZoneCalculator = createTimeZoneCalculator('UTC'); diff --git a/packages/devextreme/js/__internal/scheduler/__tests__/__mock__/model/scheduler.ts b/packages/devextreme/js/__internal/scheduler/__tests__/__mock__/model/scheduler.ts index c65cee6d9b4c..7bb365cf80b6 100644 --- a/packages/devextreme/js/__internal/scheduler/__tests__/__mock__/model/scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/__tests__/__mock__/model/scheduler.ts @@ -1,6 +1,6 @@ import { ToolbarModel } from '@ts/scheduler/__tests__/__mock__/model/toolbar'; -import { APPOINTMENT_POPUP_CLASS } from '../../../appointment_popup/m_popup'; +import { APPOINTMENT_POPUP_CLASS } from '../../../entities/appointment-popup/popup'; import { POPUP_DIALOG_CLASS } from '../../../m_scheduler'; import type { AppointmentModel } from './appointment'; import { createAppointmentModel } from './appointment'; diff --git a/packages/devextreme/js/__internal/scheduler/__tests__/performance.test.ts b/packages/devextreme/js/__internal/scheduler/__tests__/performance.test.ts index dc13c5c5cf5d..dfabe7c92384 100644 --- a/packages/devextreme/js/__internal/scheduler/__tests__/performance.test.ts +++ b/packages/devextreme/js/__internal/scheduler/__tests__/performance.test.ts @@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, jest, } from '@jest/globals'; -import timezoneUtils from '../m_utils_time_zone'; +import timezoneUtils from '../entities/timezone/utils'; import { createScheduler } from './__mock__/create_scheduler'; const startDate = new Date(2025, 0, 6); diff --git a/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts b/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts index d92be8078b3b..fe6568f538a9 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts @@ -24,7 +24,7 @@ import { REDUCED_APPOINTMENT_PARTS_CLASSES, } from '../../m_classes'; import type { SubscribeKey, SubscribeMethods } from '../../m_subscribes'; -import { validateRRule } from '../../recurrence/validate_rule'; +import { validateRRule } from '../../entities/recurrence/validate-rule'; import type { AppointmentDataAccessor } from '../../utils/data_accessor/appointment_data_accessor'; import type { AppointmentProperties } from './m_types'; import { diff --git a/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_types.ts b/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_types.ts index 42daf2e45316..b520a0d98f78 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_types.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_types.ts @@ -1,9 +1,9 @@ import type { Orientation } from '@js/common'; import type NotifyScheduler from '@ts/scheduler/base/m_widget_notify_scheduler'; -import type { TimeZoneCalculator } from '@ts/scheduler/r1/timezone_calculator/calculator'; +import type { TimeZoneCalculator } from '../../entities/timezone'; import type { SafeAppointment } from '@ts/scheduler/types'; import type { AppointmentDataAccessor } from '@ts/scheduler/utils/data_accessor/appointment_data_accessor'; -import type { ResourceManager } from '@ts/scheduler/utils/resource_manager/resource_manager'; +import type { ResourceManager } from '@ts/scheduler/entities/resource/manager'; export interface AppointmentProperties extends Record { data: SafeAppointment; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts index 5b0721847d19..9739a4ee6b5f 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts @@ -28,7 +28,7 @@ import { APPOINTMENT_DRAG_SOURCE_CLASS, APPOINTMENT_ITEM_CLASS, } from '../m_classes'; -import timeZoneUtils from '../m_utils_time_zone'; +import timeZoneUtils from '../entities/timezone/utils'; import type { CompactAppointmentOptions } from '../types'; import { AppointmentAdapter } from '../utils/appointment_adapter/appointment_adapter'; import type { AppointmentDataAccessor } from '../utils/data_accessor/appointment_data_accessor'; @@ -36,9 +36,9 @@ import { getTargetedAppointment, getTargetedAppointmentFromInfo, } from '../utils/get_targeted_appointment'; -import { getAppointmentGroupValues } from '../utils/resource_manager/appointment_groups_utils'; -import { getGroupTexts } from '../utils/resource_manager/group_utils'; -import type { ResourceManager } from '../utils/resource_manager/resource_manager'; +import { getAppointmentGroupValues } from '../entities/resource/appointment-groups-utils'; +import { getGroupTexts } from '../entities/resource/group-utils'; +import type { ResourceManager } from '../entities/resource/manager'; import type { AppointmentAgendaViewModel, AppointmentCollectorViewModel, diff --git a/packages/devextreme/js/__internal/scheduler/appointments/resizing/types.ts b/packages/devextreme/js/__internal/scheduler/appointments/resizing/types.ts index cc5b123d35a5..dbff171a813c 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/resizing/types.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/resizing/types.ts @@ -1,4 +1,4 @@ -import type { TimeZoneCalculator } from '../../r1/timezone_calculator'; +import type { TimeZoneCalculator } from '../../entities/timezone'; import type { ViewDataProviderType } from '../../types'; import type { AppointmentDataAccessor } from '../../utils/data_accessor/appointment_data_accessor'; import type { AppointmentItemViewModel } from '../../view_model/types'; diff --git a/packages/devextreme/js/__internal/scheduler/a11y_status/a11y_status_render.ts b/packages/devextreme/js/__internal/scheduler/entities/a11y/status-render.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/a11y_status/a11y_status_render.ts rename to packages/devextreme/js/__internal/scheduler/entities/a11y/status-render.ts diff --git a/packages/devextreme/js/__internal/scheduler/a11y_status/a11y_status_text.test.ts b/packages/devextreme/js/__internal/scheduler/entities/a11y/status-text.test.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/a11y_status/a11y_status_text.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/a11y/status-text.test.ts index d0b936dc5106..7e5ffed3f0e2 100644 --- a/packages/devextreme/js/__internal/scheduler/a11y_status/a11y_status_text.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/a11y/status-text.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from '@jest/globals'; -import { getA11yStatusText } from './a11y_status_text'; +import { getA11yStatusText } from './status-text'; describe('getA11yStatusText', () => { it('should return text custom view', () => { diff --git a/packages/devextreme/js/__internal/scheduler/a11y_status/a11y_status_text.ts b/packages/devextreme/js/__internal/scheduler/entities/a11y/status-text.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/a11y_status/a11y_status_text.ts rename to packages/devextreme/js/__internal/scheduler/entities/a11y/status-text.ts index a6a2e090ed18..6b68aa2464f9 100644 --- a/packages/devextreme/js/__internal/scheduler/a11y_status/a11y_status_text.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/a11y/status-text.ts @@ -2,7 +2,7 @@ import dateLocalization from '@js/common/core/localization/date'; import messageLocalization from '@js/common/core/localization/message'; import type { ViewType } from '@js/ui/scheduler'; -import type { NormalizedView } from '../utils/options/types'; +import type { NormalizedView } from '../../utils/options/types'; const KEYS = { dateRange: 'dxScheduler-dateRange', diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/appointment_popup.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/appointment_popup.test.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/appointment_popup/appointment_popup.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/appointment_popup.test.ts index 4399ec0365d1..af8ae7b94bba 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/appointment_popup.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/appointment_popup.test.ts @@ -8,9 +8,9 @@ import type { ToolbarItem } from '@js/ui/popup'; import { toMilliseconds } from '@ts/utils/toMilliseconds'; import fx from '../../../common/core/animation/fx'; -import { createScheduler } from '../__tests__/__mock__/create_scheduler'; -import { setupSchedulerTestEnvironment } from '../__tests__/__mock__/m_mock_scheduler'; -import { DEFAULT_SCHEDULER_OPTIONS } from '../utils/options/constants'; +import { createScheduler } from '../../__tests__/__mock__/create_scheduler'; +import { setupSchedulerTestEnvironment } from '../../__tests__/__mock__/m_mock_scheduler'; +import { DEFAULT_SCHEDULER_OPTIONS } from '../../utils/options/constants'; const CLASSES = { icon: 'dx-scheduler-form-icon', @@ -1880,12 +1880,12 @@ describe('Appointment Form', () => { expect(mainFormIcons.length).toBe(4); expect(recurrenceFormIcons.length).toBe(3); - const mainIconsCorrect = Array.from(mainFormIcons).every((icon) => { + const mainIconsCorrect = Array.from(mainFormIcons).every((icon: Element) => { const isVisible = !icon.classList.contains(CLASSES.hidden); return isVisible === visibleMain; }); - const recurrenceIconsCorrect = Array.from(recurrenceFormIcons).every((icon) => { + const recurrenceIconsCorrect = Array.from(recurrenceFormIcons).every((icon: Element) => { const isVisible = !icon.classList.contains(CLASSES.hidden); return isVisible === visibleRecurrence; }); diff --git a/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/config.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/config.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/r1/appointment_popup/config.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/config.ts diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/customize_form_items.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/customize_form_items.test.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/appointment_popup/customize_form_items.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/customize_form_items.test.ts index f5f0e065f352..37bf97a0d2ce 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/customize_form_items.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/customize_form_items.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, } from '@jest/globals'; -import { type ConfigItem, customizeFormItems, type FormItem } from './m_customize_form_items'; +import { type ConfigItem, customizeFormItems, type FormItem } from './customize_form_items'; const subjectGroup: FormItem = { name: 'subjectGroup', diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_customize_form_items.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/customize_form_items.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/appointment_popup/m_customize_form_items.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/customize_form_items.ts diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/form.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/form.ts index 816df5c92e08..bccd151a5300 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/form.ts @@ -19,14 +19,14 @@ import { current, isFluent } from '@js/ui/themes'; import { dateSerialization } from '@ts/core/utils/m_date_serialization'; import type Popup from '@ts/ui/popup/m_popup'; -import timeZoneUtils from '../m_utils_time_zone'; -import type { SafeAppointment } from '../types'; -import type { ResourceLoader } from '../utils/loader/resource_loader'; -import { DEFAULT_ICONS_SHOW_MODE } from '../utils/options/constants'; -import { getAppointmentGroupIndex, getRawAppointmentGroupValues, getSafeGroupValues } from '../utils/resource_manager/appointment_groups_utils'; -import type { ResourceManager } from '../utils/resource_manager/resource_manager'; -import { customizeFormItems } from './m_customize_form_items'; -import { RecurrenceForm } from './m_recurrence_form'; +import timeZoneUtils from '../timezone/utils'; +import type { SafeAppointment } from '../../types'; +import type { ResourceLoader } from '../resource/loader'; +import { DEFAULT_ICONS_SHOW_MODE } from '../../utils/options/constants'; +import { getAppointmentGroupIndex, getRawAppointmentGroupValues, getSafeGroupValues } from '../resource/appointment-groups-utils'; +import type { ResourceManager } from '../resource/manager'; +import { customizeFormItems } from './customize_form_items'; +import { RecurrenceForm } from './recurrence_form'; import { createFormIconTemplate, getStartDateCommonConfig, RecurrenceRule } from './utils'; const CLASSES = { diff --git a/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/index.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/index.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/r1/appointment_popup/index.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/index.ts diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_legacy_form.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/legacy_form.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/appointment_popup/m_legacy_form.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/legacy_form.ts index ab4d026edc26..432ea53806cb 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_legacy_form.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/legacy_form.ts @@ -1,4 +1,4 @@ -import '../m_recurrence_editor'; +import '../recurrence/editor'; import '@js/ui/text_area'; import '@js/ui/tag_box'; import '@js/ui/switch'; @@ -14,7 +14,7 @@ import { extend } from '@js/core/utils/extend'; import Form from '@js/ui/form'; import { current, isFluent } from '@js/ui/themes'; -import timeZoneUtils from '../m_utils_time_zone'; +import timeZoneUtils from '../timezone/utils'; const SCREEN_SIZE_OF_SINGLE_COLUMN = 600; diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_legacy_popup.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/legacy_popup.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/appointment_popup/m_legacy_popup.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/legacy_popup.ts index 60ead1a03da7..257f489515a2 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_legacy_popup.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/legacy_popup.ts @@ -9,11 +9,11 @@ import { getMaxWidth, getPopupToolbarItems, isPopupFullScreenNeeded, -} from '@ts/scheduler/r1/appointment_popup/index'; +} from './config'; -import { hide as hideLoading, show as showLoading } from '../m_loading'; -import { AppointmentAdapter } from '../utils/appointment_adapter/appointment_adapter'; -import { getAppointmentGroupValues, getRawAppointmentGroupValues } from '../utils/resource_manager/appointment_groups_utils'; +import { hide as hideLoading, show as showLoading } from '../../m_loading'; +import { AppointmentAdapter } from '../../utils/appointment_adapter/appointment_adapter'; +import { getAppointmentGroupValues, getRawAppointmentGroupValues } from '../resource/appointment-groups-utils'; const toMs = dateUtils.dateToMilliseconds; diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/popup.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/popup.ts index c942018fc3af..104db86e8f97 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/popup.ts @@ -12,11 +12,11 @@ import type dxPopup from '@js/ui/popup'; import Popup from '@js/ui/popup/ui.popup'; import { current, isFluent } from '@js/ui/themes'; -import { hide as hideLoading, show as showLoading } from '../m_loading'; -import type { SafeAppointment } from '../types'; -import { AppointmentAdapter } from '../utils/appointment_adapter/appointment_adapter'; -import { getAppointmentGroupValues, getRawAppointmentGroupValues } from '../utils/resource_manager/appointment_groups_utils'; -import type { AppointmentForm } from './m_form'; +import { hide as hideLoading, show as showLoading } from '../../m_loading'; +import type { SafeAppointment } from '../../types'; +import { AppointmentAdapter } from '../../utils/appointment_adapter/appointment_adapter'; +import { getAppointmentGroupValues, getRawAppointmentGroupValues } from '../resource/appointment-groups-utils'; +import type { AppointmentForm } from './form'; export const APPOINTMENT_POPUP_CLASS = 'dx-scheduler-appointment-popup'; diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_recurrence_form.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/recurrence_form.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/appointment_popup/m_recurrence_form.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/recurrence_form.ts index 8429a6552c4f..f8101856d09c 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_recurrence_form.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/recurrence_form.ts @@ -12,7 +12,7 @@ import type { Properties as RadioGroupProperties } from '@js/ui/radio_group'; import type { Properties as SelectBoxProperties } from '@js/ui/select_box'; import { capitalize } from '@ts/core/utils/capitalize'; -import type Scheduler from '../m_scheduler'; +import type Scheduler from '../../m_scheduler'; import { createFormIconTemplate, getStartDateCommonConfig, RecurrenceRule } from './utils'; const CLASSES = { diff --git a/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/types.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/types.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/r1/appointment_popup/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/utils.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/utils.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/appointment_popup/utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-popup/utils.ts index 1fc0c27db421..dff7caacde66 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/utils.ts @@ -7,7 +7,7 @@ import type { Properties as DateBoxProperties } from '@js/ui/date_box'; import type { SimpleItem } from '@js/ui/form'; import { getRecurrenceString, parseRecurrenceRule } from '../recurrence/base'; -import { daysFromByDayRule } from '../recurrence/days_from_by_day_rule'; +import { daysFromByDayRule } from '../recurrence/days-from-by-day-rule'; import type { Rule } from '../recurrence/types'; export const createFormIconTemplate = (iconName: string): () => dxElementWrapper => { diff --git a/packages/devextreme/js/__internal/scheduler/header/m_calendar.ts b/packages/devextreme/js/__internal/scheduler/entities/header/calendar.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/header/m_calendar.ts rename to packages/devextreme/js/__internal/scheduler/entities/header/calendar.ts diff --git a/packages/devextreme/js/__internal/scheduler/header/constants.ts b/packages/devextreme/js/__internal/scheduler/entities/header/constants.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/header/constants.ts rename to packages/devextreme/js/__internal/scheduler/entities/header/constants.ts diff --git a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.test.ts b/packages/devextreme/js/__internal/scheduler/entities/header/date-navigator.test.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/header/m_date_navigator.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/header/date-navigator.test.ts index b966e2ed7b57..d803fff403da 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/date-navigator.test.ts @@ -5,8 +5,8 @@ import type { ToolbarItem } from '@js/ui/scheduler'; import { CLASS, DEFAULT_ITEMS, getDateNavigator, ITEMS_NAME, -} from './m_date_navigator'; -import type { SchedulerHeader } from './m_header'; +} from './date-navigator'; +import type { SchedulerHeader } from './header'; describe('getDateNavigator', () => { it('should return default options in case of item is empty', () => { diff --git a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts b/packages/devextreme/js/__internal/scheduler/entities/header/date-navigator.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts rename to packages/devextreme/js/__internal/scheduler/entities/header/date-navigator.ts index d9d73de126f2..695face02b0c 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/date-navigator.ts @@ -6,7 +6,7 @@ import { current, isMaterialBased } from '@js/ui/themes'; import type { Item as ToolbarItem } from '@js/ui/toolbar'; import { dateUtilsTs } from '@ts/core/utils/date'; import { extend } from '@ts/core/utils/m_extend'; -import type { SchedulerHeader } from '@ts/scheduler/header/m_header'; +import type { SchedulerHeader } from './header'; import { Direction } from './constants'; diff --git a/packages/devextreme/js/__internal/scheduler/header/m_header.ts b/packages/devextreme/js/__internal/scheduler/entities/header/header.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/header/m_header.ts rename to packages/devextreme/js/__internal/scheduler/entities/header/header.ts index adac334eadf0..dfe4dea833f5 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_header.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/header.ts @@ -15,21 +15,21 @@ import Widget from '@ts/core/widget/widget'; import type { NormalizedView, SafeSchedulerOptions } from '@ts/scheduler/utils/options/types'; import type { Direction } from './constants'; -import SchedulerCalendar from './m_calendar'; +import SchedulerCalendar from './calendar'; import { getDateNavigator, getTodayButtonOptions, -} from './m_date_navigator'; +} from './date-navigator'; import { getCaption, getNextIntervalDate, getStep, nextWeek, -} from './m_utils'; +} from './utils'; import { getDropDownViewSwitcher, getTabViewSwitcher, -} from './m_view_switcher'; +} from './view-switcher'; import type { EventMapHandler, HeaderOptions, IntervalOptions, diff --git a/packages/devextreme/js/__internal/scheduler/header/types.ts b/packages/devextreme/js/__internal/scheduler/entities/header/types.ts similarity index 93% rename from packages/devextreme/js/__internal/scheduler/header/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/header/types.ts index 9fe0089ae77e..7dd3673dfca8 100644 --- a/packages/devextreme/js/__internal/scheduler/header/types.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/types.ts @@ -1,7 +1,7 @@ import type { FirstDayOfWeek } from '@js/common'; import type { ValueChangedEvent } from '@js/ui/calendar'; -import type { NormalizedView, SafeSchedulerOptions } from '../utils/options/types'; +import type { NormalizedView, SafeSchedulerOptions } from '../../utils/options/types'; export interface HeaderOptions { currentView: NormalizedView; diff --git a/packages/devextreme/js/__internal/scheduler/header/m_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/header/utils.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/header/m_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/header/utils.ts index f5d981394439..9e361c98b46a 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/utils.ts @@ -5,7 +5,7 @@ import messageLocalization from '@js/localization/message'; import type { DateNavigatorTextInfo, Properties } from '@js/ui/scheduler'; import type { BaseFormat } from '@ts/core/localization/date'; import { camelize } from '@ts/core/utils/m_inflector'; -import type { IntervalOptions, Step } from '@ts/scheduler/header/types'; +import type { IntervalOptions, Step } from './types'; import type { NormalizedView, RawViewType, ViewType } from '@ts/scheduler/utils/options/types'; import type { Direction } from './constants'; diff --git a/packages/devextreme/js/__internal/scheduler/header/m_view_switcher.integration.test.ts b/packages/devextreme/js/__internal/scheduler/entities/header/view-switcher.integration.test.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/header/m_view_switcher.integration.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/header/view-switcher.integration.test.ts index 91309438ba91..a3801699115e 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_view_switcher.integration.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/view-switcher.integration.test.ts @@ -7,8 +7,8 @@ import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { loadMessages, locale } from '@js/localization'; -import type { Properties as SchedulerProperties } from '../../../ui/scheduler'; -import Scheduler from '../../../ui/scheduler'; +import type { Properties as SchedulerProperties } from '@js/ui/scheduler'; +import Scheduler from '@js/ui/scheduler'; const SCHEDULER_CONTAINER_ID = 'schedulerContainer'; diff --git a/packages/devextreme/js/__internal/scheduler/header/m_view_switcher.ts b/packages/devextreme/js/__internal/scheduler/entities/header/view-switcher.ts similarity index 95% rename from packages/devextreme/js/__internal/scheduler/header/m_view_switcher.ts rename to packages/devextreme/js/__internal/scheduler/entities/header/view-switcher.ts index 8b98db201586..ad672aace4a4 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_view_switcher.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/view-switcher.ts @@ -1,12 +1,12 @@ import { current, isFluent } from '@js/ui/themes'; import type { Item as ToolbarItem } from '@js/ui/toolbar'; -import type { NormalizedView } from '../utils/options/types'; -import type { SchedulerHeader } from './m_header'; +import type { NormalizedView } from '../../utils/options/types'; +import type { SchedulerHeader } from './header'; import { formatViews, getViewName, -} from './m_utils'; +} from './utils'; const ClASS = { container: 'dx-scheduler-view-switcher', diff --git a/packages/devextreme/js/__internal/scheduler/recurrence/base.test.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/base.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/recurrence/base.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/base.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/recurrence/base.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/base.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/recurrence/base.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/base.ts diff --git a/packages/devextreme/js/__internal/scheduler/recurrence/days_from_by_day_rule.test.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/days-from-by-day-rule.test.ts similarity index 92% rename from packages/devextreme/js/__internal/scheduler/recurrence/days_from_by_day_rule.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/days-from-by-day-rule.test.ts index 280a7c85008d..a789dfb374c7 100644 --- a/packages/devextreme/js/__internal/scheduler/recurrence/days_from_by_day_rule.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/recurrence/days-from-by-day-rule.test.ts @@ -3,7 +3,7 @@ import { } from '@jest/globals'; import { parseRecurrenceRule } from './base'; -import { daysFromByDayRule } from './days_from_by_day_rule'; +import { daysFromByDayRule } from './days-from-by-day-rule'; describe('daysFromByDayRule', () => { it('get days of the week by byDay rule', () => { diff --git a/packages/devextreme/js/__internal/scheduler/recurrence/days_from_by_day_rule.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/days-from-by-day-rule.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/recurrence/days_from_by_day_rule.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/days-from-by-day-rule.ts diff --git a/packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/editor.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/editor.ts index 63ba04cc0d99..f7589cbced3f 100644 --- a/packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/recurrence/editor.ts @@ -13,8 +13,8 @@ import Editor from '@js/ui/editor/editor'; import Form from '@js/ui/form'; import { current, isFluent } from '@js/ui/themes'; -import { getRecurrenceString, parseRecurrenceRule } from './recurrence/base'; -import { daysFromByDayRule } from './recurrence/days_from_by_day_rule'; +import { getRecurrenceString, parseRecurrenceRule } from './base'; +import { daysFromByDayRule } from './days-from-by-day-rule'; const RECURRENCE_EDITOR = 'dx-recurrence-editor'; const LABEL_POSTFIX = '-label'; diff --git a/packages/devextreme/js/__internal/scheduler/recurrence/generate_dates.test.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/generate-dates.test.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/recurrence/generate_dates.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/generate-dates.test.ts index f42254c487fb..d3a964ae13d1 100644 --- a/packages/devextreme/js/__internal/scheduler/recurrence/generate_dates.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/recurrence/generate-dates.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, } from '@jest/globals'; -import { generateDates } from './generate_dates'; +import { generateDates } from './generate-dates'; const days = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA']; diff --git a/packages/devextreme/js/__internal/scheduler/recurrence/generate_dates.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/generate-dates.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/recurrence/generate_dates.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/generate-dates.ts index 6027f03aa3ba..9a87357026d1 100644 --- a/packages/devextreme/js/__internal/scheduler/recurrence/generate_dates.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/recurrence/generate-dates.ts @@ -1,10 +1,10 @@ import { dateUtilsTs } from '@ts/core/utils/date'; import { RRule, RRuleSet } from 'rrule'; -import timeZoneUtils from '../m_utils_time_zone'; +import timeZoneUtils from '../timezone/utils'; import { getDateByAsciiString, parseRecurrenceRule } from './base'; import type { ProcessorOptions, RRuleParams } from './types'; -import { validateRRuleObject } from './validate_rule'; +import { validateRRuleObject } from './validate-rule'; const { addOffsets } = dateUtilsTs; diff --git a/packages/devextreme/js/__internal/scheduler/recurrence/generate_dates.pacific.test.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/generate_dates.pacific.test.ts similarity index 92% rename from packages/devextreme/js/__internal/scheduler/recurrence/generate_dates.pacific.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/generate_dates.pacific.test.ts index 4710c291748c..afd3c56a2b9b 100644 --- a/packages/devextreme/js/__internal/scheduler/recurrence/generate_dates.pacific.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/recurrence/generate_dates.pacific.test.ts @@ -7,7 +7,7 @@ import { describe, expect, it, } from '@jest/globals'; -import { generateDates } from './generate_dates'; +import { generateDates } from './generate-dates'; describe('generateDates', () => { it('Recurrence rule with UNTIL date in UTC format should apply correctly to local dates', () => { diff --git a/packages/devextreme/js/__internal/scheduler/recurrence/types.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/types.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/recurrence/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/recurrence/validate_rule.test.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/validate-rule.test.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/recurrence/validate_rule.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/validate-rule.test.ts index 21fb7d801289..4444d9b23548 100644 --- a/packages/devextreme/js/__internal/scheduler/recurrence/validate_rule.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/recurrence/validate-rule.test.ts @@ -3,7 +3,7 @@ import { } from '@jest/globals'; import { parseRecurrenceRule } from './base'; -import { validateRRule, validateRRuleObject } from './validate_rule'; +import { validateRRule, validateRRuleObject } from './validate-rule'; describe('validateRRule', () => { it('should return true for valid rule', () => { diff --git a/packages/devextreme/js/__internal/scheduler/recurrence/validate_rule.ts b/packages/devextreme/js/__internal/scheduler/entities/recurrence/validate-rule.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/recurrence/validate_rule.ts rename to packages/devextreme/js/__internal/scheduler/entities/recurrence/validate-rule.ts index de5e450c96c1..c06357744568 100644 --- a/packages/devextreme/js/__internal/scheduler/recurrence/validate_rule.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/recurrence/validate-rule.ts @@ -4,7 +4,7 @@ import errors from '@js/core/errors'; import { each } from '@ts/core/utils/m_iterator'; import { parseRecurrenceRule } from './base'; -import { daysFromByDayRule } from './days_from_by_day_rule'; +import { daysFromByDayRule } from './days-from-by-day-rule'; import type { Rule } from './types'; const loggedWarnings: string[] = []; diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/agenda_group_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/agenda-group-utils.ts similarity index 94% rename from packages/devextreme/js/__internal/scheduler/utils/resource_manager/agenda_group_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/agenda-group-utils.ts index 617eed4f384f..0aba8552ab6b 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/agenda_group_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/agenda-group-utils.ts @@ -1,5 +1,5 @@ import type { ListEntity } from '../../view_model/types'; -import type { ResourceLoader } from '../loader/resource_loader'; +import type { ResourceLoader } from './loader'; import type { GroupNode } from './types'; const hasGroupAppointments = ( diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_groups_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/appointment-groups-utils.ts similarity index 96% rename from packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_groups_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/appointment-groups-utils.ts index 4d77398d1663..d540c94c6106 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_groups_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/appointment-groups-utils.ts @@ -2,8 +2,8 @@ import { wrapToArray } from '@ts/core/utils/m_array'; import { equalByValue } from '@ts/core/utils/m_common'; import type { SafeAppointment } from '@ts/scheduler/types'; -import type { ResourceLoader } from '../loader/resource_loader'; -import type { ResourceData, ResourceId } from '../loader/types'; +import type { ResourceLoader } from './loader'; +import type { ResourceData, ResourceId } from './types'; import type { GroupLeaf, GroupValues, RawGroupValues } from './types'; export interface AppointmentResource { diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_color_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/color-utils.ts similarity index 92% rename from packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_color_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/color-utils.ts index 73486f7d6224..016cba5a417f 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_color_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/color-utils.ts @@ -1,9 +1,9 @@ import type { SafeAppointment } from '@ts/scheduler/types'; -import type { ResourceLoader } from '../loader/resource_loader'; -import type { ResourceId } from '../loader/types'; -import { getAppointmentGroupValues, getResourceItemById } from './appointment_groups_utils'; -import { getLeafGroupValues } from './group_utils'; +import type { ResourceLoader } from './loader'; +import type { ResourceId } from './types'; +import { getAppointmentGroupValues, getResourceItemById } from './appointment-groups-utils'; +import { getLeafGroupValues } from './group-utils'; import type { GroupLeaf } from './types'; /* diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/group_utils.test.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/group-utils.test.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/utils/resource_manager/group_utils.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/group-utils.test.ts index ed85fdb1379f..14784d4e533b 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/group_utils.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/group-utils.test.ts @@ -5,7 +5,7 @@ import { getResourceManagerMock } from '@ts/scheduler/__mock__/resource_manager. import { getAllGroupValues, getGroupTexts, getLeafGroupValues, getResourcesByGroupIndex, groupResources, -} from './group_utils'; +} from './group-utils'; const groupsLeafs: any = [ { groupIndex: 0, grouped: { assigneeId: 1, roomId: 3 } }, diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/group_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/group-utils.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/utils/resource_manager/group_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/group-utils.ts index 097c7fd2cf3a..fc50de0c28ac 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/group_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/group-utils.ts @@ -1,4 +1,4 @@ -import type { ResourceLoader } from '../loader/resource_loader'; +import type { ResourceLoader } from './loader'; import type { GroupLeaf, GroupNode } from './types'; export const groupResources = (resourceById: Record, groups: string[]): { diff --git a/packages/devextreme/js/__internal/scheduler/utils/loader/resource_loader.test.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/loader.test.ts similarity index 96% rename from packages/devextreme/js/__internal/scheduler/utils/loader/resource_loader.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/loader.test.ts index ab5215c4919e..87963ed79327 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/loader/resource_loader.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/loader.test.ts @@ -4,7 +4,7 @@ import { import { DataSource } from '@ts/data/data_source/m_data_source'; import CustomStore from '@ts/data/m_custom_store'; -import { ResourceLoader } from './resource_loader'; +import { ResourceLoader } from './loader'; const assigneeData = [ { guid: 1, name: 'Samantha Bright', mainColor: '#727bd2' }, diff --git a/packages/devextreme/js/__internal/scheduler/utils/loader/resource_loader.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/loader.ts similarity index 86% rename from packages/devextreme/js/__internal/scheduler/utils/loader/resource_loader.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/loader.ts index 910f50415fb4..1f0422264d64 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/loader/resource_loader.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/loader.ts @@ -2,14 +2,14 @@ import { getAppointmentResourceAccessor, getResourceIndex, type ResourceIdAccessor, -} from '../data_accessor/appointment_resource_data_accessor'; -import { ResourceDataAccessor } from '../data_accessor/resource_data_accessor'; -import { Loader } from './loader'; +} from '../../utils/data_accessor/appointment_resource_data_accessor'; +import { ResourceDataAccessor } from '../../utils/data_accessor/resource_data_accessor'; +import { Loader } from '../../utils/loader/loader'; import type { RawResourceData, ResourceConfig, ResourceData, -} from './types'; +} from '../../utils/loader/types'; export class ResourceLoader extends Loader { public idsGetter: ResourceIdAccessor['idsGetter']; diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/resource_manager.test.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/manager.test.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/utils/resource_manager/resource_manager.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/manager.test.ts index 69bcb3676602..08cc17f33d93 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/resource_manager.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/manager.test.ts @@ -4,7 +4,7 @@ import { import { DataSource } from '@ts/data/data_source/m_data_source'; import CustomStore from '@ts/data/m_custom_store'; -import { ResourceManager } from './resource_manager'; +import { ResourceManager } from './manager'; const counts: any = {}; const getResourceConfig = (index: string) => { diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/resource_manager.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/manager.ts similarity index 87% rename from packages/devextreme/js/__internal/scheduler/utils/resource_manager/resource_manager.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/manager.ts index 98a66f5c01f7..319167360a3c 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/resource_manager.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/manager.ts @@ -1,17 +1,17 @@ import type { SafeAppointment } from '@ts/scheduler/types'; -import { getResourceIndex } from '../data_accessor/appointment_resource_data_accessor'; -import { ResourceLoader } from '../loader/resource_loader'; +import { getResourceIndex } from '../../utils/data_accessor/appointment_resource_data_accessor'; +import { ResourceLoader } from './loader'; import type { ResourceConfig, -} from '../loader/types'; -import { getAppointmentColor } from './appointment_color_utils'; -import type { AppointmentResource } from './appointment_groups_utils'; +} from '../../utils/loader/types'; +import { getAppointmentColor } from './color-utils'; +import type { AppointmentResource } from './appointment-groups-utils'; import { getAppointmentGroupValues, getAppointmentResources, -} from './appointment_groups_utils'; -import { groupResources } from './group_utils'; +} from './appointment-groups-utils'; +import { groupResources } from './group-utils'; import type { GroupLeaf, GroupNode } from './types'; export class ResourceManager { diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/popup_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/popup-utils.ts similarity index 92% rename from packages/devextreme/js/__internal/scheduler/utils/resource_manager/popup_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/popup-utils.ts index c044bc8a4ac4..e75b1e0d471c 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/popup_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/popup-utils.ts @@ -1,7 +1,7 @@ import type { SimpleItem } from '@js/ui/form'; import { current, isFluent } from '@js/ui/themes'; -import type { ResourceLoader } from '../loader/resource_loader'; +import type { ResourceLoader } from './loader'; export const createResourceEditorModel = ( resourceById: Record, diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/types.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/types.ts similarity index 74% rename from packages/devextreme/js/__internal/scheduler/utils/resource_manager/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/resource/types.ts index 3d95dec0e4b5..95fb0adf46c9 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/types.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/types.ts @@ -1,5 +1,6 @@ -import type { ResourceId } from '../loader/types'; +import type { ResourceId, ResourceData } from '../../utils/loader/types'; +export type { ResourceId, ResourceData }; export type GroupValues = Record; export type RawGroupValues = Record; diff --git a/packages/devextreme/js/__internal/scheduler/shaders/m_current_time_shader_horizontal.ts b/packages/devextreme/js/__internal/scheduler/entities/shaders/current-time-shader-horizontal.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/shaders/m_current_time_shader_horizontal.ts rename to packages/devextreme/js/__internal/scheduler/entities/shaders/current-time-shader-horizontal.ts index 2e99b476e147..9e226184175f 100644 --- a/packages/devextreme/js/__internal/scheduler/shaders/m_current_time_shader_horizontal.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/shaders/current-time-shader-horizontal.ts @@ -1,7 +1,7 @@ import { getBoundingRect } from '@js/core/utils/position'; import { setWidth } from '@js/core/utils/size'; -import CurrentTimeShader from './m_current_time_shader'; +import CurrentTimeShader from './current-time-shader'; class HorizontalCurrentTimeShader extends CurrentTimeShader { renderShader() { diff --git a/packages/devextreme/js/__internal/scheduler/shaders/m_current_time_shader_vertical.ts b/packages/devextreme/js/__internal/scheduler/entities/shaders/current-time-shader-vertical.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/shaders/m_current_time_shader_vertical.ts rename to packages/devextreme/js/__internal/scheduler/entities/shaders/current-time-shader-vertical.ts index cca4af93001b..ba37703618b1 100644 --- a/packages/devextreme/js/__internal/scheduler/shaders/m_current_time_shader_vertical.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/shaders/current-time-shader-vertical.ts @@ -1,7 +1,7 @@ import $ from '@js/core/renderer'; import { setHeight, setWidth } from '@js/core/utils/size'; -import CurrentTimeShader from './m_current_time_shader'; +import CurrentTimeShader from './current-time-shader'; const DATE_TIME_SHADER_ALL_DAY_CLASS = 'dx-scheduler-date-time-shader-all-day'; const DATE_TIME_SHADER_TOP_CLASS = 'dx-scheduler-date-time-shader-top'; diff --git a/packages/devextreme/js/__internal/scheduler/shaders/m_current_time_shader.ts b/packages/devextreme/js/__internal/scheduler/entities/shaders/current-time-shader.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/shaders/m_current_time_shader.ts rename to packages/devextreme/js/__internal/scheduler/entities/shaders/current-time-shader.ts diff --git a/packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/utils.ts b/packages/devextreme/js/__internal/scheduler/entities/timezone/calculator-utils.ts similarity index 91% rename from packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/timezone/calculator-utils.ts index 9b5c4c591a1c..fe3db11039e9 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/timezone/calculator-utils.ts @@ -1,4 +1,4 @@ -import timeZoneUtils from '../../m_utils_time_zone'; +import timeZoneUtils from './utils'; import { TimeZoneCalculator } from './calculator'; export const createTimeZoneCalculator = ( diff --git a/packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/calculator.test.ts b/packages/devextreme/js/__internal/scheduler/entities/timezone/calculator.test.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/calculator.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/timezone/calculator.test.ts index 03c34e8a7dd8..d3c80faf0bca 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/calculator.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/timezone/calculator.test.ts @@ -4,7 +4,7 @@ import { import { TimeZoneCalculator } from './calculator'; import type { TimeZoneCalculatorOptions } from './types'; -import { createTimeZoneCalculator } from './utils'; +import { createTimeZoneCalculator } from './calculator-utils'; describe('TimeZoneCalculator', () => { describe('General tests', () => { diff --git a/packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/calculator.ts b/packages/devextreme/js/__internal/scheduler/entities/timezone/calculator.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/calculator.ts rename to packages/devextreme/js/__internal/scheduler/entities/timezone/calculator.ts diff --git a/packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/index.ts b/packages/devextreme/js/__internal/scheduler/entities/timezone/index.ts similarity index 73% rename from packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/index.ts rename to packages/devextreme/js/__internal/scheduler/entities/timezone/index.ts index 4a0e767074bb..8287f9415cfa 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/index.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/timezone/index.ts @@ -5,4 +5,4 @@ export type { TimeZoneCalculatorOptions, TimeZoneOffsetsType, } from './types'; -export { createTimeZoneCalculator } from './utils'; +export { createTimeZoneCalculator } from './calculator-utils'; diff --git a/packages/devextreme/js/__internal/scheduler/timezones/timezone_list.ts b/packages/devextreme/js/__internal/scheduler/entities/timezone/timezone-list.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/timezones/timezone_list.ts rename to packages/devextreme/js/__internal/scheduler/entities/timezone/timezone-list.ts diff --git a/packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/types.ts b/packages/devextreme/js/__internal/scheduler/entities/timezone/types.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/r1/timezone_calculator/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/timezone/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/m_utils_time_zone.santiago.test.ts b/packages/devextreme/js/__internal/scheduler/entities/timezone/utils.santiago.test.ts similarity index 92% rename from packages/devextreme/js/__internal/scheduler/m_utils_time_zone.santiago.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/timezone/utils.santiago.test.ts index 8563d2bab873..8cdfd9213f32 100644 --- a/packages/devextreme/js/__internal/scheduler/m_utils_time_zone.santiago.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/timezone/utils.santiago.test.ts @@ -6,7 +6,7 @@ import { describe, expect, it, } from '@jest/globals'; -import timeZoneUtils from './m_utils_time_zone'; +import timeZoneUtils from './utils'; describe('isLocalTimeMidnightDST', () => { it('should return false for summer DST', () => { diff --git a/packages/devextreme/js/__internal/scheduler/m_utils_time_zone.test.ts b/packages/devextreme/js/__internal/scheduler/entities/timezone/utils.test.ts similarity index 94% rename from packages/devextreme/js/__internal/scheduler/m_utils_time_zone.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/timezone/utils.test.ts index bacd710c2525..a0bfbb0ae202 100644 --- a/packages/devextreme/js/__internal/scheduler/m_utils_time_zone.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/timezone/utils.test.ts @@ -3,9 +3,9 @@ import { } from '@jest/globals'; import { macroTaskArray } from '@ts/scheduler/utils/index'; -import { globalCache } from './global_cache'; -import timeZoneUtils from './m_utils_time_zone'; -import timeZoneList from './timezones/timezone_list'; +import { globalCache } from '../../global_cache'; +import timeZoneUtils from './utils'; +import timeZoneList from './timezone-list'; const defaultTimeZones = timeZoneList.value; diff --git a/packages/devextreme/js/__internal/scheduler/m_utils_time_zone.ts b/packages/devextreme/js/__internal/scheduler/entities/timezone/utils.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/m_utils_time_zone.ts rename to packages/devextreme/js/__internal/scheduler/entities/timezone/utils.ts index c704c975c414..1954dc113bbe 100644 --- a/packages/devextreme/js/__internal/scheduler/m_utils_time_zone.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/timezone/utils.ts @@ -3,9 +3,9 @@ import errors from '@js/core/errors'; import { dateUtilsTs } from '@ts/core/utils/date'; import { macroTaskArray } from '@ts/scheduler/utils/index'; -import dateUtils from '../../core/utils/date'; -import { globalCache } from './global_cache'; -import timeZoneList from './timezones/timezone_list'; +import dateUtils from '@js/core/utils/date'; +import { globalCache } from '../../global_cache'; +import timeZoneList from './timezone-list'; export interface TimezoneLabel { /** uniq timezone id, e.g: 'America/Los_Angeles' */ @@ -241,7 +241,7 @@ const cacheTimeZones = async (): Promise => globalCache.timezon () => macroTaskArray .map( timeZoneList.value, - (timezoneId) => ({ + (timezoneId: string) => ({ id: timezoneId, title: getTimezoneTitle(timezoneId, new Date()), }), diff --git a/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_tooltip_strategy_base.ts b/packages/devextreme/js/__internal/scheduler/entities/tooltip/base-strategy.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_tooltip_strategy_base.ts rename to packages/devextreme/js/__internal/scheduler/entities/tooltip/base-strategy.ts diff --git a/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts b/packages/devextreme/js/__internal/scheduler/entities/tooltip/desktop-strategy.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts rename to packages/devextreme/js/__internal/scheduler/entities/tooltip/desktop-strategy.ts index e9f44a6022e9..fe34eadbd846 100644 --- a/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/tooltip/desktop-strategy.ts @@ -2,7 +2,7 @@ import messageLocalization from '@js/common/core/localization/message'; import supportUtils from '@ts/core/utils/m_support'; import Tooltip from '@ts/ui/m_tooltip'; -import { TooltipStrategyBase } from './m_tooltip_strategy_base'; +import { TooltipStrategyBase } from './base-strategy'; const APPOINTMENT_TOOLTIP_WRAPPER_CLASS = 'dx-scheduler-appointment-tooltip-wrapper'; const MAX_TOOLTIP_HEIGHT = 200; diff --git a/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_mobile_tooltip_strategy.ts b/packages/devextreme/js/__internal/scheduler/entities/tooltip/mobile-strategy.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_mobile_tooltip_strategy.ts rename to packages/devextreme/js/__internal/scheduler/entities/tooltip/mobile-strategy.ts index b88b1d8ec06e..1f47839d9711 100644 --- a/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_mobile_tooltip_strategy.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/tooltip/mobile-strategy.ts @@ -2,7 +2,7 @@ import { getHeight, getOuterHeight, getWidth } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; import Overlay from '@js/ui/overlay/ui.overlay'; -import { TooltipStrategyBase } from './m_tooltip_strategy_base'; +import { TooltipStrategyBase } from './base-strategy'; const CLASS = { slidePanel: 'dx-scheduler-overlay-panel', diff --git a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts index 0c635929bded..270a4e463d7c 100644 --- a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts @@ -32,24 +32,24 @@ import type { Appointment, AppointmentTooltipShowingEvent, FirstDayOfWeek } from import errors from '@js/ui/widget/ui.errors'; import { dateUtilsTs } from '@ts/core/utils/date'; -import { createA11yStatusContainer } from './a11y_status/a11y_status_render'; -import { getA11yStatusText } from './a11y_status/a11y_status_text'; -import { AppointmentForm } from './appointment_popup/m_form'; -import { AppointmentForm as AppointmentLegacyForm } from './appointment_popup/m_legacy_form'; -import { ACTION_TO_APPOINTMENT, AppointmentPopup as AppointmentLegacyPopup } from './appointment_popup/m_legacy_popup'; -import { AppointmentPopup } from './appointment_popup/m_popup'; +import { createA11yStatusContainer } from './entities/a11y/status-render'; +import { getA11yStatusText } from './entities/a11y/status-text'; +import { AppointmentForm } from './entities/appointment-popup/form'; +import { AppointmentForm as AppointmentLegacyForm } from './entities/appointment-popup/legacy_form'; +import { ACTION_TO_APPOINTMENT, AppointmentPopup as AppointmentLegacyPopup } from './entities/appointment-popup/legacy_popup'; +import { AppointmentPopup } from './entities/appointment-popup/popup'; import AppointmentCollection from './appointments/m_appointment_collection'; import NotifyScheduler from './base/m_widget_notify_scheduler'; -import { SchedulerHeader } from './header/m_header'; -import type { HeaderOptions } from './header/types'; +import { SchedulerHeader } from './entities/header/header'; +import type { HeaderOptions } from './entities/header/types'; import { CompactAppointmentsHelper } from './m_compact_appointments_helper'; import { hide as hideLoading, show as showLoading } from './m_loading'; import type { SubscribeKey, SubscribeMethods } from './m_subscribes'; import subscribes from './m_subscribes'; import { utils } from './m_utils'; -import timeZoneUtils, { type TimezoneLabel } from './m_utils_time_zone'; +import timeZoneUtils, { type TimezoneLabel } from './entities/timezone/utils'; import { combineRemoteFilter } from './r1/filterting/remote'; -import { createTimeZoneCalculator } from './r1/timezone_calculator/index'; +import { createTimeZoneCalculator } from './entities/timezone/index'; import { excludeFromRecurrence, getToday, @@ -57,10 +57,10 @@ import { isDateAndTimeView, isTimelineView, } from './r1/utils/index'; -import { validateRRule } from './recurrence/validate_rule'; +import { validateRRule } from './entities/recurrence/validate-rule'; 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 { DesktopTooltipStrategy } from './entities/tooltip/desktop-strategy'; +import { MobileTooltipStrategy } from './entities/tooltip/mobile-strategy'; import type { AppointmentTooltipItem, SafeAppointment, @@ -74,9 +74,9 @@ import { macroTaskArray } from './utils/index'; import { isAgendaWorkspaceComponent } from './utils/is_agenda_workpace_component'; import { VIEWS } from './utils/options/constants_view'; import type { NormalizedView } from './utils/options/types'; -import { setAppointmentGroupValues } from './utils/resource_manager/appointment_groups_utils'; -import { createResourceEditorModel } from './utils/resource_manager/popup_utils'; -import { ResourceManager } from './utils/resource_manager/resource_manager'; +import { setAppointmentGroupValues } from './entities/resource/appointment-groups-utils'; +import { createResourceEditorModel } from './entities/resource/popup-utils'; +import { ResourceManager } from './entities/resource/manager'; import AppointmentLayoutManager from './view_model/appointments_layout_manager'; import { AppointmentDataSource } from './view_model/m_appointment_data_source'; import type { AppointmentViewModelPlain } from './view_model/types'; diff --git a/packages/devextreme/js/__internal/scheduler/m_table_creator.ts b/packages/devextreme/js/__internal/scheduler/m_table_creator.ts index 9af94f69319a..14ede01023b9 100644 --- a/packages/devextreme/js/__internal/scheduler/m_table_creator.ts +++ b/packages/devextreme/js/__internal/scheduler/m_table_creator.ts @@ -4,7 +4,7 @@ import { data as elementData } from '@js/core/element_data'; import $ from '@js/core/renderer'; import { isFunction } from '@js/core/utils/type'; -import type { GroupNode } from './utils/resource_manager/types'; +import type { GroupNode } from './entities/resource/types'; const ROW_SELECTOR = 'tr'; diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.pacific.test.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.pacific.test.ts index b208afc7fbb9..526f5e71a40a 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.pacific.test.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.pacific.test.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from '@jest/globals'; -import timeZoneUtils from '../../m_utils_time_zone'; +import timeZoneUtils from '../../entities/timezone/utils'; import { calculateRows } from './agenda'; const createDate = (year: number, month: number, day: number, hours: number) => { diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.santiago.test.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.santiago.test.ts index 23f42e32ea0e..4596195d4004 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.santiago.test.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.santiago.test.ts @@ -4,7 +4,7 @@ import { describe, expect, it } from '@jest/globals'; -import timeZoneUtils from '../../m_utils_time_zone'; +import timeZoneUtils from '../../entities/timezone/utils'; import { calculateRows } from './agenda'; const createDate = (year: number, month: number, day: number, hours: number) => { diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.ts index 8bddcb45b093..5fd0f476dbb6 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.ts @@ -1,4 +1,4 @@ -import timeZoneUtils from '../../m_utils_time_zone'; +import timeZoneUtils from '../../entities/timezone/utils'; import type { ListEntity } from '../../view_model/types'; import { setOptionHour } from './base'; diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts index 2487bac3a6d9..1f682d15c6e7 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts @@ -7,7 +7,7 @@ import { HORIZONTAL_GROUP_ORIENTATION, VERTICAL_GROUP_ORIENTATION, } from '../../constants'; import { VERTICAL_GROUP_COUNT_CLASSES } from '../../m_classes'; -import timeZoneUtils from '../../m_utils_time_zone'; +import timeZoneUtils from '../../entities/timezone/utils'; import type { AllDayPanelModeType, AppointmentGeometry, @@ -21,7 +21,7 @@ import type { ViewDataProviderType, ViewType, } from '../../types'; -import type { ResourceLoader } from '../../utils/loader/resource_loader'; +import type { ResourceLoader } from '../../entities/resource/loader'; import type { ResourceId } from '../../utils/loader/types'; import { VIEWS } from '../../utils/options/constants_view'; diff --git a/packages/devextreme/js/__internal/scheduler/scheduler_options_base_widget.ts b/packages/devextreme/js/__internal/scheduler/scheduler_options_base_widget.ts index 23883fcf5d21..a9420d7544bf 100644 --- a/packages/devextreme/js/__internal/scheduler/scheduler_options_base_widget.ts +++ b/packages/devextreme/js/__internal/scheduler/scheduler_options_base_widget.ts @@ -1,7 +1,7 @@ import Widget from '@js/ui/widget/ui.widget'; import { extend } from '@ts/core/utils/m_extend'; -import timeZoneUtils from './m_utils_time_zone'; +import timeZoneUtils from './entities/timezone/utils'; import { DEFAULT_SCHEDULER_INTEGRATION_OPTIONS, DEFAULT_SCHEDULER_INTERNAL_OPTIONS, diff --git a/packages/devextreme/js/__internal/scheduler/types.ts b/packages/devextreme/js/__internal/scheduler/types.ts index ce997ba2f606..b47a7df218c0 100644 --- a/packages/devextreme/js/__internal/scheduler/types.ts +++ b/packages/devextreme/js/__internal/scheduler/types.ts @@ -1,8 +1,8 @@ import type { dxElementWrapper } from '@js/core/renderer'; import type { Appointment, Properties } from '@js/ui/scheduler'; -import type { ResourceLoader } from './utils/loader/resource_loader'; -import type { GroupValues, RawGroupValues } from './utils/resource_manager/types'; +import type { ResourceLoader } from './entities/resource/loader'; +import type { GroupValues, RawGroupValues } from './entities/resource/types'; import type { AppointmentViewModelPlain } from './view_model/types'; export type Direction = 'vertical' | 'horizontal'; diff --git a/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.test.ts b/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.test.ts index c198df065b51..0a345224cbdb 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.test.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.test.ts @@ -3,7 +3,7 @@ import { } from '@jest/globals'; import { mockFieldExpressions } from '@ts/scheduler/__mock__/appointment_data_accessor.mock'; -import { createTimeZoneCalculator } from '../../r1/timezone_calculator'; +import { createTimeZoneCalculator } from '../../entities/timezone'; import { AppointmentDataAccessor } from '../data_accessor/appointment_data_accessor'; import { AppointmentAdapter } from './appointment_adapter'; diff --git a/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.ts b/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.ts index 69ce9fc25f8e..06efd4e6b916 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.ts @@ -1,6 +1,6 @@ import type { Appointment } from '@js/ui/scheduler'; import { deepExtendArraySafe } from '@ts/core/utils/m_object'; -import type { PathTimeZoneConversion, TimeZoneCalculator } from '@ts/scheduler/r1/timezone_calculator'; +import type { PathTimeZoneConversion, TimeZoneCalculator } from '../../entities/timezone'; import type { AppointmentDataAccessor } from '../data_accessor/appointment_data_accessor'; diff --git a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_data_accessor.ts b/packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_data_accessor.ts index 24af62bf558e..2d06d9f48d3d 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_data_accessor.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_data_accessor.ts @@ -2,7 +2,7 @@ import { compileGetter, compileSetter } from '@js/core/utils/data'; import dateSerialization from '@js/core/utils/date_serialization'; import type { Appointment } from '@js/ui/scheduler'; -import { validateRRule } from '../../recurrence/validate_rule'; +import { validateRRule } from '../../entities/recurrence/validate-rule'; import { DataAccessor } from './data_accessor'; import type { DataAccessorGetter, DataAccessorSetter, IFieldExpr } from './types'; diff --git a/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.ts b/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.ts index 40c86437608e..ed79a2d5f296 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.ts @@ -5,9 +5,9 @@ import type { AppointmentViewModelPlain, } from '../view_model/types'; import type { AppointmentDataAccessor } from './data_accessor/appointment_data_accessor'; -import { setAppointmentGroupValues } from './resource_manager/appointment_groups_utils'; -import { getLeafGroupValues } from './resource_manager/group_utils'; -import type { ResourceManager } from './resource_manager/resource_manager'; +import { setAppointmentGroupValues } from '../entities/resource/appointment-groups-utils'; +import { getLeafGroupValues } from '../entities/resource/group-utils'; +import type { ResourceManager } from '../entities/resource/manager'; const setTargetedAppointmentResources = ( rawAppointment: SafeAppointment, diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/agenda_group_utils.test.ts b/packages/devextreme/js/__internal/scheduler/utils/resource_manager/agenda_group_utils.test.ts index e2eb52c0e553..eafe1faaf970 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/agenda_group_utils.test.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/resource_manager/agenda_group_utils.test.ts @@ -3,7 +3,7 @@ import { } from '@jest/globals'; import { getResourceManagerMock } from '../../__mock__/resource_manager.mock'; -import { reduceResourcesTree } from './agenda_group_utils'; +import { reduceResourcesTree } from '../../entities/resource/agenda-group-utils'; describe('agenda group utils', () => { describe('reduceResourcesTree', () => { diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_color_utils.test.ts b/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_color_utils.test.ts index e9b600026b5d..1b22fdc8e5a4 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_color_utils.test.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_color_utils.test.ts @@ -9,7 +9,7 @@ import { resourceItemsByIdMock, } from '@ts/scheduler/__mock__/resource_manager.mock'; -import { getAppointmentColor, getPaintedResource } from './appointment_color_utils'; +import { getAppointmentColor, getPaintedResource } from '../../entities/resource/color-utils'; const ownerFirstColor = '#cb2824'; const ownerSecondColor = '#cb7d7b'; diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_groups_utils.test.ts b/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_groups_utils.test.ts index 205d39e48465..468baef58dac 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_groups_utils.test.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/resource_manager/appointment_groups_utils.test.ts @@ -14,7 +14,7 @@ import { getSafeGroupValues, groupAppointmentsByGroupLeafs, setAppointmentGroupValues, -} from './appointment_groups_utils'; +} from '../../entities/resource/appointment-groups-utils'; describe('appointment groups utils', () => { describe('getResourceItemById', () => { diff --git a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/popup_utils.test.ts b/packages/devextreme/js/__internal/scheduler/utils/resource_manager/popup_utils.test.ts index 5875f5bbd601..af9ab2e2c709 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/resource_manager/popup_utils.test.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/resource_manager/popup_utils.test.ts @@ -5,7 +5,7 @@ import { getResourceManagerMock, } from '@ts/scheduler/__mock__/resource_manager.mock'; -import { createResourceEditorModel } from './popup_utils'; +import { createResourceEditorModel } from '../../entities/resource/popup-utils'; describe('popup utils', () => { describe('createResourceEditorModel', () => { diff --git a/packages/devextreme/js/__internal/scheduler/view_model/common/get_compare_options.ts b/packages/devextreme/js/__internal/scheduler/view_model/common/get_compare_options.ts index cc33db47c1ba..aa05b0ce0a2e 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/common/get_compare_options.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/common/get_compare_options.ts @@ -1,5 +1,5 @@ import type Scheduler from '../../m_scheduler'; -import timeZoneUtils from '../../m_utils_time_zone'; +import timeZoneUtils from '../../entities/timezone/utils'; import type { CompareOptions } from '../types'; export const getCompareOptions = ( diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts index 8dd101a8d874..f89aa450ab7a 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, } from '@jest/globals'; -import { ResourceLoader } from '../../../../utils/loader/resource_loader'; +import { ResourceLoader } from '../../../../entities/resource/loader'; import { isAppointmentMatchedResources, } from './is_appointment_matched_resources'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts index f7768a79502b..b68cd2083e46 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts @@ -1,8 +1,8 @@ import { equalByValue } from '@js/core/utils/common'; import type { SafeAppointment } from '../../../../types'; -import type { ResourceLoader } from '../../../../utils/loader/resource_loader'; -import { getAppointmentGroupValues } from '../../../../utils/resource_manager/appointment_groups_utils'; +import type { ResourceLoader } from '../../../../entities/resource/loader'; +import { getAppointmentGroupValues } from '../../../../entities/resource/appointment-groups-utils'; export const isAppointmentMatchedResources = ( appointment: SafeAppointment, diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_filter_options.test.ts b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_filter_options.test.ts index 4f1f35c6251a..4ce015115a4e 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_filter_options.test.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_filter_options.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it } from '@jest/globals'; import { mockAppointmentDataAccessor } from '../../../../__mock__/appointment_data_accessor.mock'; import type Scheduler from '../../../../m_scheduler'; -import { ResourceManager } from '../../../../utils/resource_manager/resource_manager'; +import { ResourceManager } from '../../../../entities/resource/manager'; import { getFilterOptions } from './get_filter_options'; export const getSchedulerMock = ({ diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.test.ts b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.test.ts index 00335fb8e37f..f8fafcd97e06 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.test.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from '@jest/globals'; import type { ResourceConfig } from '../../../utils/loader/types'; -import { ResourceManager } from '../../../utils/resource_manager/resource_manager'; +import { ResourceManager } from '../../../entities/resource/manager'; import type { MinimalAppointmentEntity } from '../../types'; import { splitByGroupIndex } from './split_by_group_index'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.ts b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.ts index df44c85ac1d0..916dc4b45a10 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.ts @@ -1,7 +1,7 @@ import { getAppointmentGroupIndex, getAppointmentGroupValues, -} from '../../../utils/resource_manager/appointment_groups_utils'; +} from '../../../entities/resource/appointment-groups-utils'; import type { FilterOptions, GroupIndex, MinimalAppointmentEntity } from '../../types'; export const splitByGroupIndex = ( diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts index e2587cf09bd5..48746c4222d0 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts @@ -1,7 +1,7 @@ import { dateUtilsTs } from '@ts/core/utils/date'; import { RRule, RRuleSet } from 'rrule'; -import { parseRecurrenceRule } from '../../../../recurrence/base'; +import { parseRecurrenceRule } from '../../../../entities/recurrence/base'; import type { DateInterval, MinimalAppointmentEntity } from '../../../types'; import { getDateOffsetMs } from './get_date_information'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts index a2bb98cd56c9..b8bc589a603e 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, } from '@jest/globals'; -import { getAsciiStringByDate } from '../../../../recurrence/base'; +import { getAsciiStringByDate } from '../../../../entities/recurrence/base'; import { getAppointmentRecurrenceOccurrences } from './get_appointment_recurrence_occurrences'; const options = { diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts index b69fdd86720a..4246a5ff1a19 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts @@ -1,4 +1,4 @@ -import { getDateByAsciiString } from '../../../../recurrence/base'; +import { getDateByAsciiString } from '../../../../entities/recurrence/base'; import type { DateInterval, MinimalAppointmentEntity, UTCDates } from '../../../types'; import { generateRecurrenceUTCDates } from './generate_recurrence_utc_dates'; import type { DateInformation } from './get_date_information'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_date_information.ts b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_date_information.ts index 35281af8cdb7..62e35e194874 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_date_information.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_date_information.ts @@ -1,7 +1,7 @@ import dateUtils from '@js/core/utils/date'; import { globalCache } from '../../../../global_cache'; -import timeZoneUtils from '../../../../m_utils_time_zone'; +import timeZoneUtils from '../../../../entities/timezone/utils'; export interface DateInformation { offsetMs: number; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_filter.ts b/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_filter.ts index 1afd763e3c00..09f0c523d1b2 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_filter.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_filter.ts @@ -1,4 +1,4 @@ -import timeZoneUtils from '../../../m_utils_time_zone'; +import timeZoneUtils from '../../../entities/timezone/utils'; import type ViewDataProvider from '../../../workspaces/view_model/m_view_data_provider'; import { isAppointmentMatchedIntervals } from '../../common/is_appointment_matched_intervals'; import type { ListEntity } from '../../types'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/get_appointment_info.ts b/packages/devextreme/js/__internal/scheduler/view_model/get_appointment_info.ts index 58e8c9ccc3d4..344f527be149 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/get_appointment_info.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/get_appointment_info.ts @@ -1,4 +1,4 @@ -import timeZoneUtils from '../m_utils_time_zone'; +import timeZoneUtils from '../entities/timezone/utils'; import type { AppointmentAgendaViewModel, AppointmentItemViewModel, diff --git a/packages/devextreme/js/__internal/scheduler/view_model/preparation/prepare_appointments.test.ts b/packages/devextreme/js/__internal/scheduler/view_model/preparation/prepare_appointments.test.ts index 33e2bf41f435..eaf5f610430e 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/preparation/prepare_appointments.test.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/preparation/prepare_appointments.test.ts @@ -3,7 +3,7 @@ import { mockAppointmentDataAccessor } from '@ts/scheduler/__mock__/appointment_ import type { MinimalAppointmentEntity } from '@ts/scheduler/view_model/types'; import type Scheduler from '../../m_scheduler'; -import { createTimeZoneCalculator } from '../../r1/timezone_calculator'; +import { createTimeZoneCalculator } from '../../entities/timezone'; import { prepareAppointments } from './prepare_appointments'; const schedulerMock = { diff --git a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.test.ts b/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.test.ts index 2624578916e0..6c9fed6b0f27 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.test.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.test.ts @@ -3,7 +3,7 @@ import { describe, expect, it } from '@jest/globals'; import { mockAppointmentDataAccessor, mockUppercaseFieldExpressions, } from '../../../__mock__/appointment_data_accessor.mock'; -import { createTimeZoneCalculator } from '../../../r1/timezone_calculator'; +import { createTimeZoneCalculator } from '../../../entities/timezone'; import { AppointmentDataAccessor } from '../../../utils/data_accessor/appointment_data_accessor'; import type { MinimalAppointmentEntity } from '../../types'; import { getMinimalAppointments } from './get_minimal_appointments'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.ts b/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.ts index 573c0e894bc7..0698e86453e3 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.ts @@ -1,6 +1,6 @@ import { isDefined } from '@js/core/utils/type'; -import type { TimeZoneCalculator } from '../../../r1/timezone_calculator'; +import type { TimeZoneCalculator } from '../../../entities/timezone'; import type { SafeAppointment } from '../../../types'; import type { AppointmentDataAccessor } from '../../../utils/data_accessor/appointment_data_accessor'; import type { MinimalAppointmentEntity } from '../../types'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/types.ts b/packages/devextreme/js/__internal/scheduler/view_model/types.ts index 1133b5fc5562..fa28d48b8bd3 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/types.ts +++ b/packages/devextreme/js/__internal/scheduler/view_model/types.ts @@ -2,8 +2,8 @@ import type { Orientation } from '@js/common'; import type { AllDayPanelModeType, SafeAppointment } from '../types'; import type { AppointmentDataAccessor } from '../utils/data_accessor/appointment_data_accessor'; -import type { ResourceManager } from '../utils/resource_manager/resource_manager'; -import type { GroupLeaf } from '../utils/resource_manager/types'; +import type { ResourceManager } from '../entities/resource/manager'; +import type { GroupLeaf } from '../entities/resource/types'; import type { Empty, Geometry, diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts index a0986d0bbe4d..0d1168b0d348 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts @@ -20,8 +20,8 @@ import { import tableCreatorModule from '../m_table_creator'; import { agendaUtils, formatWeekday, getVerticalGroupCountClass } from '../r1/utils/index'; import { VIEWS } from '../utils/options/constants_view'; -import { reduceResourcesTree } from '../utils/resource_manager/agenda_group_utils'; -import type { GroupNode } from '../utils/resource_manager/types'; +import { reduceResourcesTree } from '../entities/resource/agenda-group-utils'; +import type { GroupNode } from '../entities/resource/types'; import type { ListEntity } from '../view_model/types'; import WorkSpace from './m_work_space'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts index 325a70ca2080..6c24269b020f 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts @@ -16,8 +16,8 @@ import { HEADER_CURRENT_TIME_CELL_CLASS, } from '../m_classes'; import tableCreatorModule from '../m_table_creator'; -import timezoneUtils from '../m_utils_time_zone'; -import HorizontalShader from '../shaders/m_current_time_shader_horizontal'; +import timezoneUtils from '../entities/timezone/utils'; +import HorizontalShader from '../entities/shaders/current-time-shader-horizontal'; import SchedulerWorkSpace from './m_work_space_indicator'; const { tableCreator } = tableCreatorModule; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts index 6105e50b0732..8335b6d950b6 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts @@ -71,15 +71,15 @@ import { CompactAppointmentsHelper } from '../m_compact_appointments_helper'; import type { SubscribeKey, SubscribeMethods } from '../m_subscribes'; import tableCreatorModule from '../m_table_creator'; import { utils } from '../m_utils'; -import VerticalShader from '../shaders/m_current_time_shader_vertical'; -import type { ResourceLoader } from '../utils/loader/resource_loader'; +import VerticalShader from '../entities/shaders/current-time-shader-vertical'; +import type { ResourceLoader } from '../entities/resource/loader'; import { getAppointmentGroupIndex, getSafeGroupValues, -} from '../utils/resource_manager/appointment_groups_utils'; -import { getLeafGroupValues } from '../utils/resource_manager/group_utils'; -import type { ResourceManager } from '../utils/resource_manager/resource_manager'; -import type { GroupValues, RawGroupValues } from '../utils/resource_manager/types'; +} from '../entities/resource/appointment-groups-utils'; +import { getLeafGroupValues } from '../entities/resource/group-utils'; +import type { ResourceManager } from '../entities/resource/manager'; +import type { GroupValues, RawGroupValues } from '../entities/resource/types'; import { getAllDayHeight, getCellHeight, diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts index 8a4873193229..beb19c5bbded 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts @@ -9,7 +9,7 @@ import { dateUtilsTs } from '@ts/core/utils/date'; import { getToday } from '@ts/scheduler/r1/utils/index'; import { HEADER_CURRENT_TIME_CELL_CLASS } from '../m_classes'; -import timezoneUtils from '../m_utils_time_zone'; +import timezoneUtils from '../entities/timezone/utils'; import SchedulerWorkSpace from './m_work_space'; const toMs = dateUtils.dateToMilliseconds; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_date_header_data_generator.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_date_header_data_generator.ts index e87874ba300a..ea3e7b1ee789 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_date_header_data_generator.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_date_header_data_generator.ts @@ -1,7 +1,7 @@ import dateUtils from '@js/core/utils/date'; import type { DateHeaderData } from '@ts/scheduler/types'; -import timeZoneUtils from '../../m_utils_time_zone'; +import timeZoneUtils from '../../entities/timezone/utils'; import { formatWeekdayAndDay, getDisplayedCellCount, diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_grouped_data_map_provider.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_grouped_data_map_provider.ts index 773ec0a97518..35a3465adb90 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_grouped_data_map_provider.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_grouped_data_map_provider.ts @@ -2,7 +2,7 @@ import dateUtils from '@js/core/utils/date'; import { dateUtilsTs } from '@ts/core/utils/date'; import { isDateAndTimeView } from '@ts/scheduler/r1/utils/index'; -import timezoneUtils from '../../m_utils_time_zone'; +import timezoneUtils from '../../entities/timezone/utils'; const toMs = dateUtils.dateToMilliseconds; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_types.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_types.ts index 6662e5e7a9d6..813d07bd9310 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_types.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_types.ts @@ -1,4 +1,4 @@ -import type { TimeZoneCalculator } from '../../r1/timezone_calculator/calculator'; +import type { TimeZoneCalculator } from '../../entities/timezone'; import type { CountGenerationConfig, GetDateForHeaderText, @@ -6,8 +6,8 @@ import type { ViewOptions, ViewType, } from '../../types'; -import type { ResourceManager } from '../../utils/resource_manager/resource_manager'; -import type { GroupLeaf } from '../../utils/resource_manager/types'; +import type { ResourceManager } from '../../entities/resource/manager'; +import type { GroupLeaf } from '../../entities/resource/types'; interface CommonOptions extends CountGenerationConfig { getResourceManager: () => ResourceManager; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator.ts index 7f0ea1b5b862..2796daa92072 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator.ts @@ -1,9 +1,9 @@ import dateUtils from '@js/core/utils/date'; import { dateUtilsTs } from '@ts/core/utils/date'; -import type { GroupLeaf } from '@ts/scheduler/utils/resource_manager/types'; +import type { GroupLeaf } from '../../entities/resource/types'; import { HORIZONTAL_GROUP_ORIENTATION } from '../../constants'; -import timezoneUtils from '../../m_utils_time_zone'; +import timezoneUtils from '../../entities/timezone/utils'; import { calculateCellIndex, calculateDayDuration, @@ -17,7 +17,7 @@ import { } from '../../r1/utils/index'; import type { ViewDataMap, ViewType } from '../../types'; import { VIEWS } from '../../utils/options/constants_view'; -import { getAllGroupValues } from '../../utils/resource_manager/group_utils'; +import { getAllGroupValues } from '../../entities/resource/group-utils'; import type { ViewCellDataSimple, ViewCellGeneratedData, diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts index 16b61e8fa4f1..9f83e17ab109 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts @@ -4,7 +4,7 @@ import { getToday, isFirstCellInMonthWithIntervalCount, monthUtils, setOptionHour, } from '@ts/scheduler/r1/utils/index'; -import timezoneUtils from '../../m_utils_time_zone'; +import timezoneUtils from '../../entities/timezone/utils'; import type { MonthViewCellDataSimple, ViewDataProviderExtendedOptions } from './m_types'; import { ViewDataGenerator } from './m_view_data_generator'; import { calculateAlignedWeeksBetweenDates } from './utils/view_generator_utils'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_timeline_month.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_timeline_month.ts index 1390ac420b09..77dc0d39ba99 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_timeline_month.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_timeline_month.ts @@ -1,7 +1,7 @@ import dateUtils from '@js/core/utils/date'; import { setOptionHour, timelineMonthUtils } from '@ts/scheduler/r1/utils/index'; -import timezoneUtils from '../../m_utils_time_zone'; +import timezoneUtils from '../../entities/timezone/utils'; import { ViewDataGenerator } from './m_view_data_generator'; const toMs = dateUtils.dateToMilliseconds; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts index ac1c485234a6..2904553845af 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts @@ -1,7 +1,7 @@ import dateUtils from '@js/core/utils/date'; import { dateUtilsTs } from '@ts/core/utils/date'; -import timeZoneUtils from '../../m_utils_time_zone'; +import timeZoneUtils from '../../entities/timezone/utils'; import { calculateIsGroupedAllDayPanel, getGroupPanelData, diff --git a/packages/devextreme/js/common/core/environment/time_zone_utils.js b/packages/devextreme/js/common/core/environment/time_zone_utils.js index 4bbab0e11a5e..85ece101d248 100644 --- a/packages/devextreme/js/common/core/environment/time_zone_utils.js +++ b/packages/devextreme/js/common/core/environment/time_zone_utils.js @@ -1,3 +1,3 @@ -import timeZoneUtils from '../../../__internal/scheduler/m_utils_time_zone'; +import timeZoneUtils from '../../../__internal/scheduler/entities/timezone/utils'; export const getTimeZones = timeZoneUtils.getTimeZones; diff --git a/packages/devextreme/js/ui/recurrence_editor.js b/packages/devextreme/js/ui/recurrence_editor.js index d2d799d96e25..74e3aa127d9b 100644 --- a/packages/devextreme/js/ui/recurrence_editor.js +++ b/packages/devextreme/js/ui/recurrence_editor.js @@ -1,4 +1,4 @@ -import RecurrenceEditor from '../__internal/scheduler/m_recurrence_editor'; +import RecurrenceEditor from '../__internal/scheduler/entities/recurrence/editor'; export default RecurrenceEditor; /** diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js index 8180556ae3cb..349f01adcdd8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js @@ -17,7 +17,7 @@ import Resizable from 'ui/resizable'; import fx from 'common/core/animation/fx'; import { DataSource } from 'common/data/data_source/data_source'; import { Deferred } from 'core/utils/deferred'; -import { createTimeZoneCalculator } from '__internal/scheduler/r1/timezone_calculator/index.js'; +import { createTimeZoneCalculator } from '__internal/scheduler/entities/timezone/index.js'; QUnit.testStart(function() { $('#qunit-fixture').html(` diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js index 6a45e70982a1..911bb71fa859 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js @@ -3,7 +3,7 @@ import fx from 'common/core/animation/fx'; import { CustomStore } from 'common/data/custom_store'; import { DataSource } from 'common/data/data_source/data_source'; -import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; +import timeZoneUtils from '__internal/scheduler/entities/timezone/utils'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; import { waitAsync } from '../../helpers/scheduler/waitForAsync.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js index e3b915e82de0..666ec5731267 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js @@ -9,7 +9,7 @@ import { DataSource } from 'common/data/data_source/data_source'; import ArrayStore from 'common/data/array_store'; import fx from 'common/core/animation/fx'; import translator from 'common/core/animation/translator'; -import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; +import timeZoneUtils from '__internal/scheduler/entities/timezone/utils'; import { CustomStore } from 'common/data/custom_store'; import { noop } from 'core/utils/common'; import dragEvents from 'common/core/events/drag'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js index 0b42df4ab1aa..83e171a9b69f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js @@ -7,7 +7,7 @@ import translator from 'common/core/animation/translator'; import fx from 'common/core/animation/fx'; import { DataSource } from 'common/data/data_source/data_source'; import dataUtils from 'core/element_data'; -import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; +import timeZoneUtils from '__internal/scheduler/entities/timezone/utils'; import 'generic_light.css!'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js index b592eb638210..6ca67e3b7da7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js @@ -2,7 +2,7 @@ import { initTestMarkup, createWrapper } from '../../helpers/scheduler/helpers.j import dateLocalization from 'common/core/localization/date'; import fx from 'common/core/animation/fx'; import { dateToMilliseconds as toMs } from 'core/utils/date'; -import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; +import timeZoneUtils from '__internal/scheduler/entities/timezone/utils'; import '__internal/scheduler/m_scheduler'; import { waitAsync } from '../../helpers/scheduler/waitForAsync.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/legacyAppointmentPopup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/legacyAppointmentPopup.tests.js index c460b9173f1b..fc21e4bf590b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/legacyAppointmentPopup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/legacyAppointmentPopup.tests.js @@ -16,7 +16,7 @@ import '__internal/scheduler/m_scheduler'; import 'ui/switch'; import viewPort from 'core/utils/view_port'; import browser from 'core/utils/browser'; -import timezoneUtils from '__internal/scheduler/m_utils_time_zone'; +import timezoneUtils from '__internal/scheduler/entities/timezone/utils'; const { module, test, testStart } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js index 58e404bdba8c..2114b91e6f0c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js @@ -1,13 +1,13 @@ import $ from 'jquery'; import dateUtils from 'core/utils/date'; -import RecurrenceEditor from '__internal/scheduler/m_recurrence_editor'; +import RecurrenceEditor from '__internal/scheduler/entities/recurrence/editor'; import SelectBox from 'ui/select_box'; import NumberBox from 'ui/number_box'; import RadioGroup from 'ui/radio_group'; import ButtonGroup from 'ui/button_group'; import DateBox from 'ui/date_box'; -import { getAsciiStringByDate, getDateByAsciiString } from '__internal/scheduler/recurrence/base'; -import { createTimeZoneCalculator } from '__internal/scheduler/r1/timezone_calculator/index.js'; +import { getAsciiStringByDate, getDateByAsciiString } from '__internal/scheduler/entities/recurrence/base'; +import { createTimeZoneCalculator } from '__internal/scheduler/entities/timezone/index.js'; import dateLocalization from 'common/core/localization/date'; const FREQUENCY_EDITOR = 'dx-recurrence-selectbox-freq'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js index b63f1c9b0a48..f5d45d570449 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js @@ -16,7 +16,7 @@ import { hide } from '__internal/ui/tooltip/m_tooltip'; import { DataSource } from 'common/data/data_source/data_source'; import ArrayStore from 'common/data/array_store'; import dragEvents from 'common/core/events/drag'; -import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; +import timeZoneUtils from '__internal/scheduler/entities/timezone/utils'; import 'generic_light.css!'; From 4d4b4f5834e59832f74bfd4fc9f2f64d0b04965c Mon Sep 17 00:00:00 2001 From: Sergio Bur Date: Thu, 29 Jan 2026 13:40:51 +0100 Subject: [PATCH 2/2] refactor: move files by entity (part 2) --- .../appointment_data_accessor.mock.ts | 4 +-- .../__mock__/resource_manager.mock.ts | 2 +- .../__tests__/__mock__/m_mock_scheduler.ts | 2 +- .../scheduler/entities/a11y/status-text.ts | 2 +- .../appointment_popup.test.ts | 2 +- .../entities/appointment-popup/form.ts | 2 +- .../appointment-popup/legacy_popup.ts | 2 +- .../entities/appointment-popup/popup.ts | 2 +- .../appointments_layout_manager.ts | 2 +- .../common/get_compare_options.ts | 4 +-- .../is_appointment_matched_intervals.test.ts | 0 .../is_appointment_matched_intervals.ts | 0 .../common/shift_intervals.test.ts | 0 .../common/shift_intervals.ts | 0 .../common/split_interval_by_days.test.ts | 0 .../common/split_interval_by_days.ts | 0 .../common/trim_interval.ts | 0 .../filtration/filter_appointments.ts | 2 +- .../utils/add_all_day_panel_occupation.ts | 2 +- .../filter_by_attributes.ts | 0 .../is_appointment_matched_resources.test.ts | 2 +- .../is_appointment_matched_resources.ts | 6 ++-- .../filter_by_intervals.ts | 0 .../get_filter_options.test.ts | 6 ++-- .../get_filter_options/get_filter_options.ts | 4 +-- .../get_visible_date_time_intervals.test.ts | 0 .../get_visible_date_time_intervals.ts | 0 .../utils/split_by_group_index.test.ts | 4 +-- .../filtration/utils/split_by_group_index.ts | 2 +- .../generate_recurrence_utc_dates.test.ts | 0 .../generate_recurrence_utc_dates.ts | 2 +- ...appointment_recurrence_occurrences.test.ts | 2 +- .../get_appointment_recurrence_occurrences.ts | 2 +- .../get_date_information.test.ts | 2 +- .../get_date_information.ts | 4 +-- .../split_by_recurrence.ts | 0 .../generate_agenda_view_model.ts | 2 +- .../generate_grid_view_model.ts | 2 +- .../options/get_collector_size.test.ts | 0 .../options/get_collector_size.ts | 0 .../options/get_group_size.ts | 2 +- .../options/get_max_level.test.ts | 0 .../options/get_max_level.ts | 0 .../options/get_min_appointment_size.ts | 0 .../get_minutes_cell_intervals.test.ts | 0 .../options/get_minutes_cell_intervals.ts | 0 .../options/get_month_intervals.ts | 0 .../get_one_day_cell_intervals.test.ts | 0 .../options/get_one_day_cell_intervals.ts | 0 .../options/get_panel_collector_options.ts | 0 .../options/get_view_model_options.ts | 4 +-- .../options/get_week_intervals.ts | 0 .../options/option_manager.ts | 4 +-- .../steps/add_collector/add_collector.ts | 0 .../add_collector_by_level.test.ts | 0 .../add_collector/add_collector_by_level.ts | 0 .../steps/add_collector/add_level.test.ts | 0 .../steps/add_collector/add_level.ts | 0 .../add_collector/split_by_condition.test.ts | 0 .../steps/add_collector/split_by_condition.ts | 0 .../steps/add_collector/types.ts | 0 .../steps/add_direction.ts | 0 .../steps/add_emptiness.test.ts | 0 .../steps/add_emptiness.ts | 0 ...daptivity_geometry_inside_interval.test.ts | 0 ...add_adaptivity_geometry_inside_interval.ts | 0 .../steps/add_geometry/add_geometry.ts | 0 .../add_geometry_inside_interval.test.ts | 0 .../add_geometry_inside_interval.ts | 0 .../add_geometry/add_grouping_offset.test.ts | 0 .../steps/add_geometry/add_grouping_offset.ts | 0 .../get_appointment_abstract_geometry.test.ts | 0 .../get_appointment_abstract_geometry.ts | 0 ...get_appointment_collector_geometry.test.ts | 0 .../get_appointment_collector_geometry.ts | 0 .../add_geometry/get_appointment_geometry.ts | 0 .../swap_by_view_orientation.test.ts | 0 .../add_geometry/swap_by_view_orientation.ts | 0 .../steps/add_geometry/types.ts | 0 .../steps/add_last_in_group.test.ts | 0 .../steps/add_last_in_group.ts | 0 .../steps/add_position.test.ts | 0 .../generate_view_model/steps/add_position.ts | 0 .../steps/add_sorted_index.test.ts | 0 .../steps/add_sorted_index.ts | 0 .../steps/binary_search_cell_index.test.ts | 0 .../steps/binary_search_cell_index.ts | 0 .../steps/expand_all_day.test.ts | 0 .../steps/expand_all_day.ts | 0 .../steps/group_by_group_index.ts | 0 .../steps/maybe_split.test.ts | 0 .../generate_view_model/steps/maybe_split.ts | 0 .../steps/snap_to_cells.test.ts | 0 .../steps/snap_to_cells.ts | 0 .../generate_view_model/steps/sorting.test.ts | 0 .../generate_view_model/steps/sorting.ts | 0 .../get_next_interval_start_date.test.ts | 0 .../get_next_interval_start_date.ts | 0 .../get_prev_interval_end_date.test.ts | 0 .../get_prev_interval_end_date.ts | 0 .../split_by_parts/split_by_parts.test.ts | 0 .../steps/split_by_parts/split_by_parts.ts | 0 .../steps/virtual_screen_crop.test.ts | 0 .../steps/virtual_screen_crop.ts | 0 .../steps/virtual_screen_filter.ts | 4 +-- .../get_appointment_info.ts | 2 +- .../m_appointment_data_source.ts | 0 .../preparation/prepare_appointments.test.ts | 8 ++--- .../preparation/prepare_appointments.ts | 2 +- .../utils/get_minimal_appointments.test.ts | 6 ++-- .../utils/get_minimal_appointments.ts | 6 ++-- .../utils/replace_incorrect_end_date.test.ts | 0 .../utils/replace_incorrect_end_date.ts | 15 ++++---- .../appointment-view-model}/types.ts | 8 ++--- .../adapter}/appointment_adapter.test.ts | 4 +-- .../adapter}/appointment_adapter.ts | 4 +-- .../appointment/agenda_appointment.ts | 2 +- .../appointment}/appointment/m_appointment.ts | 10 +++--- .../appointment}/appointment/m_types.ts | 8 ++--- .../appointment/text_utils.test.ts | 0 .../appointment}/appointment/text_utils.ts | 0 .../appointment}/m_appointment_collection.ts | 27 ++++++++------- .../appointment}/m_appointment_layout.ts | 2 +- .../appointment}/m_text_utils.ts | 0 .../resizing/get_delta_time.test.ts | 4 +-- .../appointment}/resizing/get_delta_time.ts | 4 +-- .../appointment}/resizing/m_core.ts | 2 +- .../appointment}/resizing/types.ts | 8 ++--- .../utils/get_arrays_diff.test.ts | 0 .../appointment}/utils/get_arrays_diff.ts | 0 .../appointment}/utils/get_view_model_diff.ts | 6 ++-- .../utils/sorted_index_utils.test.ts | 0 .../appointment}/utils/sorted_index_utils.ts | 0 .../appointment_data_accessor.test.ts | 0 .../appointment_data_accessor.ts | 2 +- ...appointment_resource_data_accessor.test.ts | 0 .../appointment_resource_data_accessor.ts | 0 .../data-accessor}/data_accessor.ts | 0 .../resource_data_accessor.test.ts | 0 .../data-accessor}/resource_data_accessor.ts | 0 .../data-source/data-accessor}/types.ts | 0 .../data-source}/loader/loader.test.ts | 0 .../data-source}/loader/loader.ts | 0 .../data-source}/loader/types.ts | 0 .../data-source}/loader/utils.test.ts | 0 .../data-source}/loader/utils.ts | 0 .../scheduler/entities/header/header.ts | 2 +- .../scheduler/entities/header/types.ts | 2 +- .../scheduler/entities/header/utils.ts | 4 +-- .../entities/header/view-switcher.ts | 2 +- .../options}/options/constants.ts | 0 .../options}/options/constants_view.ts | 0 .../options}/options/types.ts | 0 .../options}/options/utils.test.ts | 0 .../options}/options/utils.ts | 0 .../options/validator}/common/index.ts | 0 .../common/validation_functions.test.ts | 0 .../validator}/common/validation_functions.ts | 0 .../validator}/common/validator_rules.test.ts | 0 .../validator}/common/validator_rules.ts | 0 .../options/validator}/core/index.ts | 0 .../validator}/core/options_validator.test.ts | 0 .../validator}/core/options_validator.ts | 0 .../options_validator_error_handler.test.ts | 0 .../core/options_validator_error_handler.ts | 0 .../options/validator}/core/types.ts | 0 .../options/validator}/core/validator.test.ts | 0 .../options/validator}/core/validator.ts | 0 .../validator}/core/validator_rules.test.ts | 0 .../validator}/core/validator_rules.ts | 0 .../options/validator}/index.ts | 0 .../options/validator}/options_validator.ts | 0 .../options_validator_errors_handler.ts | 0 .../options/validator}/types.ts | 0 .../validator}/validator_rules.test.ts | 0 .../options/validator}/validator_rules.ts | 0 .../entities/resource/agenda-group-utils.ts | 2 +- .../entities/resource/group-utils.ts | 11 +++--- .../scheduler/entities/resource/loader.ts | 8 ++--- .../scheduler/entities/resource/manager.ts | 4 +-- .../scheduler/entities/resource/types.ts | 2 +- .../workspace}/const.ts | 0 .../workspace}/helpers/m_position_helper.ts | 0 .../workspace}/m_agenda.ts | 14 ++++---- .../m_cells_selection_controller.ts | 0 .../workspace}/m_cells_selection_state.ts | 0 .../workspace}/m_timeline.ts | 8 ++--- .../workspace}/m_timeline_day.ts | 2 +- .../workspace}/m_timeline_month.ts | 2 +- .../workspace}/m_timeline_week.ts | 2 +- .../workspace}/m_timeline_work_week.ts | 2 +- .../workspace}/m_virtual_scrolling.ts | 0 .../workspace}/m_work_space.ts | 30 ++++++++-------- .../workspace}/m_work_space_day.ts | 2 +- ..._work_space_grouped_strategy_horizontal.ts | 4 +-- .../m_work_space_grouped_strategy_vertical.ts | 6 ++-- .../workspace}/m_work_space_indicator.ts | 4 +-- .../workspace}/m_work_space_month.ts | 4 +-- .../workspace}/m_work_space_vertical.ts | 0 .../workspace}/m_work_space_week.ts | 2 +- .../workspace}/m_work_space_work_week.ts | 2 +- .../m_date_header_data_generator.ts | 6 ++-- .../view_model/m_grouped_data_map_provider.ts | 2 +- .../view_model/m_time_panel_data_generator.ts | 0 .../workspace}/view_model/m_types.ts | 12 ++++--- .../view_model/m_view_data_generator.ts | 14 ++++---- .../view_model/m_view_data_generator_day.ts | 2 +- .../view_model/m_view_data_generator_month.ts | 2 +- .../m_view_data_generator_timeline_month.ts | 2 +- .../view_model/m_view_data_generator_week.ts | 2 +- .../m_view_data_generator_work_week.ts | 2 +- .../view_model/m_view_data_provider.ts | 6 ++-- .../utils/view_generator_utils.test.ts | 0 .../view_model/utils/view_generator_utils.ts | 0 .../view_model/utils/view_provider_utils.ts | 4 +-- .../scheduler/m_appointment_drag_behavior.ts | 2 +- .../js/__internal/scheduler/m_scheduler.ts | 34 +++++++++---------- .../js/__internal/scheduler/m_subscribes.ts | 8 ++--- .../js/__internal/scheduler/m_utils.ts | 2 +- .../scheduler/r1/filterting/remote.ts | 2 +- .../scheduler/r1/filterting/types.ts | 2 +- .../__internal/scheduler/r1/utils/agenda.ts | 2 +- .../js/__internal/scheduler/r1/utils/base.ts | 4 +-- .../r1/utils/exclude_from_recurrence.ts | 4 +-- .../scheduler_options_base_widget.ts | 8 ++--- .../js/__internal/scheduler/types.ts | 2 +- .../utils/get_targeted_appointment.test.ts | 2 +- .../utils/get_targeted_appointment.ts | 4 +-- .../js/__internal/scheduler/utils/index.ts | 2 +- 229 files changed, 238 insertions(+), 227 deletions(-) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/appointments_layout_manager.ts (98%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/common/get_compare_options.ts (85%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/common/is_appointment_matched_intervals.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/common/is_appointment_matched_intervals.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/common/shift_intervals.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/common/shift_intervals.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/common/split_interval_by_days.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/common/split_interval_by_days.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/common/trim_interval.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/filter_appointments.ts (96%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/add_all_day_panel_occupation.ts (89%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/filter_by_attributes/filter_by_attributes.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts (95%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts (71%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/filter_by_intervals/filter_by_intervals.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/get_filter_options/get_filter_options.test.ts (89%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/get_filter_options/get_filter_options.ts (93%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/get_filter_options/get_visible_date_time_intervals.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/get_filter_options/get_visible_date_time_intervals.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/split_by_group_index.test.ts (94%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/split_by_group_index.ts (93%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts (96%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts (99%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts (98%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/split_by_recurrence/get_date_information.test.ts (95%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/split_by_recurrence/get_date_information.ts (95%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/filtration/utils/split_by_recurrence/split_by_recurrence.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/generate_agenda_view_model.ts (96%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/generate_grid_view_model.ts (98%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_collector_size.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_collector_size.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_group_size.ts (96%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_max_level.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_max_level.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_min_appointment_size.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_minutes_cell_intervals.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_minutes_cell_intervals.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_month_intervals.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_one_day_cell_intervals.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_one_day_cell_intervals.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_panel_collector_options.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_view_model_options.ts (96%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/get_week_intervals.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/options/option_manager.ts (98%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_collector/add_collector.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_collector/add_collector_by_level.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_collector/add_collector_by_level.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_collector/add_level.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_collector/add_level.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_collector/split_by_condition.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_collector/split_by_condition.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_collector/types.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_direction.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_emptiness.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_emptiness.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/add_adaptivity_geometry_inside_interval.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/add_adaptivity_geometry_inside_interval.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/add_geometry.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/add_geometry_inside_interval.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/add_geometry_inside_interval.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/add_grouping_offset.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/add_grouping_offset.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/get_appointment_abstract_geometry.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/get_appointment_abstract_geometry.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/get_appointment_collector_geometry.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/get_appointment_collector_geometry.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/get_appointment_geometry.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/swap_by_view_orientation.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/swap_by_view_orientation.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_geometry/types.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_last_in_group.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_last_in_group.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_position.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_position.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_sorted_index.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/add_sorted_index.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/binary_search_cell_index.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/binary_search_cell_index.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/expand_all_day.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/expand_all_day.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/group_by_group_index.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/maybe_split.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/maybe_split.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/snap_to_cells.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/snap_to_cells.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/sorting.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/sorting.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/split_by_parts/get_next_interval_start_date.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/split_by_parts/get_next_interval_start_date.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/split_by_parts/get_prev_interval_end_date.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/split_by_parts/get_prev_interval_end_date.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/split_by_parts/split_by_parts.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/split_by_parts/split_by_parts.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/virtual_screen_crop.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/virtual_screen_crop.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/generate_view_model/steps/virtual_screen_filter.ts (88%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/get_appointment_info.ts (95%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/m_appointment_data_source.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/preparation/prepare_appointments.test.ts (84%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/preparation/prepare_appointments.ts (93%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/preparation/utils/get_minimal_appointments.test.ts (95%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/preparation/utils/get_minimal_appointments.ts (85%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/preparation/utils/replace_incorrect_end_date.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/preparation/utils/replace_incorrect_end_date.ts (65%) rename packages/devextreme/js/__internal/scheduler/{view_model => entities/appointment-view-model}/types.ts (93%) rename packages/devextreme/js/__internal/scheduler/{utils/appointment_adapter => entities/appointment/adapter}/appointment_adapter.test.ts (96%) rename packages/devextreme/js/__internal/scheduler/{utils/appointment_adapter => entities/appointment/adapter}/appointment_adapter.ts (96%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/appointment/agenda_appointment.ts (98%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/appointment/m_appointment.ts (96%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/appointment/m_types.ts (71%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/appointment/text_utils.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/appointment/text_utils.ts (100%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/m_appointment_collection.ts (97%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/m_appointment_layout.ts (97%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/m_text_utils.ts (100%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/resizing/get_delta_time.test.ts (95%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/resizing/get_delta_time.ts (94%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/resizing/m_core.ts (99%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/resizing/types.ts (78%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/utils/get_arrays_diff.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/utils/get_arrays_diff.ts (100%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/utils/get_view_model_diff.ts (88%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/utils/sorted_index_utils.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{appointments => entities/appointment}/utils/sorted_index_utils.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/data_accessor => entities/data-source/data-accessor}/appointment_data_accessor.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/data_accessor => entities/data-source/data-accessor}/appointment_data_accessor.ts (98%) rename packages/devextreme/js/__internal/scheduler/{utils/data_accessor => entities/data-source/data-accessor}/appointment_resource_data_accessor.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/data_accessor => entities/data-source/data-accessor}/appointment_resource_data_accessor.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/data_accessor => entities/data-source/data-accessor}/data_accessor.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/data_accessor => entities/data-source/data-accessor}/resource_data_accessor.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/data_accessor => entities/data-source/data-accessor}/resource_data_accessor.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/data_accessor => entities/data-source/data-accessor}/types.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils => entities/data-source}/loader/loader.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils => entities/data-source}/loader/loader.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils => entities/data-source}/loader/types.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils => entities/data-source}/loader/utils.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils => entities/data-source}/loader/utils.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils => entities/options}/options/constants.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils => entities/options}/options/constants_view.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils => entities/options}/options/types.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils => entities/options}/options/utils.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils => entities/options}/options/utils.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/common/index.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/common/validation_functions.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/common/validation_functions.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/common/validator_rules.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/common/validator_rules.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/core/index.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/core/options_validator.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/core/options_validator.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/core/options_validator_error_handler.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/core/options_validator_error_handler.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/core/types.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/core/validator.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/core/validator.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/core/validator_rules.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/core/validator_rules.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/index.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/options_validator.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/options_validator_errors_handler.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/types.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/validator_rules.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{utils/options_validator => entities/options/validator}/validator_rules.ts (100%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/const.ts (100%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/helpers/m_position_helper.ts (100%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_agenda.ts (97%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_cells_selection_controller.ts (100%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_cells_selection_state.ts (100%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_timeline.ts (98%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_timeline_day.ts (89%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_timeline_month.ts (97%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_timeline_week.ts (92%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_timeline_work_week.ts (93%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_virtual_scrolling.ts (100%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_work_space.ts (99%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_work_space_day.ts (92%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_work_space_grouped_strategy_horizontal.ts (98%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_work_space_grouped_strategy_vertical.ts (97%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_work_space_indicator.ts (98%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_work_space_month.ts (98%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_work_space_vertical.ts (100%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_work_space_week.ts (91%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/m_work_space_work_week.ts (91%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_date_header_data_generator.ts (98%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_grouped_data_map_provider.ts (99%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_time_panel_data_generator.ts (100%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_types.ts (85%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_view_data_generator.ts (98%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_view_data_generator_day.ts (87%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_view_data_generator_month.ts (98%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_view_data_generator_timeline_month.ts (95%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_view_data_generator_week.ts (91%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_view_data_generator_work_week.ts (89%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/m_view_data_provider.ts (99%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/utils/view_generator_utils.test.ts (100%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/utils/view_generator_utils.ts (100%) rename packages/devextreme/js/__internal/scheduler/{workspaces => entities/workspace}/view_model/utils/view_provider_utils.ts (90%) diff --git a/packages/devextreme/js/__internal/scheduler/__mock__/appointment_data_accessor.mock.ts b/packages/devextreme/js/__internal/scheduler/__mock__/appointment_data_accessor.mock.ts index 80d993c60a60..3a0fc3d5c9b8 100644 --- a/packages/devextreme/js/__internal/scheduler/__mock__/appointment_data_accessor.mock.ts +++ b/packages/devextreme/js/__internal/scheduler/__mock__/appointment_data_accessor.mock.ts @@ -1,5 +1,5 @@ -import { AppointmentDataAccessor } from '../utils/data_accessor/appointment_data_accessor'; -import type { IFieldExpr } from '../utils/data_accessor/types'; +import { AppointmentDataAccessor } from '../entities/data-source/data-accessor/appointment_data_accessor'; +import type { IFieldExpr } from '../entities/data-source/data-accessor/types'; export const mockFieldExpressions: IFieldExpr = { startDateExpr: 'startDate', diff --git a/packages/devextreme/js/__internal/scheduler/__mock__/resource_manager.mock.ts b/packages/devextreme/js/__internal/scheduler/__mock__/resource_manager.mock.ts index 422a7d4af3f8..cc25a03082cc 100644 --- a/packages/devextreme/js/__internal/scheduler/__mock__/resource_manager.mock.ts +++ b/packages/devextreme/js/__internal/scheduler/__mock__/resource_manager.mock.ts @@ -1,7 +1,7 @@ import { DataSource } from '@ts/data/data_source/m_data_source'; import CustomStore from '@ts/data/m_custom_store'; -import type { ResourceConfig } from '../utils/loader/types'; +import type { ResourceConfig } from '../entities/data-source/loader/types'; import { ResourceManager } from '../entities/resource/manager'; export const resourceItemsByIdMock = { diff --git a/packages/devextreme/js/__internal/scheduler/__tests__/__mock__/m_mock_scheduler.ts b/packages/devextreme/js/__internal/scheduler/__tests__/__mock__/m_mock_scheduler.ts index 90a9c4a623cc..7c2bd974a376 100644 --- a/packages/devextreme/js/__internal/scheduler/__tests__/__mock__/m_mock_scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/__tests__/__mock__/m_mock_scheduler.ts @@ -2,7 +2,7 @@ import { jest } from '@jest/globals'; import { logger } from '@ts/core/utils/m_console'; import DOMComponent from '@ts/core/widget/dom_component'; -import SchedulerWorkSpace from '../../workspaces/m_work_space'; +import SchedulerWorkSpace from '../../entities/workspace/m_work_space'; interface SetupSchedulerTestEnvironmentOptions { width?: number; diff --git a/packages/devextreme/js/__internal/scheduler/entities/a11y/status-text.ts b/packages/devextreme/js/__internal/scheduler/entities/a11y/status-text.ts index 6b68aa2464f9..b133e4af5705 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/a11y/status-text.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/a11y/status-text.ts @@ -2,7 +2,7 @@ import dateLocalization from '@js/common/core/localization/date'; import messageLocalization from '@js/common/core/localization/message'; import type { ViewType } from '@js/ui/scheduler'; -import type { NormalizedView } from '../../utils/options/types'; +import type { NormalizedView } from '../options/options/types'; const KEYS = { dateRange: 'dxScheduler-dateRange', diff --git a/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/appointment_popup.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/appointment_popup.test.ts index af8ae7b94bba..89ff54e57c80 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/appointment_popup.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/appointment_popup.test.ts @@ -10,7 +10,7 @@ import { toMilliseconds } from '@ts/utils/toMilliseconds'; import fx from '../../../common/core/animation/fx'; import { createScheduler } from '../../__tests__/__mock__/create_scheduler'; import { setupSchedulerTestEnvironment } from '../../__tests__/__mock__/m_mock_scheduler'; -import { DEFAULT_SCHEDULER_OPTIONS } from '../../utils/options/constants'; +import { DEFAULT_SCHEDULER_OPTIONS } from '../options/options/constants'; const CLASSES = { icon: 'dx-scheduler-form-icon', diff --git a/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/form.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/form.ts index bccd151a5300..49fc29aabca9 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/form.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/form.ts @@ -22,7 +22,7 @@ import type Popup from '@ts/ui/popup/m_popup'; import timeZoneUtils from '../timezone/utils'; import type { SafeAppointment } from '../../types'; import type { ResourceLoader } from '../resource/loader'; -import { DEFAULT_ICONS_SHOW_MODE } from '../../utils/options/constants'; +import { DEFAULT_ICONS_SHOW_MODE } from '../options/options/constants'; import { getAppointmentGroupIndex, getRawAppointmentGroupValues, getSafeGroupValues } from '../resource/appointment-groups-utils'; import type { ResourceManager } from '../resource/manager'; import { customizeFormItems } from './customize_form_items'; diff --git a/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/legacy_popup.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/legacy_popup.ts index 257f489515a2..81d93a93b5af 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/legacy_popup.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/legacy_popup.ts @@ -12,7 +12,7 @@ import { } from './config'; import { hide as hideLoading, show as showLoading } from '../../m_loading'; -import { AppointmentAdapter } from '../../utils/appointment_adapter/appointment_adapter'; +import { AppointmentAdapter } from '../appointment/adapter/appointment_adapter'; import { getAppointmentGroupValues, getRawAppointmentGroupValues } from '../resource/appointment-groups-utils'; const toMs = dateUtils.dateToMilliseconds; diff --git a/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/popup.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/popup.ts index 104db86e8f97..44dd94d4b260 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/popup.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-popup/popup.ts @@ -14,7 +14,7 @@ import { current, isFluent } from '@js/ui/themes'; import { hide as hideLoading, show as showLoading } from '../../m_loading'; import type { SafeAppointment } from '../../types'; -import { AppointmentAdapter } from '../../utils/appointment_adapter/appointment_adapter'; +import { AppointmentAdapter } from '../appointment/adapter/appointment_adapter'; import { getAppointmentGroupValues, getRawAppointmentGroupValues } from '../resource/appointment-groups-utils'; import type { AppointmentForm } from './form'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/appointments_layout_manager.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/appointments_layout_manager.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/view_model/appointments_layout_manager.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/appointments_layout_manager.ts index 60b063072665..71bc644d7120 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/appointments_layout_manager.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/appointments_layout_manager.ts @@ -1,6 +1,6 @@ import type { Appointment } from '@js/ui/scheduler'; -import type Scheduler from '../m_scheduler'; +import type Scheduler from '../../m_scheduler'; import { filterAppointments } from './filtration/filter_appointments'; import { generateAgendaViewModel } from './generate_view_model/generate_agenda_view_model'; import { generateGridViewModel } from './generate_view_model/generate_grid_view_model'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/common/get_compare_options.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/get_compare_options.ts similarity index 85% rename from packages/devextreme/js/__internal/scheduler/view_model/common/get_compare_options.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/get_compare_options.ts index aa05b0ce0a2e..1995b09e47dd 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/common/get_compare_options.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/get_compare_options.ts @@ -1,5 +1,5 @@ -import type Scheduler from '../../m_scheduler'; -import timeZoneUtils from '../../entities/timezone/utils'; +import type Scheduler from '../../../m_scheduler'; +import timeZoneUtils from '../../timezone/utils'; import type { CompareOptions } from '../types'; export const getCompareOptions = ( diff --git a/packages/devextreme/js/__internal/scheduler/view_model/common/is_appointment_matched_intervals.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/is_appointment_matched_intervals.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/common/is_appointment_matched_intervals.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/is_appointment_matched_intervals.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/common/is_appointment_matched_intervals.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/is_appointment_matched_intervals.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/common/is_appointment_matched_intervals.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/is_appointment_matched_intervals.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/common/shift_intervals.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/shift_intervals.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/common/shift_intervals.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/shift_intervals.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/common/shift_intervals.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/shift_intervals.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/common/shift_intervals.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/shift_intervals.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/common/split_interval_by_days.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/split_interval_by_days.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/common/split_interval_by_days.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/split_interval_by_days.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/common/split_interval_by_days.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/split_interval_by_days.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/common/split_interval_by_days.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/split_interval_by_days.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/common/trim_interval.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/trim_interval.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/common/trim_interval.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/common/trim_interval.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/filter_appointments.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/filter_appointments.ts similarity index 96% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/filter_appointments.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/filter_appointments.ts index f15c24f6bab6..003380461c21 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/filter_appointments.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/filter_appointments.ts @@ -1,4 +1,4 @@ -import type Scheduler from '../../m_scheduler'; +import type Scheduler from '../../../m_scheduler'; import type { Duration, ListEntity, MinimalAppointmentEntity, UTCDates, UTCDatesBeforeSplit, diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/add_all_day_panel_occupation.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/add_all_day_panel_occupation.ts similarity index 89% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/add_all_day_panel_occupation.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/add_all_day_panel_occupation.ts index b2d5d0b884e1..eb96e28584c4 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/add_all_day_panel_occupation.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/add_all_day_panel_occupation.ts @@ -1,4 +1,4 @@ -import { isAppointmentTakesAllDay } from '../../../r1/utils/base'; +import { isAppointmentTakesAllDay } from '../../../../r1/utils/base'; import type { AllDayPanelOccupation, FilterOptions, MinimalAppointmentEntity } from '../../types'; export const addAllDayPanelOccupation = ( diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/filter_by_attributes.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/filter_by_attributes/filter_by_attributes.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/filter_by_attributes.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/filter_by_attributes/filter_by_attributes.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts similarity index 95% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts index f89aa450ab7a..fa5b27886de5 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, } from '@jest/globals'; -import { ResourceLoader } from '../../../../entities/resource/loader'; +import { ResourceLoader } from '../../../../resource/loader'; import { isAppointmentMatchedResources, } from './is_appointment_matched_resources'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts similarity index 71% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts index b68cd2083e46..d20ce5e02dff 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/filter_by_attributes/is_appointment_matched_resources.ts @@ -1,8 +1,8 @@ import { equalByValue } from '@js/core/utils/common'; -import type { SafeAppointment } from '../../../../types'; -import type { ResourceLoader } from '../../../../entities/resource/loader'; -import { getAppointmentGroupValues } from '../../../../entities/resource/appointment-groups-utils'; +import type { SafeAppointment } from '../../../../../types'; +import type { ResourceLoader } from '../../../../resource/loader'; +import { getAppointmentGroupValues } from '../../../../resource/appointment-groups-utils'; export const isAppointmentMatchedResources = ( appointment: SafeAppointment, diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_intervals/filter_by_intervals.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/filter_by_intervals/filter_by_intervals.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/filter_by_intervals/filter_by_intervals.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/filter_by_intervals/filter_by_intervals.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_filter_options.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/get_filter_options/get_filter_options.test.ts similarity index 89% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_filter_options.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/get_filter_options/get_filter_options.test.ts index 4ce015115a4e..c908f4662a33 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_filter_options.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/get_filter_options/get_filter_options.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it } from '@jest/globals'; -import { mockAppointmentDataAccessor } from '../../../../__mock__/appointment_data_accessor.mock'; -import type Scheduler from '../../../../m_scheduler'; -import { ResourceManager } from '../../../../entities/resource/manager'; +import { mockAppointmentDataAccessor } from '../../../../../__mock__/appointment_data_accessor.mock'; +import type Scheduler from '../../../../../m_scheduler'; +import { ResourceManager } from '../../../../resource/manager'; import { getFilterOptions } from './get_filter_options'; export const getSchedulerMock = ({ diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_filter_options.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/get_filter_options/get_filter_options.ts similarity index 93% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_filter_options.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/get_filter_options/get_filter_options.ts index 3f4f4ee9c500..613c2585573a 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_filter_options.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/get_filter_options/get_filter_options.ts @@ -1,5 +1,5 @@ -import type Scheduler from '../../../../m_scheduler'; -import type { ViewType } from '../../../../types'; +import type Scheduler from '../../../../../m_scheduler'; +import type { ViewType } from '../../../../../types'; import { getCompareOptions } from '../../../common/get_compare_options'; import { shiftIntervals } from '../../../common/shift_intervals'; import type { FilterOptions } from '../../../types'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_visible_date_time_intervals.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/get_filter_options/get_visible_date_time_intervals.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_visible_date_time_intervals.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/get_filter_options/get_visible_date_time_intervals.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_visible_date_time_intervals.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/get_filter_options/get_visible_date_time_intervals.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/get_filter_options/get_visible_date_time_intervals.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/get_filter_options/get_visible_date_time_intervals.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_group_index.test.ts similarity index 94% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_group_index.test.ts index f8fafcd97e06..a2d100c01ff5 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_group_index.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from '@jest/globals'; -import type { ResourceConfig } from '../../../utils/loader/types'; -import { ResourceManager } from '../../../entities/resource/manager'; +import type { ResourceConfig } from '../../../data-source/loader/types'; +import { ResourceManager } from '../../../resource/manager'; import type { MinimalAppointmentEntity } from '../../types'; import { splitByGroupIndex } from './split_by_group_index'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_group_index.ts similarity index 93% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_group_index.ts index 916dc4b45a10..39e015a13fff 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_group_index.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_group_index.ts @@ -1,7 +1,7 @@ import { getAppointmentGroupIndex, getAppointmentGroupValues, -} from '../../../entities/resource/appointment-groups-utils'; +} from '../../../resource/appointment-groups-utils'; import type { FilterOptions, GroupIndex, MinimalAppointmentEntity } from '../../types'; export const splitByGroupIndex = ( diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts similarity index 96% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts index 48746c4222d0..e2587cf09bd5 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/generate_recurrence_utc_dates.ts @@ -1,7 +1,7 @@ import { dateUtilsTs } from '@ts/core/utils/date'; import { RRule, RRuleSet } from 'rrule'; -import { parseRecurrenceRule } from '../../../../entities/recurrence/base'; +import { parseRecurrenceRule } from '../../../../recurrence/base'; import type { DateInterval, MinimalAppointmentEntity } from '../../../types'; import { getDateOffsetMs } from './get_date_information'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts index b8bc589a603e..a2bb98cd56c9 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.test.ts @@ -2,7 +2,7 @@ import { describe, expect, it, } from '@jest/globals'; -import { getAsciiStringByDate } from '../../../../entities/recurrence/base'; +import { getAsciiStringByDate } from '../../../../recurrence/base'; import { getAppointmentRecurrenceOccurrences } from './get_appointment_recurrence_occurrences'; const options = { diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts index 4246a5ff1a19..b69fdd86720a 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_appointment_recurrence_occurrences.ts @@ -1,4 +1,4 @@ -import { getDateByAsciiString } from '../../../../entities/recurrence/base'; +import { getDateByAsciiString } from '../../../../recurrence/base'; import type { DateInterval, MinimalAppointmentEntity, UTCDates } from '../../../types'; import { generateRecurrenceUTCDates } from './generate_recurrence_utc_dates'; import type { DateInformation } from './get_date_information'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_date_information.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_date_information.test.ts similarity index 95% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_date_information.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_date_information.test.ts index 6c9f3a0dacdd..9a98d287b124 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_date_information.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_date_information.test.ts @@ -2,7 +2,7 @@ import { afterAll, describe, expect, it, } from '@jest/globals'; -import { globalCache } from '../../../../global_cache'; +import { globalCache } from '../../../../../global_cache'; import { findDSTOfDay } from './get_date_information'; const HOUR_MS = 3600_000; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_date_information.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_date_information.ts similarity index 95% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_date_information.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_date_information.ts index 62e35e194874..945a16928051 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/get_date_information.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/get_date_information.ts @@ -1,7 +1,7 @@ import dateUtils from '@js/core/utils/date'; -import { globalCache } from '../../../../global_cache'; -import timeZoneUtils from '../../../../entities/timezone/utils'; +import { globalCache } from '../../../../../global_cache'; +import timeZoneUtils from '../../../../timezone/utils'; export interface DateInformation { offsetMs: number; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/split_by_recurrence.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/split_by_recurrence.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/filtration/utils/split_by_recurrence/split_by_recurrence.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/filtration/utils/split_by_recurrence/split_by_recurrence.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/generate_agenda_view_model.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/generate_agenda_view_model.ts similarity index 96% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/generate_agenda_view_model.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/generate_agenda_view_model.ts index ed11215b5b07..ed4183702d15 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/generate_agenda_view_model.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/generate_agenda_view_model.ts @@ -1,4 +1,4 @@ -import type Scheduler from '../../m_scheduler'; +import type Scheduler from '../../../m_scheduler'; import { getCompareOptions } from '../common/get_compare_options'; import { splitIntervalByDay } from '../common/split_interval_by_days'; import type { diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/generate_grid_view_model.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/generate_grid_view_model.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/generate_grid_view_model.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/generate_grid_view_model.ts index b91034f26441..d463fd5b86f6 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/generate_grid_view_model.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/generate_grid_view_model.ts @@ -1,4 +1,4 @@ -import type Scheduler from '../../m_scheduler'; +import type Scheduler from '../../../m_scheduler'; import type { AppointmentEntity, ListEntity } from '../types'; import { OptionManager } from './options/option_manager'; import { addCollector } from './steps/add_collector/add_collector'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_collector_size.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_collector_size.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_collector_size.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_collector_size.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_collector_size.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_collector_size.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_collector_size.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_collector_size.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_group_size.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_group_size.ts similarity index 96% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_group_size.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_group_size.ts index 0312d45552b9..e305c0939a24 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_group_size.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_group_size.ts @@ -1,4 +1,4 @@ -import type { ViewType } from '../../../types'; +import type { ViewType } from '../../../../types'; import type { CellInterval, DateInterval } from '../../types'; import type { RealSize } from '../steps/add_geometry/types'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_max_level.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_max_level.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_max_level.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_max_level.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_max_level.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_max_level.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_max_level.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_max_level.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_min_appointment_size.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_min_appointment_size.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_min_appointment_size.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_min_appointment_size.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_minutes_cell_intervals.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_minutes_cell_intervals.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_minutes_cell_intervals.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_minutes_cell_intervals.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_minutes_cell_intervals.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_minutes_cell_intervals.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_minutes_cell_intervals.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_minutes_cell_intervals.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_month_intervals.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_month_intervals.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_month_intervals.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_month_intervals.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_one_day_cell_intervals.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_one_day_cell_intervals.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_one_day_cell_intervals.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_one_day_cell_intervals.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_one_day_cell_intervals.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_one_day_cell_intervals.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_one_day_cell_intervals.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_one_day_cell_intervals.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_panel_collector_options.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_panel_collector_options.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_panel_collector_options.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_panel_collector_options.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_view_model_options.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_view_model_options.ts similarity index 96% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_view_model_options.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_view_model_options.ts index c5656557dcd0..00e34963b78c 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_view_model_options.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_view_model_options.ts @@ -1,7 +1,7 @@ import type { Orientation } from '@js/common'; -import type Scheduler from '@ts/scheduler/m_scheduler'; +import type Scheduler from '../../../../m_scheduler'; -import type { ViewType } from '../../../types'; +import type { ViewType } from '../../../../types'; import { getCompareOptions } from '../../common/get_compare_options'; import type { CompareOptions } from '../../types'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_week_intervals.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_week_intervals.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/get_week_intervals.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/get_week_intervals.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/option_manager.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/option_manager.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/option_manager.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/option_manager.ts index b830eae445bb..73c1e20c5d9e 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/options/option_manager.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/options/option_manager.ts @@ -1,5 +1,5 @@ -import { Cache } from '../../../global_cache'; -import type Scheduler from '../../../m_scheduler'; +import { Cache } from '../../../../global_cache'; +import type Scheduler from '../../../../m_scheduler'; import type { CellInterval, CompareOptions, diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/add_collector.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/add_collector.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/add_collector.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/add_collector.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/add_collector_by_level.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/add_collector_by_level.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/add_collector_by_level.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/add_collector_by_level.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/add_collector_by_level.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/add_collector_by_level.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/add_collector_by_level.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/add_collector_by_level.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/add_level.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/add_level.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/add_level.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/add_level.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/add_level.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/add_level.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/add_level.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/add_level.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/split_by_condition.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/split_by_condition.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/split_by_condition.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/split_by_condition.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/split_by_condition.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/split_by_condition.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/split_by_condition.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/split_by_condition.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/types.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/types.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_collector/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_collector/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_direction.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_direction.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_direction.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_direction.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_emptiness.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_emptiness.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_emptiness.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_emptiness.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_emptiness.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_emptiness.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_emptiness.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_emptiness.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_adaptivity_geometry_inside_interval.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_adaptivity_geometry_inside_interval.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_adaptivity_geometry_inside_interval.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_adaptivity_geometry_inside_interval.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_adaptivity_geometry_inside_interval.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_adaptivity_geometry_inside_interval.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_adaptivity_geometry_inside_interval.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_adaptivity_geometry_inside_interval.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_geometry.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_geometry.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_geometry.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_geometry.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_geometry_inside_interval.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_geometry_inside_interval.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_geometry_inside_interval.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_geometry_inside_interval.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_geometry_inside_interval.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_geometry_inside_interval.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_geometry_inside_interval.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_geometry_inside_interval.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_grouping_offset.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_grouping_offset.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_grouping_offset.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_grouping_offset.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_grouping_offset.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_grouping_offset.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/add_grouping_offset.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/add_grouping_offset.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/get_appointment_abstract_geometry.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/get_appointment_abstract_geometry.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/get_appointment_abstract_geometry.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/get_appointment_abstract_geometry.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/get_appointment_abstract_geometry.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/get_appointment_abstract_geometry.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/get_appointment_abstract_geometry.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/get_appointment_abstract_geometry.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/get_appointment_collector_geometry.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/get_appointment_collector_geometry.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/get_appointment_collector_geometry.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/get_appointment_collector_geometry.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/get_appointment_collector_geometry.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/get_appointment_collector_geometry.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/get_appointment_collector_geometry.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/get_appointment_collector_geometry.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/get_appointment_geometry.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/get_appointment_geometry.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/get_appointment_geometry.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/get_appointment_geometry.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/swap_by_view_orientation.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/swap_by_view_orientation.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/swap_by_view_orientation.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/swap_by_view_orientation.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/swap_by_view_orientation.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/swap_by_view_orientation.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/swap_by_view_orientation.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/swap_by_view_orientation.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/types.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/types.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_geometry/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_geometry/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_last_in_group.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_last_in_group.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_last_in_group.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_last_in_group.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_last_in_group.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_last_in_group.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_last_in_group.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_last_in_group.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_position.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_position.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_position.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_position.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_position.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_position.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_position.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_position.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_sorted_index.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_sorted_index.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_sorted_index.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_sorted_index.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_sorted_index.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_sorted_index.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/add_sorted_index.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/add_sorted_index.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/binary_search_cell_index.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/binary_search_cell_index.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/binary_search_cell_index.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/binary_search_cell_index.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/binary_search_cell_index.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/binary_search_cell_index.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/binary_search_cell_index.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/binary_search_cell_index.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/expand_all_day.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/expand_all_day.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/expand_all_day.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/expand_all_day.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/expand_all_day.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/expand_all_day.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/expand_all_day.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/expand_all_day.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/group_by_group_index.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/group_by_group_index.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/group_by_group_index.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/group_by_group_index.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/maybe_split.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/maybe_split.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/maybe_split.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/maybe_split.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/maybe_split.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/maybe_split.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/maybe_split.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/maybe_split.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/snap_to_cells.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/snap_to_cells.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/snap_to_cells.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/snap_to_cells.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/snap_to_cells.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/snap_to_cells.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/snap_to_cells.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/snap_to_cells.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/sorting.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/sorting.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/sorting.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/sorting.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/sorting.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/sorting.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/sorting.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/sorting.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/get_next_interval_start_date.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/get_next_interval_start_date.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/get_next_interval_start_date.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/get_next_interval_start_date.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/get_next_interval_start_date.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/get_next_interval_start_date.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/get_next_interval_start_date.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/get_next_interval_start_date.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/get_prev_interval_end_date.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/get_prev_interval_end_date.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/get_prev_interval_end_date.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/get_prev_interval_end_date.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/get_prev_interval_end_date.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/get_prev_interval_end_date.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/get_prev_interval_end_date.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/get_prev_interval_end_date.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/split_by_parts.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/split_by_parts.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/split_by_parts.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/split_by_parts.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/split_by_parts.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/split_by_parts.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/split_by_parts/split_by_parts.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/split_by_parts/split_by_parts.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_crop.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/virtual_screen_crop.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_crop.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/virtual_screen_crop.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_crop.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/virtual_screen_crop.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_crop.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/virtual_screen_crop.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_filter.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/virtual_screen_filter.ts similarity index 88% rename from packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_filter.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/virtual_screen_filter.ts index 09f0c523d1b2..96af2bea2c4f 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/generate_view_model/steps/virtual_screen_filter.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/generate_view_model/steps/virtual_screen_filter.ts @@ -1,5 +1,5 @@ -import timeZoneUtils from '../../../entities/timezone/utils'; -import type ViewDataProvider from '../../../workspaces/view_model/m_view_data_provider'; +import timeZoneUtils from '../../../timezone/utils'; +import type ViewDataProvider from '../../../workspace/view_model/m_view_data_provider'; import { isAppointmentMatchedIntervals } from '../../common/is_appointment_matched_intervals'; import type { ListEntity } from '../../types'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/get_appointment_info.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/get_appointment_info.ts similarity index 95% rename from packages/devextreme/js/__internal/scheduler/view_model/get_appointment_info.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/get_appointment_info.ts index 344f527be149..00a52dc6d74a 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/get_appointment_info.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/get_appointment_info.ts @@ -1,4 +1,4 @@ -import timeZoneUtils from '../entities/timezone/utils'; +import timeZoneUtils from '../timezone/utils'; import type { AppointmentAgendaViewModel, AppointmentItemViewModel, diff --git a/packages/devextreme/js/__internal/scheduler/view_model/m_appointment_data_source.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/m_appointment_data_source.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/m_appointment_data_source.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/m_appointment_data_source.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/preparation/prepare_appointments.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/prepare_appointments.test.ts similarity index 84% rename from packages/devextreme/js/__internal/scheduler/view_model/preparation/prepare_appointments.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/prepare_appointments.test.ts index eaf5f610430e..6534fb55d099 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/preparation/prepare_appointments.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/prepare_appointments.test.ts @@ -1,9 +1,9 @@ import { describe, expect, it } from '@jest/globals'; -import { mockAppointmentDataAccessor } from '@ts/scheduler/__mock__/appointment_data_accessor.mock'; -import type { MinimalAppointmentEntity } from '@ts/scheduler/view_model/types'; +import { mockAppointmentDataAccessor } from '../../../__mock__/appointment_data_accessor.mock'; +import type { MinimalAppointmentEntity } from '../types'; -import type Scheduler from '../../m_scheduler'; -import { createTimeZoneCalculator } from '../../entities/timezone'; +import type Scheduler from '../../../m_scheduler'; +import { createTimeZoneCalculator } from '../../timezone'; import { prepareAppointments } from './prepare_appointments'; const schedulerMock = { diff --git a/packages/devextreme/js/__internal/scheduler/view_model/preparation/prepare_appointments.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/prepare_appointments.ts similarity index 93% rename from packages/devextreme/js/__internal/scheduler/view_model/preparation/prepare_appointments.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/prepare_appointments.ts index 3af52bae686e..cab369a73a93 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/preparation/prepare_appointments.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/prepare_appointments.ts @@ -1,6 +1,6 @@ import type { Appointment } from '@js/ui/scheduler'; -import type Scheduler from '../../m_scheduler'; +import type Scheduler from '../../../m_scheduler'; import type { MinimalAppointmentEntity } from '../types'; import { getMinimalAppointments } from './utils/get_minimal_appointments'; import { replaceIncorrectEndDate } from './utils/replace_incorrect_end_date'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/get_minimal_appointments.test.ts similarity index 95% rename from packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/get_minimal_appointments.test.ts index 6c9fed6b0f27..f00f0cccb970 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/get_minimal_appointments.test.ts @@ -2,9 +2,9 @@ import { describe, expect, it } from '@jest/globals'; import { mockAppointmentDataAccessor, mockUppercaseFieldExpressions, -} from '../../../__mock__/appointment_data_accessor.mock'; -import { createTimeZoneCalculator } from '../../../entities/timezone'; -import { AppointmentDataAccessor } from '../../../utils/data_accessor/appointment_data_accessor'; +} from '../../../../__mock__/appointment_data_accessor.mock'; +import { createTimeZoneCalculator } from '../../../timezone'; +import { AppointmentDataAccessor } from '../../../data-source/data-accessor/appointment_data_accessor'; import type { MinimalAppointmentEntity } from '../../types'; import { getMinimalAppointments } from './get_minimal_appointments'; diff --git a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/get_minimal_appointments.ts similarity index 85% rename from packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/get_minimal_appointments.ts index 0698e86453e3..dbc87f0ae720 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/get_minimal_appointments.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/get_minimal_appointments.ts @@ -1,8 +1,8 @@ import { isDefined } from '@js/core/utils/type'; -import type { TimeZoneCalculator } from '../../../entities/timezone'; -import type { SafeAppointment } from '../../../types'; -import type { AppointmentDataAccessor } from '../../../utils/data_accessor/appointment_data_accessor'; +import type { TimeZoneCalculator } from '../../../timezone'; +import type { SafeAppointment } from '../../../../types'; +import type { AppointmentDataAccessor } from '../../../data-source/data-accessor/appointment_data_accessor'; import type { MinimalAppointmentEntity } from '../../types'; interface Options { diff --git a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/replace_incorrect_end_date.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/replace_incorrect_end_date.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/replace_incorrect_end_date.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/replace_incorrect_end_date.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/replace_incorrect_end_date.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/replace_incorrect_end_date.ts similarity index 65% rename from packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/replace_incorrect_end_date.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/replace_incorrect_end_date.ts index dbf5b85d5060..5ff6b0719fef 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/preparation/utils/replace_incorrect_end_date.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/preparation/utils/replace_incorrect_end_date.ts @@ -2,8 +2,8 @@ import type { Appointment } from '@js/ui/scheduler'; import { dateUtilsTs } from '@ts/core/utils/date'; import { dateUtils } from '@ts/core/utils/m_date'; -import type { SafeAppointment } from '../../../types'; -import type { AppointmentDataAccessor } from '../../../utils/data_accessor/appointment_data_accessor'; +import type { SafeAppointment } from '../../../../types'; +import type { AppointmentDataAccessor } from '../../../data-source/data-accessor/appointment_data_accessor'; const toMs = dateUtils.dateToMilliseconds; @@ -25,14 +25,17 @@ export const replaceIncorrectEndDate = ( return result; } - const isEndDateIncorrect = !dateUtilsTs.isValidDate(endDate) - || startDate.getTime() > endDate.getTime(); + const startDateObj = startDate instanceof Date ? startDate : new Date(startDate); + const endDateObj = endDate instanceof Date ? endDate : (dateUtilsTs.isValidDate(endDate) ? new Date(endDate) : null); + + const isEndDateIncorrect = !endDateObj + || startDateObj.getTime() > endDateObj.getTime(); if (isEndDateIncorrect) { const isAllDay = dataAccessors.get('allDay', rawAppointment); const correctedEndDate = isAllDay - ? dateUtils.setToDayEnd(new Date(startDate)) - : new Date(startDate.getTime() + appointmentMinDuration * toMs('minute')); + ? dateUtils.setToDayEnd(new Date(startDateObj)) + : new Date(startDateObj.getTime() + appointmentMinDuration * toMs('minute')); // TODO(4): fixme. serializationFormat auto-detection will not the same as in startDate dataAccessors.set('endDate', rawAppointment, correctedEndDate); diff --git a/packages/devextreme/js/__internal/scheduler/view_model/types.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/types.ts similarity index 93% rename from packages/devextreme/js/__internal/scheduler/view_model/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/types.ts index fa28d48b8bd3..e2147f6ca145 100644 --- a/packages/devextreme/js/__internal/scheduler/view_model/types.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment-view-model/types.ts @@ -1,9 +1,9 @@ import type { Orientation } from '@js/common'; -import type { AllDayPanelModeType, SafeAppointment } from '../types'; -import type { AppointmentDataAccessor } from '../utils/data_accessor/appointment_data_accessor'; -import type { ResourceManager } from '../entities/resource/manager'; -import type { GroupLeaf } from '../entities/resource/types'; +import type { AllDayPanelModeType, SafeAppointment } from '../../types'; +import type { AppointmentDataAccessor } from '../data-source/data-accessor/appointment_data_accessor'; +import type { ResourceManager } from '../resource/manager'; +import type { GroupLeaf } from '../resource/types'; import type { Empty, Geometry, diff --git a/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/adapter/appointment_adapter.test.ts similarity index 96% rename from packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/adapter/appointment_adapter.test.ts index 0a345224cbdb..0d3831b191e9 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/adapter/appointment_adapter.test.ts @@ -3,8 +3,8 @@ import { } from '@jest/globals'; import { mockFieldExpressions } from '@ts/scheduler/__mock__/appointment_data_accessor.mock'; -import { createTimeZoneCalculator } from '../../entities/timezone'; -import { AppointmentDataAccessor } from '../data_accessor/appointment_data_accessor'; +import { createTimeZoneCalculator } from '../../timezone'; +import { AppointmentDataAccessor } from '../../data-source/data-accessor/appointment_data_accessor'; import { AppointmentAdapter } from './appointment_adapter'; const mockCalculator = createTimeZoneCalculator('America/Los_Angeles'); diff --git a/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/adapter/appointment_adapter.ts similarity index 96% rename from packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/adapter/appointment_adapter.ts index 06efd4e6b916..f78123c42b6d 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/appointment_adapter/appointment_adapter.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/adapter/appointment_adapter.ts @@ -1,8 +1,8 @@ import type { Appointment } from '@js/ui/scheduler'; import { deepExtendArraySafe } from '@ts/core/utils/m_object'; -import type { PathTimeZoneConversion, TimeZoneCalculator } from '../../entities/timezone'; +import type { PathTimeZoneConversion, TimeZoneCalculator } from '../../timezone'; -import type { AppointmentDataAccessor } from '../data_accessor/appointment_data_accessor'; +import type { AppointmentDataAccessor } from '../../data-source/data-accessor/appointment_data_accessor'; export class AppointmentAdapter { constructor( diff --git a/packages/devextreme/js/__internal/scheduler/appointments/appointment/agenda_appointment.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/agenda_appointment.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/appointments/appointment/agenda_appointment.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/agenda_appointment.ts index 74cb4afee7e1..6cc38155e032 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/appointment/agenda_appointment.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/agenda_appointment.ts @@ -3,7 +3,7 @@ import $ from '@js/core/renderer'; import { APPOINTMENT_CONTENT_CLASSES, -} from '../../m_classes'; +} from '../../../m_classes'; import { Appointment } from './m_appointment'; export class AgendaAppointment extends Appointment { diff --git a/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/m_appointment.ts similarity index 96% rename from packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/m_appointment.ts index fe6568f538a9..d162466baaf9 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/m_appointment.ts @@ -22,10 +22,10 @@ import { REDUCED_APPOINTMENT_CLASS, REDUCED_APPOINTMENT_ICON, REDUCED_APPOINTMENT_PARTS_CLASSES, -} from '../../m_classes'; -import type { SubscribeKey, SubscribeMethods } from '../../m_subscribes'; -import { validateRRule } from '../../entities/recurrence/validate-rule'; -import type { AppointmentDataAccessor } from '../../utils/data_accessor/appointment_data_accessor'; +} from '../../../m_classes'; +import type { SubscribeKey, SubscribeMethods } from '../../../m_subscribes'; +import { validateRRule } from '../../recurrence/validate-rule'; +import type { AppointmentDataAccessor } from '../../data-source/data-accessor/appointment_data_accessor'; import type { AppointmentProperties } from './m_types'; import { getAriaDescription, @@ -75,7 +75,7 @@ export class Appointment extends DOMComponent { notifyObserver( funcName: Subject, - args: Parameters, + ...args: Parameters ): void { this.invoke(funcName, ...args); } diff --git a/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_types.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/m_types.ts similarity index 71% rename from packages/devextreme/js/__internal/scheduler/appointments/appointment/m_types.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/m_types.ts index b520a0d98f78..1c05cd27954c 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/appointment/m_types.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/m_types.ts @@ -1,9 +1,9 @@ import type { Orientation } from '@js/common'; import type NotifyScheduler from '@ts/scheduler/base/m_widget_notify_scheduler'; -import type { TimeZoneCalculator } from '../../entities/timezone'; -import type { SafeAppointment } from '@ts/scheduler/types'; -import type { AppointmentDataAccessor } from '@ts/scheduler/utils/data_accessor/appointment_data_accessor'; -import type { ResourceManager } from '@ts/scheduler/entities/resource/manager'; +import type { TimeZoneCalculator } from '../../timezone'; +import type { SafeAppointment } from '../../../types'; +import type { AppointmentDataAccessor } from '../../data-source/data-accessor/appointment_data_accessor'; +import type { ResourceManager } from '../../resource/manager'; export interface AppointmentProperties extends Record { data: SafeAppointment; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/appointment/text_utils.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/text_utils.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/appointments/appointment/text_utils.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/text_utils.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/appointments/appointment/text_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/text_utils.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/appointments/appointment/text_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/appointment/text_utils.ts diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/m_appointment_collection.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/m_appointment_collection.ts index 9739a4ee6b5f..4b9346537804 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/m_appointment_collection.ts @@ -21,30 +21,30 @@ import { isDeferred, isPlainObject } from '@js/core/utils/type'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.edit'; import { dateUtilsTs } from '@ts/core/utils/date'; -import { APPOINTMENT_SETTINGS_KEY } from '../constants'; +import { APPOINTMENT_SETTINGS_KEY } from '../../constants'; import { AGENDA_LAST_IN_DATE_APPOINTMENT_CLASS, APPOINTMENT_CONTENT_CLASSES, APPOINTMENT_DRAG_SOURCE_CLASS, APPOINTMENT_ITEM_CLASS, -} from '../m_classes'; -import timeZoneUtils from '../entities/timezone/utils'; -import type { CompactAppointmentOptions } from '../types'; -import { AppointmentAdapter } from '../utils/appointment_adapter/appointment_adapter'; -import type { AppointmentDataAccessor } from '../utils/data_accessor/appointment_data_accessor'; +} from '../../m_classes'; +import timeZoneUtils from '../timezone/utils'; +import type { CompactAppointmentOptions } from '../../types'; +import { AppointmentAdapter } from '../appointment/adapter/appointment_adapter'; +import type { AppointmentDataAccessor } from '../data-source/data-accessor/appointment_data_accessor'; import { getTargetedAppointment, getTargetedAppointmentFromInfo, -} from '../utils/get_targeted_appointment'; -import { getAppointmentGroupValues } from '../entities/resource/appointment-groups-utils'; -import { getGroupTexts } from '../entities/resource/group-utils'; -import type { ResourceManager } from '../entities/resource/manager'; +} from '../../utils/get_targeted_appointment'; +import { getAppointmentGroupValues } from '../resource/appointment-groups-utils'; +import { getGroupTexts } from '../resource/group-utils'; +import type { ResourceManager } from '../resource/manager'; import type { AppointmentAgendaViewModel, AppointmentCollectorViewModel, AppointmentItemViewModel, AppointmentViewModelPlain, -} from '../view_model/types'; +} from '../appointment-view-model/types'; import { AgendaAppointment } from './appointment/agenda_appointment'; import { Appointment } from './appointment/m_appointment'; import { createAgendaAppointmentLayout, createAppointmentLayout } from './m_appointment_layout'; @@ -721,10 +721,11 @@ class SchedulerAppointments extends CollectionWidget { const appointmentGroups = getAppointmentGroupValues(rawAppointment, resources); Object.entries(appointmentGroups).forEach(([resourceIndex, resourceIds]) => { - if (resourceIds.length) { + const ids = resourceIds as (string | number)[]; + if (ids.length) { const prefix = `data-${normalizeKey(resourceIndex.toLowerCase())}-`; - resourceIds.forEach((value) => $appointment.attr(prefix + normalizeKey(value), true)); + ids.forEach((value) => $appointment.attr(prefix + normalizeKey(value), true)); } }); } diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/m_appointment_layout.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/m_appointment_layout.ts index 984229540f04..593ef7208e9a 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/m_appointment_layout.ts @@ -2,7 +2,7 @@ import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; -import { APPOINTMENT_CONTENT_CLASSES } from '../m_classes'; +import { APPOINTMENT_CONTENT_CLASSES } from '../../m_classes'; const allDayText = ` ${messageLocalization.format('dxScheduler-allDay')}: `; const recurringText = messageLocalization.format('dxScheduler-appointmentAriaLabel-recurring'); diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_text_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/m_text_utils.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/appointments/m_text_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/m_text_utils.ts diff --git a/packages/devextreme/js/__internal/scheduler/appointments/resizing/get_delta_time.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/get_delta_time.test.ts similarity index 95% rename from packages/devextreme/js/__internal/scheduler/appointments/resizing/get_delta_time.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/get_delta_time.test.ts index e07a51c9abf0..cfaace2ea2ce 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/resizing/get_delta_time.test.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/get_delta_time.test.ts @@ -2,8 +2,8 @@ import { describe, expect, it, } from '@jest/globals'; -import { VIEW_TYPES } from '../../utils/options/constants_view'; -import type { ViewType } from '../../utils/options/types'; +import { VIEW_TYPES } from '../../options/options/constants_view'; +import type { ViewType } from '../../options/options/types'; import { getDeltaTime } from './get_delta_time'; describe('getDeltaTime', () => { diff --git a/packages/devextreme/js/__internal/scheduler/appointments/resizing/get_delta_time.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/get_delta_time.ts similarity index 94% rename from packages/devextreme/js/__internal/scheduler/appointments/resizing/get_delta_time.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/get_delta_time.ts index 0c4768c18827..a6f2328dc326 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/resizing/get_delta_time.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/get_delta_time.ts @@ -1,7 +1,7 @@ import dateUtils from '@js/core/utils/date'; -import { VERTICAL_VIEW_TYPES } from '../../constants'; -import type { ViewType } from '../../types'; +import { VERTICAL_VIEW_TYPES } from '../../../constants'; +import type { ViewType } from '../../../types'; const toMs = dateUtils.dateToMilliseconds; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/resizing/m_core.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/m_core.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/appointments/resizing/m_core.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/m_core.ts index a235bc0515b4..80a46854b85a 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/resizing/m_core.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/m_core.ts @@ -1,7 +1,7 @@ import { dateUtilsTs } from '@ts/core/utils/date'; import { dateUtils } from '@ts/core/utils/m_date'; -import type { ViewCellData } from '../../types'; +import type { ViewCellData } from '../../../types'; import type { CellsInfo, DateRange, diff --git a/packages/devextreme/js/__internal/scheduler/appointments/resizing/types.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/types.ts similarity index 78% rename from packages/devextreme/js/__internal/scheduler/appointments/resizing/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/types.ts index dbff171a813c..41e8017d67fa 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/resizing/types.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/resizing/types.ts @@ -1,7 +1,7 @@ -import type { TimeZoneCalculator } from '../../entities/timezone'; -import type { ViewDataProviderType } from '../../types'; -import type { AppointmentDataAccessor } from '../../utils/data_accessor/appointment_data_accessor'; -import type { AppointmentItemViewModel } from '../../view_model/types'; +import type { TimeZoneCalculator } from '../../timezone'; +import type { ViewDataProviderType } from '../../../types'; +import type { AppointmentDataAccessor } from '../../data-source/data-accessor/appointment_data_accessor'; +import type { AppointmentItemViewModel } from '../../appointment-view-model/types'; export type Rect = Pick; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/utils/get_arrays_diff.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/utils/get_arrays_diff.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/appointments/utils/get_arrays_diff.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/utils/get_arrays_diff.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/appointments/utils/get_arrays_diff.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/utils/get_arrays_diff.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/appointments/utils/get_arrays_diff.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/utils/get_arrays_diff.ts diff --git a/packages/devextreme/js/__internal/scheduler/appointments/utils/get_view_model_diff.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/utils/get_view_model_diff.ts similarity index 88% rename from packages/devextreme/js/__internal/scheduler/appointments/utils/get_view_model_diff.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/utils/get_view_model_diff.ts index 149d706be122..329149b353fb 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/utils/get_view_model_diff.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/appointment/utils/get_view_model_diff.ts @@ -1,8 +1,8 @@ import { equalByValue } from '@js/core/utils/common'; -import type { SafeAppointment } from '../../types'; -import type { AppointmentDataSource } from '../../view_model/m_appointment_data_source'; -import type { AppointmentViewModelPlain } from '../../view_model/types'; +import type { SafeAppointment } from '../../../types'; +import type { AppointmentDataSource } from '../../appointment-view-model/m_appointment_data_source'; +import type { AppointmentViewModelPlain } from '../../appointment-view-model/types'; import type { DiffItem } from './get_arrays_diff'; import { getArraysDiff } from './get_arrays_diff'; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/utils/sorted_index_utils.test.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/utils/sorted_index_utils.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/appointments/utils/sorted_index_utils.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/utils/sorted_index_utils.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/appointments/utils/sorted_index_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/appointment/utils/sorted_index_utils.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/appointments/utils/sorted_index_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/appointment/utils/sorted_index_utils.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_data_accessor.test.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/appointment_data_accessor.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_data_accessor.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/appointment_data_accessor.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_data_accessor.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/appointment_data_accessor.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_data_accessor.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/appointment_data_accessor.ts index 2d06d9f48d3d..6a71c8f88179 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_data_accessor.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/appointment_data_accessor.ts @@ -2,7 +2,7 @@ import { compileGetter, compileSetter } from '@js/core/utils/data'; import dateSerialization from '@js/core/utils/date_serialization'; import type { Appointment } from '@js/ui/scheduler'; -import { validateRRule } from '../../entities/recurrence/validate-rule'; +import { validateRRule } from '../../recurrence/validate-rule'; import { DataAccessor } from './data_accessor'; import type { DataAccessorGetter, DataAccessorSetter, IFieldExpr } from './types'; diff --git a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_resource_data_accessor.test.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/appointment_resource_data_accessor.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_resource_data_accessor.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/appointment_resource_data_accessor.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_resource_data_accessor.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/appointment_resource_data_accessor.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/data_accessor/appointment_resource_data_accessor.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/appointment_resource_data_accessor.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/data_accessor.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/data_accessor.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/data_accessor/data_accessor.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/data_accessor.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/resource_data_accessor.test.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/resource_data_accessor.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/data_accessor/resource_data_accessor.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/resource_data_accessor.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/resource_data_accessor.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/resource_data_accessor.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/data_accessor/resource_data_accessor.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/resource_data_accessor.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/data_accessor/types.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/types.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/data_accessor/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/data-accessor/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/loader/loader.test.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/loader/loader.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/loader/loader.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/loader/loader.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/loader/loader.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/loader/loader.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/loader/loader.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/loader/loader.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/loader/types.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/loader/types.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/loader/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/loader/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/loader/utils.test.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/loader/utils.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/loader/utils.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/loader/utils.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/loader/utils.ts b/packages/devextreme/js/__internal/scheduler/entities/data-source/loader/utils.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/loader/utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/data-source/loader/utils.ts diff --git a/packages/devextreme/js/__internal/scheduler/entities/header/header.ts b/packages/devextreme/js/__internal/scheduler/entities/header/header.ts index dfe4dea833f5..6c89972860cb 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/header/header.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/header.ts @@ -12,7 +12,7 @@ import type { DateNavigatorTextInfo, ToolbarItem } from '@js/ui/scheduler'; import Toolbar from '@js/ui/toolbar'; import type { OptionChanged } from '@ts/core/widget/types'; import Widget from '@ts/core/widget/widget'; -import type { NormalizedView, SafeSchedulerOptions } from '@ts/scheduler/utils/options/types'; +import type { NormalizedView, SafeSchedulerOptions } from '../options/options/types'; import type { Direction } from './constants'; import SchedulerCalendar from './calendar'; diff --git a/packages/devextreme/js/__internal/scheduler/entities/header/types.ts b/packages/devextreme/js/__internal/scheduler/entities/header/types.ts index 7dd3673dfca8..239cf3cd5323 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/header/types.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/types.ts @@ -1,7 +1,7 @@ import type { FirstDayOfWeek } from '@js/common'; import type { ValueChangedEvent } from '@js/ui/calendar'; -import type { NormalizedView, SafeSchedulerOptions } from '../../utils/options/types'; +import type { NormalizedView, SafeSchedulerOptions } from '../options/options/types'; export interface HeaderOptions { currentView: NormalizedView; diff --git a/packages/devextreme/js/__internal/scheduler/entities/header/utils.ts b/packages/devextreme/js/__internal/scheduler/entities/header/utils.ts index 9e361c98b46a..4499c48cae8a 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/header/utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/utils.ts @@ -6,7 +6,7 @@ import type { DateNavigatorTextInfo, Properties } from '@js/ui/scheduler'; import type { BaseFormat } from '@ts/core/localization/date'; import { camelize } from '@ts/core/utils/m_inflector'; import type { IntervalOptions, Step } from './types'; -import type { NormalizedView, RawViewType, ViewType } from '@ts/scheduler/utils/options/types'; +import type { NormalizedView, RawViewType, ViewType } from '../options/options/types'; import type { Direction } from './constants'; @@ -322,7 +322,7 @@ const STEP_MAP: Record = { export const getViewName = (view: RawViewType): string | undefined => { if (isObject(view)) { - return view.name ?? view.type; + return (view as NormalizedView).name ?? (view as NormalizedView).type; } return view; diff --git a/packages/devextreme/js/__internal/scheduler/entities/header/view-switcher.ts b/packages/devextreme/js/__internal/scheduler/entities/header/view-switcher.ts index ad672aace4a4..5dd8b41f5ac1 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/header/view-switcher.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/header/view-switcher.ts @@ -1,7 +1,7 @@ import { current, isFluent } from '@js/ui/themes'; import type { Item as ToolbarItem } from '@js/ui/toolbar'; -import type { NormalizedView } from '../../utils/options/types'; +import type { NormalizedView } from '../options/options/types'; import type { SchedulerHeader } from './header'; import { formatViews, diff --git a/packages/devextreme/js/__internal/scheduler/utils/options/constants.ts b/packages/devextreme/js/__internal/scheduler/entities/options/options/constants.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options/constants.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/options/constants.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options/constants_view.ts b/packages/devextreme/js/__internal/scheduler/entities/options/options/constants_view.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options/constants_view.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/options/constants_view.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options/types.ts b/packages/devextreme/js/__internal/scheduler/entities/options/options/types.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/options/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options/utils.test.ts b/packages/devextreme/js/__internal/scheduler/entities/options/options/utils.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options/utils.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/options/utils.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options/utils.ts b/packages/devextreme/js/__internal/scheduler/entities/options/options/utils.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options/utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/options/utils.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/common/index.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/common/index.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/common/index.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/common/index.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/common/validation_functions.test.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/common/validation_functions.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/common/validation_functions.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/common/validation_functions.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/common/validation_functions.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/common/validation_functions.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/common/validation_functions.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/common/validation_functions.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/common/validator_rules.test.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/common/validator_rules.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/common/validator_rules.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/common/validator_rules.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/common/validator_rules.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/common/validator_rules.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/common/validator_rules.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/common/validator_rules.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/core/index.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/core/index.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/core/index.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/core/index.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/core/options_validator.test.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/core/options_validator.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/core/options_validator.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/core/options_validator.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/core/options_validator.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/core/options_validator.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/core/options_validator.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/core/options_validator.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/core/options_validator_error_handler.test.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/core/options_validator_error_handler.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/core/options_validator_error_handler.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/core/options_validator_error_handler.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/core/options_validator_error_handler.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/core/options_validator_error_handler.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/core/options_validator_error_handler.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/core/options_validator_error_handler.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/core/types.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/core/types.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/core/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/core/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/core/validator.test.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/core/validator.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/core/validator.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/core/validator.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/core/validator.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/core/validator.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/core/validator.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/core/validator.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/core/validator_rules.test.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/core/validator_rules.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/core/validator_rules.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/core/validator_rules.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/core/validator_rules.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/core/validator_rules.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/core/validator_rules.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/core/validator_rules.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/index.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/index.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/index.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/index.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/options_validator.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/options_validator.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/options_validator.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/options_validator.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/options_validator_errors_handler.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/options_validator_errors_handler.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/options_validator_errors_handler.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/options_validator_errors_handler.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/types.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/types.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/types.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/types.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/validator_rules.test.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/validator_rules.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/validator_rules.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/validator_rules.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/utils/options_validator/validator_rules.ts b/packages/devextreme/js/__internal/scheduler/entities/options/validator/validator_rules.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/utils/options_validator/validator_rules.ts rename to packages/devextreme/js/__internal/scheduler/entities/options/validator/validator_rules.ts diff --git a/packages/devextreme/js/__internal/scheduler/entities/resource/agenda-group-utils.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/agenda-group-utils.ts index 0aba8552ab6b..878cc7be8cff 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/resource/agenda-group-utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/agenda-group-utils.ts @@ -1,4 +1,4 @@ -import type { ListEntity } from '../../view_model/types'; +import type { ListEntity } from '../appointment-view-model/types'; import type { ResourceLoader } from './loader'; import type { GroupNode } from './types'; diff --git a/packages/devextreme/js/__internal/scheduler/entities/resource/group-utils.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/group-utils.ts index fc50de0c28ac..6bc0749db9a1 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/resource/group-utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/group-utils.ts @@ -83,8 +83,11 @@ export const getResourcesByGroupIndex = ( return Object.entries(resourceById) .filter(([resourceIndex]) => leafGroups[resourceIndex] !== undefined) - .map(([resourceIndex, resource]) => ({ - ...resource, - items: resource.items.filter((item) => item.id === leafGroups[resourceIndex]), - }) as ResourceLoader); + .map(([resourceIndex, resource]) => { + const filteredResource = { + ...resource, + items: resource.items.filter((item) => item.id === leafGroups[resourceIndex]), + }; + return filteredResource as ResourceLoader; + }); }; diff --git a/packages/devextreme/js/__internal/scheduler/entities/resource/loader.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/loader.ts index 1f0422264d64..24db6c3a6ba0 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/resource/loader.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/loader.ts @@ -2,14 +2,14 @@ import { getAppointmentResourceAccessor, getResourceIndex, type ResourceIdAccessor, -} from '../../utils/data_accessor/appointment_resource_data_accessor'; -import { ResourceDataAccessor } from '../../utils/data_accessor/resource_data_accessor'; -import { Loader } from '../../utils/loader/loader'; +} from '../data-source/data-accessor/appointment_resource_data_accessor'; +import { ResourceDataAccessor } from '../data-source/data-accessor/resource_data_accessor'; +import { Loader } from '../data-source/loader/loader'; import type { RawResourceData, ResourceConfig, ResourceData, -} from '../../utils/loader/types'; +} from '../data-source/loader/types'; export class ResourceLoader extends Loader { public idsGetter: ResourceIdAccessor['idsGetter']; diff --git a/packages/devextreme/js/__internal/scheduler/entities/resource/manager.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/manager.ts index 319167360a3c..4cef3d70ad7d 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/resource/manager.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/manager.ts @@ -1,10 +1,10 @@ import type { SafeAppointment } from '@ts/scheduler/types'; -import { getResourceIndex } from '../../utils/data_accessor/appointment_resource_data_accessor'; +import { getResourceIndex } from '../data-source/data-accessor/appointment_resource_data_accessor'; import { ResourceLoader } from './loader'; import type { ResourceConfig, -} from '../../utils/loader/types'; +} from '../data-source/loader/types'; import { getAppointmentColor } from './color-utils'; import type { AppointmentResource } from './appointment-groups-utils'; import { diff --git a/packages/devextreme/js/__internal/scheduler/entities/resource/types.ts b/packages/devextreme/js/__internal/scheduler/entities/resource/types.ts index 95fb0adf46c9..91436e4a95aa 100644 --- a/packages/devextreme/js/__internal/scheduler/entities/resource/types.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/resource/types.ts @@ -1,4 +1,4 @@ -import type { ResourceId, ResourceData } from '../../utils/loader/types'; +import type { ResourceId, ResourceData } from '../data-source/loader/types'; export type { ResourceId, ResourceData }; export type GroupValues = Record; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/const.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/const.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/workspaces/const.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/const.ts diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/helpers/m_position_helper.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/helpers/m_position_helper.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/workspaces/helpers/m_position_helper.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/helpers/m_position_helper.ts diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_agenda.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_agenda.ts index 0d1168b0d348..a65b5eef34bc 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_agenda.ts @@ -16,13 +16,13 @@ import { GROUP_HEADER_CONTENT_CLASS, GROUP_ROW_CLASS, TIME_PANEL_CLASS, -} from '../m_classes'; -import tableCreatorModule from '../m_table_creator'; -import { agendaUtils, formatWeekday, getVerticalGroupCountClass } from '../r1/utils/index'; -import { VIEWS } from '../utils/options/constants_view'; -import { reduceResourcesTree } from '../entities/resource/agenda-group-utils'; -import type { GroupNode } from '../entities/resource/types'; -import type { ListEntity } from '../view_model/types'; +} from '../../m_classes'; +import tableCreatorModule from '../../m_table_creator'; +import { agendaUtils, formatWeekday, getVerticalGroupCountClass } from '../../r1/utils/index'; +import { VIEWS } from '../options/options/constants_view'; +import { reduceResourcesTree } from '../resource/agenda-group-utils'; +import type { GroupNode } from '../resource/types'; +import type { ListEntity } from '../appointment-view-model/types'; import WorkSpace from './m_work_space'; const { tableCreator } = tableCreatorModule; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_cells_selection_controller.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_cells_selection_controller.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_cells_selection_controller.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_cells_selection_controller.ts diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_cells_selection_state.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_cells_selection_state.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_cells_selection_state.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_cells_selection_state.ts diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline.ts index 6c24269b020f..0e2e472e8d4a 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline.ts @@ -14,10 +14,10 @@ import { GROUP_HEADER_CONTENT_CLASS, GROUP_ROW_CLASS, HEADER_CURRENT_TIME_CELL_CLASS, -} from '../m_classes'; -import tableCreatorModule from '../m_table_creator'; -import timezoneUtils from '../entities/timezone/utils'; -import HorizontalShader from '../entities/shaders/current-time-shader-horizontal'; +} from '../../m_classes'; +import tableCreatorModule from '../../m_table_creator'; +import timezoneUtils from '../timezone/utils'; +import HorizontalShader from '../shaders/current-time-shader-horizontal'; import SchedulerWorkSpace from './m_work_space_indicator'; const { tableCreator } = tableCreatorModule; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_day.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_day.ts similarity index 89% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_day.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_day.ts index 6bfe83908d05..4a21c9c4ae45 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_day.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_day.ts @@ -1,6 +1,6 @@ import registerComponent from '@js/core/component_registrator'; -import { VIEWS } from '../utils/options/constants_view'; +import { VIEWS } from '../options/options/constants_view'; import SchedulerTimeline from './m_timeline'; const TIMELINE_CLASS = 'dx-scheduler-timeline-day'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_month.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_month.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_month.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_month.ts index 78b3a8d04e13..d08746431539 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_month.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_month.ts @@ -4,7 +4,7 @@ import dateUtils from '@js/core/utils/date'; import { HeaderPanelComponent } from '@ts/scheduler/r1/components/index'; import { formatWeekdayAndDay, monthUtils } from '@ts/scheduler/r1/utils/index'; -import { VIEWS } from '../utils/options/constants_view'; +import { VIEWS } from '../options/options/constants_view'; import SchedulerTimeline from './m_timeline'; const TIMELINE_CLASS = 'dx-scheduler-timeline-month'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_week.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_week.ts similarity index 92% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_week.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_week.ts index c2a78f0fed29..589e01bf49ae 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_week.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_week.ts @@ -1,7 +1,7 @@ import registerComponent from '@js/core/component_registrator'; import { getBoundingRect } from '@js/core/utils/position'; -import { VIEWS } from '../utils/options/constants_view'; +import { VIEWS } from '../options/options/constants_view'; import SchedulerTimeline from './m_timeline'; const TIMELINE_CLASS = 'dx-scheduler-timeline-week'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_work_week.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_work_week.ts similarity index 93% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_work_week.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_work_week.ts index aa98995aa062..4b9936234933 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_work_week.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_timeline_work_week.ts @@ -3,7 +3,7 @@ import { getWeekendsCount, } from '@ts/scheduler/r1/utils/index'; -import { VIEWS } from '../utils/options/constants_view'; +import { VIEWS } from '../options/options/constants_view'; import SchedulerTimelineWeek from './m_timeline_week'; const TIMELINE_CLASS = 'dx-scheduler-timeline-work-week'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_virtual_scrolling.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_virtual_scrolling.ts diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space.ts index 8335b6d950b6..1796bc033742 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space.ts @@ -52,10 +52,10 @@ import { import type { ViewType } from '@ts/scheduler/types'; import Scrollable from '@ts/ui/scroll_view/scrollable'; -import type NotifyScheduler from '../base/m_widget_notify_scheduler'; -import { APPOINTMENT_SETTINGS_KEY } from '../constants'; -import { Cache } from '../global_cache'; -import AppointmentDragBehavior from '../m_appointment_drag_behavior'; +import type NotifyScheduler from '../../base/m_widget_notify_scheduler'; +import { APPOINTMENT_SETTINGS_KEY } from '../../constants'; +import { Cache } from '../../global_cache'; +import AppointmentDragBehavior from '../../m_appointment_drag_behavior'; import { APPOINTMENT_DRAG_SOURCE_CLASS, DATE_TABLE_CLASS, @@ -66,20 +66,20 @@ import { TIME_PANEL_CLASS, VERTICAL_GROUP_COUNT_CLASSES, VIRTUAL_CELL_CLASS, -} from '../m_classes'; -import { CompactAppointmentsHelper } from '../m_compact_appointments_helper'; -import type { SubscribeKey, SubscribeMethods } from '../m_subscribes'; -import tableCreatorModule from '../m_table_creator'; -import { utils } from '../m_utils'; -import VerticalShader from '../entities/shaders/current-time-shader-vertical'; -import type { ResourceLoader } from '../entities/resource/loader'; +} from '../../m_classes'; +import { CompactAppointmentsHelper } from '../../m_compact_appointments_helper'; +import type { SubscribeKey, SubscribeMethods } from '../../m_subscribes'; +import tableCreatorModule from '../../m_table_creator'; +import { utils } from '../../m_utils'; +import VerticalShader from '../shaders/current-time-shader-vertical'; +import type { ResourceLoader } from '../resource/loader'; import { getAppointmentGroupIndex, getSafeGroupValues, -} from '../entities/resource/appointment-groups-utils'; -import { getLeafGroupValues } from '../entities/resource/group-utils'; -import type { ResourceManager } from '../entities/resource/manager'; -import type { GroupValues, RawGroupValues } from '../entities/resource/types'; +} from '../resource/appointment-groups-utils'; +import { getLeafGroupValues } from '../resource/group-utils'; +import type { ResourceManager } from '../resource/manager'; +import type { GroupValues, RawGroupValues } from '../resource/types'; import { getAllDayHeight, getCellHeight, diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_day.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_day.ts similarity index 92% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_day.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_day.ts index 1e184dd264ce..61edd4d0b6ee 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_day.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_day.ts @@ -1,6 +1,6 @@ import registerComponent from '@js/core/component_registrator'; -import { VIEWS } from '../utils/options/constants_view'; +import { VIEWS } from '../options/options/constants_view'; import SchedulerWorkSpaceVertical from './m_work_space_vertical'; const DAY_CLASS = 'dx-scheduler-work-space-day'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_grouped_strategy_horizontal.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_grouped_strategy_horizontal.ts index 121ac7ce3712..cbd09850c9d4 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_grouped_strategy_horizontal.ts @@ -1,7 +1,7 @@ import { getBoundingRect } from '@js/core/utils/position'; -import { WORK_SPACE_BORDER_PX } from '@ts/scheduler/workspaces/const'; +import { WORK_SPACE_BORDER_PX } from './const'; -import { FIRST_GROUP_CELL_CLASS, LAST_GROUP_CELL_CLASS } from '../m_classes'; +import { FIRST_GROUP_CELL_CLASS, LAST_GROUP_CELL_CLASS } from '../../m_classes'; class HorizontalGroupedStrategy { constructor(public _workSpace) { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_grouped_strategy_vertical.ts similarity index 97% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_grouped_strategy_vertical.ts index 8edcbf3a854b..bca275600f32 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_grouped_strategy_vertical.ts @@ -1,9 +1,9 @@ import { getBoundingRect } from '@js/core/utils/position'; import { calculateDayDuration, getVerticalGroupCountClass } from '@ts/scheduler/r1/utils/index'; -import { WORK_SPACE_BORDER_PX } from '@ts/scheduler/workspaces/const'; +import { WORK_SPACE_BORDER_PX } from './const'; -import { Cache } from '../global_cache'; -import { FIRST_GROUP_CELL_CLASS, LAST_GROUP_CELL_CLASS } from '../m_classes'; +import { Cache } from '../../global_cache'; +import { FIRST_GROUP_CELL_CLASS, LAST_GROUP_CELL_CLASS } from '../../m_classes'; class VerticalGroupedStrategy { cache = new Cache(); diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_indicator.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_indicator.ts index beb19c5bbded..0f5eb7e93eb4 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_indicator.ts @@ -8,8 +8,8 @@ import { hasWindow } from '@js/core/utils/window'; import { dateUtilsTs } from '@ts/core/utils/date'; import { getToday } from '@ts/scheduler/r1/utils/index'; -import { HEADER_CURRENT_TIME_CELL_CLASS } from '../m_classes'; -import timezoneUtils from '../entities/timezone/utils'; +import { HEADER_CURRENT_TIME_CELL_CLASS } from '../../m_classes'; +import timezoneUtils from '../timezone/utils'; import SchedulerWorkSpace from './m_work_space'; const toMs = dateUtils.dateToMilliseconds; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_month.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_month.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_month.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_month.ts index 9c06047ee21b..d601e43e433c 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_month.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_month.ts @@ -7,8 +7,8 @@ import { hasWindow } from '@js/core/utils/window'; import { DateTableMonthComponent } from '@ts/scheduler/r1/components/index'; import { formatWeekday, monthUtils } from '@ts/scheduler/r1/utils/index'; -import { utils } from '../m_utils'; -import { VIEWS } from '../utils/options/constants_view'; +import { utils } from '../../m_utils'; +import { VIEWS } from '../options/options/constants_view'; import SchedulerWorkSpace from './m_work_space_indicator'; const MONTH_CLASS = 'dx-scheduler-work-space-month'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_vertical.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_vertical.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_vertical.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_vertical.ts diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_week.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_week.ts similarity index 91% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_week.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_week.ts index c149aab4b726..c39cce3f0e0e 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_week.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_week.ts @@ -1,7 +1,7 @@ import registerComponent from '@js/core/component_registrator'; import { weekUtils } from '@ts/scheduler/r1/utils/index'; -import { VIEWS } from '../utils/options/constants_view'; +import { VIEWS } from '../options/options/constants_view'; import SchedulerWorkSpaceVertical from './m_work_space_vertical'; const WEEK_CLASS = 'dx-scheduler-work-space-week'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_work_week.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_work_week.ts similarity index 91% rename from packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_work_week.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_work_week.ts index e1d7b6761cc4..6b42aea8a316 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_work_week.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/m_work_space_work_week.ts @@ -3,7 +3,7 @@ import { getWeekendsCount, } from '@ts/scheduler/r1/utils/index'; -import { VIEWS } from '../utils/options/constants_view'; +import { VIEWS } from '../options/options/constants_view'; import SchedulerWorkSpaceWeek from './m_work_space_week'; const WORK_WEEK_CLASS = 'dx-scheduler-work-space-work-week'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_date_header_data_generator.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_date_header_data_generator.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_date_header_data_generator.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_date_header_data_generator.ts index ea3e7b1ee789..c8500fa2cd6d 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_date_header_data_generator.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_date_header_data_generator.ts @@ -1,7 +1,7 @@ import dateUtils from '@js/core/utils/date'; import type { DateHeaderData } from '@ts/scheduler/types'; -import timeZoneUtils from '../../entities/timezone/utils'; +import timeZoneUtils from '../../timezone/utils'; import { formatWeekdayAndDay, getDisplayedCellCount, @@ -9,8 +9,8 @@ import { getHorizontalGroupCount, getTotalCellCountByCompleteData, isTimelineView, -} from '../../r1/utils/index'; -import { VIEWS } from '../../utils/options/constants_view'; +} from '../../../r1/utils/index'; +import { VIEWS } from '../../options/options/constants_view'; import type { ViewDataProviderExtendedOptions } from './m_types'; export class DateHeaderDataGenerator { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_grouped_data_map_provider.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_grouped_data_map_provider.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_grouped_data_map_provider.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_grouped_data_map_provider.ts index 35a3465adb90..0bc16c4896c7 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_grouped_data_map_provider.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_grouped_data_map_provider.ts @@ -2,7 +2,7 @@ import dateUtils from '@js/core/utils/date'; import { dateUtilsTs } from '@ts/core/utils/date'; import { isDateAndTimeView } from '@ts/scheduler/r1/utils/index'; -import timezoneUtils from '../../entities/timezone/utils'; +import timezoneUtils from '../../timezone/utils'; const toMs = dateUtils.dateToMilliseconds; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_time_panel_data_generator.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_time_panel_data_generator.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_time_panel_data_generator.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_time_panel_data_generator.ts diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_types.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_types.ts similarity index 85% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_types.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_types.ts index 813d07bd9310..d872b402e598 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_types.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_types.ts @@ -1,13 +1,13 @@ -import type { TimeZoneCalculator } from '../../entities/timezone'; +import type { TimeZoneCalculator } from '../../timezone'; import type { CountGenerationConfig, GetDateForHeaderText, GroupOrientation, ViewOptions, ViewType, -} from '../../types'; -import type { ResourceManager } from '../../entities/resource/manager'; -import type { GroupLeaf } from '../../entities/resource/types'; +} from '../../../types'; +import type { ResourceManager } from '../../resource/manager'; +import type { GroupLeaf } from '../../resource/types'; interface CommonOptions extends CountGenerationConfig { getResourceManager: () => ResourceManager; @@ -43,6 +43,10 @@ export interface ViewDataProviderExtendedOptions extends CommonOptions, ViewOpti isGroupedByDate: boolean; isGroupedAllDayPanel: boolean; interval: number; + startDayHour: number; + endDayHour: number; + intervalCount: number; + currentDate: Date; } export interface ViewCellDataSimple { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator.ts index 2796daa92072..4b7ab6a9eb2a 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator.ts @@ -1,9 +1,9 @@ import dateUtils from '@js/core/utils/date'; import { dateUtilsTs } from '@ts/core/utils/date'; -import type { GroupLeaf } from '../../entities/resource/types'; +import type { GroupLeaf } from '../../resource/types'; -import { HORIZONTAL_GROUP_ORIENTATION } from '../../constants'; -import timezoneUtils from '../../entities/timezone/utils'; +import { HORIZONTAL_GROUP_ORIENTATION } from '../../../constants'; +import timezoneUtils from '../../timezone/utils'; import { calculateCellIndex, calculateDayDuration, @@ -14,10 +14,10 @@ import { getTotalCellCountByCompleteData, getTotalRowCountByCompleteData, isHorizontalView, -} from '../../r1/utils/index'; -import type { ViewDataMap, ViewType } from '../../types'; -import { VIEWS } from '../../utils/options/constants_view'; -import { getAllGroupValues } from '../../entities/resource/group-utils'; +} from '../../../r1/utils/index'; +import type { ViewDataMap, ViewType } from '../../../types'; +import { VIEWS } from '../../options/options/constants_view'; +import { getAllGroupValues } from '../../resource/group-utils'; import type { ViewCellDataSimple, ViewCellGeneratedData, diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_day.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_day.ts similarity index 87% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_day.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_day.ts index 271236ee7e13..fc2a36709be4 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_day.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_day.ts @@ -1,4 +1,4 @@ -import { dayUtils } from '../../r1/utils/index'; +import { dayUtils } from '../../../r1/utils/index'; import { ViewDataGenerator } from './m_view_data_generator'; export class ViewDataGeneratorDay extends ViewDataGenerator { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_month.ts similarity index 98% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_month.ts index 9f83e17ab109..9af6c8d650df 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_month.ts @@ -4,7 +4,7 @@ import { getToday, isFirstCellInMonthWithIntervalCount, monthUtils, setOptionHour, } from '@ts/scheduler/r1/utils/index'; -import timezoneUtils from '../../entities/timezone/utils'; +import timezoneUtils from '../../timezone/utils'; import type { MonthViewCellDataSimple, ViewDataProviderExtendedOptions } from './m_types'; import { ViewDataGenerator } from './m_view_data_generator'; import { calculateAlignedWeeksBetweenDates } from './utils/view_generator_utils'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_timeline_month.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_timeline_month.ts similarity index 95% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_timeline_month.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_timeline_month.ts index 77dc0d39ba99..c06cb9b99339 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_timeline_month.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_timeline_month.ts @@ -1,7 +1,7 @@ import dateUtils from '@js/core/utils/date'; import { setOptionHour, timelineMonthUtils } from '@ts/scheduler/r1/utils/index'; -import timezoneUtils from '../../entities/timezone/utils'; +import timezoneUtils from '../../timezone/utils'; import { ViewDataGenerator } from './m_view_data_generator'; const toMs = dateUtils.dateToMilliseconds; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_week.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_week.ts similarity index 91% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_week.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_week.ts index c6635121685a..bca4e2662e9a 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_week.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_week.ts @@ -1,4 +1,4 @@ -import { weekUtils } from '../../r1/utils/index'; +import { weekUtils } from '../../../r1/utils/index'; import { ViewDataGenerator } from './m_view_data_generator'; export class ViewDataGeneratorWeek extends ViewDataGenerator { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_work_week.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_work_week.ts similarity index 89% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_work_week.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_work_week.ts index 400b4e85b29b..32b8157b3be5 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_work_week.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_generator_work_week.ts @@ -1,4 +1,4 @@ -import { isDataOnWeekend, workWeekUtils } from '../../r1/utils/index'; +import { isDataOnWeekend, workWeekUtils } from '../../../r1/utils/index'; import { ViewDataGeneratorWeek } from './m_view_data_generator_week'; export class ViewDataGeneratorWorkWeek extends ViewDataGeneratorWeek { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_provider.ts similarity index 99% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_provider.ts index 2904553845af..e20b9fd823f2 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_provider.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/m_view_data_provider.ts @@ -1,7 +1,7 @@ import dateUtils from '@js/core/utils/date'; import { dateUtilsTs } from '@ts/core/utils/date'; -import timeZoneUtils from '../../entities/timezone/utils'; +import timeZoneUtils from '../../timezone/utils'; import { calculateIsGroupedAllDayPanel, getGroupPanelData, @@ -9,7 +9,7 @@ import { isHorizontalGroupingApplied, isHorizontalView, isVerticalGroupingApplied, -} from '../../r1/utils/index'; +} from '../../../r1/utils/index'; import type { CountGenerationConfig, DateHeaderData, @@ -17,7 +17,7 @@ import type { ViewCellData, ViewDataMap, ViewOptions, ViewType, -} from '../../types'; +} from '../../../types'; import { DateHeaderDataGenerator } from './m_date_header_data_generator'; import { GroupedDataMapProvider } from './m_grouped_data_map_provider'; import { TimePanelDataGenerator } from './m_time_panel_data_generator'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/utils/view_generator_utils.test.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/utils/view_generator_utils.test.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/utils/view_generator_utils.test.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/utils/view_generator_utils.test.ts diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/utils/view_generator_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/utils/view_generator_utils.ts similarity index 100% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/utils/view_generator_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/utils/view_generator_utils.ts diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/utils/view_provider_utils.ts b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/utils/view_provider_utils.ts similarity index 90% rename from packages/devextreme/js/__internal/scheduler/workspaces/view_model/utils/view_provider_utils.ts rename to packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/utils/view_provider_utils.ts index 0fa21be40834..09ebaaf3d5ad 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/utils/view_provider_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/entities/workspace/view_model/utils/view_provider_utils.ts @@ -1,5 +1,5 @@ -import type { ViewType } from '../../../types'; -import { VIEWS } from '../../../utils/options/constants_view'; +import type { ViewType } from '../../../../types'; +import { VIEWS } from '../../../options/options/constants_view'; import { ViewDataGenerator } from '../m_view_data_generator'; import { ViewDataGeneratorDay } from '../m_view_data_generator_day'; import { ViewDataGeneratorMonth } from '../m_view_data_generator_month'; diff --git a/packages/devextreme/js/__internal/scheduler/m_appointment_drag_behavior.ts b/packages/devextreme/js/__internal/scheduler/m_appointment_drag_behavior.ts index 7d7b4a787f75..0bcb376bcb1f 100644 --- a/packages/devextreme/js/__internal/scheduler/m_appointment_drag_behavior.ts +++ b/packages/devextreme/js/__internal/scheduler/m_appointment_drag_behavior.ts @@ -5,7 +5,7 @@ import Draggable from '@js/ui/draggable'; import { APPOINTMENT_SETTINGS_KEY, LIST_ITEM_DATA_KEY } from './constants'; import { isSchedulerComponent } from './utils/is_scheduler_component'; -import type { AppointmentViewModelPlain } from './view_model/types'; +import type { AppointmentViewModelPlain } from './entities/appointment-view-model/types'; const APPOINTMENT_ITEM_CLASS = 'dx-scheduler-appointment'; diff --git a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts index 270a4e463d7c..46497be41a7f 100644 --- a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts @@ -38,7 +38,7 @@ import { AppointmentForm } from './entities/appointment-popup/form'; import { AppointmentForm as AppointmentLegacyForm } from './entities/appointment-popup/legacy_form'; import { ACTION_TO_APPOINTMENT, AppointmentPopup as AppointmentLegacyPopup } from './entities/appointment-popup/legacy_popup'; import { AppointmentPopup } from './entities/appointment-popup/popup'; -import AppointmentCollection from './appointments/m_appointment_collection'; +import AppointmentCollection from './entities/appointment/m_appointment_collection'; import NotifyScheduler from './base/m_widget_notify_scheduler'; import { SchedulerHeader } from './entities/header/header'; import type { HeaderOptions } from './entities/header/types'; @@ -66,29 +66,29 @@ import type { SafeAppointment, ScrollToGroupValuesOrOptions, ScrollToOptions, TargetedAppointment, } from './types'; -import { AppointmentAdapter } from './utils/appointment_adapter/appointment_adapter'; -import { AppointmentDataAccessor } from './utils/data_accessor/appointment_data_accessor'; +import { AppointmentAdapter } from './entities/appointment/adapter/appointment_adapter'; +import { AppointmentDataAccessor } from './entities/data-source/data-accessor/appointment_data_accessor'; import { getTargetedAppointment } from './utils/get_targeted_appointment'; import type { IFieldExpr } from './utils/index'; import { macroTaskArray } from './utils/index'; import { isAgendaWorkspaceComponent } from './utils/is_agenda_workpace_component'; -import { VIEWS } from './utils/options/constants_view'; -import type { NormalizedView } from './utils/options/types'; +import { VIEWS } from './entities/options/options/constants_view'; +import type { NormalizedView } from './entities/options/options/types'; import { setAppointmentGroupValues } from './entities/resource/appointment-groups-utils'; import { createResourceEditorModel } from './entities/resource/popup-utils'; import { ResourceManager } from './entities/resource/manager'; -import AppointmentLayoutManager from './view_model/appointments_layout_manager'; -import { AppointmentDataSource } from './view_model/m_appointment_data_source'; -import type { AppointmentViewModelPlain } from './view_model/types'; -import SchedulerAgenda from './workspaces/m_agenda'; -import SchedulerTimelineDay from './workspaces/m_timeline_day'; -import SchedulerTimelineMonth from './workspaces/m_timeline_month'; -import SchedulerTimelineWeek from './workspaces/m_timeline_week'; -import SchedulerTimelineWorkWeek from './workspaces/m_timeline_work_week'; -import SchedulerWorkSpaceDay from './workspaces/m_work_space_day'; -import SchedulerWorkSpaceMonth from './workspaces/m_work_space_month'; -import SchedulerWorkSpaceWeek from './workspaces/m_work_space_week'; -import SchedulerWorkSpaceWorkWeek from './workspaces/m_work_space_work_week'; +import AppointmentLayoutManager from './entities/appointment-view-model/appointments_layout_manager'; +import { AppointmentDataSource } from './entities/appointment-view-model/m_appointment_data_source'; +import type { AppointmentViewModelPlain } from './entities/appointment-view-model/types'; +import SchedulerAgenda from './entities/workspace/m_agenda'; +import SchedulerTimelineDay from './entities/workspace/m_timeline_day'; +import SchedulerTimelineMonth from './entities/workspace/m_timeline_month'; +import SchedulerTimelineWeek from './entities/workspace/m_timeline_week'; +import SchedulerTimelineWorkWeek from './entities/workspace/m_timeline_work_week'; +import SchedulerWorkSpaceDay from './entities/workspace/m_work_space_day'; +import SchedulerWorkSpaceMonth from './entities/workspace/m_work_space_month'; +import SchedulerWorkSpaceWeek from './entities/workspace/m_work_space_week'; +import SchedulerWorkSpaceWorkWeek from './entities/workspace/m_work_space_work_week'; const toMs = dateUtils.dateToMilliseconds; diff --git a/packages/devextreme/js/__internal/scheduler/m_subscribes.ts b/packages/devextreme/js/__internal/scheduler/m_subscribes.ts index 5499536f3102..e9cdda402b26 100644 --- a/packages/devextreme/js/__internal/scheduler/m_subscribes.ts +++ b/packages/devextreme/js/__internal/scheduler/m_subscribes.ts @@ -4,8 +4,8 @@ import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; -import { formatDates, getFormatType } from './appointments/m_text_utils'; -import { getDeltaTime } from './appointments/resizing/get_delta_time'; +import { formatDates, getFormatType } from './entities/appointment/m_text_utils'; +import { getDeltaTime } from './entities/appointment/resizing/get_delta_time'; import { VERTICAL_VIEW_TYPES } from './constants'; import type Scheduler from './m_scheduler'; import { utils } from './m_utils'; @@ -16,8 +16,8 @@ import type { SafeAppointment, TargetedAppointment, } from './types'; -import { AppointmentAdapter } from './utils/appointment_adapter/appointment_adapter'; -import type { AppointmentItemViewModel } from './view_model/types'; +import { AppointmentAdapter } from './entities/appointment/adapter/appointment_adapter'; +import type { AppointmentItemViewModel } from './entities/appointment-view-model/types'; const toMs = dateUtils.dateToMilliseconds; const isAllDay = ( diff --git a/packages/devextreme/js/__internal/scheduler/m_utils.ts b/packages/devextreme/js/__internal/scheduler/m_utils.ts index 5ec2aa60830c..7c7b7dbb9c38 100644 --- a/packages/devextreme/js/__internal/scheduler/m_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/m_utils.ts @@ -3,7 +3,7 @@ import $ from '@js/core/renderer'; import { getOuterHeight, setHeight, setWidth } from '@js/core/utils/size'; import { APPOINTMENT_SETTINGS_KEY } from './constants'; -import type { AppointmentViewModelPlain } from './view_model/types'; +import type { AppointmentViewModelPlain } from './entities/appointment-view-model/types'; export const utils = { dataAccessors: { diff --git a/packages/devextreme/js/__internal/scheduler/r1/filterting/remote.ts b/packages/devextreme/js/__internal/scheduler/r1/filterting/remote.ts index 237a65c0af08..5f9dafec3302 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/filterting/remote.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/filterting/remote.ts @@ -3,7 +3,7 @@ import dateSerialization from '@js/core/utils/date_serialization'; import { extend } from '@js/core/utils/extend'; import { isDefined, isString } from '@js/core/utils/type'; -import type { AppointmentDataAccessor } from '../../utils/data_accessor/appointment_data_accessor'; +import type { AppointmentDataAccessor } from '../../entities/data-source/data-accessor/appointment_data_accessor'; import { getDatesWithoutTime } from '../utils/index'; import type { CombineRemoteFilterType, diff --git a/packages/devextreme/js/__internal/scheduler/r1/filterting/types.ts b/packages/devextreme/js/__internal/scheduler/r1/filterting/types.ts index 2dfc5d978edb..cf96174c557e 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/filterting/types.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/filterting/types.ts @@ -1,4 +1,4 @@ -import type { AppointmentDataAccessor } from '../../utils/data_accessor/appointment_data_accessor'; +import type { AppointmentDataAccessor } from '../../entities/data-source/data-accessor/appointment_data_accessor'; export type DateFilterType = string | string[] | (string | Date)[][]; diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.ts index 5fd0f476dbb6..c092194ec0ae 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/agenda.ts @@ -1,5 +1,5 @@ import timeZoneUtils from '../../entities/timezone/utils'; -import type { ListEntity } from '../../view_model/types'; +import type { ListEntity } from '../../entities/appointment-view-model/types'; import { setOptionHour } from './base'; export const calculateStartViewDate = (currentDate: Date, startDayHour: number): Date => { diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts index 1f682d15c6e7..0eac2ef2f294 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts @@ -22,8 +22,8 @@ import type { ViewType, } from '../../types'; import type { ResourceLoader } from '../../entities/resource/loader'; -import type { ResourceId } from '../../utils/loader/types'; -import { VIEWS } from '../../utils/options/constants_view'; +import type { ResourceId } from '../../entities/data-source/loader/types'; +import { VIEWS } from '../../entities/options/options/constants_view'; const toMs = dateUtils.dateToMilliseconds; const DAY_HOURS = 24; diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/exclude_from_recurrence.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/exclude_from_recurrence.ts index 43be51732e4d..a835018848f9 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/exclude_from_recurrence.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/exclude_from_recurrence.ts @@ -1,8 +1,8 @@ import dateSerialization from '@js/core/utils/date_serialization'; import type { Appointment } from '@js/ui/scheduler'; -import { AppointmentAdapter } from '../../utils/appointment_adapter/appointment_adapter'; -import type { AppointmentDataAccessor } from '../../utils/data_accessor/appointment_data_accessor'; +import { AppointmentAdapter } from '../../entities/appointment/adapter/appointment_adapter'; +import type { AppointmentDataAccessor } from '../../entities/data-source/data-accessor/appointment_data_accessor'; const FULL_DATE_FORMAT = 'yyyyMMddTHHmmss'; const UTC_FULL_DATE_FORMAT = `${FULL_DATE_FORMAT}Z`; diff --git a/packages/devextreme/js/__internal/scheduler/scheduler_options_base_widget.ts b/packages/devextreme/js/__internal/scheduler/scheduler_options_base_widget.ts index a9420d7544bf..c46aa71ecd01 100644 --- a/packages/devextreme/js/__internal/scheduler/scheduler_options_base_widget.ts +++ b/packages/devextreme/js/__internal/scheduler/scheduler_options_base_widget.ts @@ -7,12 +7,12 @@ import { DEFAULT_SCHEDULER_INTERNAL_OPTIONS, DEFAULT_SCHEDULER_OPTIONS, DEFAULT_SCHEDULER_OPTIONS_RULES, -} from './utils/options/constants'; +} from './entities/options/options/constants'; import type { NormalizedView, SafeSchedulerOptions, SchedulerOptionsRule, View, -} from './utils/options/types'; -import { getCurrentView, getViewOption, getViews } from './utils/options/utils'; -import { SchedulerOptionsValidator, SchedulerOptionsValidatorErrorsHandler } from './utils/options_validator/index'; +} from './entities/options/options/types'; +import { getCurrentView, getViewOption, getViews } from './entities/options/options/utils'; +import { SchedulerOptionsValidator, SchedulerOptionsValidatorErrorsHandler } from './entities/options/validator/index'; export class SchedulerOptionsBaseWidget extends Widget { protected views: NormalizedView[] = []; diff --git a/packages/devextreme/js/__internal/scheduler/types.ts b/packages/devextreme/js/__internal/scheduler/types.ts index b47a7df218c0..1c5093b29acb 100644 --- a/packages/devextreme/js/__internal/scheduler/types.ts +++ b/packages/devextreme/js/__internal/scheduler/types.ts @@ -3,7 +3,7 @@ import type { Appointment, Properties } from '@js/ui/scheduler'; import type { ResourceLoader } from './entities/resource/loader'; import type { GroupValues, RawGroupValues } from './entities/resource/types'; -import type { AppointmentViewModelPlain } from './view_model/types'; +import type { AppointmentViewModelPlain } from './entities/appointment-view-model/types'; export type Direction = 'vertical' | 'horizontal'; export type GroupOrientation = 'vertical' | 'horizontal'; diff --git a/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.test.ts b/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.test.ts index b5bbd3576a73..4bea7cfe5d84 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.test.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.test.ts @@ -4,7 +4,7 @@ import { import { getResourceManagerMock } from '@ts/scheduler/__mock__/resource_manager.mock'; import { mockUppercaseFieldExpressions } from '../__mock__/appointment_data_accessor.mock'; -import { AppointmentDataAccessor } from './data_accessor/appointment_data_accessor'; +import { AppointmentDataAccessor } from '../entities/data-source/data-accessor/appointment_data_accessor'; import { getTargetedAppointment, getTargetedAppointmentFromInfo } from './get_targeted_appointment'; const dataAccessor = new AppointmentDataAccessor(mockUppercaseFieldExpressions, true); diff --git a/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.ts b/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.ts index ed79a2d5f296..4065a8da7746 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/get_targeted_appointment.ts @@ -3,8 +3,8 @@ import type { AppointmentAgendaViewModel, AppointmentItemViewModel, AppointmentViewModelPlain, -} from '../view_model/types'; -import type { AppointmentDataAccessor } from './data_accessor/appointment_data_accessor'; +} from '../entities/appointment-view-model/types'; +import type { AppointmentDataAccessor } from '../entities/data-source/data-accessor/appointment_data_accessor'; import { setAppointmentGroupValues } from '../entities/resource/appointment-groups-utils'; import { getLeafGroupValues } from '../entities/resource/group-utils'; import type { ResourceManager } from '../entities/resource/manager'; diff --git a/packages/devextreme/js/__internal/scheduler/utils/index.ts b/packages/devextreme/js/__internal/scheduler/utils/index.ts index 0c10055880f9..67ee97c41809 100644 --- a/packages/devextreme/js/__internal/scheduler/utils/index.ts +++ b/packages/devextreme/js/__internal/scheduler/utils/index.ts @@ -1,4 +1,4 @@ -import type { IFieldExpr } from './data_accessor/types'; +import type { IFieldExpr } from '../entities/data-source/data-accessor/types'; import macroTaskArray from './macro_task_array/index'; export {