From db56d82dbd0cf91f6e0ea7044eb1198309c2b5ca Mon Sep 17 00:00:00 2001 From: Levente NAGY Date: Tue, 12 Sep 2017 11:45:37 +0200 Subject: [PATCH] KEYCLOAK 2538 - UI group pagination - fix duplicate result for search + sort result --- .../keycloak/models/jpa/JpaRealmProvider.java | 28 ++++++++++++------- .../models/jpa/entities/GroupEntity.java | 5 ++-- .../org/keycloak/models/RealmProvider.java | 2 +- .../admin/resources/js/controllers/groups.js | 2 +- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java index 2e15fd04afb1..17f629fd14aa 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java @@ -18,6 +18,7 @@ package org.keycloak.models.jpa; import com.sun.org.apache.xpath.internal.operations.Bool; +import org.apache.commons.codec.binary.StringUtils; import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.connections.jpa.util.JpaUtils; @@ -335,6 +336,7 @@ public List getGroups(RealmModel realm) { return ref.getGroups().stream() .map(g -> session.realms().getGroupById(g.getId(), realm)) + .sorted(Comparator.comparing(GroupModel::getName)) .collect(Collectors.collectingAndThen( Collectors.toList(), Collections::unmodifiableList)); } @@ -354,12 +356,7 @@ public Long getGroupsCount(RealmModel realm, Boolean onlyTopGroups) { @Override public Long getGroupsCountByNameContaining(RealmModel realm, String search) { - Long count = em.createNamedQuery("getGroupCountByNameContaining", Long.class) - .setParameter("realm", realm.getId()) - .setParameter("name", search) - .getSingleResult(); - - return count; + return (long) searchForGroupByName(realm, search, null, null).size(); } @Override @@ -369,6 +366,7 @@ public List getTopLevelGroups(RealmModel realm) { return ref.getGroups().stream() .filter(g -> g.getParent() == null) .map(g -> session.realms().getGroupById(g.getId(), realm)) + .sorted(Comparator.comparing(GroupModel::getName)) .collect(Collectors.collectingAndThen( Collectors.toList(), Collections::unmodifiableList)); } @@ -388,6 +386,8 @@ public List getTopLevelGroups(RealmModel realm, Integer first, Integ } } + list.sort(Comparator.comparing(GroupModel::getName)); + return Collections.unmodifiableList(list); } @@ -582,7 +582,7 @@ public ClientTemplateModel getClientTemplateById(String id, RealmModel realm) { @Override public List searchForGroupByName(RealmModel realm, String search, Integer first, Integer max) { - TypedQuery query = em.createNamedQuery("getTopLevelGroupIdsByNameContaining", String.class) + TypedQuery query = em.createNamedQuery("getGroupIdsByNameContaining", String.class) .setParameter("realm", realm.getId()) .setParameter("search", search); if(Objects.nonNull(first) && Objects.nonNull(max)) { @@ -590,10 +590,18 @@ public List searchForGroupByName(RealmModel realm, String search, In } List groups = query.getResultList(); if (Objects.isNull(groups)) return Collections.EMPTY_LIST; - List list = new LinkedList<>(); + List list = new ArrayList<>(); for (String id : groups) { - list.add(session.realms().getGroupById(id, realm)); + GroupModel groupById = session.realms().getGroupById(id, realm); + while(Objects.nonNull(groupById.getParentId())) { + groupById = session.realms().getGroupById(groupById.getParentId(), realm); + } + if(!list.contains(groupById)) { + list.add(groupById); + } } + list.sort(Comparator.comparing(GroupModel::getName)); + return Collections.unmodifiableList(list); } @@ -645,7 +653,7 @@ public List listClientInitialAccess(RealmModel realm) List entities = query.getResultList(); return entities.stream() - .map(entity -> entityToModel(entity)) + .map(this::entityToModel) .collect(Collectors.toList()); } diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java index eff03407047b..e01ad0c11e9d 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java @@ -27,11 +27,10 @@ */ @NamedQueries({ @NamedQuery(name="getGroupIdsByParent", query="select u.id from GroupEntity u where u.parent = :parent"), - @NamedQuery(name="getTopLevelGroupIdsByNameContaining", query="select u.id from GroupEntity u where u.realm.id = :realm and u.name like concat('%',:search,'%') and u.parent is null order by u.name ASC"), + @NamedQuery(name="getGroupIdsByNameContaining", query="select u.id from GroupEntity u where u.realm.id = :realm and u.name like concat('%',:search,'%') order by u.name ASC"), @NamedQuery(name="getTopLevelGroupIds", query="select u.id from GroupEntity u where u.parent is null and u.realm.id = :realm"), @NamedQuery(name="getGroupCount", query="select count(u) from GroupEntity u where u.realm.id = :realm"), - @NamedQuery(name="getTopLevelGroupCount", query="select count(u) from GroupEntity u where u.realm.id = :realm and u.parent is null"), - @NamedQuery(name="getGroupCountByNameContaining", query="select count(u) from GroupEntity u where u.realm.id = :realm and u.name like concat('%',:name,'%')"), + @NamedQuery(name="getTopLevelGroupCount", query="select count(u) from GroupEntity u where u.realm.id = :realm and u.parent is null") }) @Entity @Table(name="KEYCLOAK_GROUP") diff --git a/server-spi/src/main/java/org/keycloak/models/RealmProvider.java b/server-spi/src/main/java/org/keycloak/models/RealmProvider.java index e1a5d5f7f7d7..d14f2d625633 100755 --- a/server-spi/src/main/java/org/keycloak/models/RealmProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/RealmProvider.java @@ -48,7 +48,7 @@ public interface RealmProvider extends Provider { List getTopLevelGroups(RealmModel realm, Integer first, Integer max); - List searchForGroupByName(RealmModel realm, String search, Integer first, Integer max); + List searchForGroupByName(RealmModel realm, String search, Integer first, Integer max); boolean removeGroup(RealmModel realm, GroupModel group); diff --git a/themes/src/main/resources/theme/base/admin/resources/js/controllers/groups.js b/themes/src/main/resources/theme/base/admin/resources/js/controllers/groups.js index fed4d94078fe..23edb675d5e4 100755 --- a/themes/src/main/resources/theme/base/admin/resources/js/controllers/groups.js +++ b/themes/src/main/resources/theme/base/admin/resources/js/controllers/groups.js @@ -65,7 +65,7 @@ module.controller('GroupListCtrl', function($scope, $route, $q, realm, groups, g $scope.$watch('currentPage', function(newValue, oldValue) { if(newValue !== oldValue) { - refreshGroups(); + refreshGroups($scope.searchTerms); } });