Merge branch 'develop' into 'master'

V2.0.13

See merge request alexander.lovett/looking-glass!6

CHANGELOG.md

+# 2.0.13
+* [LGR-76](https://jira.software.geant.org/browse/LGR-76) - Results page handle non 200 status
+
 # 2.0.12
 * [LGR-73](https://jira.software.geant.org/browse/LGR-73) - Use inventory provider for router info
 

package.json

 {
   "name": "looking-glass",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -30,7 +30,7 @@
     "core-js": "^2.5.4",
     "font-awesome": "^4.7.0",
     "ionicons": "^4.4.6",
-    "jquery": "^3.3.1",
+    "jquery": "3.2.1",
     "leaflet": "1.3.1",
     "leaflet-defaulticon-compatibility": "^0.1.1",
     "leaflet.awesome-markers": "^2.0.4",

src/app/interfaces/components/results/results.component.ts

@@ -4,6 +4,7 @@ import { Location } from '@angular/common';
 import { from, of } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
 import 'rxjs/add/operator/delay';
+import 'rxjs/add/operator/catch';
 
 import { CommandService } from '../../../domain/command.service';
 declare let $: any;
@@ -49,7 +50,12 @@ export class ResultsComponent implements OnInit {
             .asXml(params.asXml=="true")
             .build()
           )
-      ).mergeMap(request => commandService.execute(request))
+      ).mergeMap(request => commandService.execute(request)
+        .catch(e => {
+          console.log(e);
+          var message: String = (e != null && e.hasOwnProperty('message')) ? e.message : "Undefined error"
+          return of(new CommandService.CommandResult(request.getHost(), `Error: ${message}`, 0));
+        }))
       .subscribe(
         result => {
           var results = context.queryResults$;