Skip to content

Commit

Permalink
Operation result page, handling of errors in the object lists
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Apr 28, 2016
1 parent a47f738 commit e1a9bd1
Show file tree
Hide file tree
Showing 11 changed files with 238 additions and 69 deletions.
20 changes: 19 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010-2013 Evolveum
* Copyright (c) 2010-2016 Evolveum
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -258,4 +258,22 @@ public void accept(Visitor visitor) {
}

}

public void setShowMoreAll(final boolean show) {
Visitor visitor = new Visitor() {

@Override
public void visit(Visitable visitable) {
if (!(visitable instanceof OpResult)) {
return;
}

OpResult result = (OpResult) visitable;
result.setShowMore(show);

}
};

accept(visitor);
}
}
81 changes: 47 additions & 34 deletions ...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010-2014 Evolveum
* Copyright (c) 2010-2016 Evolveum
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -56,6 +56,7 @@
* @author katkav
*/
public class OperationResultPanel extends BasePanel<OpResult> {
private static final long serialVersionUID = 1L;

private static final String ID_DETAILS_BOX = "detailsBox";
private static final String ID_ICON_TYPE = "iconType";
Expand Down Expand Up @@ -90,9 +91,11 @@ public void initLayout() {
private void initHeader(WebMarkupContainer box) {
WebMarkupContainer iconType = new WebMarkupContainer(ID_ICON_TYPE);
iconType.setOutputMarkupId(true);
iconType.add(new AttributeAppender("class", new AbstractReadOnlyModel() {
iconType.add(new AttributeAppender("class", new AbstractReadOnlyModel<String>() {
private static final long serialVersionUID = 1L;

@Override
public Object getObject() {
public String getObject() {
StringBuilder sb = new StringBuilder();

OpResult message = getModelObject();
Expand Down Expand Up @@ -124,8 +127,7 @@ public Object getObject() {

Label message = createMessage();

AjaxLink showMore = new AjaxLink(ID_MESSAGE) {

AjaxLink<String> showMore = new AjaxLink<String>(ID_MESSAGE) {
private static final long serialVersionUID = 1L;

@Override
Expand All @@ -139,8 +141,7 @@ public void onClick(AjaxRequestTarget target) {
showMore.add(message);
box.add(showMore);

AjaxLink backgroundTask = new AjaxLink(ID_BACKGROUND_TASK) {

AjaxLink<String> backgroundTask = new AjaxLink<String>(ID_BACKGROUND_TASK) {
private static final long serialVersionUID = 1L;

@Override
Expand All @@ -155,6 +156,8 @@ public void onClick(AjaxRequestTarget target) {
}
};
backgroundTask.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
return getModelObject().getBackgroundTaskOid() != null
Expand All @@ -163,8 +166,7 @@ public boolean isVisible() {
});
box.add(backgroundTask);

AjaxLink showAll = new AjaxLink(ID_SHOW_ALL) {

AjaxLink<String> showAll = new AjaxLink<String>(ID_SHOW_ALL) {
private static final long serialVersionUID = 1L;

@Override
Expand All @@ -173,7 +175,8 @@ public void onClick(AjaxRequestTarget target) {
}
};
showAll.add(new VisibleEnableBehaviour() {

private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
return !OperationResultPanel.this.getModelObject().isShowMore();
Expand All @@ -182,8 +185,7 @@ public boolean isVisible() {

box.add(showAll);

AjaxLink hideAll = new AjaxLink(ID_HIDE_ALL) {

AjaxLink<String> hideAll = new AjaxLink<String>(ID_HIDE_ALL) {
private static final long serialVersionUID = 1L;

@Override
Expand All @@ -192,7 +194,8 @@ public void onClick(AjaxRequestTarget target) {
}
};
hideAll.add(new VisibleEnableBehaviour() {

private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
return OperationResultPanel.this.getModelObject().isShowMore();
Expand All @@ -201,8 +204,7 @@ public boolean isVisible() {

box.add(hideAll);

AjaxLink close = new AjaxLink("close") {

AjaxLink<String> close = new AjaxLink<String>("close") {
private static final long serialVersionUID = 1L;

@Override
Expand All @@ -215,6 +217,7 @@ public void onClick(AjaxRequestTarget target) {
box.add(close);

DownloadLink downloadXml = new DownloadLink("downloadXml", new AbstractReadOnlyModel<File>() {
private static final long serialVersionUID = 1L;

@Override
public File getObject() {
Expand Down Expand Up @@ -249,6 +252,7 @@ private Label createMessage() {
message = new Label(ID_MESSAGE_LABEL, messageModel);
} else {
message = new Label(ID_MESSAGE_LABEL, new LoadableModel<Object>() {
private static final long serialVersionUID = 1L;

@Override
protected Object load() {
Expand All @@ -269,6 +273,7 @@ private void initDetails(WebMarkupContainer box) {
final WebMarkupContainer details = new WebMarkupContainer("details", getModel());
details.setOutputMarkupId(true);
details.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -281,6 +286,8 @@ public boolean isVisible() {
WebMarkupContainer operationPanel = new WebMarkupContainer("type");
operationPanel.setOutputMarkupId(true);
operationPanel.add(new AttributeAppender("class", new LoadableModel<String>() {
private static final long serialVersionUID = 1L;

@Override
protected String load() {
return getLabelCss(getModel());
Expand All @@ -294,6 +301,7 @@ protected String load() {
operationPanel.add(operationLabel);

Label operation = new Label("operation", new LoadableModel<Object>() {
private static final long serialVersionUID = 1L;

@Override
protected Object load() {
Expand All @@ -308,6 +316,7 @@ protected Object load() {

Label count = new Label("countLabel", getString("FeedbackAlertMessageDetails.count"));
count.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -325,6 +334,7 @@ public boolean isVisible() {
message.setOutputMarkupId(true);

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

@Override
public boolean isVisible() {
Expand All @@ -338,6 +348,7 @@ public boolean isVisible() {
messageLabel.setOutputMarkupId(true);

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

@Override
public boolean isVisible() {
Expand All @@ -357,6 +368,7 @@ private void initParams(WebMarkupContainer operationContent, final IModel<OpResu
Label paramsLabel = new Label("paramsLabel", getString("FeedbackAlertMessageDetails.params"));
paramsLabel.setOutputMarkupId(true);
paramsLabel.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -367,6 +379,7 @@ public boolean isVisible() {
operationContent.add(paramsLabel);

ListView<Param> params = new ListView<Param>("params", createParamsModel(model)) {
private static final long serialVersionUID = 1L;

@Override
protected void populateItem(ListItem<Param> item) {
Expand All @@ -376,6 +389,7 @@ protected void populateItem(ListItem<Param> item) {
};
params.setOutputMarkupId(true);
params.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -386,6 +400,7 @@ public boolean isVisible() {
operationContent.add(params);

ListView<OpResult> subresults = new ListView<OpResult>("subresults", createSubresultsModel(model)) {
private static final long serialVersionUID = 1L;

@Override
protected void populateItem(final ListItem<OpResult> item) {
Expand All @@ -396,6 +411,7 @@ protected void populateItem(final ListItem<OpResult> item) {
};
subresults.setOutputMarkupId(true);
subresults.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -412,6 +428,7 @@ private void initContexts(WebMarkupContainer operationContent, final IModel<OpRe
Label contextsLabel = new Label("contextsLabel", getString("FeedbackAlertMessageDetails.contexts"));
contextsLabel.setOutputMarkupId(true);
contextsLabel.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -422,6 +439,8 @@ public boolean isVisible() {
operationContent.add(contextsLabel);

ListView<Context> contexts = new ListView<Context>("contexts", createContextsModel(model)) {
private static final long serialVersionUID = 1L;

@Override
protected void populateItem(ListItem<Context> item) {
item.add(new Label("contextName", new PropertyModel<Object>(item.getModel(), "name")));
Expand All @@ -430,6 +449,7 @@ protected void populateItem(ListItem<Context> item) {
};
contexts.setOutputMarkupId(true);
contexts.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -442,6 +462,7 @@ public boolean isVisible() {
private void initError(WebMarkupContainer operationPanel, final IModel<OpResult> model) {
Label errorLabel = new Label("errorLabel", getString("FeedbackAlertMessageDetails.error"));
errorLabel.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -455,6 +476,7 @@ public boolean isVisible() {

Label errorMessage = new Label("errorMessage", new PropertyModel<String>(model, "exceptionMessage"));
errorMessage.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -469,6 +491,7 @@ public boolean isVisible() {
final Label errorStackTrace = new Label("errorStackTrace",
new PropertyModel<String>(model, "exceptionsStackTrace"));
errorStackTrace.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -481,6 +504,7 @@ public boolean isVisible() {
operationPanel.add(errorStackTrace);

AjaxLink errorStackTraceLink = new AjaxLink("errorStackTraceLink") {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
Expand All @@ -491,6 +515,7 @@ public void onClick(AjaxRequestTarget target) {
};
errorStackTraceLink.setOutputMarkupId(true);
errorStackTraceLink.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -505,6 +530,7 @@ public boolean isVisible() {
private Label initCountPanel(final IModel<OpResult> model) {
Label count = new Label("count", new PropertyModel<String>(model, "count"));
count.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
Expand All @@ -516,31 +542,15 @@ public boolean isVisible() {

}

private void showHideAll(final boolean show, OpResult object, AjaxRequestTarget target) {

Visitor visitor = new Visitor() {

@Override
public void visit(Visitable visitable) {
if (!(visitable instanceof OpResult)) {
return;
}

OpResult result = (OpResult) visitable;
result.setShowMore(show);

}
};

object.accept(visitor);

private void showHideAll(final boolean show, OpResult opresult, AjaxRequestTarget target) {
opresult.setShowMoreAll(show);
target.add(OperationResultPanel.this);

}

private IModel<String> createHeaderCss() {

return new AbstractReadOnlyModel<String>() {
private static final long serialVersionUID = 1L;

@Override
public String getObject() {
Expand Down Expand Up @@ -573,6 +583,7 @@ public String getObject() {

static IModel<List<Param>> createParamsModel(final IModel<OpResult> model) {
return new LoadableModel<List<Param>>(false) {
private static final long serialVersionUID = 1L;

@Override
protected List<Param> load() {
Expand All @@ -584,6 +595,7 @@ protected List<Param> load() {

static IModel<List<Context>> createContextsModel(final IModel<OpResult> model) {
return new LoadableModel<List<Context>>(false) {
private static final long serialVersionUID = 1L;

@Override
protected List<Context> load() {
Expand All @@ -595,6 +607,7 @@ protected List<Context> load() {

private IModel<List<OpResult>> createSubresultsModel(final IModel<OpResult> model) {
return new LoadableModel<List<OpResult>>(false) {
private static final long serialVersionUID = 1L;

@Override
protected List<OpResult> load() {
Expand Down

0 comments on commit e1a9bd1

Please sign in to comment.