fix of using css attributes in color element for GUI

Evolveum · Dec 21, 2023 · c30bcfb · c30bcfb
1 parent ce1346f
commit c30bcfb
Show file tree

Hide file tree

Showing 15 changed files with 66 additions and 21 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -9,6 +9,7 @@
 import java.util.*;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component.TaskAwareExecutor;
 import com.evolveum.midpoint.web.component.menu.top.LocaleTopMenuPanel;
 
@@ -432,7 +433,7 @@ public static AttributeAppender createHeaderColorStyleModel(boolean checkSkinUsa
                 return null;
             }
 
-            return "background-color: " + info.getHeaderColor() + " !important;";
+            return "background-color: " + GuiDisplayTypeUtil.removeStringAfterSemicolon(info.getHeaderColor()) + " !important;";
         });
     }
 

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
@@ -30,6 +30,7 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.annotation.Nullable;
 import javax.xml.namespace.QName;
 
 public class GuiDisplayTypeUtil {
@@ -251,7 +252,7 @@ public static String getIconColor(DisplayType displayType) {
         if (displayType == null || displayType.getIcon() == null) {
             return "";
         }
-        return displayType.getIcon().getColor();
+        return removeStringAfterSemicolon(displayType.getIcon().getColor());
     }
 
     public static String getHelp(DisplayType displayType) {
@@ -315,4 +316,11 @@ public static DisplayType createDisplayTypeWith(String labelOrg, String labelKey
         display.setHelp(help);
         return display;
     }
+
+    public static String removeStringAfterSemicolon(@Nullable String headerColor) {
+        if (headerColor == null || !headerColor.contains(";")) {
+            return headerColor;
+        }
+        return headerColor.substring(0, headerColor.indexOf(";"));
+    }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -2726,7 +2726,7 @@ public static CompositedIconBuilder getAssignmentRelationIconBuilder(PageBase pa
                 return null;
             }
             builder.setBasicIcon(actionButtonIcon, IconCssStyle.IN_ROW_STYLE)
-                    .appendColorHtmlValue(actionButtonIcon.getColor());
+                    .appendColorHtmlValue(GuiDisplayTypeUtil.removeStringAfterSemicolon(actionButtonIcon.getColor()));
             return builder;
         }
         DisplayType objectTypeDisplay = null;
@@ -2760,7 +2760,7 @@ public static CompositedIconBuilder getAssignmentRelationIconBuilder(PageBase pa
                     .appendLayerIcon(relationIcon, IconCssStyle.TOP_RIGHT_MAX_ICON_STYLE);
         } else {
             builder.setBasicIcon(actionButtonIcon, IconCssStyle.IN_ROW_STYLE)
-                    .appendColorHtmlValue(actionButtonIcon.getColor());
+                    .appendColorHtmlValue(GuiDisplayTypeUtil.removeStringAfterSemicolon(actionButtonIcon.getColor()));
         }
         return builder;
     }

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AjaxCompositedIconButton.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AjaxCompositedIconButton.java
@@ -105,7 +105,9 @@ public void onComponentTagBody(final MarkupStream markupStream, final ComponentT
                 if (StringUtils.isNotEmpty(entry.getIconType().getCssClass())) {
                     sb.append("<i class=\"").append(entry.getIconType().getCssClass()).append("\"");
                     if (StringUtils.isNotEmpty(entry.getIconType().getColor())) {
-                        sb.append(" style=\"color: ").append(entry.getIconType().getColor()).append(";\"");
+                        sb.append(" style=\"color: ")
+                                .append(GuiDisplayTypeUtil.removeStringAfterSemicolon(entry.getIconType().getColor()))
+                                .append(";\"");
                     }
                     sb.append(">").append(entry.hasLabel() ? entry.getLabelModel().getObject() : "").append("</i> ");
                 }

diff --git a/...c/main/java/com/evolveum/midpoint/gui/impl/component/data/column/CompositedIconPanel.java b/...c/main/java/com/evolveum/midpoint/gui/impl/component/data/column/CompositedIconPanel.java
@@ -6,6 +6,8 @@
  */
 package com.evolveum.midpoint.gui.impl.component.data.column;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebComponent;
@@ -87,7 +89,9 @@ protected void populateItem(ListItem<LayerIcon> item) {
                 WebComponent icon = new WebComponent(ID_LAYER_ICON);
                 icon.add(AttributeAppender.append("class", iconType.getCssClass()));
                 if (StringUtils.isNotEmpty(iconType.getColor())) {
-                    icon.add(AttributeAppender.append("style", "color: " + iconType.getColor()));
+                    icon.add(AttributeAppender.append(
+                            "style",
+                            "color: " + GuiDisplayTypeUtil.removeStringAfterSemicolon(iconType.getColor())));
                 }
                 item.add(icon);
             }

diff --git a/...va/com/evolveum/midpoint/gui/impl/component/data/column/CompositedIconWithLabelPanel.java b/...va/com/evolveum/midpoint/gui/impl/component/data/column/CompositedIconWithLabelPanel.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.component.data.column;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
 
@@ -48,6 +49,6 @@ private String getLabel() {
 
     private String getLabelColor() {
         return labelDisplayModel != null && labelDisplayModel.getObject() != null && labelDisplayModel.getObject().getColor() != null ?
-                labelDisplayModel.getObject().getColor() : "";
+                GuiDisplayTypeUtil.removeStringAfterSemicolon(labelDisplayModel.getObject().getColor()) : "";
     }
 }
diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/component/icon/CompositedIconBuilder.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/component/icon/CompositedIconBuilder.java
@@ -10,6 +10,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.impl.util.IconAndStylesUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
@@ -124,8 +125,10 @@ public CompositedIconBuilder appendLayerIcon(IconType icon, LayeredIconCssStyle
         }
         String layerIconClass = sb.toString();
         sb.append(" ").append(style.getStrokeLayerCssClass());
-        appendLayerIcon(new LayerIcon(IconAndStylesUtil.createIconType(sb.toString(), icon.getColor())));
-        appendLayerIcon(new LayerIcon(IconAndStylesUtil.createIconType(layerIconClass, icon.getColor())));
+        appendLayerIcon(new LayerIcon(
+                IconAndStylesUtil.createIconType(sb.toString(), GuiDisplayTypeUtil.removeStringAfterSemicolon(icon.getColor()))));
+        appendLayerIcon(new LayerIcon(
+                IconAndStylesUtil.createIconType(layerIconClass, GuiDisplayTypeUtil.removeStringAfterSemicolon(icon.getColor()))));
         return this;
     }
 
