inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +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

2
lib/content-services/search/components/search-filter/search-filter.component.html
View File

@@ -89,7 +89,7 @@
<mat-checkbox
*ngFor="let bucket of field.buckets"
[checked]="bucket.checked"
(change)="onToggleBucket($event, bucket)">
(change)="onToggleBucket($event, field, bucket)">
{{ bucket.display || bucket.label }} ({{ bucket.count }})
</mat-checkbox>
</div>

13
lib/content-services/search/components/search-filter/search-filter.component.spec.ts
View File

@@ -57,12 +57,13 @@ describe('SearchFilterComponent', () => {
spyOn(queryBuilder, 'addUserFacetBucket').and.callThrough();
const event: any = { checked: true };
const field: FacetField = { field: 'f1', label: 'f1' };
const bucket: FacetFieldBucket = { checked: false, filterQuery: 'q1', label: 'q1', count: 1 };
component.onToggleBucket(event, bucket);
component.onToggleBucket(event, field, bucket);
expect(bucket.checked).toBeTruthy();
expect(queryBuilder.addUserFacetBucket).toHaveBeenCalledWith(bucket);
expect(queryBuilder.addUserFacetBucket).toHaveBeenCalledWith(field, bucket);
expect(queryBuilder.update).toHaveBeenCalled();
});
@@ -71,11 +72,12 @@ describe('SearchFilterComponent', () => {
spyOn(queryBuilder, 'removeUserFacetBucket').and.callThrough();
const event: any = { checked: false };
const field: FacetField = { field: 'f1', label: 'f1' };
const bucket: FacetFieldBucket = { checked: true, filterQuery: 'q1', label: 'q1', count: 1 };
component.onToggleBucket(event, bucket);
component.onToggleBucket(event, field, bucket);
expect(queryBuilder.removeUserFacetBucket).toHaveBeenCalledWith(bucket);
expect(queryBuilder.removeUserFacetBucket).toHaveBeenCalledWith(field, bucket);
expect(queryBuilder.update).toHaveBeenCalled();
});
@@ -217,7 +219,8 @@ describe('SearchFilterComponent', () => {
it('should update query builder only when has bucket to unselect', () => {
spyOn(queryBuilder, 'update').and.stub();
component.onToggleBucket(<any> { checked: true }, null);
const field: FacetField = { field: 'f1', label: 'f1' };
component.onToggleBucket(<any> { checked: true }, field, null);
expect(queryBuilder.update).not.toHaveBeenCalled();
});

16
lib/content-services/search/components/search-filter/search-filter.component.ts
View File

@@ -130,29 +130,29 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
}
}
onToggleBucket(event: MatCheckboxChange, bucket: FacetFieldBucket) {
onToggleBucket(event: MatCheckboxChange, field: FacetField, bucket: FacetFieldBucket) {
if (event && bucket) {
if (event.checked) {
this.selectFacetBucket(bucket);
this.selectFacetBucket(field, bucket);
} else {
this.unselectFacetBucket(bucket);
this.unselectFacetBucket(field, bucket);
}
}
}
selectFacetBucket(bucket: FacetFieldBucket) {
selectFacetBucket(field: FacetField, bucket: FacetFieldBucket) {
if (bucket) {
bucket.checked = true;
this.queryBuilder.addUserFacetBucket(bucket);
this.queryBuilder.addUserFacetBucket(field, bucket);
this.updateSelectedBuckets();
this.queryBuilder.update();
}
}
unselectFacetBucket(bucket: FacetFieldBucket) {
unselectFacetBucket(field: FacetField, bucket: FacetFieldBucket) {
if (bucket) {
bucket.checked = false;
this.queryBuilder.removeUserFacetBucket(bucket);
this.queryBuilder.removeUserFacetBucket(field, bucket);
this.updateSelectedBuckets();
this.queryBuilder.update();
}
@@ -181,7 +181,7 @@ export class SearchFilterComponent implements OnInit, OnDestroy {
if (field && field.buckets) {
for (let bucket of field.buckets.items) {
bucket.checked = false;
this.queryBuilder.removeUserFacetBucket(bucket);
this.queryBuilder.removeUserFacetBucket(field, bucket);
}
this.updateSelectedBuckets();
this.queryBuilder.update();

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

@@ -18,6 +18,7 @@
import { SearchQueryBuilderService } from './search-query-builder.service';
import { SearchConfiguration } from './search-configuration.interface';
import { AppConfigService } from '@alfresco/adf-core';
import { FacetField } from './facet-field.interface';
describe('SearchQueryBuilder', () => {
@@ -420,4 +421,43 @@ describe('SearchQueryBuilder', () => {
expect(compiled.query.query).toBe('(my query) AND (cm:name:test)');
});
it('should group facet buckets by field', () => {
const field1: FacetField = {
field: 'f1',
label: 'f1'
};
const field1buckets = [
{ checked: true, filterQuery: 'f1-q1', label: 'f1-q1', count: 1 },
{ checked: true, filterQuery: 'f1-q2', label: 'f1-q2', count: 1 }
];
const field2: FacetField = {
field: 'f2',
label: 'f2'
};
const field2buckets = [
{ checked: true, filterQuery: 'f2-q1', label: 'f2-q1', count: 1 },
{ checked: true, filterQuery: 'f2-q2', label: 'f2-q2', count: 1 }
];
const config: SearchConfiguration = {
categories: [
<any> { id: 'cat1', enabled: true }
]
};
const builder = new SearchQueryBuilderService(buildConfig(config), null);
builder.addUserFacetBucket(field1, field1buckets[0]);
builder.addUserFacetBucket(field1, field1buckets[1]);
builder.addUserFacetBucket(field2, field2buckets[0]);
builder.addUserFacetBucket(field2, field2buckets[1]);
const compiledQuery = builder.buildQuery();
const expectedResult = '(f1-q1 OR f1-q2) AND (f2-q1 OR f2-q2)';
expect(compiledQuery.query.query).toBe(expectedResult);
});
});

34
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
if (this.userFacetBuckets) {
Object.keys(this.userFacetBuckets).forEach(key => {
const subQuery = (this.userFacetBuckets[key] || [])
.map(bucket => bucket.filterQuery)
.join(' OR ');
result += ` AND (${combined})`;
if (subQuery) {
if (result.length > 0) {
result += ' AND ';
}
result += `(${subQuery})`;
}
});
}
return result;