Browse Source

Refactoring

pull/5844/head
Thomas Kaul 1 week ago
parent
commit
24c5dad6c1
  1. 5
      apps/client/src/app/components/admin-users/admin-users.component.ts
  2. 1
      apps/client/src/app/components/user-detail-dialog/interfaces/interfaces.ts
  3. 58
      apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html

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

@ -278,9 +278,9 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
}); });
} }
private openUserDetailDialog(userId: string) { private openUserDetailDialog(aUserId: string) {
const userData = this.dataSource.data.find(({ id }) => { const userData = this.dataSource.data.find(({ id }) => {
return id === userId; return id === aUserId;
}); });
if (!userData) { if (!userData) {
@ -293,6 +293,7 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
data: { data: {
userData, userData,
deviceType: this.deviceType, deviceType: this.deviceType,
hasPermissionForSubscription: this.hasPermissionForSubscription,
locale: this.user?.settings?.locale locale: this.user?.settings?.locale
} as UserDetailDialogParams, } as UserDetailDialogParams,
height: this.deviceType === 'mobile' ? '98vh' : '60vh', height: this.deviceType === 'mobile' ? '98vh' : '60vh',

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

@ -2,6 +2,7 @@ import { AdminUsers } from '@ghostfolio/common/interfaces';
export interface UserDetailDialogParams { export interface UserDetailDialogParams {
deviceType: string; deviceType: string;
hasPermissionForSubscription: boolean;
locale: string; locale: string;
userData: AdminUsers['users'][0]; userData: AdminUsers['users'][0];
} }

58
apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html

@ -31,11 +31,13 @@
Role Role
</gf-value> </gf-value>
</div> </div>
<div class="col-6 mb-3"> @if (data.hasPermissionForSubscription) {
<gf-value i18n size="medium" [value]="data.userData.country"> <div class="col-6 mb-3">
Country <gf-value i18n size="medium" [value]="data.userData.country">
</gf-value> Country
</div> </gf-value>
</div>
}
</div> </div>
<div class="mb-3 row"> <div class="mb-3 row">
@ -61,29 +63,31 @@
</div> </div>
</div> </div>
<div class="mb-3 row"> @if (data.hasPermissionForSubscription) {
<div class="col-6 mb-3"> <div class="mb-3 row">
<gf-value <div class="col-6 mb-3">
i18n <gf-value
size="medium" i18n
[locale]="data.locale" size="medium"
[precision]="0" [locale]="data.locale"
[value]="data.userData.engagement" [precision]="0"
> [value]="data.userData.engagement"
Engagement per Day >
</gf-value> Engagement per Day
</div> </gf-value>
<div class="col-6 mb-3"> </div>
<gf-value <div class="col-6 mb-3">
i18n <gf-value
size="medium" i18n
[locale]="data.locale" size="medium"
[value]="data.userData.dailyApiRequests" [locale]="data.locale"
> [value]="data.userData.dailyApiRequests"
API Requests Today >
</gf-value> API Requests Today
</gf-value>
</div>
</div> </div>
</div> }
</div> </div>
</div> </div>

Loading…
Cancel
Save