management of objects in error output for coe

INTO-CPS-Association · Jul 26, 2024 · 37401da · 37401da
1 parent 092106e
commit 37401da
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/angular2-app/coe/coe-simulation.service.ts b/src/angular2-app/coe/coe-simulation.service.ts
@@ -175,7 +175,7 @@ export class CoeSimulationService implements OnDestroy  {
         }).catch(err => this.errorHandler(err));
     }
 
-    errorHandler(err: Response, stopped?: boolean) {
+    errorHandler(err: { error?: string, statusText?: string, status?: number }, stopped?: boolean) {
         console.warn(err);
         if (stopped) {
             this.progress = 0;
@@ -187,9 +187,10 @@ export class CoeSimulationService implements OnDestroy  {
             this.progress = 0;
             console.log("err: ", err);
             if('error' in err){
-                this.errorReport(true, "Error: " + err.statusText + " - " + err.error + ". Check CoE Log for more details.");
+                let errorMessage = typeof err.error === 'string' ? err.error : '';
+                this.errorReport(true, "Error: " + err.statusText + (errorMessage ? " - " + errorMessage : "") + ". Check CoE Server and/or CoE Log for more details.");
             } else{
-            this.errorReport(true, "Error: " + err.statusText);
+                this.errorReport(true, "Error: " + err.statusText);
             }
         }
     }