[incubator-dlab] 15/29: [DLAB-635]: added grid refresh; apply after confirmations

[ankovalyshyn]

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 4e220cb1df2afdae678bb0bee177ee2cf806b15d
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Mon May 27 17:57:41 2019 +0300

    [DLAB-635]: added grid refresh; apply after confirmations
---
 .../webapp/src/app/administration/project/project.component.html   | 2 +-
 .../webapp/src/app/administration/project/project.component.ts     | 6 +++---
 .../src/main/resources/webapp/src/assets/styles/_theme.scss        | 7 +++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git 
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
 
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
index 9e46186..956e1d7 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
+++ 
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
@@ -25,7 +25,7 @@
     </button>
   </div>
   <div>
-    <button mat-raised-button class="butt" (click)="refreshGrid()" 
*ngIf="projects?.lenght > 1">
+    <button mat-raised-button class="butt" (click)="refreshGrid()" 
[hidden]="projects?.lenght < 1">
       <i class="material-icons">autorenew</i>Refresh
     </button>
   </div>
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
index 5abeabc..59824b9 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
@@ -83,14 +83,14 @@ export class ProjectComponent implements OnInit, OnDestroy {
   public editProject($event) {
     this.dialog.open(EditProjectComponent, { data: { action: 'edit', item: 
$event }, panelClass: 'modal-xl-s' })
       .afterClosed().subscribe(() => {
-        console.log('Update project');
+        this.refreshGrid();
       });
   }
 
   public deleteProject($event) {
     this.dialog.open(NotificationDialogComponent, { data: { type: 
'confirmation', item: $event }, panelClass: 'modal-sm' })
       .afterClosed().subscribe(result => {
-        this.projectService.deleteProject($event.name).subscribe(() => {
+        result && this.projectService.deleteProject($event.name).subscribe(() 
=> {
           this.refreshGrid();
         });
       });
@@ -114,7 +114,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
         <button type="button" class="close" 
(click)="dialogRef.close()">&times;</button>
       </div>
       <div mat-dialog-content class="content project-form">
-        <project-form [item]="data.item"></project-form>
+        <project-form [item]="data.item" 
(update)="dialogRef.close(true)"></project-form>
       </div>
     </div>
   `,
diff --git 
a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss 
b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index a298d0d..434e325 100644
--- 
a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ 
b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -56,6 +56,12 @@
         width: 80px;
       }
     }
+    &.butt-create {
+      color: #35afd5;
+      &:disabled{
+        color: #577289!important;
+      }
+    }
     &:disabled {
       cursor: not-allowed;
       opacity: 0.6;
@@ -106,6 +112,7 @@
     display: inline-block;
     width: 50%;
     padding: 0 15px;
+    text-align: center;
     vertical-align: middle;
     color: #575757;
     cursor: pointer;


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