Merge branch 'DM-8189-TableModelErrHandle' into dev

Author: Cindy Wang

src/firefly/js/tables/TableUtil.js

@@ -836,4 +836,8 @@ export function isTableUsingRadians(tableOrMeta) {
     if (!tableOrMeta) return false;
     const tableMeta= tableOrMeta.tableMeta || tableOrMeta;
     return has(tableMeta, 'HIERARCH.AFW_TABLE_VERSION');
+}
+
+export function createErrorTbl(tbl_id, error) {
+    return {tbl_id, error};
 }

src/firefly/js/tables/TablesCntlr.js

@@ -476,14 +476,11 @@ function* doOnTblLoaded({tbl_id, callback}) {
             hasData = hasData || get(tableModel, 'tableData.columns.length');
             if (get(tableModel, 'error')) {
                 // there was an error loading this table.
-                callback(createErrorTbl(tbl_id, tableModel.error));
+                callback(TblUtil.createErrorTbl(tbl_id, tableModel.error));
                 return;
             }
         }
     }
     callback && callback(TblUtil.getTblInfoById(tbl_id));
 }
 
-function createErrorTbl(tbl_id, error) {
-    return {tbl_id, error};
-}

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

@@ -142,11 +142,11 @@ export class BasicTableView extends React.Component {
 
     render() {
         const {columns, data, hlRowIdx, showUnits, showFilters, filterInfo, renderers, bgColor,
-            selectable, selectInfoCls, sortInfo, callbacks, textView, rowHeight, showMask} = this.props;
+            selectable, selectInfoCls, sortInfo, callbacks, textView, rowHeight, showMask, error} = this.props;
         const {widthPx, heightPx, columnWidths} = this.state;
         const {onSort, onFilter, onRowSelect, onSelectAll, onFilterSelected} = this;
 
-        if (isEmpty(columns)) return (<div style={{top: 0}} className='loading-mask'/>);
+        if (!error && isEmpty(columns)) return (<div style={{top: 0}} className='loading-mask'/>);
 
         // const filterInfoCls = FilterInfo.parse(filterInfo);
         // const sortInfoCls = SortInfo.parse(sortInfo);
@@ -159,7 +159,8 @@ export class BasicTableView extends React.Component {
 
         return (
             <Resizable id='table-resizer' tabIndex='-1' onKeyDown={this.onKeyDown} className='TablePanel__frame' onResize={this.onResize}>
-                {   widthPx === 0 ? <div /> :
+                {   error ? <div style={{padding: 10}}>{error}</div> :
+                    widthPx === 0 ? <div /> :
                     textView ? <TextView { ...{columns, data, showUnits, heightPx, widthPx} }/> :
                     <Table
                         rowHeight={rowHeight}
@@ -175,8 +176,8 @@ export class BasicTableView extends React.Component {
                         { makeColumns(makeColumnsProps) }
                     </Table>
                 }
-                {showMask && <div style={{top: 0}} className='loading-mask'/>}
-                {!showMask && isEmpty(data) && <div className='TablePanel_NoData'> No Data Found </div>}
+                {!error && showMask && <div style={{top: 0}} className='loading-mask'/>}
+                {!error && !showMask && isEmpty(data) && <div className='TablePanel_NoData'> No Data Found </div>}
             </Resizable>
         );
     }
@@ -198,6 +199,7 @@ BasicTableView.propTypes = {
     showMask: PropTypes.bool,
     currentPage: PropTypes.number,
     bgColor: PropTypes.string,
+    error:  PropTypes.string,
     renderers: PropTypes.objectOf(
         PropTypes.shape({
             cellRenderer: PropTypes.func,

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

@@ -4,20 +4,20 @@
 
 import React, {Component, PropTypes} from 'react';
 import sCompare from 'react-addons-shallow-compare';
-import {isEmpty, get, merge} from 'lodash';
+import {isEmpty, get, merge, isNil, isArray, cloneDeep, set, has} from 'lodash';
 import FieldGroupUtils from '../../fieldGroup/FieldGroupUtils.js';
-import {fieldGroupConnector} from '../../ui/FieldGroupConnector.jsx';
-import {doFetchTable, getColumnIdx, getTblById} from '../../tables/TableUtil.js';
+import {dispatchValueChange} from '../../fieldGroup/FieldGroupCntlr.js';
+import {fetchTable} from '../../rpc/SearchServicesJson.js';
+import {getColumnIdx, getTblById} from '../../tables/TableUtil.js';
 import {BasicTableView} from '../../tables/ui/BasicTableView.jsx';
-import {ListBoxInputField} from '../../ui/ListBoxInputField.jsx';
-import {InputAreaFieldConnected} from '../../ui/InputAreaField.jsx';
 import {createLinkCell, createInputCell} from '../../tables/ui/TableRenderer.js';
 import * as TblCntlr from '../../tables/TablesCntlr.js';
 import * as TblUtil from '../../tables/TableUtil.js';
 import {SelectInfo} from '../../tables/SelectInfo.js';
 import {FilterInfo, FILTER_TTIPS} from '../../tables/FilterInfo.js';
-import {isNil, isArray, cloneDeep, set} from 'lodash';
-import {dispatchValueChange} from '../../fieldGroup/FieldGroupCntlr.js';
+import {ListBoxInputField} from '../../ui/ListBoxInputField.jsx';
+import {InputAreaFieldConnected} from '../../ui/InputAreaField.jsx';
+import {fieldGroupConnector} from '../../ui/FieldGroupConnector.jsx';
 import {LSSTDDPID} from './LSSTCatalogSelectViewPanel.jsx';
 const sqlConstraintsCol = {name: 'constraints', idx: 1, type: 'char', width: 10};
 
@@ -37,6 +37,7 @@ function getTblId(catName, dd_short) {
 /**
  * @summary reest table constraints state
  * @param {string} gkey
+ * @param {string} fieldKey
  */
 function resetConstraints(gkey, fieldKey) {
     const value = {constraints: '', selcols: '', filters: {}, errorConstraints:''};
@@ -86,6 +87,7 @@ export class CatalogConstraintsPanel extends React.Component {
 
     render() {
         const {tableModel} = this.state;
+        const {error} = tableModel || {};
         const {catname, dd_short, fieldKey, showFormType=true, createDDRequest, groupKey} = this.props;
 
         var resetButton = () => {
@@ -126,12 +128,12 @@ export class CatalogConstraintsPanel extends React.Component {
                             margin:'0px 10px 5px 5px', padding:'0 0 0 10px',
                             border:'1px solid #a3aeb9'}}>
                     <div style={{display:'flex', flexDirection:'row', padding:'5px 5px 0'}}>
-                        {showFormType && formTypeList()}
-                        {resetButton()}
+                        {!error && showFormType && formTypeList()}
+                        {!error && resetButton()}
                     </div>
                     <div>
                         <TablePanelConnected {...{tableModel, fieldKey}} />
-                        {renderSqlArea()}
+                        {!error && renderSqlArea()}
                     </div>
                 </div>
             </div>
@@ -165,8 +167,7 @@ export class CatalogConstraintsPanel extends React.Component {
         const request = createDDRequest(); //Fetch DD master table
         const urlDef = get(FieldGroupUtils.getGroupFields(this.props.groupKey), 'cattable.coldef', 'null');
 
-
-        doFetchTable(request).then((tableModel) => {
+        fetchTable(request).then((tableModel) => {
             const tableModelFetched = tableModel;
             tableModelFetched.tbl_id = tblid;
             addConstraintColumn(tableModelFetched, this.props.groupKey);
@@ -180,7 +181,11 @@ export class CatalogConstraintsPanel extends React.Component {
             TblCntlr.dispatchTableReplace(tableModel);
             this.setState({tableModel: tableModelFetched});
         }).catch((reason) => {
-                console.error(reason);
+                console.log(reason.message);
+                const errTable = TblUtil.createErrorTbl(tblid, `Catalog Fetch Error: ${reason.message}`);
+
+                TblCntlr.dispatchTableReplace(errTable);
+                this.setState({tableModel: errTable});
             }
         );
     }
@@ -359,8 +364,9 @@ class ConstraintPanel extends Component {
         const {tableModel, onTableChanged} = this.props;
         const tbl_ui_id = tableModel.tbl_id + '-ui';
         const tbl = getTblById(tableModel.tbl_id);
-        const {columns, data} = get(tbl, 'tableData');
-        const selectInfoCls = SelectInfo.newInstance(tbl.selectInfo, 0);
+        const {columns, data} = get(tbl, 'tableData', {});
+        const selectInfoCls = has(tbl, 'selectInfo') && SelectInfo.newInstance(tbl.selectInfo, 0);
+        const totalCol = columns ? (columns.length-1) : 0;
 
         //const {tableconstraints} = FieldGroupUtils.getGroupFields(groupKey);
         //console.log('constraint: ' + tableconstraints.value.constraints + ' errorConstraints: ' + tableconstraints.value.errorConstraints);
@@ -383,6 +389,7 @@ class ConstraintPanel extends Component {
                                     currentPage={1}
                                     hlRowIdx={0}
                                     key={tableModel.tbl_id}
+                                    error={tableModel.error}
                                     callbacks={
                                         {
                                            onRowSelect: updateRowSelected(tableModel.tbl_id, onTableChanged),
@@ -395,7 +402,7 @@ class ConstraintPanel extends Component {
                                                 { cellRenderer:
                                                     createLinkCell(
                                                         {
-                                                            hrefColIdx: tableModel.tableData.columns.length-1
+                                                            hrefColIdx: totalCol
                                                         }
                                                     )
                                                 },