Fixed unrecoverable error when chart is added from dropdown while single view multi-chart is expanded.

Also made histogram API backward compatible.

Author: tgoldina

src/firefly/js/charts/ChartUtil.js

@@ -183,17 +183,27 @@ export function makeXYPlotParams(params) {
  * @memberof firefly.util.chart
  */
 export function makeHistogramParams(params) {
-    const {col, xOptions, yOptions, falsePositiveRate} = params;
+    const {col, xOptions, yOptions, falsePositiveRate, binWidth} = params;
     let numBins = params.numBins;
-    if (!falsePositiveRate && !numBins) {numBins = 50;}
+    let fixedBinSizeSelection = params.fixedBinSizeSelection;
+    if (!falsePositiveRate) {
+        if (!fixedBinSizeSelection) {
+            fixedBinSizeSelection = 'numBins';
+        }
+        if (!numBins) {
+            numBins = 50;
+        }
+    }
     const algorithm = numBins ? 'fixedSizeBins' : 'bayesianBlocks';
 
     if (col) {
         const histogramParams =
         {
             columnOrExpr: col,
             algorithm,
+            fixedBinSizeSelection,
             numBins,
+            binWidth,
             falsePositiveRate,
             x: xOptions||'',
             y: yOptions||''

src/firefly/js/charts/ui/MultiChartToolbar.jsx

@@ -4,6 +4,7 @@
 
 
 import React, {PropTypes} from 'react';
+import {get} from 'lodash';
 import {getChartData} from '../ChartsCntlr.js';
 import {dispatchChangeViewerLayout, dispatchUpdateCustom, getViewerItemIds, getViewer, getLayoutType, getMultiViewRoot} from '../../visualize/MultiViewCntlr.js';
 
@@ -168,7 +169,8 @@ MultiChartToolbarExpanded.propTypes= {
 };
 
 const getChartTitle = (chartId, viewerItemIds) => {
-    const {chartType} = getChartData(chartId);
+    const chartData = getChartData(chartId);
+    const chartType = get(chartData, 'chartType');
     const idx = viewerItemIds.findIndex((el) => {return el === chartId;} );
     if (idx>=0) {
         return `${idx+1}-${chartType}`;

src/firefly/js/visualize/iv/ExpandedTools.jsx

@@ -4,8 +4,8 @@
 
 
 import React, {PropTypes} from 'react';
-import {ExpandType, WcsMatchType, dispatchChangeExpandedMode,
-         dispatchExpandedAutoPlay, dispatchWcsMatch} from '../ImagePlotCntlr.js';
+import {ExpandType, dispatchChangeExpandedMode,
+         dispatchExpandedAutoPlay} from '../ImagePlotCntlr.js';
 import {primePlot} from '../PlotViewUtil.js';
 import {ToolbarButton} from '../../ui/ToolbarButton.jsx';
 import {PlotTitle, TitleType} from './PlotTitle.jsx';
@@ -211,11 +211,11 @@ export function PagingControl({viewerItemIds,activeItemId,isPagingMode,getItemTi
     if (!activeItemId || viewerItemIds.length<2 || !isPagingMode) return <div style={controlStyle}/>;
 
     const cIdx= viewerItemIds.indexOf(activeItemId);
+    if (cIdx<0) return <div style={controlStyle}/>;
+
     const nextIdx= cIdx===viewerItemIds.length-1 ? 0 : cIdx+1;
     const prevIdx= cIdx ? cIdx-1 : viewerItemIds.length-1;
 
-
-
     const dots= viewerItemIds.map( (plotId,idx) =>
         idx===cIdx ?
             <img src={ACTIVE_DOT} className='control-dots'