From 39d0857888b927578b3a9293479a3ebcf16a2599 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Sun, 22 Sep 2024 20:36:30 +0200
Subject: [PATCH] [EDELIVERY-13775] UI Wrong page after delete
AccessToken/Certificate
---
.../user-access-tokens/user-access-tokens.component.ts | 7 +++++--
.../user-certificates/user-certificates.component.ts | 7 ++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.ts b/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.ts
index 1c1416474..2be5a50b5 100644
--- a/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.ts
+++ b/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.ts
@@ -68,9 +68,12 @@ export class UserAccessTokensComponent implements AfterViewInit, BeforeLeaveGuar
userAccessToken];
}
+ // show current page after update if possible or previous page
+ let pageIndex = Math.min(this.paginator.pageIndex,
+ Math.floor(this.accessTokens.length / this.paginator.pageSize));
+ // set the data source
this.dataSource.data = this.accessTokens;
- // show the last page
- this.paginator.lastPage();
+ this.paginator.pageIndex = pageIndex;
}
public trackListItem(index: number, credential: CredentialRo) {
diff --git a/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts b/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts
index 694b7c370..c375ab987 100644
--- a/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts
+++ b/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts
@@ -73,8 +73,13 @@ export class UserCertificatesComponent implements AfterViewInit, BeforeLeaveGuar
certificate];
}
+ // show current page after update if possible or previous page
+ let pageIndex = Math.min(this.paginator.pageIndex,
+ Math.floor(this.certificates.length / this.paginator.pageSize));
+ // set data
this.dataSource.data = this.certificates;
- // show the last page
+ // set page
+ this.paginator.pageIndex = pageIndex;
this.paginator.lastPage();
}
--
GitLab