adding icon for dead shadow MID-5418

Evolveum · Jun 13, 2019 · 85d019a · 85d019a
1 parent 1f89a19
commit 85d019a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/...main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java b/...main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
@@ -352,16 +352,8 @@ private String createTriggerTooltip(PrismContainer<TriggerType> container) {
     }
 
 	private CompositedIcon createAccountIcon(IModel<PrismContainerValueWrapper<ShadowType>> prismContainerValue) {
-         IModel<PrismValueWrapper> status = new PropertyModel(PrismPropertyWrapperModel.fromContainerValueWrapper(
-        		prismContainerValue, ItemPath.create(ShadowType.F_ACTIVATION, ActivationType.F_ADMINISTRATIVE_STATUS)), "value");
-         IModel<PrismValueWrapper> lockoutStatus = new PropertyModel(PrismPropertyWrapperModel.fromContainerValueWrapper(
-        		prismContainerValue, ItemPath.create(ShadowType.F_ACTIVATION, ActivationType.F_LOCKOUT_STATUS)), "value");
-         IModel<PrismValueWrapper> lockoutTimeStatus = new PropertyModel(PrismPropertyWrapperModel.fromContainerValueWrapper(
-         		prismContainerValue, ItemPath.create(ShadowType.F_ACTIVATION, ActivationType.F_LOCKOUT_EXPIRATION_TIMESTAMP)), "value");
-         PrismContainerWrapperModel<ShadowType, TriggerType> trigger = PrismContainerWrapperModel.fromContainerValueWrapper(
-          		prismContainerValue, ObjectType.F_TRIGGER);
-         PrismObject obj = ((PrismObjectWrapper)prismContainerValue.getObject().getParent()).getObject();
-         PrismContainer<TriggerType> container = obj.findContainer(ObjectType.F_TRIGGER);
+        PrismObject obj = ((PrismObjectWrapper)prismContainerValue.getObject().getParent()).getObject();
+        PrismContainer<TriggerType> container = obj.findContainer(ObjectType.F_TRIGGER);
         String iconCssClass = WebComponentUtil.createShadowIcon(prismContainerValue.getObject().getNewValue());
         CompositedIconBuilder builder = new CompositedIconBuilder();
         String title = createTriggerTooltip(container);
@@ -371,6 +363,22 @@ private CompositedIcon createAccountIcon(IModel<PrismContainerValueWrapper<Shado
         	builder.appendLayerIcon(icon, IconCssStyle.TOP_RIGHT_FOR_COLUMN_STYLE);
         }
         builder.setBasicIcon(iconCssClass, IconCssStyle.BOTTOM_RIGHT_FOR_COLUMN_STYLE);
+
+        IModel<PrismValueWrapper> deadStatus = new PropertyModel(PrismPropertyWrapperModel.fromContainerValueWrapper(
+         		prismContainerValue, ItemPath.create(ShadowType.F_DEAD)), "value");
+        if(deadStatus != null && Boolean.TRUE.equals(deadStatus.getObject().getRealValue())) {
+        	IconType icon = new IconType();
+        	icon.setCssClass("fa fa-times-circle " + GuiStyleConstants.RED_COLOR);
+        	builder.appendLayerIcon(icon, IconCssStyle.BOTTOM_RIGHT_FOR_COLUMN_STYLE);
+        	builder.setTitle(getPageBase().createStringResource("FocusProjectionsTabPanel.deadShadow").getString()
+        			+ (StringUtils.isNotBlank(title) ? ("\n" + title) : ""));
+        	return builder.build();
+        }
+
+        IModel<PrismValueWrapper> lockoutStatus = new PropertyModel(PrismPropertyWrapperModel.fromContainerValueWrapper(
+        		prismContainerValue, ItemPath.create(ShadowType.F_ACTIVATION, ActivationType.F_LOCKOUT_STATUS)), "value");
+        IModel<PrismValueWrapper> lockoutTimeStatus = new PropertyModel(PrismPropertyWrapperModel.fromContainerValueWrapper(
+         		prismContainerValue, ItemPath.create(ShadowType.F_ACTIVATION, ActivationType.F_LOCKOUT_EXPIRATION_TIMESTAMP)), "value");
         if((lockoutStatus != null && LockoutStatusType.LOCKED.equals(lockoutStatus.getObject().getRealValue()))
         		|| (lockoutTimeStatus.getObject() != null && lockoutTimeStatus.getObject().getRealValue() != null
         		&& getPageBase().getClock().isPast(((XMLGregorianCalendar)lockoutTimeStatus.getObject().getRealValue())))) {
@@ -381,6 +389,9 @@ && getPageBase().getClock().isPast(((XMLGregorianCalendar)lockoutTimeStatus.getO
         			+ (StringUtils.isNotBlank(title) ? ("\n" + title) : ""));
         	return builder.build();
         }
+
+        IModel<PrismValueWrapper> status = new PropertyModel(PrismPropertyWrapperModel.fromContainerValueWrapper(
+        		prismContainerValue, ItemPath.create(ShadowType.F_ACTIVATION, ActivationType.F_ADMINISTRATIVE_STATUS)), "value");
         ActivationStatusType value = null;
         if (status != null) {
 				value = (ActivationStatusType) status.getObject().getRealValue();

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -387,6 +387,7 @@ feedtempMessagePanelbackMessagePanel.message.info=Information
 fetchStrategy.nullValid=Choose One
 filter.duplicate=Filter with name '{0}' is already defined
 filter.emptyFilter=Filter must not be empty
+FocusProjectionsTabPanel.deadShadow=Dead shadow
 FocusTypeAssignmentPopupTabPanel.message.addFilterToContentQuery.fatalError=Couldn't load available roles
 H3Header.label.error=Error
 H3Header.showMore=Show more