Merge pull request #93 from delphi-hub/feature/dockerControlsUpdate

Feature/dockerControlHide

Author: janniclas

client/package-lock.json

@@ -38,15 +38,15 @@
     "@angular/cli": "^7.2.1",
     "@angular/compiler-cli": "^7.2.0",
     "@angular/language-service": "^7.2.0",
-    "@types/jasmine": "^2.8.14",
+    "@types/jasmine": "^3.3.5",
     "@types/jasminewd2": "^2.0.6",
     "@types/node": "^10.12.18",
     "codelyzer": "^4.5.0",
     "jasmine-core": "^3.3.0",
     "jasmine-spec-reporter": "^4.2.1",
     "karma": "^3.1.4",
     "karma-chrome-launcher": "^2.2.0",
-    "karma-cli": "^1.0.1",
+    "karma-cli": "^2.0.0",
     "karma-coverage-istanbul-reporter": "^2.0.4",
     "karma-firefox-launcher": "^1.1.0",
     "karma-jasmine": "^2.0.1",

client/package.json

@@ -51,23 +51,29 @@
 
           <ng-container matColumnDef="action">
               <mat-header-cell [ngClass]="'customWidthClass'"  *matHeaderCellDef> Action </mat-header-cell>
-               <mat-cell [ngClass]="'customWidthClass'" *matCellDef="let element; let i=index; let row;" >
-                  <button  mat-icon-button (click)= startInstance(element.id) matTooltip="Start">
-                      <mat-icon aria-label="play_circle_filled_white">play_circle_filled_white</mat-icon>
-                  </button>
-                 <button  mat-icon-button (click)= stopInstance(element.id) matTooltip="Stop">
-                   <mat-icon aria-label="stop">stop</mat-icon>
-                 </button>
-                  <button mat-icon-button (click)= pauseInstance(element.id) matTooltip="Pause">
-                      <mat-icon aria-label="pause_circle_outline">pause_circle_outline</mat-icon>
-                  </button>
-                 <button mat-icon-button (click)= resumeInstance(element.id) matTooltip="Resume">
-                   <mat-icon aria-label="play_circle_outline">play_circle_outline</mat-icon>
-                 </button>
-                  <button id="deleteButton" (click)="openDeleteDialog(i,row, element.id)" mat-icon-button matTooltip="Delete">
-                      <mat-icon aria-label="delete" id="deleteButton" >delete</mat-icon>
-                  </button>
-                </mat-cell>
+                    <mat-cell [ngClass]="'customWidthClass'" *matCellDef="let element; let i=index; let row;" >
+                            <div *ngIf="!element.dockerId; else actions">
+                                Instance not hosted with docker.
+                            </div>
+                            <ng-template #actions>
+                                <button  mat-icon-button (click)= startInstance(element.id) matTooltip="Start">
+                                    <mat-icon aria-label="play_circle_filled_white">play_circle_filled_white</mat-icon>
+                                </button>
+                                <button  mat-icon-button (click)= stopInstance(element.id) matTooltip="Stop">
+                                <mat-icon aria-label="stop">stop</mat-icon>
+                                </button>
+                                <button mat-icon-button (click)= pauseInstance(element.id) matTooltip="Pause">
+                                    <mat-icon aria-label="pause_circle_outline">pause_circle_outline</mat-icon>
+                                </button>
+                                <button mat-icon-button (click)= resumeInstance(element.id) matTooltip="Resume">
+                                <mat-icon aria-label="play_circle_outline">play_circle_outline</mat-icon>
+                                </button>
+                                <button id="deleteButton" (click)="openDeleteDialog(i,row, element.id)" mat-icon-button matTooltip="Delete">
+                                    <mat-icon aria-label="delete" id="deleteButton" >delete</mat-icon>
+                                </button>
+                            </ng-template>
+                    </mat-cell>
+
             </ng-container>
 
             <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>