DM-9342:

  Fixed the bug introduced that made Bayesian Block fail.
  Change all the data type of all numberical properties in HistogramOptions PropTypes.oneOfType([PropTypes.string,PropTypes.number])

Author: Lijun Zhang

src/firefly/java/edu/caltech/ipac/firefly/server/query/HistogramProcessor.java

@@ -55,7 +55,7 @@ public class HistogramProcessor extends IpacTablePartProcessor {
     private String algorithm = null;// FIXED_SIZE_ALGORITHM;
     private int numBins=0;
     private double binWidth=0.0;
-    private String binSelection;
+    private String binSelection=null;
     private String binSize;
     private double min = Double.NaN;
     private double max = Double.NaN;
@@ -149,7 +149,9 @@ private void getParameters(TableServerRequest tableServerRequest) {
         List<Param> params = tableServerRequest.getParams();
         for (Param p: params.toArray(new Param[params.size()])){
             String name = p.getName();
+
             String value = p.getValue();
+            if (name==null || value==null ) continue;
             if (name.equalsIgnoreCase(COLUMN)) {
                 //columnName = (String) value;
                 columnExpression = value;
@@ -174,15 +176,18 @@ else if (name.equalsIgnoreCase(PRESERVE_EMPTY_BIN) ){
         }
 
 
-        if (binSelection.equalsIgnoreCase("numBins")){
-            numBins = Integer.parseInt(binSize);
-        }
-        else if (binSelection.equalsIgnoreCase("binWidth") ) {
+        if (binSelection!=null ){
+            if (binSelection.equalsIgnoreCase("numBins")) {
+
+               numBins = Integer.parseInt(binSize);
+           }
+            else if (binSelection.equalsIgnoreCase("binWidth") ) {
             binWidth = Double.parseDouble(binSize);
 
-        }
-        if (numBins>0 || binWidth>0.0 ){
-            algorithm = FIXED_SIZE_ALGORITHM;
+           }
+           if (numBins>0 || binWidth>0.0 ){
+               algorithm = FIXED_SIZE_ALGORITHM;
+           }
         }
     }
 

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

@@ -19,12 +19,12 @@ import {updateSet} from '../../util/WebUtil.js';
 
 export const histogramParamsShape = PropTypes.shape({
          algorithm : PropTypes.oneOf(['fixedSizeBins','bayesianBlocks']),
-         numBins : PropTypes.string,
-         binWidth : PropTypes.string,
+         numBins : PropTypes.oneOfType([PropTypes.string,PropTypes.number]),
+         binWidth :PropTypes.oneOfType([PropTypes.string,PropTypes.number]),
          fixedBinSizeSelection : PropTypes.oneOf(['numBins','binWidth']),
-         falsePositiveRate : PropTypes.string,
-         minCutoff : PropTypes.string,
-         maxCutoff : PropTypes.string
+         falsePositiveRate : PropTypes.oneOfType([PropTypes.string,PropTypes.number]),
+         minCutoff : PropTypes.oneOfType([PropTypes.string,PropTypes.number]),
+         maxCutoff :PropTypes.oneOfType([PropTypes.string,PropTypes.number])
       });