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-5175] - perform the search when at least one filter is active (#5836)

Browse Source 
* [ADF-5175] - perform the search when at least one filter is active

* [ADF-5175] - removed wrong attempt

* [ADF-5175] - removed unused import
This commit is contained in:
Vito
2020-07-06 11:53:23 +01:00
committed by GitHub
parent a1077756fc
commit 6001ff801e
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/content-services/src/lib/search/components/search-header/search-header.component.spec.ts
View File

@@ -109,6 +109,7 @@ describe('SearchHeaderComponent', () => {
expect(newNodePaging).toBe(fakeNodePaging); expect(newNodePaging).toBe(fakeNodePaging);
done(); done();
}); });
const maxItem = new SimpleChange(10, 20, false); const maxItem = new SimpleChange(10, 20, false);
component.ngOnChanges({ 'maxItems': maxItem }); component.ngOnChanges({ 'maxItems': maxItem });
fixture.detectChanges(); fixture.detectChanges();
@@ -122,6 +123,7 @@ describe('SearchHeaderComponent', () => {
expect(newNodePaging).toBe(fakeNodePaging); expect(newNodePaging).toBe(fakeNodePaging);
done(); done();
}); });
const skipCount = new SimpleChange(0, 10, false); const skipCount = new SimpleChange(0, 10, false);
component.ngOnChanges({ 'skipCount': skipCount }); component.ngOnChanges({ 'skipCount': skipCount });
fixture.detectChanges(); fixture.detectChanges();
@@ -137,6 +139,7 @@ describe('SearchHeaderComponent', () => {
component.clear.subscribe(() => { component.clear.subscribe(() => {
done(); done();
}); });
const menuButton: HTMLButtonElement = fixture.nativeElement.querySelector('#filter-menu-button'); const menuButton: HTMLButtonElement = fixture.nativeElement.querySelector('#filter-menu-button');
menuButton.click(); menuButton.click();
fixture.detectChanges(); fixture.detectChanges();
@@ -144,5 +147,27 @@ describe('SearchHeaderComponent', () => {
const clearButton = fixture.debugElement.query(By.css('#clear-filter-button')); const clearButton = fixture.debugElement.query(By.css('#clear-filter-button'));
clearButton.triggerEventHandler('click', fakeEvent); clearButton.triggerEventHandler('click', fakeEvent);
fixture.detectChanges(); fixture.detectChanges();
await fixture.whenStable();
});
it('should execute the query again if there are more filter actives after a clear', async (done) => {
spyOn(queryBuilder, 'isNoFilterActive').and.returnValue(false);
spyOn(alfrescoApiService.searchApi, 'search').and.returnValue(Promise.resolve(fakeNodePaging));
spyOn(queryBuilder, 'buildQuery').and.returnValue({});
spyOn(component.widgetContainer, 'resetInnerWidget').and.stub();
const fakeEvent = jasmine.createSpyObj('event', ['stopPropagation']);
const menuButton: HTMLButtonElement = fixture.nativeElement.querySelector('#filter-menu-button');
component.update.subscribe((newNodePaging) => {
expect(newNodePaging).toBe(fakeNodePaging);
done();
});
menuButton.click();
fixture.detectChanges();
await fixture.whenStable();
const clearButton = fixture.debugElement.query(By.css('#clear-filter-button'));
clearButton.triggerEventHandler('click', fakeEvent);
fixture.detectChanges();
await fixture.whenStable();
}); });
}); });

4
lib/content-services/src/lib/search/components/search-header/search-header.component.ts
View File

@@ -149,7 +149,11 @@ export class SearchHeaderComponent implements OnInit, OnChanges, OnDestroy {
if (this.widgetContainer) { if (this.widgetContainer) {
this.widgetContainer.resetInnerWidget(); this.widgetContainer.resetInnerWidget();
this.searchHeaderQueryBuilder.removeActiveFilter(this.category.columnKey); this.searchHeaderQueryBuilder.removeActiveFilter(this.category.columnKey);
if (this.searchHeaderQueryBuilder.isNoFilterActive()) {
this.clear.emit(); this.clear.emit();
} else {
this.searchHeaderQueryBuilder.execute();
}
} }
} }