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-No-issue-number] search problem type fix (#3068)

Browse Source 
* search problem type fix

* fix type test

* fix test node selector

* fix test content node selector panel
This commit is contained in:
Eugenio Romano
2018-03-13 12:10:06 +00:00
committed by GitHub
parent ba905acf13
commit c3e2588e35
8 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo-shell/src/app/components/search/search-config-test.service.ts
View File

@@ -23,7 +23,7 @@ export class TestSearchConfigurationService implements SearchConfigurationInterf
constructor() {
}
public generateQueryBody(searchTerm: string, maxResults: string, skipCount: string): QueryBody {
public generateQueryBody(searchTerm: string, maxResults: number, skipCount: number): QueryBody {
const defaultQueryBody: QueryBody = {
query: {
query: searchTerm ? `${searchTerm}* OR name:${searchTerm}*` : searchTerm

4
lib/content-services/content-node-selector/content-node-selector-panel.component.spec.ts
View File

@@ -292,8 +292,8 @@ describe('ContentNodeSelectorComponent', () => {
},
include: ['path', 'allowableOperations'],
paging: {
maxItems: '25',
skipCount: skipCount.toString()
maxItems: 25,
skipCount: skipCount
},
filterQueries: [
{ query: "TYPE:'cm:folder'" },

8
lib/content-services/content-node-selector/content-node-selector.service.spec.ts
View File

@@ -69,15 +69,15 @@ describe('ContentNodeSelectorService', () => {
it('should set the maxItems and paging properly by parameters', () => {
service.search('nuka cola quantum', null, 10, 100);
expect(search.query.paging.maxItems).toEqual('100');
expect(search.query.paging.skipCount).toEqual('10');
expect(search.query.paging.maxItems).toEqual(100);
expect(search.query.paging.skipCount).toEqual(10);
});
it('should set the maxItems and paging properly by default', () => {
service.search('nuka cola quantum');
expect(search.query.paging.maxItems).toEqual('25');
expect(search.query.paging.skipCount).toEqual('0');
expect(search.query.paging.maxItems).toEqual(25);
expect(search.query.paging.skipCount).toEqual(0);
});
it('should filter the search only for folders', () => {

13
lib/content-services/content-node-selector/content-node-selector.service.ts
View File

@@ -26,7 +26,8 @@ import { Observable } from 'rxjs/Observable';
@Injectable()
export class ContentNodeSelectorService {
constructor(private searchService: SearchService) {}
constructor(private searchService: SearchService) {
}
/**
* Performs a search for content node selection
@@ -47,11 +48,11 @@ export class ContentNodeSelectorService {
extraNodeIds
.filter(id => id !== rootNodeId)
.forEach(extraId => {
extraParentFiltering += ` OR ANCESTOR:'workspace://SpacesStore/${extraId}'`;
});
extraParentFiltering += ` OR ANCESTOR:'workspace://SpacesStore/${extraId}'`;
});
}
const parentFiltering = rootNodeId ? [ { query: `ANCESTOR:'workspace://SpacesStore/${rootNodeId}'${extraParentFiltering}` } ] : [];
const parentFiltering = rootNodeId ? [{ query: `ANCESTOR:'workspace://SpacesStore/${rootNodeId}'${extraParentFiltering}` }] : [];
let defaultSearchNode: any = {
query: {
@@ -59,8 +60,8 @@ export class ContentNodeSelectorService {
},
include: ['path', 'allowableOperations'],
paging: {
maxItems: `${maxItems}`,
skipCount: `${skipCount}`
maxItems: maxItems,
skipCount: skipCount
},
filterQueries: [
{ query: "TYPE:'cm:folder'" },

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

@@ -158,7 +158,7 @@ export class SearchComponent implements AfterContentInit, OnChanges {
search$ = this.searchService.searchByQueryBody(this.queryBody);
} else {
search$ = this.searchService
.search(searchTerm, this.maxResults.toString(), this.skipResults.toString());
.search(searchTerm, this.maxResults, this.skipResults);
}
search$.subscribe(
results => {

2
lib/core/interface/search-configuration.interface.ts
View File

@@ -19,6 +19,6 @@ import { QueryBody } from 'alfresco-js-api';
export interface SearchConfigurationInterface {
generateQueryBody(searchTerm: string, maxResults: string, skipCount: string): QueryBody;
generateQueryBody(searchTerm: string, maxResults: number, skipCount: number): QueryBody;
}

2
lib/core/services/search-configuration.service.ts
View File

@@ -25,7 +25,7 @@ export class SearchConfigurationService implements SearchConfigurationInterface
constructor() {
}
public generateQueryBody(searchTerm: string, maxResults: string, skipCount: string): QueryBody {
public generateQueryBody(searchTerm: string, maxResults: number, skipCount: number): QueryBody {
let defaultQueryBody: QueryBody = {
query: {
query: searchTerm ? `${searchTerm}* OR name:${searchTerm}*` : searchTerm

2
lib/core/services/search.service.ts
View File

@@ -37,7 +37,7 @@ export class SearchService {
.catch(err => this.handleError(err));
}
search(searchTerm: string, maxResults: string, skipCount: string): Observable<NodePaging> {
search(searchTerm: string, maxResults: number, skipCount: number): Observable<NodePaging> {
const searchQuery = Object.assign(this.searchConfigurationService.generateQueryBody(searchTerm, maxResults, skipCount));
const promise = this.apiService.getInstance().search.searchApi.search(searchQuery);