GridCommands: add row index to focus and select commands

Author: anna-shakhova

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/commands/__tests__/focus.test.ts

@@ -328,13 +328,13 @@ describe('focusRowByIndexCommand', () => {
   });
 
   describe('default message', () => {
-    it('uses the literal `Focus row.` on success', async () => {
+    it('reports the 1-based row number on the current page on success', async () => {
       const instance = await createGrid();
       const callbacks = createCallbacks();
 
       await focusRowByIndexCommand.execute(instance, callbacks)({ index: 1 });
 
-      expect(callbacks.success).toHaveBeenCalledWith('Focus row.');
+      expect(callbacks.success).toHaveBeenCalledWith('Focus row number 2 on the current page.');
     });
 
     it('passes the same default message to failure when executability fails', async () => {
@@ -343,7 +343,7 @@ describe('focusRowByIndexCommand', () => {
 
       await focusRowByIndexCommand.execute(instance, callbacks)({ index: 1 });
 
-      expect(callbacks.failure).toHaveBeenCalledWith('Focus row.');
+      expect(callbacks.failure).toHaveBeenCalledWith('Focus row number 2 on the current page.');
     });
   });
 });

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/commands/__tests__/selection.test.ts

@@ -372,14 +372,14 @@ describe('selectByIndexesCommand', () => {
   });
 
   describe('default message', () => {
-    it('uses literal `Select row(s).`', async () => {
+    it('reports the 1-based row numbers on the current page on success', async () => {
       const instance = await createGrid();
       jest.spyOn(instance, 'selectRowsByIndexes').mockReturnValue(Promise.resolve([]) as never);
       const callbacks = createCallbacks();
 
       await selectByIndexesCommand.execute(instance, callbacks)({ indexes: [0, 2] });
 
-      expect(callbacks.success).toHaveBeenCalledWith('Select row(s).');
+      expect(callbacks.success).toHaveBeenCalledWith('Select row(s) number 1, 3 on the current page.');
     });
 
     it('passes the same default message to failure', async () => {
@@ -388,7 +388,7 @@ describe('selectByIndexesCommand', () => {
 
       await selectByIndexesCommand.execute(instance, callbacks)({ indexes: [0] });
 
-      expect(callbacks.failure).toHaveBeenCalledWith('Select row(s).');
+      expect(callbacks.failure).toHaveBeenCalledWith('Select row(s) number 1 on the current page.');
     });
   });
 });

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/commands/focus.ts

@@ -84,7 +84,7 @@ export const focusRowByIndexCommand = defineGridCommand({
   description: 'Focus a specific row by its 0-based index within the current page. Index 0 is the first row on the visible page. To focus a row that is not on the current page, use focusRowByKey or call pageIndex first. Requires focusedRowEnabled to be true on the grid.',
   schema: focusRowByIndexCommandSchema,
   execute: (component, { success, failure }) => async (args): Promise<CommandResult> => {
-    const defaultMessage = 'Focus row.';
+    const defaultMessage = `Focus row number ${args.index + 1} on the current page.`;
     const dataController = component.getController('data');
     const key = dataController.getKeyByRowIndex(args.index);
 

packages/devextreme/js/__internal/grids/grid_core/ai_assistant/commands/selection.ts

@@ -51,7 +51,8 @@ export const selectByIndexesCommand = defineGridCommand({
   description: 'Select rows by their 0-based indexes within the current page. Index 0 is the first row on the visible page; group/header rows are not selectable. To select rows that are not on the current page, use selectByKeys, or call pageIndex first to switch the page.',
   schema: selectByIndexesCommandSchema,
   execute: (component, { success, failure }) => async (args): Promise<CommandResult> => {
-    const defaultMessage = 'Select row(s).';
+    const rowIndexes = args.indexes.map((index) => index + 1).join(', ');
+    const defaultMessage = `Select row(s) number ${rowIndexes} on the current page.`;
 
     if (component.option('selection.mode') === 'none') {
       return failure(defaultMessage);