[ADF-3930] fix infinite pagination (#4275)

* refactoring infinite pagination

* fix lint

* fix import reuqest pagination from core

* fix failing unit test

lib/content-services/document-list/components/document-list.component.spec.ts

@@ -1269,6 +1269,24 @@ describe('DocumentList', () => {
         documentList.ngOnChanges({ currentFolderId: new SimpleChange(null, '-root-', false) });
 
         expect(documentListService.getFolder).toHaveBeenCalledWith(null, {
+            where: undefined,
+            maxItems: 25,
+            skipCount: 0,
+            rootFolderId: 'fake-id'
+        }, ['test-include']);
+    });
+
+    it('should add where in the server request when present', () => {
+        fixture.detectChanges();
+        documentList.currentFolderId = 'fake-id';
+        documentList.includeFields = ['test-include'];
+        documentList.where = '(isFolder=true)';
+        spyOn(documentListService, 'getFolder').and.callThrough();
+
+        documentList.ngOnChanges({ currentFolderId: new SimpleChange(null, '-root-', false) });
+
+        expect(documentListService.getFolder).toHaveBeenCalledWith(null, {
+            where: '(isFolder=true)',
             maxItems: 25,
             skipCount: 0,
             rootFolderId: 'fake-id'

lib/content-services/document-list/components/document-list.component.ts

@@ -39,7 +39,8 @@ import {
     ThumbnailService,
     CustomLoadingContentTemplateDirective,
     CustomNoPermissionTemplateDirective,
-    CustomEmptyContentTemplateDirective
+    CustomEmptyContentTemplateDirective,
+    RequestPaginationModel
 } from '@alfresco/adf-core';
 
 import { Node, NodeEntry, NodePaging } from '@alfresco/js-api';
@@ -88,6 +89,10 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
     @Input()
     includeFields: string[];
 
+    /** filter the Node list using the where condition of the rest api for example (isFolder=true) see the rest api documentation for more information. */
+    @Input()
+    where: string;
+
     /** Change the display mode of the table. Can be "list" or "gallery". */
     @Input()
     display: string = DisplayMode.List;
@@ -260,7 +265,9 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
     // @deprecated 3.0.0
     folderNode: Node;
 
-    private _pagination: BehaviorSubject<PaginationModel>;
+    private _pagination: PaginationModel;
+    private $pagination: BehaviorSubject<PaginationModel>;
+
     private layoutPresets = {};
     private subscriptions: Subscription[] = [];
     private rowMenuCache: { [key: string]: ContentActionModel[] } = {};
@@ -274,6 +281,13 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
                 private customResourcesService: CustomResourcesService,
                 private contentService: ContentService,
                 private thumbnailService: ThumbnailService) {
+
+        this._pagination = <PaginationModel> {
+            maxItems: this.maxItems || this.preferences.paginationSize,
+            skipCount: 0,
+            totalItems: 0,
+            hasMoreItems: false
+        };
     }
 
     getContextActions(node: NodeEntry) {
@@ -310,17 +324,10 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
     }
 
     get pagination(): BehaviorSubject<PaginationModel> {
-        if (!this._pagination) {
-            let maxItems = this.maxItems || this.preferences.paginationSize;
-            let defaultPagination = <PaginationModel> {
-                maxItems: maxItems,
-                skipCount: 0,
-                totalItems: 0,
-                hasMoreItems: false
-            };
-            this._pagination = new BehaviorSubject<PaginationModel>(defaultPagination);
+        if (!this.$pagination) {
+            this.$pagination = new BehaviorSubject<PaginationModel>(this._pagination);
         }
-        return this._pagination;
+        return this.$pagination;
     }
 
     isMobile(): boolean {
@@ -412,7 +419,9 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
             this.loadFolder();
         } else if (this.data) {
             if (changes.node && changes.node.currentValue) {
-                this.data.loadPage(changes.node.currentValue);
+                let merge = this._pagination ? this._pagination.merge : false;
+
+                this.data.loadPage(changes.node.currentValue, merge);
                 this.onDataReady(changes.node.currentValue);
             } else if (changes.imageResolver) {
                 this.data.setImageResolver(changes.imageResolver.currentValue);
@@ -424,7 +433,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
         this.ngZone.run(() => {
             this.resetSelection();
             if (this.node) {
-                this.data.loadPage(this.node, this.pagination.getValue().merge);
+                this.data.loadPage(this.node, this._pagination.merge);
                 this.onDataReady(this.node);
             } else {
                 this.loadFolder();
@@ -579,7 +588,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
     }
 
     loadFolder() {
-        if (!this.pagination.getValue().merge) {
+        if (!this._pagination.merge) {
             this.setLoadingState(true);
         }
 
@@ -593,33 +602,36 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
     loadFolderByNodeId(nodeId: string) {
         if (this.customResourcesService.isCustomSource(nodeId)) {
             this.updateCustomSourceData(nodeId);
-            this.customResourcesService.loadFolderByNodeId(nodeId, this.pagination.getValue(), this.includeFields)
-                .subscribe((page: NodePaging) => {
-                    this.onPageLoaded(page);
+            this.customResourcesService.loadFolderByNodeId(nodeId, this._pagination, this.includeFields)
+                .subscribe((nodePaging: NodePaging) => {
+                    this.onPageLoaded(nodePaging);
                 }, (err) => {
                     this.error.emit(err);
                 });
         } else {
-            let pagination = this.pagination.getValue();
+
             this.documentListService.getFolder(null, {
-                maxItems: pagination.maxItems,
-                skipCount: pagination.skipCount,
-                rootFolderId: nodeId
+                maxItems: this._pagination.maxItems,
+                skipCount: this._pagination.skipCount,
+                rootFolderId: nodeId,
+                where: this.where
             }, this.includeFields)
                 .subscribe((nodePaging: NodePaging) => {
-                    this.data.loadPage(nodePaging, this.pagination.getValue().merge);
-                    this.setLoadingState(false);
-                    this.onDataReady(nodePaging);
-                    this.documentListService.getFolderNode(nodeId, this.includeFields).subscribe((nodeEntry: NodeEntry) => {
-                        this.folderNode = nodeEntry.entry;
-                        this.$folderNode.next(this.folderNode);
-                    });
+                    this.onPageLoaded(nodePaging);
+                    this.getSourceNodeWithPath(nodeId);
                 }, (err) => {
                     this.handleError(err);
                 });
         }
     }
 
+    getSourceNodeWithPath(nodeId: string) {
+        this.documentListService.getFolderNode(nodeId, this.includeFields).subscribe((nodeEntry: NodeEntry) => {
+            this.folderNode = nodeEntry.entry;
+            this.$folderNode.next(this.folderNode);
+        });
+    }
+
     resetSelection() {
         this.dataTable.resetSelection();
         this.selection = [];
@@ -628,7 +640,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
 
     onPageLoaded(nodePaging: NodePaging) {
         if (nodePaging) {
-            this.data.loadPage(nodePaging, this.pagination.getValue().merge);
+            this.data.loadPage(nodePaging, this._pagination.merge);
             this.setLoadingState(false);
             this.onDataReady(nodePaging);
         }
@@ -787,12 +799,13 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
 
     private onDataReady(nodePaging: NodePaging) {
         this.ready.emit(nodePaging);
-
         this.pagination.next(nodePaging.list.pagination);
     }
 
-    updatePagination(pagination: PaginationModel) {
-        this.pagination.next(pagination);
+    updatePagination(requestPaginationModel: RequestPaginationModel) {
+        this._pagination.maxItems = requestPaginationModel.maxItems;
+        this._pagination.merge = requestPaginationModel.merge;
+        this._pagination.skipCount = requestPaginationModel.skipCount;
         this.reload();
     }
 

lib/content-services/document-list/data/share-datatable-adapter.ts

@@ -245,11 +245,11 @@ export class ShareDataTableAdapter implements DataTableAdapter {
         }
     }
 
-    public loadPage(page: NodePaging, merge: boolean = false) {
+    public loadPage(nodePaging: NodePaging, merge: boolean = false) {
         let shareDataRows: ShareDataRow[] = [];
 
-        if (page && page.list) {
-            let nodeEntries: NodeEntry[] = page.list.entries;
+        if (nodePaging && nodePaging.list) {
+            let nodeEntries: NodeEntry[] = nodePaging.list.entries;
             if (nodeEntries && nodeEntries.length > 0) {
                 shareDataRows = nodeEntries.map((item) => new ShareDataRow(item, this.contentService, this.permissionsStyle, this.thumbnailService));
 

lib/content-services/document-list/services/document-list.service.ts

@@ -105,6 +105,9 @@ export class DocumentListService {
             if (opts.skipCount) {
                 params.skipCount = opts.skipCount;
             }
+            if (opts.where) {
+                params.where = opts.where;
+            }
         }
 
         return from(this.apiService.getInstance().nodes.getNodeChildren(rootNodeId, params)).pipe(