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 944368ad88..ae166a5243 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 @@ -26,7 +26,7 @@ export class ListService implements OnDestroy { return this._maxResultCount; } - private _page = 1; + private _page = 0; set page(value: number) { this._page = value; this.get(); @@ -71,7 +71,7 @@ export class ListService implements OnDestroy { this._query$.next({ filter: this._filter || undefined, maxResultCount: this._maxResultCount, - skipCount: (this._page - 1) * this._maxResultCount, + skipCount: this._page * this._maxResultCount, sorting: this._sortOrder ? `${this._sortKey} ${this._sortOrder}` : undefined, }); }; diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html index eb45a485a8..3ecc6413ea 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html @@ -27,9 +27,9 @@ (sort)="sort($event)" [externalPaging]="true" [count]="totalCount$ | async" - [offset]="list.page - 1" + [offset]="list.page" [limit]="list.maxResultCount" - (page)="list.page = $event.offset + 1" + (page)="list.page = $event.offset" [headerHeight]="50" [footerHeight]="50" columnMode="force" diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html index 68012b3d90..e87a1e2634 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html @@ -37,9 +37,9 @@ (sort)="sort($event)" [externalPaging]="true" [count]="totalCount$ | async" - [offset]="list.page - 1" + [offset]="list.page" [limit]="list.maxResultCount" - (page)="list.page = $event.offset + 1" + (page)="list.page = $event.offset" [headerHeight]="50" [footerHeight]="50" columnMode="force" diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html index 3a391133b2..a73ccef949 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html +++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.html @@ -38,9 +38,9 @@ (sort)="sort($event)" [externalPaging]="true" [count]="totalCount$ | async" - [offset]="list.page - 1" + [offset]="list.page" [limit]="list.maxResultCount" - (page)="list.page = $event.offset + 1" + (page)="list.page = $event.offset" [headerHeight]="50" [footerHeight]="50" columnMode="force"