AG-3245 - re-ordering columns in the grid should override re-ordering in the data panel

Author: alowdon

enterprise-modules/grid-charts/src/chartAdaptor/chartComp/chartController.ts

@@ -41,7 +41,7 @@ export class ChartController extends BeanStub {
 
     @PostConstruct
     private init(): void {
-        this.updateForGridChange();
+        this.setChartRange();
 
         this.addDestroyableEventListener(this.eventService, Events.EVENT_RANGE_SELECTION_CHANGED, event => {
             if (event.id && event.id === this.model.getChartId()) {
@@ -52,30 +52,33 @@ export class ChartController extends BeanStub {
         this.addDestroyableEventListener(this.eventService, Events.EVENT_COLUMN_MOVED, this.updateForGridChange.bind(this));
         this.addDestroyableEventListener(this.eventService, Events.EVENT_COLUMN_PINNED, this.updateForGridChange.bind(this));
         this.addDestroyableEventListener(this.eventService, Events.EVENT_COLUMN_VISIBLE, this.updateForGridChange.bind(this));
-        this.addDestroyableEventListener(this.eventService, Events.EVENT_MODEL_UPDATED, this.updateForGridChange.bind(this));
-        this.addDestroyableEventListener(this.eventService, Events.EVENT_CELL_VALUE_CHANGED, this.updateForGridChange.bind(this));
+
+        this.addDestroyableEventListener(this.eventService, Events.EVENT_MODEL_UPDATED, this.updateForDataChange.bind(this));
+        this.addDestroyableEventListener(this.eventService, Events.EVENT_CELL_VALUE_CHANGED, this.updateForDataChange.bind(this));
     }
 
     public updateForGridChange() {
-        // don't update chart if chart is detached from grid data
         if (this.model.isDetached()) { return; }
 
         this.model.updateCellRanges();
-
         this.setChartRange();
     }
 
+    public updateForDataChange() {
+        if (this.model.isDetached()) { return; }
+
+        this.model.updateData();
+        this.raiseChartUpdatedEvent();
+    }
+
     public updateForRangeChange() {
         this.updateForGridChange();
-
         this.raiseChartRangeSelectionChangedEvent();
     }
 
     public updateForPanelChange(updatedCol: ColState): void {
         this.model.updateCellRanges(updatedCol);
-
         this.setChartRange();
-
         this.raiseChartRangeSelectionChangedEvent();
     }
 

enterprise-modules/grid-charts/src/chartAdaptor/chartComp/chartDataModel.ts

@@ -190,6 +190,8 @@ export class ChartDataModel extends BeanStub {
     }
 
     private getAllColumnsFromRanges(): Set<Column> {
+
+
         let columns = this.dimensionCellRange || this.valueCellRange ? [] : this.referenceCellRange.columns;
 
         if (this.dimensionCellRange) {
@@ -326,7 +328,7 @@ export class ChartDataModel extends BeanStub {
         return 'id-' + Math.random().toString(36).substr(2, 16);
     }
 
-    private updateData(): void {
+    public updateData(): void {
         const { startRow, endRow } = this.getRowIndexes();
         const selectedDimension = this.getSelectedDimension();
         const selectedValueCols = this.getSelectedValueCols();
@@ -353,6 +355,9 @@ export class ChartDataModel extends BeanStub {
     private resetColumnState(): void {
         const { dimensionCols, valueCols } = this.getAllChartColumns();
         const allCols = this.pivotChart ? _.convertToSet(this.columnController.getAllDisplayedColumns()) : this.getAllColumnsFromRanges();
+
+        const isInitialising = this.valueColState.length < 1;
+
         this.dimensionColState = [];
         this.valueColState = [];
 
@@ -384,12 +389,12 @@ export class ChartDataModel extends BeanStub {
 
         this.dimensionColState.unshift(defaultCategory);
 
-        const valueColumnsFromRange = this.valueCellRange.columns.slice();
+        const valueColumnsFromReferenceRange = this.referenceCellRange.columns.filter(c => valueCols.has(c));
 
         valueCols.forEach(column => {
-            if (_.includes(this.valueCellRange.columns, column)) {
-                // ensure that columns included in the specified cell range are added in the order they were specified
-                column = valueColumnsFromRange.shift();
+            // first time the value cell range is set, preserve the column order from the supplied range
+            if (isInitialising && _.includes(this.referenceCellRange.columns, column)) {
+                column = valueColumnsFromReferenceRange.shift();
             }
 
             this.valueColState.push({