From bb6037afba35742236222690a047e5793cb973da Mon Sep 17 00:00:00 2001
From: amentis <amentis@cite.gr>
Date: Wed, 6 Mar 2024 18:41:26 +0200
Subject: [PATCH] ui fixes

---
 .../recent-edited-activity.component.html     |  8 ++++----
 .../description-listing.component.html        | 10 +++++-----
 .../listing/description-listing.component.ts  | 20 ++++++++++++++++---
 .../description-overview.component.html       |  8 ++++----
 .../description-overview.component.ts         |  4 +++-
 .../ui/dmp/listing/dmp-listing.component.html | 10 +++++-----
 .../ui/dmp/listing/dmp-listing.component.ts   | 14 +++++++++++--
 .../dmp/overview/dmp-overview.component.html  |  8 ++++----
 .../ui/dmp/overview/dmp-overview.component.ts |  3 ++-
 9 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
index 2c61f0e17..304fabf50 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
@@ -7,10 +7,10 @@
 		<span class="d-flex align-items-center">{{'DMP-LISTING.SORT-BY' | translate}}:</span>
 		<mat-form-field appearance="outline" class="sort-form col-auto">
 			<mat-select placeholder="{{'CRITERIA.LIKE'| translate}}" [formControl]="formGroup.get('order')">
-				<mat-option *ngIf="!publicMode" [value]="order.MODIFIED">{{enumUtils.toRecentActivityOrderString(order.MODIFIED)}}</mat-option>
-				<mat-option *ngIf="publicMode" [value]="order.PUBLISHED">{{enumUtils.toRecentActivityOrderString(order.PUBLISHED)}}</mat-option>
-				<mat-option [value]="order.LABEL">{{enumUtils.toRecentActivityOrderString(order.LABEL)}}</mat-option>
-				<mat-option *ngIf="!publicMode" [value]="order.STATUS">{{enumUtils.toRecentActivityOrderString(order.STATUS)}}</mat-option>
+				<mat-option *ngIf="!publicMode" [value]="order.UpdatedAt">{{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}}</mat-option>
+				<!-- <mat-option *ngIf="publicMode" [value]="order.PUBLISHED">{{enumUtils.toRecentActivityOrderString(order.PUBLISHED)}}</mat-option> -->
+				<mat-option [value]="order.Label">{{enumUtils.toRecentActivityOrderString(order.Label)}}</mat-option>
+				<mat-option *ngIf="!publicMode" [value]="order.Status">{{enumUtils.toRecentActivityOrderString(order.Status)}}</mat-option>
 			</mat-select>
 		</mat-form-field>
 		<!-- End of Sort by -->
diff --git a/dmp-frontend/src/app/ui/description/listing/description-listing.component.html b/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
index 142839cc1..0a1dbb26b 100644
--- a/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
+++ b/dmp-frontend/src/app/ui/description/listing/description-listing.component.html
@@ -36,11 +36,11 @@
 						<!-- Sort by -->
 						<span class="d-flex align-items-center">{{'DMP-LISTING.SORT-BY' | translate}}:</span>
 						<mat-form-field class="sort-form col-auto pr-0">
-							<mat-select placeholder="{{'CRITERIA.LIKE'| translate}}" [formControl]="formGroup.get('order')">
-								<mat-option *ngIf="!isPublic" [value]="order.MODIFIED">{{enumUtils.toRecentActivityOrderString(order.MODIFIED)}}</mat-option>
-								<mat-option *ngIf="isPublic" [value]="order.DATASETPUBLISHED">{{enumUtils.toRecentActivityOrderString(order.DATASETPUBLISHED)}}</mat-option>
-								<mat-option [value]="order.LABEL">{{enumUtils.toRecentActivityOrderString(order.LABEL)}}</mat-option>
-								<mat-option *ngIf="!isPublic" [value]="order.STATUS">{{enumUtils.toRecentActivityOrderString(order.STATUS)}}</mat-option>
+							<mat-select placeholder="{{'CRITERIA.LIKE'| translate}}" [formControl]="formGroup.get('order')" (selectionChange)="orderByChanged()">
+								<mat-option *ngIf="!isPublic" [value]="order.UpdatedAt">{{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}}</mat-option>
+								<!-- <mat-option *ngIf="isPublic" [value]="order.DATASETPUBLISHED">{{enumUtils.toRecentActivityOrderString(order.DATASETPUBLISHED)}}</mat-option> -->
+								<mat-option [value]="order.Label">{{enumUtils.toRecentActivityOrderString(order.Label)}}</mat-option>
+								<mat-option *ngIf="!isPublic" [value]="order.Status">{{enumUtils.toRecentActivityOrderString(order.Status)}}</mat-option>
 								<!-- <mat-option [value]="order.CREATED">{{enumUtils.toRecentActivityOrderString(order.CREATED)}}</mat-option> -->
 							</mat-select>
 						</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts b/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts
