TreeList - display items in the original order when search is applied for local data source - T1274434 (DevExpress#28971)

Author: Tucchhaa

e2e/testcafe-devextreme/tests/treeList/seachPanel.ts

@@ -0,0 +1,75 @@
+import TreeList from 'devextreme-testcafe-models/treeList';
+import url from '../../helpers/getPageUrl';
+import { createWidget } from '../../helpers/createWidget';
+
+fixture`SearchPanel`
+  .page(url(__dirname, '../container.html'));
+
+test('Items are shown in the original order after search is applied - T1274434 - 1', async (t) => {
+  const treeList = new TreeList('#container');
+  await treeList.apiSearchByText('test');
+
+  await t
+    .expect((await treeList.apiGetVisibleRows()).length)
+    .eql(3);
+
+  await t
+    .expect(treeList.apiGetCellValue(0, 0))
+    .eql('parent1');
+
+  await t
+    .expect(treeList.apiGetCellValue(1, 0))
+    .eql('test2');
+
+  await t
+    .expect(treeList.apiGetCellValue(2, 0))
+    .eql('test1');
+}).before(async () => createWidget('dxTreeList', {
+  showBorders: true,
+  showRowLines: true,
+  expandedRowKeys: [1],
+  searchPanel: {
+    visible: true,
+  },
+  columns: ['text'],
+  dataSource: [
+    { id: 1, parentId: 0, text: 'parent1' },
+    { id: 2, parentId: 0, text: 'test1' },
+    { id: 3, parentId: 1, text: 'test2' },
+  ],
+}));
+
+test('Items are shown in the original order after search is applied - T1274434 - 2', async (t) => {
+  const treeList = new TreeList('#container');
+  await treeList.apiSearchByText('test');
+
+  await t
+    .expect((await treeList.apiGetVisibleRows()).length)
+    .eql(3);
+
+  await t
+    .expect(treeList.apiGetCellValue(0, 0))
+    .eql('parent1');
+
+  await t
+    .expect(treeList.apiGetCellValue(1, 0))
+    .eql('test2');
+
+  await t
+    .expect(treeList.apiGetCellValue(2, 0))
+    .eql('test1');
+}).before(async () => createWidget('dxTreeList', {
+  showBorders: true,
+  showRowLines: true,
+  expandedRowKeys: [1],
+  searchPanel: {
+    visible: true,
+  },
+  columns: ['text'],
+  dataSource: [
+    { id: 1, parentId: 0, text: 'parent1' },
+    { id: 2, parentId: 0, text: 'test1' },
+    { id: 3, parentId: 1, text: 'test2' },
+    { id: 4, parentId: 0, text: 'parent2' },
+  ],
+}));

packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts

@@ -634,7 +634,7 @@ class DataSourceAdapterTreeList extends DataSourceAdapter {
     const expandedRowKeys = [];
 
     if (parentIds && parentIds.length || this._isReload) {
-      if (options.fullData && options.fullData.length > options.data.length) {
+      if (options.fullData) {
         data = options.fullData;
         visibleItems = visibleItems || options.data;
       }

packages/testcafe-models/dataGrid/index.ts

@@ -666,6 +666,20 @@ export default class DataGrid extends Widget {
       },
     )();
   }
+
+  apiSearchByText(text: string): Promise<void> {
+    const { getInstance } = this;
+
+    return ClientFunction(
+      () => (getInstance() as DataGridInstance).searchByText(text),
+      {
+        dependencies: {
+          getInstance, text
+        },
+      },
+    )();
+  }
+
   moveRow(rowIndex: number, x: number, y: number, isStart = false): Promise<void> {
     const { getInstance } = this;