This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 4_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/4_1_X by this push:
new 48fd0f3ab2 [SYNCOPE-1951] Fix Realm search console and clean code
(#1318)
48fd0f3ab2 is described below
commit 48fd0f3ab2b692989777404664a4f20665ce24be
Author: Matteo Tatoni <[email protected]>
AuthorDate: Tue Mar 10 17:19:23 2026 +0100
[SYNCOPE-1951] Fix Realm search console and clean code (#1318)
---
.../syncope/client/console/panels/search/RealmSearchPanel.java | 4 ++--
client/idrepo/console/src/main/resources/console.properties | 1 +
.../syncope/core/persistence/jpa/dao/AbstractJPARealmSearchDAO.java | 3 +--
.../persistence/elasticsearch/dao/ElasticsearchRealmSearchDAO.java | 4 ----
.../core/persistence/opensearch/dao/OpenSearchRealmSearchDAO.java | 5 -----
5 files changed, 4 insertions(+), 13 deletions(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/RealmSearchPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/RealmSearchPanel.java
index e3e00f9e47..f57dd33f75 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/RealmSearchPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/search/RealmSearchPanel.java
@@ -139,7 +139,7 @@ public class RealmSearchPanel extends AbstractSearchPanel {
@Override
public boolean showOperator(final int index, final
SearchClause currentClause) {
- return isNotBaseClause(currentClause, index);
+ return index > 1;
}
});
}
@@ -304,6 +304,6 @@ public class RealmSearchPanel extends AbstractSearchPanel {
return clause == null
|| clause.getType() != SearchClause.Type.CUSTOM
|| !FULLPATH.equals(clause.getProperty())
- || index > 1;
+ || index > 0;
}
}
diff --git a/client/idrepo/console/src/main/resources/console.properties
b/client/idrepo/console/src/main/resources/console.properties
index 13639f89d7..275912c427 100644
--- a/client/idrepo/console/src/main/resources/console.properties
+++ b/client/idrepo/console/src/main/resources/console.properties
@@ -53,6 +53,7 @@ console.adminUser=${adminUser}
console.page.dashboard=org.apache.syncope.client.console.pages.Dashboard
console.page.realms=org.apache.syncope.client.console.pages.Realms
+console.page.anys=org.apache.syncope.client.console.pages.Anys
console.page.reports=org.apache.syncope.client.console.pages.Reports
console.page.audit=org.apache.syncope.client.console.pages.Audit
console.page.implementations=org.apache.syncope.client.console.pages.Implementations
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPARealmSearchDAO.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPARealmSearchDAO.java
index cb621cb030..c50f37ff8a 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPARealmSearchDAO.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPARealmSearchDAO.java
@@ -559,8 +559,7 @@ public abstract class AbstractJPARealmSearchDAO extends
AbstractRealmSearchDAO {
obs.items.forEach(item -> queryString.append(',').append(item.select));
queryString.append(" FROM
").append(buildFrom(queryInfo.plainSchemas(), obs)).
- append(" WHERE ").append(buildWhere(bases, queryInfo,
parameters)).
- toString();
+ append(" WHERE ").append(buildWhere(bases, queryInfo,
parameters));
if (!obs.items.isEmpty()) {
queryString.append(" ORDER BY ").
diff --git
a/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchRealmSearchDAO.java
b/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchRealmSearchDAO.java
index 3808827536..6b1b411121 100644
---
a/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchRealmSearchDAO.java
+++
b/ext/elasticsearch/persistence/src/main/java/org/apache/syncope/core/persistence/elasticsearch/dao/ElasticsearchRealmSearchDAO.java
@@ -66,16 +66,12 @@ import
org.apache.syncope.core.persistence.api.utils.RealmUtils;
import org.apache.syncope.core.persistence.common.dao.AbstractRealmSearchDAO;
import org.apache.syncope.core.spring.security.AuthContextUtils;
import org.apache.syncope.ext.elasticsearch.client.ElasticsearchUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.transaction.annotation.Transactional;
public class ElasticsearchRealmSearchDAO extends AbstractRealmSearchDAO
implements RealmSearchDAO {
- protected static final Logger LOG =
LoggerFactory.getLogger(RealmSearchDAO.class);
-
protected static final Set<String> ID_PROPS = Set.of("key", "id", "_id");
protected static final List<SortOptions> FULLPATH_SORT_OPTIONS = List.of(
diff --git
a/ext/opensearch/persistence/src/main/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchRealmSearchDAO.java
b/ext/opensearch/persistence/src/main/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchRealmSearchDAO.java
index 787ec93b27..b510c034cd 100644
---
a/ext/opensearch/persistence/src/main/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchRealmSearchDAO.java
+++
b/ext/opensearch/persistence/src/main/java/org/apache/syncope/core/persistence/opensearch/dao/OpenSearchRealmSearchDAO.java
@@ -65,16 +65,11 @@ import org.opensearch.client.opensearch.core.CountRequest;
import org.opensearch.client.opensearch.core.SearchRequest;
import org.opensearch.client.opensearch.core.search.Hit;
import org.opensearch.client.opensearch.core.search.SourceConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.transaction.annotation.Transactional;
public class OpenSearchRealmSearchDAO extends AbstractRealmSearchDAO
implements RealmSearchDAO {
-
- protected static final Logger LOG =
LoggerFactory.getLogger(RealmSearchDAO.class);
-
protected static final Set<String> ID_PROPS = Set.of("key", "id", "_id");
protected static final List<SortOptions> FULLPATH_SORT_OPTIONS = List.of(
