Merge remote-tracking branch 'upstream/master' into JAKARTA_EE_11

Author: ilgrosso

client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/themes/css/AdminLTE.css

@@ -326,17 +326,20 @@ protected Model<String> toJSON(final AuditEventTO auditEvent) {
         }
 
         try {
-            String content;
+            String content = null;
             if (auditEvent.getBefore() == null) {
                 JsonNode output = MAPPER.readTree(auditEvent.getOutput());
                 if (output.has("entity")) {
                     content = output.get("entity").toPrettyString();
-                } else {
+                } else if ((!output.has("content") && output.get("content").isArray())) {
                     content = output.toPrettyString();
                 }
             } else {
                 content = auditEvent.getBefore();
             }
+            if (content == null || "null".equals(content)) {
+                return Model.of();
+            }
 
             T entity = MAPPER.reader().
                     with(StreamReadFeature.STRICT_DUPLICATE_DETECTION).

client/idrepo/common-ui/src/main/resources/org/apache/syncope/client/ui/commons/themes/js/AdminLTE-app.min.js

@@ -18,15 +18,18 @@
  */
 package org.apache.syncope.client.console.pages;
 
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
 import java.io.Serializable;
 import java.util.List;
 import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.audit.AuditHistoryModal;
 import org.apache.syncope.client.console.panels.Realm;
 import org.apache.syncope.client.console.panels.RealmChoicePanel;
 import org.apache.syncope.client.console.panels.RealmChoicePanel.ChosenRealm;
 import org.apache.syncope.client.console.rest.AnyTypeRestClient;
+import org.apache.syncope.client.console.rest.AuditRestClient;
 import org.apache.syncope.client.console.rest.RealmRestClient;
 import org.apache.syncope.client.console.tasks.TemplatesTogglePanel;
 import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -40,6 +43,8 @@
 import org.apache.syncope.common.lib.to.ProvisioningResult;
 import org.apache.syncope.common.lib.to.RealmTO;
 import org.apache.syncope.common.lib.to.TemplatableTO;
+import org.apache.syncope.common.lib.types.IdRepoEntitlement;
+import org.apache.syncope.common.lib.types.OpEvent;
 import org.apache.wicket.PageReference;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.event.Broadcast;
@@ -56,6 +61,8 @@ public class Realms extends BasePage {
 
     private static final long serialVersionUID = -1100228004207271270L;
 
+    protected static final JsonMapper MAPPER = JsonMapper.builder().findAndAddModules().build();
+
     public static final String SELECTED_INDEX = "selectedIndex";
 
     public static final String INITIAL_REALM = "initialRealm";
@@ -66,6 +73,9 @@ public class Realms extends BasePage {
     @SpringBean
     protected AnyTypeRestClient anyTypeRestClient;
 
+    @SpringBean
+    protected AuditRestClient auditRestClient;
+
     protected final TemplatesTogglePanel templates;
 
     protected final RealmChoicePanel realmChoicePanel;
@@ -119,7 +129,7 @@ protected void onConfigure() {
                 setFooterVisible(false);
             }
         };
-        templateModal.size(Modal.Size.Large);
+        templateModal.size(Modal.Size.Extra_large);
         content.add(templateModal);
 
         modal.setWindowClosedCallback(target -> {
@@ -194,12 +204,6 @@ protected Content(final RealmTO realmTO, final List<AnyTypeTO> anyTypes, final i
             super("body", realmTO, anyTypes, selectedIndex, Realms.this.getPageReference());
         }
 
-        @Override
-        protected void onClickTemplate(final AjaxRequestTarget target) {
-            templates.setTargetObject(realmTO);
-            templates.toggle(target, true);
-        }
-
         @Override
         protected void setWindowClosedReloadCallback(final BaseModal<?> modal) {
             modal.setWindowClosedCallback(target -> {
@@ -217,6 +221,12 @@ protected void setWindowClosedReloadCallback(final BaseModal<?> modal) {
             });
         }
 
+        @Override
+        protected void onClickTemplate(final AjaxRequestTarget target) {
+            templates.setTargetObject(realmTO);
+            templates.toggle(target, true);
+        }
+
         @Override
         protected void onClickCreate(final AjaxRequestTarget target) {
             this.wizardBuilder.setParent(realmChoicePanel.getCurrentRealm());
@@ -240,6 +250,38 @@ public String getEventDescription() {
             });
         }
 
+        @Override
+        protected void onClickAudit(final AjaxRequestTarget target, final RealmTO realmTO) {
+            target.add(templateModal.setContent(new AuditHistoryModal<>(
+                    OpEvent.CategoryType.LOGIC,
+                    "RealmLogic",
+                    realmTO,
+                    IdRepoEntitlement.REALM_UPDATE,
+                    auditRestClient) {
+
+                private static final long serialVersionUID = -5819724478921691835L;
+
+                @Override
+                protected void restore(final String json, final AjaxRequestTarget target) {
+                    try {
+                        RealmTO updated = MAPPER.readValue(json, RealmTO.class);
+                        realmRestClient.update(updated);
+
+                        SyncopeConsoleSession.get().success(getString(Constants.OPERATION_SUCCEEDED));
+                        target.add(realmChoicePanel.reloadRealmTree(target));
+                    } catch (Exception e) {
+                        LOG.error("While restoring realm {}", realmTO.getKey(), e);
+                        SyncopeConsoleSession.get().onException(e);
+                    }
+                    ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
+                }
+            }));
+
+            templateModal.header(new Model<>(getString("realm.auditHistory.title", new Model<>(realmTO))));
+
+            templateModal.show(true);
+        }
+
         @Override
         protected void onClickDelete(final AjaxRequestTarget target, final RealmTO realmTO) {
             try {

client/idrepo/console/src/main/java/org/apache/syncope/client/console/audit/AuditHistoryDetails.java

@@ -234,6 +234,8 @@ public void onClick(final AjaxRequestTarget target, final PropagationStatus stat
 
     protected abstract void onClickEdit(AjaxRequestTarget target, RealmTO realmTO);
 
+    protected abstract void onClickAudit(AjaxRequestTarget target, RealmTO realmTO);
+
     protected abstract void onClickDelete(AjaxRequestTarget target, RealmTO realmTO);
 
     protected static class RemoteRealmPanel extends RemoteObjectPanel {
@@ -306,6 +308,18 @@ public void onClick(final AjaxRequestTarget target, final RealmTO ignore) {
                 }, ActionLink.ActionType.TEMPLATE, IdRepoEntitlement.REALM_UPDATE).hideLabel();
             }
 
+            if (securityCheck(Set.of(IdRepoEntitlement.AUDIT_LIST))) {
+                actionPanel.add(new ActionLink<>(realmTO) {
+
+                    private static final long serialVersionUID = 2802988981431379827L;
+
+                    @Override
+                    public void onClick(final AjaxRequestTarget target, final RealmTO ignore) {
+                        onClickAudit(target, realmTO);
+                    }
+                }, ActionLink.ActionType.VIEW_AUDIT_HISTORY, IdRepoEntitlement.AUDIT_LIST).hideLabel();
+            }
+
             if (securityCheck(Set.of(IdRepoEntitlement.REALM_DELETE))) {
                 actionPanel.add(new ActionLink<>(realmTO) {
 

client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Realms.java

@@ -22,3 +22,4 @@ realmLabel=Realm
 dynRealmLabel=Dynamic Realm
 realms=Realms
 dynrealms=Dynamic Realms
+realm.auditHistory.title=Realm ${fullPath} history

client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/Realm.java

@@ -16,9 +16,10 @@
 # under the License.
 any.realm.new=Nouveau domaine
 any.realm.edit=Modifier domaine ${fullPath}
-inner.template.edit=Modifier modèle ${gauche} pour '${right.fullPath}''.
+inner.template.edit=Modifier mod\u00e8le ${gauche} pour '${right.fullPath}''.
 afterObj=Lien d'objet
 realmLabel=Domaine
 dynRealmLabel=Domaine dynamique
 realms=Domaines
 dynrealms=Domaines dynamiques
+realm.auditHistory.title=Realm ${fullPath} histoire

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Realms.properties

@@ -22,3 +22,4 @@ realmLabel=Realm
 dynRealmLabel=Realm Dinamico
 realms=Realm
 dynrealms=Realm Dinamici
+realm.auditHistory.title=Realm ${fullPath} storico

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_fr_CA.properties

@@ -22,3 +22,4 @@ realmLabel=\u30ec\u30eb\u30e0
 dynRealmLabel=\u52d5\u7684\u30ec\u30eb\u30e0
 realms=\u30ec\u30eb\u30e0
 dynrealms=\u52d5\u7684\u30ec\u30eb\u30e0
+realm.auditHistory.title=Realm ${fullPath} history

client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_it.properties

@@ -22,3 +22,4 @@ realmLabel=Realm
 dynRealmLabel=Dynamic Realm
 realms=Realms
 dynrealms=Dynamic Realms
+realm.auditHistory.title=Realm ${fullPath} history