simulations - metric widgets, better metric title handling when defin…

…ition or mark is not available
Evolveum · Mar 21, 2023 · 7dd0a67 · 7dd0a67
1 parent fdff1ed
commit 7dd0a67
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java b/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java
@@ -202,31 +202,43 @@ protected List<DashboardWidgetType> load() {
                             .end();
 
                     SimulationMetricReferenceType metricRef = m.getRef();
-                    if (metricRef.getEventMarkRef() != null) {
+                    ObjectReferenceType eventMarkRef = metricRef.getEventMarkRef();
+                    String metricIdentifier = metricRef.getIdentifier();
+                    if (eventMarkRef != null) {
                         PrismObject<MarkType> markObject =
-                                WebModelServiceUtils.loadObject(metricRef.getEventMarkRef(), PageSimulationResult.this);
+                                WebModelServiceUtils.loadObject(eventMarkRef, PageSimulationResult.this);
+                        DisplayType display;
                         if (markObject != null) {
                             MarkType mark = markObject.asObjectable();
-                            DisplayType display = mark.getDisplay();
+                            display = mark.getDisplay();
                             if (display == null) {
                                 display = new DisplayType();
                                 display.setLabel(mark.getName());
                             }
-                            dw.setDisplay(display);
                             dw.setDisplayOrder(mark.getDisplayOrder());
+                        } else {
+                            display = new DisplayType();
+                            display.setLabel(new PolyStringType(WebComponentUtil.getName(eventMarkRef)));
                         }
-                    } else if (metricRef.getIdentifier() != null) {
+
+                        dw.setDisplay(display);
+                    } else if (metricIdentifier != null) {
                         SimulationMetricDefinitionType def =
-                                getSimulationResultManager().getMetricDefinition(metricRef.getIdentifier());
+                                getSimulationResultManager().getMetricDefinition(metricIdentifier);
+                        DisplayType display;
                         if (def != null) {
-                            DisplayType display = def.getDisplay();
+                            display = def.getDisplay();
                             if (display == null) {
                                 display = new DisplayType();
                                 display.setLabel(new PolyStringType(def.getIdentifier()));
                             }
-                            dw.setDisplay(display);
                             dw.setDisplayOrder(def.getDisplayOrder());
+                        } else {
+                            display = new DisplayType();
+                            display.setLabel(new PolyStringType(metricIdentifier));
                         }
+
+                        dw.setDisplay(display);
                     } else {
                         // built-in -> ignored
                     }

diff --git a/...n/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/widget/MetricWidgetPanel.java b/...n/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/widget/MetricWidgetPanel.java
@@ -224,10 +224,13 @@ private ObjectFilter createObjectFilter(CollectionRefSpecificationType collectio
     private void initLayout() {
         add(AttributeModifier.prepend("class", "d-flex flex-column border rounded bg-white"));
 
-        Label title = new Label(ID_TITLE, () -> {
+        IModel<String> titleModel = () -> {
             DisplayType display = getModelObject().getDisplay();
             return display != null ? WebComponentUtil.getTranslatedPolyString(display.getLabel()) : null;
-        });
+        };
+
+        Label title = new Label(ID_TITLE, titleModel);
+        title.add(AttributeAppender.append("title", titleModel));
         add(title);
 
         BadgePanel trendBadge = new BadgePanel(ID_TREND_BADGE, () -> {