Admin UI: Loading stops before data is shown (#447)

* fix: loading should only stop after main request of page * refactor: remove unnecessary property
nmshd · Dec 13, 2023 · ac73a3e · ac73a3e
1 parent 02a64f3
commit ac73a3e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 10 deletions.
diff --git a/AdminUi/src/AdminUi/ClientApp/src/app/components/client/client-list/client-list.component.ts b/AdminUi/src/AdminUi/ClientApp/src/app/components/client/client-list/client-list.component.ts
@@ -59,9 +59,7 @@ export class ClientListComponent {
             next: (data: PagedHttpResponseEnvelope<TierOverview>) => {
                 this.tiers = data.result;
             },
-            complete: () => (this.loading = false),
             error: (err: any) => {
-                this.loading = false;
                 const errorMessage = err.error?.error?.message ?? err.message;
                 this.snackBar.open(errorMessage, "Dismiss", {
                     verticalPosition: "top",

diff --git a/...nUi/ClientApp/src/app/components/quotas/identity/identity-list/identity-list.component.ts b/...nUi/ClientApp/src/app/components/quotas/identity/identity-list/identity-list.component.ts
@@ -9,12 +9,8 @@ export class IdentityListComponent {
     public header: string;
     public headerDescription: string;
 
-    public loading: boolean;
-
     public constructor() {
         this.header = "Identities";
         this.headerDescription = "A list of existing Identities";
-
-        this.loading = false;
     }
 }
diff --git a/.../ClientApp/src/app/components/shared/identities-overview/identities-overview.component.ts b/.../ClientApp/src/app/components/shared/identities-overview/identities-overview.component.ts
@@ -122,9 +122,7 @@ export class IdentitiesOverviewComponent {
             next: (data: PagedHttpResponseEnvelope<TierOverview>) => {
                 this.tiers = data.result;
             },
-            complete: () => (this.loading = false),
             error: (err: any) => {
-                this.loading = false;
                 const errorMessage = err.error?.error?.message ?? err.message;
                 this.snackBar.open(errorMessage, "Dismiss", {
                     verticalPosition: "top",
@@ -145,9 +143,7 @@ export class IdentitiesOverviewComponent {
             next: (data: PagedHttpResponseEnvelope<ClientOverview>) => {
                 this.clients = data.result;
             },
-            complete: () => (this.loading = false),
             error: (err: any) => {
-                this.loading = false;
                 const errorMessage = err.error?.error?.message ?? err.message;
                 this.snackBar.open(errorMessage, "Dismiss", {
                     verticalPosition: "top",