inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3367] facets multiselect fixes (#3611)

Browse Source 
* group facet buckets by field

* unit tests and code fixes
This commit is contained in:
Denys Vuika
2018-07-24 11:08:35 +01:00
committed by Eugenio Romano
parent 43e43de2e2
commit 0670c93d7b
5 changed files with 81 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/content-services/search/search-query-builder.service.ts
View File

@@ -43,7 +43,7 @@ export class SearchQueryBuilderService {
sorting: Array<SearchSortingDefinition> = [];
protected userFacetQueries: FacetQuery[] = [];
protected userFacetBuckets: FacetFieldBucket[] = [];
protected userFacetBuckets: { [key: string]: Array<FacetFieldBucket> } = {};
get userQuery(): string {
return this._userQuery;
@@ -69,7 +69,7 @@ export class SearchQueryBuilderService {
this.config = JSON.parse(JSON.stringify(template));
this.categories = (this.config.categories || []).filter(category => category.enabled);
this.filterQueries = this.config.filterQueries || [];
this.userFacetBuckets = [];
this.userFacetBuckets = {};
this.userFacetQueries = [];
if (this.config.sorting) {
this.sorting = this.config.sorting.defaults || [];
@@ -95,18 +95,21 @@ export class SearchQueryBuilderService {
}
}
addUserFacetBucket(bucket: FacetFieldBucket) {
if (bucket) {
const existing = this.userFacetBuckets.find(facetBucket => facetBucket.label === bucket.label);
addUserFacetBucket(field: FacetField, bucket: FacetFieldBucket) {
if (field && field.field && bucket) {
const buckets = this.userFacetBuckets[field.field] || [];
const existing = buckets.find(facetBucket => facetBucket.label === bucket.label);
if (!existing) {
this.userFacetBuckets.push(bucket);
buckets.push(bucket);
}
this.userFacetBuckets[field.field] = buckets;
}
}
removeUserFacetBucket(bucket: FacetFieldBucket) {
if (bucket) {
this.userFacetBuckets = this.userFacetBuckets
removeUserFacetBucket(field: FacetField, bucket: FacetFieldBucket) {
if (field && field.field && bucket) {
const buckets = this.userFacetBuckets[field.field] || [];
this.userFacetBuckets[field.field] = buckets
.filter(facetBucket => facetBucket.label !== bucket.label);
}
}
@@ -265,11 +268,18 @@ export class SearchQueryBuilderService {
result += ` AND (${combined})`;
}
if (this.userFacetBuckets && this.userFacetBuckets.length > 0) {
const combined = this.userFacetBuckets
.map(bucket => bucket.filterQuery)
.join(' OR ');
result += ` AND (${combined})`;
if (this.userFacetBuckets) {
Object.keys(this.userFacetBuckets).forEach(key => {
const subQuery = (this.userFacetBuckets[key] || [])
.map(bucket => bucket.filterQuery)
.join(' OR ');
if (subQuery) {
if (result.length > 0) {
result += ' AND ';
}
result += `(${subQuery})`;
}
});
}
return result;