From 6e767f1e5e6b3f1a16a74cf1f379e31412743e0c Mon Sep 17 00:00:00 2001
From: Thomas Georgios Giannos <thgiannos@cite.gr>
Date: Wed, 7 Feb 2024 17:13:13 +0200
Subject: [PATCH] Added all versions listing on dmp blueprints, actions menu on
 that listing not yet functional

---
 .../query/lookup/DmpBlueprintLookup.java      | 39 +++++++++++++------
 .../dmpblueprint/DmpBlueprintServiceImpl.java |  2 +-
 .../core/model/dmp-blueprint/dmp-blueprint.ts |  1 +
 .../app/core/query/dmp-blueprint.lookup.ts    |  1 +
 .../dmp-blueprint/dmp-blueprint.routing.ts    | 10 ++++-
 .../editor/dmp-blueprint-editor.component.ts  |  8 +++-
 .../dmp-blueprint-listing.component.html      | 14 ++++---
 .../dmp-blueprint-listing.component.ts        |  4 ++
 dmp-frontend/src/assets/i18n/en.json          |  3 +-
 9 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpBlueprintLookup.java b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpBlueprintLookup.java
index c51eb4a6f..0301f27a3 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpBlueprintLookup.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DmpBlueprintLookup.java
@@ -21,6 +21,8 @@ public class DmpBlueprintLookup extends Lookup {
 
     private List<UUID> excludedIds;
 
+    private List<UUID> groupIds;
+
     public String getLike() {
         return like;
     }
@@ -37,6 +39,14 @@ public class DmpBlueprintLookup extends Lookup {
         this.isActive = isActive;
     }
 
+    public List<DmpBlueprintStatus> getStatuses() {
+        return statuses;
+    }
+
+    public void setStatuses(List<DmpBlueprintStatus> statuses) {
+        this.statuses = statuses;
+    }
+
     public List<UUID> getIds() {
         return ids;
     }
@@ -49,25 +59,32 @@ public class DmpBlueprintLookup extends Lookup {
         return excludedIds;
     }
 
-    public void setExcludedIds(List<UUID> excludeIds) {
-        this.excludedIds = excludeIds;
+    public void setExcludedIds(List<UUID> excludedIds) {
+        this.excludedIds = excludedIds;
     }
 
-    public List<DmpBlueprintStatus> getStatuses() {
-        return statuses;
+    public List<UUID> getGroupIds() {
+        return groupIds;
     }
 
-    public void setStatuses(List<DmpBlueprintStatus> statuses) {
-        this.statuses = statuses;
+    public void setGroupIds(List<UUID> groupIds) {
+        this.groupIds = groupIds;
     }
 
     public DmpBlueprintQuery enrich(QueryFactory queryFactory) {
         DmpBlueprintQuery query = queryFactory.query(DmpBlueprintQuery.class);
-        if (this.like != null) query.like(this.like);
-        if (this.isActive != null) query.isActive(this.isActive);
-        if (this.statuses != null) query.statuses(this.statuses);
-        if (this.ids != null) query.ids(this.ids);
-        if (this.excludedIds != null) query.excludedIds(this.excludedIds);
+        if (this.like != null)
+            query.like(this.like);
+        if (this.isActive != null)
+            query.isActive(this.isActive);
+        if (this.statuses != null)
+            query.statuses(this.statuses);
+        if (this.ids != null)
+            query.ids(this.ids);
+        if (this.excludedIds != null)
+            query.excludedIds(this.excludedIds);
+        if (this.groupIds != null)
+            query.groupIds(this.groupIds);
 
         this.enrichCommon(query);
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java
index a12ea362f..0ce353028 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java
@@ -407,7 +407,7 @@ public class DmpBlueprintServiceImpl implements DmpBlueprintService {
         DmpBlueprintEntity data = new DmpBlueprintEntity();
         data.setId(UUID.randomUUID());
         data.setLabel(model.getLabel());
-        data.setStatus(model.getStatus());
+        data.setStatus(DmpBlueprintStatus.Draft);
         data.setDefinition(this.xmlHandlingService.toXml(this.buildDefinitionEntity(model.getDefinition())));
         data.setGroupId(oldDmpBlueprintEntity.getGroupId());
         data.setVersion((short) (oldDmpBlueprintEntity.getVersion() + 1));
diff --git a/dmp-frontend/src/app/core/model/dmp-blueprint/dmp-blueprint.ts b/dmp-frontend/src/app/core/model/dmp-blueprint/dmp-blueprint.ts
index ff758e018..2fd5249f2 100644
--- a/dmp-frontend/src/app/core/model/dmp-blueprint/dmp-blueprint.ts
+++ b/dmp-frontend/src/app/core/model/dmp-blueprint/dmp-blueprint.ts
@@ -11,6 +11,7 @@ export interface DmpBlueprint extends BaseEntity {
 	definition: DmpBlueprintDefinition;
 	status: DmpBlueprintStatus;
 	version: number;
+	groupId: Guid;
 }
 
 export interface DmpBlueprintDefinition {
diff --git a/dmp-frontend/src/app/core/query/dmp-blueprint.lookup.ts b/dmp-frontend/src/app/core/query/dmp-blueprint.lookup.ts
index 3c18352ae..d32697e59 100644
--- a/dmp-frontend/src/app/core/query/dmp-blueprint.lookup.ts
+++ b/dmp-frontend/src/app/core/query/dmp-blueprint.lookup.ts
@@ -9,6 +9,7 @@ export class DmpBlueprintLookup extends Lookup implements DmpBlueprintFilter {
 	like: string;
 	isActive: IsActive[];
 	statuses: DmpBlueprintStatus[];
+	groupIds: Guid[];
 
 	constructor() {
 		super();
diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/dmp-blueprint.routing.ts b/dmp-frontend/src/app/ui/admin/dmp-blueprint/dmp-blueprint.routing.ts
index 80b6d697a..227789766 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/dmp-blueprint.routing.ts
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/dmp-blueprint.routing.ts
@@ -14,6 +14,14 @@ const routes: Routes = [
 		component: DmpBlueprintListingComponent,
 		canActivate: [AuthGuard]
 	},
+	{
+		path: 'versions/:groupid',
+		component: DmpBlueprintListingComponent,
+		canActivate: [AuthGuard],
+		data: {
+			mode: 'versions-listing'
+		}
+	},
 	{
 		path: 'new',
 		canActivate: [AuthGuard],
@@ -45,7 +53,6 @@ const routes: Routes = [
 			},
 			action: 'clone'
 		}
-
 	},
 	{
 		path: 'new-version/:newversionid',
@@ -64,7 +71,6 @@ const routes: Routes = [
 			},
 			action: 'new-version'
 		}
-
 	},
 	{
 		path: ':id',
diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts
index 9daa3d09b..ab7c183ed 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.ts
@@ -84,7 +84,7 @@ export class DmpBlueprintEditorComponent extends BaseEditor<DmpBlueprintEditorMo
 	}
 
 	protected get canFinalize(): boolean {
-		return !this.isDeleted && this.hasPermission(this.authService.permissionEnum.EditDmpBlueprint);
+		return !this.isNewVersion && !this.isDeleted && this.hasPermission(this.authService.permissionEnum.EditDmpBlueprint);
 	}
 
 	protected get canCreateNewVersion(): boolean {
@@ -171,9 +171,13 @@ export class DmpBlueprintEditorComponent extends BaseEditor<DmpBlueprintEditorMo
 		this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !this.authService.hasPermission(AppPermission.EditDmpBlueprint));
 		this.selectedSystemFields = this.selectedSystemFieldDisabled();
 		this.dmpBlueprintEditorService.setValidationErrorModel(this.editorModel.validationErrorModel);
-		if (this.editorModel.status == DmpBlueprintStatus.Finalized || this.isDeleted) {
+		if (this.isFinalized || this.isDeleted) {
 			this.formGroup.disable();
 		}
+		const action = this.route.snapshot.data['action'];
+		if (action && action == 'new-version') {
+			this.formGroup.enable();
+		}
 	}
 
 	refreshData(id?: Guid): void {
diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html
index 2d687c529..a8807adfe 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.html
@@ -23,7 +23,7 @@
 			</div>
 		</div>
 
-		<app-hybrid-listing [rows]="gridRows" [columns]="gridColumns" [visibleColumns]="visibleColumns" [count]="totalElements" [offset]="currentPageNumber" [limit]="lookup.page.size" [defaultSort]="lookup.order?.items" [externalSorting]="true" (rowActivated)="onRowActivated($event)" (pageLoad)="alterPage($event)" (columnSort)="onColumnSort($event)" (columnsChanged)="onColumnsChanged($event)" [listItemTemplate]="listItemTemplate">
+		<app-hybrid-listing [rows]="gridRows" [columns]="gridColumns" [visibleColumns]="visibleColumns" [count]="totalElements" [offset]="currentPageNumber" [limit]="lookup.page.size" [defaultSort]="lookup.order?.items" [externalSorting]="true" (rowActivated)="onRowActivated($event, '/dmp-blueprints')" (pageLoad)="alterPage($event)" (columnSort)="onColumnSort($event)" (columnsChanged)="onColumnsChanged($event)" [listItemTemplate]="listItemTemplate">
 
 			<app-dmp-blueprint-listing-filters hybrid-listing-filters [(filter)]="lookup" (filterChange)="filterChanged($event)" />
 
@@ -90,16 +90,20 @@
 				<mat-icon>more_horiz</mat-icon>
 			</button>
 			<mat-menu #actionsMenu="matMenu">
-				<button mat-menu-item [routerLink]="['./' + row.id]">
+				<button mat-menu-item [routerLink]="[row.id]">
 					<mat-icon>edit</mat-icon>{{'DMP-BLUEPRINT-LISTING.ACTIONS.EDIT' | translate}}
 				</button>
-				<button mat-menu-item [routerLink]="['./new-version/' + row.id]">
+				<button mat-menu-item [routerLink]="['new-version' , row.id]">
 					<mat-icon>queue</mat-icon>{{'DMP-BLUEPRINT-LISTING.ACTIONS.NEW-VERSION' | translate}}
 				</button>
-				<button mat-menu-item [routerLink]="['./clone/' + row.id]">
+				<button mat-menu-item [routerLink]="['clone' , row.id]">
 					<mat-icon>content_copy</mat-icon>{{'DMP-BLUEPRINT-LISTING.ACTIONS.CLONE' | translate}}
 				</button>
-				<button mat-menu-item (click)="export(row.id)" [routerLink]="['./' + row.id]">
+				<button mat-menu-item [routerLink]="['versions' , row.groupId]">
+					<mat-icon>library_books</mat-icon>
+					{{'DMP-BLUEPRINT-LISTING.ACTIONS.VIEW-VERSIONS' | translate}}
+				</button>
+				<button mat-menu-item (click)="export(row.id)" [routerLink]="[row.id]">
 					<mat-icon>download</mat-icon>{{'DMP-BLUEPRINT-LISTING.ACTIONS.DOWNLOAD-XML' | translate}}
 				</button>
 				<button mat-menu-item (click)="delete(row.id)">
diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts
index 8217ebe8e..05f33d4f7 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/listing/dmp-blueprint-listing.component.ts
@@ -40,6 +40,7 @@ export class DmpBlueprintListingComponent extends BaseListingComponent<DmpBluepr
 	userSettingsKey = { key: 'DmpBlueprintListingUserSettings' };
 	propertiesAvailableForOrder: ColumnDefinition[];
 	dmpBlueprintStatuses = DmpBlueprintStatus;
+	mode;
 
 	@ViewChild('dmpBlueprintStatus', { static: true }) dmpBlueprintStatus?: TemplateRef<any>;
 	@ViewChild('actions', { static: true }) actions?: TemplateRef<any>;
@@ -50,6 +51,7 @@ export class DmpBlueprintListingComponent extends BaseListingComponent<DmpBluepr
 		nameof<DmpBlueprint>(x => x.label),
 		nameof<DmpBlueprint>(x => x.status),
 		nameof<DmpBlueprint>(x => x.version),
+		nameof<DmpBlueprint>(x => x.groupId),
 		nameof<DmpBlueprint>(x => x.updatedAt),
 		nameof<DmpBlueprint>(x => x.createdAt),
 		nameof<DmpBlueprint>(x => x.hash),
@@ -76,6 +78,7 @@ export class DmpBlueprintListingComponent extends BaseListingComponent<DmpBluepr
 		super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
 		// Lookup setup
 		// Default lookup values are defined in the user settings class.
+		this.mode = this.route.snapshot?.data['mode'];
 		this.lookup = this.initializeLookup();
 	}
 
@@ -90,6 +93,7 @@ export class DmpBlueprintListingComponent extends BaseListingComponent<DmpBluepr
 		lookup.page = { offset: 0, size: this.ITEMS_PER_PAGE };
 		lookup.isActive = [IsActive.Active];
 		lookup.order = { items: [this.toDescSortField(nameof<DmpBlueprint>(x => x.createdAt))] };
+		if (this.mode && this.mode == 'versions-listing') lookup.groupIds = [Guid.parse(this.route.snapshot.paramMap.get('groupid'))]
 		this.updateOrderUiFields(lookup.order);
 
 		lookup.project = {
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index be2dddbe1..5115499db 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -1923,7 +1923,8 @@
 			"EDIT": "Edit",
 			"CLONE": "Clone",
 			"NEW-VERSION": "New Version",
-			"DOWNLOAD-XML": "Download XML"
+			"DOWNLOAD-XML": "Download XML",
+			"VIEW-VERSIONS": "All Dmp Blueprint Versions"
 		},
 		"IMPORT": {
 			"UPLOAD-XML": "Import",