small improvements related to simulations ui

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

Hide file tree

Showing 5 changed files with 49 additions and 39 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/CountablePanelTab.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/CountablePanelTab.java
@@ -6,9 +6,10 @@
  */
 package com.evolveum.midpoint.gui.api.component.tabs;
 
+import org.apache.wicket.model.IModel;
+
 import com.evolveum.midpoint.gui.api.model.CountModelProvider;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
-import org.apache.wicket.model.IModel;
 
 /**
  * Tab that can display object count (small bubble with number) in the tab label.
@@ -33,15 +34,7 @@ public IModel<String> getCountModel() {
         // When we display the tab the panel does not exist yet.
         // The panel is created only when the tab is clicked.
 
-        return new IModel<String>() {
-
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public String getObject() {
-                return getCount();
-            }
-        };
+        return () -> getCount();
     }
 
     public abstract String getCount();

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
@@ -582,18 +582,7 @@ public boolean isEditObject() {
     }
 
     protected String getObjectOidParameter() {
-        PageParameters parameters = getPageParameters();
-        LOGGER.trace("Page parameters: {}", parameters);
-        StringValue oidValue = parameters.get(OnePageParameterEncoder.PARAMETER);
-        LOGGER.trace("OID parameter: {}", oidValue);
-        if (oidValue == null) {
-            return null;
-        }
-        String oid = oidValue.toString();
-        if (StringUtils.isBlank(oid)) {
-            return null;
-        }
-        return oid;
+        return OnePageParameterEncoder.getParameter(this);
     }
 
     protected LoadableModel<PrismObjectWrapper<O>> getModel() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
@@ -6,23 +6,21 @@
   ~ and European Union Public License. See LICENSE file for details.
   -->
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
-    <div class="card card-primary card-outline card-outline-tabs">
-        <div class="card-header p-0 border-bottom-0">
-            <ul class="nav nav-tabs" wicket:id="tabs-container">
-                <li class="nav-item" wicket:id="tabs">
-                    <a class="nav-link" href="#" wicket:id="link">
-                        <span wicket:id="title"/>
-                        <small class="badge" wicket:id="count"/>
-                    </a>
-                </li>
-                <wicket:remove><!-- TODO fix the style for rightSideTabItem --></wicket:remove>
-                <li wicket:id="rightSideTabItem" class="pull-right" style="border-radius: 0; margin: 10px"><div wicket:id="rightSideTab"/></li>
-            </ul>
-        </div>
-        <div class="card-body">
-            <div class="tab-content">
-                <div wicket:id="panel" class="tab-pane active" />
-            </div>
+    <div class="card-header p-0 border-bottom-0">
+        <ul class="nav nav-tabs" wicket:id="tabs-container">
+            <li class="nav-item" wicket:id="tabs">
+                <a class="nav-link" href="#" wicket:id="link">
+                    <span wicket:id="title"/>
+                    <small class="badge" wicket:id="count"/>
+                </a>
+            </li>
+            <wicket:remove><!-- TODO fix the style for rightSideTabItem --></wicket:remove>
+            <li wicket:id="rightSideTabItem" class="pull-right" style="border-radius: 0; margin: 10px"><div wicket:id="rightSideTab"/></li>
+        </ul>
+    </div>
+    <div class="card-body">
+        <div class="tab-content">
+            <div wicket:id="panel" class="tab-pane active" />
         </div>
     </div>
 </wicket:panel>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java
@@ -100,6 +100,8 @@ public Integer getObject() {
             }
         };
 
+        add(AttributeModifier.prepend("class", "card card-primary card-outline card-outline-tabs"));
+
         WebMarkupContainer tabsContainer = newTabsContainer(ID_TABS_CONTAINER);
         tabsContainer.setOutputMarkupId(true);
         tabsContainer.setOutputMarkupPlaceholderTag(true);

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,9 +7,16 @@
 
 package com.evolveum.midpoint.web.util;
 
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Page;
 import org.apache.wicket.request.Url;
 import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.string.StringValue;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -25,6 +32,8 @@ public class OnePageParameterEncoder implements IPageParametersEncoder {
 
     public static final String PARAMETER = "pathParameter";
 
+    private static final Trace LOGGER = TraceManager.getTrace(OnePageParameterEncoder.class);
+
     @Override
     public PageParameters decodePageParameters(Url url) {
         PageParameters parameters = new PageParameters();
@@ -59,4 +68,23 @@ public Url encodePageParameters(PageParameters pageParameters) {
 
         return url;
     }
+
+    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);
+
+        if (oidValue == null) {
+            return null;
+        }
+
+        String oid = oidValue.toString();
+        if (StringUtils.isBlank(oid)) {
+            return null;
+        }
+
+        return oid;
+    }
 }