GUI Search: Use provided container definition for axiom if possible

Evolveum · Aug 10, 2022 · 64a07e7 · 64a07e7
1 parent abbb905
commit 64a07e7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/component/search/ContainerTypeSearchItem.java b/...gui/src/main/java/com/evolveum/midpoint/web/component/search/ContainerTypeSearchItem.java
@@ -10,6 +10,7 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
 import com.evolveum.midpoint.prism.Containerable;
+import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.util.DisplayableValue;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -37,6 +38,7 @@ public class ContainerTypeSearchItem<C extends Containerable> extends SearchItem
     private Class<C> oldType;
     private boolean visible = false;
     private ObjectTypeSearchItemConfigurationType configuration = null;
+    private PrismContainerDefinition<C> containerDef;
 
     public ContainerTypeSearchItem(Class<C> typeClass) {
         this(new SearchValue<>(typeClass, ""), null);
@@ -132,4 +134,12 @@ public boolean isTypeChanged(){
     public void setConfiguration(ObjectTypeSearchItemConfigurationType configuration) {
         this.configuration = configuration;
     }
+
+    public PrismContainerDefinition<C> getContainerDefinition() {
+        return containerDef;
+    }
+
+    public void setContainerDefinition(PrismContainerDefinition<C> containerDef) {
+        this.containerDef = containerDef;
+    }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
@@ -757,7 +757,12 @@ private ObjectFilter createAdvancedObjectFilter(PrismContext ctx) throws SchemaE
             if (StringUtils.isEmpty(dslQuery)) {
                 return null;
             }
-            return ctx.createQueryParser().parseQuery(getTypeClass(), dslQuery);
+
+            var containerDef = getType().getContainerDefinition();
+            if (containerDef == null) {
+                return ctx.createQueryParser().parseQuery(getTypeClass(), dslQuery);
+            }
+            return ctx.createQueryParser().parseQuery(containerDef, dslQuery);
         }
 
         return null;