fixing forming cba package definition

[ccsdk/cds.git] / cds-ui / designer-client / src / app / modules / feature-modules / packages / configuration-dashboard / configuration-dashboard.component.ts

diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
index dc5697f..a78fe4e 100644 (file)
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
@@ -19,7 +19,7 @@ import {PackageCreationService} from '../package-creation/package-creation.servi
 import {ComponentCanDeactivate} from '../../../../common/core/canDactivate/ComponentCanDeactivate';
 import {PackageCreationExtractionService} from '../package-creation/package-creation-extraction.service';
 import {distinctUntilChanged, takeUntil} from 'rxjs/operators';
-import {Subject} from 'rxjs';
+import {Subject, throwError} from 'rxjs';
 
 @Component({
     selector: 'app-configuration-dashboard',
@@ -264,8 +264,7 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl
                     this.router.navigate(['/packages/package/' + id]);
                 });
             }, error => {
-                this.toastService.error('error happened when deploying ' + error.message);
-                console.log('Error -' + error.message);
+                this.handleError(error);
             });
     }
 
@@ -291,5 +290,19 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl
             this.dataTarget = '#exampleModalLong';
         }
     }
+
+    handleError(error) {
+        let errorMessage = '';
+        if (error.error instanceof ErrorEvent) {
+            // client-side error
+            errorMessage = `Error: ${error.error.message}`;
+        } else {
+            // server-side error
+            errorMessage = `Error Code: ${error.status}\nMessage: ${error.message}`;
+        }
+        this.toastService.error('error happened when deploying ' + errorMessage);
+        console.log('Error -' + errorMessage);
+        return throwError(errorMessage);
+    }
 }