[incubator-dlab] 14/29: [DLAB-635]: modify confirm action; update projects

[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 30673f07453c63bb488efaaa4cbaa4facb24680c
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Mon May 27 17:56:21 2019 +0300

    [DLAB-635]: modify confirm action; update projects
---
 .../project-form/project-form.component.html       |  4 +++-
 .../project/project-form/project-form.component.ts | 25 ++++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git 
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
 
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
index cef71f2..0ed97e1 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
+++ 
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
@@ -104,7 +104,9 @@
             <button mat-raised-button matStepperPrevious class="butt"><i
                 class="material-icons">keyboard_arrow_left</i>Back</button>
             <button mat-raised-button type="button" class="butt butt-success" 
[disabled]="!projectForm.valid"
-              (click)="createProject(projectForm.value)">Create</button>
+              (click)="confirm(projectForm.value)">
+              <span *ngIf="item; else update">Update</span><ng-template 
#update>Create</ng-template>
+            </button>
           </div>
         </div>
       </div>
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
index a16292d..996d3ac 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
- import { Component, OnInit, Input } from '@angular/core';
+ import { Component, OnInit, Input, Output, EventEmitter } from 
'@angular/core';
  import { FormGroup, FormBuilder, Validators } from '@angular/forms';
  import { ToastrService } from 'ngx-toastr';
 
@@ -37,6 +37,7 @@ export class ProjectFormComponent implements OnInit {
   public endpointsList: any = [];
 
   @Input() item: any;
+  @Output() update: EventEmitter<{}> = new EventEmitter();
 
   constructor(
     public toastr: ToastrService,
@@ -55,14 +56,20 @@ export class ProjectFormComponent implements OnInit {
     this.item && this.editSpecificProject(this.item);
   }
 
-  public createProject(data) {
-    console.log(data);
-
-    this.projectService.createProject(data).subscribe(response => {
-      response && this.toastr.success('Project created successfully!', 
'Success!');
-      this.projectDataService.updateProjects();
-      this.reset();
-    }, error => this.toastr.error(error.message || 'Project creation failed!', 
'Oops!'));
+  public confirm(data) {
+    if (this.item) {
+      this.projectService.updateProject(data).subscribe(() => {
+        this.toastr.success('Project creupdatedated successfully!', 
'Success!');
+        this.update.emit();
+      }, error => this.toastr.error(error.message || 'Project update failed!', 
'Oops!'));
+    } else {
+      this.projectService.createProject(data).subscribe(() => {
+        this.toastr.success('Project created successfully!', 'Success!');
+        this.projectDataService.updateProjects();
+        this.update.emit();
+        this.reset();
+      }, error => this.toastr.error(error.message || 'Project creation 
failed!', 'Oops!'));
+    }
   }
 
   public reset() {


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