index 72a774ca0..03669b475 100644
--- a/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts
+++ b/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts
@@ -11,7 +11,7 @@ import { IsActive } from '@app/core/common/enum/is-active.enum';
 import { RecentActivityOrder } from '@app/core/common/enum/recent-activity-order';
 import { DescriptionTemplate } from '@app/core/model/description-template/description-template';
 import { Description } from '@app/core/model/description/description';
-import { Dmp, DmpUser } from '@app/core/model/dmp/dmp';
+import { Dmp, DmpDescriptionTemplate, DmpUser } from '@app/core/model/dmp/dmp';
 import { DmpReference } from '@app/core/model/dmp/dmp-reference';
 import { FileFormat } from '@app/core/model/file/file-format.model';
 import { ReferenceType } from '@app/core/model/reference-type/reference-type';
@@ -94,8 +94,7 @@ export class DescriptionListingComponent extends BaseComponent implements OnInit
 			//TODO: refactor
 			// this.formGroup.get('order').setValue(this.order.DATASETPUBLISHED);
 		} else {
-			//TODO: refactor
-			// this.formGroup.get('order').setValue(this.order.MODIFIED);
+			this.formGroup.get('order').setValue(this.order.UpdatedAt);
 		}
 		if (!this.isPublic && !this.authService.currentAccountIsAuthenticated()) {
 			this.router.navigateByUrl("/explore");
@@ -179,6 +178,17 @@ export class DescriptionListingComponent extends BaseComponent implements OnInit
 		this.refresh(this.lookup);
 	}
 
+	orderByChanged(){
+		if (this.formGroup.get('order').value == RecentActivityOrder.Status){
+			this.lookup.order = { items: ['-' + nameof<Dmp>(x => x.status)] };
+		} else if(this.formGroup.get('order').value == RecentActivityOrder.Label){
+			this.lookup.order = { items: ['-' + nameof<Dmp>(x => x.label)] };
+		}else{
+			this.lookup.order = { items: ['-' + nameof<Dmp>(x => x.updatedAt)] };
+		}
+		this.refresh(this.lookup);
+	}
+
 	private refresh(lookup: DescriptionLookup) {
 		lookup.project = {
 			fields: [
@@ -200,6 +210,10 @@ export class DescriptionListingComponent extends BaseComponent implements OnInit
 				[nameof<Description>(x => x.dmp), nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.label)].join('.'),
 				[nameof<Description>(x => x.dmp), nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.type), nameof<ReferenceType>(x => x.id)].join('.'),
 				[nameof<Description>(x => x.dmp), nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.reference)].join('.'),
+				[nameof<Description>(x => x.dmpDescriptionTemplate), nameof<DmpDescriptionTemplate>(x => x.id)].join('.'),
+				[nameof<Description>(x => x.dmpDescriptionTemplate), nameof<DmpDescriptionTemplate>(x => x.dmp), nameof<Dmp>(x => x.id)].join('.'),
+				[nameof<Description>(x => x.dmpDescriptionTemplate), nameof<DmpDescriptionTemplate>(x => x.descriptionTemplateGroupId)].join('.'),
+				[nameof<Description>(x => x.dmpDescriptionTemplate), nameof<DmpDescriptionTemplate>(x => x.sectionId)].join('.'),
 			]
 		};
 		this.descriptionService.query(lookup).pipe(takeUntil(this._destroyed))
diff --git a/dmp-frontend/src/app/ui/description/overview/description-overview.component.html b/dmp-frontend/src/app/ui/description/overview/description-overview.component.html
index 28ee57bbe..b9bc503ac 100644
--- a/dmp-frontend/src/app/ui/description/overview/description-overview.component.html
+++ b/dmp-frontend/src/app/ui/description/overview/description-overview.component.html
@@ -70,13 +70,13 @@
 							<span *ngIf="isOrcid(dmpReference.reference)">
 								<a href="{{ getOrcidPathForResearcher(dmpReference.reference?.reference) }}" target="blank" class="researcher">
 									<div class="id-btn">&nbsp;</div>
