From 96894f4ca45704ba5f0f00a8e050bd198ebbb7c7 Mon Sep 17 00:00:00 2001
From: amentis <amentis@cite.gr>
Date: Tue, 30 Apr 2024 15:59:26 +0300
Subject: [PATCH] ui can create new version if dmp version status is current

---
 dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts  | 1 +
 .../ui/dmp/listing/listing-item/dmp-listing-item.component.ts | 3 ++-
 .../src/app/ui/dmp/overview/dmp-overview.component.ts         | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
index 50cfefde4..772a42fd9 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
@@ -185,6 +185,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit { //IBr
 				nameof<Dmp>(x => x.status),
 				nameof<Dmp>(x => x.accessType),
 				nameof<Dmp>(x => x.version),
+				nameof<Dmp>(x => x.versionStatus),
 				nameof<Dmp>(x => x.groupId),
 				nameof<Dmp>(x => x.updatedAt),
 				nameof<Dmp>(x => x.belongsToCurrentTenant),
diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
index ffb50dca0..d5a19d0e0 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
@@ -28,6 +28,7 @@ import { DmpInvitationDialogComponent } from '../../invitation/dialog/dmp-invita
 import { NewVersionDmpDialogComponent } from '../../new-version-dialog/dmp-new-version-dialog.component';
 import { AppPermission } from '@app/core/common/enum/permission.enum';
 import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type';
+import { DmpVersionStatus } from '@app/core/common/enum/dmp-version-status';
 
 @Component({
 	selector: 'app-dmp-listing-item-component',
@@ -224,7 +225,7 @@ export class DmpListingItemComponent extends BaseComponent implements OnInit {
 	}
 
 	canCreateNewVersion(dmp: Dmp): boolean {
-		return (this.dmp.authorizationFlags?.some(x => x === AppPermission.CreateNewVersionDmp) || this.authentication.hasPermission(AppPermission.CreateNewVersionDmp)) && this.isPublic == false &&  this.dmp.belongsToCurrentTenant != false;
+		return (this.dmp.authorizationFlags?.some(x => x === AppPermission.CreateNewVersionDmp) || this.authentication.hasPermission(AppPermission.CreateNewVersionDmp)) && this.dmp.versionStatus === DmpVersionStatus.Current && this.isPublic == false &&  this.dmp.belongsToCurrentTenant != false;
 	}
 
 	canDeleteDmp(dmp: Dmp): boolean {
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 1c7c3f324..3e081a54e 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
@@ -47,6 +47,7 @@ import { IsActive } from '@app/core/common/enum/is-active.enum';
 import { DmpFinalizeDialogComponent, DmpFinalizeDialogOutput } from '../dmp-finalize-dialog/dmp-finalize-dialog.component';
 import { DmpEditorResolver } from '../dmp-editor-blueprint/dmp-editor.resolver';
 import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type';
+import { DmpVersionStatus } from '@app/core/common/enum/dmp-version-status';
 
 @Component({
 	selector: 'app-dmp-overview',
@@ -218,7 +219,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 	}
 
 	canCreateNewVersion(): boolean {
-		return (this.dmp.authorizationFlags?.some(x => x === AppPermission.CreateNewVersionDmp) || this.authentication.hasPermission(AppPermission.CreateNewVersionDmp)) && this.isPublicView == false &&  this.dmp.belongsToCurrentTenant != false;
+		return (this.dmp.authorizationFlags?.some(x => x === AppPermission.CreateNewVersionDmp) || this.authentication.hasPermission(AppPermission.CreateNewVersionDmp)) && this.dmp.versionStatus === DmpVersionStatus.Current && this.isPublicView == false &&  this.dmp.belongsToCurrentTenant != false;
 	}
 
 	canDeleteDmp(): boolean {
@@ -728,6 +729,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 			nameof<Dmp>(x => x.status),
 			nameof<Dmp>(x => x.accessType),
 			nameof<Dmp>(x => x.version),
+			nameof<Dmp>(x => x.versionStatus),
 			nameof<Dmp>(x => x.groupId),
 			nameof<Dmp>(x => x.version),
 			nameof<Dmp>(x => x.updatedAt),