fixed mark icon (not visible when there are no marks for processed ob…

…jects), serialization issue
Evolveum · Mar 15, 2023 · 81df7c6 · 81df7c6
1 parent 9ee8850
commit 81df7c6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java b/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java
@@ -30,6 +30,7 @@
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.AjaxIconButton;
 import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
+import com.evolveum.midpoint.web.component.util.SerializableConsumer;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.page.admin.PageAdmin;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
@@ -285,7 +286,7 @@ private DetailsTableItem createDetailsItemForBuiltInMetric(BuiltInSimulationMetr
         return createDetailsItemForBuiltInMetric(nameModel, valueModel, target -> redirectToProcessedObjects(identifier));
     }
 
-    private DetailsTableItem createDetailsItemForBuiltInMetric(IModel<String> name, IModel<String> value, Consumer<AjaxRequestTarget> onClickHandler) {
+    private DetailsTableItem createDetailsItemForBuiltInMetric(IModel<String> name, IModel<String> value, SerializableConsumer<AjaxRequestTarget> onClickHandler) {
         return new DetailsTableItem(name, value) {
 
             @Override

diff --git a/.../java/com/evolveum/midpoint/gui/impl/page/admin/simulation/TitleWithDescriptionPanel.html b/.../java/com/evolveum/midpoint/gui/impl/page/admin/simulation/TitleWithDescriptionPanel.html
@@ -10,7 +10,7 @@
 <wicket:panel>
     <a wicket:id="link">
         <div wicket:id="title"/>
-        <div class="text-sm">
+        <div class="text-sm" wicket:id="descriptionContainer">
             <i class="fa-solid fa-tag text-info mr-1"/>
             <span class="text-secondary text-truncate" wicket:id="description"/>
         </div>

diff --git a/.../java/com/evolveum/midpoint/gui/impl/page/admin/simulation/TitleWithDescriptionPanel.java b/.../java/com/evolveum/midpoint/gui/impl/page/admin/simulation/TitleWithDescriptionPanel.java
@@ -7,9 +7,14 @@
 
 package com.evolveum.midpoint.gui.impl.page.admin.simulation;
 
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebComponent;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.IModel;
 
@@ -26,6 +31,7 @@ public class TitleWithDescriptionPanel extends BasePanel {
 
     private static final String ID_LINK = "link";
     private static final String ID_TITLE = "title";
+    private static final String ID_DESCRIPTION_CONTAINER ="descriptionContainer";
     private static final String ID_DESCRIPTION = "description";
 
     private IModel<String> description;
@@ -52,9 +58,13 @@ public void onClick(AjaxRequestTarget target) {
         Label title = new Label(ID_TITLE, getModel());
         link.add(title);
 
+        WebMarkupContainer descriptionContainer = new WebMarkupContainer(ID_DESCRIPTION_CONTAINER);
+        descriptionContainer.add(AttributeAppender.append("class", () -> StringUtils.isEmpty(this.description.getObject()) ? "invisible" : null));
+        link.add(descriptionContainer);
+
         Label description = new Label(ID_DESCRIPTION, this.description);
         description.add(new VisibleBehaviour(() -> StringUtils.isNotEmpty(this.description.getObject())));
-        link.add(description);
+        descriptionContainer.add(description);
     }
 
     protected boolean isTitleLinkEnabled() {