[incubator-dlab] branch odahu-integration updated: Fixed style bugs, added status to odahu-detail dialog

[dgnatyshyn]

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 b12bfe2  Fixed style bugs, added status to odahu-detail dialog
b12bfe2 is described below

commit b12bfe2566b8cb90bd02c04a1b7043ad4a1e4413
Author: Dmytro Gnatyshyn <di1...@ukr.net>
AuthorDate: Fri Mar 6 12:24:22 2020 +0200

    Fixed style bugs, added status to odahu-detail dialog
---
 .../detail-dialog/detail-dialog.component.html           | 16 ++++++++++++++--
 .../odahu-action-dialog/odahu-action-dialog.component.ts |  9 ++++++++-
 .../resources/webapp/src/assets/styles/_dialogs.scss     |  2 +-
 3 files changed, 23 insertions(+), 4 deletions(-)

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 86ab42a..5902d27 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
@@ -18,11 +18,23 @@
   -->
 
 <div class="detail-dialog" id="dialog-box">
-  <header class="dialog-header " [ngClass]="{'header-white': data.notebook}">
-    <h4 *ngIf="data.legion" class="modal-title" >Odahu cluster</h4>
+  <header class="dialog-header header-white" >
     <button type="button" class="close" 
(click)="dialogRef.close()">&times;</button>
   </header>
   <div class="dialog-content">
+    <div *ngIf="data.legion">
+      <table class="detail-header">
+        <tr>
+          <td>{{legion.name}}</td>
+          <td>
+            <span class="status" ngClass="{{legion.status || ''}}">
+              {{legion.status}}
+            </span>
+          </td>
+          <td>{{legion.shape}}</td>
+        </tr>
+      </table>
+    </div>
     <div *ngIf="data.notebook">
       <table class="detail-header">
         <tr>
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/odahu-action-dialog/odahu-action-dialog.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/odahu-action-dialog/odahu-action-dialog.component.ts
index 3ead81e..01eedb6 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/odahu-action-dialog/odahu-action-dialog.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/odahu-action-dialog/odahu-action-dialog.component.ts
@@ -11,7 +11,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from 
'@angular/material/dialog';
       <button type="button" class="close" 
(click)="dialogRef.close()">&times;</button>
     </header>
       <div mat-dialog-content class="content message mat-dialog-content">
-          <h3 class="strong">Odahu cluster {{data.item.name}} will be 
{{data.type}}</h3>
+          <h3>Odahu cluster <span class="strong">{{data.item.name}} 
</span>will be {{label[data.type]}}</h3>
       <p class="m-top-20 action-text"><span class="strong">Do you want to 
proceed?</span></p>
 
       <div class="text-center m-top-30 m-bott-30">
@@ -25,6 +25,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from 
'@angular/material/dialog';
     .content { color: #718ba6; padding: 20px 50px; font-size: 14px; 
font-weight: 400; margin: 0; }
     .info .confirm-dialog { color: #607D8B; }
     header { display: flex; justify-content: space-between; color: #607D8B; }
+    h3 { font-weight: 300; }
     header h4 i { vertical-align: bottom; }
     header a i { font-size: 20px; }
     header a:hover i { color: #35afd5; cursor: pointer; }
@@ -36,6 +37,12 @@ import { MatDialogRef, MAT_DIALOG_DATA } from 
'@angular/material/dialog';
 })
 
 export class OdahuActionDialogComponent {
+  private label = {
+    stop: 'stopped',
+    start: 'started',
+    terminate: 'terminated',
+  };
+
   constructor(
     public dialogRef: MatDialogRef<OdahuActionDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public data: any) {
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 f1fa89f..7e43e48 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
@@ -268,7 +268,7 @@ mat-dialog-container {
     }
   }
 
-  span {
+  span:not(.description) {
     font-size: 14px;
     overflow: hidden;
     text-overflow: ellipsis;


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