From ea74226b456948501ba9e527905291109c554faa Mon Sep 17 00:00:00 2001 From: "anna.shakhova" <68295572+anna-shakhova@users.noreply.github.com> Date: Wed, 18 Nov 2026 11:34:47 +0100 Subject: [PATCH 1/2] PivotGrid: remove m_ prefix utils, remote and local stores, summary --- .../chart_integration/m_chart_integration.ts | 2 +- .../grids/pivot_grid/data_area/m_data_area.ts | 2 +- .../data_controller/m_data_controller.ts | 2 +- .../pivot_grid/data_source/m_data_source.ts | 8 ++++---- .../data_source/m_data_source_utils.ts | 2 +- .../field_chooser/m_field_chooser.ts | 2 +- .../field_chooser/m_field_chooser_base.ts | 2 +- .../{m_local_store.ts => local_store.ts} | 12 +++++------- .../grids/pivot_grid/local_store/types.ts | 19 ++++++++++++++++--- .../__internal/grids/pivot_grid/m_widget.ts | 2 +- .../{m_remote_store.ts => remote_store.ts} | 4 ++-- ...e_store_utils.ts => remote_store_utils.ts} | 0 ...play_modes.ts => summary_display_modes.ts} | 2 +- .../pivot_grid/summary_display_modes/types.ts | 2 +- .../{m_widget_utils.ts => widget_utils.ts} | 0 .../pivot_grid/xmla_store/m_xmla_store.ts | 2 +- .../ui/diagram/ui.diagram.scroll_view.ts | 2 +- .../testing/helpers/scrollableTestsHelper.js | 2 +- .../dataController.tests.js | 2 +- .../dataSource_bundled.tests.js | 8 ++++---- .../pivotGrid.tests.js | 2 +- .../store.local.tests.js | 2 +- .../store.remote.tests.js | 6 +++--- .../store.xmla.common.tests.js | 2 +- .../store.xmla.tests.js | 2 +- .../summaryDisplayModes.tests.js | 4 ++-- 26 files changed, 53 insertions(+), 42 deletions(-) rename packages/devextreme/js/__internal/grids/pivot_grid/local_store/{m_local_store.ts => local_store.ts} (98%) rename packages/devextreme/js/__internal/grids/pivot_grid/remote_store/{m_remote_store.ts => remote_store.ts} (99%) rename packages/devextreme/js/__internal/grids/pivot_grid/remote_store/{m_remote_store_utils.ts => remote_store_utils.ts} (100%) rename packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/{m_summary_display_modes.ts => summary_display_modes.ts} (99%) rename packages/devextreme/js/__internal/grids/pivot_grid/{m_widget_utils.ts => widget_utils.ts} (100%) diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/chart_integration/m_chart_integration.ts b/packages/devextreme/js/__internal/grids/pivot_grid/chart_integration/m_chart_integration.ts index 2ae5c873645a..b6c4738c9463 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/chart_integration/m_chart_integration.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/chart_integration/m_chart_integration.ts @@ -2,7 +2,7 @@ import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import { createPath, foreachTree, formatValue } from '../m_widget_utils'; +import { createPath, foreachTree, formatValue } from '../widget_utils'; const FORMAT_DICTIONARY = { number: 'numeric', diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/data_area/m_data_area.ts b/packages/devextreme/js/__internal/grids/pivot_grid/data_area/m_data_area.ts index 9e25238564a4..4e6932dceb1f 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/data_area/m_data_area.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/data_area/m_data_area.ts @@ -4,7 +4,7 @@ import { setTabIndex } from '@js/ui/shared/accessibility'; import supportUtils from '@ts/core/utils/support'; import { AreaItem } from '../area_item/m_area_item'; -import { calculateScrollbarWidth } from '../m_widget_utils'; +import { calculateScrollbarWidth } from '../widget_utils'; const PIVOTGRID_AREA_CLASS = 'dx-pivotgrid-area'; const PIVOTGRID_AREA_DATA_CLASS = 'dx-pivotgrid-area-data'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/pivot_grid/data_controller/m_data_controller.ts index 68dada4c39f3..a13a4f31b5df 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/data_controller/m_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/data_controller/m_data_controller.ts @@ -12,7 +12,7 @@ import VirtualScrollControllerModule from '@ts/grids/grid_core/virtual_scrolling import { PivotGridDataSource } from '../data_source/m_data_source'; import { createPath, findField, foreachTree, foreachTreeAsync, formatValue, -} from '../m_widget_utils'; +} from '../widget_utils'; import type { PivotGridColumnInfo } from './types'; const math = Math; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts b/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts index 6cfb4982e08c..90b9d229f48c 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts @@ -12,7 +12,9 @@ import Store from '@js/data/abstract_store'; import commonUtils from '@ts/core/utils/common'; import inflector from '@ts/core/utils/inflector'; -import { LocalStore } from '../local_store/m_local_store'; +import { LocalStore } from '../local_store/local_store'; +import { RemoteStore } from '../remote_store/remote_store'; +import summaryUtils from '../summary_display_modes/summary_display_modes'; import { createPath, findField, @@ -21,9 +23,7 @@ import { formatValue, getFieldsDataType, setFieldProperty, -} from '../m_widget_utils'; -import { RemoteStore } from '../remote_store/m_remote_store'; -import summaryUtils from '../summary_display_modes/m_summary_display_modes'; +} from '../widget_utils'; import xmlaStore from '../xmla_store/m_xmla_store'; import { sort } from './m_data_source_utils'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source_utils.ts b/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source_utils.ts index c8cc16f4076f..14bd7242fc56 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source_utils.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source_utils.ts @@ -7,7 +7,7 @@ import { foreachDataLevel, foreachTree, getCompareFunction, -} from '../m_widget_utils'; +} from '../widget_utils'; function sort(loadOptions, dataSource, getAscOrder) { sortDimension(dataSource, loadOptions, 'rows', getAscOrder); diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts index 7a8e3719900a..d628f2d8c807 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts @@ -12,7 +12,7 @@ import ContextMenu from '@js/ui/context_menu'; import TreeView from '@js/ui/tree_view'; import { getData, setData } from '@ts/core/element_data'; -import { foreachDataLevel, getCompareFunction } from '../m_widget_utils'; +import { foreachDataLevel, getCompareFunction } from '../widget_utils'; import { getFieldsHotkeysA11yLabel } from './a11y'; import { ATTRIBUTES, CLASSES, FIELD_DATA_KEY, ICONS, 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 a6273b60ca07..aa7c388096b4 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 @@ -22,8 +22,8 @@ import type { InternalGrid } from '@ts/grids/grid_core/types'; import type { RovingTabIndexComponent } from '../keyboard_navigation/roving_tab_index'; import { RovingTabIndex } from '../keyboard_navigation/roving_tab_index'; -import { createPath, foreachTree } from '../m_widget_utils'; import SortableModule from '../sortable/m_sortable'; +import { createPath, foreachTree } from '../widget_utils'; import { getFieldItemA11yLabel } from './a11y'; import { ATTRIBUTES, CLASSES, FIELD_DATA_KEY } from './const'; import { dragAndDropItemRender } from './dom'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts b/packages/devextreme/js/__internal/grids/pivot_grid/local_store/local_store.ts similarity index 98% rename from packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts rename to packages/devextreme/js/__internal/grids/pivot_grid/local_store/local_store.ts index fa94f8545550..668de3e3db80 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/local_store/local_store.ts @@ -26,7 +26,7 @@ import { setDefaultFieldValueFormatting, setFieldProperty, storeDrillDownMixin, -} from '../m_widget_utils'; +} from '../widget_utils'; import type { CustomSummaryOptions, DataItemFilter, @@ -185,7 +185,7 @@ function fillHierarchyItemIndexesCore( indexes.push(hierarchyItem.index); - if ((expandedPathsHash && expandedPathsHash[itemPathHash]) || dimension.expanded) { + if (expandedPathsHash?.[itemPathHash] || dimension.expanded) { hierarchyItem.children ??= []; fillHierarchyItemIndexesCore( indexes, @@ -211,7 +211,7 @@ function generateHierarchyItems( data, childrenHash: headers[`${headerName}Hash`], dimensions: loadOptions[headerName], - expandedPathsHash: loadOptions.headerName !== headerName && expandedPaths?.hash, + expandedPathsHash: loadOptions.headerName !== headerName ? expandedPaths?.hash : undefined, }; fillHierarchyItemIndexesCore(result, options, headers[headerName], expandIndex); @@ -534,10 +534,7 @@ function loadDataSource( function fillSelectorsByFields(selectors: FieldSelectors, fields: PivotGridField[]): void { fields.forEach((field) => { if (field.dataField && field.dataType === 'date') { - const valueSelector = getDateValue(getDataSelector(field.dataField)); - selectors[field.dataField] = function selectDateValue(data: unknown): unknown { - return valueSelector(data); - }; + selectors[field.dataField] = getDateValue(getDataSelector(field.dataField)); } }); } @@ -640,6 +637,7 @@ class LocalStore { if (customColumns) { item = {}; + // eslint-disable-next-line max-depth -- copies the custom columns of a matching data item for (const column of customColumns) { // @ts-expect-error a data item is an object here item[column] = dataItem[column]; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/local_store/types.ts b/packages/devextreme/js/__internal/grids/pivot_grid/local_store/types.ts index 0ce39374735d..35138cb4ee52 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/local_store/types.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/local_store/types.ts @@ -1,4 +1,7 @@ +import type { CustomStoreOptions } from '@js/common/data'; import type { ScalarFilterValue } from '@js/common/grids'; +import type { DataSourceLike } from '@js/data/data_source'; +import type { NormalizedDataSourceOptions } from '@ts/data/data_source/types'; import type { PivotGridField, PivotGridLoadOptions, @@ -66,7 +69,7 @@ export interface LocalHierarchyOptions { data: unknown; childrenHash: LocalHeaderItemsHash; dimensions: LocalField[]; - expandedPathsHash: Record | false | undefined; + expandedPathsHash: Record | undefined; } export interface CustomSummaryOptions { @@ -92,6 +95,16 @@ export interface LocalLoadResult { grandTotalColumnIndex: number; } -export interface LocalStoreOptions { +/** PivotGridDataSource passes normalized options, with its own handlers set to null. */ +type PivotGridStoreSourceOptions = { + [TKey in keyof NormalizedDataSourceOptions]: TKey extends 'onChanged' | 'onLoadingChanged' + ? NormalizedDataSourceOptions[TKey] | null + : NormalizedDataSourceOptions[TKey]; +}; + +/** The constructor passes the options on to DataSource. */ +export type LocalStoreOptions = ( + DataSourceLike | CustomStoreOptions | PivotGridStoreSourceOptions +) & { onProgressChanged?: (progress: number) => void; -} +}; 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 01052a15aa4c..7b3b9cff767f 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts @@ -43,7 +43,7 @@ import { FAKE_TABLE_CLASS, HORIZONTAL_HEADERS_AREA_CLASS, VERTICAL_HEADERS_AREA_ import { RovingTabIndex } from './keyboard_navigation/roving_tab_index'; import type { CellNavigationDirection } from './keyboard_navigation/table_cell_navigation'; import { buildCellMatrix, getAdjacentCell } from './keyboard_navigation/table_cell_navigation'; -import { findField, mergeArraysByMaxValue, setFieldProperty } from './m_widget_utils'; +import { findField, mergeArraysByMaxValue, setFieldProperty } from './widget_utils'; type FieldChooserOptions = NonNullable; type FieldPanelOptions = NonNullable; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts b/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/remote_store.ts similarity index 99% rename from packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts rename to packages/devextreme/js/__internal/grids/pivot_grid/remote_store/remote_store.ts index eff08f5d15c0..da55644d99e6 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/remote_store.ts @@ -25,8 +25,8 @@ import pivotGridUtils, { getExpandedLevel, getFiltersByPath, setDefaultFieldValueFormatting, -} from '../m_widget_utils'; -import { forEachGroup } from './m_remote_store_utils'; +} from '../widget_utils'; +import { forEachGroup } from './remote_store_utils'; import type { DataFilter, FilterExpression, diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store_utils.ts b/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/remote_store_utils.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store_utils.ts rename to packages/devextreme/js/__internal/grids/pivot_grid/remote_store/remote_store_utils.ts diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/m_summary_display_modes.ts b/packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/summary_display_modes.ts similarity index 99% rename from packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/m_summary_display_modes.ts rename to packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/summary_display_modes.ts index 8f3c3974b3b7..56cb057613c6 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/m_summary_display_modes.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/summary_display_modes.ts @@ -1,7 +1,7 @@ import { isDefined, isFunction, isObject } from '@js/core/utils/type'; import type { PivotGridSummaryDisplayMode } from '@js/ui/pivot_grid/data_source'; -import pivotGridUtils, { findField, foreachTree } from '@ts/grids/pivot_grid/m_widget_utils'; import type { PivotGridDescriptions, PivotGridField } from '@ts/grids/pivot_grid/types'; +import pivotGridUtils, { findField, foreachTree } from '@ts/grids/pivot_grid/widget_utils'; import type { SummaryCellData, diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/types.ts b/packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/types.ts index 7e51c9fc2bcc..9faa5c03554d 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/types.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/summary_display_modes/types.ts @@ -1,7 +1,7 @@ import type { PivotGridArea } from '@js/ui/pivot_grid/data_source'; import type { PivotGridField } from '@ts/grids/pivot_grid/types'; -import type { Cell as SummaryCell } from './m_summary_display_modes'; +import type { Cell as SummaryCell } from './summary_display_modes'; export interface SummaryHeaderItem { index: number; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts b/packages/devextreme/js/__internal/grids/pivot_grid/widget_utils.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts rename to packages/devextreme/js/__internal/grids/pivot_grid/widget_utils.ts diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts b/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts index d733c3b688c1..5530094d854b 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts @@ -15,7 +15,7 @@ import pivotGridUtils, { foreachTree, getExpandedLevel, storeDrillDownMixin, -} from '../m_widget_utils'; +} from '../widget_utils'; // Utility functions function union(elements: any[]): string { diff --git a/packages/devextreme/js/__internal/ui/diagram/ui.diagram.scroll_view.ts b/packages/devextreme/js/__internal/ui/diagram/ui.diagram.scroll_view.ts index 9cce0524507d..b96c55a78e11 100644 --- a/packages/devextreme/js/__internal/ui/diagram/ui.diagram.scroll_view.ts +++ b/packages/devextreme/js/__internal/ui/diagram/ui.diagram.scroll_view.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ // TODO: Can we get rid of this dependency of the PivotGrid here? -import { calculateScrollbarWidth } from '__internal/grids/pivot_grid/m_widget_utils'; +import { calculateScrollbarWidth } from '__internal/grids/pivot_grid/widget_utils'; import $ from '@js/core/renderer'; import { getHeight, getWidth } from '@js/core/utils/size'; import type { OptionChanged } from '@ts/core/widget/types'; diff --git a/packages/devextreme/testing/helpers/scrollableTestsHelper.js b/packages/devextreme/testing/helpers/scrollableTestsHelper.js index ca52e4fef981..401eb5a49a31 100644 --- a/packages/devextreme/testing/helpers/scrollableTestsHelper.js +++ b/packages/devextreme/testing/helpers/scrollableTestsHelper.js @@ -1,5 +1,5 @@ import devices from '__internal/core/devices'; -import { calculateScrollbarWidth } from '__internal/grids/pivot_grid/m_widget_utils'; +import { calculateScrollbarWidth } from '__internal/grids/pivot_grid/widget_utils'; const SCROLLABLE_CONTAINER = 'dx-scrollable-container'; const SCROLLABLE_CONTENT = 'dx-scrollable-content'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataController.tests.js index fb5068fcde67..068dc343235d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataController.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { DataController } from '__internal/grids/pivot_grid/data_controller/m_data_controller'; import virtualScrolling from '__internal/grids/grid_core/virtual_scrolling/virtual_scrolling_core'; import stateStoring from '__internal/grids/grid_core/state_storing/state_storing_controller_core'; -import pivotGridUtils from '__internal/grids/pivot_grid/m_widget_utils'; +import pivotGridUtils from '__internal/grids/pivot_grid/widget_utils'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js index 98f19374f61f..24e813834327 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js @@ -3,11 +3,11 @@ import ArrayStore from 'common/data/array_store'; import { CustomStore } from 'common/data/custom_store'; import inflector from '__internal/core/utils/inflector'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; -import summaryDisplayModesModule from '__internal/grids/pivot_grid/summary_display_modes/m_summary_display_modes'; +import summaryDisplayModesModule from '__internal/grids/pivot_grid/summary_display_modes/summary_display_modes'; import xmlaStoreModule, { XmlaStore } from '__internal/grids/pivot_grid/xmla_store/m_xmla_store'; -import { LocalStore } from '__internal/grids/pivot_grid/local_store/m_local_store'; -import { RemoteStore } from '__internal/grids/pivot_grid/remote_store/m_remote_store'; -import pivotGridUtils, { setFieldProperty } from '__internal/grids/pivot_grid/m_widget_utils'; +import { LocalStore } from '__internal/grids/pivot_grid/local_store/local_store'; +import { RemoteStore } from '__internal/grids/pivot_grid/remote_store/remote_store'; +import pivotGridUtils, { setFieldProperty } from '__internal/grids/pivot_grid/widget_utils'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import '../../content/orders.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js index 85f838604a4e..6423114a0f88 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js @@ -39,7 +39,7 @@ import { getRealElementWidth } from '__internal/grids/pivot_grid/area_item/m_are import DataAreaModule from '__internal/grids/pivot_grid/data_area/m_data_area'; import DataControllerModule from '__internal/grids/pivot_grid/data_controller/m_data_controller'; import HeadersAreaModule from '__internal/grids/pivot_grid/headers_area/m_headers_area'; -import pivotGridUtils, { getScrollbarWidth } from '__internal/grids/pivot_grid/m_widget_utils'; +import pivotGridUtils, { getScrollbarWidth } from '__internal/grids/pivot_grid/widget_utils'; import pointerMock from '../../helpers/pointerMock.js'; 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 f10d61b5b52b..6c0fe6ad02c5 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 @@ -3,7 +3,7 @@ import 'common/data/odata/store'; import $ from 'jquery'; import { noop } from 'core/utils/common'; -import { LocalStore } from '__internal/grids/pivot_grid/local_store/m_local_store'; +import { LocalStore } from '__internal/grids/pivot_grid/local_store/local_store'; import { sort } from '__internal/grids/pivot_grid/data_source/m_data_source_utils'; import pivotGridUtils from '__internal/grids/grid_core/utils'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js index 4113c96df818..435395ac8c35 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; -import { RemoteStore } from '__internal/grids/pivot_grid/remote_store/m_remote_store'; -import { forEachGroup } from '__internal/grids/pivot_grid/remote_store/m_remote_store_utils'; +import { RemoteStore } from '__internal/grids/pivot_grid/remote_store/remote_store'; +import { forEachGroup } from '__internal/grids/pivot_grid/remote_store/remote_store_utils'; import { sort } from '__internal/grids/pivot_grid/data_source/m_data_source_utils'; -import pivotGridUtils from '__internal/grids/pivot_grid/m_widget_utils'; +import pivotGridUtils from '__internal/grids/pivot_grid/widget_utils'; import ArrayStore from 'common/data/array_store'; import DataSource from 'common/data/data_source'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js index 399dbfce3634..89221b2cc8d7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import ajax from 'core/utils/ajax'; -import pivotGridUtils from '__internal/grids/pivot_grid/m_widget_utils'; +import pivotGridUtils from '__internal/grids/pivot_grid/widget_utils'; import { XmlaStore } from '__internal/grids/pivot_grid/xmla_store/m_xmla_store'; import { errors } from 'common/data/errors'; import localization from 'localization'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.tests.js index a877d648d6c8..c1ebe44314bd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import pivotGridUtils from '__internal/grids/pivot_grid/m_widget_utils'; +import pivotGridUtils from '__internal/grids/pivot_grid/widget_utils'; import { XmlaStore } from '__internal/grids/pivot_grid/xmla_store/m_xmla_store'; import { errors } from 'common/data/errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/summaryDisplayModes.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/summaryDisplayModes.tests.js index 7de5a2c7f5f0..46a9a5da88d2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/summaryDisplayModes.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/summaryDisplayModes.tests.js @@ -3,8 +3,8 @@ import summaryDisplayModes, { applyDisplaySummaryMode, applyRunningTotal, summaryDictionary, -} from '__internal/grids/pivot_grid/summary_display_modes/m_summary_display_modes'; // arguments: description, data -import pivotGridUtils from '__internal/grids/pivot_grid/m_widget_utils'; +} from '__internal/grids/pivot_grid/summary_display_modes/summary_display_modes'; // arguments: description, data +import pivotGridUtils from '__internal/grids/pivot_grid/widget_utils'; const data = { columns: [{ From fa70a7372ba1781bca57e5eb1b33c0f06182d6d0 Mon Sep 17 00:00:00 2001 From: "anna.shakhova" <68295572+anna-shakhova@users.noreply.github.com> Date: Tue, 17 Nov 2026 14:23:38 +0100 Subject: [PATCH 2/2] HtmlEditor: remove unused @ts-expect-error directives from tests --- .../ui/html_editor/__tests__/image_upload_dialog.test.ts | 1 - .../ui/html_editor/__tests__/table_context_menu.test.ts | 1 - .../ui/html_editor/__tests__/table_properties_form.test.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/devextreme/js/__internal/ui/html_editor/__tests__/image_upload_dialog.test.ts b/packages/devextreme/js/__internal/ui/html_editor/__tests__/image_upload_dialog.test.ts index de9d372bf830..a80ecb95738e 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/__tests__/image_upload_dialog.test.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/__tests__/image_upload_dialog.test.ts @@ -63,7 +63,6 @@ const getFileUploader = (editor: HtmlEditor): FileUploader => FileUploader.getIn const openFileTab = ({ imageUpload, fileTabIndex }: DialogConfig): HtmlEditor => { const $element = $('
').appendTo(document.body); - // @ts-expect-error direct instantiation is not typed const editor: HtmlEditor = new HtmlEditor($element, { value: VALUE, toolbar: { items: ['image'] }, diff --git a/packages/devextreme/js/__internal/ui/html_editor/__tests__/table_context_menu.test.ts b/packages/devextreme/js/__internal/ui/html_editor/__tests__/table_context_menu.test.ts index 225f8b0e01fa..5b86b1ef9726 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/__tests__/table_context_menu.test.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/__tests__/table_context_menu.test.ts @@ -38,7 +38,6 @@ const editors: HtmlEditor[] = []; const createEditor = (options: Properties): HtmlEditor => { const $element = $('
').appendTo(document.body); - // @ts-expect-error direct instantiation is not typed const editor: HtmlEditor = new HtmlEditor($element, { value: TABLE_MARKUP, ...options }); editors.push(editor); diff --git a/packages/devextreme/js/__internal/ui/html_editor/__tests__/table_properties_form.test.ts b/packages/devextreme/js/__internal/ui/html_editor/__tests__/table_properties_form.test.ts index 0cca1c6a544e..61770673f853 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/__tests__/table_properties_form.test.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/__tests__/table_properties_form.test.ts @@ -66,7 +66,6 @@ const editors: HtmlEditor[] = []; const createEditor = ({ options, caretIndex }: EditorState): HtmlEditor => { const $element = $('
').appendTo(document.body); - // @ts-expect-error direct instantiation is not typed const editor: HtmlEditor = new HtmlEditor($element, { tableContextMenu: { enabled: true }, toolbar: {