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-5087] Document List - custom sources 'where' clause not passed (#5558)

Browse Source 
* pass document list where clause to custom sources

* update docs
This commit is contained in:
Cilibiu Bogdan
2020-03-19 11:38:58 +02:00
committed by GitHub
parent 5bcd326891
commit 983e01f70c
3 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/content-services/src/lib/document-list/services/custom-resources.service.ts
View File

@@ -132,15 +132,17 @@ export class CustomResourcesService {
* Gets favorite files for the current user.
* @param pagination Specifies how to paginate the results
* @param includeFields List of data field names to include in the results
* @param where A string to restrict the returned objects by using a predicate
* @returns List of favorite files
*/
loadFavorites(pagination: PaginationModel, includeFields: string[] = []): Observable<NodePaging> {
loadFavorites(pagination: PaginationModel, includeFields: string[] = [], where?: string): Observable<NodePaging> {
const includeFieldsRequest = this.getIncludesFields(includeFields);
const defaultPredicate = '(EXISTS(target/file) OR EXISTS(target/folder))';
const options = {
maxItems: pagination.maxItems,
skipCount: pagination.skipCount,
where: '(EXISTS(target/file) OR EXISTS(target/folder))',
where: where ? `${where} AND ${defaultPredicate}` : defaultPredicate ,
include: includeFieldsRequest
};
@@ -181,13 +183,15 @@ export class CustomResourcesService {
/**
* Gets sites that the current user is a member of.
* @param pagination Specifies how to paginate the results
* @param where A string to restrict the returned objects by using a predicate
* @returns List of sites
*/
loadMemberSites(pagination: PaginationModel): Observable<SiteMemberPaging> {
loadMemberSites(pagination: PaginationModel, where?: string): Observable<SiteMemberPaging> {
const options = {
include: ['properties'],
maxItems: pagination.maxItems,
skipCount: pagination.skipCount
skipCount: pagination.skipCount,
where
};
return new Observable((observer) => {
@@ -220,13 +224,15 @@ export class CustomResourcesService {
/**
* Gets all sites in the repository.
* @param pagination Specifies how to paginate the results
* @param where A string to restrict the returned objects by using a predicate
* @returns List of sites
*/
loadSites(pagination: PaginationModel): Observable<NodePaging> {
loadSites(pagination: PaginationModel, where?: string): Observable<NodePaging> {
const options = {
include: ['properties', 'aspectNames'],
maxItems: pagination.maxItems,
skipCount: pagination.skipCount
skipCount: pagination.skipCount,
where
};
return new Observable((observer) => {
@@ -272,15 +278,17 @@ export class CustomResourcesService {
* Gets shared links for the current user.
* @param pagination Specifies how to paginate the results
* @param includeFields List of data field names to include in the results
* @param where A string to restrict the returned objects by using a predicate
* @returns List of shared links
*/
loadSharedLinks(pagination: PaginationModel, includeFields: string[] = []): Observable<SharedLinkPaging> {
loadSharedLinks(pagination: PaginationModel, includeFields: string[] = [], where?: string): Observable<SharedLinkPaging> {
const includeFieldsRequest = this.getIncludesFields(includeFields);
const options = {
include: includeFieldsRequest,
maxItems: pagination.maxItems,
skipCount: pagination.skipCount
skipCount: pagination.skipCount,
where
};
return from(this.apiService.sharedLinksApi.findSharedLinks(options))
@@ -326,17 +334,17 @@ export class CustomResourcesService {
* @param includeFields List of data field names to include in the results
* @returns List of items contained in the folder
*/
loadFolderByNodeId(nodeId: string, pagination: PaginationModel, includeFields: string[] = []): any {
loadFolderByNodeId(nodeId: string, pagination: PaginationModel, includeFields: string[] = [], where?: string): any {
if (nodeId === '-trashcan-') {
return this.loadTrashcan(pagination, includeFields);
} else if (nodeId === '-sharedlinks-') {
return this.loadSharedLinks(pagination, includeFields);
return this.loadSharedLinks(pagination, includeFields, where);
} else if (nodeId === '-sites-') {
return this.loadSites(pagination);
return this.loadSites(pagination, where);
} else if (nodeId === '-mysites-') {
return this.loadMemberSites(pagination);
return this.loadMemberSites(pagination, where);
} else if (nodeId === '-favorites-') {
return this.loadFavorites(pagination, includeFields);
return this.loadFavorites(pagination, includeFields, where);
} else if (nodeId === '-recent-') {
return this.getRecentFiles('-me-', pagination);
}

2
lib/content-services/src/lib/document-list/services/document-list.service.ts
View File

@@ -171,7 +171,7 @@ export class DocumentListService implements DocumentListLoader {
*/
loadFolderByNodeId(nodeId: string, pagination: PaginationModel, includeFields: string[], where?: string): Observable<DocumentLoaderNode> {
if (this.customResourcesService.isCustomSource(nodeId)) {
return this.customResourcesService.loadFolderByNodeId(nodeId, pagination, includeFields).pipe(
return this.customResourcesService.loadFolderByNodeId(nodeId, pagination, includeFields, where).pipe(
map((result: any) => new DocumentLoaderNode(null, result))
);
} else {