[incubator-dlab] 09/19: [DLAB-834]: added new status states; filter pipe added

[an...@apache.org]

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 a1393e3526b19a589caf14ab74da2a12ae0f0bfb
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Jul 5 15:29:17 2019 +0300

    [DLAB-834]: added new status states; filter pipe added
---
 .../resources/webapp/src/app/administration/project/index.ts  |  4 +++-
 .../project/project-list/project-list.component.html          |  2 +-
 .../self-service/src/main/resources/webapp/src/styles.scss    | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
index 1c086d0..f03b47e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
@@ -23,6 +23,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { MaterialModule } from '../../shared/material.module';
 import { FormControlsModule } from '../../shared/form-controls';
+import { UnderscorelessPipeModule } from '../../core/pipes/underscoreless-pipe';
 
 import { ProjectFormComponent } from './project-form/project-form.component';
 import { ProjectListComponent } from './project-list/project-list.component';
@@ -36,7 +37,8 @@ import { ProjectDataService } from './project-data.service';
     FormsModule,
     ReactiveFormsModule,
     MaterialModule,
-    FormControlsModule
+    FormControlsModule,
+    UnderscorelessPipeModule
   ],
   declarations: [ProjectComponent, EditProjectComponent, ProjectFormComponent, ProjectListComponent],
   entryComponents: [EditProjectComponent],
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
index 716ea88..449d0f8 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
@@ -35,7 +35,7 @@
   <ng-container matColumnDef="status">
     <th mat-header-cell *matHeaderCellDef class="status"> Status </th>
     <td mat-cell *matCellDef="let element" class="status" ngClass="{{ element.status.toLowerCase() || '' }}">
-      {{ element.status.toLowerCase() }}
+      {{ element.status.toLowerCase() | underscoreless }}
     </td>
   </ng-container>
 
diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss
index 5b72b0f..923e384 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -105,12 +105,15 @@ mat-chip.mat-chip strong {
 .running,
 .starting,
 .installed,
-.active {
+.active,
+.activating {
   color: #49af38;
 }
 
 .stopped,
-.stopping {
+.stopping,
+.deactivating,
+.not_active {
   color: #f7b500;
 }
 
@@ -125,7 +128,9 @@ mat-chip.mat-chip strong {
 
 .terminated,
 .terminating,
-.failed {
+.failed,
+.deleting,
+.deleted {
   color: #f1696e;
 }
 


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