inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-09-17 14:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MNT-24082] fix aspect overwriting from dialog (#9390)

Browse Source 
* [MNT-24082] fix aspect overwriting from dialog

* [MNT-24028] address comments, improve unit tests
This commit is contained in:
Grzegorz Jaśkowski
2024-03-04 11:45:41 +01:00
committed by GitHub
parent ca892fc8fa
commit 9e4569d7ca
2 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/content-services/src/lib/aspect-list/aspect-list.component.ts
View File

@@ -47,6 +47,7 @@ export class AspectListComponent implements OnInit, OnDestroy {
aspects$: Observable<AspectEntry[]> = null;
nodeAspects: string[] = [];
nodeAspectStatus: string[] = [];
notDisplayedAspects: string[] = [];
hasEqualAspect: boolean = true;
private onDestroy$ = new Subject<boolean>();
@@ -71,7 +72,8 @@ export class AspectListComponent implements OnInit, OnDestroy {
tap(([node, customAspects]) => {
this.nodeAspects = node.aspectNames.filter((aspect) => this.aspectListService.getVisibleAspects().includes(aspect) || customAspects.includes(aspect));
this.nodeAspectStatus = [ ...this.nodeAspects ];
this.valueChanged.emit(this.nodeAspects);
this.notDisplayedAspects = node.aspectNames.filter((aspect) => !this.aspectListService.getVisibleAspects().includes(aspect) && !customAspects.includes(aspect));
this.valueChanged.emit([...this.nodeAspects, ...this.notDisplayedAspects]);
}),
concatMap(() => this.aspectListService.getAspects()),
takeUntil(this.onDestroy$));
@@ -94,14 +96,14 @@ export class AspectListComponent implements OnInit, OnDestroy {
this.nodeAspects.splice(this.nodeAspects.indexOf(prefixedName), 1);
}
this.updateEqualityOfAspectList();
this.valueChanged.emit(this.nodeAspects);
this.valueChanged.emit([...this.nodeAspects, ...this.notDisplayedAspects]);
}
reset() {
if (this.nodeAspectStatus && this.nodeAspectStatus.length > 0) {
this.nodeAspects.splice(0, this.nodeAspects.length, ...this.nodeAspectStatus);
this.hasEqualAspect = true;
this.valueChanged.emit(this.nodeAspects);
this.valueChanged.emit([...this.nodeAspects, ...this.notDisplayedAspects]);
} else {
this.clear();
}
@@ -110,7 +112,7 @@ export class AspectListComponent implements OnInit, OnDestroy {
clear() {
this.nodeAspects = [];
this.updateEqualityOfAspectList();
this.valueChanged.emit(this.nodeAspects);
this.valueChanged.emit([...this.nodeAspects, ...this.notDisplayedAspects]);
}
getId(aspect: any): string {