@@ -140,8 +143,12 @@ public CompositedIconBuilder appendLayerIcon(IModel<String> labelModel, IconType
         }
         String layerIconClass = sb.toString();
         sb.append(" ").append(style.getStrokeLayerCssClass());
-        appendLayerIcon(new LayerIcon(IconAndStylesUtil.createIconType(sb.toString(), icon.getColor()), labelModel));
-        appendLayerIcon(new LayerIcon(IconAndStylesUtil.createIconType(layerIconClass, icon.getColor()), labelModel));
+        appendLayerIcon(new LayerIcon(
+                IconAndStylesUtil.createIconType(
+                        sb.toString(), GuiDisplayTypeUtil.removeStringAfterSemicolon(icon.getColor())), labelModel));
+        appendLayerIcon(new LayerIcon(
+                IconAndStylesUtil.createIconType(
+                        layerIconClass, GuiDisplayTypeUtil.removeStringAfterSemicolon(icon.getColor())), labelModel));
         return this;
     }
 

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/MemberTilePanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/MemberTilePanel.java
@@ -15,6 +15,7 @@
 import com.evolveum.midpoint.gui.api.component.button.DropdownButtonPanel;
 import com.evolveum.midpoint.gui.api.component.form.CheckBoxPanel;
 import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.page.admin.resource.component.TemplateTile;
 
@@ -133,14 +134,18 @@ protected void populateItem(ListItem<DisplayType> item) {
                     tagContainer.add(AttributeAppender.append("style", tag.getCssStyle()));
                 }
                 if (StringUtils.isNotEmpty(tag.getColor())) {
-                    tagContainer.add(AttributeAppender.append("style", "color: " + tag.getColor()));
+                    tagContainer.add(AttributeAppender.append(
+                            "style",
+                            "color: " + GuiDisplayTypeUtil.removeStringAfterSemicolon(tag.getColor())));
                 }
                 if (StringUtils.isEmpty(tag.getCssClass())
                         && StringUtils.isEmpty(tag.getCssStyle())
                         && StringUtils.isEmpty(tag.getColor())
                         && tag.getIcon() != null
                         && StringUtils.isNotEmpty(tag.getIcon().getColor())) {
-                    tagContainer.add(AttributeAppender.append("style", "color: " + tag.getIcon().getColor()));
+                    tagContainer.add(AttributeAppender.append(
+                            "style",
+                            "color: " + GuiDisplayTypeUtil.removeStringAfterSemicolon(tag.getIcon().getColor())));
                 }
                 item.add(tagContainer);
 

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/component/AjaxCompositedIconSubmitButton.java b/...gui/src/main/java/com/evolveum/midpoint/web/component/AjaxCompositedIconSubmitButton.java
@@ -6,6 +6,8 @@
  */
 package com.evolveum.midpoint.web.component;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
