fix review remarks

Author: dmirgaev

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/ai_assistant_controller.ts

@@ -38,12 +38,11 @@ export class AIAssistantController extends Controller {
 
   private getCustomizedResponseTitle(
     status: MessageStatus.Success | MessageStatus.Failure,
-    commandNames: GridCommand['name'][],
+    commandNames: string[],
   ): string {
     // TODO: remove type description, it should be got from d.ts
     const customizeResponseTitle = this.option('aiAssistant.customizeResponseTitle') as CustomizeResponseTitle | undefined;
 
-    // There shouldn't be an empty array here, but we need to handle it anyway.
     if (!commandNames.length) {
       return messageLocalization.format('dxDataGrid-aiAssistantErrorMessage');
     }
@@ -63,7 +62,7 @@ export class AIAssistantController extends Controller {
     ].join(' and ');
   }
 
-  private getCommandNames(actions: ExecuteGridAssistantAction[]): GridCommand['name'][] {
+  private getCommandNames(actions: ExecuteGridAssistantAction[]): string[] {
     const commandNames = actions.map(({ name }) => name);
     const uniqueCommandNameSet = new Set(commandNames);
 
@@ -131,7 +130,7 @@ export class AIAssistantController extends Controller {
   private completeAIMessage(
     messageId: string,
     commands: CommandResult[],
-    commandNames: GridCommand['name'][],
+    commandNames: string[],
   ): void {
     const messageStatus = hasCommandErrors(commands)
       ? MessageStatus.Failure
@@ -174,10 +173,16 @@ export class AIAssistantController extends Controller {
     });
   }
 
-  private sendRequestToAICore(aiMessage: AIMessage): Promise<void> {
+  private withProcessing(promise: Promise<void>): Promise<void> {
     this.setProcessing(true);
 
-    return new Promise((resolve, reject) => {
+    return promise.finally(() => {
+      this.setProcessing(false);
+    });
+  }
+
+  private sendRequestToAICore(aiMessage: AIMessage): Promise<void> {
+    return this.withProcessing(new Promise<void>((resolve, reject) => {
       const responseSchema = this.gridCommands?.buildResponseSchema();
       const extraContext = this.getGridExtraContext();
 
@@ -186,7 +191,6 @@ export class AIAssistantController extends Controller {
         const error = new Error('Grid commands not initialized');
 
         this.failAIMessage(aiMessage.id, error);
-        this.setProcessing(false);
         reject(error);
         return;
       }
@@ -202,36 +206,32 @@ export class AIAssistantController extends Controller {
                 const commandNames = this.getCommandNames(response.actions);
 
                 this.completeAIMessage(aiMessage.id, commands, commandNames);
-                this.setProcessing(false);
                 resolve();
               })
               .fail((errorMessage) => {
-              // TODO: Change error message
+                // TODO: Change error message
                 const error = errorMessage instanceof Error
                   ? errorMessage
                   : new Error(String(errorMessage));
 
                 this.failAIMessage(aiMessage.id, error);
-                this.setProcessing(false);
                 reject(error);
               });
           },
           onError: (error: Error): void => {
-          // TODO: Change error message
+            // TODO: Change error message
             this.failAIMessage(aiMessage.id, error);
-            this.setProcessing(false);
             reject(error);
           },
           onAbort: (): void => {
             const error = new Error(messageLocalization.format('dxDataGrid-aiAssistantAbortMessage'));
 
             this.failAIMessage(aiMessage.id, error);
-            this.setProcessing(false);
             reject(error);
           },
         },
       );
-    });
+    }));
   }
 
   protected getGridCommandList(): GridCommand[] {
@@ -243,7 +243,6 @@ export class AIAssistantController extends Controller {
   }
 
   public init(): void {
-    // TODO: initialize default commands list when they are ready
     this.gridCommands = new GridCommands(this.component, this.getGridCommandList());
     this.messageStore = new ArrayStore<Message, string>({
       key: 'id',

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/ai_assistant_integration_controller.ts

@@ -11,7 +11,6 @@ import type {
   AIAssistantRequestCallbacks,
   GridColumnContext,
   GridColumnContextOptional,
-  GridContext,
   GridContextOptional,
   GridExtraContextOption,
   JsonSchema,
@@ -56,13 +55,8 @@ export class AIAssistantIntegrationController extends Controller {
     }
 
     const context = this.buildContext(extraContext);
-    const args: {
-      context: Record<string, unknown>;
-      responseSchema: JsonSchema;
-      cancel: boolean;
-      additionalInfo: Record<string, unknown>;
-    } = {
-      context: context as unknown as Record<string, unknown>,
+    const args = {
+      context,
       responseSchema,
       cancel: false,
       additionalInfo: {},
@@ -126,10 +120,9 @@ export class AIAssistantIntegrationController extends Controller {
     this.abort = undefined;
   }
 
-  public buildContext(extraContext: GridExtraContextOption | null): GridContext {
+  // TODO: fix return type
+  public buildContext(extraContext: GridExtraContextOption | null): Record<string, unknown> {
     const dataController = this.getController('data');
-    const selectedRowKeys = (this.option('selectedRowKeys') ?? []) as (string | number)[];
-    const searchText = this.option('searchPanel.text') ?? '';
     const gridExtraContext = this.getGridExtraContext(extraContext?.grid);
 
     return {
@@ -143,10 +136,10 @@ export class AIAssistantIntegrationController extends Controller {
         totalCount: dataController.totalCount(),
       },
       search: {
-        searchText,
+        searchText: this.option('searchPanel.text') ?? '',
       },
       selection: {
-        selectedRowKeys,
+        selectedRowKeys: this.option('selectedRowKeys') ?? [],
       },
       ...gridExtraContext,
     };
@@ -170,7 +163,6 @@ export class AIAssistantIntegrationController extends Controller {
           visible: column.visible !== false,
           sortOrder: column.sortOrder,
           sortIndex: column.sortIndex,
-          filterValue: column.filterValue,
           fixed: column.fixed,
           fixedPosition: column.fixedPosition,
           width: column.width,
@@ -195,7 +187,6 @@ export class AIAssistantIntegrationController extends Controller {
           context.summary = {
             totalItems: this.option('summary.totalItems'),
             groupItems: this.option('summary.groupItems'),
-            skipEmptyValues: this.option('summary.skipEmptyValues'),
           };
           break;
         }

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/types.ts

@@ -66,7 +66,7 @@ export type CustomizeResponseText = (
 // TODO: move to d.ts
 export type CustomizeResponseTitle = (
   status: MessageStatus.Success | MessageStatus.Failure,
-  commandNames: GridCommand['name'][],
+  commandNames: string[],
 ) => string;
 
 export type AIAssistantRequestCallbacks<T> = RequestCallbacks<T> & {
@@ -84,7 +84,6 @@ export interface GridColumnContext extends GridColumnContextOptional {
   visible: boolean;
   sortOrder: SortOrder | undefined;
   sortIndex: number | undefined;
-  filterValue: string | number | boolean | null | undefined;
   fixed: boolean | undefined;
   fixedPosition: FixedPosition | undefined;
   width: number | string | undefined;
@@ -95,14 +94,13 @@ export interface GridContextOptional {
   summary?: {
     totalItems: SummaryTotalItem[] | undefined;
     groupItems: SummaryGroupItem[] | undefined;
-    skipEmptyValues: SummaryGroupItem['skipEmptyValues'] | undefined;
   };
 }
 
 export interface GridContext extends GridContextOptional {
   columns: GridColumnContext[];
   filtering: {
-    filterValue: string | unknown[] | Function | null | undefined;
+    filterValue: unknown
   };
   paging: {
     pageIndex: number;
@@ -113,7 +111,7 @@ export interface GridContext extends GridContextOptional {
     searchText: string;
   };
   selection: {
-    selectedRowKeys: (string | number)[];
+    selectedRowKeys: unknown[];
   };
 }
 

packages/devextreme/js/common/grids.d.ts

@@ -128,6 +128,11 @@ export type AIAssistantRequestCreatingInfo = {
    * @type object
    */
   responseSchema: Record<string, any>;
+  /**
+   * @docid
+   * @type object
+   */
+  additionalInfo?: Record<string, any>;
 };
 
 /**

packages/devextreme/ts/dx.all.d.ts

@@ -4660,6 +4660,10 @@ declare module DevExpress.common.grids {
      * [descr:AIAssistantRequestCreatingInfo.responseSchema]
      */
     responseSchema: Record<string, any>;
+    /**
+     * [descr:AIAssistantRequestCreatingInfo.additionalInfo]
+     */
+    additionalInfo?: Record<string, any>;
   };
   export type AIColumnMode = 'auto' | 'manual';
   /**