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-2242] Search on custom sources is not working. (#2904)

Browse Source 
* [ADF-2242] Search on custom sources is not working.

fix search on custom sources

* [ADF-2242] added unit tests

* [ADF-2242] reverted change

* [ADF-2242] simplify code on search method and make extra call only when having custom dropdown defined
This commit is contained in:
suzanadirla
2018-02-02 17:22:33 +02:00
committed by Eugenio Romano
parent 5ee9b09a21
commit 78c6a68e51
5 changed files with 204 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
lib/content-services/document-list/components/document-list.component.ts
View File

@@ -671,33 +671,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
}
private loadRecent(merge: boolean = false): void {
this.apiService.peopleApi.getPerson('-me-')
.then((person: PersonEntry) => {
const username = person.entry.id;
const query = {
query: {
query: '*',
language: 'afts'
},
filterQueries: [
{ query: `cm:modified:[NOW/DAY-30DAYS TO NOW/DAY+1DAY]` },
{ query: `cm:modifier:${username} OR cm:creator:${username}` },
{ query: `TYPE:"content" AND -TYPE:"app:filelink" AND -TYPE:"fm:post"` }
],
include: ['path', 'properties', 'allowableOperations'],
sort: [{
type: 'FIELD',
field: 'cm:modified',
ascending: false
}],
paging: {
maxItems: this.maxItems,
skipCount: this.skipCount
}
};
return this.apiService.searchApi.search(query);
})
this.getRecentFiles('-me-')
.then((page: NodePaging) => this.onPageLoaded(page, merge))
.catch(error => this.error.emit(error));
}
@@ -930,4 +904,68 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
this.contextActionHandlerSubscription = null;
}
}
getCorrespondingNodeIds(nodeId: string): Promise<string[]> {
if (nodeId === '-trashcan-') {
return this.apiService.nodesApi.getDeletedNodes()
.then(result => result.list.entries.map(node => node.entry.id));
} else if (nodeId === '-sharedlinks-') {
return this.apiService.sharedLinksApi.findSharedLinks()
.then(result => result.list.entries.map(node => node.entry.nodeId));
} else if (nodeId === '-sites-') {
return this.apiService.sitesApi.getSites()
.then(result => result.list.entries.map(node => node.entry.guid));
} else if (nodeId === '-mysites-') {
return this.apiService.peopleApi.getSiteMembership('-me-')
.then(result => result.list.entries.map(node => node.entry.guid));
} else if (nodeId === '-favorites-') {
return this.apiService.favoritesApi.getFavorites('-me-')
.then(result => result.list.entries.map(node => node.entry.targetGuid));
} else if (nodeId === '-recent-') {
return this.getRecentFiles('-me-')
.then(result => result.list.entries.map(node => node.entry.id));
} else if (nodeId) {
return this.documentListService.getFolderNode(nodeId)
.then(node => [ node.id ]);
}
return new Promise((resolve) => {
resolve([]);
});
}
getRecentFiles(personId: string): Promise<NodePaging> {
return this.apiService.peopleApi.getPerson(personId)
.then((person: PersonEntry) => {
const username = person.entry.id;
const query = {
query: {
query: '*',
language: 'afts'
},
filterQueries: [
{ query: `cm:modified:[NOW/DAY-30DAYS TO NOW/DAY+1DAY]` },
{ query: `cm:modifier:${username} OR cm:creator:${username}` },
{ query: `TYPE:"content" AND -TYPE:"app:filelink" AND -TYPE:"fm:post"` }
],
include: ['path', 'properties', 'allowableOperations'],
sort: [{
type: 'FIELD',
field: 'cm:modified',
ascending: false
}],
paging: {
maxItems: this.maxItems,
skipCount: this.skipCount
}
};
return this.apiService.searchApi.search(query);
});
}
}