Skip to content

DataGrid/TreeList: Refactor AI Column module #31777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2025
Merged

DataGrid/TreeList: Refactor AI Column module #31777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17c826f
DataGrid/TreeList: Refactor AI Column module
Nov 20, 2025
f8b8832
Fix tests
Nov 20, 2025
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
10 changes: 6 additions & 4 deletions packages/devextreme/js/__internal/grids/data_grid/module_not_extended/ai_column.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { AIColumnController } from '@ts/grids/grid_core/ai_column/m_ai_column_controller';
import { columnHeadersViewExtender } from '@ts/grids/grid_core/ai_column/m_ai_column_view';
import { AIPromptEditorView } from '@ts/grids/grid_core/ai_column/m_ai_prompt_editor_view';
import { AIPromptEditorViewController } from '@ts/grids/grid_core/ai_column/m_ai_prompt_editor_view_controller';
import {
AIColumnController,
AIPromptEditorView,
AIPromptEditorViewController,
columnHeadersViewExtender,
} from '@ts/grids/grid_core/ai_column/index';

import gridCore from '../m_core';

Expand Down
2 changes: 1 addition & 1 deletion ...e/ai_column/ai_column.integration.test.ts → ...n/__tests__/ai_column.integration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { AIIntegration } from '@ts/core/ai_integration/core/ai_integration';
import ArrayStore from '@ts/data/m_array_store';
import { DataGridModel } from '@ts/grids/data_grid/__tests__/__mock__/model/data_grid';

import { CLASSES } from './const';
import { CLASSES } from '../const';

const SELECTORS = {
gridContainer: '#gridContainer',
Expand Down
0 ...orted_base_properties.integration.test.ts → ...orted_base_properties.integration.test.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ai_column/m_ai_column_cache_controller.ts → ...ntrollers/m_ai_column_cache_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Controller } from '../m_modules';
import { Controller } from '../../m_modules';

