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-1918] added new search api service to search component (#2667)

Browse Source 
* [ADF-1918] added new search api service to search component

* [ADF-1918] fixed close panel on empty search word

* [ADF-1918] added documentation for search changes

* [ADF-1918] fixed closing of subscription on destroy
This commit is contained in:
Vito
2017-11-19 20:44:12 +00:00
committed by Eugenio Romano
parent a105ab0334
commit 0f0f22634a
9 changed files with 283 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { SearchOptions, SearchService } from '@alfresco/adf-core';
import { SearchApiService } from '@alfresco/adf-core';
import {
AfterContentInit,
ChangeDetectionStrategy,
@@ -31,7 +31,7 @@ import {
ViewChild,
ViewEncapsulation
} from '@angular/core';
import { NodePaging } from 'alfresco-js-api';
import { NodePaging, QueryBody } from 'alfresco-js-api';
import { Subject } from 'rxjs/Subject';
@Component({
@@ -61,17 +61,14 @@ export class SearchComponent implements AfterContentInit, OnChanges {
maxResults: number = 20;
@Input()
resultSort: string = null;
@Input()
rootNodeId: string = '-root-';
@Input()
resultType: string = null;
skipResults: number = 0;
@Input()
searchTerm: string = '';
@Input()
searchNode: QueryBody;
@Input('class')
set classList(classList: string) {
if (classList && classList.length) {
@@ -104,7 +101,7 @@ export class SearchComponent implements AfterContentInit, OnChanges {
_classList: { [key: string]: boolean } = {};
constructor(
private searchService: SearchService,
private searchService: SearchApiService,
private changeDetectorRef: ChangeDetectorRef,
private _elementRef: ElementRef) {
this.keyPressedStream.asObservable()
@@ -119,10 +116,13 @@ export class SearchComponent implements AfterContentInit, OnChanges {
}
ngOnChanges(changes) {
if (changes.searchTerm) {
this.resetResults();
this.resetResults();
if (changes.searchTerm && changes.searchTerm.currentValue) {
this.displaySearchResults(changes.searchTerm.currentValue);
}
if (changes.searchNode && changes.searchNode.currentValue) {
this.displaySearchResults();
}
}
resetResults() {
@@ -140,18 +140,17 @@ export class SearchComponent implements AfterContentInit, OnChanges {
}
}
private displaySearchResults(searchTerm) {
let searchOpts: SearchOptions = {
include: ['path', 'allowableOperations'],
rootNodeId: this.rootNodeId,
nodeType: this.resultType,
maxItems: this.maxResults,
orderBy: this.resultSort
};
if (searchTerm !== null && searchTerm !== '') {
private hasValidSearchQuery(searchOpts: QueryBody) {
return searchOpts && searchOpts.query && searchOpts.query.query;
}
private displaySearchResults(searchTerm?: string) {
let searchOpts: QueryBody = this.getSearchNode(searchTerm);
if (this.hasValidSearchQuery(searchOpts)) {
searchTerm = searchTerm + '*';
this.searchService
.getNodeQueryResults(searchTerm, searchOpts)
.search(searchOpts)
.subscribe(
results => {
this.results = <NodePaging> results;
@@ -165,9 +164,39 @@ export class SearchComponent implements AfterContentInit, OnChanges {
this.error.emit(error);
}
});
} else {
this.cleanResults();
}
}
private getSearchNode(searchTerm: string): QueryBody {
if (this.searchNode) {
if (!this.searchNode.query.query && searchTerm) {
this.searchNode.query.query = searchTerm;
}
return this.searchNode;
} else {
return this.generateDefaultSearchNode(searchTerm);
}
}
private generateDefaultSearchNode(searchTerm: string): QueryBody {
let defaultSearchNode: QueryBody = {
query: {
query: searchTerm ? `${searchTerm}* OR name:${searchTerm}*` : searchTerm
},
include: ['path', 'allowableOperations'],
paging: {
maxItems: this.maxResults.toString(),
skipCount: this.skipResults.toString()
},
filterQueries: [
{ query: "TYPE:'cm:folder' OR TYPE:'cm:content'" },
{ query: 'NOT cm:creator:System' }]
};
return defaultSearchNode;
}
hidePanel() {
if (this.isOpen) {
this._classList['adf-search-show'] = false;