DM-11013 Response to review comments

- fixed error message from backgrounded search
- added check for failed status before tracking fetch
- now returning DAX message rather then DAX error type
- added error message to 'Unexpected error'

Author: tgoldina

src/firefly/java/edu/caltech/ipac/firefly/server/query/IpacTablePartProcessor.java

@@ -223,7 +223,9 @@ public DataGroupPart getData(ServerRequest sr) throws DataAccessException {
             throw dae;
         } catch (Exception e) {
             LOGGER.error(e, "Error while processing request:" + StringUtils.truncate(sr, 512));
-            throw new DataAccessException("Unexpected error", e);
+            String message = e.getMessage();
+            if (message == null || message.length() < 5) message = "Unexpected error";
+            throw new DataAccessException(message, e);
         }
     }
 

src/firefly/java/edu/caltech/ipac/firefly/server/query/lsst/LSSTMetaSearch.java

@@ -54,7 +54,13 @@ static  String getErrorMessageFromFile(File file) throws IOException, ParseExcep
         JSONParser parser = new JSONParser();
 
         JSONObject obj = ( JSONObject) parser.parse(new FileReader(file ));
-        return  obj.get("error").toString();
+        String message = obj.get("message").toString();
+        String error = obj.get("error").toString();
+        if (error != null && message != null) {
+            return message.contains(error) ? message : error + " " + message;
+        } else {
+            return error;
+        }
     }
 
     private DataGroup  getDataFromURL(TableServerRequest request) throws Exception {

src/firefly/js/core/background/BackgroundUtil.js

@@ -2,7 +2,7 @@
  * License information at https://github.com/Caltech-IPAC/firefly/blob/master/License.txt
  */
 
-import {get} from 'lodash';
+import {get, omit} from 'lodash';
 import Enum from 'enum';
 
 import {flux} from '../../Firefly.js';
@@ -68,7 +68,7 @@ export function isActive(state) {
 }
 
 export function getErrMsg(bgStatus) {
-    return Object.entries(bgStatus).filter( ([k,v]) => k.startsWith('MESSAGE_'))
+    return Object.entries(omit(bgStatus, 'MESSAGE_CNT')).filter( ([k,v]) => k.startsWith('MESSAGE_'))
                             .map(([k,v]) => v)
                             .join('; ');
 }

src/firefly/js/tables/TablesCntlr.js

@@ -406,7 +406,7 @@ function highlightRow(action) {
             TblUtil.doFetchTable(request, startIdx+hlRowIdx).then ( (tableModel) => {
                 dispatch( {type:TABLE_HIGHLIGHT, payload: tableModel} );
             }).catch( (error) => {
-                dispatch({type: TABLE_HIGHLIGHT, payload: TblUtil.createErrorTbl(tbl_id, `Fail to load table. \n   ${error}`)});
+                dispatch({type: TABLE_HIGHLIGHT, payload: TblUtil.createErrorTbl(tbl_id, `Failed to load table. \n   ${error}`)});
             });
         }
     };
@@ -535,7 +535,7 @@ function syncFetch(request, hlRowIdx, invokedBy, dispatch) {
         const type = tableModel.origTableModel ? TABLE_REPLACE : TABLE_UPDATE;
         dispatch( {type, payload: tableModel} );
     }).catch( (error) => {
-        dispatch({type: TABLE_UPDATE, payload: TblUtil.createErrorTbl(request.tbl_id, `Fail to load table. \n   ${error}`)});
+        dispatch({type: TABLE_UPDATE, payload: TblUtil.createErrorTbl(request.tbl_id, `Failed to load table. \n   ${error}`)});
     });
 }
 
@@ -546,12 +546,19 @@ function asyncFetch(request, hlRowIdx, invokedBy, dispatch) {
         const {ID, STATE} = bgStatus || {};
         if (isSuccess(STATE)) {
             syncFetch(request, hlRowIdx, invokedBy, dispatch);
+        } else if (isFail(STATE)) {
+            const error = getErrMsg(bgStatus);
+            const {tbl_id} = request;
+            dispatch({
+                type: TABLE_UPDATE,
+                payload: TblUtil.createErrorTbl(tbl_id, `Failed to load table. \n   ${error}`)
+            });
         } else {
             dispatchAddSaga( trackFetch, {request, hlRowIdx, invokedBy, bgID:ID, dispatch});
             dispatch({type: TABLE_UPDATE, payload: {tbl_id, bgStatus}});
         }
     }).catch( (error) => {
-        dispatch({type: TABLE_UPDATE, payload: TblUtil.createErrorTbl(tbl_id, `Fail to load table. \n   ${error}`)});
+        dispatch({type: TABLE_UPDATE, payload: TblUtil.createErrorTbl(tbl_id, `Failed to load table. \n   ${error}`)});
     });
 }
 
@@ -567,7 +574,7 @@ function* trackFetch({request, hlRowIdx, invokedBy, bgID, dispatch}) {
         } else if (isFail(STATE)) {
             const error = getErrMsg(action.payload);
             const {tbl_id} = request;
-            dispatch({ type: TABLE_UPDATE, payload: TblUtil.createErrorTbl(tbl_id, `Fail to load table. \n   ${error}`)});
+            dispatch({ type: TABLE_UPDATE, payload: TblUtil.createErrorTbl(tbl_id, `Failed to load table. \n   ${error}`)});
             break;
         } else if (action.type === BG_JOB_ADD && ID === bgID) {
             // sent to background... no need to track this anymore.

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

@@ -116,7 +116,6 @@ export class TablePanel extends PureComponent {
                 filterInfo, filterCount, sortInfo, data, bgStatus} = this.state;
         var {leftButtons, rightButtons} =  this.state;
 
-        if (get(bgStatus, 'STATE') === 'FAIL') return <div className='TablePanel__error'>{get(bgStatus, 'MESSAGE_0', '')}</div>
         if (error) return <div className='TablePanel__error'>{error}</div>;
         if (isEmpty(columns)) return <Loading {...{showTitle, tbl_id, title, removable, bgStatus}}/>;