Browse Source

Fix PR comments

pull/6256/head
Karel De Smet 2 days ago
parent
commit
0f06e0adbf
  1. 1
      CHANGELOG.md
  2. 8
      apps/client/src/app/components/admin-users/admin-users.component.ts
  3. 2
      apps/client/src/app/components/user-detail-dialog/interfaces/interfaces.ts
  4. 3
      apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts

1
CHANGELOG.md

@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Upgraded `angular` from version `21.0.6` to `21.1.1` - Upgraded `angular` from version `21.0.6` to `21.1.1`
- Upgraded `Nx` from version `22.3.3` to `22.4.1` - Upgraded `Nx` from version `22.3.3` to `22.4.1`
- Upgraded `prettier` from version `3.8.0` to `3.8.1` - Upgraded `prettier` from version `3.8.0` to `3.8.1`
- Extended the user detail dialog with an actions menu
## 2.233.0 - 2026-01-23 ## 2.233.0 - 2026-01-23

8
apps/client/src/app/components/admin-users/admin-users.component.ts

@ -208,7 +208,7 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
.deleteUser(aId) .deleteUser(aId)
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))
.subscribe(() => { .subscribe(() => {
this.fetchUsers(); this.router.navigate(['..'], { relativeTo: this.route });
}); });
}, },
confirmType: ConfirmationDialogType.Warn, confirmType: ConfirmationDialogType.Warn,
@ -293,11 +293,11 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
>(GfUserDetailDialogComponent, { >(GfUserDetailDialogComponent, {
autoFocus: false, autoFocus: false,
data: { data: {
currentUserId: this.user?.id,
deviceType: this.deviceType, deviceType: this.deviceType,
hasPermissionForSubscription: this.hasPermissionForSubscription, hasPermissionForSubscription: this.hasPermissionForSubscription,
locale: this.user?.settings?.locale, locale: this.user?.settings?.locale,
userId: aUserId, userId: aUserId
currentUserId: this.user?.id
}, },
height: this.deviceType === 'mobile' ? '98vh' : '60vh', height: this.deviceType === 'mobile' ? '98vh' : '60vh',
width: this.deviceType === 'mobile' ? '100vw' : '50rem' width: this.deviceType === 'mobile' ? '100vw' : '50rem'
@ -307,7 +307,7 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
.afterClosed() .afterClosed()
.pipe(takeUntil(this.unsubscribeSubject)) .pipe(takeUntil(this.unsubscribeSubject))
.subscribe((data) => { .subscribe((data) => {
if (data?.userId) { if (data?.action === 'delete' && data?.userId) {
this.onDeleteUser(data.userId); this.onDeleteUser(data.userId);
} else { } else {
this.router.navigate( this.router.navigate(

2
apps/client/src/app/components/user-detail-dialog/interfaces/interfaces.ts

@ -1,7 +1,7 @@
export interface UserDetailDialogParams { export interface UserDetailDialogParams {
currentUserId: string;
deviceType: string; deviceType: string;
hasPermissionForSubscription: boolean; hasPermissionForSubscription: boolean;
locale: string; locale: string;
userId: string; userId: string;
currentUserId: string;
} }

3
apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts

@ -74,7 +74,8 @@ export class GfUserDetailDialogComponent implements OnDestroy, OnInit {
public deleteUser() { public deleteUser() {
this.dialogRef.close({ this.dialogRef.close({
userId: this.data.userId userId: this.data.userId,
action: 'delete'
}); });
} }

Loading…
Cancel
Save