export class AIColumnCacheController extends Controller {
private readonly cache: Record<string, Record<PropertyKey, string> | undefined> = {};
Expand Down
10 changes: 5 additions & 5 deletions ..._core/ai_column/m_ai_column_controller.ts → ...umn/controllers/m_ai_column_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { Callback } from '@js/core/utils/callbacks';

import type { Column, ColumnsController } from '../columns_controller/m_columns_controller';
import type { DataController, HandleDataChangedArguments, UserData } from '../data_controller/m_data_controller';
import { Controller } from '../m_modules';
import type { Column, ColumnsController } from '../../columns_controller/m_columns_controller';
import type { DataController, HandleDataChangedArguments, UserData } from '../../data_controller/m_data_controller';
import { Controller } from '../../m_modules';
import type { InternalRequestCallbacks } from '../types';
import { getAICommandColumnDefaultOptions, isAIColumnAutoMode, isPromptOption } from '../utils';
import { AIColumnIntegrationController } from './m_ai_column_integration_controller';
import type { InternalRequestCallbacks } from './types';
import { getAICommandColumnDefaultOptions, isAIColumnAutoMode, isPromptOption } from './utils';

export class AIColumnController extends Controller {
private dataController!: DataController;
Expand Down
12 changes: 6 additions & 6 deletions ...umn/m_ai_column_integration_controller.ts → ...ers/m_ai_column_integration_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import type {
} from '@js/common/ai-integration';
import errors from '@js/ui/widget/ui.errors';

import type { ColumnsController } from '../columns_controller/m_columns_controller';
import type { DataController } from '../data_controller/m_data_controller';
import type { ErrorHandlingController } from '../error_handling/m_error_handling';
import { Controller } from '../m_modules';
import type { ColumnsController } from '../../columns_controller/m_columns_controller';
import type { DataController } from '../../data_controller/m_data_controller';
import type { ErrorHandlingController } from '../../error_handling/m_error_handling';
import { Controller } from '../../m_modules';
import type { InternalRequestCallbacks } from '../types';
import { getDataFromRowItems, reduceDataCachedKeys } from '../utils';
import { AIColumnCacheController } from './m_ai_column_cache_controller';
import type { InternalRequestCallbacks } from './types';
import { getDataFromRowItems, reduceDataCachedKeys } from './utils';

export class AIColumnIntegrationController extends Controller {
private aborts: Record<string, (() => void) | undefined> = { };
Expand Down
6 changes: 3 additions & 3 deletions ...umn/m_ai_prompt_editor_view_controller.ts → ...ers/m_ai_prompt_editor_view_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Column } from '../columns_controller/m_columns_controller';
import { ViewController } from '../m_modules';
import type { AIPromptEditorView } from './m_ai_prompt_editor_view';
import type { Column } from '../../columns_controller/m_columns_controller';
import { ViewController } from '../../m_modules';
import type { AIPromptEditorView } from '../views/m_ai_prompt_editor_view';

export class AIPromptEditorViewController extends ViewController {
private aiPromptEditorView!: AIPromptEditorView;
Expand Down
4 changes: 4 additions & 0 deletions packages/devextreme/js/__internal/grids/grid_core/ai_column/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export { AIColumnController } from './controllers/m_ai_column_controller';
export { AIPromptEditorViewController } from './controllers/m_ai_prompt_editor_view_controller';
export { columnHeadersViewExtender } from './views/m_ai_column_view';
export { AIPromptEditorView } from './views/m_ai_prompt_editor_view';
18 changes: 9 additions & 9 deletions ...s/grid_core/ai_column/m_ai_column_view.ts → ..._core/ai_column/views/m_ai_column_view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ import $ from '@js/core/renderer';
import type { Item, ItemClickEvent, Properties as DropDownProperties } from '@js/ui/drop_down_button';
import DropDownButton from '@js/ui/drop_down_button';

import type { ColumnHeadersView } from '../column_headers/m_column_headers';
import type { Column } from '../columns_controller/m_columns_controller';
import type { ColumnsResizerViewController } from '../columns_resizing_reordering/m_columns_resizing_reordering';
import type { ModuleType } from '../m_types';
import { AI_COLUMN_NAME, CLASSES, ICON_NAMES } from './const';
import { createAIHeaderContainer, createChatSparkleOutlineIcon } from './dom';
import type { AIColumnController } from './m_ai_column_controller';
import type { AIPromptEditorViewController } from './m_ai_prompt_editor_view_controller';
import type { ColumnHeadersView } from '../../column_headers/m_column_headers';
import type { Column } from '../../columns_controller/m_columns_controller';
import type { ColumnsResizerViewController } from '../../columns_resizing_reordering/m_columns_resizing_reordering';
import type { ModuleType } from '../../m_types';
import { AI_COLUMN_NAME, CLASSES, ICON_NAMES } from '../const';
import type { AIColumnController } from '../controllers/m_ai_column_controller';
import type { AIPromptEditorViewController } from '../controllers/m_ai_prompt_editor_view_controller';
import { createAIHeaderContainer, createChatSparkleOutlineIcon } from '../dom';
import {
isAIColumnHeader,
isHeaderDropDownButtonVisible,
isPromptOption,
} from './utils';
} from '../utils';

export const columnHeadersViewExtender = (
Base: ModuleType<ColumnHeadersView>,
Expand Down
8 changes: 4 additions & 4 deletions ...ai_column/m_ai_prompt_editor_view.test.ts → ...umn/views/m_ai_prompt_editor_view.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import Callbacks from '@js/core/utils/callbacks';
import wrapInstanceWithMocks from '@ts/grids/grid_core/__tests__/__mock__/helpers/wrapInstance';
import { AIPromptEditorModel } from '@ts/grids/grid_core/__tests__/__mock__/model/ai_prompt_editor';

import type { Column } from '../columns_controller/m_columns_controller';
import { AIPromptEditor } from './ai_prompt_editor/ai_prompt_editor';
import { AIPromptEditor } from '../../ai_prompt_editor/ai_prompt_editor';
import type { Column } from '../../columns_controller/m_columns_controller';
import { AIPromptEditorView } from './m_ai_prompt_editor_view';

jest.mock('./ai_prompt_editor/ai_prompt_editor', (): any => {
const original = jest.requireActual<any>('./ai_prompt_editor/ai_prompt_editor');
jest.mock('../../ai_prompt_editor/ai_prompt_editor', (): any => {
const original = jest.requireActual<any>('../../ai_prompt_editor/ai_prompt_editor');

return {
...original,
Expand Down
16 changes: 8 additions & 8 deletions ...core/ai_column/m_ai_prompt_editor_view.ts → ...i_column/views/m_ai_prompt_editor_view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import $ from '@js/core/renderer';
import domAdapter from '@ts/core/m_dom_adapter';

import type { Column, ColumnsController } from '../columns_controller/m_columns_controller';
import { getColumnHeaderCellSelector } from '../columns_controller/m_columns_controller_utils';
import { View } from '../m_modules';
import { AIPromptEditor } from './ai_prompt_editor/ai_prompt_editor';
import type { AIPromptEditorOptions } from './ai_prompt_editor/types';
import { AI_COLUMN_NAME } from './const';
import type { AIColumnController } from './m_ai_column_controller';
import { AIPromptEditor } from '../../ai_prompt_editor/ai_prompt_editor';
import type { AIPromptEditorOptions } from '../../ai_prompt_editor/types';
import type { Column, ColumnsController } from '../../columns_controller/m_columns_controller';
import { getColumnHeaderCellSelector } from '../../columns_controller/m_columns_controller_utils';
import { View } from '../../m_modules';
import { AI_COLUMN_NAME } from '../const';
import type { AIColumnController } from '../controllers/m_ai_column_controller';
import {
isAIColumnAutoMode,
isEditorOptions,
isPopupOptions,
isPromptOption,
isRefreshOption,
} from './utils';
} from '../utils';

export class AIPromptEditorView extends View {
private columnsController!: ColumnsController;
Expand Down
0 ...itor/ai_prompt_editor.integration.test.ts → ...itor/ai_prompt_editor.integration.test.ts
View file
Open in desktop
File renamed without changes.
0 ...lumn/ai_prompt_editor/ai_prompt_editor.ts → ...core/ai_prompt_editor/ai_prompt_editor.ts
View file
Open in desktop
File renamed without changes.
0 ..._core/ai_column/ai_prompt_editor/const.ts → ...grids/grid_core/ai_prompt_editor/const.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ..._core/ai_column/ai_prompt_editor/types.ts → ...grids/grid_core/ai_prompt_editor/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { dxElementWrapper } from '@js/core/renderer';
import type { Properties as PopupProperties } from '@js/ui/popup';
import type { Properties as TextAreaProperties } from '@js/ui/text_area';

import type { CreateComponent } from '../../m_types';
import type { CreateComponent } from '../m_types';

export interface AIPromptEditorOptions {
container: dxElementWrapper;
Expand Down
0 ..._core/ai_column/ai_prompt_editor/utils.ts → ...grids/grid_core/ai_prompt_editor/utils.ts
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions packages/devextreme/js/__internal/grids/grid_core/m_types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ export interface Controllers {
synchronizeScrolling: import('./views/m_grid_view').SynchronizeScrollingController;
tablePosition: import('./columns_resizing_reordering/m_columns_resizing_reordering').TablePositionViewController;
toastViewController: import('./toast/m_toast_controller').ToastViewController;
aiColumn: import('./ai_column/m_ai_column_controller').AIColumnController;
aiPromptEditor: import('./ai_column/m_ai_prompt_editor_view_controller').AIPromptEditorViewController;
aiColumn: import('./ai_column/controllers/m_ai_column_controller').AIColumnController;
aiPromptEditor: import('./ai_column/controllers/m_ai_prompt_editor_view_controller').AIPromptEditorViewController;
}

type ControllerTypes = {
Expand All @@ -226,7 +226,7 @@ export interface Views {
filterBuilderView: import('./filter/m_filter_builder').FilterBuilderView;
filterPanelView: import('./filter/m_filter_panel').FilterPanelView;
toastView: import('./toast/m_toast_view').ToastView;
aiPromptEditorView: import('./ai_column/m_ai_prompt_editor_view').AIPromptEditorView;
aiPromptEditorView: import('./ai_column/views/m_ai_prompt_editor_view').AIPromptEditorView;
}

export interface EditingControllerRequired {
Expand Down
10 changes: 6 additions & 4 deletions packages/devextreme/js/__internal/grids/tree_list/module_not_extended/ai_column.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { AIColumnController } from '@ts/grids/grid_core/ai_column/m_ai_column_controller';
import { columnHeadersViewExtender } from '@ts/grids/grid_core/ai_column/m_ai_column_view';
import { AIPromptEditorView } from '@ts/grids/grid_core/ai_column/m_ai_prompt_editor_view';
import { AIPromptEditorViewController } from '@ts/grids/grid_core/ai_column/m_ai_prompt_editor_view_controller';
import {
AIColumnController,
AIPromptEditorView,
AIPromptEditorViewController,
columnHeadersViewExtender,
} from '@ts/grids/grid_core/ai_column/index';

import gridCore from '../m_core';

Expand Down
Loading