Fix emptyText/noDataText in manual mode

Author: Alyar

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

@@ -487,6 +487,101 @@ describe('Options', () => {
       expect(component.getDataCell(1, 3).getText()).toBe('Test - Empty Data');
     });
   });
+
+  describe('when the noDataText is set and mode = "manual"', () => {
+    it('should render this text', async () => {
+      const { component, instance } = await createDataGrid({
+        dataSource: [
+          { id: 1, name: 'Name 1', value: 10 },
+          { id: 2, name: 'Name 2', value: 20 },
+        ],
+        keyExpr: 'id',
+        columns: [
+          { dataField: 'id', caption: 'ID' },
+          { dataField: 'name', caption: 'Name' },
+          { dataField: 'value', caption: 'Value' },
+          {
+            type: 'ai',
+            caption: 'AI Column',
+            name: 'myColumn',
+            cssClass: 'custom-class',
+            ai: {
+              prompt: 'Initial Prompt',
+              noDataText: 'Test - No Data',
+              mode: 'manual',
+              aiIntegration: new AIIntegration({
+                sendRequest(): RequestResult {
+                  return {
+                    promise: new Promise<string>((resolve) => {
+                      resolve('{"1":"","2":""}');
+                    }),
+                    abort: (): void => {},
+                  };
+                },
+              }),
+            },
+          },
+        ],
+      });
+
+      expect(component.getDataCell(0, 3).getText()).toBe(EMPTY_CELL_TEXT);
+      expect(component.getDataCell(1, 3).getText()).toBe(EMPTY_CELL_TEXT);
+
+      instance.sendAIColumnRequest('myColumn');
+      await Promise.resolve();
+
+      expect(component.getDataCell(0, 3).getText()).toBe('Test - No Data');
+      expect(component.getDataCell(1, 3).getText()).toBe('Test - No Data');
+    });
+  });
+
+  describe('when the emptyText is set and mode = "manual"', () => {
+    it('should render this text', async () => {
+      const { component, instance } = await createDataGrid({
+        keyExpr: 'id',
+        dataSource: [
+          { id: 1, name: 'Name 1', value: 10 },
+          { id: 2, name: 'Name 2', value: 20 },
+        ],
+        columns: [
+          { dataField: 'id', caption: 'ID' },
+          { dataField: 'name', caption: 'Name' },
+          { dataField: 'value', caption: 'Value' },
+          {
+            type: 'ai',
+            caption: 'AI Column',
+            name: 'myColumn',
+            cssClass: 'custom-class',
+            ai: {
+              emptyText: 'Test - Empty Data',
+              noDataText: 'Test - No Data',
+              mode: 'manual',
+              aiIntegration: new AIIntegration({
+                sendRequest(): RequestResult {
+                  return {
+                    promise: new Promise<string>((resolve) => {
+                      resolve('{"1":"","2":""}');
+                    }),
+                    abort: (): void => {},
+                  };
+                },
+              }),
+            },
+          },
+        ],
+      });
+
+      expect(component.getDataCell(0, 3).getText()).toBe('Test - Empty Data');
+      expect(component.getDataCell(1, 3).getText()).toBe('Test - Empty Data');
+
+      instance.columnOption('myColumn', 'ai.prompt', 'Updated Prompt');
+      instance.sendAIColumnRequest('myColumn');
+      await Promise.resolve();
+
+      expect(component.getDataCell(0, 3).getText()).toBe('Test - No Data');
+      expect(component.getDataCell(1, 3).getText()).toBe('Test - No Data');
+    });
+  });
 });
 
 describe('columnOption', () => {
@@ -3750,12 +3845,12 @@ describe('Cache', () => {
       instance.sendAIColumnRequest('myColumn');
       await Promise.resolve();
       expect(sendRequestSpy).toHaveBeenCalledTimes(1);
-      expect(instance.getAIColumnText('myColumn', 1)).toBeUndefined();
+      expect(instance.getAIColumnText('myColumn', 1)).toBe('');
 
       instance.sendAIColumnRequest('myColumn');
       await Promise.resolve();
       expect(sendRequestSpy).toHaveBeenCalledTimes(2);
-      expect(instance.getAIColumnText('myColumn', 1)).toBeUndefined();
+      expect(instance.getAIColumnText('myColumn', 1)).toBe('');
     });
   });
 });

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

@@ -25,14 +25,14 @@ export class AIColumnCacheController extends Controller {
     data: Record<PropertyKey, string>,
   ): void {
     let columnCache = this.cache[columnName];
+
     if (!columnCache) {
       columnCache = {};
       this.cache[columnName] = columnCache;
     }
+
     Object.entries(data).forEach(([key, value]) => {
-      if (columnCache && value !== '') {
-        columnCache[key] = value;
-      }
+      columnCache[key] = value;
     });
   }
 

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

@@ -27,10 +27,8 @@ export class AIColumnController extends Controller {
 
   public aiRequestRejected!: Callback;
 
-  private getDefaultCellValue(column: Column): string | null {
-    const prompt = column.ai?.prompt;
-
-    if (!prompt) {
+  private getDefaultCellValue(column: Column, cellValue: string | undefined): string | null {
+    if (cellValue === undefined) {
       return column.ai?.emptyText ?? null;
     }
 
@@ -46,7 +44,7 @@ export class AIColumnController extends Controller {
       calculateCellValue(data: UserData) {
         const key = dataController.keyOf(data);
         const cellValue = aiColumnIntegrationController.getAIColumnText(this.name, key);
-        const defaultValue = that.getDefaultCellValue(this);
+        const defaultValue = that.getDefaultCellValue(this, cellValue);
 
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         return cellValue || defaultValue;