fix pagination, bump version
This commit is contained in:
@@ -7,8 +7,9 @@
|
||||
</button>
|
||||
</header>
|
||||
|
||||
<div class="mat-elevation-z8">
|
||||
<table mat-table [dataSource]="dataSource" matSort (matSortChange)="onSortChange($event)">
|
||||
@if (!!userAliases) {
|
||||
<div>
|
||||
<table mat-table [dataSource]="userAliases.content" matSort (matSortChange)="updateSort($event)">
|
||||
<ng-container matColumnDef="id">
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{'admin.user_aliases.id' | i18n}}</th>
|
||||
<td mat-cell *matCellDef="let alias">{{alias.id}}</td>
|
||||
@@ -20,12 +21,12 @@
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="target">
|
||||
<th mat-header-cell *matHeaderCellDef>{{'admin.user_aliases.target' | i18n}}</th>
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{'admin.user_aliases.target' | i18n}}</th>
|
||||
<td mat-cell *matCellDef="let alias">{{alias.target}}</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="visibility">
|
||||
<th mat-header-cell *matHeaderCellDef>{{'admin.user_aliases.visibility' | i18n}}</th>
|
||||
<th mat-header-cell *matHeaderCellDef mat-sort-header>{{'admin.user_aliases.visibility' | i18n}}</th>
|
||||
<td mat-cell *matCellDef="let alias">{{alias.visibility}}</td>
|
||||
</ng-container>
|
||||
|
||||
@@ -46,10 +47,11 @@
|
||||
</table>
|
||||
|
||||
<mat-paginator
|
||||
[length]="totalElements"
|
||||
[pageSize]="pageSize"
|
||||
[pageSizeOptions]="[5, 10, 25, 50, 100]"
|
||||
(page)="onPageChange($event)"
|
||||
[pageSizeOptions]="pageSizeOptions"
|
||||
[length]="userAliases.page.totalElements"
|
||||
[pageSize]="userAliases.page.size"
|
||||
(page)="updatePages($event)"
|
||||
showFirstLastButtons>
|
||||
</mat-paginator>
|
||||
</div>
|
||||
}
|
||||
|
||||
@@ -16,10 +16,10 @@ import { AdminUserAliasEditDialog } from './user-alias.edit';
|
||||
})
|
||||
export class AdminUserAliasesComponent implements OnInit {
|
||||
displayedColumns: string[] = ['id', 'alias', 'target', 'visibility', 'actions'];
|
||||
dataSource: MatTableDataSource<any>;
|
||||
totalElements = 0;
|
||||
pageSize = 10;
|
||||
pageIndex = 0;
|
||||
|
||||
userAliases: any;
|
||||
page: any = { page: 0, size: 10, sort: "id", desc: false };
|
||||
pageSizeOptions: number[] = [5, 10, 25, 50];
|
||||
|
||||
@ViewChild(MatPaginator) paginator!: MatPaginator;
|
||||
@ViewChild(MatSort) sort!: MatSort;
|
||||
@@ -29,7 +29,6 @@ export class AdminUserAliasesComponent implements OnInit {
|
||||
private i18n: I18nService,
|
||||
private dialog: MatDialog
|
||||
) {
|
||||
this.dataSource = new MatTableDataSource();
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
@@ -37,10 +36,9 @@ export class AdminUserAliasesComponent implements OnInit {
|
||||
}
|
||||
|
||||
loadAliases(): void {
|
||||
this.userAliasManagementService.getAliases(this.pageIndex, this.pageSize).subscribe(
|
||||
this.userAliasManagementService.getAliases(this.page.page, this.page.size).subscribe(
|
||||
(data: any) => {
|
||||
this.dataSource.data = data.content || data;
|
||||
this.totalElements = data.totalElements || data.length;
|
||||
this.userAliases = data;
|
||||
},
|
||||
error => {
|
||||
console.error('Error loading user aliases:', error);
|
||||
@@ -48,15 +46,21 @@ export class AdminUserAliasesComponent implements OnInit {
|
||||
);
|
||||
}
|
||||
|
||||
onPageChange(event: PageEvent): void {
|
||||
this.pageIndex = event.pageIndex;
|
||||
this.pageSize = event.pageSize;
|
||||
updatePages(event: PageEvent): void {
|
||||
this.page.page = event.pageIndex;
|
||||
this.page.size = event.pageSize;
|
||||
this.loadAliases();
|
||||
}
|
||||
|
||||
onSortChange(sort: any): void {
|
||||
// Sorting can be implemented when backend supports it
|
||||
console.log('Sort change:', sort);
|
||||
updateSort(sort: any): void {
|
||||
if (sort.direction == "") {
|
||||
this.page.sort = "id";
|
||||
this.page.desc = false;
|
||||
} else {
|
||||
this.page.sort = sort.active;
|
||||
this.page.desc = sort.direction == "desc";
|
||||
}
|
||||
this.loadAliases();
|
||||
}
|
||||
|
||||
deleteAlias(alias: any): void {
|
||||
|
||||
Reference in New Issue
Block a user