Browse Source

Fix loading indicators

pull/7520/head
Thomas Kaul 4 weeks ago
parent
commit
9ce6b0e8b2
  1. 3
      apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
  2. 28
      apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html

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

@ -56,6 +56,7 @@ export class GfUserDetailDialogComponent implements OnInit {
protected readonly baseCurrency: string; protected readonly baseCurrency: string;
protected readonly canDeleteUser = canDeleteUser; protected readonly canDeleteUser = canDeleteUser;
protected readonly getCountryName = getCountryName; protected readonly getCountryName = getCountryName;
protected isLoading = true;
protected readonly subscriptionsDataSource = protected readonly subscriptionsDataSource =
new MatTableDataSource<Subscription>(); new MatTableDataSource<Subscription>();
protected readonly subscriptionsDisplayedColumns = [ protected readonly subscriptionsDisplayedColumns = [
@ -101,6 +102,8 @@ export class GfUserDetailDialogComponent implements OnInit {
this.subscriptionsDataSource.data = this.user.subscriptions ?? []; this.subscriptionsDataSource.data = this.user.subscriptions ?? [];
this.isLoading = false;
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();
}); });
} }

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

@ -36,12 +36,14 @@
i18n i18n
size="medium" size="medium"
[enableCopyToClipboardButton]="true" [enableCopyToClipboardButton]="true"
[value]="user?.id" [value]="isLoading ? undefined : user.id"
>User ID</gf-value >User ID</gf-value
> >
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value i18n size="medium" [value]="user?.role">Role</gf-value> <gf-value i18n size="medium" [value]="isLoading ? undefined : user.role"
>Role</gf-value
>
</div> </div>
</div> </div>
@ -52,7 +54,7 @@
size="medium" size="medium"
[isDate]="true" [isDate]="true"
[locale]="data.locale" [locale]="data.locale"
[value]="user?.createdAt" [value]="isLoading ? undefined : user.createdAt"
>Registration Date</gf-value >Registration Date</gf-value
> >
</div> </div>
@ -61,7 +63,7 @@
i18n i18n
size="medium" size="medium"
[locale]="data.locale" [locale]="data.locale"
[value]="user?.provider" [value]="isLoading ? undefined : user.provider"
>Authentication</gf-value >Authentication</gf-value
> >
</div> </div>
@ -74,7 +76,9 @@
i18n i18n
size="medium" size="medium"
[locale]="data.locale" [locale]="data.locale"
[value]="user?.subscription ? 'Premium' : 'Basic'" [value]="
isLoading ? undefined : user.subscription ? 'Premium' : 'Basic'
"
>Membership</gf-value >Membership</gf-value
> >
</div> </div>
@ -83,7 +87,11 @@
i18n i18n
size="medium" size="medium"
[value]=" [value]="
user?.country ? getCountryName({ code: user.country }) : '-' isLoading
? undefined
: user.country
? getCountryName({ code: user.country })
: '-'
" "
>Country</gf-value >Country</gf-value
> >
@ -97,7 +105,7 @@
i18n i18n
size="medium" size="medium"
[locale]="data.locale" [locale]="data.locale"
[value]="user?.accountCount" [value]="isLoading ? undefined : user.accountCount"
>Accounts</gf-value >Accounts</gf-value
> >
</div> </div>
@ -106,7 +114,7 @@
i18n i18n
size="medium" size="medium"
[locale]="data.locale" [locale]="data.locale"
[value]="user?.activityCount" [value]="isLoading ? undefined : user.activityCount"
>Activities</gf-value >Activities</gf-value
> >
</div> </div>
@ -120,7 +128,7 @@
size="medium" size="medium"
[locale]="data.locale" [locale]="data.locale"
[precision]="0" [precision]="0"
[value]="user?.engagement" [value]="isLoading ? undefined : user.engagement"
>Engagement per Day</gf-value >Engagement per Day</gf-value
> >
</div> </div>
@ -129,7 +137,7 @@
i18n i18n
size="medium" size="medium"
[locale]="data.locale" [locale]="data.locale"
[value]="user?.dailyApiRequests" [value]="isLoading ? undefined : user.dailyApiRequests"
>API Requests Today</gf-value >API Requests Today</gf-value
> >
</div> </div>

Loading…
Cancel
Save