[syncope] 01/02: [SYNCOPE-1752] Refinements

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 7583deb8afd6be0d668e536188b37b5ee898dac3
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Wed Apr 19 11:09:45 2023 +0200

    [SYNCOPE-1752] Refinements
---
 .../org/apache/syncope/client/console/commons/RealmsUtils.java    | 7 ++++++-
 .../apache/syncope/client/console/panels/RealmChoicePanel.java    | 2 +-
 .../org/apache/syncope/client/console/widgets/NumberWidget.java   | 8 ++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/RealmsUtils.java
 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/RealmsUtils.java
index 375ec10b44..6e7a252cf0 100644
--- 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/RealmsUtils.java
+++ 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/commons/RealmsUtils.java
@@ -19,6 +19,7 @@
 package org.apache.syncope.client.console.commons;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.common.lib.SyncopeConstants;
 import org.apache.syncope.common.rest.api.beans.RealmQuery;
 
@@ -41,7 +42,11 @@ public final class RealmsUtils {
     }
 
     public static RealmQuery buildRootQuery() {
-        return new 
RealmQuery.Builder().base(SyncopeConstants.ROOT_REALM).build();
+        String base = 
SyncopeConsoleSession.get().getSearchableRealms().isEmpty()
+                || 
SyncopeConsoleSession.get().getSearchableRealms().contains(SyncopeConstants.ROOT_REALM)
+                ? SyncopeConstants.ROOT_REALM
+                : SyncopeConsoleSession.get().getSearchableRealms().get(0);
+        return new RealmQuery.Builder().base(base).build();
     }
 
     private RealmsUtils() {
diff --git 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java
 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java
index d36cb813a2..0780201dce 100644
--- 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java
+++ 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/RealmChoicePanel.java
@@ -122,7 +122,7 @@ public class RealmChoicePanel extends Panel {
                             map(el -> Pair.of(el.getKey(), 
el.getValue().getLeft()));
                 }
                 return full.filter(realm -> 
SyncopeConsoleSession.get().getSearchableRealms().stream().anyMatch(
-                        availableRealm -> 
realm.getValue().getFullPath().startsWith(availableRealm))).
+                        r -> realm.getValue().getFullPath().startsWith(r))).
                         collect(Collectors.toList());
             }
         };
diff --git 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java
 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java
index 03bbf9daf3..2c38520489 100644
--- 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java
+++ 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java
@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.client.console.widgets;
 
+import java.text.NumberFormat;
 import java.util.List;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.console.SyncopeWebApplication;
@@ -122,7 +123,9 @@ public class NumberWidget extends BaseWidget {
 
         add(box);
 
-        numberLabel = new Label("number", number);
+        numberLabel = new Label(
+                "number",
+                
NumberFormat.getInstance(SyncopeConsoleSession.get().getLocale()).format(number));
         numberLabel.setOutputMarkupId(true);
         box.add(numberLabel);
         box.add(new Label("label", label));
@@ -135,7 +138,8 @@ public class NumberWidget extends BaseWidget {
     public boolean refresh(final Number number) {
         if (this.number != number) {
             this.number = number;
-            numberLabel.setDefaultModelObject(number);
+            numberLabel.setDefaultModelObject(
+                    
NumberFormat.getInstance(SyncopeConsoleSession.get().getLocale()).format(number));
             return true;
         }
         return false;