From 6508b145d0558be0c1fa4de7ed88d23def616963 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 6 Jul 2018 10:03:32 +0100 Subject: [PATCH] [ADF-3292] fix reset to defaults (#3566) * fix reset to defaults * code fixes * restore providers * fix category filtering --- .../search/search-query-builder.service.ts | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/lib/content-services/search/search-query-builder.service.ts b/lib/content-services/search/search-query-builder.service.ts index 5a260ccade..fb798bc1c2 100644 --- a/lib/content-services/search/search-query-builder.service.ts +++ b/lib/content-services/search/search-query-builder.service.ts @@ -55,26 +55,18 @@ export class SearchQueryBuilderService { // TODO: to be supported in future iterations ranges: { [id: string]: SearchRange } = {}; - constructor(appConfig: AppConfigService, private alfrescoApiService: AlfrescoApiService) { - this.config = appConfig.get('search'); + constructor(private appConfig: AppConfigService, private alfrescoApiService: AlfrescoApiService) { this.resetToDefaults(); } resetToDefaults() { - if (this.config) { - this.categories = - (this.config.categories || []) - .filter(category => category.enabled) - .map(category => { return { ...category }; }); - - this.filterQueries = - (this.config.filterQueries || []) - .map(query => { return {...query}; }); - + const template = this.appConfig.get('search'); + if (template) { + this.config = JSON.parse(JSON.stringify(template)); + this.categories = (this.config.categories || []).filter(category => category.enabled); + this.filterQueries = this.config.filterQueries || []; if (this.config.sorting) { - this.sorting = - (this.config.sorting.defaults || []) - .map(sorting => { return { ...sorting }; }); + this.sorting = this.config.sorting.defaults || []; } } }