diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts index f91332929e..03b760318f 100644 --- a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts +++ b/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts @@ -124,14 +124,14 @@ describe('SearchFacetFilterComponent', () => { describe('when the getAddParams method is called wih a value', () => { it('should return the selectedValue list with the new parameter value', () => { const result = comp.getAddParams(value3); - expect(result).toEqual({ [mockFilterConfig.paramName]: [value1, value2, value3] }); + expect(result[mockFilterConfig.paramName]).toEqual([value1, value2, value3]); }); }); describe('when the getRemoveParams method is called wih a value', () => { it('should return the selectedValue list with the parameter value left out', () => { const result = comp.getRemoveParams(value1); - expect(result).toEqual({ [mockFilterConfig.paramName]: [value2] }); + expect(result[mockFilterConfig.paramName]).toEqual([value2]); }); }); diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts index bf78bbe5ec..5f8111c87b 100644 --- a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts +++ b/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts @@ -100,11 +100,17 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy { return hasValue(o); } getRemoveParams(value: string) { - return { [this.filterConfig.paramName]: this.selectedValues.filter((v) => v !== value) }; + return { + [this.filterConfig.paramName]: this.selectedValues.filter((v) => v !== value), + page: 1 + }; } getAddParams(value: string) { - return { [this.filterConfig.paramName]: [...this.selectedValues, value] }; + return { + [this.filterConfig.paramName]: [...this.selectedValues, value], + page: 1 + }; } ngOnDestroy(): void { diff --git a/src/app/+search-page/search-filters/search-filters.component.ts b/src/app/+search-page/search-filters/search-filters.component.ts index cb2dae0290..517b2e1e59 100644 --- a/src/app/+search-page/search-filters/search-filters.component.ts +++ b/src/app/+search-page/search-filters/search-filters.component.ts @@ -23,8 +23,6 @@ export class SearchFiltersComponent { constructor(private searchService: SearchService, private filterService: SearchFilterService) { this.filters = searchService.getConfig(); this.clearParams = filterService.getCurrentFilters().map((filters) => {Object.keys(filters).forEach((f) => filters[f] = null); return filters;}); - - this.filters.subscribe((v) => console.log('this.filters', v)); } getSearchLink() { diff --git a/src/app/+search-page/search-options.model.ts b/src/app/+search-page/search-options.model.ts index 4164321680..df8d8e713a 100644 --- a/src/app/+search-page/search-options.model.ts +++ b/src/app/+search-page/search-options.model.ts @@ -1,5 +1,6 @@ import { isNotEmpty } from '../shared/empty.util'; import { URLCombiner } from '../core/url-combiner/url-combiner'; +import 'core-js/fn/object/entries'; export enum ViewMode { List = 'list', diff --git a/tsconfig.json b/tsconfig.json index 8037c659ed..8ab72a4327 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,7 +26,8 @@ "es6", "es2015", "es2016", - "es2017" + "es2017", + "es2017.object" ] }, "exclude": [