Assignments Panel: Add type hints to sorting if possible

Evolveum · Sep 28, 2022 · e5b4166 · e5b4166
1 parent 7fdf97f
commit e5b4166
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/component/util/RepoAssignmentListProvider.java b/...ui/src/main/java/com/evolveum/midpoint/web/component/util/RepoAssignmentListProvider.java
@@ -13,6 +13,7 @@
 import com.evolveum.midpoint.prism.PrismConstants;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.path.ItemPath;
+import com.evolveum.midpoint.prism.path.ObjectReferencePathSegment;
 import com.evolveum.midpoint.prism.query.AndFilter;
 import com.evolveum.midpoint.prism.query.FullTextFilter;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
@@ -194,7 +195,7 @@ protected void postProcessWrapper(PrismContainerValueWrapper<AssignmentType> val
             return super.createObjectOrderings(sortParam);
         }
         String property = sortParam.getProperty();
-        final ItemPath path;
+        ItemPath path;
         if (TARGET_NAME_STRING.equals(property)) {
             path = TARGET_NAME_PATH;
         } else if (property.contains("/")) {
@@ -203,6 +204,15 @@ protected void postProcessWrapper(PrismContainerValueWrapper<AssignmentType> val
         } else {
             path = ItemPath.create(new QName(SchemaConstantsGenerated.NS_COMMON, sortParam.getProperty()));
         }
+
+        if (path.startsWith(TARGET_REF_OBJ) && determineTargetRefType() != null) {
+            // we have more concrete targetRef type and we are sorting using targetRef/@
+            var afterDereference = path.rest(2);
+            var typeHint = determineTargetRefType();
+            path = ItemPath.create(AssignmentType.F_TARGET_REF, new ObjectReferencePathSegment(typeHint));
+            path = path.append(afterDereference);
+        }
+
         OrderDirection order = sortParam.isAscending() ? OrderDirection.ASCENDING : OrderDirection.DESCENDING;
         return Collections.singletonList(
                 getPrismContext().queryFactory().createOrdering(path, order));