From 9a8ddfa7eab49a91a19150aae64ef1e2a4a1c285 Mon Sep 17 00:00:00 2001
From: Sofia Papacharalampous <spapacharalampous@cite.gr>
Date: Fri, 26 Apr 2024 16:05:05 +0300
Subject: [PATCH] fixed bug on toc error indicator, on nested sections

---
 .../editor/description-editor.component.ts        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
index c28355d35..38523ebfa 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
+++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
@@ -1098,10 +1098,11 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 		
 		page.sections?.forEach((section: DescriptionTemplateSection) => {
 			let fieldsets = this.getNestedSectionFieldsets(section);
-			let sectionIds = this.getNestedSectionIds(section);
 			let fieldsBySection: DescriptionFieldIndicator[] = fieldsets?.flatMap((fieldset: DescriptionTemplateFieldSet) =>
-				fieldset.fields?.flatMap((field: DescriptionTemplateField) => 
-					new DescriptionFieldIndicator(page.id, sectionIds, fieldset.id, field.id, field.data.fieldType, field.data.multipleSelect)
+				fieldset.fields?.flatMap((field: DescriptionTemplateField) => {
+						let sectionIds = this.getNestedSectionIdsByField(section, fieldset.id);
+						return new DescriptionFieldIndicator(page.id, sectionIds, fieldset.id, field.id, field.data.fieldType, field.data.multipleSelect)
+					}
 				));
 
 				fieldsByPage.push(...fieldsBySection);
@@ -1118,12 +1119,14 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 		else return section.fieldSets;
 	}
 	
-	getNestedSectionIds(section: DescriptionTemplateSection):  string[] {
+	getNestedSectionIdsByField(section: DescriptionTemplateSection, fieldSetId: string):  string[] {
 		if (section.sections) {
-			return [section.id, ...section.sections.flatMap((subsection: DescriptionTemplateSection) => this.getNestedSectionIds(subsection))];
+			return [section.id, ...section.sections.flatMap((subsection: DescriptionTemplateSection) => this.getNestedSectionIdsByField(subsection, fieldSetId))];
 		}
 
-		else return [section.id];
+		else if (section.fieldSets.find(fieldSet => fieldSet.id == fieldSetId)) return [section.id];
+
+		else return [];
 	}
 
 	// 	// this._listenersSubscription.add(dmpSubscription);