Merge pull request #35 from OpenTOSCA/fix/completion

Fix/completion

Author: lharzenetter

src/app/application-management/application-upload/application-upload.component.ts

@@ -130,9 +130,9 @@ export class ApplicationUploadComponent implements OnInit {
      * If topology completion is required this is caught within this handler.
      */
     onUploadError(event): void {
-        switch (event.xhr.status) {
+        switch (event.error.status) {
             case 406:
-                const response = JSON.parse(event.xhr.response);
+                const response = event.error.error;
                 this.linkToWineryResourceForCompletion = response['Location'];
                 const fileName = event.files[0].name;
                 const csarName = fileName.substr(0, fileName.length - 5);

src/app/core/component/deployment-completion/deployment-completion.component.html

@@ -25,40 +25,48 @@
         </div>
     </div>
     <div *ngIf="activeIndex === 1">
-        <div class="modal-body">
-            <h4 *ngIf="connectionCompletionOptions">Host Selection</h4>
+        <div class="modal-body" *ngIf="hostCompletionOptions; else noHostOptions">
+            <h4>Host Selection</h4>
             <div class="panel panel-default" *ngFor="let hostCompletionOption of hostCompletionOptions">
                 <div class="panel-heading">
                     <h3 class="panel-title">Node template requiring host: {{hostCompletionOption?.nodeID}}</h3>
                 </div>
                 <div class="panel-body" [style.height.px]="amountOfHostOptions * 50">
                     <p-dropdown [options]="hostOptions"
                                 (onChange)="onUpdateHostSelection(hostCompletionOption, $event)"
-                                autoWidth="false"
                                 [style]="{'width':'100%'}"
                                 required>
                     </p-dropdown>
                 </div>
             </div>
         </div>
+        <ng-template #noHostOptions>
+            <div class="modal-body">
+                There are no host options to select!
+            </div>
+        </ng-template>
     </div>
     <div *ngIf="activeIndex === 2">
-        <div class="modal-body">
-            <h4 *ngIf="connectionCompletionOptions">Connection Selection</h4>
+        <div class="modal-body" *ngIf="connectionCompletionOptions; else noConnectionOptions">
+            <h4>Connection Selection</h4>
             <div class="panel panel-default" *ngFor="let connectionCompletionOption of connectionCompletionOptions">
                 <div class="panel-heading">
                     <h3 class="panel-title">Open Requirement: {{connectionCompletionOption?.nodeID}}</h3>
                 </div>
                 <div class="panel-body" [style.height.px]="amountOfConnectOptions * 50">
                     <p-dropdown [options]="connectOptions"
                                 (onChange)="onUpdateConnectionSelection(connectionCompletionOption, $event)"
-                                autoWidth="false"
                                 [style]="{'width':'100%'}"
                                 required>
                     </p-dropdown>
                 </div>
             </div>
         </div>
+        <ng-template #noConnectionOptions>
+            <div class="modal-body">
+                There are no connection options to select!
+            </div>
+        </ng-template>
     </div>
     <div *ngIf="activeIndex === 3">
         <div class="opentosca-modal-content">

src/app/core/component/deployment-completion/deployment-completion.component.ts

@@ -181,7 +181,7 @@ export class DeploymentCompletionComponent implements OnInit, AfterViewInit {
                     // get connection injection options, i.e. rel templates with open requirement and possible values
                     this.connectionCompletionOptions = injectionOptions.connectionInjectionOptions;
                     this.logger.log('[deployment-completion.component][getInjectionOptions]', 'Got host completion options: '
-                        + this.hostCompletionOptions);
+                        + JSON.stringify(this.hostCompletionOptions));
                 }
             // after getting the injection options, fill the dropdown with the fetched values
             }).then(() => {