Merge pull request #196 from Caltech-IPAC/DM-7488_text_view

DM-7488: Text View does not show column's label, only name.

Author: loitly

src/firefly/java/edu/caltech/ipac/firefly/server/util/ipactable/JsonTableUtil.java

@@ -210,6 +210,10 @@ private static List<JSONObject> toJsonTableColumn(DataGroup dataGroup, TableDef
             if (!StringUtils.isEmpty(sortable)) {
                 c.put("sortable", Boolean.parseBoolean(sortable));
             }
+            String filterable = getColAttr(tableDef, FILTERABLE_TAG, cname);
+            if (!StringUtils.isEmpty(filterable)) {
+                c.put("filterable", Boolean.parseBoolean(filterable));
+            }
             String units = getColAttr(tableDef, UNIT_TAG, cname);
             if (!StringUtils.isEmpty(units)) {
                 c.put("units", units);

src/firefly/java/edu/caltech/ipac/firefly/util/DataSetParser.java

@@ -38,6 +38,7 @@ public class DataSetParser {
     public static final String FORMAT_TAG = "[email protected]";     // can be AUTO, NONE or a valid java format string.  defaults to AUTO.
     public static final String FORMAT_DISP_TAG = "[email protected]";
     public static final String SORTABLE_TAG = "[email protected]";
+    public static final String FILTERABLE_TAG = "[email protected]";
     public static final String ITEMS_TAG = "[email protected]";
     public static final String SORT_BY_TAG = "[email protected]";
     public static final String ENUM_VALS_TAG = "[email protected]";

src/firefly/java/edu/caltech/ipac/util/IpacTableUtil.java

@@ -279,6 +279,7 @@ public static DataObject parseRow(DataGroup source, String line, boolean isFixed
                             if (String.valueOf(type.getDataUnit()).equalsIgnoreCase("html") ||
                                     rval.trim().matches("<[^>]+>.*")) {
                                 source.addAttribute(DataSetParser.makeAttribKey(DataSetParser.SORTABLE_TAG, type.getKeyName()), "false");
+                                source.addAttribute(DataSetParser.makeAttribKey(DataSetParser.FILTERABLE_TAG, type.getKeyName()), "false");
                             }
                         }
                     }

src/firefly/js/tables/TableUtil.js

@@ -670,7 +670,7 @@ export function getTableSourceUrl(tbl_ui_id) {
  */
 export function calcColumnWidths(columns, dataAry) {
     return columns.reduce( (pv, cv, idx) => {
-        const cname = cv.name;
+        const cname = cv.label || cv.name;
         var width = Math.max(cname.length, get(cv, 'units.length', 0),  get(cv, 'type.length', 0));
         width = dataAry.reduce( (maxWidth, row) => {
             return Math.max(maxWidth, get(row, [idx, 'length'], 0));

src/firefly/js/tables/tables-typedefs.jsdoc

@@ -48,8 +48,9 @@
  * @prop {string} units     data units
  * @prop {string} desc      description of the column
  * @prop {number} width     column display width
- * @prop {number} prefWidth preferred width.  if width is not defined
- * @prop {boolean} sortable true if undefined
+ * @prop {number} prefWidth     preferred width.  if width is not defined
+ * @prop {boolean} sortable     true if undefined
+ * @prop {boolean} filterable   true if undefined
  * @prop {string} visibility    show, hide, or hidden.  hidden columns are not viewable by users.
  * @prop {string} sortByCols    for multi-columns sorting.  column names separated by comma(',').
  * @prop {string} related       highlight related rows based on this column's value.

src/firefly/js/tables/ui/BasicTableView.jsx

@@ -297,7 +297,7 @@ function tableToText(columns, dataAry, showUnits=false) {
 
     // column's name
     var textHead = columns.reduce( (pval, col, idx) => {
-        return pval + (get(columns, [idx,'visibility'], 'show') === 'show' ? `${padEnd(col.name, colWidths[idx])}|` : '');
+        return pval + (get(columns, [idx,'visibility'], 'show') === 'show' ? `${padEnd(col.label || col.name, colWidths[idx])}|` : '');
     }, '|');
 
     // column's type

src/firefly/js/tables/ui/FilterEditor.jsx

@@ -12,7 +12,7 @@ import {createInputCell} from './TableRenderer.js';
 import {FILTER_CONDITION_TTIPS, FILTER_TTIPS, FilterInfo} from '../FilterInfo.js';
 import {sortTableData, calcColumnWidths} from  '../TableUtil.js';
 import {InputAreaField} from '../../ui/InputAreaField.jsx';
-// import {deepDiff} from '../../util/WebUtil.js';
+import {toBoolean} from '../../util/WebUtil.js';
 
 const wrapperStyle = {display: 'block', flexGrow: 0};
 const style = {display: 'block', width: '100%', resize: 'none', boxSizing: 'border-box', backgroundColor: 'white'};
@@ -95,8 +95,8 @@ function prepareOptionData(columns, sortInfo, filterInfo, selectable) {
     const filterInfoCls = FilterInfo.parse(filterInfo);
     columns = columns.filter((c) => c.visibility !== 'hidden');
     var data = columns.map( (v) => {
-        const filter = filterInfoCls.getFilter(v.name) || '';
-        return [v.name||'', filter, v.units||'', v.desc||'', v.visibility !== 'hide'];
+        const filter = toBoolean(v.filterable, true) ? filterInfoCls.getFilter(v.name) || '' : undefined;
+        return [v.label||v.name||'', filter, v.units||'', v.desc||'', v.visibility !== 'hide'];
     } );
     sortTableData(data, cols, sortInfo);
 

src/firefly/js/tables/ui/TableRenderer.js

@@ -240,19 +240,24 @@ export const createInputCell = (tooltips, size = 10, validator, onChange, style)
     };
 
     return ({rowIndex, data, colIdx}) => {
-        return (
-            <div style={{margin: 2}}>
-                <InputField
-                    validator={validator}
-                    tooltip={tooltips}
-                    size={size}
-                    style={style}
-                    value={get(data, [rowIndex, colIdx],'')}
-                    onChange={(v) => changeHandler(rowIndex, data, colIdx, v) }
-                    actOn={['blur','enter']}
-                />
-            </div>
-        );
+        const val = get(data, [rowIndex, colIdx]);
+        if (val === undefined) {
+            return null;
+        } else {
+            return (
+                <div style={{margin: 2}}>
+                    <InputField
+                        validator={validator}
+                        tooltip={tooltips}
+                        size={size}
+                        style={style}
+                        value={val}
+                        onChange={(v) => changeHandler(rowIndex, data, colIdx, v) }
+                        actOn={['blur','enter']}
+                    />
+                </div>
+            );
+        }
     };
 };