-									<div *ngIf="!last">{{ dmpReference.reference?.data?.name }}, </div> <!-- TODO: data is missign after refactor -->
-									<div *ngIf="last">{{ dmpReference.reference?.data?.name }}</div><!-- TODO: data is missign after refactor -->
+									<div *ngIf="!last">{{ dmpReference.reference?.label }}, </div>
+									<div *ngIf="last">{{ dmpReference.reference?.label }}</div>
 								</a>
 							</span>
 							<span *ngIf="!isOrcid(dmpReference.reference)">
-								<div *ngIf="!last">{{ dmpReference.reference?.data?.name }}, </div> <!-- TODO: data is missign after refactor -->
-								<div *ngIf="last">{{ dmpReference.reference?.data?.name }}</div> <!-- TODO: data is missign after refactor -->
+								<div *ngIf="!last">{{ dmpReference.reference?.label }}, </div>
+								<div *ngIf="last">{{ dmpReference.reference?.label }}</div>
 							</span>
 						</div>
 						<span *ngIf="!researchers || researchers.length === 0" class="material-icons">horizontal_rule</span>
diff --git a/dmp-frontend/src/app/ui/description/overview/description-overview.component.ts b/dmp-frontend/src/app/ui/description/overview/description-overview.component.ts
index 5fc270e5a..91780c67a 100644
--- a/dmp-frontend/src/app/ui/description/overview/description-overview.component.ts
+++ b/dmp-frontend/src/app/ui/description/overview/description-overview.component.ts
@@ -32,6 +32,7 @@ import * as FileSaver from 'file-saver';
 import { filter, takeUntil } from 'rxjs/operators';
 import { nameof } from 'ts-simple-nameof';
 import { DescriptionCopyDialogComponent } from '../description-copy-dialog/description-copy-dialog.component';
+import { ReferenceType } from '@app/core/model/reference-type/reference-type';
 
 
 @Component({
@@ -431,6 +432,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
 		return [
 			nameof<Description>(x => x.id),
 			nameof<Description>(x => x.label),
+			nameof<Description>(x => x.description),
 			nameof<Description>(x => x.status),
 			nameof<Description>(x => x.updatedAt),
 			[nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.id)].join('.'),
@@ -446,7 +448,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
 			[nameof<Description>(x => x.dmp), nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.id)].join('.'),
 			[nameof<Description>(x => x.dmp), nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.id)].join('.'),
 			[nameof<Description>(x => x.dmp), nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.label)].join('.'),
-			[nameof<Description>(x => x.dmp), nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.type)].join('.'),
+			[nameof<Description>(x => x.dmp), nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.type), nameof<ReferenceType>(x => x.id)].join('.'),
 			[nameof<Description>(x => x.dmp), nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.source)].join('.'),
 			[nameof<Description>(x => x.dmp), nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.reference)].join('.'),
 		]
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
index 71cd988bb..c98990db9 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.html
@@ -25,11 +25,11 @@
 						<!-- Sort by -->
 						<span class="d-flex align-items-center">{{'DMP-LISTING.SORT-BY' | translate}}:</span>
 						<mat-form-field class="sort-form col-auto">
