From 3cd7b514bce0d0a68da220e0c33c1402c1b4b540 Mon Sep 17 00:00:00 2001 From: jacekpluta <73617938+jacekpluta@users.noreply.github.com> Date: Mon, 3 Jun 2024 07:32:35 +0200 Subject: [PATCH] [ACS-7584] - Filtering by type, name and content size (range) does not filter the data table (#9736) --- .../search-filter-container.component.html | 1 + .../search-widget-container.component.ts | 27 ++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.html b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.html index a001edaf1a..6d1690decc 100644 --- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.html +++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.html @@ -32,6 +32,7 @@ [selector]="category?.component?.selector" [settings]="category?.component?.settings" [value]="initialValue" + [useHeaderQueryBuilder]="true" > diff --git a/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts b/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts index 3e9293971a..1f4a6baf8e 100644 --- a/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts +++ b/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts @@ -15,10 +15,21 @@ * limitations under the License. */ -import { Component, Input, ViewChild, ViewContainerRef, OnInit, OnDestroy, ComponentRef, SimpleChanges, OnChanges } from '@angular/core'; +import { + Component, + Input, + ViewChild, + ViewContainerRef, + OnInit, + OnDestroy, + ComponentRef, + SimpleChanges, + OnChanges, + Injector +} from '@angular/core'; import { SearchFilterService } from '../../services/search-filter.service'; import { Observable } from 'rxjs'; -import { SearchQueryBuilderService } from '../../services'; +import {SearchHeaderQueryBuilderService, SearchQueryBuilderService} from '../../services'; @Component({ selector: 'adf-search-widget-container', @@ -43,9 +54,13 @@ export class SearchWidgetContainerComponent implements OnInit, OnDestroy, OnChan @Input() value: any; + @Input() + useHeaderQueryBuilder: boolean; + componentRef: ComponentRef; - constructor(private searchFilterService: SearchFilterService, private queryBuilder: SearchQueryBuilderService) {} + constructor(private searchFilterService: SearchFilterService, private injector: Injector) { + } ngOnInit() { const componentType = this.searchFilterService.widgets[this.selector]; @@ -67,7 +82,11 @@ export class SearchWidgetContainerComponent implements OnInit, OnDestroy, OnChan if (ref?.instance) { ref.instance.id = this.id; ref.instance.settings = { ...this.settings }; - ref.instance.context = this.queryBuilder; + if (this.useHeaderQueryBuilder) { + ref.instance.context = this.injector.get(SearchHeaderQueryBuilderService); + } else { + ref.instance.context = this.injector.get(SearchQueryBuilderService); + } if (this.value) { ref.instance.isActive = true; ref.instance.startValue = this.value;