Skip to content

Commit

Permalink
MID-8685 fixed metrics widget for dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Mar 28, 2023
1 parent 4527b0a commit 5f5f7eb
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 23 deletions.
11 changes: 11 additions & 0 deletions .../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,17 @@ private ListView<DashboardWidgetType> createWidgetList(String id, String widgetI
protected void populateItem(ListItem<DashboardWidgetType> item) {
item.add(new MetricWidgetPanel(widgetId, item.getModel()) {

@Override
protected boolean isMoreInfoVisible() {
DashboardWidgetDataType data = getWidgetData();
SimulationMetricReferenceType ref = data.getMetricRef();
if (ref == null || ref.getEventMarkRef() == null) {
return false;
}

return StringUtils.isNotEmpty(data.getStoredData()) || !metricValues.getObject().isEmpty();
}

@Override
protected void onMoreInfoPerformed(AjaxRequestTarget target) {
openMarkMetricPerformed(item.getModelObject());
Expand Down
73 changes: 59 additions & 14 deletions ...n/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/widget/MetricWidgetPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.jetbrains.annotations.NotNull;

import com.evolveum.midpoint.gui.api.component.Badge;
Expand All @@ -40,6 +41,8 @@
import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
import com.evolveum.midpoint.gui.impl.component.icon.IconCssStyle;
import com.evolveum.midpoint.gui.impl.page.admin.simulation.PageSimulationResult;
import com.evolveum.midpoint.gui.impl.page.admin.simulation.SimulationPage;
import com.evolveum.midpoint.model.api.simulation.SimulationResultManager;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.query.ObjectFilter;
Expand Down Expand Up @@ -69,7 +72,12 @@ public class MetricWidgetPanel extends WidgetPanel<DashboardWidgetType> {
private static final String ID_ICON = "icon";
private static final String ID_CHART_CONTAINER = "chartContainer";

private IModel<List<SimulationMetricValuesType>> metricValues;
/**
* Model with reference used as data for "more" link, if available
*/
private IModel<ObjectReferenceType> defaultSimulationResult;

protected IModel<List<SimulationMetricValuesType>> metricValues;

private IModel<MarkType> markModel;

Expand Down Expand Up @@ -114,7 +122,7 @@ public void renderHead(IHeaderResponse response) {
"MidPointTheme.createSparkline('#" + comp.getMarkupId() + "', " + options + ", " + data + ");"));
}

private @NotNull DashboardWidgetDataType getWidgetData() {
protected @NotNull DashboardWidgetDataType getWidgetData() {
DashboardWidgetType widget = getModelObject();
if (widget == null || widget.getData() == null) {
return new DashboardWidgetDataType();
Expand All @@ -137,10 +145,10 @@ protected MarkType load() {
}
};

metricValues = new LoadableDetachableModel<>() {
IModel<List<SimulationResultType>> results = new LoadableDetachableModel<>() {

@Override
protected List<SimulationMetricValuesType> load() {
protected List<SimulationResultType> load() {
DashboardWidgetDataType data = getWidgetData();
SimulationMetricReferenceType metricRef = data.getMetricRef();

Expand All @@ -159,8 +167,36 @@ protected List<SimulationMetricValuesType> load() {
OperationResult result = page.getPageTask().getResult();
List<PrismObject<SimulationResultType>> results = WebModelServiceUtils.searchObjects(SimulationResultType.class, query, result, page);

return results.stream()
.map(r -> r.asObjectable().getMetric())
return results.stream().map(po -> po.asObjectable()).collect(Collectors.toList());
}
};

defaultSimulationResult = new LoadableDetachableModel<>() {
@Override
protected ObjectReferenceType load() {
List<SimulationResultType> list = results.getObject();
if (list.isEmpty()) {
return null;
}

SimulationResultType result = list.get(list.size() - 1);
return new ObjectReferenceType()
.oid(result.getOid())
.type(SimulationResultType.COMPLEX_TYPE);
}
};

metricValues = new LoadableDetachableModel<>() {

@Override
protected List<SimulationMetricValuesType> load() {
DashboardWidgetDataType data = getWidgetData();
SimulationMetricReferenceType metricRef = data.getMetricRef();

List<SimulationResultType> simResults = results.getObject();

return simResults.stream()
.map(SimulationResultType::getMetric)
.reduce(new ArrayList<>(), (list, metric) -> {
list.addAll(metric);
return list;
Expand Down Expand Up @@ -284,7 +320,7 @@ private boolean isIconVisible(IModel<CompositedIcon> iconModel) {
return false;
}

return metricValues.getObject().isEmpty();
return metricValues.getObject().size() <= 1;
}

private IModel<String> createValueModel() {
Expand Down Expand Up @@ -330,17 +366,26 @@ private IModel<String> createDescriptionModel() {
}

protected boolean isMoreInfoVisible() {
DashboardWidgetDataType data = getWidgetData();
SimulationMetricReferenceType ref = data.getMetricRef();
if (ref == null || ref.getEventMarkRef() == null) {
return false;
}

return StringUtils.isNotEmpty(data.getStoredData()) || !metricValues.getObject().isEmpty();
return defaultSimulationResult.getObject() != null;
}

protected void onMoreInfoPerformed(AjaxRequestTarget target) {
ObjectReferenceType ref = defaultSimulationResult.getObject();
if (ref == null) {
return;
}

DashboardWidgetDataType data = getWidgetData();
SimulationMetricReferenceType metricRef = data.getMetricRef();
ObjectReferenceType markRef = metricRef != null ? metricRef.getEventMarkRef() : null;

PageParameters params = new PageParameters();
params.add(SimulationPage.PAGE_PARAMETER_RESULT_OID, ref.getOid());
if (markRef != null) {
params.add(SimulationPage.PAGE_PARAMETER_MARK_OID, markRef.getOid());
}

getPageBase().navigateToNext(PageSimulationResult.class, params);
}

private CompositedIcon createIcon() {
Expand Down
10 changes: 1 addition & 9 deletions ...ui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboardConfigurable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,7 @@ protected void populateItem(ListItem<DashboardWidgetType> item) {
}

private Component populateMetricWidget(String id, IModel<DashboardWidgetType> model) {
MetricWidgetPanel widget = new MetricWidgetPanel(id, model) {

@Override
protected void onMoreInfoPerformed(AjaxRequestTarget target) {
// todo implement
}
};

return widget;
return new MetricWidgetPanel(id, model);
}

private Component populateDashboardWidget(String id, IModel<DashboardWidgetType> model) {
Expand Down

0 comments on commit 5f5f7eb

Please sign in to comment.