-							<mat-select placeholder="{{'CRITERIA.LIKE'| translate}}" [formControl]="formGroup.get('order')">
-								<mat-option *ngIf="!isPublic" [value]="order.MODIFIED">{{enumUtils.toRecentActivityOrderString(order.MODIFIED)}}</mat-option>
-								<mat-option *ngIf="isPublic" [value]="order.PUBLISHED">{{enumUtils.toRecentActivityOrderString(order.PUBLISHED)}}</mat-option>
-								<mat-option [value]="order.LABEL">{{enumUtils.toRecentActivityOrderString(order.LABEL)}}</mat-option>
-								<mat-option *ngIf="!isPublic" [value]="order.STATUS">{{enumUtils.toRecentActivityOrderString(order.STATUS)}}</mat-option>
+							<mat-select placeholder="{{'CRITERIA.LIKE'| translate}}" [formControl]="formGroup.get('order')" (selectionChange)="orderByChanged()">
+								<mat-option *ngIf="!isPublic" [value]="order.UpdatedAt">{{enumUtils.toRecentActivityOrderString(order.UpdatedAt)}}</mat-option>
+								<!-- <mat-option *ngIf="isPublic" [value]="order.PUBLISHED">{{enumUtils.toRecentActivityOrderString(order.PUBLISHED)}}</mat-option> -->
+								<mat-option [value]="order.Label">{{enumUtils.toRecentActivityOrderString(order.Label)}}</mat-option>
+								<mat-option *ngIf="!isPublic" [value]="order.Status">{{enumUtils.toRecentActivityOrderString(order.Status)}}</mat-option>
 							</mat-select>
 						</mat-form-field>
 						<div class="d-flex flex-row ml-auto">
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 a421601bb..b86eb3f61 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
@@ -80,8 +80,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit { //IBr
 			//TODO refactor
 			// this.formGroup.get('order').setValue(this.order.PUBLISHED);
 		} else {
-			//TODO refactor
-			// this.formGroup.get('order').setValue(this.order.MODIFIED);
+			this.formGroup.get('order').setValue(this.order.UpdatedAt);
 		}
 		if (!this.isPublic && !this.authService.currentAccountIsAuthenticated()) {
 			this.router.navigateByUrl("/explore-plans");
@@ -163,6 +162,17 @@ export class DmpListingComponent extends BaseComponent implements OnInit { //IBr
 		this.refresh(this.lookup);
 	}
 
+	orderByChanged(){
+		if (this.formGroup.get('order').value == RecentActivityOrder.Status){
+			this.lookup.order = { items: ['-' + nameof<Dmp>(x => x.status)] };
+		} else if(this.formGroup.get('order').value == RecentActivityOrder.Label){
+			this.lookup.order = { items: ['-' + nameof<Dmp>(x => x.label)] };
+		}else{
+			this.lookup.order = { items: ['-' + nameof<Dmp>(x => x.updatedAt)] };
+		}
+		this.refresh(this.lookup);
+	}
+
 	private refresh(lookup: DmpLookup) {
 		lookup.project = {
 			fields: [
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index 73278bb9b..865bdce54 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -64,13 +64,13 @@
 							<span *ngIf="isOrcid(dmpReference.reference)">
 								<a href="{{ getOrcidPathForResearcher(dmpReference.reference?.reference) }}" target="blank" class="researcher">
 									<div class="id-btn">&nbsp;</div>
-									<div *ngIf="!last">{{ dmpReference.reference?.data?.name }}, </div> <!-- TODO: data is missign after refactor -->
-									<div *ngIf="last">{{ dmpReference.reference?.data?.name }}</div><!-- TODO: data is missign after refactor -->
+									<div *ngIf="!last">{{ dmpReference.reference?.label }}, </div>
+									<div *ngIf="last">{{ dmpReference.reference?.label }}</div>
 								</a>
 							</span>
 							<span *ngIf="!isOrcid(dmpReference.reference)">
-								<div *ngIf="!last">{{ dmpReference.reference?.data?.name }}, </div> <!-- TODO: data is missign after refactor -->
-								<div *ngIf="last">{{ dmpReference.reference?.data?.name }}</div> <!-- TODO: data is missign after refactor -->
+								<div *ngIf="!last">{{ dmpReference.reference?.label }}, </div>
+								<div *ngIf="last">{{ dmpReference.reference?.label }}</div>
 							</span>
 						</div>
 						<span *ngIf="!researchers || researchers.length === 0" class="material-icons">horizontal_rule</span>
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 456288290..968b81d2b 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
@@ -42,6 +42,7 @@ import { DmpBlueprint, DmpBlueprintDefinition, DmpBlueprintDefinitionSection } f
 import { CloneDmpDialogComponent } from '../clone-dialog/dmp-clone-dialog.component';
 import { NewVersionDmpDialogComponent } from '../new-version-dialog/dmp-new-version-dialog.component';
 import { AppPermission } from '@app/core/common/enum/permission.enum';
+import { ReferenceType } from '@app/core/model/reference-type/reference-type';
 
 @Component({
 	selector: 'app-dmp-overview',
@@ -775,7 +776,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 			[nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.id)].join('.'),
 			[nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.id)].join('.'),
 			[nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.label)].join('.'),
-			[nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.type)].join('.'),
+			[nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.type), nameof<ReferenceType>(x => x.id)].join('.'),
 			[nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.source)].join('.'),
 			[nameof<Dmp>(x => x.dmpReferences), nameof<DmpReference>(x => x.reference), nameof<Reference>(x => x.reference)].join('.'),