Search add wildcard * to match all the (#2079)

This commit is contained in:
Eugenio Romano
2017-07-13 14:12:25 +01:00
parent 8fef3b6781
commit 55cd57b49d
4 changed files with 11 additions and 6 deletions

View File

@@ -91,7 +91,7 @@ results page will be shown.
| --- | --- | --- | --- | --- |
| searchTerm | string | | Search term to use when executing the search. Updating this value will run a new search and update the results |
| rootNodeId | string | "-root-" | NodeRef or node name where the search should start. |
| resultType | string | | Node type to filter search results by, e.g. 'cm:content'. |
| resultType | string | | Node type to filter search results by, e.g. 'cm:content', 'cm:folder' if you want only the files. |
| maxResults | number | 20 | Maximum number of results to show in the search. |
| resultSort | string | | Criteria to sort search results by, must be one of "name" , "modifiedAt" or "createdAt" |
| navigationMode | string | "dblclick" | Event used to initiate a navigation action to a specific result, one of "click" or "dblclick" |

View File

@@ -101,6 +101,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
orderBy: this.resultSort
};
if (searchTerm !== null && searchTerm !== '') {
searchTerm = searchTerm + '*';
this.searchService
.getNodeQueryResults(searchTerm, searchOpts)
.subscribe(

View File

@@ -105,8 +105,8 @@ describe('AlfrescoSearchComponent', () => {
declarations: [AlfrescoSearchComponent], // declare the test component
providers: [
AlfrescoSearchService,
{ provide: AlfrescoTranslationService, useClass: TranslationMock },
{ provide: NotificationService, useClass: NotificationService }
{provide: AlfrescoTranslationService, useClass: TranslationMock},
{provide: NotificationService, useClass: NotificationService}
]
}).compileComponents().then(() => {
fixture = TestBed.createComponent(AlfrescoSearchComponent);
@@ -155,8 +155,10 @@ describe('AlfrescoSearchComponent', () => {
describe('Search results', () => {
it('should call search service with the correct parameters', (done) => {
let searchTerm = 'searchTerm63688', options = {
it('should add wildcard in the search parameters', (done) => {
let searchTerm = 'searchTerm6368';
let searchTermOut = 'searchTerm6368*';
let options = {
include: ['path', 'allowableOperations'],
skipCount: 0,
rootNodeId: '-my-',
@@ -164,6 +166,7 @@ describe('AlfrescoSearchComponent', () => {
maxItems: 20,
orderBy: null
};
component.searchTerm = searchTerm;
component.rootNodeId = '-my-';
component.resultType = 'my:type';
@@ -174,7 +177,7 @@ describe('AlfrescoSearchComponent', () => {
component.resultsLoad.subscribe(() => {
fixture.detectChanges();
expect(searchService.getQueryNodesPromise).toHaveBeenCalledWith(searchTerm, options);
expect(searchService.getQueryNodesPromise).toHaveBeenCalledWith(searchTermOut, options);
done();
});
});

View File

@@ -108,6 +108,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
*/
private displaySearchResults(searchTerm) {
if (searchTerm && this.searchService) {
searchTerm = searchTerm + '*';
let searchOpts: SearchOptions = {
include: ['path', 'allowableOperations'],
skipCount: this.skipCount,