From 31c3a5339aef946b55353fd4fd4a47f5b9ec7aa4 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Fri, 6 Oct 2017 20:51:43 +0100
Subject: [PATCH] pagination fixes (#2448)

---
 .../src/components/document-list.component.spec.ts         | 7 +++++++
 .../src/components/document-list.component.ts              | 1 +
 2 files changed, 8 insertions(+)

diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts
index 84963063c3..1cbcf7452b 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.spec.ts
@@ -981,4 +981,11 @@ describe('DocumentList', () => {
 
         expect(documentList.resetPagination).toHaveBeenCalledTimes(2);
     });
+
+    it('should reset folder node upon changing current folder id', () => {
+        documentList.folderNode = <any> {};
+        documentList.ngOnChanges({currentFolderId: new SimpleChange(null, '-sites-', false)});
+
+        expect(documentList.folderNode).toBeNull();
+    });
 });
diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts
index afb7e585a0..9faa88cd84 100644
--- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts
+++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.component.ts
@@ -244,6 +244,7 @@ export class DocumentListComponent implements OnInit, OnChanges, AfterContentIni
         } else if (changes.currentFolderId && changes.currentFolderId.currentValue) {
             if (changes.currentFolderId.previousValue !== changes.currentFolderId.currentValue) {
                 this.resetPagination();
+                this.folderNode = null;
             }
             if (!this.hasCustomLayout) {
                 this.setupDefaultColumns(changes.currentFolderId.currentValue);