MID-9569: Fixed MQL attributes search in Resource Object panels

Provide kind/intent / object class shadow specific definition to SearchContext.definitionOverride which is used to provide detailed schema
Evolveum · Mar 27, 2024 · c674442 · c674442
1 parent 4fc977c
commit c674442
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/...va/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceObjectsPanel.java b/...va/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceObjectsPanel.java
@@ -414,6 +414,13 @@ protected ISelectableDataProvider<SelectableBean<ShadowType>> createProvider() {
             protected SearchContext createAdditionalSearchContext() {
                 SearchContext searchContext = new SearchContext();
                 searchContext.setPanelType(CollectionPanelType.REPO_SHADOW);
+                // MID-9569: selectedObjectDefinition has knowledge about detailed shadow type, so we can provide it
+                // directly to search (since we are also adding coordinates to filter) so Axiom Query can access
+                // additional attributes
+                var resTypeDef = getSelectedObjectTypeDefinition();
+                if (resTypeDef != null) {
+                    searchContext.setDefinitionOverride(resTypeDef.getPrismObjectDefinition());
+                }
                 return searchContext;
             }
 

diff --git a/.../evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceUncategorizedPanel.java b/.../evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceUncategorizedPanel.java
@@ -199,7 +199,14 @@ protected ISelectableDataProvider<SelectableBean<ShadowType>> createProvider() {
             protected SearchContext createAdditionalSearchContext() {
                 SearchContext searchContext = new SearchContext();
                 searchContext.setPanelType(CollectionPanelType.RESOURCE_SHADOW);
-                searchContext.setResourceObjectDefinition(getObjectDetailsModels().findResourceObjectClassDefinition(getSelectedObjectClass()));
+                var objClassDef = getObjectDetailsModels().findResourceObjectClassDefinition(getSelectedObjectClass());
+                searchContext.setResourceObjectDefinition(objClassDef);
+                // MID-9569: selectedObjectDefinition has knowledge about detailed shadow type, so we can provide it
+                // directly to search (since we are also adding coordinates to filter) so Axiom Query can access
+                // additional attributes
+                if (objClassDef != null) {
+                    searchContext.setDefinitionOverride(objClassDef.getPrismObjectDefinition());
+                }
                 return searchContext;
             }