Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Feb 22, 2019 · 235bdcd · 235bdcd
2 parents 34215d7 + b53ead7
commit 235bdcd
Showing 1 changed file with 42 additions and 4 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AbstractSummaryPanel.java
@@ -16,7 +16,6 @@
 package com.evolveum.midpoint.web.component;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.util.ModelServiceLocator;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.model.FlexibleLabelModel;
 import com.evolveum.midpoint.prism.Containerable;
@@ -68,6 +67,7 @@ public abstract class AbstractSummaryPanel<C extends Containerable> extends Base
 
     protected static final String BOX_CSS_CLASS = "col-xs-12 info-box";
     protected static final String ICON_BOX_CSS_CLASS = "info-box-icon";
+    protected static final String ARCHETYPE_ICON_FONT_SIZE = "font-size: 45px !important;";
 
     protected SummaryPanelSpecificationType configuration;
 
@@ -167,7 +167,12 @@ public boolean isVisible() {
         Label icon = new Label(ID_ICON, "");
 
         String archetypeIconCssClass = getArchetypeIconCssClass();
-        icon.add(new AttributeModifier("class", StringUtils.isNotEmpty(archetypeIconCssClass) ? archetypeIconCssClass : getIconCssClass()));
+        if (StringUtils.isNotEmpty(archetypeIconCssClass)){
+			icon.add(AttributeModifier.append("class", archetypeIconCssClass));
+			icon.add(AttributeModifier.append("style", ARCHETYPE_ICON_FONT_SIZE));
+		} else {
+			icon.add(AttributeModifier.append("class", getIconCssClass()));
+		}
         icon.add(new VisibleEnableBehaviour() {
             @Override
             public boolean isVisible(){
@@ -186,7 +191,12 @@ public boolean isVisible() {
         iconBox.add(img);
 
 		tagBox = new RepeatingView(ID_TAG_BOX);
-		getSummaryTagComponentList().forEach(summaryTag -> {
+		List<SummaryTag<C>> summaryTags = getSummaryTagComponentList();
+
+		if (getArchetypeSummaryTag() != null){
+			summaryTags.add(getArchetypeSummaryTag());
+		}
+		summaryTags.forEach(summaryTag -> {
 			WebMarkupContainer summaryTagPanel = new WebMarkupContainer(tagBox.newChildId());
 			summaryTagPanel.setOutputMarkupId(true);
 
@@ -196,7 +206,7 @@ public boolean isVisible() {
 		if (getTagBoxCssClass() != null) {
 			tagBox.add(new AttributeModifier("class", getTagBoxCssClass()));
 		}
-		tagBox.add(new VisibleBehaviour(() -> CollectionUtils.isNotEmpty(getSummaryTagComponentList())));
+		tagBox.add(new VisibleBehaviour(() -> CollectionUtils.isNotEmpty(summaryTags)));
 		box.add(tagBox);
     }
 
@@ -219,6 +229,26 @@ protected List<SummaryTag<C>> getSummaryTagComponentList(){
     	return new ArrayList<>();
 	}
 
+	private SummaryTag<C> getArchetypeSummaryTag(){
+		String archetypeIconCssClass = getArchetypeIconCssClass();
+		String archetypeIconColor = getArchetypePolicyAdditionalCssClass();
+		String archetypeLabel = getArchetypeLabel();
+		if (StringUtils.isNotEmpty(archetypeLabel)){
+			SummaryTag<C> archetypeSummaryTag = new SummaryTag<C>(ID_SUMMARY_TAG, getModel()) {
+				private static final long serialVersionUID = 1L;
+
+				@Override
+				protected void initialize(C object) {
+						setIconCssClass(archetypeIconCssClass);
+						setLabel(createStringResource(archetypeLabel).getString());
+						setColor(archetypeIconColor);
+				}
+			};
+			return archetypeSummaryTag;
+		}
+		return null;
+	}
+
     protected void addAdditionalExpressionVariables(ExpressionVariables variables) {
 
     }
@@ -251,6 +281,14 @@ private String getArchetypePolicyAdditionalCssClass(){
 		return "";
 	}
 
+	private String getArchetypeLabel(){
+		if (getModelObject() instanceof AssignmentHolderType){
+			DisplayType displayType = WebComponentUtil.getArchetypePolicyDisplayType((AssignmentHolderType) getModelObject(), getPageBase());
+			return displayType == null || displayType.getLabel() == null ? "" : displayType.getLabel().getOrig();
+		}
+		return "";
+	}
+
 	private String getArchetypeIconCssClass(){
 		if (getModelObject() instanceof AssignmentHolderType){
 			DisplayType displayType = WebComponentUtil.getArchetypePolicyDisplayType((AssignmentHolderType) getModelObject(), getPageBase());