From 368ee12b512e9020d41c8e280d9842006e35ca58 Mon Sep 17 00:00:00 2001
From: Sofia Papacharalampous <spapacharalampous@cite.gr>
Date: Fri, 21 Jun 2024 13:42:35 +0300
Subject: [PATCH] fixed table view placeholder on reference type field

---
 .../form-field-set/form-field-set.component.html | 16 ++++++++++------
 .../form-field-set/form-field-set.component.ts   |  2 ++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
index 7d94b1b7f..4ff5511ed 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
@@ -40,17 +40,21 @@
 						<mat-icon>add_circle</mat-icon>
 					</button>
 					<span class="mt-1" *ngIf="fieldSet?.multiplicity?.placeholder">{{fieldSet.multiplicity.placeholder}}</span>
-					<span class="mt-1" *ngIf="!fieldSet?.multiplicity?.placeholder && !fieldSet.multiplicity?.tableView else addTableView">{{'DESCRIPTION-EDITOR.ACTIONS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}</span>
-					<ng-template #addTableView>
-						<span class="mt-1">{{'DESCRIPTION-EDITOR.ACTIONS.MULTIPLICITY-ADD-ONE-FIELD-TABLEVIEW' | translate}}</span>
-					</ng-template>
+					<span class="mt-1" *ngIf="!fieldSet?.multiplicity?.placeholder">{{'DESCRIPTION-EDITOR.ACTIONS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}</span>
 				</span>
 			</div>
 		</div>
 		<div *ngIf="fieldSet.hasMultiplicity && fieldSet?.multiplicity?.tableView" class="col-12">
 			<table class="table table-bordered" style="table-layout: fixed">
 				<tr>
-					<th *ngFor="let field of fieldSet.fields; let i = index;" class="text-truncated">{{field.data?.label}}</th>
+					<th *ngFor="let field of fieldSet.fields; let i = index;" class="text-truncated">
+						<ng-container *ngIf="field?.data?.fieldType !== descriptionTemplateFieldType.REFERENCE_TYPES else referenceTypeLabel">
+							{{field.data?.label}}
+						</ng-container>
+						<ng-template #referenceTypeLabel>
+							{{field.data?.label != null && field.data?.label != '' ? field.data?.label: field.data?.referenceType?.name }}
+						</ng-template>
+					</th>
 					<th class="actions"></th>
 				</tr>
 				<ng-container *ngFor="let fieldSetItemPropertiesControl of propertiesFormGroup?.get('items')?.controls; let j = index">
@@ -82,7 +86,7 @@
 								<mat-icon>add_circle</mat-icon>
 							</button>
 							<span class="mt-1" *ngIf="fieldSet.multiplicity.placeholder">{{fieldSet.multiplicity.placeholder}}</span>
-							<span class="mt-1" *ngIf="!fieldSet.multiplicity.placeholder">{{('DESCRIPTION-EDITOR.ACTIONS.MULTIPLICITY-ADD-ONE-FIELD' + (fieldSet.multiplicity.tableView?'-TABLEVIEW':'')) | translate}}</span>
+							<span class="mt-1" *ngIf="!fieldSet.multiplicity.placeholder">{{'DESCRIPTION-EDITOR.ACTIONS.MULTIPLICITY-ADD-ONE-FIELD-TABLEVIEW' | translate}}</span>
 						</span>
 					</td>
 				</tr>
diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.ts b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.ts
index 6da5f3057..f0b0e68da 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.ts
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.ts
@@ -16,6 +16,7 @@ import { AnnotationEntityType } from '@app/core/common/enum/annotation-entity-ty
 import { DescriptionFormAnnotationService } from '../../description-form-annotation.service';
 import { DescriptionPropertyDefinitionFieldSet } from '@app/core/model/description/description';
 import { DescriptionFormService } from '../services/description-form.service';
+import { DescriptionTemplateFieldType } from '@app/core/common/enum/description-template-field-type';
 
 @Component({
 	selector: 'app-description-form-field-set',
@@ -49,6 +50,7 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
 	@Input() validationErrorModel: ValidationErrorModel;
 
 	annotationsCount: number = 0;
+	descriptionTemplateFieldType = DescriptionTemplateFieldType;
 
 	constructor(
 		private dialog: MatDialog,