Merge pull request #148 from KB-iGOT/pagination-issue-fix

update for pagination issue
KB-iGOT · Dec 31, 2024 · 490bd21 · 490bd21
2 parents 6cf7c74 + 8e4b8cb
commit 490bd21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts
@@ -107,15 +107,16 @@ export class UIDirectoryTableComponent implements OnInit, AfterViewInit, OnChang
     this.showNewNoContent = this.tableData?.showNewNoContent ? true : false
     this.dataSource.data = _.get(data, 'data.currentValue', [])
     this.length = this.tableData.tableDataCount
-
     // this.paginator.firstPage()
     if (this.dataSource && this.dataSource.data && this.dataSource.data.length > 0) {
       this.tableData.loader = false
     }
-
     else if (this.dataSource && this.dataSource.data && this.dataSource.data.length === 0 && this.getFilterValue) {
       this.tableData.loader = false
     }
+    if (data && data['selectedDepartment']) {
+      this.pageIndex = 0
+    }
   }
   ngAfterViewInit() { }
 

diff --git a/project/ws/app/src/lib/routes/home/routes/directory/directory.component.html b/project/ws/app/src/lib/routes/home/routes/directory/directory.component.html
@@ -54,7 +54,7 @@
         <ws-widget-directory-table [selectedDepartment]='currentDepartment' [tableData]='tabledata' [data]='data'
           [needCreate]="currentFilter === 'mdo' || currentFilter === 'state' ? false : true"
           (eOnRowClick)="onRoleClick($event)" (actionsClick)="actionClick($event)"
-          (searchByEnterKey)="onEnterkySearch($event)">
+          (pageChangeEvent)="onPageChange($event)" (searchByEnterKey)="onEnterkySearch($event)">
         </ws-widget-directory-table>
       </ng-container>
     </mat-card-content>