Merge remote-tracking branch 'origin/master'

Evolveum · Feb 21, 2024 · 884f475 · 884f475
2 parents 0a57bb9 + d8c45ee
commit 884f475
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/FocusTilePanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/FocusTilePanel.java
@@ -8,8 +8,9 @@
 package com.evolveum.midpoint.gui.impl.component.tile;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.web.component.data.column.RoundedImagePanel;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
@@ -123,11 +124,16 @@ protected DisplayType createDisplayType(IModel<T> model) {
             return null;
         }
 
-        String icon = IconAndStylesUtil.createDefaultBlackIcon(obj.asPrismContainerValue().getTypeName());
+        OperationResult result =  new OperationResult("getIcon");
+        DisplayType type =  GuiDisplayTypeUtil.getDisplayTypeForObject(obj, result, getPageBase());
+        if (type == null || type.getIcon() == null) {
+            return type;
+        }
+
+        IconType icon = type.getIcon();
+        icon.setCssClass(StringUtils.joinWith(" ", icon.getCssClass(), "fa-2x"));
 
-        return new DisplayType()
-                .icon(new IconType()
-                        .cssClass(StringUtils.joinWith(" ", icon, "fa-2x")));
+        return type;
     }
 
     protected IModel<IResource> createPreferredImage(IModel<T> model) {

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/CartSummaryPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/CartSummaryPanel.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
 import com.evolveum.midpoint.gui.impl.util.RelationUtil;
 
@@ -429,11 +430,17 @@ protected DisplayType createDisplayType(IModel<ShoppingCartItem> model) {
                     return null;
                 }
 
-                String icon = IconAndStylesUtil.createDefaultBlackIcon(ref.getType());
+                PrismObject object = WebModelServiceUtils.loadObject(ref, getPageBase());
+                if (object == null) {
+                    String icon = IconAndStylesUtil.createDefaultColoredIcon(ref.getType());
 
-                return new DisplayType()
-                        .icon(new IconType()
-                                .cssClass(icon));
+                    return new DisplayType()
+                            .icon(new IconType()
+                                    .cssClass(icon));
+                }
+
+                OperationResult result = new OperationResult("getIcon");
+                return GuiDisplayTypeUtil.getDisplayTypeForObject(object, result, getPageBase());
             }
         });
         columns.add(new AbstractColumn<>(createStringResource("ShoppingCartPanel.accessName")) {

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java
@@ -11,6 +11,7 @@
 import java.util.stream.Collectors;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.impl.util.TableUtil;
 
 import com.evolveum.midpoint.web.component.util.*;
@@ -917,12 +918,8 @@ protected IModel<IResource> createPreferredImage(IModel<SelectableBean<ObjectTyp
 
             @Override
             protected DisplayType createDisplayType(IModel<SelectableBean<ObjectType>> model) {
-                ObjectType obj = model.getObject().getValue();
-                String icon = IconAndStylesUtil.createDefaultBlackIcon(obj.asPrismContainerValue().getTypeName());
-
-                return new DisplayType()
-                        .icon(new IconType()
-                                .cssClass(icon));
+                OperationResult result =  new OperationResult("getIcon");
+                return GuiDisplayTypeUtil.getDisplayTypeForObject(model.getObject().getValue(), result, getPageBase());
             }
         });
         columns.add(new AbstractColumn<>(createStringResource("ObjectType.name")) {