@@ -1301,13 +1301,23 @@ qx.Class.define("osparc.data.Resources", {
13011301 } , this ) ;
13021302
13031303 res . addListenerOnce ( endpoint + "Error" , e => {
1304- const status = e . getRequest ( ) . getStatus ( ) ;
1305- let message = null ; // required
1306- let errorType = null ; // optional
1304+ let message = null ;
1305+ let status = null ;
13071306 if ( e . getData ( ) . error ) {
13081307 const errorData = e . getData ( ) . error ;
1309- message = errorData . message
1310- errorType = errorData . type || null ;
1308+ const logs = errorData . logs || null ;
1309+ if ( logs && logs . length ) {
1310+ message = logs [ 0 ] . message ;
1311+ }
1312+ const errors = errorData . errors || [ ] ;
1313+ if ( message === null && errors && errors . length ) {
1314+ message = errors [ 0 ] . message ;
1315+ }
1316+ status = errorData . status ;
1317+ } else {
1318+ const req = e . getRequest ( ) ;
1319+ message = req . getResponse ( ) ;
1320+ status = req . getStatus ( ) ;
13111321 }
13121322 res . dispose ( ) ;
13131323
@@ -1325,19 +1335,12 @@ qx.Class.define("osparc.data.Resources", {
13251335 } ) ;
13261336 }
13271337
1328- if ( status == 500 ) {
1329- console . error ( message ) ;
1330- // Show Flash message...
1331- osparc . FlashMessenger . getInstance ( ) . logAs ( message , "ERROR" ) ;
1332- // ...and do not propagate message
1333- message = "" ;
1334- } else if ( [ 404 , 503 ] . includes ( status ) ) {
1335- message += "<br>" + qx . locale . Manager . tr ( "Please try again later" ) ;
1338+ if ( [ 404 , 503 ] . includes ( status ) ) {
1339+ message += "<br>Please try again later and/or contact support" ;
13361340 }
1337- const err = Error ( message ) ;
1338- err . status = status ;
1339- if ( errorType ) {
1340- err . type = errorType
1341+ const err = Error ( message ? message : `Error while trying to fetch ${ endpoint } ${ resource } ` ) ;
1342+ if ( status ) {
1343+ err . status = status ;
13411344 }
13421345 reject ( err ) ;
13431346 } ) ;
0 commit comments