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/03/10 15:36:59 UTC
[incubator-dlab] 01/03: [DLAB-1620]: Updated Odahu termination if
cluster stopped
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 8688c253e7eaf10723c0d9a7ea9b7a7b810e6628
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Mar 10 17:32:17 2020 +0200
[DLAB-1620]: Updated Odahu termination if cluster stopped
---
.../legion-deployment/legion-list/legion-list.component.html | 4 ++--
.../exploratory/detail-dialog/detail-dialog.component.html | 6 +++---
.../exploratory/detail-dialog/detail-dialog.component.scss | 9 +++++++--
.../app/resources/resources-grid/resources-grid.component.html | 6 ++++--
.../src/main/resources/webapp/src/assets/styles/_dialogs.scss | 6 ++++++
5 files changed, 22 insertions(+), 9 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 71314a3..a670b2f 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
@@ -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" [ngClass]="{'disabled': element.status !== 'RUNNING' && element.status !== 'STOPPED' }"></span>
+ <span *ngIf="element && element.name" #settings (click)="actions.toggle($event, settings)" class="actions" [ngClass]="{'disabled': element.status !== 'RUNNING' && element.status !== 'STOPPED'}"></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' && element.status !== 'STOPPED' && element.status !== 'STOPPING'" (click)="odahuAction(element, 'terminate')">
+ <li class="project-seting-item" [ngClass]="{'disabled' : element.status === 'STOPPED'}" *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/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index e74bad9..de503f3 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
@@ -142,6 +142,7 @@
</div>
</div>
</div>
+
<div class="legion-info" *ngIf="data.legion">
<div class="content-box">
<div class="detail-info" *ngIf="!legion.error_message">
@@ -154,10 +155,9 @@
</a>
</div>
<div class="grafana" *ngIf="url.description === 'Grafana'">
- <div><span>Gafana user: </span><span class="creds">{{legion.bucket_name}}</span></div>
- <div><span>Gafana password: </span><span class="creds">{{legion.shared_bucket_name}}</span></div>
+ <div><span>Gafana user: </span><span class="creds">{{legion.bucket_name}}</span></div>
+ <div><span>Gafana password: </span><span class="creds">{{legion.shared_bucket_name}}</span></div>
</div>
-
</div>
</div>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
index 9d0f775..f4d17ef 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
@@ -28,27 +28,33 @@
.links_block {
max-height: 300px;
overflow-y: auto;
+
.odahu-links:not(:last-child){
margin-bottom: 20px;
}
+
.grafana{
white-space: nowrap;
padding-left: 30px;
-
color: $blue-grey-color;
+
div{
display: flex;
+
span{
font-size: 13px;
font-weight: 500;
+
&.creds{
font-weight: 600;
}
}
}
}
+
>p, .odahu-link {
display: flex;
+
.description {
white-space: nowrap;
padding-left: 7px;
@@ -92,7 +98,6 @@
}
span {
-
.danger_color {
position: absolute;
bottom: -16px;
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index 6da480a..945cc4e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -148,7 +148,6 @@
[ngClass]="{ 'disabled': element.status.toLowerCase() === 'creating'
|| (element.image === 'docker.dlab-superset' && element.status !== 'running' && element.status !== 'stopped')
|| (element.image === 'docker.dlab-jupyterlab' && element.status !== 'running' && element.status !== 'stopped')
- || element.status.toLowerCase() === 'stopping'
}">
</span>
@@ -228,7 +227,10 @@
Stop
</a>
</li>
- <li class="project-seting-item" *ngIf="element.status !== 'terminated' && element.status !== 'terminating' && element.status !== 'stopped' && element.status !== 'stopping'" (click)="odahuAction(element, 'terminate')">
+ <li class="project-seting-item"
+ [ngClass]="{'disabled': element.status === 'stopped' || element.status.toLowerCase() === 'stopping' || element.status.toLowerCase() === 'starting'}"
+ *ngIf="element.status === 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/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index 7e43e48..1c602d0 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -335,6 +335,12 @@ mat-dialog-container {
top: 49%;
}
+.disabled {
+ opacity: 0.4;
+ cursor: not-allowed;
+ pointer-events: none;
+}
+
@media screen and (max-width: 1280px) {
.modal-fullscreen {
max-width: 100vw !important;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org