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


The following commit(s) were added to refs/heads/odahu-integration by this push:
     new 4e22de2  [DLAB-384]: Prevented terminate Odahu cluster in stopped 
status
4e22de2 is described below

commit 4e22de2f438d4524b31232650174b354e8333fe3
Author: Dmytro Gnatyshyn <[email protected]>
AuthorDate: Tue Mar 10 16:37:37 2020 +0200

    [DLAB-384]: Prevented terminate Odahu cluster in stopped status
---
 .../legion-deployment/legion-list/legion-list.component.html        | 2 +-
 .../exploratory/detail-dialog/detail-dialog.component.scss          | 2 ++
 .../src/app/resources/resources-grid/resources-grid.component.html  | 6 ++++--
 3 files changed, 7 insertions(+), 3 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 43aa274..71314a3 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
@@ -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' && element.status !== 
'STOPPED' && element.status !== 'STOPPING'" (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.scss
 
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
index 94c8384..9d0f775 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
@@ -26,6 +26,8 @@
 }
 
 .links_block {
+  max-height: 300px;
+  overflow-y: auto;
   .odahu-links:not(:last-child){
     margin-bottom: 20px;
   }
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 70ceb8b..6da480a 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
@@ -147,7 +147,9 @@
             <span #settings (click)="actions.toggle($event, settings)" 
class="actions"
               [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.image === 'docker.dlab-jupyterlab' && element.status 
!== 'running' && element.status !== 'stopped')
+              ||  element.status.toLowerCase() === 'stopping'
+              }">
             </span>
 
             <bubble-up #actions class="list-menu" position="bottom-left" 
alternative="top-left">
@@ -226,7 +228,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' && element.status !== 
'stopped' && element.status !== 'stopping'" (click)="odahuAction(element, 
'terminate')">
                   <i class="material-icons">phonelink_off</i>
                   <a class="action">
                     Terminate


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to