MID-7804: fix for configurable clickable first column with multi segm…

…ent item path
Evolveum · Apr 4, 2022 · 15fa334 · 15fa334
1 parent b672b76
commit 15fa334
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -184,7 +184,8 @@ private Component createNewObjectButton(String buttonId) {
         builder.setBasicIcon(WebComponentUtil.getIconCssClass(newObjectButtonDisplayType), IconCssStyle.IN_ROW_STYLE)
                 .appendColorHtmlValue(WebComponentUtil.getIconColor(newObjectButtonDisplayType));
         CompiledObjectCollectionView view = getObjectCollectionView();
-        if (isCollectionViewPanelForCompiledView() && GuiDisplayTypeUtil.existsIconDisplay(view)) {
+        if (isCollectionViewPanelForCompiledView() && GuiDisplayTypeUtil.existsIconDisplay(view)
+                && GuiDisplayTypeUtil.containsDifferentIcon(newObjectButtonDisplayType, GuiStyleConstants.CLASS_ADD_NEW_OBJECT)) {
             IconType plusIcon = new IconType();
             plusIcon.setCssClass(GuiStyleConstants.CLASS_ADD_NEW_OBJECT);
             plusIcon.setColor("green");

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/GuiDisplayTypeUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/GuiDisplayTypeUtil.java
@@ -14,6 +14,7 @@
 import com.evolveum.midpoint.prism.util.PolyStringUtils;
 import com.evolveum.midpoint.schema.constants.RelationTypes;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.data.column.ColumnUtils;
@@ -184,6 +185,11 @@ public static DisplayType getNewObjectDisplayTypeFromCollectionView(CompiledObje
         if (displayType == null) {
             displayType = createDisplayType(GuiStyleConstants.CLASS_ADD_NEW_OBJECT, "green", "");
         }
+
+        if (displayType.getIcon() == null || displayType.getIcon().getCssClass() == null){
+            MiscSchemaUtil.mergeDisplay(displayType, createDisplayType(GuiStyleConstants.CLASS_ADD_NEW_OBJECT, "green", ""));
+        }
+
         if (PolyStringUtils.isEmpty(displayType.getTooltip()) && !PolyStringUtils.isEmpty(displayType.getLabel())) {
             StringBuilder sb = new StringBuilder();
             sb.append(pageBase.createStringResource("MainObjectListPanel.newObject").getString());
@@ -219,12 +225,23 @@ public static boolean existsIconDisplay(CompiledObjectCollectionView view) {
         if (view == null){
             return false;
         }
-        if (view.getDisplay() == null){
+        return existsIconDisplay(view.getDisplay());
+    }
+
+    private static boolean existsIconDisplay(DisplayType display) {
+        if (display == null){
             return false;
         }
-        if (view.getDisplay().getIcon() == null){
+        if (display.getIcon() == null){
             return false;
         }
-        return StringUtils.isNotBlank(view.getDisplay().getIcon().getCssClass());
+        return StringUtils.isNotBlank(display.getIcon().getCssClass());
+    }
+
+    public static boolean containsDifferentIcon(DisplayType display, String iconCss) {
+        if (existsIconDisplay(display)) {
+            return !display.getIcon().getCssClass().contains(iconCss);
+        }
+        return true;
     }
 }
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectNameColumn.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ObjectNameColumn.java
@@ -123,7 +123,14 @@ public String getObject() {
                     return getName(value, selectableBean);
                 }
 
-                Object itemPathPropertyValue = new PropertyModel<>(rowModel, "value." + itemPath).getObject();
+                StringBuilder path = new StringBuilder("value");
+                itemPath.getSegments().forEach(segment -> {
+                    if (segment != null) {
+                        path.append(".").append(segment);
+                    }
+                });
+
+                Object itemPathPropertyValue = new PropertyModel<>(rowModel, path.toString()).getObject();
                 return itemPathPropertyValue != null ? itemPathPropertyValue.toString() : "";
 
             }