diff --git a/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/ai_column.ts b/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/ai_column.ts index c73516297802..db92283dc7bf 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/ai_column.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/module_not_extended/ai_column.ts @@ -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'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_column.integration.test.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/__tests__/ai_column.integration.test.ts similarity index 99% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_column.integration.test.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_column/__tests__/ai_column.integration.test.ts index 95197ab95f27..629e494e194b 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_column.integration.test.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/__tests__/ai_column.integration.test.ts @@ -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', diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/unsupported_base_properties.integration.test.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/__tests__/unsupported_base_properties.integration.test.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/unsupported_base_properties.integration.test.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_column/__tests__/unsupported_base_properties.integration.test.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_cache_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_column_cache_controller.ts similarity index 96% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_cache_controller.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_column_cache_controller.ts index d9c0a61bdb7d..9bf3fe363acc 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_cache_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_column_cache_controller.ts @@ -1,4 +1,4 @@ -import { Controller } from '../m_modules'; +import { Controller } from '../../m_modules'; export class AIColumnCacheController extends Controller { private readonly cache: Record | undefined> = {}; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_column_controller.ts similarity index 95% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_controller.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_column_controller.ts index ae837aeaeba0..8a672543510a 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_column_controller.ts @@ -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; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_integration_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_column_integration_controller.ts similarity index 92% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_integration_controller.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_column_integration_controller.ts index 9fba21cc5201..528f0ce2ba40 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_integration_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_column_integration_controller.ts @@ -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 void) | undefined> = { }; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_prompt_editor_view_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_prompt_editor_view_controller.ts similarity index 69% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_prompt_editor_view_controller.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_prompt_editor_view_controller.ts index 9c1c41497357..de8052547a2e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_prompt_editor_view_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/controllers/m_ai_prompt_editor_view_controller.ts @@ -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; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/index.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/index.ts new file mode 100644 index 000000000000..bbb95345a557 --- /dev/null +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/index.ts @@ -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'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_view.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_column_view.ts similarity index 91% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_view.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_column_view.ts index 2335efe130dc..d5e534052f7e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_column_view.ts @@ -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, diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_prompt_editor_view.test.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_prompt_editor_view.test.ts similarity index 98% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_prompt_editor_view.test.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_prompt_editor_view.test.ts index 6259c48df781..37a2d613c939 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_prompt_editor_view.test.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_prompt_editor_view.test.ts @@ -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('./ai_prompt_editor/ai_prompt_editor'); +jest.mock('../../ai_prompt_editor/ai_prompt_editor', (): any => { + const original = jest.requireActual('../../ai_prompt_editor/ai_prompt_editor'); return { ...original, diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_prompt_editor_view.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_prompt_editor_view.ts similarity index 90% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_prompt_editor_view.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_prompt_editor_view.ts index 425707bb5480..29b06bc8a552 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_prompt_editor_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_column/views/m_ai_prompt_editor_view.ts @@ -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; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/ai_prompt_editor.integration.test.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/ai_prompt_editor.integration.test.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/ai_prompt_editor.integration.test.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/ai_prompt_editor.integration.test.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/ai_prompt_editor.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/ai_prompt_editor.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/ai_prompt_editor.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/ai_prompt_editor.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/const.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/const.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/const.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/const.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/types.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/types.ts similarity index 92% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/types.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/types.ts index d155c1e9c042..db2d56571190 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/types.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/types.ts @@ -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; diff --git a/packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/utils.ts b/packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/utils.ts similarity index 100% rename from packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_prompt_editor/utils.ts rename to packages/devextreme/js/__internal/grids/grid_core/ai_prompt_editor/utils.ts diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_types.ts b/packages/devextreme/js/__internal/grids/grid_core/m_types.ts index cf2bdf68a0d4..e00697e998f5 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/m_types.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/m_types.ts @@ -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 = { @@ -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 { diff --git a/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/ai_column.ts b/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/ai_column.ts index c73516297802..db92283dc7bf 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/ai_column.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/module_not_extended/ai_column.ts @@ -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';