diff --git a/lib/content-services/src/lib/search/base-query-builder.service.ts b/lib/content-services/src/lib/search/base-query-builder.service.ts index 709a63f297..59f0d7624a 100644 --- a/lib/content-services/src/lib/search/base-query-builder.service.ts +++ b/lib/content-services/src/lib/search/base-query-builder.service.ts @@ -71,14 +71,14 @@ export abstract class BaseQueryBuilderService { ranges: { [id: string]: SearchRange } = {}; constructor(protected appConfig: AppConfigService, protected alfrescoApiService: AlfrescoApiService) { - this.setUpConfiguration(); + this.resetToDefaults(); } public abstract loadConfiguration(): SearchConfiguration; public abstract isFilterServiceActive(): boolean; - public setUpConfiguration() { + public resetToDefaults() { const currentConfig = this.loadConfiguration(); this.setUpSearchConfiguration(currentConfig); } diff --git a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts index 2411ecc1e6..9c8589eb8e 100644 --- a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts @@ -737,7 +737,7 @@ describe('SearchFilterComponent', () => { it('should not show the disabled widget', async(() => { appConfigService.config.search = { categories: disabledCategories }; - queryBuilder.setUpConfiguration(); + queryBuilder.resetToDefaults(); fixture.detectChanges(); fixture.whenStable().then(() => { @@ -748,7 +748,7 @@ describe('SearchFilterComponent', () => { it('should show the widget in expanded mode', async(() => { appConfigService.config.search = { categories: expandedCategories }; - queryBuilder.setUpConfiguration(); + queryBuilder.resetToDefaults(); fixture.detectChanges(); fixture.whenStable().then(() => { @@ -769,7 +769,7 @@ describe('SearchFilterComponent', () => { it('should show the widgets only if configured', async(() => { appConfigService.config.search = { categories: simpleCategories }; - queryBuilder.setUpConfiguration(); + queryBuilder.resetToDefaults(); fixture.detectChanges(); fixture.whenStable().then(() => { @@ -784,7 +784,7 @@ describe('SearchFilterComponent', () => { it('should be update the search query when name changed', async( async () => { spyOn(queryBuilder, 'update').and.stub(); appConfigService.config.search = searchFilter; - queryBuilder.setUpConfiguration(); + queryBuilder.resetToDefaults(); fixture.detectChanges(); await fixture.whenStable(); @@ -805,7 +805,7 @@ describe('SearchFilterComponent', () => { it('should show the long facet options list with pagination', () => { const panel = '[data-automation-id="expansion-panel-Size facet queries"]'; appConfigService.config.search = searchFilter; - queryBuilder.setUpConfiguration(); + queryBuilder.resetToDefaults(); fixture.detectChanges(); queryBuilder.executed.next( mockSearchResult); @@ -871,7 +871,7 @@ describe('SearchFilterComponent', () => { delete filter.facetQueries; appConfigService.config.search = filter; - queryBuilder.setUpConfiguration(); + queryBuilder.resetToDefaults(); fixture.detectChanges(); queryBuilder.executed.next( mockSearchResult); @@ -884,7 +884,7 @@ describe('SearchFilterComponent', () => { it('should search the facets options and select it', () => { const panel = '[data-automation-id="expansion-panel-Size facet queries"]'; appConfigService.config.search = searchFilter; - queryBuilder.setUpConfiguration(); + queryBuilder.resetToDefaults(); fixture.detectChanges(); queryBuilder.executed.next( mockSearchResult); fixture.detectChanges(); @@ -930,7 +930,7 @@ describe('SearchFilterComponent', () => { const panel1 = '[data-automation-id="expansion-panel-Size facet queries"]'; const panel2 = '[data-automation-id="expansion-panel-Type facet queries"]'; appConfigService.config.search = searchFilter; - queryBuilder.setUpConfiguration(); + queryBuilder.resetToDefaults(); fixture.detectChanges(); queryBuilder.executed.next( mockSearchResult); fixture.detectChanges(); diff --git a/lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts b/lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts index 62a9dee851..4014600f51 100644 --- a/lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts +++ b/lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts @@ -48,7 +48,7 @@ describe('SearchHeaderQueryBuilder', () => { expect(builder.categories.length).toBe(0); expect(builder.filterQueries.length).toBe(0); - builder.setUpConfiguration(); + builder.resetToDefaults(); expect(builder.categories.length).toBe(2); expect(builder.filterQueries.length).toBe(2); diff --git a/lib/content-services/src/lib/search/search-query-builder.service.spec.ts b/lib/content-services/src/lib/search/search-query-builder.service.spec.ts index 4c09fa064b..ad63444bee 100644 --- a/lib/content-services/src/lib/search/search-query-builder.service.spec.ts +++ b/lib/content-services/src/lib/search/search-query-builder.service.spec.ts @@ -47,7 +47,7 @@ describe('SearchQueryBuilder', () => { expect(builder.categories.length).toBe(0); expect(builder.filterQueries.length).toBe(0); - builder.setUpConfiguration(); + builder.resetToDefaults(); expect(builder.categories.length).toBe(2); expect(builder.filterQueries.length).toBe(2);