fixing relation translations (MID-6725, MID-6749)

Evolveum · Dec 15, 2020 · 7bc53fc · 7bc53fc
1 parent 452ac22
commit 7bc53fc
Showing 1 changed file with 55 additions and 13 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -23,6 +23,8 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.api.prism.wrapper.*;
+import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismReferenceValueWrapperImpl;
 import com.evolveum.midpoint.web.component.data.SelectableBeanContainerDataProvider;
 import com.evolveum.midpoint.web.page.admin.server.dto.ApprovalOutcomeIcon;
 import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventRecordType;
@@ -76,10 +78,6 @@
 import com.evolveum.midpoint.gui.api.model.NonEmptyModel;
 import com.evolveum.midpoint.gui.api.model.ReadOnlyValueModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
-import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
-import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
-import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;
 import com.evolveum.midpoint.gui.impl.GuiChannel;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;
@@ -2013,19 +2011,41 @@ public static boolean isDefaultRelation(QName relation) {
     }
 
     public static String getRelationLabelValue(PrismContainerValueWrapper<AssignmentType> assignmentWrapper, PageBase pageBase) {
-        if (assignmentWrapper == null || assignmentWrapper.getRealValue() == null
-                || assignmentWrapper.getRealValue().getTargetRef() == null
-                || assignmentWrapper.getRealValue().getTargetRef().getRelation() == null) {
-            return "";
+        QName relation = null;
+        try {
+            relation = getRelation(assignmentWrapper);
+        } catch (SchemaException e) {
+            LoggingUtils.logUnexpectedException(LOGGER, "Problem while getting relation for {}", e, assignmentWrapper.getRealValue());
         }
 
-        QName relation = assignmentWrapper.getRealValue().getTargetRef().getRelation();
-        String relationDisplayName = WebComponentUtil.getRelationHeaderLabelKeyIfKnown(relation);
+        String relationDisplayName = getRelationHeaderLabelKeyIfKnown(relation);
         return StringUtils.isNotEmpty(relationDisplayName) ?
                 pageBase.createStringResource(relationDisplayName).getString() :
                 pageBase.createStringResource(relation.getLocalPart()).getString();
     }
 
+    private static QName getRelation(PrismContainerValueWrapper<AssignmentType> assignmentWrapper) throws SchemaException {
+        if (assignmentWrapper == null) {
+            return null;
+        }
+
+        PrismReferenceWrapper<ObjectReferenceType> targetRef = assignmentWrapper.findReference(AssignmentType.F_TARGET_REF);
+        if (targetRef == null) {
+            return null;
+        }
+
+        PrismReferenceValueWrapperImpl<ObjectReferenceType> refValue = targetRef.getValue();
+        if (refValue == null) {
+            return null;
+        }
+
+        ObjectReferenceType ref = refValue.getRealValue();
+        if (ref == null) {
+            return null;
+        }
+        return ref.getRelation();
+    }
+
     @SuppressWarnings("WeakerAccess")
     public static QName getDefaultRelation() {
         return getRelationRegistry().getDefaultRelation();
@@ -2070,11 +2090,33 @@ public static String getRelationHeaderLabelKey(QName relation) {
     @Nullable
     public static String getRelationHeaderLabelKeyIfKnown(QName relation) {
         RelationDefinitionType definition = getRelationRegistry().getRelationDefinition(relation);
-        if (definition != null && definition.getDisplay() != null && definition.getDisplay().getLabel() != null) {
-            return definition.getDisplay().getLabel().getOrig();
-        } else {
+
+        PolyStringType label = getRelationLabel(definition);
+        if (label == null) {
+            return null;
+        }
+
+        PolyStringTranslationType translation = label.getTranslation();
+        if (translation == null) {
+            return label.getOrig();
+        }
+
+        return translation.getKey();
+
+    }
+
+    @Nullable
+    private static PolyStringType getRelationLabel(RelationDefinitionType definition) {
+        if (definition == null) {
+            return null;
+        }
+
+        DisplayType displayType = definition.getDisplay();
+        if (displayType == null) {
             return null;
         }
+
+        return displayType.getLabel();
     }
 
     public static String createUserIcon(PrismObject<UserType> object) {