From 48d96760eb2f76977a223064b62273a8095f2c41 Mon Sep 17 00:00:00 2001 From: Mykyta Maliarchuk <84377976+nikita-web-ua@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:59:25 +0200 Subject: [PATCH] [ACS-8081] People facet - update the query on apply hit (#9904) * [ACS-8081] People facet - update the query on apply hit * [ACS-8081] cr fix --- .../search-facet-chip-tabbed.component.ts | 3 ++- ...search-facet-tabbed-content.component.spec.ts | 16 +++++++++------- .../search-facet-tabbed-content.component.ts | 1 - 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts index f5516a1a82..b66536661e 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.ts @@ -87,7 +87,8 @@ export class SearchFacetChipTabbedComponent { this.menuTrigger.closeMenu(); } } - onIsPopulatedEventChange(isPopulated: boolean): void { + + onIsPopulatedEventChange(isPopulated: boolean) { this.isPopulated = isPopulated; this.changeDetectorRef.detectChanges(); } diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.spec.ts index ca751a8e78..0997cd86f2 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.spec.ts @@ -23,7 +23,6 @@ import { FacetField } from '../../../models/facet-field.interface'; import { SearchFacetFiltersService } from '../../../services/search-facet-filters.service'; import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; import { SearchFacetTabbedContentComponent } from './search-facet-tabbed-content.component'; -import { of } from 'rxjs'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatTabGroupHarness, MatTabHarness } from '@angular/material/tabs/testing'; @@ -34,6 +33,7 @@ describe('SearchFacetTabbedContentComponent', () => { let queryBuilder: SearchQueryBuilderService; let searchFacetService: SearchFacetFiltersService; let loader: HarnessLoader; + let queryBuilderUpdateSpy: jasmine.Spy; beforeEach(() => { TestBed.configureTestingModule({ @@ -45,7 +45,7 @@ describe('SearchFacetTabbedContentComponent', () => { component = fixture.componentInstance; queryBuilder = TestBed.inject(SearchQueryBuilderService); searchFacetService = TestBed.inject(SearchFacetFiltersService); - spyOn(queryBuilder, 'update').and.stub(); + queryBuilderUpdateSpy = spyOn(queryBuilder, 'update').and.stub(); const facet1: FacetField = { type: 'field', label: 'field', field: 'field', buckets: new SearchFilterList() }; const facet2: FacetField = { type: 'field', label: 'field2', field: 'field2', buckets: new SearchFilterList() }; @@ -59,9 +59,6 @@ describe('SearchFacetTabbedContentComponent', () => { } }; - component.onReset$ = of(void 0); - component.onApply$ = of(void 0); - fixture.detectChanges(); }); @@ -189,7 +186,7 @@ describe('SearchFacetTabbedContentComponent', () => { spyOn(searchFacetService, 'updateSelectedBuckets').and.callThrough(); component.submitValues(); expect(component.submitValues).toHaveBeenCalled(); - expect(queryBuilder.update).toHaveBeenCalled(); + expect(queryBuilderUpdateSpy).toHaveBeenCalled(); expect(component.updateDisplayValue).toHaveBeenCalled(); expect(searchFacetService.updateSelectedBuckets).toHaveBeenCalled(); }); @@ -197,7 +194,12 @@ describe('SearchFacetTabbedContentComponent', () => { it('should update search query and display value on reset', () => { spyOn(component, 'updateDisplayValue').and.callThrough(); component.reset(); - expect(queryBuilder.update).toHaveBeenCalled(); + expect(queryBuilderUpdateSpy).toHaveBeenCalled(); expect(component.updateDisplayValue).toHaveBeenCalled(); }); + + it('should not call queryBuilder.update on options change', () => { + component.onOptionsChange([{ value: 'test' }], 'field'); + expect(queryBuilderUpdateSpy).not.toHaveBeenCalled(); + }); }); diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.ts index 6d7b75c6d4..c4ccfd3d85 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.ts @@ -93,7 +93,6 @@ export class SearchFacetTabbedContentComponent implements OnInit, OnDestroy, OnC this.isPopulated.emit(this.tabbedFacet.fields.some((facetField) => this.selectedOptions[facetField].length > 0)); this.updateDisplayValue(); this.updateUserFacetBuckets(); - this.queryBuilder.update(); } updateDisplayValue() {