DM-10115 Reset the column select dropdown and table column stats when starting a new catalog search

Author: Cindy Wang

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

@@ -70,9 +70,11 @@ export function ColumnOrExpression({colValStats,params,groupKey,fldPath,label,la
     };
 
     var val = get(params, fldPath);
-    const onColSelected = (colName) => {
-        val = colName;
-        dispatchValueChange({fieldKey: fldPath, groupKey, value: colName, valid: true});
+    const onColSelected = (colValStats) => {
+        return (colName) => {
+            val = colName;
+            dispatchValueChange({fieldKey: fldPath, groupKey, value: colName, valid: true, colValStats});
+        };
     };
     const colValidator = getColValidator(colValStats,!nullAllowed);
     const value = get(params, fldPath);
@@ -102,7 +104,7 @@ export function ColumnOrExpression({colValStats,params,groupKey,fldPath,label,la
             />
             <div style={{display: 'inline-block', cursor:'pointer', paddingLeft: 3, verticalAlign: 'middle', fontSize: 'larger'}}
                  title={`Select ${name} column`}
-                 onClick={() => showColSelectPopup(colValStats, onColSelected,`Choose ${name}`,'OK',val)}>
+                 onClick={() => showColSelectPopup(colValStats, onColSelected(colValStats),`Choose ${name}`,'OK',val)}>
                 {cols}
             </div>
         </div>

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

@@ -1,6 +1,6 @@
 import React, {PropTypes} from 'react';
 
-import {get, defer} from 'lodash';
+import {get, defer, has} from 'lodash';
 import ColValuesStatistics from './../ColValuesStatistics.js';
 import {DATATYPE_HISTOGRAM} from '../dataTypes/HistogramCDT.js';
 import CompleteButton from '../../ui/CompleteButton.jsx';
@@ -49,8 +49,6 @@ export function setOptions(groupKey, histogramParams) {
         {fieldKey: 'binWidth', value: get(histogramParams, 'binWidth','')},
         {fieldKey: 'minCutoff', value: get(histogramParams, 'minCutoff','')},
         {fieldKey: 'maxCutoff', value: get(histogramParams, 'maxCutoff','')}
-
-
     ];
     dispatchMultiValueChange(groupKey, flds);
 }
@@ -79,6 +77,10 @@ var columnNameReducer= (colValStats) => {
         if (!inFields) {
             return {};
         }
+        if (has(action.payload, 'colValStats')) {
+            colValStats = get(action.payload, 'colValStats'); // reset column stats
+        }
+
         let fieldKey = undefined;
         if (action.type === VALUE_CHANGE) {
             // when column name changes, update the min/max input
@@ -87,6 +89,7 @@ var columnNameReducer= (colValStats) => {
                 case 'columnOrExpr':
                     const colName = action.payload.value;
                     if (colName ) {
+
                         if (isSingleColumn(colName, colValStats)) {
                             for (var i=0; i<colValStats.length; i++){
                                 if (colName=== colValStats[i].name) {
@@ -159,13 +162,13 @@ var columnNameReducer= (colValStats) => {
 };
 export class HistogramOptions extends React.Component {
 
-        constructor(props) {
-            super(props);
-            this.state = {
-                fields : FieldGroupUtils.getGroupFields(this.props.groupKey),
-                fixedAlgorithm: get(getAppOptions(), 'charts.ui.HistogramOptions.fixedAlgorithm') || props.fixedAlgorithm
-            };
-        }
+    constructor(props) {
+        super(props);
+        this.state = {
+            fields : FieldGroupUtils.getGroupFields(this.props.groupKey),
+            fixedAlgorithm: get(getAppOptions(), 'charts.ui.HistogramOptions.fixedAlgorithm') || props.fixedAlgorithm
+        };
+    }
 
 
     shouldComponentUpdate(np, ns) {

src/firefly/js/ui/ChartSelectDropdown.jsx

@@ -28,11 +28,11 @@ import LOADING from 'html/images/gxt/loading.gif';
 
 const dropdownName = 'ChartSelectDropDownCmd';
 
-const SCATTER = 'scatter';
-const HISTOGRAM = 'histogram';
+export const SCATTER = 'scatter';
+export const HISTOGRAM = 'histogram';
 const PREF_CHART_TYPE = 'pref.chartType';
 
-function getFormName(chartType) {
+export function getFormName(chartType) {
     return chartType+'ChartOpts';
 }
 

src/firefly/js/visualize/ui/CatalogSelectViewPanel.jsx

@@ -8,7 +8,7 @@ import {FormPanel} from '../../ui/FormPanel.jsx';
 import { get, merge, isEmpty, isFunction} from 'lodash';
 import {updateMerge} from '../../util/WebUtil.js';
 import {ListBoxInputField} from '../../ui/ListBoxInputField.jsx';
-import {doFetchTable, makeTblRequest, makeIrsaCatalogRequest, makeVOCatalogRequest} from '../../tables/TableUtil.js';
+import {doFetchTable, makeTblRequest, makeIrsaCatalogRequest, makeVOCatalogRequest, getTblIdsByGroup} from '../../tables/TableUtil.js';
 import {CatalogTableListField} from './CatalogTableListField.jsx';
 import {CatalogConstraintsPanel} from './CatalogConstraintsPanel.jsx';
 import {FieldGroup} from '../../ui/FieldGroup.jsx';
@@ -27,6 +27,9 @@ import {FileUpload} from '../../ui/FileUpload.jsx';
 import {convertAngle} from '../VisUtil.js';
 import {masterTableFilter} from './IrsaMasterTableFilters.js';
 import {getAppOptions} from '../../core/AppDataCntlr.js';
+import {SCATTER, HISTOGRAM, getFormName} from '../../ui/ChartSelectDropdown.jsx';
+import {setOptions as HistogramSetOptions} from '../../charts/ui/HistogramOptions.jsx';
+import {setOptions as XYPlotSetOptions} from '../../charts/ui/XYPlotOptions.jsx';
 
 
 import './CatalogTableListField.css';
@@ -213,7 +216,19 @@ function doCatalog(request) {
         tReq.selcols = colsSearched;
     }
 
-    console.log('final request: ' + JSON.stringify(tReq));
+    //console.log('final request: ' + JSON.stringify(tReq));
+    if (!isEmpty(getTblIdsByGroup())) {     // triview has table already, reset the chart column select form values
+        const chartHandler = {[SCATTER]: XYPlotSetOptions,
+                              [HISTOGRAM]: HistogramSetOptions};
+
+        Object.keys(chartHandler).forEach((chartType) => {
+            const formGroupName = getFormName(chartType);
+
+            if (!isEmpty(FieldGroupUtils.getGroupFields(formGroupName))) {
+                chartHandler[chartType](formGroupName);
+            }
+        });
+    }
     dispatchTableSearch(tReq);
 }