diff --git a/apps/client/src/app/components/admin-users/admin-users.component.ts b/apps/client/src/app/components/admin-users/admin-users.component.ts
index c2bf62d21..e708ec010 100644
--- a/apps/client/src/app/components/admin-users/admin-users.component.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.component.ts
@@ -80,7 +80,6 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
public displayedColumns: string[] = [];
public deviceType: string;
public getEmojiFlag = getEmojiFlag;
- public hasImpersonationId: boolean;
public hasPermissionForSubscription: boolean;
public hasPermissionToImpersonateAllUsers: boolean;
public info: InfoItem;
@@ -97,10 +96,10 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
private dataService: DataService,
private deviceService: DeviceDetectorService,
private dialog: MatDialog,
- private route: ActivatedRoute,
- private router: Router,
private impersonationStorageService: ImpersonationStorageService,
private notificationService: NotificationService,
+ private route: ActivatedRoute,
+ private router: Router,
private tokenStorageService: TokenStorageService,
private userService: UserService
) {
@@ -153,17 +152,16 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
addIcons({
contractOutline,
ellipsisHorizontal,
- personOutline,
keyOutline,
+ personOutline,
trashOutline
});
this.deviceType = this.deviceService.getDeviceInfo().deviceType;
- this.hasImpersonationId = !!this.impersonationStorageService.getId();
this.route.queryParams
.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((params) => {
- if (params['userId'] && params['userDetailDialog']) {
+ if (params['userDetailDialog'] && params['userId']) {
this.openUserDetailDialog(params['userId']);
}
});
@@ -185,9 +183,8 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
const dialogRef = this.dialog.open(GfUserDetailDialogComponent, {
autoFocus: false,
data: {
- userId: userId,
+ userId,
deviceType: this.deviceType,
- hasImpersonationId: this.hasImpersonationId,
userData: userData // Pass the user data
} as UserDetailDialogParams,
height: this.deviceType === 'mobile' ? '80vh' : '60vh',
diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html
index 23a371a89..e802e3272 100644
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@@ -264,9 +264,8 @@
>
diff --git a/apps/client/src/app/components/user-detail-dialog/interfaces/interfaces.ts b/apps/client/src/app/components/user-detail-dialog/interfaces/interfaces.ts
index 06a437b3f..0d75fdbe2 100644
--- a/apps/client/src/app/components/user-detail-dialog/interfaces/interfaces.ts
+++ b/apps/client/src/app/components/user-detail-dialog/interfaces/interfaces.ts
@@ -1,8 +1,7 @@
import { AdminUsers } from '@ghostfolio/common/interfaces';
export interface UserDetailDialogParams {
- userId: string;
deviceType: string;
- hasImpersonationId: boolean;
userData?: AdminUsers['users'][0];
+ userId: string;
}
diff --git a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.scss b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.scss
index 35825fc9a..b63df0134 100644
--- a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.scss
+++ b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.scss
@@ -4,21 +4,4 @@
.mat-mdc-dialog-content {
max-height: unset;
}
-
- .text-monospace {
- font-family:
- 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
- font-size: 0.875rem;
- }
-
- small {
- font-size: 0.75rem;
- font-weight: 500;
- }
-
- h5 {
- font-size: 1.25rem;
- font-weight: 600;
- margin-bottom: 1rem;
- }
}
diff --git a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
index d3e67be15..7184055fe 100644
--- a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
+++ b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
@@ -1,6 +1,7 @@
import { GfDialogFooterComponent } from '@ghostfolio/client/components/dialog-footer/dialog-footer.component';
import { GfDialogHeaderComponent } from '@ghostfolio/client/components/dialog-header/dialog-header.component';
import { User } from '@ghostfolio/common/interfaces';
+import { GfValueComponent } from '@ghostfolio/ui/value';
import { CommonModule } from '@angular/common';
import {
@@ -28,6 +29,7 @@ import { UserDetailDialogParams } from './interfaces/interfaces';
CommonModule,
GfDialogFooterComponent,
GfDialogHeaderComponent,
+ GfValueComponent,
MatButtonModule,
MatDialogModule
],
@@ -37,11 +39,11 @@ import { UserDetailDialogParams } from './interfaces/interfaces';
templateUrl: './user-detail-dialog.html'
})
export class GfUserDetailDialogComponent implements OnDestroy, OnInit {
- private unsubscribeSubject = new Subject();
+ public isLoading = false;
+ public registrationDate: Date;
public user: User;
public userId: string;
- public registrationDate: Date;
- public isLoading = false;
+ private unsubscribeSubject = new Subject();
public constructor(
private changeDetectorRef: ChangeDetectorRef,
@@ -52,18 +54,14 @@ export class GfUserDetailDialogComponent implements OnDestroy, OnInit {
addIcons({ personOutline });
}
- public ngOnInit(): void {
+ public ngOnInit() {
this.initialize();
}
- public onClose(): void {
+ public onClose() {
this.dialogRef.close();
}
- private initialize(): void {
- this.fetchUserDetails();
- }
-
private fetchUserDetails(): void {
this.isLoading = true;
@@ -81,8 +79,11 @@ export class GfUserDetailDialogComponent implements OnDestroy, OnInit {
this.changeDetectorRef.markForCheck();
}
}
+ private initialize() {
+ this.fetchUserDetails();
+ }
- public ngOnDestroy(): void {
+ public ngOnDestroy() {
this.unsubscribeSubject.next();
this.unsubscribeSubject.complete();
}
diff --git a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html
index a16c65074..79e7f69df 100644
--- a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html
+++ b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html
@@ -9,22 +9,18 @@
-
User Information
+ User Information
-
- User ID
- {{ userId }}
-
+
User ID
-
- Registration Date
- {{ registrationDate | date: 'medium' }}
-
+
Registration Date