cover unbound column case

Author: anna-shakhova

e2e/testcafe-devextreme/tests/dataGrid/common/grouping/grouping.ts

@@ -320,7 +320,38 @@ test('DataGrid should not lose grouping after the expandAll method if a grouped
   'b', 'c'],
 }));
 
-test('DataGrid should not change group column after the expandAll method if a grouped column has string calculateGroupValue (T1308536)', async (t) => {
+test('DataGrid should not change group column after the expandAll method, string calculateGroupValue corresponds another column (T1308536)', async (t) => {
+  const dataGrid = new DataGrid('#container');
+  const firstGroupCellText = await dataGrid.getGroupRow(0).getCell(1).element.textContent;
+
+  await dataGrid.apiExpandAll();
+
+  await t
+    .expect(dataGrid.apiColumnOption('a', 'groupIndex'))
+    .eql(0)
+    .expect(dataGrid.apiColumnOption('aLabel', 'groupIndex'))
+    .eql(undefined)
+    .expect(dataGrid.getGroupRow(0).getCell(1).element.textContent)
+    .eql(firstGroupCellText);
+}).before(async () => createWidget('dxDataGrid', {
+  dataSource: [{
+    id: 0, a: 0, aLabel: 'A_0', b: 'B_0', c: 'C_0',
+  }],
+  keyExpr: 'id',
+  grouping: { autoExpandAll: false },
+  columns: [{
+    dataField: 'a',
+    groupIndex: 0,
+    calculateGroupValue: 'aLabel',
+  },
+  {
+    caption: 'aLabel',
+    calculateCellValue(data) { return data.aLabel; },
+  },
+  'b', 'c'],
+}));
+
+test('DataGrid should not change group column after the expandAll method, , string calculateGroupValue corresponds another unbound column (T1308536)', async (t) => {
   const dataGrid = new DataGrid('#container');
   const firstGroupCellText = await dataGrid.getGroupRow(0).getCell(1).element.textContent;
 

packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts

@@ -1341,7 +1341,9 @@ export class ColumnsController extends modules.Controller {
 
       each(columns, (_: number, column) => {
         const isReferencedAsGroupValue = indexParameterName === 'groupIndex'
-          && referencedGroupValues.includes(column.dataField);
+          && referencedGroupValues.some((groupValue) => column.dataField === groupValue
+              || column.name === groupValue
+              || gridCoreUtils.isSelectorEqualWithCallback(groupValue, column.calculateCellValue));
 
         if (!isReferencedAsGroupValue) {
         // eslint-disable-next-line @typescript-eslint/no-dynamic-delete