From c353115a1df1c6f43e02ce290cc8d2f0402a96a3 Mon Sep 17 00:00:00 2001 From: ivanblinov2k17 Date: Wed, 16 Oct 2024 18:15:07 +0400 Subject: [PATCH] Core: fix pivotGrid dataSource.bundled --- packages/devextreme/js/__internal/core/utils/m_common.ts | 2 +- .../devextreme/js/__internal/core/utils/m_inflector.ts | 9 +++++++++ .../grid_core/columns_controller/m_columns_controller.ts | 4 ++-- .../__internal/grids/grid_core/filter/m_filter_panel.ts | 4 ++-- .../grids/pivot_grid/data_source/m_data_source.ts | 4 ++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/packages/devextreme/js/__internal/core/utils/m_common.ts b/packages/devextreme/js/__internal/core/utils/m_common.ts index b3a2b665a435..369e55892950 100644 --- a/packages/devextreme/js/__internal/core/utils/m_common.ts +++ b/packages/devextreme/js/__internal/core/utils/m_common.ts @@ -11,7 +11,7 @@ export const ensureDefined = function (value, defaultValue) { return isDefined(value) ? value : defaultValue; }; -export const executeAsync = function (action, context/* , internal */) { +export const executeAsync = function (action, context?/* , internal */) { // @ts-expect-error only void function can be called with new const deferred = new Deferred(); const normalizedContext = context || this; diff --git a/packages/devextreme/js/__internal/core/utils/m_inflector.ts b/packages/devextreme/js/__internal/core/utils/m_inflector.ts index 4ad864f409f3..f9675f385974 100644 --- a/packages/devextreme/js/__internal/core/utils/m_inflector.ts +++ b/packages/devextreme/js/__internal/core/utils/m_inflector.ts @@ -73,3 +73,12 @@ export const captionize = function(name) { } return captionList.join(''); }; + +export default { + dasherize, + underscore, + camelize, + humanize, + titleize, + captionize +} \ No newline at end of file diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts index bc14ed0158f5..21a559db2e7e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts @@ -6,7 +6,6 @@ import Callbacks from '@js/core/utils/callbacks'; import { compileGetter } from '@js/core/utils/data'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import { captionize } from '@js/core/utils/inflector'; import { each, map } from '@js/core/utils/iterator'; import { orderEach } from '@js/core/utils/object'; import { @@ -21,6 +20,7 @@ import dateLocalization from '@js/localization/date'; import messageLocalization from '@js/localization/message'; import filterUtils from '@js/ui/shared/filtering'; import errors from '@js/ui/widget/ui.errors'; +import inflector from '@ts/core/utils/m_inflector'; import type { DataController } from '@ts/grids/grid_core/data_controller/m_data_controller'; import type { FocusController } from '@ts/grids/grid_core/focus/m_focus'; import type { StateStoringController } from '@ts/grids/grid_core/state_storing/m_state_storing_core'; @@ -1605,7 +1605,7 @@ export class ColumnsController extends modules.Controller { if (isString(dataField)) { const getter = compileGetter(dataField); calculatedColumnOptions = { - caption: captionize(dataField), + caption: inflector.captionize(dataField), calculateCellValue(data, skipDeserialization) { // @ts-expect-error const value = getter(data); diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts index 7f4bafe41755..28085ef378dd 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.ts @@ -2,11 +2,11 @@ import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { Deferred, when } from '@js/core/utils/deferred'; -import { captionize } from '@js/core/utils/inflector'; import { isDefined } from '@js/core/utils/type'; import eventsEngine from '@js/events/core/events_engine'; import messageLocalization from '@js/localization/message'; import CheckBox from '@js/ui/check_box'; +import inflector from '@ts/core/utils/m_inflector'; import { getCaptionByOperation, getCurrentLookupValueText, getCurrentValueText, getCustomOperation, getField, getGroupValue, isCondition, isGroup, @@ -244,7 +244,7 @@ export class FilterPanelView extends modules.View { const value = filterValue[2]; if (customOperation) { - operationText = customOperation.caption || captionize(customOperation.name); + operationText = customOperation.caption || inflector.captionize(customOperation.name); } else if (value === null) { operationText = getCaptionByOperation(operation === '=' ? 'isblank' : 'isnotblank', options.filterOperationDescriptions); } else { 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 d6f9f48f84d4..e918861e9f53 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 @@ -3,7 +3,6 @@ import { EventsStrategy } from '@js/core/events_strategy'; import { normalizeIndexes } from '@js/core/utils/array'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import { titleize } from '@js/core/utils/inflector'; import { each } from '@js/core/utils/iterator'; import { isDefined, isFunction, isNumeric, isPlainObject, @@ -12,6 +11,7 @@ import { import Store from '@js/data/abstract_store'; import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; import commonUtils from '@ts/core/utils/m_common'; +import inflector from '@ts/core/utils/m_inflector'; import { LocalStore } from '../local_store/m_local_store'; import { @@ -73,7 +73,7 @@ function createCaption(field) { summaryType = ''; } - return titleize(caption) + summaryType; + return inflector.titleize(caption) + summaryType; } function resetFieldState(field, properties) {