From 91556cb6b6766480edeaea98d23472188ea354f0 Mon Sep 17 00:00:00 2001
From: amentis <amentis@cite.gr>
Date: Tue, 21 May 2024 11:22:33 +0300
Subject: [PATCH] dmp user field filter sections changes

---
 .../ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts    |  1 +
 .../dmp/dmp-user-field/dmp-user-field.component.html   | 10 ++++++++--
 .../ui/dmp/dmp-user-field/dmp-user-field.component.ts  |  3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts
index 0a3236183..177329329 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts
@@ -113,6 +113,7 @@ export class DmpEditorModel extends BaseEditorModel implements DmpPersist {
 		// 	// 	rootPath: `descriptionTemplates[${index}].`
 		// 	})), //context.getValidation('descriptionTemplates')
 		// ))
+		if (disabled) descriptionTemplatesFormGroup.disable();
 		formGroup.addControl('descriptionTemplates', descriptionTemplatesFormGroup);
 
 		return formGroup;
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html b/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html
index 5ac28db43..1906960bd 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html
+++ b/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html
@@ -67,15 +67,21 @@
 			<mat-error *ngIf="user.get('role').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 		</mat-form-field>
 	</div>
-	<div class="col-12 col-xl mt-3" *ngIf="sections && (user.get('role').value == dmpUserRoleEnum.DescriptionContributor || user.get('role').value == dmpUserRoleEnum.Reviewer)">
+	<div class="col-12 col-xl mt-3" *ngIf="sections || hasTemplatesSections">
 		<mat-form-field class="w-100">
 			<mat-label>{{'DMP-EDITOR.FIELDS.SECTIONS' | translate}}</mat-label>
-			<mat-select [formControl]="user.get('sectionId')">
+			<mat-select *ngIf="user.get('role').value != dmpUserRoleEnum.DescriptionContributor && sections" [formControl]="user.get('sectionId')">
 				<mat-option value="">{{'DMP-EDITOR.FIELDS.ALL-SECTIONS' | translate}}</mat-option>
 				<mat-option *ngFor="let section of sections" [value]="section.id">
 					{{ section.label }}
 				</mat-option>
 			</mat-select>
+			<mat-select *ngIf="user.get('role').value === dmpUserRoleEnum.DescriptionContributor && hasTemplatesSections" [formControl]="user.get('sectionId')">
+				<mat-option value="">{{'DMP-EDITOR.FIELDS.ALL-SECTIONS' | translate}}</mat-option>
+				<mat-option *ngFor="let section of hasTemplatesSections" [value]="section.id">
+					{{ section.label }}
+				</mat-option>
+			</mat-select>
 			<mat-error *ngIf="user.get('sectionId').hasError('backendError')">{{user.get('sectionId').getError('backendError').message}}</mat-error>
 			<mat-error *ngIf="user.get('sectionId').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' |translate}}</mat-error>
 		</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts
index 6bd2e8126..50365d230 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.ts
@@ -28,6 +28,7 @@ export class DmpUserFieldComponent extends BaseComponent implements OnInit {
 
 	@Input() enableSorting: boolean = true;
 	hoveredUser:number = -1;
+	hasTemplatesSections: DmpBlueprintDefinitionSection[] = null;
 
 	dmpUserTypeEnum = DmpUserType;
 	dmpUserTypeEnumValues = this.enumUtils.getEnumValues<DmpUserType>(DmpUserType);
@@ -43,7 +44,7 @@ export class DmpUserFieldComponent extends BaseComponent implements OnInit {
 	) { super(); }
 
 	ngOnInit() {
-		this.sections = this.sections?.filter(x => x.hasTemplates) || null;
+		this.hasTemplatesSections = this.sections?.filter(x => x.hasTemplates) || null;
 		console.log('sorting mode: ', this.enableSorting);
 		if(this.initializeUsers) {
 			this.addUser();