From c2155d19dda3710766c966c11a54f63d873e1ca6 Mon Sep 17 00:00:00 2001
From: Amine FILALI <amine.filali00@gmail.com>
Date: Tue, 28 Jan 2020 10:30:42 +0100
Subject: [PATCH] Users App : Fix filter

---
 .../app/user/user-list/user-list.component.html   | 15 ++++++++++-----
 .../app/user/user-list/user-list.component.scss   |  3 +++
 2 files changed, 13 insertions(+), 5 deletions(-)

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 6a0690d3..405038b4 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
@@ -19,27 +19,32 @@
             <vitamui-common-table-filter [(filter)]="filterMap['status']" (filterChange)="onFilterChange('status', $event)">
               <vitamui-common-table-filter-option value="ENABLED">
                 <div class="table-filter-icon" i18n="@@userStatusEnabled">
-                  <i class="vitamui-icon vitamui-icon-user status-badge status-badge-green close"></i> Actif
+                  <i class="vitamui-icon vitamui-icon-user status-badge status-badge-green close"></i>
+                  <span class="badge-state">Actif</span>
                 </div>
               </vitamui-common-table-filter-option>
               <vitamui-common-table-filter-option value="BLOCKED">
                 <div class="table-filter-icon" i18n="@@userStatusBlocked">
-                  <i class="vitamui-icon vitamui-icon-user status-badge status-badge-orange close"></i> Bloqué
+                  <i class="vitamui-icon vitamui-icon-user status-badge status-badge-orange close"></i>
+                  <span class="badge-state">Bloqué</span>
                 </div>
               </vitamui-common-table-filter-option>
               <vitamui-common-table-filter-option value="DISABLED">
                 <div class="table-filter-icon" i18n="@@userStatusDisabled">
-                  <i class="vitamui-icon vitamui-icon-user status-badge status-badge-grey close"></i> Désactivé
+                  <i class="vitamui-icon vitamui-icon-user status-badge status-badge-grey close"></i>
+                  <span class="badge-state">Désactivé</span>
                 </div>
               </vitamui-common-table-filter-option>
               <vitamui-common-table-filter-option value="REMOVED">
                 <div class="table-filter-icon" i18n="@@userStatusRemoved">
-                  <i class="vitamui-icon vitamui-icon-user parent"><span class="status-badge-anonym">x</span></i> Effacé
+                  <i class="vitamui-icon vitamui-icon-user parent"><span class="status-badge-anonym">x</span></i>
+                  <span class="badge-state">Effacé</span>
                 </div>
               </vitamui-common-table-filter-option>
               <vitamui-common-table-filter-option *vitamuiCommonHasAnyRole="genericUserRole" value="GENERIC" [separator]="true">
                 <div class="table-filter-icon" i18n="@@userTypeGeneric">
-                  <i class="vitamui-icon vitamui-icon-user parent"></i> Générique
+                  <i class="vitamui-icon vitamui-icon-user parent"></i>
+                  <span class="badge-state">Générique</span>
                 </div>
               </vitamui-common-table-filter-option>
             </vitamui-common-table-filter>
diff --git a/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.scss b/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.scss
index e5292c8c..2e6300ff 100644
--- a/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.scss
+++ b/ui/ui-frontend/projects/identity/src/app/user/user-list/user-list.component.scss
@@ -41,4 +41,7 @@ app-table-filter-option .vitamui-icon {
 .table-filter-icon {
     display: flex;
     align-items: center;
+    span.badge-state {
+        margin-left: 18px;
+    }
 }
-- 
GitLab