From d414e540c923c97551e50a5e75a41a45f58eb66d Mon Sep 17 00:00:00 2001
From: dhrn <14145706+dhrn@users.noreply.github.com>
Date: Wed, 22 Jul 2020 19:01:10 +0530
Subject: [PATCH] [ACA-3752][ADW] Pagination values are not passed when a
 filter is applied (#1547)

---
 src/app/components/files/files.component.html | 36 ++++---------------
 src/app/components/page.component.ts          |  9 +----
 2 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/src/app/components/files/files.component.html b/src/app/components/files/files.component.html
index 933546001..0fe16dc73 100644
--- a/src/app/components/files/files.component.html
+++ b/src/app/components/files/files.component.html
@@ -1,12 +1,6 @@
 <aca-page-layout [hasError]="!isValidPath">
   <aca-page-layout-header>
-    <adf-breadcrumb
-      [root]="title"
-      [folderNode]="node"
-      [maxItems]="isSmallScreen ? 1 : 0"
-      (navigate)="onBreadcrumbNavigate($event)"
-    >
-    </adf-breadcrumb>
+    <adf-breadcrumb [root]="title" [folderNode]="node" [maxItems]="isSmallScreen ? 1 : 0" (navigate)="onBreadcrumbNavigate($event)"> </adf-breadcrumb>
 
     <adf-toolbar class="adf-toolbar--inline">
       <ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
@@ -21,11 +15,7 @@
 
   <aca-page-layout-content>
     <div class="main-content">
-      <adf-upload-drag-area
-        [rootFolderId]="node?.id"
-        [disabled]="!canUpload"
-        (updateFileVersion)="onUploadNewVersion($event)"
-      >
+      <adf-upload-drag-area [rootFolderId]="node?.id" [disabled]="!canUpload" (updateFileVersion)="onUploadNewVersion($event)">
         <adf-document-list
           #documentList
           acaDocumentList
@@ -47,8 +37,8 @@
               <adf-search-header
                 [col]="col"
                 [currentFolderNodeId]="node?.id"
-                [maxItems]="pagination?.maxItems"
-                [skipCount]="pagination?.skipCount"
+                [maxItems]="(documentList?.pagination | async)?.maxItems"
+                [skipCount]="(documentList?.pagination | async)?.skipCount"
                 (update)="onFilterUpdate($event)"
                 (clear)="onAllFilterCleared()"
               >
@@ -57,11 +47,7 @@
           </adf-custom-header-filter-template>
           <data-columns>
             <ng-container *ngFor="let column of columns; trackBy: trackById">
-              <ng-container
-                *ngIf="
-                  column.template && !(column.desktopOnly && isSmallScreen)
-                "
-              >
+              <ng-container *ngIf="column.template && !(column.desktopOnly && isSmallScreen)">
                 <data-column
                   [key]="column.key"
                   [title]="column.title"
@@ -71,20 +57,12 @@
                   [sortable]="column.sortable"
                 >
                   <ng-template let-context>
-                    <adf-dynamic-column
-                      [id]="column.template"
-                      [context]="context"
-                    >
-                    </adf-dynamic-column>
+                    <adf-dynamic-column [id]="column.template" [context]="context"> </adf-dynamic-column>
                   </ng-template>
                 </data-column>
               </ng-container>
 
-              <ng-container
-                *ngIf="
-                  !column.template && !(column.desktopOnly && isSmallScreen)
-                "
-              >
+              <ng-container *ngIf="!column.template && !(column.desktopOnly && isSmallScreen)">
                 <data-column
                   [key]="column.key"
                   [title]="column.title"
diff --git a/src/app/components/page.component.ts b/src/app/components/page.component.ts
index e93bac287..aba16b5ed 100644
--- a/src/app/components/page.component.ts
+++ b/src/app/components/page.component.ts
@@ -28,7 +28,7 @@ import { ShowHeaderMode } from '@alfresco/adf-core';
 import { ContentActionRef, SelectionState } from '@alfresco/adf-extensions';
 import { OnDestroy, OnInit, OnChanges, ViewChild, SimpleChanges, Directive } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { MinimalNodeEntity, MinimalNodeEntryEntity, Pagination, NodePaging } from '@alfresco/js-api';
+import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging } from '@alfresco/js-api';
 import { Observable, Subject, Subscription } from 'rxjs';
 import { takeUntil, map } from 'rxjs/operators';
 import { ContentManagementService } from '../services/content-management.service';
@@ -65,7 +65,6 @@ export abstract class PageComponent implements OnInit, OnDestroy, OnChanges {
   canUpdateNode = false;
   canUpload = false;
   nodeResult: NodePaging;
-  pagination: Pagination;
   showHeader = ShowHeaderMode.Always;
 
   protected subscriptions: Subscription[] = [];
@@ -98,12 +97,6 @@ export abstract class PageComponent implements OnInit, OnDestroy, OnChanges {
       .subscribe((node) => {
         this.canUpload = node && this.content.canUploadContent(node);
       });
-
-    if (this.documentList && this.documentList.pagination) {
-      this.documentList.pagination.pipe(takeUntil(this.onDestroy$)).subscribe((newPagination: Pagination) => {
-        this.pagination = newPagination;
-      });
-    }
   }
 
   ngOnChanges(changes: SimpleChanges) {