@@ -90,7 +92,9 @@ public void onComponentTagBody(final MarkupStream markupStream, final ComponentT
                 if (StringUtils.isNotEmpty(entry.getIconType().getCssClass())) {
                     sb.append("<i class=\"").append(entry.getIconType().getCssClass()).append("\"");
                     if (StringUtils.isNotEmpty(entry.getIconType().getColor())) {
-                        sb.append(" style=\"color: ").append(entry.getIconType().getColor()).append(";\"");
+                        sb.append(" style=\"color: ")
+                                .append(GuiDisplayTypeUtil.removeStringAfterSemicolon(entry.getIconType().getColor()))
+                                .append(";\"");
                     }
                     sb.append(">").append(entry.hasLabel() ? entry.getLabelModel().getObject() : "").append("</i> ");
                 }

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CountIconPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CountIconPanel.java
@@ -8,6 +8,7 @@
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.model.ReadOnlyModel;
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.DisplayType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.IconType;
@@ -89,6 +90,6 @@ private String getColor(DisplayType displayType) {
             return null;
         }
 
-        return icon.getColor();
+        return GuiDisplayTypeUtil.removeStringAfterSemicolon(icon.getColor());
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ImagePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ImagePanel.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.web.component.data.column;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.api.util.LocalizationUtil;
 
 import org.apache.commons.lang3.StringUtils;
@@ -86,6 +87,6 @@ private String getColor() {
             return null;
         }
 
-        return icon.getColor();
+        return GuiDisplayTypeUtil.removeStringAfterSemicolon(icon.getColor());
     }
 }
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/RoundedImagePanel.java b/...-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/RoundedImagePanel.java
@@ -7,6 +7,8 @@
 
 package com.evolveum.midpoint.web.component.data.column;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -75,7 +77,7 @@ private String getIconColorStyle() {
         if(icon != null) {
             String color = icon.getColor();
             if (StringUtils.isNotEmpty(color)) {
-                return "color:" + color + ";";
+                return "color:" + GuiDisplayTypeUtil.removeStringAfterSemicolon(color) + ";";
             }
         }
         return null;

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/DashboardWidgetDto.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/DashboardWidgetDto.java
@@ -7,6 +7,7 @@
 package com.evolveum.midpoint.web.page.admin.home;
 
 import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.model.api.interaction.DashboardWidget;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.DashboardWidgetType;
@@ -80,7 +81,7 @@ private String createStyleColor(DashboardWidget dashboardWidget) {
         }
         DisplayType displayType = dashboardWidget.getDisplay();
         if (displayType != null && StringUtils.isNoneBlank(displayType.getColor())) {
-            return "background-color:" + displayType.getColor() + ";";
+            return "background-color:" + GuiDisplayTypeUtil.removeStringAfterSemicolon(displayType.getColor()) + ";";
         }
         return DEFAULT_BACKGROUND_COLOR;
     }

diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java b/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
@@ -16,6 +16,8 @@
 import java.util.stream.Collectors;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
@@ -306,7 +308,7 @@ protected CompositedIcon getCompositedIcon(IModel<SelectableBean<AuditEventRecor
                         } else {
                             rightBottomIcon = eventType.getDisplay().getIcon().getCssClass();
                         }
-                        iconColor = eventType.getDisplay().getIcon().getColor();
+                        iconColor = GuiDisplayTypeUtil.removeStringAfterSemicolon(eventType.getDisplay().getIcon().getColor());
                     }
                     CompositedIconBuilder iconBuilder = new CompositedIconBuilder();
                     if (defaultIcon != null) {
@@ -332,7 +334,7 @@ public IModel<DisplayType> getLabelDisplayModel(IModel<SelectableBean<AuditEvent
                             WebComponentUtil.createLocalizedModelForEnum(record.getEventType(), AuditLogViewerPanel.this).getObject();
                     String color = eventType != null && eventType.getDisplay() != null && eventType.getDisplay().getIcon() != null ?
                             eventType.getDisplay().getIcon().getColor() : null;
-                    return Model.of(new DisplayType().label(label).color(color));
+                    return Model.of(new DisplayType().label(label).color(GuiDisplayTypeUtil.removeStringAfterSemicolon(color)));
                 }
 
                 @Override

diff --git a/...main/java/com/evolveum/midpoint/report/impl/controller/HtmlDashboardReportDataWriter.java b/...main/java/com/evolveum/midpoint/report/impl/controller/HtmlDashboardReportDataWriter.java
@@ -184,7 +184,13 @@ private CommonHtmlSupport getDefaultSupport() {
 
     @Override
     public @Nullable Function<String, String> getFunctionForWidgetStatus() {
-        return (value) -> CommonHtmlSupport.VALUE_CSS_STYLE_TAG + "{background-color: " + value + " !important;}";
+        return (value) -> {
+            String color = value;
+            if (color.contains(";")) {
+                color = color.substring(0, color.indexOf(";"));
+            }
+            return CommonHtmlSupport.VALUE_CSS_STYLE_TAG + "{background-color: " + color + " !important;}";
+        };
     }
 
     @Override