fix: update tree when deleted #445

Author: Shayan1375

src/app/modules/shared-filter/components/edit-fields/edit-fields.component.ts

@@ -1,11 +1,11 @@
 import { BasicField } from 'src/app/model/DataSelection/Profile/Fields/BasicFields/BasicField';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { FieldsTreeAdapter } from 'src/app/shared/models/TreeNode/Adapter/FieldTreeAdapter';
 import { map, Subscription, take } from 'rxjs';
 import { SelectedBasicField } from 'src/app/model/DataSelection/Profile/Fields/BasicFields/SelectedBasicField';
 import { SelectedBasicFieldCloner } from 'src/app/model/Utilities/DataSelecionCloner/ProfileFields/SelectedFieldCloner';
 import { SelectedProfileFieldsService } from 'src/app/service/DataSelection/SelectedProfileFields.service';
 import { TreeNode } from 'src/app/shared/models/TreeNode/TreeNodeInterface';
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 
 @Component({
   selector: 'num-edit-fields',
@@ -45,7 +45,7 @@ export class EditFieldsComponent implements OnInit, OnDestroy {
       .getDeepCopyBasicFields()
       .pipe(
         take(1),
-        map((profileFields) => {
+        map((profileFields: BasicField[]) => {
           this.setSelectedChildrenFields();
           this.tree = FieldsTreeAdapter.fromTree(profileFields);
         })
@@ -70,8 +70,10 @@ export class EditFieldsComponent implements OnInit, OnDestroy {
     const node: BasicField = element.originalEntry as BasicField;
     const index = this.getIndexInSelectedFields(node.getElementId());
     if (index !== -1) {
+      node.setIsSelected(false);
       this.spliceAndEmit(index);
     } else {
+      node.setIsSelected(true);
       this.addNodeToSelectedFields(node);
     }
     this.traversAndUpddateTree();
@@ -92,6 +94,12 @@ export class EditFieldsComponent implements OnInit, OnDestroy {
     const index = this.getIndexInSelectedFields(node.getElementId());
     if (index !== -1) {
       this.spliceAndEmit(index);
+      this.fieldTree = this.selectedDataSelectionProfileFieldsService.updateNodeInDeepCopy(
+        this.fieldTree,
+        node.getSelectedField(),
+        false
+      );
+      this.tree = FieldsTreeAdapter.fromTree(this.fieldTree);
     }
   }
 
@@ -112,9 +120,6 @@ export class EditFieldsComponent implements OnInit, OnDestroy {
       this.selectedBasicFields
     );
     this.updatedSelectedBasicFields.emit(clonedSelectedFields);
-    // Only update the selection status, don't trigger tree rebuilding
     this.traversAndUpddateTree();
-    // Remove this line that causes the circular trigger:
-    // this.selectedDataSelectionProfileFieldsService.setDeepCopyFields(this.fieldTree);
   }
 }

src/app/service/DataSelection/SelectedProfileFields.service.ts

@@ -4,6 +4,7 @@ import { Display } from 'src/app/model/DataSelection/Profile/Display';
 import { Injectable } from '@angular/core';
 import { SelectedBasicField } from 'src/app/model/DataSelection/Profile/Fields/BasicFields/SelectedBasicField';
 import { Translation } from 'src/app/model/DataSelection/Profile/Translation';
+import { CloneDisplayData } from 'src/app/model/Utilities/DisplayData/CloneDisplayData';
 
 @Injectable({
   providedIn: 'root',
@@ -62,15 +63,7 @@ export class SelectedProfileFieldsService {
   }
 
   private instantiateDisplayData(displayData: Display): Display {
-    return new Display(
-      displayData
-        .getTranslations()
-        .map(
-          (translation) =>
-            new Translation(translation.getLanguage(), translation.getValue(), undefined)
-        ),
-      displayData.getOriginal()
-    );
+    return CloneDisplayData.deepCopyDisplayData(displayData);
   }
 
   public getDeepCopyBasicFields(): Observable<BasicField[]> {
@@ -117,13 +110,13 @@ export class SelectedProfileFieldsService {
     this.updateDeepCopyField(field);
   }
 
-  private updateDeepCopyField(field: BasicField, isSelected = true): void {
+  public updateDeepCopyField(field: BasicField, isSelected = true): void {
     const deepCopy = this.deepCopyOfBasicFields.getValue();
     const updatedDeepCopy = this.updateNodeInDeepCopy(deepCopy, field, isSelected);
     this.deepCopyOfBasicFields.next(updatedDeepCopy);
   }
 
-  private updateNodeInDeepCopy(
+  public updateNodeInDeepCopy(
     fields: BasicField[],
     updatedField: BasicField,
     isSelected: boolean