mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-2306] DocumentList should let configure the includeFields request to the se… (#3109)
* DocumentList should let configure the includeFields request to the server * fix test * fix test after rebase * fix permissions * travis_wait dist
This commit is contained in:
@@ -27,7 +27,12 @@ import {
|
||||
PaginationQueryParams,
|
||||
PermissionsEnum
|
||||
} from '@alfresco/adf-core';
|
||||
import { AlfrescoApiService, AppConfigService, DataColumnListComponent, UserPreferencesService } from '@alfresco/adf-core';
|
||||
import {
|
||||
AlfrescoApiService,
|
||||
AppConfigService,
|
||||
DataColumnListComponent,
|
||||
UserPreferencesService
|
||||
} from '@alfresco/adf-core';
|
||||
import {
|
||||
AfterContentInit, Component, ContentChild, ElementRef, EventEmitter, HostListener, Input, NgZone,
|
||||
OnChanges, OnDestroy, OnInit, Output, SimpleChanges, TemplateRef, ViewChild, ViewEncapsulation
|
||||
@@ -73,6 +78,10 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
|
||||
|
||||
@ContentChild(DataColumnListComponent) columnList: DataColumnListComponent;
|
||||
|
||||
/** Include additional information about the node in the server request.for example: association, isLink, isLocked and others. */
|
||||
@Input()
|
||||
includeFields: string[];
|
||||
|
||||
/** Change the display mode of the table. Can be "list" or "gallery". */
|
||||
@Input()
|
||||
display: string = DisplayMode.List;
|
||||
@@ -539,7 +548,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
|
||||
this.loadRecent(merge);
|
||||
} else {
|
||||
this.documentListService
|
||||
.getFolderNode(nodeId)
|
||||
.getFolderNode(nodeId, this.includeFields)
|
||||
.then(node => {
|
||||
this.folderNode = node;
|
||||
this.currentFolderId = node.id;
|
||||
@@ -566,18 +575,18 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
|
||||
maxItems: maxItems,
|
||||
skipCount: skipCount,
|
||||
rootFolderId: id
|
||||
})
|
||||
}, this.includeFields)
|
||||
.subscribe(
|
||||
val => {
|
||||
this.data.loadPage(<NodePaging> val, merge);
|
||||
this.loading = false;
|
||||
this.infiniteLoading = false;
|
||||
this.onDataReady(val);
|
||||
resolve(true);
|
||||
},
|
||||
error => {
|
||||
reject(error);
|
||||
});
|
||||
val => {
|
||||
this.data.loadPage(<NodePaging> val, merge);
|
||||
this.loading = false;
|
||||
this.infiniteLoading = false;
|
||||
this.onDataReady(val);
|
||||
resolve(true);
|
||||
},
|
||||
error => {
|
||||
reject(error);
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
@@ -640,13 +649,13 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
|
||||
this.apiService.sitesApi.getSites(options)
|
||||
.then((page: NodePaging) => {
|
||||
page.list.entries.map(
|
||||
({entry}: any) => {
|
||||
({ entry }: any) => {
|
||||
entry.name = entry.name || entry.title;
|
||||
return {entry};
|
||||
return { entry };
|
||||
}
|
||||
);
|
||||
this.onPageLoaded(page, merge);
|
||||
})
|
||||
})
|
||||
.catch(error => this.error.emit(error));
|
||||
}
|
||||
|
||||
@@ -664,7 +673,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
|
||||
let page: NodePaging = {
|
||||
list: {
|
||||
entries: result.list.entries
|
||||
.map(({entry: {site}}: any) => {
|
||||
.map(({ entry: { site } }: any) => {
|
||||
site.allowableOperations = site.allowableOperations ? site.allowableOperations : [this.CREATE_PERMISSION];
|
||||
site.name = site.name || site.title;
|
||||
return {
|
||||
@@ -976,8 +985,8 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
|
||||
.then(result => result.list.entries.map(node => node.entry.id));
|
||||
|
||||
} else if (nodeId) {
|
||||
return this.documentListService.getFolderNode(nodeId)
|
||||
.then(node => [ node.id ]);
|
||||
return this.documentListService.getFolderNode(nodeId, this.includeFields)
|
||||
.then(node => [node.id]);
|
||||
}
|
||||
|
||||
return new Promise((resolve) => {
|
||||
|
Reference in New Issue
Block a user