Skip to content

Commit

Permalink
fix of showing kind, intent and objectClass in resource task panel (M…
Browse files Browse the repository at this point in the history 
…ID-7303)
  • Loading branch information
@skublik
skublik committed Oct 11, 2021
1 parent 240ff21 commit ab40a1b
Showing 1 changed file with 72 additions and 16 deletions.
88 changes: 72 additions & 16 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import javax.xml.namespace.QName;

import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
import com.evolveum.midpoint.prism.*;
import com.evolveum.midpoint.web.page.admin.orgs.PageOrgUnit;
import com.evolveum.midpoint.web.util.OnePageParameterEncoder;

Expand Down Expand Up @@ -43,10 +44,6 @@
import com.evolveum.midpoint.gui.impl.component.data.column.CompositedIconColumn;
import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
import com.evolveum.midpoint.prism.Containerable;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.PrismProperty;
import com.evolveum.midpoint.prism.PrismReferenceValue;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
Expand Down Expand Up @@ -304,10 +301,18 @@ public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> ge
public void populateItem(Item<ICellPopulator<SelectableBean<T>>> cellItem,
String componentId, IModel<SelectableBean<T>> rowModel) {
SelectableBean<TaskType> object = (SelectableBean<TaskType>) rowModel.getObject();
PrismProperty<ShadowKindType> pKind = object.getValue() != null ?
object.getValue().asPrismObject().findProperty(
ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_KIND))
: null;

PrismProperty<ShadowKindType> pKind;
if (object.getValue() != null) {
pKind = findPropertyInResourceSet(object.getValue(), ResourceObjectSetType.F_KIND);
if (pKind == null) {
pKind = object.getValue().asPrismObject().findProperty(
ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_KIND));
}
} else {
pKind = null;
}

if (pKind != null) {
cellItem.add(new Label(componentId, WebComponentUtil
.createLocalizedModelForEnum(pKind.getRealValue(), cellItem)));
Expand All @@ -325,10 +330,18 @@ public void populateItem(Item<ICellPopulator<SelectableBean<T>>> cellItem,
public void populateItem(Item<ICellPopulator<SelectableBean<T>>> cellItem,
String componentId, IModel<SelectableBean<T>> rowModel) {
SelectableBean<TaskType> object = (SelectableBean<TaskType>) rowModel.getObject();
PrismProperty<String> pIntent = object.getValue() != null ?
object.getValue().asPrismObject().findProperty(
ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_INTENT))
: null;

PrismProperty<String> pIntent;
if (object.getValue() != null) {
pIntent = findPropertyInResourceSet(object.getValue(), ResourceObjectSetType.F_INTENT);
if (pIntent == null) {
pIntent = object.getValue().asPrismObject().findProperty(
ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_INTENT));
}
} else {
pIntent = null;
}

if (pIntent != null) {
cellItem.add(new Label(componentId, pIntent.getRealValue()));
} else {
Expand All @@ -344,10 +357,18 @@ public void populateItem(Item<ICellPopulator<SelectableBean<T>>> cellItem,
public void populateItem(Item<ICellPopulator<SelectableBean<T>>> cellItem,
String componentId, IModel<SelectableBean<T>> rowModel) {
SelectableBean<TaskType> object = (SelectableBean<TaskType>) rowModel.getObject();
PrismProperty<QName> pObjectClass = object.getValue() != null ?
object.getValue().asPrismObject().findProperty(
ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_OBJECTCLASS))
: null;

PrismProperty<QName> pObjectClass;
if (object.getValue() != null) {
pObjectClass = findPropertyInResourceSet(object.getValue(), ResourceObjectSetType.F_OBJECTCLASS);
if (pObjectClass == null) {
pObjectClass = object.getValue().asPrismObject().findProperty(
ItemPath.create(TaskType.F_EXTENSION, SchemaConstants.MODEL_EXTENSION_OBJECTCLASS));
}
} else {
pObjectClass = null;
}

if (pObjectClass != null) {
cellItem.add(new Label(componentId, pObjectClass.getRealValue().getLocalPart()));
} else {
Expand All @@ -366,6 +387,41 @@ public void populateItem(Item<ICellPopulator<SelectableBean<T>>> cellItem,

}

private static PrismProperty findPropertyInResourceSet(TaskType value, ItemPath pathToProperty) {
if (!WebComponentUtil.isResourceRelatedTask(value)) {
return null;
}
PrismContainer resourceSet = value.asPrismObject().findContainer(
ItemPath.create(
TaskType.F_ACTIVITY,
ActivityDefinitionType.F_WORK,
WorkDefinitionsType.F_RECONCILIATION,
ReconciliationWorkDefinitionType.F_RESOURCE_OBJECTS
));
if (resourceSet == null) {
resourceSet = value.asPrismObject().findContainer(
ItemPath.create(
TaskType.F_ACTIVITY,
ActivityDefinitionType.F_WORK,
WorkDefinitionsType.F_IMPORT,
ImportWorkDefinitionType.F_RESOURCE_OBJECTS
));
}
if (resourceSet == null) {
resourceSet = value.asPrismObject().findContainer(
ItemPath.create(
TaskType.F_ACTIVITY,
ActivityDefinitionType.F_WORK,
WorkDefinitionsType.F_LIVE_SYNCHRONIZATION,
LiveSyncWorkDefinitionType.F_RESOURCE_OBJECTS
));
}
if (resourceSet != null) {
return resourceSet.findProperty(pathToProperty);
}
return null;
}

public static <T extends ObjectType> List<IColumn<SelectableBean<T>, String>> getDefaultRoleColumns() {
List<IColumn<SelectableBean<T>, String>> columns = new ArrayList<>();

Expand Down

0 comments on commit ab40a1b

Please sign in to comment.