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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
ATTRIBUTES, CLASSES, FIELD_DATA_KEY, ICONS,
} from './const';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ 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';
import { createPath, foreachTree } from '../m_widget_utils';
import SortableModule from '../sortable/m_sortable';
import { createPath, foreachTree } from '../widget_utils';
import { ATTRIBUTES, CLASSES, FIELD_DATA_KEY } from './const';
import { dragAndDropItemRender } from './dom';
import { reverseSortOrder, shouldCancelDragging } from './utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
setDefaultFieldValueFormatting,
setFieldProperty,
storeDrillDownMixin,
} from '../m_widget_utils';
} from '../widget_utils';
import type {
CustomSummaryOptions,
DataItemFilter,
Expand Down Expand Up @@ -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,
Expand All @@ -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);
Expand Down Expand Up @@ -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));
}
});
}
Expand Down Expand Up @@ -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];
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -66,7 +69,7 @@ export interface LocalHierarchyOptions {
data: unknown;
childrenHash: LocalHeaderItemsHash;
dimensions: LocalField[];
expandedPathsHash: Record<string, boolean> | false | undefined;
expandedPathsHash: Record<string, boolean> | undefined;
}

export interface CustomSummaryOptions {
Expand All @@ -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<unknown> | CustomStoreOptions | PivotGridStoreSourceOptions
) & {
onProgressChanged?: (progress: number) => void;
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,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 { 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<PivotGridProperties['fieldChooser']>;
type FieldPanelOptions = NonNullable<PivotGridProperties['fieldPanel']>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import pivotGridUtils, {
foreachTree,
getExpandedLevel,
storeDrillDownMixin,
} from '../m_widget_utils';
} from '../widget_utils';

// Utility functions
function union(elements: any[]): string {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ const getFileUploader = (editor: HtmlEditor): FileUploader => FileUploader.getIn

const openFileTab = ({ imageUpload, fileTabIndex }: DialogConfig): HtmlEditor => {
const $element = $('<div>').appendTo(document.body);
// @ts-expect-error direct instantiation is not typed
const editor: HtmlEditor = new HtmlEditor($element, {
value: VALUE,
toolbar: { items: ['image'] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ const editors: HtmlEditor[] = [];

const createEditor = (options: Properties): HtmlEditor => {
const $element = $('<div>').appendTo(document.body);
// @ts-expect-error direct instantiation is not typed
const editor: HtmlEditor = new HtmlEditor($element, { value: TABLE_MARKUP, ...options });

editors.push(editor);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ const editors: HtmlEditor[] = [];

const createEditor = ({ options, caretIndex }: EditorState): HtmlEditor => {
const $element = $('<div>').appendTo(document.body);
// @ts-expect-error direct instantiation is not typed
const editor: HtmlEditor = new HtmlEditor($element, {
tableContextMenu: { enabled: true },
toolbar: {
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [{
Expand Down
Loading