You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/10 15:53:09 UTC

[incubator-dlab] 06/19: [DLAB-834]: added stop / start actions to project service

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 5482e33d235af08e3e3c3f1f7441b43a9fec2b7b
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Jul 5 14:21:19 2019 +0300

    [DLAB-834]: added stop / start actions to project service
---
 .../project/project-list/project-list.component.html       | 14 +++++++++-----
 .../project/project-list/project-list.component.scss       |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

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 01d858f..716ea88 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
@@ -56,19 +56,23 @@
           <mat-icon *ngIf="element.status === 'ACTIVE'" (click)="toggleProjectStatus(element, 'stop')">
             pause_circle_outline
           </mat-icon>
-          <mat-icon *ngIf="element.status === 'STOPPED'" (click)="toggleProjectStatus(element, 'start')">
+          <mat-icon *ngIf="element.status === 'NOT_ACTIVE'" (click)="toggleProjectStatus(element, 'start')">
             play_circle_outline
           </mat-icon>
         </a>
       </span>
-      <span [ngClass]="{'not-active' : element.status !== 'ACTIVE' }">
-        <a [ngClass]="{'not-allowed' : element.status !== 'ACTIVE' }"
+      <span [ngClass]="{'not-active' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' }">
+        <a [ngClass]="{'not-allowed' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' }"
           (click)="element.status === 'ACTIVE' && editProject(element)">
           <mat-icon>mode_edit</mat-icon>
         </a>
       </span>
-      <span (click)="deleteProject(element)">
-        <mat-icon>delete_forever</mat-icon>
+      <span
+        [ngClass]="{'not-active' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' && element.status !== 'FAILED' }">
+        <a [ngClass]="{'not-allowed' : element.status !== 'ACTIVE' && element.status !== 'NOT_ACTIVE' && element.status !== 'FAILED' }"
+          (click)="deleteProject(element)">
+          <mat-icon>delete_forever</mat-icon>
+        </a>
       </span>
     </td>
 
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss
index bd3ebdd..361d687 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.scss
@@ -41,7 +41,7 @@ table {
   .project-actions {
     color: #607d8b;
     width: 10%;
-    text-align: center;
+    text-align: right;
 
     span {
       transition: all .5s ease-in-out;


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