(syncope) branch 3_0_X updated: [SYNCOPE-1791] Fixing Console refactoring

[ilgrosso]

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

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


The following commit(s) were added to refs/heads/3_0_X by this push:
     new 34f17d8351 [SYNCOPE-1791] Fixing Console refactoring
34f17d8351 is described below

commit 34f17d8351cf5bd93c6b929bd0715305018dd0b5
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Thu Dec 14 14:19:51 2023 +0100

    [SYNCOPE-1791] Fixing Console refactoring
---
 .../apache/syncope/client/console/events/EventCategoryPanel.java  | 8 ++++----
 .../src/main/java/org/apache/syncope/core/logic/AuditLogic.java   | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/EventCategoryPanel.java
 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/EventCategoryPanel.java
index 983f259af3..4fdf187a5f 100644
--- 
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/EventCategoryPanel.java
+++ 
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/events/EventCategoryPanel.java
@@ -93,7 +93,7 @@ public abstract class EventCategoryPanel extends Panel {
 
         return categories.stream().
                 filter(c -> type == c.getType() && 
StringUtils.equals(category, c.getCategory())).
-                map(EventCategory::getCategory).
+                map(EventCategory::getSubcategory).
                 distinct().
                 sorted().
                 collect(Collectors.toList());
@@ -433,9 +433,9 @@ public abstract class EventCategoryPanel extends Panel {
                 itor.hasNext() && eventCategory.getEvents().isEmpty();) {
 
             EventCategory ec = itor.next();
-            if (eventCategory.getType() == ec.getType()
-                    && StringUtils.equals(eventCategory.getCategory(), 
ec.getCategory())
-                    && StringUtils.equals(eventCategory.getSubcategory(), 
ec.getSubcategory())) {
+            if (ec.getType() == eventCategory.getType()
+                    && StringUtils.equals(ec.getCategory(), 
eventCategory.getCategory())
+                    && StringUtils.equals(ec.getSubcategory(), 
eventCategory.getSubcategory())) {
 
                 eventCategory.getEvents().addAll(ec.getEvents());
             }
diff --git 
a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/AuditLogic.java 
b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/AuditLogic.java
index 296a44e22a..6efd927baa 100644
--- 
a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/AuditLogic.java
+++ 
b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/AuditLogic.java
@@ -173,10 +173,6 @@ public class AuditLogic extends 
AbstractTransactionalLogic<AuditConfTO> {
         authenticationEventCategory.getEvents().add(AuditElements.LOGIN_EVENT);
         events.add(authenticationEventCategory);
 
-        events.add(new EventCategory(EventCategoryType.PROPAGATION));
-        events.add(new EventCategory(EventCategoryType.PULL));
-        events.add(new EventCategory(EventCategoryType.PUSH));
-
         EventCategory pullTaskEventCategory = new 
EventCategory(EventCategoryType.TASK);
         
pullTaskEventCategory.setCategory(PullJobDelegate.class.getSimpleName());
         events.add(pullTaskEventCategory);