From 16d74ccf059f3fddf886a22146bdc5e0536debb3 Mon Sep 17 00:00:00 2001 From: Vito Date: Wed, 12 Aug 2020 08:46:19 +0100 Subject: [PATCH] Fixed parent changing for search header (#5975) Co-authored-by: Vito Albano --- .../search-header/search-header.component.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/content-services/src/lib/search/components/search-header/search-header.component.ts b/lib/content-services/src/lib/search/components/search-header/search-header.component.ts index 5de237558a..acdf36df33 100644 --- a/lib/content-services/src/lib/search/components/search-header/search-header.component.ts +++ b/lib/content-services/src/lib/search/components/search-header/search-header.component.ts @@ -113,19 +113,12 @@ export class SearchHeaderComponent implements OnInit, OnChanges, OnDestroy { .subscribe((newNodePaging: NodePaging) => { this.update.emit(newNodePaging); }); - - if (this.searchHeaderQueryBuilder.isCustomSourceNode(this.currentFolderNodeId)) { - this.searchHeaderQueryBuilder.getNodeIdForCustomSource(this.currentFolderNodeId).subscribe((node: MinimalNode) => { - this.initSearchHeader(node.id); - }); - } else { - this.initSearchHeader(this.currentFolderNodeId); - } } ngOnChanges(changes: SimpleChanges) { if (changes['currentFolderNodeId'] && changes['currentFolderNodeId'].currentValue) { this.clearHeader(); + this.configureSearchParent(changes['currentFolderNodeId'].currentValue); } if (changes['maxItems'] || changes['skipCount']) { @@ -200,6 +193,16 @@ export class SearchHeaderComponent implements OnInit, OnChanges, OnDestroy { return this.widgetContainer && this.widgetContainer.componentRef && this.widgetContainer.componentRef.instance.isActive; } + private configureSearchParent(currentFolderNodeId: string) { + if (this.searchHeaderQueryBuilder.isCustomSourceNode(currentFolderNodeId)) { + this.searchHeaderQueryBuilder.getNodeIdForCustomSource(currentFolderNodeId).subscribe((node: MinimalNode) => { + this.initSearchHeader(node.id); + }); + } else { + this.initSearchHeader(currentFolderNodeId); + } + } + private initSearchHeader(currentFolderId: string) { this.searchHeaderQueryBuilder.setCurrentRootFolderId(currentFolderId); if (this.value) {