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

[ADF-5344] - fixed counter for custom aspects (#6727)

Browse Source
This commit is contained in:
Vito
2021-02-25 21:50:31 +00:00
committed by GitHub
parent c932cb0964
commit f3c4680c2c
3 changed files with 67 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,8 +17,8 @@
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core';
import { NodesApiService } from '@alfresco/adf-core';
import { Observable, Subject } from 'rxjs';
import { concatMap, takeUntil, tap } from 'rxjs/operators';
import { Observable, Subject, zip } from 'rxjs';
import { concatMap, map, takeUntil, tap } from 'rxjs/operators';
import { AspectListService } from './aspect-list.service';
import { MatCheckboxChange } from '@angular/material/checkbox';
import { AspectEntry } from '@alfresco/js-api';
@@ -56,9 +56,14 @@ export class AspectListComponent implements OnInit, OnDestroy {
ngOnInit(): void {
if (this.nodeId) {
this.aspects$ = this.nodeApiService.getNode(this.nodeId).pipe(
tap((node) => {
this.nodeAspects = node.aspectNames.filter((aspect) => this.aspectListService.getVisibleAspects().includes(aspect));
const node$ = this.nodeApiService.getNode(this.nodeId);
const customAspect$ = this.aspectListService.getCustomAspects()
.pipe(map(
(customAspects) => customAspects.flatMap((customAspect) => customAspect.entry.id)
));
this.aspects$ = zip(node$, customAspect$).pipe(
tap(([node, customAspects]) => {
this.nodeAspects = node.aspectNames.filter((aspect) => this.aspectListService.getVisibleAspects().includes(aspect) || customAspects.includes(aspect));
this.nodeAspectStatus = Array.from(node.aspectNames);
this.valueChanged.emit(this.nodeAspects);
}),