- fix FireflyHeatmap's mappings disapeared after component remounted

Author: loitly

src/firefly/js/charts/dataTypes/FireflyHeatmap.js

@@ -19,6 +19,9 @@ import BrowserInfo from  '../../util/BrowserInfo.js';
  */
 export function getTraceTSEntries({traceTS, chartId, traceNum}) {
     const {mappings} = traceTS;
+
+    if (!mappings) return {}; 
+
     const {fireflyData, fireflyLayout} = getChartData(chartId) || {};
     // server call parameters
     const xbins = get(fireflyData, `${traceNum}.nbins.x`);

src/firefly/js/tables/TableUtil.js

@@ -642,13 +642,10 @@ export function getAsyncTableSourceUrl(tbl_ui_id) {
 
 function makeTableSourceUrl(columns, request) {
     const tableRequest = Object.assign(cloneDeep(request), {startIdx: 0,pageSize : MAX_ROW});
-    const visiCols = columns.filter( (col) => {
-        return get(col, 'visibility', 'show') === 'show';
-    }).map( (col) => {
-        return col.name;
-    } );
+    const visiCols = columns.filter( (col) => get(col, 'visibility', 'show') === 'show')
+                            .map( (col) => col.name);
     if (visiCols.length !== columns.length) {
-        tableRequest['inclCols'] = visiCols.toString();
+        tableRequest['inclCols'] = visiCols.map( (c) => c.includes('"') ? c : '"' + c + '"');  // add quotes to cname unless it's already quoted.
     }
     Reflect.deleteProperty(tableRequest, 'tbl_id');
     const params = omitBy({

src/firefly/js/templates/lightcurve/LcPeriodogram.jsx

@@ -523,7 +523,7 @@ function periodogramSuccess(popupId, hideDropDown = false) {
             peaks: get(request, [pKeyDef.peaks.fkey]),
             table_name: LC.PEAK_TABLE,
             sortInfo: sortInfoString('SDE', false)                 // sort peak table by column SDE, descending
-        }, {tbl_id: LC.PEAK_TABLE, pageSize: parseInt(peak), inclCols : '"PEAK", "PERIOD", "POWER", "SDE"'});   // period and power are reserved words in sql.. put them in quotes
+        }, {tbl_id: LC.PEAK_TABLE, pageSize: parseInt(peak), inclCols : '"Peak", "Period", "Power", "SDE"'});   // period and power are reserved words in sql.. put them in quotes
 
         var tReq = makeTblRequest('LightCurveProcessor', LC.PERIODOGRAM_TABLE, {
             original_table: srcFile,
@@ -538,7 +538,7 @@ function periodogramSuccess(popupId, hideDropDown = false) {
             table_name: LC.PERIODOGRAM_TABLE
             /* Should we do the same for Power column in Periodogram? */
             /*sortInfo: sortInfoString('Power', false)*/
-        }, {tbl_id: LC.PERIODOGRAM_TABLE, inclCols : '"PERIOD", "POWER"'});
+        }, {tbl_id: LC.PERIODOGRAM_TABLE, inclCols : '"Period", "Power"'});
 
 
         if (tReq !== null) {

src/firefly/js/ui/TestQueriesPanel.jsx

@@ -167,7 +167,7 @@ function renderPeriodogram(fields) {
                 //'peaks' : 50
                 //'result_table': 'http://web.ipac.caltech.edu/staff/ejoliet/demo/vo-nexsci-result-sample.xml'
             },
-                {inclCols : 'Power,Period'});
+                {inclCols : '"Power","Period"'});
         } else if (opt === 1) {
             tReq = makeTblRequest('PhaseFoldedProcessor', 'Phase folded', {
                 'period_days': ds,
@@ -189,7 +189,7 @@ function renderPeriodogram(fields) {
                 //'alg': 'ls', //There are three algorithms: ls (Lomb-Scargle), bls (Box-fitting Least Squares), and plav (Plavchan 2008). The default algorithm is Lomb-Scargle.
                 'peaks' : 57
                 //'result_table': 'http://web.ipac.caltech.edu/staff/ejoliet/demo/vo-nexsci-result-sample.xml'
-            }, {inclCols : 'Peak, Period, Power, SDE'});
+            }, {inclCols : '"Peak", "Period", "Power", "SDE"'});
         }
 
         console.log(ds);