You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/01/29 13:44:29 UTC
[incubator-dlab] branch DLAB-1357 updated: Disable action if
cluster terminated
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1357
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1357 by this push:
new 15b134a Disable action if cluster terminated
new ab94068 Merge remote-tracking branch 'origin/DLAB-1357' into DLAB-1357
15b134a is described below
commit 15b134ac81e10da466f696d02a86c68f432ff454
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Wed Jan 29 15:40:20 2020 +0200
Disable action if cluster terminated
---
.../legion-deployment/legion-list/legion-list.component.html | 8 ++++----
.../legion-deployment/legion-list/legion-list.component.scss | 5 +++++
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.html
index 0a30f4d..aaa4f2a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.html
@@ -19,7 +19,7 @@
</ng-container>
<ng-container matColumnDef="legion-name">
- <th mat-header-cell *matHeaderCellDef class="legion-name"> Odahu cluster Name </th>
+ <th mat-header-cell *matHeaderCellDef class="legion-name"> Odahu cluster name </th>
<td mat-cell *matCellDef="let element" class="legion-name">
<span *ngIf="element && element.name">{{element.name}}</span>
</td>
@@ -27,7 +27,7 @@
</ng-container>
<ng-container matColumnDef="legion-status">
- <th mat-header-cell *matHeaderCellDef class="legion-status"> Legion cluster status </th>
+ <th mat-header-cell *matHeaderCellDef class="legion-status"> Odahu cluster status </th>
<td mat-cell *matCellDef="let element" class="legion-status">
<span *ngIf="element && element.name" [ngClass]="element.status.toLowerCase()">{{ element.status | titlecase}}</span>
</td>
@@ -37,7 +37,7 @@
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef class="legion-actions"></th>
<td mat-cell *matCellDef="let element" class="settings">
- <span *ngIf="element && element.name" #settings (click)="actions.toggle($event, settings)" class="actions"></span>
+ <span *ngIf="element && element.name" #settings (click)="actions.toggle($event, settings)" class="actions" [ngClass]="{'disabled': element.status === 'TERMINATING' || element.status === 'TERMINATED'}"></span>
<bubble-up #actions class="list-menu" position="bottom-left" alternative="top-left">
<ul class="list-unstyled">
<div class="active-items"></div>
@@ -53,7 +53,7 @@
Stop
</a>
</li>
- <li class="project-seting-item" *ngIf="element.status !== 'TERMINATED' || element.status !== 'TERMINATING'" (click)="odahuAction(element, 'terminate')">
+ <li class="project-seting-item" *ngIf="element.status !== 'TERMINATED' && element.status !== 'TERMINATING'" (click)="odahuAction(element, 'terminate')">
<i class="material-icons">phonelink_off</i>
<a class="action">
Terminate
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.scss
index 7cfaef8..21fc43e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/legion-deployment/legion-list/legion-list.component.scss
@@ -27,6 +27,11 @@
display: inline-block;
text-align: center;
cursor: pointer;
+ &.disabled {
+ opacity: 0.4;
+ cursor: not-allowed;
+ pointer-events: none;
+ }
}
td {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org