From 9159ba2d9b46a768e7d058f3f5d7fb3bdb1b4b4e Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Wed, 29 May 2019 12:34:27 +0300
Subject: [PATCH] Bug fixed on remove collaborator

---
 .../ui/dmp/editor/dmp-editor.component.html   |  2 +-
 .../people-tab/people-tab.component.html      |  6 ++---
 .../editor/people-tab/people-tab.component.ts | 25 +++++++++----------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
index 0e6c3c0ea..bc0fc9549 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html
@@ -62,7 +62,7 @@
 								<mat-icon class="mr-2">person</mat-icon>
 								{{ 'DMP-LISTING.COLUMNS.PEOPLE' | translate }}
 							</ng-template>
-							<app-people-tab [people]="people" [dmp]="dmp"></app-people-tab>
+							<app-people-tab [formGroup]="formGroup" [dmp]="dmp"></app-people-tab>
 						</mat-tab>
 						<!-- <mat-tab>
 							<ng-template mat-tab-label>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.html b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.html
index dcf94bf43..46b53eacb 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.html
+++ b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.html
@@ -3,19 +3,19 @@
 		<div class="col-12 pt-4 pb-4 pl-4">
 			<div class="table-header col-auto d-flex">
 				<span class="table-title">Collaborators</span>
-				<div class="table-action" (click)="openShareDialog(dmp.id,dmp.label)">
+				<div class="table-action" (click)="openShareDialog(dmp.id, dmp.label)">
 					<mat-icon>add</mat-icon><span>{{'DMP-LISTING.ACTIONS.INVITE' | translate}}</span>
 				</div>
 			</div>
 			<div class="table-container">
-				<table *ngIf="people">
+				<table *ngIf="formGroup.get('users')">
 					<tr>
 						<th>{{'USERS.LISTING.NAME' | translate}}</th>
 						<th>{{'USERS.LISTING.EMAIL' | translate}}</th>
 						<th>{{'USERS.LISTING.PERMISSIONS' | translate}}</th>
 						<th *ngIf="isOwner()"></th>
 					</tr>
-					<tr *ngFor="let user of people">
+					<tr *ngFor="let user of formGroup.get('users')?.value">
 						<td>{{user.name}}</td>
 						<td>{{user.email}}</td>
 						<td>{{roleDisplay(user)}}</td>
diff --git a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts
index a22574437..f92f11015 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts
@@ -1,14 +1,14 @@
-import { Component, OnInit, Input } from '@angular/core';
-import { UserModel } from '../../../../core/model/user/user';
-import { DmpEditorModel } from '../dmp-editor.model';
+import { Component, Input, OnInit } from '@angular/core';
+import { FormGroup } from '@angular/forms';
 import { MatDialog } from '@angular/material';
-import { DmpInvitationDialogComponent } from '../../invitation/dmp-invitation.component';
-import { UserInfoListingModel } from '../../../../core/model/user/user-info-listing';
 import { TranslateService } from '@ngx-translate/core';
 import { Principal } from '../../../../core/model/auth/Principal';
+import { UserInfoListingModel } from '../../../../core/model/user/user-info-listing';
 import { AuthService } from '../../../../core/services/auth/auth.service';
-import { ConfirmationDialogComponent } from '../../../../library/confirmation-dialog/confirmation-dialog.component';
 import { DmpService } from '../../../../core/services/dmp/dmp.service';
+import { ConfirmationDialogComponent } from '../../../../library/confirmation-dialog/confirmation-dialog.component';
+import { DmpInvitationDialogComponent } from '../../invitation/dmp-invitation.component';
+import { DmpEditorModel } from '../dmp-editor.model';
 
 @Component({
 	selector: 'app-people-tab',
@@ -17,9 +17,9 @@ import { DmpService } from '../../../../core/services/dmp/dmp.service';
 })
 export class PeopleTabComponent implements OnInit {
 
-	@Input() associatedUsers: Array<UserModel>;
-	@Input() people: Array<UserInfoListingModel>;
+	@Input() formGroup: FormGroup;
 	@Input() dmp: DmpEditorModel;
+
 	constructor(
 		private dialog: MatDialog,
 		private translate: TranslateService,
@@ -58,7 +58,7 @@ export class PeopleTabComponent implements OnInit {
 		const principal: Principal = this.authentication.current();
 		var isOwner: boolean = false;
 		if (principal) {
-			this.people.forEach(element => {
+			this.formGroup.get('users').value.forEach(element => {
 				if (principal.id === element.id && element.role === 0) {
 					isOwner = true;
 				}
@@ -78,11 +78,10 @@ export class PeopleTabComponent implements OnInit {
 		});
 		dialogRef.afterClosed().subscribe(result => {
 			if (result) {
-				this.people = this.people.filter(function(value, index, arr) {
-					return value.id !== id;
-				});
+				this.formGroup.get('users').setValue(this.formGroup.get('users').value.filter(function (val, index, arr) {
+					return val.id !== id;
+				}));
 			}
 		});
 	}
-
 }