[incubator-dlab] 06/09: [DLAB-747]: cleanup status and keys check from clusters list page

[ankovalyshyn]

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 d892ae411ce161f5788402bf1db414f045745a63
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Wed Jun 5 17:07:17 2019 +0300

    [DLAB-747]: cleanup status and keys check from clusters list page
---
 .../computational-resources-list.component.html                | 10 ++++------
 .../computational-resources-list.component.ts                  |  1 -
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html
 
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html
index 75f19fb..d4cac2c 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html
@@ -34,21 +34,19 @@
         <div class="resource-actions">
           <a class="schedule" [ngClass]="{'active': resource.scheduler_data,
               'not-allowed': environment.status !== 'running' && 
environment.status !== 'stopped'
-              || resource.status !== 'running' && resource.status !== 'stopped'
-              || healthStatus === 'error' }">
+              || resource.status !== 'running' && resource.status !== 
'stopped' }">
             <i class="material-icons" 
(click)="openScheduleDialog(resource)">schedule</i>
           </a>
   
           <a class="start-stop-action" *ngIf="resource.image === 
'docker.dlab-dataengine' && environment.status === 'running'">
             <i class="material-icons" *ngIf="resource.status === 'running' || 
resource.status === 'stopping'" (click)="toggleResourceAction(resource, 'stop')"
-              [ngClass]="{'not-allowed' : resource.status === 'stopping' || 
healthStatus === 'error'}">pause_circle_outline</i>
+              [ngClass]="{'not-allowed' : resource.status === 'stopping' 
}">pause_circle_outline</i>
             <i class="material-icons" *ngIf="resource.status === 'stopped' || 
resource.status === 'starting'" (click)="toggleResourceAction(resource, 
'start')"
-              [ngClass]="{'not-allowed' : resource.status === 'starting' || 
healthStatus === 'error'}">play_circle_outline</i>
+              [ngClass]="{'not-allowed' : resource.status === 'starting' 
}">play_circle_outline</i>
           </a>
   
           <a class="remove_butt" [ngClass]="{'disabled' : environment.status 
!== 'running' || environment.status !== 'stopped'
-              && resource.status != 'running' && resource.status != 'failed' 
&& resource.status != 'stopped',
-              'not-allowed' : healthStatus === 'error'}" 
(click)="toggleResourceAction(resource, 'terminate')">
+              && resource.status != 'running' && resource.status != 'failed' 
&& resource.status != 'stopped' }" (click)="toggleResourceAction(resource, 
'terminate')">
             <i class="material-icons">highlight_off</i>
           </a>
         </div>
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
index 89e3992..02ede96 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
@@ -38,7 +38,6 @@ export class ComputationalResourcesListComponent {
 
   @Input() resources: any[];
   @Input() environment: any[];
-  @Input() healthStatus: string;
 
   @Output() buildGrid: EventEmitter<{}> = new EventEmitter();
 


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