[EDELIVERY-13775] UI Wrong page after delete AccessToken/Certificate

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) {

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();
   }