Merge remote-tracking branch 'origin/master'

Evolveum · Feb 24, 2023 · 4b0e657 · 4b0e657
2 parents b7174cc + 8abbef9
commit 4b0e657
Show file tree

Hide file tree

Showing 9 changed files with 324 additions and 247 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.html b/...rc/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.html
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ChangesPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ChangesPanel.html
@@ -17,6 +17,8 @@ <h3 class="card-title flex-grow-1">
         <div wicket:id="toggle"/>
     </div>
     <div class="card-body" wicket:id="body">
+        <wicket:child/>
+
         <wicket:container wicket:id="visualizations">
             <div wicket:id="visualization"/>
         </wicket:container>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ChangesPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ChangesPanel.java
@@ -53,13 +53,23 @@ public enum ChangesView {
 
     private IModel<List<VisualizationDto>> changesModel;
 
+    private boolean showOperationalItems;
+
     public ChangesPanel(String id, IModel<List<ObjectDeltaType>> deltaModel, IModel<List<VisualizationDto>> visualizationModel) {
         super(id);
 
         initModels(deltaModel, visualizationModel);
         initLayout();
     }
 
+    protected WebMarkupContainer getBody() {
+        return (WebMarkupContainer) get(ID_BODY);
+    }
+
+    public void setShowOperationalItems(boolean showOperationalItems) {
+        this.showOperationalItems = showOperationalItems;
+    }
+
     public void setChangesView(@NotNull IModel<ChangesView> changesView) {
         this.changesView = changesView;
     }
@@ -148,7 +158,7 @@ protected void populateItem(ListItem<VisualizationDto> item) {
                     expandVisualization(model.getObject());
                 }
 
-                VisualizationPanel visualization = new VisualizationPanel(ID_VISUALIZATION, model, false, advanced);
+                VisualizationPanel visualization = new VisualizationPanel(ID_VISUALIZATION, model, showOperationalItems, advanced);
                 item.add(visualization);
             }
         };

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/audit/AuditChangesPanel.html b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/audit/AuditChangesPanel.html
@@ -0,0 +1,39 @@
+<!--
+  ~ Copyright (c) 2010-2023 Evolveum and contributors
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:extend>
+    <table class="table table-striped table-bordered mb-4">
+        <wicket:enclosure wicket:child="resourceName">
+            <tr>
+                <td>
+                    <wicket:message key="ObjectDeltaOperationType.resourceName"/>
+                </td>
+                <td><span wicket:id="resourceName"/></td>
+            </tr>
+        </wicket:enclosure>
+        <tr>
+            <td>
+                <wicket:message key="ObjectDeltaOperationType.objectName"/>
+            </td>
+            <td><span wicket:id="objectName"/></td>
+        </tr>
+        <tr>
+            <td>
+                <wicket:message key="ObjectDeltaOperationType.executionResult"/>
+            </td>
+            <td>
+                <span wicket:id="executionResult"/>
+                <a class="ml-1 text-sm" wicket:id="fullResultLink">
+                    <wicket:message key="ObjectDeltaOperationResult.showFullResult"/>
+                </a>
+            </td>
+        </tr>
+    </table>
+</wicket:extend>
+</html>