Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
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 type { ResourceConfig } from '../entities/data-source/loader/types';
import { ResourceManager } from '../entities/resource/manager';

export const resourceItemsByIdMock = {
'nested.priorityId': [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { createTimeZoneCalculator } from '../r1/timezone_calculator/utils';
import { createTimeZoneCalculator } from '../entities/timezone/calculator-utils';

export const mockTimeZoneCalculator = createTimeZoneCalculator('UTC');
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 '../options/options/constants';

const CLASSES = {
icon: 'dx-scheduler-form-icon',
Expand Down Expand Up @@ -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;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 '../options/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 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 '../appointment/adapter/appointment_adapter';
import { getAppointmentGroupValues, getRawAppointmentGroupValues } from '../resource/appointment-groups-utils';

const toMs = dateUtils.dateToMilliseconds;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 '../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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type Scheduler from '../../m_scheduler';
import timeZoneUtils from '../../m_utils_time_zone';
import type Scheduler from '../../../m_scheduler';
import timeZoneUtils from '../../timezone/utils';
import type { CompareOptions } from '../types';

export const getCompareOptions = (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type Scheduler from '../../m_scheduler';
import type Scheduler from '../../../m_scheduler';
import type {
Duration, ListEntity, MinimalAppointmentEntity, UTCDates,
UTCDatesBeforeSplit,
Expand Down
Original file line number Diff line number Diff line change
@@ -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 = <T extends MinimalAppointmentEntity>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
describe, expect, it,
} from '@jest/globals';

import { ResourceLoader } from '../../../../utils/loader/resource_loader';
import { ResourceLoader } from '../../../../resource/loader';
import {
isAppointmentMatchedResources,
} from './is_appointment_matched_resources';
Expand Down
Original file line number Diff line number Diff line change
@@ -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 { SafeAppointment } from '../../../../../types';
import type { ResourceLoader } from '../../../../resource/loader';
import { getAppointmentGroupValues } from '../../../../resource/appointment-groups-utils';

export const isAppointmentMatchedResources = (
appointment: SafeAppointment,
Expand Down
Original file line number Diff line number Diff line change
@@ -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 '../../../../utils/resource_manager/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 = ({
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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 type { ResourceConfig } from '../../../data-source/loader/types';
import { ResourceManager } from '../../../resource/manager';
import type { MinimalAppointmentEntity } from '../../types';
import { splitByGroupIndex } from './split_by_group_index';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
getAppointmentGroupIndex,
getAppointmentGroupValues,
} from '../../../utils/resource_manager/appointment_groups_utils';
} from '../../../resource/appointment-groups-utils';
import type { FilterOptions, GroupIndex, MinimalAppointmentEntity } from '../../types';

export const splitByGroupIndex = <T extends MinimalAppointmentEntity>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import dateUtils from '@js/core/utils/date';

import { globalCache } from '../../../../global_cache';
import timeZoneUtils from '../../../../m_utils_time_zone';
import { globalCache } from '../../../../../global_cache';
import timeZoneUtils from '../../../../timezone/utils';

export interface DateInformation {
offsetMs: number;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import timeZoneUtils from '../../../m_utils_time_zone';
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';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import timeZoneUtils from '../m_utils_time_zone';
import timeZoneUtils from '../timezone/utils';
import type {
AppointmentAgendaViewModel,
AppointmentItemViewModel,
Expand Down
Original file line number Diff line number Diff line change
@@ -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 '../../r1/timezone_calculator';
import type Scheduler from '../../../m_scheduler';
import { createTimeZoneCalculator } from '../../timezone';
import { prepareAppointments } from './prepare_appointments';

const schedulerMock = {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { describe, expect, it } from '@jest/globals';

import {
mockAppointmentDataAccessor, mockUppercaseFieldExpressions,
} from '../../../__mock__/appointment_data_accessor.mock';
import { createTimeZoneCalculator } from '../../../r1/timezone_calculator';
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';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { isDefined } from '@js/core/utils/type';

import type { TimeZoneCalculator } from '../../../r1/timezone_calculator';
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 {
Expand Down
Loading
Loading