From 00d125ded3ee41337d964692942bbae0af5c5765 Mon Sep 17 00:00:00 2001
From: Sinan997 <sinanozturk997@gmail.com>
Date: Tue, 1 Aug 2023 09:57:23 +0300
Subject: [PATCH] hold current page

---
 .../packages/core/src/lib/services/list.service.ts  | 13 ++++++++-----
 .../src/lib/proxy/identity/identity-user.service.ts |  7 +++++--
 .../src/lib/components/users/users.component.ts     |  5 ++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/services/list.service.ts b/npm/ng-packs/packages/core/src/lib/services/list.service.ts
index 3025b91682..00eed90933 100644
--- a/npm/ng-packs/packages/core/src/lib/services/list.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/list.service.ts
@@ -121,12 +121,15 @@ export class ListService<QueryParamsType = ABP.PageQueryParams | any> implements
   }
 
   private resetPageWhenUnchanged() {
+    console.log('this.page',this._page);
+    console.log('this._maxResultCount',this._maxResultCount);
+    console.log('this._skipCount',this._skipCount);
     const skipCount = this._page * this._maxResultCount;
-
-    if (skipCount === this._skipCount) {
-      this._page = 0;
-      this._skipCount = 0;
-    } else this._skipCount = skipCount;
+    console.log({skipCount});
+    this._skipCount = skipCount;
+    console.log('this.page',this._page);
+    console.log('this._maxResultCount',this._maxResultCount);
+    console.log('this._skipCount',this._skipCount);
   }
 
   private next() {
diff --git a/npm/ng-packs/packages/identity/proxy/src/lib/proxy/identity/identity-user.service.ts b/npm/ng-packs/packages/identity/proxy/src/lib/proxy/identity/identity-user.service.ts
index 1d36c7a2e7..b7951bca10 100644
--- a/npm/ng-packs/packages/identity/proxy/src/lib/proxy/identity/identity-user.service.ts
+++ b/npm/ng-packs/packages/identity/proxy/src/lib/proxy/identity/identity-user.service.ts
@@ -52,13 +52,16 @@ export class IdentityUserService {
     },
     { apiName: this.apiName });
 
-  getList = (input: GetIdentityUsersInput) =>
-    this.restService.request<any, PagedResultDto<IdentityUserDto>>({
+  getList = (input: GetIdentityUsersInput) => {
+    console.log({input});
+    return this.restService.request<any, PagedResultDto<IdentityUserDto>>({
       method: 'GET',
       url: '/api/identity/users',
       params: { filter: input.filter, sorting: input.sorting, skipCount: input.skipCount, maxResultCount: input.maxResultCount },
     },
     { apiName: this.apiName });
+  }
+
 
   getRoles = (id: string) =>
     this.restService.request<any, ListResultDto<IdentityRoleDto>>({
diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
index 6dd1ab9f17..5dcd3be238 100644
--- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
+++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
@@ -184,7 +184,10 @@ export class UsersComponent implements OnInit {
   }
 
   private hookToQuery() {
-    this.list.hookToQuery(query => this.service.getList(query)).subscribe(res => (this.data = res));
+    this.list.hookToQuery(query => this.service.getList(query)).subscribe(res => {
+      (this.data = res)
+      console.log(this.data);
+    });
   }
 
   openPermissionsModal(providerKey: string, entityDisplayName?: string) {