You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/06/05 14:14:47 UTC
[incubator-dlab] 05/09: [DLAB-747]: cleanup status and keys check
from management list page
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 cf2a00b3c0e53e744fc6afa7486ff6771f5a71a3
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Jun 5 17:06:51 2019 +0300
[DLAB-747]: cleanup status and keys check from management list page
---
.../management/management-grid/management-grid.component.html | 11 ++++-------
.../management/management-grid/management-grid.component.ts | 2 --
2 files changed, 4 insertions(+), 9 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 5d68686..1241f3a 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
@@ -57,12 +57,11 @@
<div class="resource-actions">
<a class="start-stop-action" *ngIf="resource.image === 'docker.dlab-dataengine'">
<i class="material-icons" (click)="toggleResourceAction(element, 'stop', resource)"
- [ngClass]="{'not-allowed' : resource.status !== 'running' || element.user.toLowerCase() === currentUser && healthStatus !== 'ok' }">pause_circle_outline</i>
+ [ngClass]="{'not-allowed' : resource.status !== 'running' }">pause_circle_outline</i>
</a>
<a class="remove_butt" (click)="toggleResourceAction(element, 'terminate', resource)"
- [ngClass]="{ 'disabled' : element.status !== 'running' || resource.status !== 'running'
- && resource.status !== 'stopped' || element.user.toLowerCase() === currentUser && healthStatus !== 'ok' }">
+ [ngClass]="{ 'disabled' : element.status !== 'running' || resource.status !== 'running' && resource.status !== 'stopped' }">
<i class="material-icons">highlight_off</i>
</a>
</div>
@@ -76,11 +75,9 @@
<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)" [ngClass]="{ 'disabled'
- : (!uploadKey && element.type === 'notebook' && element.user.toLowerCase() === currentUser)
- || (element.status !== 'running' && element.status !== 'stopped' && element.status !== 'stopping' && element.status !== 'failed' )
+ : (element.status !== 'running' && element.status !== 'stopped' && element.status !== 'stopping' && element.status !== 'failed' )
|| (element.type === 'edge node' && element.user.toLowerCase() === currentUser && element.status === 'stopping')
- || element.type === 'edge node' && element.user.toLowerCase() !== currentUser && element.status !== 'running'
- || element.user.toLowerCase() === currentUser && healthStatus !== 'ok' && element.type !== 'edge node' }"></span>
+ || element.type === 'edge node' && element.user.toLowerCase() !== currentUser && element.status !== 'running' }"></span>
<bubble-up #actions class="list-menu" position="bottom-left" alternative="top-left">
<ul class="list-unstyled">
<li
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
index 937a8b8..1173e83 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
@@ -44,9 +44,7 @@ export interface ManageAction {
export class ManagementGridComponent implements OnInit {
@Input() allEnvironmentData: Array<any>;
@Input() environmentsHealthStatuses: Array<any>;
- @Input() healthStatus: string;
@Input() resources: Array<any>;
- @Input() uploadKey: boolean;
@Input() isAdmin: boolean;
@Input() currentUser: string = '';
@Output() refreshGrid: EventEmitter<{}> = new EventEmitter();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org