Merge branch '25_2' into 25_2_ng_nested_fix

Author: GoodDayForSurf

packages/devextreme/js/__internal/grids/data_grid/m_widget.ts

@@ -3,7 +3,7 @@
 import DataGrid from './m_widget_base';
 
 import './module_not_extended/state_storing';
-import './module_not_extended/ai_column_controller';
+import './module_not_extended/ai_column';
 import './module_not_extended/selection';
 import './module_not_extended/column_chooser';
 import './grouping/m_grouping';

packages/devextreme/js/__internal/grids/data_grid/module_not_extended/ai_column.ts

@@ -0,0 +1,13 @@
+import { AiColumnController } from '@ts/grids/grid_core/ai_column/m_ai_column_controller';
+import { AiColumnView } from '@ts/grids/grid_core/ai_column/m_ai_column_view';
+
+import gridCore from '../m_core';
+
+gridCore.registerModule('aiColumn', {
+  controllers: {
+    aiColumn: AiColumnController,
+  },
+  views: {
+    aiColumnView: AiColumnView,
+  },
+});

packages/devextreme/js/__internal/grids/data_grid/module_not_extended/ai_column_controller.ts

@@ -1,28 +1,20 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-
-import type { ColumnsController } from '../columns_controller/m_columns_controller';
 import type { DataController } from '../data_controller/m_data_controller';
 import { Controller } from '../m_modules';
-import { getAiCommandColumnOptions } from './m_ai_column_controller_utils';
 
 export class AiColumnController extends Controller {
-  private columnsController!: ColumnsController;
-
   private dataController!: DataController;
 
   private dataChangedHandler!: (e) => any;
 
   public init(): void {
-    this.columnsController = this.getController('columns');
     this.dataController = this.getController('data');
 
     this.dataChangedHandler = this.handleDataChanged.bind(this);
     this.dataController.changed.add(this.dataChangedHandler);
 
     this.createAction('onAIColumnRequestCreating');
     this.createAction('onAIColumnResponseReceived');
-
-    this.addAiCommandColumn();
   }
 
   private createAIColumnRequest() {
@@ -35,10 +27,6 @@ export class AiColumnController extends Controller {
     this.executeAction('onAIColumnResponseReceived', options);
   }
 
-  private addAiCommandColumn(): void {
-    this.columnsController.addCommandColumn(getAiCommandColumnOptions());
-  }
-
   private handleDataChanged(e) {
 
   }
@@ -83,9 +71,3 @@ export class AiColumnController extends Controller {
     this.dataController.changed.remove(this.dataChangedHandler);
   }
 }
-
-export const aiColumnControllerModule = {
-  controllers: {
-    aiColumn: AiColumnController,
-  },
-};

packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_controller.ts

@@ -0,0 +1,20 @@
+import type { ColumnsController } from '../columns_controller/m_columns_controller';
+import { View } from '../m_modules';
+import type { AiColumnController } from './m_ai_column_controller';
+import { getAiCommandColumnOptions } from './m_ai_column_controller_utils';
+
+export class AiColumnView extends View {
+  private columnsController!: ColumnsController;
+
+  private aiColumnController!: AiColumnController;
+
+  private addAiCommandColumn(): void {
+    this.columnsController.addCommandColumn(getAiCommandColumnOptions());
+  }
+
+  public init(): void {
+    this.columnsController = this.getController('columns');
+    this.aiColumnController = this.getController('aiColumn');
+    this.addAiCommandColumn();
+  }
+}

packages/devextreme/js/__internal/grids/grid_core/ai_column/m_ai_column_view.ts

@@ -1,5 +1,5 @@
 /* eslint-disable spellcheck/spell-checker */
-/* eslint-disable max-classes-per-file */
+
 import type { GridBase, GridBaseOptions, SelectionBase } from '@js/common/grids';
 import type { Component } from '@js/core/component';
 import type { PropertyType } from '@js/core/index';
@@ -221,6 +221,7 @@ export interface Views {
   gridView: import('./views/m_grid_view').GridView;
   filterBuilderView: import('./filter/m_filter_builder').FilterBuilderView;
   filterPanelView: import('./filter/m_filter_panel').FilterPanelView;
+  aiColumnView: import('./ai_column/m_ai_column_view').AiColumnView;
 }
 
 export interface EditingControllerRequired {

packages/devextreme/js/__internal/grids/grid_core/m_types.ts

@@ -34,7 +34,7 @@ const GROUP_ROW_SELECTOR = 'tr.dx-group-row';
 
 const HIDDEN_COLUMNS_WIDTH = 'adaptiveHidden';
 
-const VIEW_NAMES = ['columnsSeparatorView', 'blockSeparatorView', 'trackerView', 'headerPanel', 'columnHeadersView', 'rowsView', 'footerView', 'columnChooserView', 'filterPanelView', 'pagerView', 'draggingHeaderView', 'contextMenuView', 'errorView', 'headerFilterView', 'filterBuilderView'];
+const VIEW_NAMES = ['columnsSeparatorView', 'blockSeparatorView', 'trackerView', 'headerPanel', 'columnHeadersView', 'rowsView', 'footerView', 'columnChooserView', 'filterPanelView', 'pagerView', 'draggingHeaderView', 'contextMenuView', 'errorView', 'headerFilterView', 'filterBuilderView', 'aiColumnView'];
 
 const E2E_ATTRIBUTES = {
   a11yStatusContainer: 'e2e-a11y-general-status-container',

packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts

@@ -3,7 +3,7 @@
 import TreeList from './m_widget_base';
 
 import './m_state_storing';
-import './module_not_extended/ai_column_controller';
+import './module_not_extended/ai_column';
 import './module_not_extended/column_chooser';
 import './m_master_detail';
 import './editing/m_editing';

packages/devextreme/js/__internal/grids/tree_list/m_widget.ts

@@ -0,0 +1,13 @@
+import { AiColumnController } from '@ts/grids/grid_core/ai_column/m_ai_column_controller';
+import { AiColumnView } from '@ts/grids/grid_core/ai_column/m_ai_column_view';
+
+import gridCore from '../m_core';
+
+gridCore.registerModule('aiColumn', {
+  controllers: {
+    aiColumn: AiColumnController,
+  },
+  views: {
+    aiColumnView: AiColumnView,
+  },
+});