colMeta) {
- DataType dt, dtSrc;
-
- for (Col col : cols) {
- if (col.getter.isExpression()) {
- dt = new DataType(col.colname, col.colname, Double.class, DataType.Importance.HIGH, "", false);
- DataType.FormatInfo fi = dt.getFormatInfo();
- fi.setDataFormat("%.14g");
- dt.setFormatInfo(fi);
- columnList.add(dt);
- } else {
- dtSrc = dg.getDataDefintion(col.colname);
- dt = dtSrc.copyWithNoColumnIdx(columnList.size());
- dt.setMaxDataWidth(dtSrc.getMaxDataWidth());
- dt.setFormatInfo(dtSrc.getFormatInfo());
- columnList.add(dt);
- colMeta.addAll(IpacTableUtil.getAllColMeta(dg.getAttributes().values(), col.colname));
- }
- }
- }
-
- public static Col getCol(DataType[] dataTypes, String colOrExpr, String exprColName, boolean canBeNaN) throws DataAccessException {
- Col col = new Col(dataTypes, colOrExpr, exprColName, canBeNaN);
- if (!col.getter.isValid()) {
- throw new DataAccessException("Invalid column or expression: "+colOrExpr);
- }
- return col;
- }
-
-
- public static class Col {
- DataObjectUtil.DoubleValueGetter getter;
- String colname;
- String exprColName;
- String colOrExpr;
- boolean canBeNaN;
-
- Col(DataType[] dataTypes, String colOrExpr, String exprColName, boolean canBeNaN) {
- this.colOrExpr = colOrExpr;
- this.exprColName = exprColName;
- this.getter = new DataObjectUtil.DoubleValueGetter(dataTypes, colOrExpr);
- if (getter.isExpression()) {
- this.colname = exprColName;
- } else {
- this.colname = colOrExpr;
- }
- this.canBeNaN = canBeNaN;
- }
- }
-
}
+
diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/util/ipactable/DataGroupReader.java b/src/firefly/java/edu/caltech/ipac/firefly/server/util/ipactable/DataGroupReader.java
index f4cf684af4..5a57fcf72d 100644
--- a/src/firefly/java/edu/caltech/ipac/firefly/server/util/ipactable/DataGroupReader.java
+++ b/src/firefly/java/edu/caltech/ipac/firefly/server/util/ipactable/DataGroupReader.java
@@ -100,6 +100,12 @@ public static DataGroup read(File inf, boolean isFixedLength, boolean readAsStri
return doRead(bufferedReader, tableDef, isFixedLength, readAsString, saveFormattedData, onlyColumns);
}
+ public static DataGroup read(InputStream inputStream, String... onlyColumns) throws IOException {
+ BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream), IpacTableUtil.FILE_IO_BUFFER_SIZE);
+ TableDef tableDef = IpacTableUtil.getMetaInfo(bufferedReader);
+ return doRead(bufferedReader, tableDef, true, false, false, onlyColumns);
+ }
+
public static DataGroup read(Reader reader, boolean isFixedLength, boolean readAsString, boolean saveFormattedData, String... onlyColumns) throws IOException {
BufferedReader bufferedReader = new BufferedReader(reader, IpacTableUtil.FILE_IO_BUFFER_SIZE);
TableDef tableDef = IpacTableUtil.getMetaInfo(bufferedReader);
diff --git a/src/firefly/java/edu/caltech/ipac/util/decimate/DecimateKey.java b/src/firefly/java/edu/caltech/ipac/util/decimate/DecimateKey.java
index 244c1e86aa..99e3d56ad1 100644
--- a/src/firefly/java/edu/caltech/ipac/util/decimate/DecimateKey.java
+++ b/src/firefly/java/edu/caltech/ipac/util/decimate/DecimateKey.java
@@ -105,7 +105,7 @@ public static DecimateKey parse(String str) {
@Override
public String toString() {
- return DECIMATE_KEY+"("+xColNameOrExpr+","+yColNameOrExpr+","+
+ return DECIMATE_KEY+"(\""+xColNameOrExpr+"\",\""+yColNameOrExpr+"\","+
xMin+","+yMin+","+nX+","+nY+","+xUnit+","+yUnit+")";
}
}
diff --git a/src/firefly/js/charts/dataTypes/FireflyHeatmap.js b/src/firefly/js/charts/dataTypes/FireflyHeatmap.js
index 9778b7e962..ef5c2b3bf8 100644
--- a/src/firefly/js/charts/dataTypes/FireflyHeatmap.js
+++ b/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`);
diff --git a/src/firefly/js/drawingLayers/Catalog.js b/src/firefly/js/drawingLayers/Catalog.js
index e8c4d65f2c..d366845e1d 100644
--- a/src/firefly/js/drawingLayers/Catalog.js
+++ b/src/firefly/js/drawingLayers/Catalog.js
@@ -387,8 +387,7 @@ function doFilter(dl,p,sel) {
const rowidIdx= findColIdx(dl.tableData.columns,'ROW_IDX');
let idxs= getSelectedPts(sel, p, dl.drawData.data);
idxs = rowidIdx < 0 ? idxs : idxs.map( (idx) => get(dl,`tableData.data[${idx}][${rowidIdx}]`) );
- filter= `IN (${idxs.toString()})`;
- // filterInfoCls.setFilter(filter);
+ filter= `IN (${idxs.length === 0 ? -1 : idxs.toString()})`; // ROW_IDX is always positive.. use -1 to force no row selected
filterInfoCls.setFilter('ROW_IDX', filter);
newRequest = {tbl_id: tbl.tbl_id, filters: filterInfoCls.serialize()};
dispatchTableFilter(newRequest);
diff --git a/src/firefly/js/tables/Decimate.js b/src/firefly/js/tables/Decimate.js
index e2af69a49b..563f9b03ce 100644
--- a/src/firefly/js/tables/Decimate.js
+++ b/src/firefly/js/tables/Decimate.js
@@ -46,8 +46,8 @@ export const parseDecimateInfo = function(str) {
const [xColumnName,yColumnName,maxPoints,xyRatio,xMin,xMax,yMin,yMax,deciEnableLimit='-1'] = kv[1].split(',');
if (xColumnName && yColumnName) {
return {
- xColumnName,
- yColumnName,
+ xColumnName: xColumnName.replace(/^"(.+)"$/, '$1'),
+ yColumnName: yColumnName.replace(/^"(.+)"$/, '$1'),
maxPoints : Number.parseInt(maxPoints,10),
xyRatio: Number.parseFloat(xyRatio),
xMin: Number.parseFloat(xMin),
@@ -76,8 +76,8 @@ export const parseDecimateKey = function(str) {
v = v.substring(1,v.length-1); // remove outer braces
const parts = v.split(',');
if (parts.length === 8) {
- const xColNameOrExpr= parts[0];
- const yColNameOrExpr = parts[1];
+ const xColNameOrExpr= parts[0].replace(/^"(.+)"$/, '$1');
+ const yColNameOrExpr = parts[1].replace(/^"(.+)"$/, '$1');
const xMin = Number(parts[2]);
const yMin = Number(parts[3]);
const nX = Number(parts[4]);
diff --git a/src/firefly/js/tables/FilterInfo.js b/src/firefly/js/tables/FilterInfo.js
index 94f2c266bd..c08e17e5df 100644
--- a/src/firefly/js/tables/FilterInfo.js
+++ b/src/firefly/js/tables/FilterInfo.js
@@ -44,12 +44,13 @@ export class FilterInfo {
*/
static parse(filterString) {
var filterInfo = new FilterInfo();
- if (filterString) {
- filterString && filterString.split(';').forEach( (v) => {
- const [, cname, op, val] = v.trim().match(filter_regex) || [];
- if (cname) filterInfo.addFilter(cname, `${op} ${val}`);
- });
- }
+ filterString && filterString.split(';').forEach( (v) => {
+ let [, cname, op, val] = v.trim().match(filter_regex) || [];
+ if (cname && op) {
+ cname = cname.replace(/^"(.+)"$/, '$1'); // strip quotes if any
+ filterInfo.addFilter(cname, `${op} ${val}`);
+ }
+ });
return filterInfo;
}
@@ -214,14 +215,12 @@ export class FilterInfo {
}
serialize() {
- return Object.keys(this).reduce( (rval, key) => {
- this[key].split(';').forEach((v) => {
- if (v.length) {
- rval = (rval.length ? rval + ';': '') + `${key} ${v.trim()}`;
- }
- } );
- return rval;
- }, '');
+ return Object.entries(this)
+ .map(([k,v]) => v.split(';')
+ .filter((f) => f)
+ .map( (f) => k.includes('"') ? `${k} ${f}` : `"${k}" ${f}`) // add quotes to key if it does not contains quotes
+ .join(';'))
+ .join(';');
}
/**
diff --git a/src/firefly/js/tables/SortInfo.js b/src/firefly/js/tables/SortInfo.js
index 6013a91844..9f89a8a73b 100644
--- a/src/firefly/js/tables/SortInfo.js
+++ b/src/firefly/js/tables/SortInfo.js
@@ -33,6 +33,7 @@ export function sortInfoString(colName, isAscending=true) {
* @returns {*}
*/
getDirection(colName) {
+ colName = colName.replace(/^"(.+)"$/, '$1'); // strip quotes is any;
if (this.sortColumns[0] === colName) {
return this.direction;
} else {
@@ -51,11 +52,11 @@ export function sortInfoString(colName, isAscending=true) {
const direction = dir === UNSORTED ? SORT_ASC :
dir === SORT_ASC ? SORT_DESC : UNSORTED;
const sortColumns = UNSORTED ? [] : [colName];
- return direction === UNSORTED ? '' : `${direction},${sortColumns.toString()}`;
+ return new SortInfo(direction, sortColumns).serialize();
}
serialize() {
- return this.direction === UNSORTED ? '' : `${this.direction},${this.sortColumns.toString()}`;
+ return this.direction === UNSORTED ? '' : `${this.direction},${this.sortColumns.map( (c) => `"${c}"`).join()}`;
}
static parse(sortInfo) {
@@ -63,7 +64,7 @@ export function sortInfoString(colName, isAscending=true) {
const parts = sortInfo.split(',').map((s) => s.trim());
if (parts) {
const direction = parts[0] && parts[0].toUpperCase();
- const sortColumns = parts[1] && parts.slice(1);
+ const sortColumns = parts[1] && parts.slice(1).map( (c) => c.replace(/^"(.+)"$/, '$1')); // strip quotes is any
return new SortInfo(direction, sortColumns);
}
} else {
diff --git a/src/firefly/js/tables/TableUtil.js b/src/firefly/js/tables/TableUtil.js
index 3d78d53144..0d0535b025 100644
--- a/src/firefly/js/tables/TableUtil.js
+++ b/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({
diff --git a/src/firefly/js/tables/ui/BasicTableView.jsx b/src/firefly/js/tables/ui/BasicTableView.jsx
index d735408b3c..55e8888e5e 100644
--- a/src/firefly/js/tables/ui/BasicTableView.jsx
+++ b/src/firefly/js/tables/ui/BasicTableView.jsx
@@ -18,6 +18,10 @@ import './TablePanel.css';
const {Table, Column} = FixedDataTable;
+
+const noDataMsg = 'No Data Found';
+const noDataFromFilter = 'No data match these criteria';
+
export class BasicTableView extends PureComponent {
constructor(props) {
super(props);
@@ -167,7 +171,7 @@ export class BasicTableView extends PureComponent {
}
{!error && showMask && }
- {!error && !showMask && isEmpty(data) && No Data Found
}
+ {!error && !showMask && isEmpty(data) && {filterInfo ? noDataFromFilter : noDataMsg}
}
);
}
diff --git a/src/firefly/js/tables/ui/TablePanel.css b/src/firefly/js/tables/ui/TablePanel.css
index fb3c3dbc01..14e47eed11 100644
--- a/src/firefly/js/tables/ui/TablePanel.css
+++ b/src/firefly/js/tables/ui/TablePanel.css
@@ -14,11 +14,15 @@
.TablePanel_NoData {
position: absolute;
- top: 50%;
- left: 42%;
+ top: 45px;
z-index: 1;
color: gray;
font-size: large;
+ height: calc(100% - 45px);
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
.TablePanel__wrapper {
diff --git a/src/firefly/js/tables/ui/TablePanel.jsx b/src/firefly/js/tables/ui/TablePanel.jsx
index 6916b6bc34..ad642f34e2 100644
--- a/src/firefly/js/tables/ui/TablePanel.jsx
+++ b/src/firefly/js/tables/ui/TablePanel.jsx
@@ -4,13 +4,13 @@
import React, {PureComponent} from 'react';
import PropTypes from 'prop-types';
-import {isEmpty, truncate, get} from 'lodash';
+import {isEmpty, truncate, get, cloneDeep, omit} from 'lodash';
import shallowequal from 'shallowequal';
import {flux} from '../../Firefly.js';
import {download} from '../../util/WebUtil.js';
import * as TblUtil from '../TableUtil.js';
-import {dispatchTableRemove, dispatchTblExpanded, dispatchTblResultsRemove} from '../TablesCntlr.js';
+import {dispatchTableRemove, dispatchTblExpanded, dispatchTblResultsRemove, dispatchTableSearch} from '../TablesCntlr.js';
import {TablePanelOptions} from './TablePanelOptions.jsx';
import {BasicTableView} from './BasicTableView.jsx';
import {TableConnector} from '../TableConnector.js';
@@ -130,7 +130,7 @@ export class TablePanel extends PureComponent {
filterInfo, filterCount, sortInfo, data, bgStatus} = this.state;
var {leftButtons, rightButtons} = this.state;
- if (error) return {error}
;
+ if (error) return ;
if (isEmpty(columns)) return ;
const selectInfoCls = SelectInfo.newInstance(selectInfo, startIdx);
@@ -319,3 +319,18 @@ function Loading({showTitle, tbl_id, title, removable, bgStatus}) {
);
}
+
+function TableError({error, tbl_id, message}) {
+ const {request} = TblUtil.getTblById(tbl_id);
+ const canReset = get(request, 'filters') || get(request, 'sortInfo');
+ const reloadTable = () => {
+ const origRequest = omit(cloneDeep(request), 'filters', 'sortInfo');
+ dispatchTableSearch(origRequest);
+ };
+ return (
+
+
{message}
+ {canReset &&
}
+