DM-5387: in response to reviewer's comments

 - added rowHeight property to control the height of the table's row.
 - default to unselectable table when type is not specify.
 - added help_id property to table. set to 'tables' for old api
 - set expandable to false for old api call

Author: loitly

buildScript/loadScript.js

@@ -25,7 +25,8 @@ function loadScript(loader, script, callback){
     document.getElementsByTagName('head')[0].appendChild(scriptTag);
 }
 
-function getScriptURL(loader = 'firefly_loader.js') {
+function getScriptURL(loader) {
+    loader = loader || 'firefly_loader.js';
     var scripts = document.getElementsByTagName('script');
     var url = '/';
     for (var i = 0; (i < scripts.length); i++) {

src/firefly/html/demo/ffapi-highlevel-test.html

@@ -205,12 +205,12 @@
                 type: 'selectable',
                 Title: 'old api: selectable table',
                 pageSize: 50,
+                rowHeight: 30,
                 tableOptions: "show-filter=true,show-title=true,show-toolbar=true,show-options=true,show-paging=true,show-save=true"
             };
             firefly.showTable(tblParams, 'oldSelectable');
             var tblParams2 = {
                 source: 'http://web.ipac.caltech.edu/staff/roby/demo/WiseDemoTable.tbl',
-                type: 'basic',
                 Title: 'old api: basic table',
                 pageSize: 1000,
                 tableOptions: "show-toolbar=false"

src/firefly/js/api/ApiHighlevelBuild.js

@@ -72,11 +72,12 @@ function oldApi(llApi, params, options) {
     // options.?? = getBoolean(oldOpts, 'show-popout');
     // options.?? = getBoolean(oldOpts, 'show-table-view');
 
-    var {Title, source, alt_source, type, filters, sortInfo, pageSize, startIdx, fixedLength} = params;
+    var {Title, source, alt_source, type, filters, sortInfo, pageSize, startIdx, fixedLength, expandable, rowHeight} = params;
     var request = makeFileRequest(Title, source, alt_source, {filters, sortInfo, pageSize, startIdx});
-    if (type === 'basic') {
-        options.selectable = false;
-    }
+    options.selectable = type === 'selectable';
+    options.help_id = 'tables';
+    options.expandable = !!expandable;
+    options.rowHeight = rowHeight;
     return request;
 }
 

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

@@ -16,6 +16,7 @@ import {SelectInfo} from '../SelectInfo.js';
 import {PagingBar} from '../../ui/PagingBar.jsx';
 import {ToolbarButton} from '../../ui/ToolbarButton.jsx';
 import {LO_MODE, LO_VIEW, dispatchSetLayoutMode} from '../../core/LayoutCntlr.js';
+import {HelpIcon} from '../../ui/HelpIcon.jsx';
 import FILTER from 'html/images/icons-2014/24x24_Filter.png';
 import OUTLINE_EXPAND from 'html/images/icons-2014/24x24_ExpandArrowsWhiteOutline.png';
 
@@ -92,7 +93,7 @@ export class TablePanel extends Component {
     }
 
     render() {
-        const {selectable, expandable, expandedMode, border, renderers, title, removable,
+        const {selectable, expandable, expandedMode, border, renderers, title, removable, rowHeight, help_id,
                 showToolbar, showTitle, showOptionButton, showPaging, showSave, showFilterButton} = this.state;
         var {totalRows, showLoading, columns, showOptions, showUnits, showFilters, textView, colSortDir} = this.state;
         const {tbl_id, error, startIdx, hlRowIdx, currentPage, pageSize, selectInfo, showMask,
@@ -132,6 +133,7 @@ export class TablePanel extends Component {
                                     <button onClick={this.expandTable}>
                                         <img src={OUTLINE_EXPAND} title='Expand this panel to take up a larger area'/>
                                     </button>}
+                                { help_id && <div style={{marginTop:-10}}> <HelpIcon helpId={help_id} /> </div>}
                             </div>
                         </div>
                     }
@@ -140,6 +142,7 @@ export class TablePanel extends Component {
                             columns={columns}
                             data={data}
                             hlRowIdx={hlRowIdx}
+                            rowHeight = {rowHeight}
                             selectable={selectable}
                             showUnits={showUnits}
                             showFilters={showFilters}
@@ -175,11 +178,13 @@ TablePanel.propTypes = {
     tbl_ui_id: PropTypes.string,
     tableModel: PropTypes.object,
     pageSize: PropTypes.number,
+    rowHeight: PropTypes.number,
     selectable: PropTypes.bool,
     expandedMode: PropTypes.bool,
     expandable: PropTypes.bool,
     border: PropTypes.bool,
     title: PropTypes.string,
+    help_id: PropTypes.string,
     removable: PropTypes.bool,
     showUnits: PropTypes.bool,
     showFilters: PropTypes.bool,