bugfixes in simulation pages

Evolveum · Jan 2, 2023 · e9232ce · e9232ce
1 parent 1f14045
commit e9232ce
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 45 deletions.
diff --git a/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.html b/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.html
@@ -8,7 +8,11 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:extend>
-    <wicket:child />
+    <div class="row">
+        <div class="col-12 col-md-6 col-lg-3" wicket:id="widgets">
+            <div class="mb-4" wicket:id="widget"/>
+        </div>
+    </div>
 </wicket:extend>
 </body>
 </html>
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
@@ -7,21 +7,25 @@
 
 package com.evolveum.midpoint.gui.impl.page.admin.simulation;
 
-import org.apache.wicket.markup.html.panel.Panel;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
 import com.evolveum.midpoint.authentication.api.authorization.Url;
-import com.evolveum.midpoint.gui.impl.page.admin.AbstractPageObjectDetails;
-import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels;
+import com.evolveum.midpoint.gui.impl.component.box.SmallBox;
+import com.evolveum.midpoint.gui.impl.component.box.SmallBoxData;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.ObjectSummaryPanel;
+import com.evolveum.midpoint.web.page.admin.PageAdmin;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.SimulationResultType;
 
 /**
  * Created by Viliam Repan (lazyman).
@@ -40,44 +44,49 @@
                         description = "PageSimulationResults.auth.simulationResult.description")
         }
 )
-public class PageSimulationResult extends AbstractPageObjectDetails<SimulationResultType, ObjectDetailsModels<SimulationResultType>> {
+public class PageSimulationResult extends PageAdmin {
 
     private static final long serialVersionUID = 1L;
 
     private static final Trace LOGGER = TraceManager.getTrace(PageSimulationResult.class);
 
     private static final String DOT_CLASS = PageSimulationResult.class.getName() + ".";
 
+    private static final String ID_WIDGETS = "widgets";
+
+    private static final String ID_WIDGET = "widget";
+
     public PageSimulationResult() {
+        this(new PageParameters());
     }
 
     public PageSimulationResult(PageParameters parameters) {
         super(parameters);
-    }
 
-    @Override
-    public Class<SimulationResultType> getType() {
-        return SimulationResultType.class;
+        initLayout();
     }
 
-    @Override
-    protected Panel createSummaryPanel(String id, IModel<SimulationResultType> summaryModel) {
-        return new ObjectSummaryPanel<>(id, SimulationResultType.class, summaryModel, getSummaryPanelSpecification()) {
+    private void initLayout() {
+        // todo implement
+        IModel<List<SmallBoxData>> data = () -> new ArrayList<>();
 
-            @Override
-            protected String getDefaultIconCssClass() {
-                return null;
-            }
+        ListView<SmallBoxData> widgets = new ListView<>(ID_WIDGETS, data) {
 
             @Override
-            protected String getIconBoxAdditionalCssClass() {
-                return null;
-            }
+            protected void populateItem(ListItem<SmallBoxData> item) {
+                item.add(new SmallBox(ID_WIDGET, item.getModel()) {
 
-            @Override
-            protected String getBoxAdditionalCssClass() {
-                return null;
+                    @Override
+                    protected void onClickLink(AjaxRequestTarget target) {
+                        onWidgetClick(target, getModelObject());
+                    }
+                });
             }
         };
+        add(widgets);
+    }
+
+    private void onWidgetClick(AjaxRequestTarget target, SmallBoxData data) {
+
     }
 }
diff --git a/...main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResults.java b/...main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResults.java
@@ -7,20 +7,18 @@
 
 package com.evolveum.midpoint.gui.impl.page.admin.simulation;
 
-import com.evolveum.midpoint.gui.api.GuiStyleConstants;
-import com.evolveum.midpoint.web.application.CollectionInstance;
-import com.evolveum.midpoint.web.application.PanelDisplay;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
-
 import org.apache.wicket.markup.html.form.Form;
 
 import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
 import com.evolveum.midpoint.authentication.api.authorization.Url;
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.component.MainObjectListPanel;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.application.CollectionInstance;
+import com.evolveum.midpoint.web.application.PanelDisplay;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
 import com.evolveum.midpoint.web.page.admin.PageAdmin;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
@@ -56,20 +54,14 @@ public class PageSimulationResults extends PageAdmin {
     private static final String ID_TABLE = "table";
 
     public PageSimulationResults() {
-    }
-
-    @Override
-    protected void onBeforeRender() {
-        super.onBeforeRender();
-
         initLayout();
     }
 
     private void initLayout() {
         Form form = new MidpointForm(ID_FORM);
         add(form);
 
-        // todo add delete whole result action and delete processed objects (leave result) action
+        // todo add "delete whole result" action and delete "processed objects (leave result)" action
         MainObjectListPanel<SimulationResultType> table = new MainObjectListPanel<>(ID_TABLE, SimulationResultType.class) {
 
             @Override

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/OnePageParameterEncoder.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/OnePageParameterEncoder.java
@@ -7,8 +7,7 @@
 
 package com.evolveum.midpoint.web.util;
 
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
+import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.Page;
@@ -18,7 +17,8 @@
 import org.apache.wicket.util.string.StringValue;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
 
 /**
  * This encoder with encode/decode {@link OnePageParameterEncoder#PARAMETER} to path
@@ -73,18 +73,18 @@ public static String getParameter(@NotNull Page page) {
         PageParameters parameters = page.getPageParameters();
         LOGGER.trace("Page parameters: {}", parameters);
 
-        StringValue oidValue = parameters.get(PARAMETER);
-        LOGGER.trace("OID parameter: {}", oidValue);
+        StringValue value = parameters.get(PARAMETER);
+        LOGGER.trace("OID parameter: {}", value);
 
-        if (oidValue == null) {
+        if (value == null) {
             return null;
         }
 
-        String oid = oidValue.toString();
-        if (StringUtils.isBlank(oid)) {
+        String str = value.toString();
+        if (StringUtils.isBlank(str)) {
             return null;
         }
 
-        return oid;
+        return str;
     }
 }