MID-7693: fix for query of panels for role iducements

Evolveum · Mar 9, 2022 · 86ac033 · 86ac033
1 parent fefd2d3
commit 86ac033
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/...e/admin/assignmentholder/component/assignmentType/inducement/AbstractInducementPanel.java b/...e/admin/assignmentholder/component/assignmentType/inducement/AbstractInducementPanel.java
@@ -12,23 +12,24 @@
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
 import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.component.assignmentType.AbstractAssignmentTypePanel;
 import com.evolveum.midpoint.model.api.AssignmentObjectRelation;
+import com.evolveum.midpoint.prism.PrismConstants;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
+import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
+import com.evolveum.midpoint.prism.query.RefFilter;
 import com.evolveum.midpoint.web.component.search.SearchItemDefinition;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.SessionStorage;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
-
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.model.IModel;
 import org.jetbrains.annotations.NotNull;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 public class AbstractInducementPanel<AR extends AbstractRoleType> extends AbstractAssignmentTypePanel {
@@ -65,6 +66,10 @@ protected String getStorageKey() {
 
     @Override
     protected ObjectQuery getCustomizeQuery() {
+        RefFilter targetRefFilter = getTargetTypeFilter();
+        if (targetRefFilter != null) {
+            return getPrismContext().queryFactory().createQuery(targetRefFilter);
+        }
         return null;
     }
 

diff --git a/...in/assignmentholder/component/assignmentType/inducement/ConstructionInducementsPanel.java b/...in/assignmentholder/component/assignmentType/inducement/ConstructionInducementsPanel.java
@@ -9,10 +9,12 @@
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
 import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component.AbstractRoleInducementPanel;
+import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.web.application.PanelDisplay;
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
@@ -37,4 +39,10 @@ protected QName getAssignmentType() {
         return ResourceType.COMPLEX_TYPE;
     }
 
+    @Override
+    protected ObjectQuery getCustomizeQuery() {
+        return getPageBase().getPrismContext().queryFor(AssignmentType.class)
+                .exists(AssignmentType.F_CONSTRUCTION).build();
+    }
+
 }
diff --git a/...dmin/assignmentholder/component/assignmentType/inducement/PolicyRuleInducementsPanel.java b/...dmin/assignmentholder/component/assignmentType/inducement/PolicyRuleInducementsPanel.java
@@ -9,10 +9,12 @@
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
 import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component.AbstractRoleInducementPanel;
+import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.web.application.PanelDisplay;
 import com.evolveum.midpoint.web.application.PanelInstance;
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
 
 import org.apache.wicket.model.IModel;
@@ -28,5 +30,10 @@ public PolicyRuleInducementsPanel(String id, IModel<PrismObjectWrapper<AR>> mode
         super(id, model, config);
     }
 
+    @Override
+    protected ObjectQuery getCustomizeQuery() {
+        return getPageBase().getPrismContext().queryFor(AssignmentType.class)
+                .exists(AssignmentType.F_POLICY_RULE).build();
+    }
 
 }