Fix the sendAiColumnRequest method

Author: Alyar

packages/devextreme/js/__internal/grids/grid_core/ai_column/ai_column.integration.test.ts

@@ -567,91 +567,6 @@ describe('Public methods', () => {
 
       expect(sendRequestSpy).toHaveBeenCalled();
     });
-
-    it('should call callback on completion', async () => {
-      const sendRequestSpy = jest.fn();
-      const onCompleteSpy = jest.fn();
-
-      const aiIntegration = new AIIntegration({
-        sendRequest(): RequestResult {
-          return {
-            promise: new Promise<string>((resolve) => {
-              sendRequestSpy();
-              resolve('1');
-            }),
-            abort: (): void => { },
-          };
-        },
-      });
-
-      const { instance } = await createDataGrid({
-        dataSource: [
-          { id: 1, name: 'Name 1', value: 10 },
-        ],
-        keyExpr: 'id',
-        aiIntegration,
-        columns: [
-          { dataField: 'id', caption: 'ID' },
-          { dataField: 'name', caption: 'Name' },
-          { dataField: 'value', caption: 'Value' },
-          {
-            type: 'ai',
-            caption: 'AI Column',
-            name: 'myColumn',
-          },
-        ],
-      });
-
-      instance.sendAIColumnRequest('myColumn', { onComplete: onCompleteSpy });
-      jest.runAllTimers();
-      await Promise.resolve();
-
-      expect(sendRequestSpy).toHaveBeenCalled();
-      expect(onCompleteSpy).toHaveBeenCalledWith(1);
-    });
-
-    it('should call callback on error', async () => {
-      const sendRequestSpy = jest.fn();
-      const onErrorSpy = jest.fn();
-
-      const aiIntegration = new AIIntegration({
-        sendRequest(): RequestResult {
-          return {
-            promise: new Promise<string>((_resolve, reject) => {
-              sendRequestSpy();
-              reject(new Error('Error'));
-            }),
-            abort: (): void => { },
-          };
-        },
-      });
-
-      const { instance } = await createDataGrid({
-        dataSource: [
-          { id: 1, name: 'Name 1', value: 10 },
-        ],
-        keyExpr: 'id',
-        aiIntegration,
-        columns: [
-          { dataField: 'id', caption: 'ID' },
-          { dataField: 'name', caption: 'Name' },
-          { dataField: 'value', caption: 'Value' },
-          {
-            type: 'ai',
-            caption: 'AI Column',
-            name: 'myColumn',
-          },
-        ],
-      });
-
-      instance.sendAIColumnRequest('myColumn', { onError: onErrorSpy });
-      jest.runAllTimers();
-      await Promise.resolve();
-      await Promise.resolve();
-
-      expect(sendRequestSpy).toHaveBeenCalled();
-      expect(onErrorSpy).toHaveBeenCalledWith(new Error('Error'));
-    });
   });
 });
 

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

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import type { GenerateGridColumnCommandResult, RequestCallbacks } from '@js/common/ai-integration';
+import type { Callback } from '@js/core/utils/callbacks';
 
 import type { ColumnsController } from '../columns_controller/m_columns_controller';
 import type { DataController } from '../data_controller/m_data_controller';
@@ -18,6 +18,14 @@ export class AiColumnController extends Controller {
 
   private dataChangedHandler!: (e) => any;
 
+  public aiRequestCompleted!: Callback;
+
+  public aiRequestRejected!: Callback;
+
+  protected callbackNames(): string[] {
+    return ['aiRequestCompleted', 'aiRequestRejected'];
+  }
+
   public init(): void {
     this.columnsController = this.getController('columns');
     this.dataController = this.getController('data');
@@ -49,7 +57,7 @@ export class AiColumnController extends Controller {
       .filter((col) => col.type === 'ai' && col.ai.mode === 'auto');
 
     for (const col of aiColumns) {
-      this.refreshAIColumn(col.name, {});
+      this.refreshAIColumn(col.name);
     }
   }
 
@@ -75,16 +83,21 @@ export class AiColumnController extends Controller {
 
   public sendAIColumnRequest(
     columnName: string,
-    callbacks?: RequestCallbacks<GenerateGridColumnCommandResult>,
   ): void {
-    this.aiColumnIntegrationController.sendRequest(columnName, callbacks);
+    this.aiColumnIntegrationController.sendRequest(columnName, {
+      onComplete: (data) => {
+        this.aiRequestCompleted.fire(data);
+      },
+      onError: (error: Error) => {
+        this.aiRequestRejected.fire(error);
+      },
+    });
   }
 
   public refreshAIColumn(
     columnName: string,
-    callbacks: RequestCallbacks<GenerateGridColumnCommandResult>,
   ): void {
-    this.aiColumnIntegrationController.sendRequest(columnName, callbacks);
+    this.sendAIColumnRequest(columnName);
   }
 
   public clearAIColumn(columnName: string): void {