diff --git a/packages/devextreme/js/__internal/exporter/common/export_load_panel.ts b/packages/devextreme/js/__internal/exporter/common/export_load_panel.ts index 479c16496f3c..33f14d46bf4a 100644 --- a/packages/devextreme/js/__internal/exporter/common/export_load_panel.ts +++ b/packages/devextreme/js/__internal/exporter/common/export_load_panel.ts @@ -7,7 +7,7 @@ import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; import LoadPanel from '@js/ui/load_panel'; -import gridUtils from '@ts/grids/grid_core/m_utils'; +import gridUtils from '@ts/grids/grid_core/utils'; const EXPORT_LOAD_PANEL_CLASS = 'dx-export-loadpanel'; class ExportLoadPanel { diff --git a/packages/devextreme/js/__internal/grids/__docs__/scripts/data_grid/constants.ts b/packages/devextreme/js/__internal/grids/__docs__/scripts/data_grid/constants.ts index 21d43f0719cb..582917739792 100644 --- a/packages/devextreme/js/__internal/grids/__docs__/scripts/data_grid/constants.ts +++ b/packages/devextreme/js/__internal/grids/__docs__/scripts/data_grid/constants.ts @@ -35,7 +35,7 @@ const DATA_GRID_FEATURE_MAP: Record = { core: 'Core', widget: 'Core', widget_base: 'Core', - m_utils: 'Core', + utils: 'Core', m_editing: 'Editing', grouping: 'Grouping', summary: 'Summary', @@ -43,7 +43,7 @@ const DATA_GRID_FEATURE_MAP: Record = { keyboard_navigation: 'Navigation', focus: 'Navigation', columns_controller: 'Columns', - m_aggregate_calculator: 'Data', + aggregate_calculator: 'Data', module_not_extended: 'Passthrough', }; diff --git a/packages/devextreme/js/__internal/grids/data_grid/m_aggregate_calculator.ts b/packages/devextreme/js/__internal/grids/data_grid/aggregate_calculator.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/data_grid/m_aggregate_calculator.ts rename to packages/devextreme/js/__internal/grids/data_grid/aggregate_calculator.ts diff --git a/packages/devextreme/js/__internal/grids/data_grid/core.ts b/packages/devextreme/js/__internal/grids/data_grid/core.ts index 12bc2d92c776..801fd46d6ec8 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/core.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/core.ts @@ -1,6 +1,6 @@ -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import modules from '@ts/grids/grid_core/modules/modules'; import type { Module } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; export default { ...modules, diff --git a/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts b/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts index 34b9ead9cbff..00d592634790 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts @@ -10,7 +10,7 @@ import { getDefaultAlignment } from '@js/core/utils/position'; import { format } from '@js/core/utils/string'; import { isDefined, isFunction } from '@js/core/utils/type'; import errors from '@js/ui/widget/ui.errors'; -import { prepareItems } from '@ts/grids/grid_core/m_export'; +import { prepareItems } from '@ts/grids/grid_core/export'; import List from '@ts/ui/list/list.edit.search'; import type { ColumnHeadersView } from '../../grid_core/column_headers/m_column_headers'; @@ -23,7 +23,7 @@ import type { SelectionController } from '../../grid_core/selection/m_selection' import type { ModuleType } from '../../grid_core/types'; import type { RowsView } from '../../grid_core/views/rows_view'; import dataGridCore from '../core'; -import { isDataColumn } from '../m_utils'; +import { isDataColumn } from '../utils'; const DATAGRID_EXPORT_MENU_CLASS = 'dx-datagrid-export-menu'; const DATAGRID_EXPORT_BUTTON_CLASS = 'dx-datagrid-export-button'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/focus/m_focus.ts b/packages/devextreme/js/__internal/grids/data_grid/focus/m_focus.ts index 6485e1c9c334..415de4710586 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/focus/m_focus.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/focus/m_focus.ts @@ -10,7 +10,7 @@ import type { ModuleType } from '@ts/grids/grid_core/types'; import gridCore from '../core'; import type { GroupingDataControllerExtension, GroupingDataSourceAdapter } from '../grouping/m_grouping'; -import { createGroupFilter } from '../m_utils'; +import { createGroupFilter } from '../utils'; const MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991/* IE11 */; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts index 10e8d1783bac..b928fafc121f 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts @@ -6,9 +6,9 @@ import { each } from '@js/core/utils/iterator'; import { getHeight } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { restoreFocus, setTabIndex } from '@js/ui/shared/accessibility'; +import { registerKeyboardAction } from '@ts/grids/grid_core/accessibility'; import { ColumnContextMenuMixin } from '@ts/grids/grid_core/context_menu/m_column_context_menu_mixin'; import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; -import { registerKeyboardAction } from '@ts/grids/grid_core/m_accessibility'; import type { ModuleType } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts index f1743830c9bd..9e8597ab40e3 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts @@ -8,7 +8,7 @@ import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types' import { combineFilters } from '@ts/grids/grid_core/filter/utils'; import dataGridCore from '../core'; -import { createGroupFilter } from '../m_utils'; +import { createGroupFilter } from '../utils'; import { createOffsetFilter, GroupingHelper as GroupingHelperCore } from './m_grouping_core'; function getContinuationGroupCount(groupOffset, pageSize, groupSize, groupIndex) { diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts index 6d8df2c9bc8a..8fff60b5ed9b 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts @@ -2,7 +2,7 @@ import { normalizeSortingInfo } from '@js/common/data/utils'; import $ from '@js/core/renderer'; import { when } from '@js/core/utils/deferred'; import { combineFilters } from '@ts/grids/grid_core/filter/utils'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import gridCore from '../core'; import type { GroupingDataSourceAdapter } from './m_grouping'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts index c2cf11568d31..00d3fdb5e2f4 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts @@ -9,7 +9,7 @@ import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data import { combineFilters } from '@ts/grids/grid_core/filter/utils'; import dataGridCore from '../core'; -import { createGroupFilter } from '../m_utils'; +import { createGroupFilter } from '../utils'; import { createOffsetFilter, GroupingHelper as GroupingHelperCore } from './m_grouping_core'; import type { DataItem, GroupInfoData, GroupItemData } from './types'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/summary/extenders/summary_data_controller.ts b/packages/devextreme/js/__internal/grids/data_grid/summary/extenders/summary_data_controller.ts index 29427280409b..fefd75b46878 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/summary/extenders/summary_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/summary/extenders/summary_data_controller.ts @@ -17,7 +17,7 @@ import type { ModuleType, OptionChanged } from '@ts/grids/grid_core/types'; import gridCore from '../../core'; import type { ProcessGroupItemsOptions } from '../../grouping/types'; import { isSameContinuationState } from '../../grouping/utils'; -import { isDataColumn } from '../../m_utils'; +import { isDataColumn } from '../../utils'; import { DATAGRID_GROUP_FOOTER_ROW_TYPE, DATAGRID_TOTAL_FOOTER_ROW_TYPE } from '../const'; import type { SummaryDataSourceAdapter } from '../m_summary'; import type { diff --git a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts index 2fba1b185ea2..8535256e4a7e 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts @@ -17,8 +17,8 @@ import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import type { EditingController } from '../../grid_core/editing/m_editing'; import type { RowsView } from '../../grid_core/views/rows_view'; +import AggregateCalculator from '../aggregate_calculator'; import gridCore from '../core'; -import AggregateCalculator from '../m_aggregate_calculator'; import { DATAGRID_CELL_DISABLED, DATAGRID_FOOTER_ROW_CLASS, diff --git a/packages/devextreme/js/__internal/grids/data_grid/m_utils.ts b/packages/devextreme/js/__internal/grids/data_grid/utils.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/data_grid/m_utils.ts rename to packages/devextreme/js/__internal/grids/data_grid/utils.ts diff --git a/packages/devextreme/js/__internal/grids/data_grid/widget_base.ts b/packages/devextreme/js/__internal/grids/data_grid/widget_base.ts index ee65962bc120..5ed2c4ec77e4 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/widget_base.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/widget_base.ts @@ -23,8 +23,8 @@ import { extend } from '@js/core/utils/extend'; import { isString } from '@js/core/utils/type'; import type { Properties } from '@js/ui/data_grid'; import { isMaterialBased } from '@js/ui/themes'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { GridCoreHelper, Module } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import GridCoreWidget from '@ts/grids/grid_core/widget_base'; import gridCore from './core'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/__tests__/utils.test.ts b/packages/devextreme/js/__internal/grids/grid_core/__tests__/utils.test.ts index 83ad32871d01..9e1bf00301eb 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/__tests__/utils.test.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/__tests__/utils.test.ts @@ -15,7 +15,7 @@ import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data import type { DataFilter } from '@ts/grids/grid_core/filter/types'; import type { WrappedLookupDataSource } from '@ts/grids/grid_core/types'; -import gridCoreUtils from '../m_utils'; +import gridCoreUtils from '../utils'; interface CellRect { left: number; diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_accessibility.ts b/packages/devextreme/js/__internal/grids/grid_core/accessibility.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/m_accessibility.ts rename to packages/devextreme/js/__internal/grids/grid_core/accessibility.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity.ts index 6a68cd9f57ae..6cf39dfe5659 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/adaptivity.ts @@ -27,10 +27,10 @@ import type { ProcessedItem } from '../data_controller/types'; import { EDIT_MODE_FORM, EDIT_MODE_POPUP, EDIT_MODE_ROW } from '../editing/const'; import type { EditingController } from '../editing/m_editing'; import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyboard_navigation'; -import gridCoreUtils from '../m_utils'; import { CLASSES as MASTER_DETAIL_CLASSES } from '../master_detail/const'; import modules from '../modules/modules'; import type { OptionChanged, RowKey } from '../types'; +import gridCoreUtils from '../utils'; import type { RowsView } from '../views/rows_view'; import type { ColumnWidth, ViewCellOptions } from '../views/types'; import { isPercentWidth } from '../views/utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_data_controller.ts index 72ea40dbb6b4..94f4c2937aad 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_data_controller.ts @@ -2,9 +2,9 @@ import { isDefined } from '@js/core/utils/type'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import type { DataChange, ProcessedItem } from '@ts/grids/grid_core/data_controller/types'; import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { MasterDetailDataControllerExtension } from '@ts/grids/grid_core/master_detail/m_master_detail'; import type { ModuleType, RowKey } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import { LEGACY_SCROLLING_MODE } from '../../virtual_scrolling/const'; import type { AdaptiveColumnsViewController } from '../adaptivity'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editing_view_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editing_view_controller.ts index 83651aebb3e6..35a8224b98d8 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editing_view_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/extenders/adaptivity_editing_view_controller.ts @@ -5,8 +5,8 @@ /* eslint-disable prefer-rest-params */ import { Deferred, when } from '@js/core/utils/deferred'; import type { EditingController } from '@ts/grids/grid_core/editing/m_editing'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { ModuleType } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants'; import { EDIT_MODE_BATCH, EDIT_MODE_ROW } from '../../editing/const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_assistant/commands/utils.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_assistant/commands/utils.ts index 5fe51a26aeb6..17eb6a27c1ae 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_assistant/commands/utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_assistant/commands/utils.ts @@ -5,7 +5,7 @@ import type { import { isString } from '@js/core/utils/type'; import { dateUtilsTs } from '@ts/core/utils/date'; import { z } from '@ts/grids/grid_core/ai_assistant/zod'; -import { isDateType } from '@ts/grids/grid_core/m_utils'; +import { isDateType } from '@ts/grids/grid_core/utils'; type RowKey = string | number | Record; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.test.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.test.ts index bf0dc2570958..ce950d5a916c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.test.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.test.ts @@ -27,7 +27,7 @@ const mockWidgetInstance = { option: jest.fn(), }; -jest.mock('../m_utils', () => ({ +jest.mock('../utils', () => ({ __esModule: true, default: { getWidgetInstance: jest.fn(() => mockWidgetInstance), diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.ts index 2042c9fb3aac..0d21854acf52 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_chat/ai_chat.ts @@ -20,7 +20,7 @@ import ProgressBar from '@ts/ui/progress_bar'; import type { AIMessage } from '../ai_assistant/types'; import { isAIMessage } from '../ai_assistant/utils'; -import gridCoreUtils from '../m_utils'; +import gridCoreUtils from '../utils'; import { CLASSES, CLEAR_CHAT_ICON, DEFAULT_CHAT_OPTIONS, diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/ai_column_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/ai_column_controller.ts index 31c5133c6143..40d842467e58 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/ai_column_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/ai_column_controller.ts @@ -9,9 +9,9 @@ import type { DataController } from '../../data_controller/data_controller'; import type { DataSourceController } from '../../data_source/data_source_controller'; import type DataSourceAdapter from '../../data_source_adapter/data_source_adapter'; import type { ChangedEvent, RawItemData } from '../../data_source_adapter/types'; -import gridCoreUtils from '../../m_utils'; import { Controller } from '../../modules/modules'; import type { RowKey } from '../../types'; +import gridCoreUtils from '../../utils'; import type { InternalRequestCallbacks } from '../types'; import { getAICommandColumnDefaultOptions, isAIColumnAutoMode, isPromptOption } from '../utils'; import { AIColumnIntegrationController } from './ai_column_integration_controller'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts index ad1eb309d236..87071aa371ab 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts @@ -29,8 +29,8 @@ import type { import type { Coordinates } from '../columns_resizing_reordering/types'; import type { ResizingController } from '../grid_view/grid_view'; import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyboard_navigation'; -import gridCoreUtils from '../m_utils'; import type { ColumnPoint, ModuleType } from '../types'; +import gridCoreUtils from '../utils'; import type { ColumnsView } from '../views/columns_view'; import { normalizeWidth } from '../views/columns_view'; import type { RowsView } from '../views/rows_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts b/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts index 5c7b5245e0ae..13f49b992773 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts @@ -13,9 +13,9 @@ import type { HeaderFilterController } from '@ts/grids/grid_core/header_filter/m import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; +import { registerKeyboardAction } from '../accessibility'; import { CLASSES as REORDERING_CLASSES } from '../columns_resizing_reordering/const'; import type { HeadersKeyboardNavigationController } from '../keyboard_navigation/headers_keyboard_navigation'; -import { registerKeyboardAction } from '../m_accessibility'; import { ColumnsView } from '../views/columns_view'; import type { ColumnViewTemplate } from '../views/types'; import { CLASSES } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts index e1acb434e681..d77c28cd1cfb 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller.ts @@ -53,9 +53,9 @@ import type { DataFilter } from '@ts/grids/grid_core/filter/types'; import type { Module } from '@ts/grids/grid_core/types'; import { AI_COLUMN_NAME } from '../ai_column/const'; -import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; import { StickyPosition } from '../sticky_columns/const'; +import gridCoreUtils from '../utils'; import { addExpandColumn, assignColumns, diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller_utils.ts index d93924f36d9f..49d0ab7e63cc 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/columns_controller_utils.ts @@ -20,9 +20,9 @@ import { CLASSES as COLUMN_HEADERS_CLASSES } from '@ts/grids/grid_core/column_he import { AI_COLUMN_NAME } from '../ai_column/const'; import type DataSourceAdapter from '../data_source_adapter/data_source_adapter'; import type { RawItemData } from '../data_source_adapter/types'; -import gridCoreUtils from '../m_utils'; import { StickyPosition } from '../sticky_columns/const'; import { getColumnFixedPosition } from '../sticky_columns/utils'; +import gridCoreUtils from '../utils'; import type { ColumnsController } from './columns_controller'; import { COLUMN_CHOOSER_LOCATION, diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts index 16aa4ceb4465..abf523c5f2e8 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts @@ -32,9 +32,9 @@ import type { ColumnChooserView } from '../column_chooser/m_column_chooser'; import type { ColumnHeadersView } from '../column_headers/m_column_headers'; import type { ColumnsController } from '../columns_controller/columns_controller'; import type { HeaderPanel } from '../header_panel/header_panel'; -import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; import type { PagerView } from '../pager/m_pager'; +import gridCoreUtils from '../utils'; import { CLASSES } from './const'; import type { Coordinates, DraggingPanel } from './types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/data_controller.ts index e0fe4a47a8b4..1a695537f242 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_controller/data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_controller/data_controller.ts @@ -17,11 +17,11 @@ import type { ChangedEvent, LoadOperation, OperationTypes, RawItemData, } from '@ts/grids/grid_core/data_source_adapter/types'; import { isLocalStore } from '@ts/grids/grid_core/data_source_adapter/utils/store'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import modules from '@ts/grids/grid_core/modules/modules'; import type { Controllers, Module, ModuleItemCallbackFlags, OptionChanged, RowKey, } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import type { CustomLoadResult } from '../data_source_adapter/custom_loader'; import type { diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter.ts index 1618c4af7ab7..b918674ba54a 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter.ts @@ -18,8 +18,8 @@ import type { ChangingEvent, StoreLoadOptions } from '@ts/data/data_source/types import type { BeforePushEvent } from '@ts/data/types'; import type { RowKey } from '@ts/grids/grid_core/types'; -import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; +import gridCoreUtils from '../utils'; import { CustomLoader } from './custom_loader'; import { calculateOperationTypes, diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter_utils.ts index 7878632ba89f..e2936f36cd3a 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/data_source_adapter_utils.ts @@ -4,7 +4,7 @@ import commonUtils from '@ts/core/utils/m_common'; import type { StoreLoadOptions } from '@ts/data/data_source/types'; import { equalFilterParameters } from '../filter/utils'; -import gridCoreUtils from '../m_utils'; +import gridCoreUtils from '../utils'; import type { LoadOperation, OperationTypes, RawItemData, } from './types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/extenders/editing_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/extenders/editing_data_controller.ts index ade3e81adac6..d245811cb425 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/extenders/editing_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/extenders/editing_data_controller.ts @@ -10,8 +10,8 @@ import type { UpdateChange, } from '@ts/grids/grid_core/data_controller/types'; import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { ModuleType, OptionChanged } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import { EDITING_EDITROWKEY_OPTION_NAME } from '../const'; import { isCellModified } from '../editing_utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts index f379ee365f2a..821cd6bc487d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts @@ -42,11 +42,11 @@ import type { ProcessedItem, } from '../data_controller/types'; import type { RawItemData } from '../data_source_adapter/types'; -import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; import type { Controllers, ModuleType, RowKey, Views, } from '../types'; +import gridCoreUtils from '../utils'; import { ACTION_OPTION_NAMES, BUTTON_NAMES, diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts index f786978873b1..0b73ff4c6c12 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts @@ -18,8 +18,8 @@ import Scrollable from '@js/ui/scroll_view/ui.scrollable'; import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants'; -import gridCoreUtils from '../m_utils'; import type { ModuleType } from '../types'; +import gridCoreUtils from '../utils'; import { BUTTON_CLASS, DATA_EDIT_DATA_INSERT_TYPE, diff --git a/packages/devextreme/js/__internal/grids/grid_core/editor_factory/editor_factory.ts b/packages/devextreme/js/__internal/grids/grid_core/editor_factory/editor_factory.ts index 3e4c65f7dcab..186c84d9e9a1 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editor_factory/editor_factory.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editor_factory/editor_factory.ts @@ -27,10 +27,10 @@ import { CELL_FOCUS_DISABLED_CLASS, CELL_MODIFIED_CLASS, FOCUS_OVERLAY_CLASS } f import type { EditingController } from '../editing/m_editing'; import { CLASSES as KEYBOARD_NAVIGATION_CLASSES } from '../keyboard_navigation/const'; import { isDataRow } from '../keyboard_navigation/utils'; -import gridCoreUtils from '../m_utils'; import type { ViewController } from '../modules/modules'; import modules from '../modules/modules'; import type { Module, ModuleType } from '../types'; +import gridCoreUtils from '../utils'; import { INVALIDATE_CLASS } from '../validating/const'; import type { RowsView } from '../views/rows_view'; import { CLASSES, MODULE_NAMESPACE, UPDATE_FOCUS_EVENTS } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_export.ts b/packages/devextreme/js/__internal/grids/grid_core/export.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/m_export.ts rename to packages/devextreme/js/__internal/grids/grid_core/export.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter_panel/filter_panel.ts b/packages/devextreme/js/__internal/grids/grid_core/filter_panel/filter_panel.ts index 109e6896e20a..b76ecee6400a 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter_panel/filter_panel.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter_panel/filter_panel.ts @@ -17,13 +17,13 @@ import { getCaptionByOperation, getCurrentLookupValueText, getCurrentValueText, getCustomOperation, getField, getGroupValue, isCondition, isGroup, } from '@ts/filter_builder/utils'; +import { registerKeyboardAction } from '@ts/grids/grid_core/accessibility'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller'; -import { registerKeyboardAction } from '@ts/grids/grid_core/m_accessibility'; -import gridUtils from '@ts/grids/grid_core/m_utils'; import modules from '@ts/grids/grid_core/modules/modules'; import type { InternalGridOptions, ModuleType, OptionChanged } from '@ts/grids/grid_core/types'; +import gridUtils from '@ts/grids/grid_core/utils'; import type { FilterValueExpression } from '../filter/types'; import type { FilterBuilderController } from '../filter_builder/filter_builder'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter_row/m_filter_row.ts b/packages/devextreme/js/__internal/grids/grid_core/filter_row/m_filter_row.ts index aae5613ff9f2..b3dbecb5aa42 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter_row/m_filter_row.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter_row/m_filter_row.ts @@ -22,9 +22,9 @@ import type { DataFilter, FilterSourceContext, } from '@ts/grids/grid_core/filter/types'; import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/header_panel'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import modules from '@ts/grids/grid_core/modules/modules'; import type { ModuleType } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import type { ToolbarItem } from '@ts/grids/new/grid_core/toolbar/types'; import Editor from '@ts/ui/editor/editor'; import type MenuInternal from '@ts/ui/menu/menu'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts b/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts index 72f6be3e932f..0d864efb977c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts @@ -18,9 +18,9 @@ import type { EditingController } from '../editing/m_editing'; import type { EditorFactory } from '../editor_factory/editor_factory'; import { combineFilters } from '../filter/utils'; import type { KeyboardNavigationController } from '../keyboard_navigation/m_keyboard_navigation'; -import gridCoreUtils from '../m_utils'; import core from '../modules/modules'; import type { ModuleType } from '../types'; +import gridCoreUtils from '../utils'; import type { RowsView } from '../views/rows_view'; import type { VirtualScrollingDataControllerExtension } from '../virtual_scrolling/index'; import type { FocusDataSourceControllerExtension } from './extenders/focus_data_source_controller'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts b/packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts index 592f69cc7688..ac442086b189 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/grid_view/grid_view.ts @@ -31,11 +31,11 @@ import type { Column } from '../columns_controller/types'; import type { DataController } from '../data_controller/data_controller'; import type { DataChange } from '../data_controller/types'; import type { DataSourceController } from '../data_source/data_source_controller'; -import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; import type { InternalGridOptions, OptionChanged, SelectionRange, Views, } from '../types'; +import gridCoreUtils from '../utils'; import { A11yStatusContainerComponent } from './a11y_status_container_component'; import { CLASSES, E2E_ATTRIBUTES, VIEW_NAMES } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts index 5789b1f17cdb..29eee9b6c16c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts @@ -24,7 +24,7 @@ import Modules from '@ts/grids/grid_core/modules/modules'; import type { ModuleType } from '@ts/grids/grid_core/types'; import type { ColumnsController } from '../columns_controller/columns_controller'; -import gridCoreUtils from '../m_utils'; +import gridCoreUtils from '../utils'; import { headerFilterMixin, HeaderFilterView, diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts index 7591f994ea4f..824c29a81756 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts @@ -18,7 +18,7 @@ import List from '@ts/ui/list/list.edit.search'; import type { TreeViewBaseProperties } from '@ts/ui/tree_view/tree_view.base'; import TreeView from '@ts/ui/tree_view/tree_view.search'; -import gridCoreUtils from '../m_utils'; +import gridCoreUtils from '../utils'; import { allowHeaderFiltering } from './utils'; type CheckBoxValueChangedEvent = NativeEventInfo & ValueChangedInfo; diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_filter/utils.ts b/packages/devextreme/js/__internal/grids/grid_core/header_filter/utils.ts index e92eb9e51bc7..7c8098a36433 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_filter/utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_filter/utils.ts @@ -5,7 +5,7 @@ import sharedFiltering from '@js/ui/shared/filtering'; import type { Column } from '@ts/grids/grid_core/columns_controller/types'; import type { DataFilter } from '@ts/grids/grid_core/filter/types'; import { combineFilters, isColumnExcluded } from '@ts/grids/grid_core/filter/utils'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import type { EmptyDateValue, HeaderFilterGroup, HeaderFilterGroupItem } from './types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/keyboard_navigation_core.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/keyboard_navigation_core.ts index 44b881708993..7f1a47c0e4ab 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/keyboard_navigation_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/keyboard_navigation_core.ts @@ -12,9 +12,9 @@ import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import type Scrollable from '@ts/ui/scroll_view/scrollable'; import { getElementLocationInternal } from '@ts/ui/scroll_view/utils/get_element_location_internal'; -import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; import type { Controllers, OptionChanged, Views } from '../types'; +import gridCoreUtils from '../utils'; import type { ColumnsView } from '../views/columns_view'; import type { ViewDataChange } from '../views/types'; import { Direction } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts index b0de0af203f8..a9364633898a 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts @@ -54,12 +54,12 @@ import { EDITOR_CELL_CLASS, FOCUSABLE_ELEMENT_SELECTOR, } from '../editing/const'; -import gridCoreUtils from '../m_utils'; import { CLASSES as MASTER_DETAIL_CLASSES } from '../master_detail/const'; import { COMMAND_SELECT_CLASS } from '../selection/const'; import type { Controllers, ModuleType, RowKey, Views, } from '../types'; +import gridCoreUtils from '../utils'; import { CLASSES, COLUMN_HEADERS_VIEW, diff --git a/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts b/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts index 6ade8fe8ee44..057322634867 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts @@ -22,7 +22,7 @@ import type { ProcessedItem, } from '../data_controller/types'; import type { RawItemData } from '../data_source_adapter/types'; -import gridCoreUtils from '../m_utils'; +import gridCoreUtils from '../utils'; import { CLASSES } from './const'; import { isDetailRow } from './utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/row_dragging/dom.ts b/packages/devextreme/js/__internal/grids/grid_core/row_dragging/dom.ts index 139259ae0810..fd841224d043 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/row_dragging/dom.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/row_dragging/dom.ts @@ -4,7 +4,7 @@ import $ from '@js/core/renderer'; // eslint-disable-next-line @typescript-eslint/no-restricted-imports, -import gridCoreUtils from '../m_utils'; +import gridCoreUtils from '../utils'; import { CLASSES } from './const'; const createHandleTemplateFunc = (addWidgetPrefix) => (container, options) => { diff --git a/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts b/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts index 20bd9eb49cbd..9ba7187a626d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/row_dragging/m_row_dragging.ts @@ -13,7 +13,7 @@ import type { ModuleType } from '@ts/grids/grid_core/types'; import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; -import gridCoreUtils from '../m_utils'; +import gridCoreUtils from '../utils'; import { ATTRIBUTES, CLASSES } from './const'; import { GridCoreRowDraggingDom } from './dom'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts b/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts index 8da7eabf4f2d..205e32c7cd1d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts @@ -15,9 +15,9 @@ import type { DataController } from '../data_controller/data_controller'; import type { DataChange, UserState } from '../data_controller/types'; import type { DataFilter, FilterSourceContext } from '../filter/types'; import type { HeaderPanel } from '../header_panel/header_panel'; -import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; import type { ModuleType, OptionChanged } from '../types'; +import gridCoreUtils from '../utils'; import type { RowsView } from '../views/rows_view'; import { allowSearch, createSearchExpression, parseValue } from './utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts b/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts index b5272fb069a6..8ad33ed5cc44 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts @@ -30,8 +30,8 @@ import type { DataController } from '../data_controller/data_controller'; import type { DataChange } from '../data_controller/types'; import type { DataSourceController } from '../data_source/data_source_controller'; import { isEditRow } from '../keyboard_navigation/utils'; -import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; +import gridCoreUtils from '../utils'; import { CHECKBOXES_HIDDEN_CLASS, COMMAND_SELECT_CLASS, diff --git a/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts b/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts index 0d6658249804..926b3ee71e40 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts @@ -22,10 +22,10 @@ import { isGroupFooterRow, isGroupRow as isGroupRowElement, } from '../keyboard_navigation/utils'; -import gridCoreUtils from '../m_utils'; import { CLASSES as MASTER_DETAIL_CLASSES } from '../master_detail/const'; import { isDetailRow } from '../master_detail/utils'; import type { ModuleType } from '../types'; +import gridCoreUtils from '../utils'; import type { ColumnsView } from '../views/columns_view'; import type { RowsView } from '../views/rows_view'; import { isGroupRow } from '../views/rows_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/utils.ts b/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/utils.ts index e189bb6ba18e..c344289d88d2 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/utils.ts @@ -1,5 +1,5 @@ import { isDefined } from '@js/core/utils/type'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import { HIDDEN_COLUMNS_WIDTH } from '../adaptivity/const'; import type { ColumnsController } from '../columns_controller/columns_controller'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/utils.ts similarity index 99% rename from packages/devextreme/js/__internal/grids/grid_core/m_utils.ts rename to packages/devextreme/js/__internal/grids/grid_core/utils.ts index 823487b442a0..46718e920758 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/utils.ts @@ -791,7 +791,8 @@ export default { return lookupDataSource; }, - logHeaderFilterDeprecatedWarningIfNeed(component) { + // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types -- see Widget d.ts + logHeaderFilterDeprecatedWarningIfNeed(component): void { const since = '23.1'; const logWarning = component._logDeprecatedOptionWarning.bind(component); @@ -810,8 +811,8 @@ export default { return; } - const logSpecificDeprecatedWarningIfNeed = (columns) => { - columns.forEach((column) => { + const logSpecificDeprecatedWarningIfNeed = (columnList): void => { + columnList.forEach((column) => { const headerFilter = column.headerFilter || {}; if (isDefined(headerFilter.allowSearch)) { diff --git a/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts b/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts index 791f6190ae75..1d769d6fea4d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts @@ -35,9 +35,9 @@ import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import { EDITORS_INPUT_SELECTOR, EDITORS_TEXTAREA_SELECTOR } from '../editing/const'; import type { EditingController } from '../editing/m_editing'; import type { NormalizedEditCellOptions } from '../editing/types'; -import gridCoreUtils from '../m_utils'; import modules from '../modules/modules'; import type { ModuleType } from '../types'; +import gridCoreUtils from '../utils'; import { INVALIDATE_CLASS, VALIDATION_CANCELLED, diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/columns_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/columns_view.ts index 4f798ffa434c..8131890552b7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/columns_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/columns_view.ts @@ -45,11 +45,11 @@ import type { DataChange, ProcessedItem } from '@ts/grids/grid_core/data_control import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/editor_factory'; import { CLASSES as ERROR_HANDLING_CLASSES } from '@ts/grids/grid_core/error_handling/const'; import { CLASSES as FILTER_ROW_CLASSES } from '@ts/grids/grid_core/filter_row/const'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import { CLASSES as MASTER_DETAIL_CLASSES } from '@ts/grids/grid_core/master_detail/const'; import modules from '@ts/grids/grid_core/modules/modules'; import type { SelectionController } from '@ts/grids/grid_core/selection/m_selection'; import type { OptionChanged } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import { FIELD_ITEM_CONTENT_CLASS } from '@ts/ui/form/constants'; import { CLASSES } from './const'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/rows_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/rows_view.ts index 3e67f812c6b2..5d971052d33c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/rows_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/rows_view.ts @@ -50,8 +50,8 @@ import type { ElementOffset } from '@ts/ui/scroll_view/types'; import { CLASSES as REORDERING_CLASSES } from '../columns_resizing_reordering/const'; import { isLocalStore } from '../data_source_adapter/utils/store'; import type { EditingController } from '../editing/m_editing'; -import gridCoreUtils from '../m_utils'; import { CLASSES } from '../sticky_columns/const'; +import gridCoreUtils from '../utils'; import { ColumnsView } from './columns_view'; import { CLASSES as VIEW_CLASSES } from './const'; import type { diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/utils.ts b/packages/devextreme/js/__internal/grids/grid_core/views/utils.ts index 7d701698f87b..aaab33ab5c1f 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/utils.ts @@ -4,7 +4,7 @@ import { isString } from '@js/core/utils/type'; import { columnHasValue } from '@ts/grids/grid_core/columns_controller/columns_controller_utils'; import type { Column } from '@ts/grids/grid_core/columns_controller/types'; -import gridCoreUtils from '../m_utils'; +import gridCoreUtils from '../utils'; const INVISIBLE_CLASS = 'dx-state-invisible'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts index fec3d0733cb5..988f550110c0 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_columns/m_virtual_columns.ts @@ -9,8 +9,8 @@ import type { DataChange } from '@ts/grids/grid_core/data_controller/types'; import type { ResizingController } from '@ts/grids/grid_core/grid_view/grid_view'; import type { ColumnsController } from '../columns_controller/columns_controller'; -import gridCoreUtils from '../m_utils'; import type { ModuleType } from '../types'; +import gridCoreUtils from '../utils'; import type { ColumnsView } from '../views/columns_view'; import type { RowsView } from '../views/rows_view'; import type { RowsViewScrollEvent } from '../views/types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/extenders/virtual_scrolling_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/extenders/virtual_scrolling_data_controller.ts index 7f5d56797f4f..033ff34b3b1d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/extenders/virtual_scrolling_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/extenders/virtual_scrolling_data_controller.ts @@ -29,7 +29,7 @@ import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types' import type { ModuleType, OptionChanged } from '@ts/grids/grid_core/types'; import type { VirtualItemsCount } from '@ts/grids/grid_core/virtual_data_loader/types'; -import gridCoreUtils from '../../m_utils'; +import gridCoreUtils from '../../utils'; import { LEGACY_SCROLLING_MODE, LOAD_TIMEOUT, diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts index c48b7cd99b10..c6fa49f90f3e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling.ts @@ -21,8 +21,8 @@ import { CLASSES as VIEW_CLASSES } from '@ts/grids/grid_core/views/const'; import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import type { ChangedEvent, RawItemData } from '../data_source_adapter/types'; -import gridCoreUtils from '../m_utils'; import type { StateStoringDataControllerExtension } from '../state_storing/extenders/state_storing_data_controller'; +import gridCoreUtils from '../utils'; import type { RowsViewScrollEvent } from '../views/types'; import { BOTTOM_LOAD_PANEL_CLASS, diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts index 323031f94396..1703fae816da 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts @@ -12,7 +12,7 @@ import type { VirtualItemsCount, } from '@ts/grids/grid_core/virtual_data_loader/types'; -import gridCoreUtils from '../m_utils'; +import gridCoreUtils from '../utils'; import { VirtualDataLoader } from '../virtual_data_loader/virtual_data_loader'; const SCROLLING_MODE_INFINITE = 'infinite'; diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/filtering/header_filter/legacy_header_filter.ts b/packages/devextreme/js/__internal/grids/new/grid_core/filtering/header_filter/legacy_header_filter.ts index 669a83d63fa8..625b024e911f 100644 --- a/packages/devextreme/js/__internal/grids/new/grid_core/filtering/header_filter/legacy_header_filter.ts +++ b/packages/devextreme/js/__internal/grids/new/grid_core/filtering/header_filter/legacy_header_filter.ts @@ -24,7 +24,7 @@ import { } from '@ts/grids/grid_core/header_filter/m_header_filter'; import { updateHeaderFilterItemSelectionState } from '@ts/grids/grid_core/header_filter/m_header_filter_core'; import { getHeaderFilterGroupParameters } from '@ts/grids/grid_core/header_filter/utils'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import type { Column } from '@ts/grids/new/grid_core/columns_controller/types'; import type { HeaderFilterListType } from './types'; diff --git a/packages/devextreme/js/__internal/grids/new/grid_core/utils/parse_value/parse_value.ts b/packages/devextreme/js/__internal/grids/new/grid_core/utils/parse_value/parse_value.ts index e1b5f2e4cccf..660911cd7e3c 100644 --- a/packages/devextreme/js/__internal/grids/new/grid_core/utils/parse_value/parse_value.ts +++ b/packages/devextreme/js/__internal/grids/new/grid_core/utils/parse_value/parse_value.ts @@ -4,7 +4,7 @@ import { isDefined, isNumeric, isString, } from '@js/core/utils/type'; import { strictParseNumber } from '@ts/grids/grid_core/columns_controller/columns_controller_utils'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import type { Column } from '@ts/grids/new/grid_core/columns_controller/types'; export const parseNumberValue = ( diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts b/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts index 9ab93f44e7ea..5f3c1b032321 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts @@ -6,7 +6,7 @@ import { getDefaultAlignment } from '@js/core/utils/position'; import { isDefined, isFunction } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; import formatHelper from '@js/format_helper'; -import { prepareItems } from '@ts/grids/grid_core/m_export'; +import { prepareItems } from '@ts/grids/grid_core/export'; const DEFAULT_DATA_TYPE = 'string'; const DEFAUL_COLUMN_WIDTH = 100; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts index f456701a7899..32a406abc62d 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts @@ -16,9 +16,9 @@ import { HeaderFilterView as HeaderFilterViewBase, updateHeaderFilterItemSelectionState, } from '@ts/grids/grid_core/header_filter/m_header_filter_core'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import sortingMixin from '@ts/grids/grid_core/sorting/m_sorting_mixin'; import type { InternalGrid } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import type { RovingTabIndexComponent } from '../keyboard_navigation/roving_tab_index'; import { RovingTabIndex } from '../keyboard_navigation/roving_tab_index'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts index b257d31e3a9b..5c9e8b3e045a 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts @@ -26,7 +26,7 @@ import Popup from '@js/ui/popup/ui.popup'; import { restoreFocus, saveFocusedElementInfo } from '@js/ui/shared/accessibility'; import { current, isGeneric } from '@js/ui/themes'; import Widget from '@ts/core/widget/widget'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import { ChartIntegrationMixin } from './chart_integration/m_chart_integration'; import DataAreaImport from './data_area/m_data_area'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.ts b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.ts index c6e288877ee7..8bf753dd9a61 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/data_source_adapter.ts @@ -15,8 +15,8 @@ import type { BeforePushEvent } from '@ts/data/types'; import DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; import { createDataSourceAdapterProvider } from '@ts/grids/grid_core/data_source_adapter/provider'; import type { OperationTypes as BaseOperationTypes, RawItemData } from '@ts/grids/grid_core/data_source_adapter/types'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { RowKey } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import treeListCore from '../core'; import type { diff --git a/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts index b73e92945e1d..a048711137be 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts @@ -10,8 +10,8 @@ import errors from '@js/ui/widget/ui.errors'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import { editingDataControllerExtender } from '@ts/grids/grid_core/editing/extenders/editing_data_controller'; import { editingModule } from '@ts/grids/grid_core/editing/m_editing'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { ModuleType } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import type { RowsView } from '../../grid_core/views/rows_view'; import treeListCore from '../core'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts index 88ca0f113171..3b12e68a3fe5 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/m_virtual_scrolling.ts @@ -3,8 +3,8 @@ import { extend } from '@js/core/utils/extend'; import type { DataController } from '@ts/grids/grid_core/data_controller/data_controller'; import type { DataSourceController } from '@ts/grids/grid_core/data_source/data_source_controller'; import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/data_source_adapter'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { ModuleType, RowKey } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import type { RowsView } from '@ts/grids/grid_core/views/rows_view'; import { dataSourceAdapterExtender as virtualScrollingDataSourceAdapterExtender, diff --git a/packages/devextreme/js/__internal/grids/tree_list/widget_base.ts b/packages/devextreme/js/__internal/grids/tree_list/widget_base.ts index 9fb589d0404c..7c0ec54989da 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/widget_base.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/widget_base.ts @@ -15,8 +15,8 @@ import type { UserDefinedElement } from '@js/core/element'; import type { DefaultOptionsRule } from '@js/core/options/utils'; import { isMaterialBased } from '@js/ui/themes'; import type { Properties as dxTreeListOptions } from '@js/ui/tree_list'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; import type { GridCoreHelper, Module } from '@ts/grids/grid_core/types'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import GridCoreWidget from '@ts/grids/grid_core/widget_base'; import treeListCore from './core'; diff --git a/packages/devextreme/js/__internal/ui/gantt/ui.gantt.export_helper.ts b/packages/devextreme/js/__internal/ui/gantt/ui.gantt.export_helper.ts index 029a5e7fdad9..166e6abdcfad 100644 --- a/packages/devextreme/js/__internal/ui/gantt/ui.gantt.export_helper.ts +++ b/packages/devextreme/js/__internal/ui/gantt/ui.gantt.export_helper.ts @@ -5,7 +5,7 @@ import numberLocalization from '@js/common/core/localization/number'; import { isDate, isDefined, isNumeric } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers'; -import gridCoreUtils from '@ts/grids/grid_core/m_utils'; +import gridCoreUtils from '@ts/grids/grid_core/utils'; import type TreeList from '@ts/grids/tree_list/widget_base'; import type Gantt from '@ts/ui/gantt/ui.gantt'; diff --git a/packages/devextreme/js/__internal/ui/gantt/ui.gantt.ts b/packages/devextreme/js/__internal/ui/gantt/ui.gantt.ts index 529c2cb97c73..386f703d40ae 100644 --- a/packages/devextreme/js/__internal/ui/gantt/ui.gantt.ts +++ b/packages/devextreme/js/__internal/ui/gantt/ui.gantt.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import registerComponent from '@js/core/component_registrator'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; diff --git a/packages/devextreme/testing/helpers/baseDataGridHelper.js b/packages/devextreme/testing/helpers/baseDataGridHelper.js index bd030eb29a7f..d1c963e313ae 100644 --- a/packages/devextreme/testing/helpers/baseDataGridHelper.js +++ b/packages/devextreme/testing/helpers/baseDataGridHelper.js @@ -1,5 +1,5 @@ import DataGrid from 'ui/data_grid'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import $ from 'jquery'; diff --git a/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js index bfbd8995d28a..43c4f7d7dc37 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js @@ -7,7 +7,7 @@ import { DataSource } from 'common/data/data_source/data_source'; import Store from 'data/abstract_store'; import ArrayStore from 'common/data/array_store'; import ODataStore from 'common/data/odata/store'; -import AggregateCalculator from '__internal/grids/data_grid/m_aggregate_calculator'; +import AggregateCalculator from '__internal/grids/data_grid/aggregate_calculator'; import LocalStore from 'common/data/local_store'; const TEN_NUMBERS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js index 13f91498450c..936bd58db52e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js @@ -14,7 +14,7 @@ import renderer from 'core/renderer'; import themes from 'ui/themes'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; const device = devices.real(); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/aggregateCalculator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/aggregateCalculator.tests.js index edd3ca9a138f..6b791f8bbc10 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/aggregateCalculator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/aggregateCalculator.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import AggregateCalculator from '__internal/grids/data_grid/m_aggregate_calculator'; +import AggregateCalculator from '__internal/grids/data_grid/aggregate_calculator'; const customAggregator = { seed: 6, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js index 1ff373d6d699..9e629f9781aa 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js @@ -7,7 +7,7 @@ import browser from 'core/utils/browser'; import devices from '__internal/core/devices'; import nativePointerMock from '../../helpers/nativePointerMock.js'; import { setupDataGridModules, MockDataController, MockColumnsController } from '../../helpers/dataGridMocks.js'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import dataUtils from 'core/element_data'; import translator from 'common/core/animation/translator'; import { getOuterHeight } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/contextMenuView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/contextMenuView.tests.js index 0edfcf084d2c..c650be1cd106 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/contextMenuView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/contextMenuView.tests.js @@ -3,7 +3,7 @@ import $ from 'jquery'; import 'ui/data_grid'; import dataGridMocks from '../../helpers/dataGridMocks.js'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; const MockColumnsController = dataGridMocks.MockColumnsController; const MockDataController = dataGridMocks.MockDataController; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js index 7fd32ae69d6c..050d798014ec 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js @@ -6,7 +6,7 @@ import { errors as dataErrors } from 'common/data/errors'; import typeUtils from 'core/utils/type'; import { DataSource } from 'common/data/data_source/data_source'; import ArrayStore from 'common/data/array_store'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import { setupDataGridModules, MockGridDataSource } from '../../helpers/dataGridMocks.js'; import 'ui/data_grid'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js index a545980a2588..bc97e9a3193c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import devices from '__internal/core/devices'; import fx from 'common/core/animation/fx'; import pointerEvents from 'common/core/events/pointer'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js index efefaf8b63f1..b8b656379048 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js @@ -1,5 +1,5 @@ import fx from 'common/core/animation/fx'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import config from 'core/config'; import devices from '__internal/core/devices'; import dataUtils from 'core/element_data'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js index 8427b3998cf9..9044170d44cc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js @@ -7,7 +7,7 @@ import 'ui/data_grid'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; import ArrayStore from 'common/data/array_store'; import messageLocalization from 'common/core/localization/message'; -import { prepareItems } from '__internal/grids/grid_core/m_export'; +import { prepareItems } from '__internal/grids/grid_core/export'; import { AIIntegration } from '__internal/core/ai_integration/core/ai_integration'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js index 181377bcf6f9..c135d7699b4c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js @@ -3,7 +3,7 @@ import { EdmLiteral } from 'common/data/odata/utils'; import commonUtils from 'core/utils/common'; import devices from '__internal/core/devices'; import ArrayStore from 'common/data/array_store'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import fx from 'common/core/animation/fx'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js index 9f76e5533355..df0d3c6c22bd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js @@ -4,7 +4,7 @@ import 'ui/data_grid'; import 'common/data/odata/store'; import $ from 'jquery'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import ArrayStore from 'common/data/array_store'; import pointerEvents from 'common/core/events/pointer'; import clickEvent from 'common/core/events/click'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js index 95cdc1475c97..36cd6f22352e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js @@ -4,7 +4,7 @@ import $ from 'jquery'; import 'ui/data_grid'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import devices from '__internal/core/devices'; import keyboardMock from '../../helpers/keyboardMock.js'; import commonUtils from 'core/utils/common'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js index 12e5cf2dd291..953af9fb12bf 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js @@ -3,7 +3,7 @@ import 'fluent_blue_light.css!'; import 'ui/data_grid'; import $ from 'jquery'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import dataUtils from 'core/element_data'; import commonUtils from 'core/utils/common'; import typeUtils from 'core/utils/type'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js index c8cce308d45d..8a84ba6b9fd7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js @@ -2,7 +2,7 @@ import 'ui/data_grid'; import 'common/data/odata/store'; import $ from 'jquery'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import { setupDataGridModules, generateItems } from '../../helpers/dataGridMocks.js'; import { DataSource } from 'common/data/data_source/data_source'; import ArrayStore from 'common/data/array_store'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/summaryModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/summaryModule.tests.js index c312fd2f1116..101e28b88bcc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/summaryModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/summaryModule.tests.js @@ -7,7 +7,7 @@ import { setupDataGridModules, MockDataController, MockColumnsController } from import { addShadowDomStyles } from 'core/utils/shadow_dom'; import * as summaryModule from '__internal/grids/data_grid/summary/m_summary'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import { noop } from 'core/utils/common'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.tests.js index d6f5fbac77b4..a0601a5c6107 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.tests.js @@ -4,7 +4,7 @@ import 'ui/scroll_view/ui.scrollable'; import $ from 'jquery'; import memoryLeaksHelper from '../../helpers/memoryLeaksHelper.js'; import { VirtualScrollController } from '__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; import browser from 'core/utils/browser'; import devices from '__internal/core/devices'; import renderer from 'core/renderer'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js index ddeda0bcfa0b..43676b64d74b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js @@ -5,7 +5,7 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; import { LocalStore } from '__internal/grids/pivot_grid/local_store/m_local_store'; import { sort } from '__internal/grids/pivot_grid/data_source/m_data_source_utils'; -import pivotGridUtils from '__internal/grids/grid_core/m_utils'; +import pivotGridUtils from '__internal/grids/grid_core/utils'; import config from 'core/config'; import formatHelper from 'format_helper'; import ajaxMock from '../../helpers/ajaxMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js index defa46a80c70..f9f155a6c929 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js @@ -15,7 +15,7 @@ import $ from 'jquery'; import fx from 'common/core/animation/fx'; import { setupTreeListModules } from '../../helpers/treeListMocks.js'; import ArrayStore from 'common/data/array_store'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js index e603a7c11e5b..3f5cbc3bb086 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js @@ -15,7 +15,7 @@ import $ from 'jquery'; import fx from 'common/core/animation/fx'; import { noop } from 'core/utils/common'; import { setupTreeListModules, MockColumnsController, MockDataController } from '../../helpers/treeListMocks.js'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/exportHelper.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/exportHelper.tests.js index 6ed7c019f5fb..9c509968dd46 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/exportHelper.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/exportHelper.tests.js @@ -1,5 +1,5 @@ import { GanttExportHelper } from '__internal/ui/gantt/ui.gantt.export_helper'; -import gridCoreUtils from '__internal/grids/grid_core/m_utils'; +import gridCoreUtils from '__internal/grids/grid_core/utils'; const moduleConfig = { beforeEach: function() {