Merge branch '26_1' into issue-4222_26_1

Author: dxvladislavvolkov

package.json

@@ -117,11 +117,12 @@
       "@tootallnate/once@<3.0.1": "^3.0.1",
       "dompurify@<=3.3.3": ">=3.4.0",
       "brace-expansion@<1.1.13": "^1.1.13",
-      "brace-expansion@>=2.0.0 <2.0.3": "^5.0.5",
-      "brace-expansion@>=4.0.0 <5.0.5": "^5.0.5",
+      "brace-expansion@>=2.0.0 <2.0.3": "^5.0.6",
+      "brace-expansion@>=4.0.0 <5.0.6": "^5.0.6",
       "yaml@>=2.0.0 <2.8.3": "^2.8.3",
       "follow-redirects@<=1.15.11": ">=1.16.0",
-      "@angular/platform-server@>=20.0.0-next.0 <20.3.19": "^20.3.19",
+      "@angular/platform-server@>=21.0.0-next.0 <21.2.13": "^21.2.13",
+      "ws@>=8.0.0 <8.20.1": "^8.20.1",
       "stylelint-config-recommended-vue@1.6.1>stylelint-config-recommended": "^16.0.0",
       "uuid@<14.0.0": "~14.0.0",
       "postcss@<8.5.10": "8.5.10",

packages/devextreme/js/__internal/grids/data_grid/__tests__/__mock__/model/data_grid.ts

@@ -1,12 +1,13 @@
 import type { Column } from '@js/ui/data_grid';
 import DataGrid from '@js/ui/data_grid';
+import type { DataGridInstance } from '@ts/grids/grid_core/__tests__/__mock__/helpers/utils';
 import { DataGridBaseModel } from '@ts/grids/grid_core/__tests__/__mock__/model/data_grid_base';
 
 export class DataGridModel extends DataGridBaseModel<DataGrid> {
   protected NAME = 'dxDataGrid';
 
-  public getInstance(): DataGrid {
-    return DataGrid.getInstance(this.root) as DataGrid;
+  public getInstance(): DataGridInstance {
+    return DataGrid.getInstance(this.root) as DataGridInstance;
   }
 
   public apiGetVisibleColumns(headerLevel?: number): Column[] {

packages/devextreme/js/__internal/grids/grid_core/__tests__/__mock__/model/ai_assistant.ts

@@ -0,0 +1,57 @@
+import type { ArrayStore } from '@js/common/data';
+import type { Message } from '@js/ui/chat';
+import DataGrid from '@js/ui/data_grid';
+import type { DataGridInstance } from '@ts/grids/grid_core/__tests__/__mock__/helpers/utils';
+import { AIChatModel } from '@ts/grids/grid_core/__tests__/__mock__/model/ai_chat';
+import { DataGridBaseModel } from '@ts/grids/grid_core/__tests__/__mock__/model/data_grid_base';
+import type { AIAssistantController } from '@ts/grids/grid_core/ai_assistant/ai_assistant_controller';
+import type { AIAssistantViewController } from '@ts/grids/grid_core/ai_assistant/ai_assistant_view_controller';
+import type { AIMessage } from '@ts/grids/grid_core/ai_assistant/types';
+
+export class AIAssistantDataGridModel extends DataGridBaseModel<DataGrid> {
+  protected NAME = 'dxDataGrid';
+
+  public getInstance(): DataGridInstance {
+    return DataGrid.getInstance(this.root) as DataGridInstance;
+  }
+
+  public getAiAssistantController(): AIAssistantController {
+    return this.getInstance().getController('aiAssistant');
+  }
+
+  public getAiAssistantViewController(): AIAssistantViewController {
+    return this.getInstance().getController('aiAssistantViewController');
+  }
+
+  public sendAiRequest(text: string): void {
+    const controller = this.getAiAssistantController();
+
+    controller
+      .sendRequestToAI({
+        author: { id: 'user', name: 'User' },
+        text,
+        timestamp: new Date().toISOString(),
+      } as Message)
+      .catch(() => {});
+  }
+
+  public sendAiRequestRaw(message: Message | AIMessage): Promise<void> {
+    return this.getAiAssistantController().sendRequestToAI(message);
+  }
+
+  public getMessageStore(): ArrayStore<Message, string> {
+    return this.getAiAssistantController().getMessageStore();
+  }
+
+  public loadMessages(): Promise<Message[]> {
+    return this.getMessageStore().load() as Promise<Message[]>;
+  }
+
+  public getAiChatModel(): AIChatModel {
+    return new AIChatModel();
+  }
+
+  public async togglePopup(): Promise<void> {
+    await this.getAiAssistantViewController().toggle();
+  }
+}

packages/devextreme/js/__internal/grids/grid_core/__tests__/__mock__/model/ai_chat.ts

@@ -0,0 +1,50 @@
+import type { dxElementWrapper } from '@js/core/renderer';
+import $ from '@js/core/renderer';
+import { MessageStatus } from '@ts/grids/grid_core/ai_assistant/const';
+import { CLASSES } from '@ts/grids/grid_core/ai_chat/const';
+
+export class AIChatModel {
+  protected readonly root: dxElementWrapper;
+
+  constructor() {
+    this.root = $(`.${CLASSES.aiChat}`);
+  }
+
+  public getMessages(): dxElementWrapper {
+    return this.root.find(`.${CLASSES.message}`);
+  }
+
+  public getMessage(messageIndex: number): dxElementWrapper {
+    return this.getMessages().eq(messageIndex);
+  }
+
+  public getMessageStatus(messageIndex: number): MessageStatus {
+    const $message = this.getMessage(messageIndex);
+    if ($message.hasClass(CLASSES.messagePending)) {
+      return MessageStatus.Pending;
+    }
+    if ($message.hasClass(CLASSES.messageSuccess)) {
+      return MessageStatus.Success;
+    }
+    if ($message.hasClass(CLASSES.messageError)) {
+      return MessageStatus.Failure;
+    }
+    return '' as never;
+  }
+
+  public getErrorMessage(messageIndex: number): dxElementWrapper {
+    return this.getMessage(messageIndex)
+      .find(`.${CLASSES.messageErrorText}`);
+  }
+
+  public getActionList(messageIndex: number): dxElementWrapper {
+    return this.getMessage(messageIndex)
+      .find(`.${CLASSES.actionListItemText}`);
+  }
+
+  public getRegenerateButton(messageIndex: number): HTMLElement {
+    return this.getMessage(messageIndex)
+      .find(`.${CLASSES.messageRegenerateButton}`)
+      .get(0) as HTMLElement;
+  }
+}