fix(client): Corrections beans JSF et pages XHTML
- UserListBean: correction getTotalCount(), searchTerm(), méthodes statistiques - RoleGestionBean: correction assignRoleToUser/revokeRoleFromUser, getUserRolesDTOs - Pages: correction paramètres hasSubmitAction, useParentForm, update IDs - assign.xhtml: simplification expression EL avec méthode dédiée
This commit is contained in:
lionsdev
@@ -22,9 +22,7 @@
|
||||
<ui:include src="/templates/components/role-management/role-assignment.xhtml">
|
||||
<ui:param name="user" value="#{userProfilBean.user}" />
|
||||
<ui:param name="availableRoles" value="#{roleGestionBean.allRoles}" />
|
||||
<ui:param name="userRoles" value="#{userProfilBean.user.realmRoles != null ? roleGestionBean.allRoles.stream().filter(r -> userProfilBean.user.realmRoles.contains(r.name)).collect(java.util.stream.Collectors.toList()) : new java.util.ArrayList()}" />
|
||||
<ui:param name="assignAction" value="#{roleGestionBean.assignRoleToUser(userProfilBean.user.id, role.id)}" />
|
||||
<ui:param name="revokeAction" value="#{roleGestionBean.revokeRoleFromUser(userProfilBean.user.id, role.id)}" />
|
||||
<ui:param name="userRoles" value="#{roleGestionBean.getUserRolesDTOs(userProfilBean.user)}" />
|
||||
<ui:param name="update" value="roleAssignmentPanel" />
|
||||
</ui:include>
|
||||
</div>
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
<f:selectItems value="#{roleGestionBean.availableRealms}" />
|
||||
<p:ajax event="change"
|
||||
listener="#{roleGestionBean.loadRealmRoles}"
|
||||
update="realmRolesPanel clientRolesPanel" />
|
||||
update=":formRealmRoles:realmRolesPanel :formClientRoles:clientRolesPanel" />
|
||||
</p:selectOneMenu>
|
||||
|
||||
<p:outputLabel for="clientFilter" value="Client" />
|
||||
@@ -59,7 +59,7 @@
|
||||
<f:selectItems value="#{roleGestionBean.availableClients}" />
|
||||
<p:ajax event="change"
|
||||
listener="#{roleGestionBean.loadClientRoles}"
|
||||
update="clientRolesPanel" />
|
||||
update=":formClientRoles:clientRolesPanel" />
|
||||
</p:selectOneMenu>
|
||||
|
||||
<p:outputLabel for="typeFilter" value="Type" />
|
||||
@@ -131,7 +131,9 @@
|
||||
<ui:param name="mode" value="create" />
|
||||
<ui:param name="showClientSelector" value="false" />
|
||||
<ui:param name="submitAction" value="#{roleGestionBean.createRealmRole}" />
|
||||
<ui:param name="update" value="realmRolesPanel" />
|
||||
<ui:param name="hasSubmitAction" value="true" />
|
||||
<ui:param name="update" value=":formRealmRoles:realmRolesPanel" />
|
||||
<ui:param name="useParentForm" value="true" />
|
||||
</ui:include>
|
||||
</h:form>
|
||||
</p:dialog>
|
||||
@@ -148,7 +150,9 @@
|
||||
<ui:param name="mode" value="create" />
|
||||
<ui:param name="showClientSelector" value="true" />
|
||||
<ui:param name="submitAction" value="#{roleGestionBean.createClientRole}" />
|
||||
<ui:param name="update" value="clientRolesPanel" />
|
||||
<ui:param name="hasSubmitAction" value="true" />
|
||||
<ui:param name="update" value=":formClientRoles:clientRolesPanel" />
|
||||
<ui:param name="useParentForm" value="true" />
|
||||
</ui:include>
|
||||
</h:form>
|
||||
</p:dialog>
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
<ui:param name="showRealmSelector" value="true" />
|
||||
<ui:param name="showPasswordFields" value="true" />
|
||||
<ui:param name="submitAction" value="#{userCreationBean.createUser}" />
|
||||
<ui:param name="hasSubmitAction" value="true" />
|
||||
<ui:param name="cancelOutcome" value="/pages/user-manager/users/list" />
|
||||
</ui:include>
|
||||
</div>
|
||||
|
||||
@@ -29,55 +29,78 @@
|
||||
</ui:define>
|
||||
</ui:include>
|
||||
|
||||
<!-- Statistiques -->
|
||||
<!-- Statistiques KPI -->
|
||||
<div class="grid mb-4">
|
||||
<div class="col-12 md:col-3">
|
||||
<ui:include src="/templates/components/shared/cards/user-stat-card.xhtml">
|
||||
<ui:param name="title" value="Total Utilisateurs" />
|
||||
<ui:param name="value" value="#{userListBean.totalRecords}" />
|
||||
<ui:param name="icon" value="pi-users" />
|
||||
<ui:param name="iconColor" value="blue-600" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-3">
|
||||
<ui:include src="/templates/components/shared/cards/user-stat-card.xhtml">
|
||||
<ui:param name="title" value="Utilisateurs Actifs" />
|
||||
<ui:param name="value" value="#{userListBean.users.stream().filter(u -> u.enabled).count()}" />
|
||||
<ui:param name="icon" value="pi-user-check" />
|
||||
<ui:param name="iconColor" value="green-600" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-3">
|
||||
<ui:include src="/templates/components/shared/cards/user-stat-card.xhtml">
|
||||
<ui:param name="title" value="Utilisateurs Désactivés" />
|
||||
<ui:param name="value" value="#{userListBean.users.stream().filter(u -> !u.enabled).count()}" />
|
||||
<ui:param name="icon" value="pi-user-times" />
|
||||
<ui:param name="iconColor" value="red-600" />
|
||||
</ui:include>
|
||||
</div>
|
||||
<div class="col-12 md:col-3">
|
||||
<ui:include src="/templates/components/shared/cards/user-stat-card.xhtml">
|
||||
<ui:param name="title" value="Realm" />
|
||||
<ui:param name="value" value="#{userListBean.realmName}" />
|
||||
<ui:param name="icon" value="pi pi-globe" />
|
||||
<ui:param name="iconColor" value="purple-600" />
|
||||
</ui:include>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Barre de recherche -->
|
||||
<div class="card mb-3">
|
||||
<ui:include src="/templates/components/user-management/user-search-bar.xhtml">
|
||||
<ui:param name="searchCriteria" value="#{userListBean.searchCriteria}" />
|
||||
<ui:param name="searchAction" value="#{userListBean.search}" />
|
||||
<ui:param name="update" value="userTable" />
|
||||
<ui:param name="showAdvanced" value="true" />
|
||||
<!-- Total Utilisateurs -->
|
||||
<ui:include src="/templates/components/shared/cards/kpi-card.xhtml">
|
||||
<ui:param name="title" value="Total Utilisateurs" />
|
||||
<ui:param name="value" value="#{userListBean.totalRecords}" />
|
||||
<ui:param name="icon" value="pi-users" />
|
||||
<ui:param name="iconColor" value="blue-600" />
|
||||
<ui:param name="subtitle" value="Utilisateurs dans le realm" />
|
||||
<ui:param name="clickable" value="true" />
|
||||
<ui:param name="clickOutcome" value="/pages/user-manager/users/list" />
|
||||
</ui:include>
|
||||
|
||||
<!-- Utilisateurs Actifs -->
|
||||
<ui:include src="/templates/components/shared/cards/kpi-card.xhtml">
|
||||
<ui:param name="title" value="Utilisateurs Actifs" />
|
||||
<ui:param name="value" value="#{userListBean.activeUsersCount}" />
|
||||
<ui:param name="icon" value="pi-user-check" />
|
||||
<ui:param name="iconColor" value="green-600" />
|
||||
<ui:param name="subtitle" value="#{userListBean.activeUsersPercentage}% du total" />
|
||||
<ui:param name="progressValue" value="#{userListBean.activeUsersPercentage}" />
|
||||
<ui:param name="statusIcon" value="pi-check-circle" />
|
||||
<ui:param name="statusLabel" value="Actifs" />
|
||||
<ui:param name="statusValue" value="#{userListBean.activeUsersCount} utilisateurs" />
|
||||
<ui:param name="clickable" value="true" />
|
||||
<ui:param name="clickOutcome" value="/pages/user-manager/users/list" />
|
||||
</ui:include>
|
||||
|
||||
<!-- Utilisateurs Désactivés -->
|
||||
<ui:include src="/templates/components/shared/cards/kpi-card.xhtml">
|
||||
<ui:param name="title" value="Utilisateurs Désactivés" />
|
||||
<ui:param name="value" value="#{userListBean.disabledUsersCount}" />
|
||||
<ui:param name="icon" value="pi-user-times" />
|
||||
<ui:param name="iconColor" value="red-600" />
|
||||
<ui:param name="subtitle" value="#{userListBean.disabledUsersPercentage}% du total" />
|
||||
<ui:param name="progressValue" value="#{userListBean.disabledUsersPercentage}" />
|
||||
<ui:param name="statusIcon" value="pi-times-circle" />
|
||||
<ui:param name="statusLabel" value="Désactivés" />
|
||||
<ui:param name="statusValue" value="#{userListBean.disabledUsersCount} utilisateurs" />
|
||||
<ui:param name="clickable" value="true" />
|
||||
<ui:param name="clickOutcome" value="/pages/user-manager/users/list" />
|
||||
</ui:include>
|
||||
|
||||
<!-- Realm Actuel -->
|
||||
<ui:include src="/templates/components/shared/cards/kpi-card.xhtml">
|
||||
<ui:param name="title" value="Realm Actuel" />
|
||||
<ui:param name="value" value="#{empty userListBean.realmName ? 'master' : userListBean.realmName}" />
|
||||
<ui:param name="icon" value="pi-globe" />
|
||||
<ui:param name="iconColor" value="purple-600" />
|
||||
<ui:param name="subtitle" value="Realm Keycloak" />
|
||||
<ui:param name="statusIcon" value="pi-info-circle" />
|
||||
<ui:param name="statusLabel" value="Realm" />
|
||||
<ui:param name="statusValue" value="#{empty userListBean.realmName ? 'master' : userListBean.realmName}" />
|
||||
<ui:param name="showProgress" value="false" />
|
||||
</ui:include>
|
||||
</div>
|
||||
|
||||
<!-- Tableau des utilisateurs -->
|
||||
<div class="card">
|
||||
<h:form id="formUsers">
|
||||
<!-- Barre de recherche et Tableau des utilisateurs dans le même formulaire -->
|
||||
<h:form id="formUsers">
|
||||
<!-- Barre de recherche -->
|
||||
<div class="card mb-3">
|
||||
<ui:include src="/templates/components/user-management/user-search-bar.xhtml">
|
||||
<ui:param name="searchCriteria" value="#{userListBean.searchCriteria}" />
|
||||
<ui:param name="searchAction" value="#{userListBean.search}" />
|
||||
<ui:param name="update" value="userTable" />
|
||||
<ui:param name="showAdvanced" value="true" />
|
||||
<ui:param name="useParentForm" value="true" />
|
||||
</ui:include>
|
||||
</div>
|
||||
|
||||
<!-- Tableau des utilisateurs -->
|
||||
<div class="card">
|
||||
<ui:include src="/templates/components/shared/tables/user-data-table.xhtml">
|
||||
<ui:param name="users" value="#{userListBean.users}" />
|
||||
<ui:param name="var" value="user" />
|
||||
@@ -90,9 +113,8 @@
|
||||
<ui:param name="showStatus" value="true" />
|
||||
<ui:param name="update" value="userTable" />
|
||||
</ui:include>
|
||||
</h:form>
|
||||
</div>
|
||||
</div>
|
||||
</h:form>
|
||||
</ui:define>
|
||||
|
||||
</ui:composition>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user