MID-8298 request access: improved column icons on shopping cart summary

Evolveum · Feb 20, 2024 · 67f2515 · 67f2515
1 parent a33a12f
commit 67f2515
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss b/gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss
@@ -56,10 +56,6 @@
   margin-right: -0.625rem;
 }
 
-.role-catalog-tiles-table div.img-circle {
-  background-color: #f5f5f5;
-}
-
 .dropdown-toggle:after {
   vertical-align: middle;
   /*margin: 0 0.255em;*/

diff --git a/gui/admin-gui/src/frontend/scss/_tables.scss b/gui/admin-gui/src/frontend/scss/_tables.scss
@@ -65,3 +65,7 @@ th.countLabel{
   // See com.evolveum.midpoint.web.page.admin.certification.PageCertDecisions
   width: 70px;
 }
+
+td.rounded-icon-column div.img-circle {
+  background-color: #f5f5f5;
+}
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.impl.util.IconAndStylesUtil;
 import com.evolveum.midpoint.gui.impl.util.RelationUtil;
 
 import org.apache.commons.lang3.BooleanUtils;
@@ -418,6 +419,22 @@ protected IResource load() {
                     }
                 };
             }
+
+            @Override
+            protected DisplayType createDisplayType(IModel<ShoppingCartItem> model) {
+                AssignmentType a = model.getObject().getAssignment();
+                ObjectReferenceType ref = a != null ? a.getTargetRef() : null;
+
+                if (ref == null || ref.getType() == null) {
+                    return null;
+                }
+
+                String icon = IconAndStylesUtil.createDefaultBlackIcon(ref.getType());
+
+                return new DisplayType()
+                        .icon(new IconType()
+                                .cssClass(icon));
+            }
         });
         columns.add(new AbstractColumn<>(createStringResource("ShoppingCartPanel.accessName")) {
 

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/RoundedIconColumn.java b/...-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/RoundedIconColumn.java
@@ -43,4 +43,9 @@ protected DisplayType createDisplayType(IModel<T> model) {
     protected IModel<IResource> createPreferredImage(IModel<T> model) {
         return () -> null;
     }
+
+    @Override
+    public String getCssClass() {
+        return "rounded-icon-column";
+    }
 }