Skip to content

Commit 1c3f901

Browse files
committed
clean up #445
1 parent e955c97 commit 1c3f901

File tree

1 file changed

+2
-25
lines changed

1 file changed

+2
-25
lines changed

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

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { BasicField } from 'src/app/model/DataSelection/Profile/Fields/BasicFields/BasicField';
2+
import { BasicFieldCloner } from 'src/app/model/Utilities/DataSelecionCloner/ProfileFields/BasicFieldCloner';
23
import { BehaviorSubject, Observable } from 'rxjs';
3-
import { Display } from 'src/app/model/DataSelection/Profile/Display';
44
import { Injectable } from '@angular/core';
55
import { SelectedBasicField } from 'src/app/model/DataSelection/Profile/Fields/BasicFields/SelectedBasicField';
6-
import { Translation } from 'src/app/model/DataSelection/Profile/Translation';
7-
import { CloneDisplayData } from 'src/app/model/Utilities/DisplayData/CloneDisplayData';
86

97
@Injectable({
108
providedIn: 'root',
@@ -43,27 +41,7 @@ export class SelectedProfileFieldsService {
4341
}
4442

4543
private deepCopyBasicFields(fields: BasicField[]): BasicField[] {
46-
return fields.map((field) => this.mapNode(field));
47-
}
48-
49-
private mapNode(basicField: BasicField): BasicField {
50-
const children = basicField.getChildren()
51-
? this.deepCopyBasicFields(basicField.getChildren())
52-
: [];
53-
return new BasicField(
54-
basicField.getElementId(),
55-
this.instantiateDisplayData(basicField.getDisplay()),
56-
this.instantiateDisplayData(basicField.getDescription()),
57-
children,
58-
basicField.getRecommended(),
59-
basicField.getIsSelected(),
60-
basicField.getIsRequired(),
61-
basicField.getType()
62-
);
63-
}
64-
65-
private instantiateDisplayData(displayData: Display): Display {
66-
return CloneDisplayData.deepCopyDisplayData(displayData);
44+
return fields.map((field) => BasicFieldCloner.deepCopyBasicField(field));
6745
}
6846

6947
public getDeepCopyBasicFields(): Observable<BasicField[]> {
@@ -77,7 +55,6 @@ export class SelectedProfileFieldsService {
7755
public setSelectedFields(fields: SelectedBasicField[]): void {
7856
this.selectedFields.next(fields);
7957
this.fieldIds.clear();
80-
//this.setSelectedChildrenFields(fields);
8158
}
8259

8360
private setSelectedChildrenFields(fields: BasicField[]): void {

0 commit comments

Comments
 (0)