From dd0f158769973adcf578face5fa4d4d9f12a4a6e Mon Sep 17 00:00:00 2001
From: gpapavgeri <gpapavgeri@cite.gr>
Date: Thu, 9 Jul 2020 16:01:49 +0300
Subject: [PATCH] dmp&dataset overview: 'remove user from dmp' update

---
 .../ui/dataset/overview/dataset-overview.component.ts | 11 +++++------
 .../src/app/ui/dmp/overview/dmp-overview.component.ts | 11 ++++++++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
index 0f79504df..6e2d2d387 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
@@ -49,8 +49,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
   hasDOIToken = false;
   researchers: ResearcherModel[];
   users: UserInfoListingModel[];
-  lockStatus = false;
-  // lockStatus: Boolean;
+  lockStatus: Boolean;
 
   constructor(
     private route: ActivatedRoute,
@@ -92,7 +91,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
                 .subscribe(data => {
                   this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
                 });
-              // this.checkLockStatus(this.dataset.id);
+              this.checkLockStatus(this.dataset.id);
               this.setIsUserOwner();
               const breadCrumbs = [];
               breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS'), url: "/datasets" });
@@ -121,7 +120,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
                 .subscribe(data => {
                   this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
                 });
-              // this.checkLockStatus(this.dataset.id);
+              this.checkLockStatus(this.dataset.id);
               this.setIsUserOwner();
               const breadCrumbs = [];
               breadCrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC DATASETS'), url: "/explore" });
@@ -158,7 +157,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
     this.location.back();
   }
 
-  reloadComponent(): void {
+  reloadPage(): void {
     this.router.navigateByUrl('/datasets', { skipLocationChange: true }).then(() => {
       this.router.navigate([`/datasets/overview/${this.dataset.id}`]);
     });
@@ -394,7 +393,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
       .subscribe(
         complete => {
           this.onCallbackSuccess();
-          this.reloadComponent();
+          this.reloadPage();
         },
         error => this.onDeleteCallbackError(error)
       );
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index 945289876..9f556f060 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -577,10 +577,19 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		this.location.back();
 	}
 
+	reloadPage(): void {
+		this.router.navigateByUrl('/plans', { skipLocationChange: true }).then(() => {
+		  this.router.navigate([`/plans/overview/${this.dmp.id}`]);
+		});
+	  }
+
 	updateUsers() {
 		return this.dmpService.updateUsers(this.dmp.id, this.dmp.users).pipe(takeUntil(this._destroyed))
 			.subscribe(
-				complete => { this.onCallbackSuccess() },
+				complete => {
+					this.onCallbackSuccess();
+					this.reloadPage();
+				  },
 				error => this.onDeleteCallbackError(error)
 			);
 	}