Skip to content

Commit

Permalink
Better assignment icons.
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Apr 20, 2016
1 parent 4c0c091 commit 21551ae
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 40 deletions.
118 changes: 78 additions & 40 deletions ...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
View file
Expand Up @@ -37,6 +37,11 @@
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.MiscUtil;
import com.evolveum.midpoint.util.exception.CommunicationException;
import com.evolveum.midpoint.util.exception.ConfigurationException;
import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.exception.SecurityViolationException;
import com.evolveum.midpoint.util.logging.LoggingUtils;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
Expand Down Expand Up @@ -83,8 +88,9 @@
* @author lazyman
*/
public class AssignmentEditorPanel extends BasePanel<AssignmentEditorDto> {
private static final long serialVersionUID = 1L;

private static final Trace LOGGER = TraceManager.getTrace(AssignmentEditorPanel.class);
private static final Trace LOGGER = TraceManager.getTrace(AssignmentEditorPanel.class);

private static final String DOT_CLASS = AssignmentEditorPanel.class.getName() + ".";
private static final String OPERATION_LOAD_OBJECT = DOT_CLASS + "loadObject";
Expand Down Expand Up @@ -154,6 +160,7 @@ private void initLayout() {

AjaxCheckBox selected = new AjaxCheckBox(ID_SELECTED,
new PropertyModel<Boolean>(getModel(), AssignmentEditorDto.F_SELECTED)) {
private static final long serialVersionUID = 1L;

@Override
protected void onUpdate(AjaxRequestTarget target) {
Expand All @@ -163,21 +170,22 @@ protected void onUpdate(AjaxRequestTarget target) {
headerRow.add(selected);

WebMarkupContainer typeImage = new WebMarkupContainer(ID_TYPE_IMAGE);
typeImage.add(AttributeModifier.replace("class",
createImageTypeModel(new PropertyModel<AssignmentEditorDtoType>(getModel(), AssignmentEditorDto.F_TYPE))));
typeImage.add(AttributeModifier.append("class", createImageTypeModel(getModel())));
headerRow.add(typeImage);

Label errorIcon = new Label(ID_ERROR_ICON);
errorIcon.add(new VisibleEnableBehaviour(){
private static final long serialVersionUID = 1L;

@Override
@Override
public boolean isVisible() {
return !isTargetValid();
}
});
headerRow.add(errorIcon);

AjaxLink name = new AjaxLink(ID_NAME) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
Expand All @@ -187,13 +195,15 @@ public void onClick(AjaxRequestTarget target) {
headerRow.add(name);

AjaxLink errorLink = new AjaxLink(ID_BUTTON_SHOW_MORE) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
showErrorPerformed(target);
}
};
errorLink.add(new VisibleEnableBehaviour(){
errorLink.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand Down Expand Up @@ -772,13 +782,28 @@ private ResourceAttributeDefinitionType findOrCreateValueConstruction(PrismPrope
return construction;
}

private IModel<String> createImageTypeModel(final IModel<AssignmentEditorDtoType> model) {
private IModel<String> createImageTypeModel(final IModel<AssignmentEditorDto> model) {
return new AbstractReadOnlyModel<String>() {
private static final long serialVersionUID = 1L;

@Override
@Override
public String getObject() {
AssignmentEditorDtoType type = model.getObject();
return type.getColoredIconCssClass();
AssignmentEditorDto assignmentEditorDto = model.getObject();

PrismObject targetObject = null;
try {
targetObject = getTargetObject(assignmentEditorDto);
} catch (Exception ex) {
LoggingUtils.logException(LOGGER, "Couldn't load object", ex);
// Otherwise ignore, will be pocessed by the fallback code below
}

if (targetObject == null) {
AssignmentEditorDtoType type = assignmentEditorDto.getType();
return type.getColoredIconCssClass();
} else {
return WebComponentUtil.createDefaultIcon(targetObject);
}
}
};
}
Expand All @@ -793,47 +818,60 @@ private void nameClickPerformed(AjaxRequestTarget target) {

private IModel<String> createTargetModel() {
return new LoadableModel<String>(false) {
private static final long serialVersionUID = 1L;

@Override
@Override
protected String load() {
AssignmentEditorDto dto = getModel().getObject();
PrismContainerValue assignment = dto.getOldValue();

PrismReference targetRef = assignment.findReference(AssignmentType.F_TARGET_REF);
if (targetRef == null) {
return getString("AssignmentEditorPanel.undefined");
}

PrismReferenceValue refValue = targetRef.getValue();
if (refValue != null && refValue.getObject() != null) {
PrismObject object = refValue.getObject();
return WebComponentUtil.getName(object);
}

String oid = targetRef.getOid();
OperationResult result = new OperationResult(OPERATION_LOAD_OBJECT);

PrismObject targetObject;
try {
PageBase page = getPageBase();
ModelService model = page.getMidpointApplication().getModel();
Task task = page.createSimpleTask(OPERATION_LOAD_OBJECT);

Collection<SelectorOptions<GetOperationOptions>> options =
SelectorOptions.createCollection(GetOperationOptions.createNoFetch());
Class type = ObjectType.class;
if (refValue.getTargetType() != null){
type = getPageBase().getPrismContext().getSchemaRegistry().determineCompileTimeClass(refValue.getTargetType());
}
PrismObject object = model.getObject(type, oid, options, task, result);

return WebComponentUtil.getName(object);
targetObject = getTargetObject(dto);
} catch (Exception ex) {
LoggingUtils.logException(LOGGER, "Couldn't load object", ex);
return getString("AssignmentEditorPanel.loadError");
}

return oid;

if (targetObject == null) {
return getString("AssignmentEditorPanel.undefined");
}

return WebComponentUtil.getName(targetObject);
}
};
}

private <O extends ObjectType> PrismObject<O> getTargetObject(AssignmentEditorDto dto) throws ObjectNotFoundException, SchemaException, SecurityViolationException, CommunicationException, ConfigurationException {
PrismContainerValue<AssignmentType> assignment = dto.getOldValue();

PrismReference targetRef = assignment.findReference(AssignmentType.F_TARGET_REF);
if (targetRef == null) {
return null;
}

PrismReferenceValue refValue = targetRef.getValue();
if (refValue != null && refValue.getObject() != null) {
PrismObject object = refValue.getObject();
return object;
}

String oid = targetRef.getOid();
OperationResult result = new OperationResult(OPERATION_LOAD_OBJECT);

PageBase page = getPageBase();
ModelService model = page.getMidpointApplication().getModel();
Task task = page.createSimpleTask(OPERATION_LOAD_OBJECT);

Collection<SelectorOptions<GetOperationOptions>> options =
SelectorOptions.createCollection(GetOperationOptions.createNoFetch());
Class<O> type = (Class<O>) ObjectType.class;
if (refValue.getTargetType() != null){
type = getPageBase().getPrismContext().getSchemaRegistry().determineCompileTimeClass(refValue.getTargetType());
}
PrismObject<O> object = model.getObject(type, oid, options, task, result);
refValue.setObject(object);
return object;
}

private void showErrorPerformed(AjaxRequestTarget target){
error(getString("AssignmentEditorPanel.targetError"));
Expand Down
2 changes: 2 additions & 0 deletions gui/admin-gui/src/main/resources/localization/Midpoint.properties
View file
Expand Up @@ -72,6 +72,7 @@ AssignmentEditorPanel.enabledFrom={0}, from {1,date,medium}
AssignmentEditorPanel.enabledFromTo={0}, from {1,date,medium} to {2,date,medium}
AssignmentEditorPanel.enabledTo={0}, to {1,date,medium}
AssignmentEditorPanel.hideEmpty=Hide empty
AssignmentEditorPanel.loadError=Error loading object
AssignmentEditorPanel.manager=Manager
AssignmentEditorPanel.member=Member
AssignmentEditorPanel.name.focus=(focus mapping)
Expand All @@ -85,6 +86,7 @@ AssignmentEditorPanel.showMore=Show more
AssignmentEditorPanel.targetError=Assignment target was not found. Either target oid is malformed or target object does not exist.
AssignmentEditorPanel.target=Target
AssignmentEditorPanel.tenantRef=Tenant
AssignmentEditorPanel.undefined=Undefined
AssignmentPolicyEnforcementType.FULL=Full
AssignmentPolicyEnforcementType.LEGALIZE=Legalize
AssignmentPolicyEnforcementType.MARK=Mark
Expand Down

0 comments on commit 21551ae

Please sign in to comment.