From 663702c7974d9c5e4a1ddf143c9947640282270e Mon Sep 17 00:00:00 2001
From: Cindy <cindy.nacibide@teamdlab.com>
Date: Tue, 8 Dec 2020 18:30:13 +0100
Subject: [PATCH] [FIX TRTL-567] move spinner outside table
---
.../app/shared/profiles-form/profiles-form.component.html | 2 --
.../src/app/shared/profiles-form/profiles-form.component.ts | 1 -
.../identity/src/app/user/user-list/user-list.component.html | 5 ++++-
ui/ui-frontend/projects/identity/src/index.html | 2 +-
ui/ui-frontend/projects/portal/src/index.html | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ui/ui-frontend/projects/identity/src/app/shared/profiles-form/profiles-form.component.html b/ui/ui-frontend/projects/identity/src/app/shared/profiles-form/profiles-form.component.html
index e9f7ba088..9406c5846 100644
--- a/ui/ui-frontend/projects/identity/src/app/shared/profiles-form/profiles-form.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/shared/profiles-form/profiles-form.component.html
@@ -50,6 +50,4 @@
</div>
<div *ngIf="loading" class="vitamui-min-content">
<mat-spinner class="vitamui-spinner medium"></mat-spinner>
-</div>
-<div class="table-container">
</div>
\ No newline at end of file
diff --git a/ui/ui-frontend/projects/identity/src/app/shared/profiles-form/profiles-form.component.ts b/ui/ui-frontend/projects/identity/src/app/shared/profiles-form/profiles-form.component.ts
index 60bffa853..a585c078d 100644
--- a/ui/ui-frontend/projects/identity/src/app/shared/profiles-form/profiles-form.component.ts
+++ b/ui/ui-frontend/projects/identity/src/app/shared/profiles-form/profiles-form.component.ts
@@ -132,7 +132,6 @@ export class ProfilesFormComponent implements ControlValueAccessor, OnInit {
}
getProfiles() {
- this.loading = true;
const params = new HttpParams().set('filterApp', 'false');
this.appApiService.getAllByParams(params).pipe(
tap((applications) => this.applicationsDetails = applications.APPLICATION_CONFIGURATION),
diff --git a/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.html b/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.html
index c3bee067d..3131b36d9 100644
--- a/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.html
+++ b/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.html
@@ -135,10 +135,13 @@
</div>
</div>
- <div *ngIf="!dataSource || pending then loadingSpinner"></div>
+
</div>
+ </div>
+ <div *ngIf="!dataSource || pending then loadingSpinner"></div>
+</div>
<ng-template #loadingSpinner>
<div class="vitamui-min-content">
<mat-spinner class="vitamui-spinner medium"></mat-spinner>
diff --git a/ui/ui-frontend/projects/identity/src/index.html b/ui/ui-frontend/projects/identity/src/index.html
index f3b12e9e2..02beee66e 100644
--- a/ui/ui-frontend/projects/identity/src/index.html
+++ b/ui/ui-frontend/projects/identity/src/index.html
@@ -11,7 +11,7 @@
<link rel="dns-prefetch" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link rel="dns-prefetch" href="https://fonts.gstatic.com">
- <link href="https://fonts.googleapis.com/css?family=Mulish&display=swap" rel="stylesheet">
+ <link href="https://fonts.googleapis.com/css?family=Mulish:200,300,400,500,600,700,800,900&display=swap" rel="stylesheet">
<meta name="theme-color" content="#1976d2">
</head>
<body>
diff --git a/ui/ui-frontend/projects/portal/src/index.html b/ui/ui-frontend/projects/portal/src/index.html
index 6bbcdf094..4db6619cb 100644
--- a/ui/ui-frontend/projects/portal/src/index.html
+++ b/ui/ui-frontend/projects/portal/src/index.html
@@ -12,7 +12,7 @@
<link rel="dns-prefetch" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link rel="dns-prefetch" href="https://fonts.gstatic.com">
- <link href="https://fonts.googleapis.com/css?family=Mulish&display=swap" rel="stylesheet">
+ <link href="https://fonts.googleapis.com/css?family=Mulish:200,300,400,500,600,700,800,900&display=swap" rel="stylesheet">
<meta name="theme-color" content="#1976d2">
</head>
<body>
--
GitLab