DM-9343:

  Fixed bug after zoom

Author: Lijun Zhang

src/firefly/js/charts/ChartsCntlr.js

@@ -215,6 +215,16 @@ export function makeChartDataFetch (getChartDataType) {
     };
 }
 
+function areAllValuesEaual(obj1, obj2){
+    for(var key in obj1) {
+        if (obj1.hasOwnProperty(key)) {
+            if (obj1[key]!=obj2[key]){
+                return false;
+            }
+        }
+    }
+    return true;
+}
 /**
  *
  * @param dispatch
@@ -229,6 +239,15 @@ function doChartDataFetch(dispatch, payload, getChartDataType) {
     const {chartId, chartDataElement, invokedBy} = payload;
     const oldOptions = chartDataElement.options;
     let {newOptions=oldOptions} = payload;
+    /*
+     LZ  2/24/17
+     DM-9343
+     If the zoom is in the oldOption, copy it to the newOption unless the new zoom exists in the newOption
+    */
+
+    if (!newOptions.zoom  &&  oldOptions.zoom &&  !areAllValuesEaual(oldOptions.zoom,oldOptions.boundaries)){
+        newOptions.zoom = oldOptions.zoom;
+    }
 
     const dataTypeId = chartDataElement.type;
     const cdt = dataTypeId ? getChartDataType(dataTypeId) : {};

src/firefly/js/charts/dataTypes/XYColsCDT.js

@@ -194,7 +194,9 @@ export function setZoom(chartId, chartDataElementId, selection=undefined) {
             if (decimatedUnzoomed || isUndefined(decimatedUnzoomed)) {
                 noFetch = false;
             }
-            dispatchChartOptionsUpdate({chartId, chartDataElementId, updates: {zoom: xyPlotParams.selection, selection: undefined}, noFetch});
+            dispatchChartOptionsUpdate({chartId, chartDataElementId, updates: {zoom: xyPlotParams.boundaries, selection: undefined}, noFetch});
+
+            //dispatchChartOptionsUpdate({chartId, chartDataElementId, updates: {zoom: xyPlotParams.selection, selection: undefined}, noFetch});
         }
     }
 }