Do not update data if expanded item have no children (T621704) (#3681)

DevExpress · Apr 13, 2018 · fedf88a · fedf88a
1 parent 109d690
commit fedf88a
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 2 deletions.
diff --git a/js/ui/pivot_grid/data_source.js b/js/ui/pivot_grid/data_source.js
@@ -189,9 +189,10 @@ module.exports = Class.inherit((function() {
             newCell,
             rowIndex,
             columnIndex,
-            dataSourceCells = dataSource.values;
+            dataSourceCells = dataSource.values,
+            isNewDataSourceNotEmpty = newRowItemIndexesToCurrent.length + newColumnItemIndexesToCurrent.length;
 
-        if(newDataSourceCells) {
+        if(newDataSourceCells && isNewDataSourceNotEmpty) {
             for(newRowIndex = 0; newRowIndex <= newDataSourceCells.length; newRowIndex++) {
                 newRowCells = newDataSourceCells[newRowIndex];
                 rowIndex = newRowItemIndexesToCurrent[newRowIndex];

diff --git a/testing/tests/DevExpress.ui.widgets.pivotGrid/dataController.tests.js b/testing/tests/DevExpress.ui.widgets.pivotGrid/dataController.tests.js
@@ -1828,6 +1828,95 @@ QUnit.test("apply partial dataController with columns path", function(assert) {
     ]);
 });
 
+QUnit.test("Apply partial dataController with empty data. Update columns", function(assert) {
+    var dataController = new DataController({
+        dataSource: {
+            fields: [
+                { area: "row" },
+                { area: "column" }, { area: "column" },
+                { caption: 'Sum', format: 'fixedPoint', area: "data" }
+            ],
+            rows: [{ value: 'Vasya', index: 0 }, { value: 'Piter', index: 1 }],
+            columns: [
+                { value: 'A', index: 2, children: [{ value: 'P1', index: 0 }, { value: 'P2', index: 1 }] },
+                { value: 'C', index: 3 }
+            ],
+            values: [
+                [1, 2, 3, 6, 12],
+                [2, 3, 4, 9, 18],
+                [3, 5, 7, 15, 30]
+            ]
+        }
+    });
+    dataController.applyPartialDataSource('column', ['C'], {
+        columns: [],
+        rows: [],
+        values: [
+            [0]
+        ]
+    });
+    assert.deepEqual(prepareLoadedData(dataController.getData().columns), [
+        { value: 'A', index: 2, children: [{ value: 'P1', index: 0 }, { value: 'P2', index: 1 }] },
+        { value: 'C', index: 3, children: [] }
+    ]);
+
+    var cells = [];
+    $.each(dataController.getCellsInfo(), function() {
+        cells.push($.map(this, function(cell) {
+            return cell && cell.text;
+        }));
+    });
+    assert.deepEqual(cells, [
+        ['1', '2', '3', '6', '12'],
+        ['2', '3', '4', '9', '18'],
+        ['3', '5', '7', '15', '30']
+    ]);
+});
+
+QUnit.test("Apply partial dataController with empty data. Update Rows", function(assert) {
+    var dataController = new DataController({
+        dataSource: {
+            fields: [
+                { area: "row" },
+                { area: "column" }, { area: "column" },
+                { caption: 'Sum', format: 'fixedPoint', area: "data" }
+            ],
+            rows: [{ value: 'Vasya', index: 0 }, { value: 'Piter', index: 1 }],
+            columns: [
+                { value: 'A', index: 2, children: [{ value: 'P1', index: 0 }, { value: 'P2', index: 1 }] },
+                { value: 'C', index: 3 }
+            ],
+            values: [
+                [1, 2, 3, 6, 12],
+                [2, 3, 4, 9, 18],
+                [3, 5, 7, 15, 30]
+            ]
+        }
+    });
+    dataController.applyPartialDataSource('row', ['Vasya'], {
+        columns: [],
+        rows: [],
+        values: [
+            [0]
+        ]
+    });
+    assert.deepEqual(prepareLoadedData(dataController.getData().rows), [
+        { value: 'Vasya', index: 0, children: [] }, { value: 'Piter', index: 1 }
+    ]);
+
+    var cells = [];
+    $.each(dataController.getCellsInfo(), function() {
+        cells.push($.map(this, function(cell) {
+            return cell && cell.text;
+        }));
+    });
+    assert.deepEqual(cells, [
+        ['1', '2', '3', '6', '12'],
+        ['2', '3', '4', '9', '18'],
+        ['3', '5', '7', '15', '30']
+    ]);
+});
+
 // B234872
 QUnit.test("apply partial dataController with empty data", function(assert) {
     var dataController = new DataController({