added order to cases tabs + icon fix

Evolveum · Aug 30, 2021 · 0ce166e · 0ce166e
1 parent 1126036
commit 0ce166e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
@@ -319,7 +319,7 @@ private List<ContainerPanelConfigurationType> processChildren(Set<Class<?>> clas
     private DisplayType createDisplayType(PanelDisplay display) {
         DisplayType displayType = new DisplayType();
         displayType.setLabel(WebComponentUtil.createPolyFromOrigString(display.label()));
-        displayType.setCssClass(display.icon());
+        displayType.setIcon(new IconType().cssClass(display.icon()));
         return displayType;
     }
 

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/DetailsNavigationPanel.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/DetailsNavigationPanel.java
@@ -8,11 +8,7 @@
 
 import java.util.List;
 
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels;
-import com.evolveum.midpoint.web.application.SimpleCounter;
-import com.evolveum.midpoint.web.session.ObjectDetailsStorage;
-
+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;
@@ -22,19 +18,20 @@
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.model.ReadOnlyModel;
-import com.evolveum.midpoint.web.application.AssignmentCounter;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels;
+import com.evolveum.midpoint.web.application.SimpleCounter;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
+import com.evolveum.midpoint.web.session.ObjectDetailsStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserInterfaceElementVisibilityType;
 
-import org.apache.wicket.model.PropertyModel;
-import org.opensaml.xmlsec.signature.P;
-
 public class DetailsNavigationPanel<O extends ObjectType> extends BasePanel<List<ContainerPanelConfigurationType>> {
 
     private static final String ID_NAV = "menu";
@@ -76,10 +73,7 @@ protected void populateItem(ListItem<ContainerPanelConfigurationType> item) {
                 item.add(navigationDetails);
                 WebMarkupContainer icon = new WebMarkupContainer(ID_NAV_ITEM_ICON);
                 icon.setOutputMarkupId(true);
-                icon.add(AttributeAppender.append("class",
-                        WebComponentUtil.getIconCssClass(item.getModelObject().getDisplay()) != null ?
-                                WebComponentUtil.getIconCssClass(item.getModelObject().getDisplay()) :
-                                GuiStyleConstants.CLASS_CIRCLE_FULL));
+                icon.add(AttributeAppender.append("class", getMenuItemIconClass(item.getModelObject())));
                 navigationDetails.add(icon);
                 AjaxLink<Void> link = new AjaxLink<>(ID_NAV_ITEM) {
 
@@ -170,4 +164,12 @@ private String createButtonLabel(ContainerPanelConfigurationType config) {
         return config.getDisplay().getLabel().getOrig();
     }
 
+    private String getMenuItemIconClass(ContainerPanelConfigurationType item) {
+        if (item == null || item.getDisplay() == null) {
+            return GuiStyleConstants.CLASS_CIRCLE_FULL;
+        }
+        String iconCss = WebComponentUtil.getIconCssClass(item.getDisplay());
+        return StringUtils.isNoneEmpty(iconCss) ? iconCss : GuiStyleConstants.CLASS_CIRCLE_FULL;
+    }
+
 }
diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/ApprovalCasePanel.java b/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/ApprovalCasePanel.java
@@ -40,7 +40,7 @@
  */
 @PanelType(name = "approvalCase")
 @PanelInstance(identifier = "approvalCase",
-        display = @PanelDisplay(label = "Approvals"))
+        display = @PanelDisplay(label = "Approvals", order = 1))
 public class ApprovalCasePanel extends AbstractObjectMainPanel<CaseType, AssignmentHolderDetailsModel<CaseType>> {
     private static final long serialVersionUID = 1L;
 

diff --git a/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/ManualCasePanel.java b/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/ManualCasePanel.java
@@ -32,7 +32,7 @@
  */
 @PanelType(name = "manualCase")
 @PanelInstance(identifier = "manualCase",
-        display = @PanelDisplay(label = "Manual case"))
+        display = @PanelDisplay(label = "Manual case", order = 1))
 public class ManualCasePanel extends AbstractObjectMainPanel<CaseType, AssignmentHolderDetailsModel<CaseType>> {
     private static final long serialVersionUID = 1L;
 

diff --git a/.../com/evolveum/midpoint/gui/impl/page/admin/cases/component/OperationRequestCasePanel.java b/.../com/evolveum/midpoint/gui/impl/page/admin/cases/component/OperationRequestCasePanel.java
@@ -38,7 +38,7 @@
  */
 @PanelType(name = "operationRequestCase")
 @PanelInstance(identifier = "operationRequestCase",
-        display = @PanelDisplay(label = "Operation request"))
+        display = @PanelDisplay(label = "Operation request", order = 1))
 public class OperationRequestCasePanel extends AbstractObjectMainPanel<CaseType, AssignmentHolderDetailsModel<CaseType>> {
     private static final long serialVersionUID = 1L;