[incubator-dlab] 02/03: [DLAB-854]: prevent actions for edge nodes in management page

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 8710effb2c2c5e85a99b9012488dc7787f80e404
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 15 14:57:59 2019 +0300

    [DLAB-854]: prevent actions for edge nodes in management page
---
 .../management/management-grid/management-grid.component.html     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index ff15225..14c3b89 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -25,18 +25,18 @@
     </ng-container>
 
     <ng-container matColumnDef="project">
-      <th mat-header-cell *matHeaderCellDef class="project"> Type </th>
+      <th mat-header-cell *matHeaderCellDef class="project"> Project </th>
       <td mat-cell *matCellDef="let element">{{ element.project }}</td>
     </ng-container>
 
     <ng-container matColumnDef="type">
       <th mat-header-cell *matHeaderCellDef class="type"> Type </th>
-      <td mat-cell *matCellDef="let element">{{ element.resource_name || element.resource_type }}</td>
+      <td mat-cell *matCellDef="let element">{{ element.name || element.type }}</td>
     </ng-container>
 
     <ng-container matColumnDef="shape">
       <th mat-header-cell *matHeaderCellDef class="shape"> Shape / Resource id </th>
-      <td mat-cell *matCellDef="let element" class="shape">{{ element.shape || element.public_ip }}</td>
+      <td mat-cell *matCellDef="let element" class="shape">{{ element.shape || element.ip }}</td>
     </ng-container>
 
     <ng-container matColumnDef="status">
@@ -80,7 +80,7 @@
     <ng-container matColumnDef="actions">
       <th mat-header-cell *matHeaderCellDef class="actions"></th>
       <td mat-cell *matCellDef="let element" class="actions settings">
-        <span #settings class="actions" (click)="actions.toggle($event, settings)"
+        <span #settings class="actions" (click)="actions.toggle($event, settings)" *ngIf="element.type !== 'edge node'"
           [ngClass]="{ 'disabled'
             : element.status !== 'running' && element.status !== 'stopped' && element.status !== 'stopping' && element.status !== 'failed' }"></span>
         <bubble-up #actions class="list-menu" position="bottom-left" alternative="top-left">


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org