Skip to content
Merged
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
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ const DATA_GRID_FEATURE_MAP: Record<string, string> = {
core: 'Core',
widget: 'Core',
widget_base: 'Core',
m_utils: 'Core',
utils: 'Core',
m_editing: 'Editing',
grouping: 'Grouping',
summary: 'Summary',
export: 'Export',
keyboard_navigation: 'Navigation',
focus: 'Navigation',
columns_controller: 'Columns',
m_aggregate_calculator: 'Data',
aggregate_calculator: 'Data',
module_not_extended: 'Passthrough',
};

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

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

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const mockWidgetInstance = {
option: jest.fn(),
};

jest.mock('../m_utils', () => ({
jest.mock('../utils', () => ({
__esModule: true,
default: {
getWidgetInstance: jest.fn(() => mockWidgetInstance),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<dxCheckBox> & ValueChangedInfo;
Expand Down
Loading
Loading