Skip to content

Commit

Permalink
AssignmentPanel: Added normalization to exists filter for targetRef/@…
Browse files Browse the repository at this point in the history 
… search items
  • Loading branch information
@tonydamage
tonydamage committed Aug 10, 2022
1 parent a371c99 commit 7375295
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 12 deletions.
1 change: 1 addition & 0 deletions ...mpl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ public abstract class AbstractAssignmentTypePanel extends MultivalueContainerLis
protected static final String OPERATION_LOAD_ASSIGNMENTS_TARGET_OBJ = DOT_CLASS + "loadAssignmentsTargetRefObject";
protected static final String OPERATION_LOAD_ASSIGNMENT_TARGET_RELATIONS = DOT_CLASS + "loadAssignmentTargetRelations";

public static final ItemPath TARGET_REF_OBJ = ItemPath.create(AssignmentType.F_TARGET_REF, PrismConstants.T_OBJECT_REFERENCE);
private static final ItemPath TARGET_REF_EXTENSION = ItemPath.create(AssignmentType.F_TARGET_REF, PrismConstants.T_OBJECT_REFERENCE, ObjectType.F_EXTENSION);

private IModel<PrismContainerWrapper<AssignmentType>> model;
Expand Down
18 changes: 17 additions & 1 deletion ...min/assignmentholder/component/assignmentType/assignment/AbstractRoleAssignmentPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,23 @@
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.prism.PrismContainerDefinition;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.web.component.search.SearchFactory;
import com.evolveum.midpoint.web.component.search.SearchItemDefinition;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractRoleType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentHolderType;
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.PolicyRuleType;

public abstract class AbstractRoleAssignmentPanel<AH extends AssignmentHolderType> extends AbstractAssignmentPanel<AH> {

public AbstractRoleAssignmentPanel(String id, IModel<PrismObjectWrapper<AH>> model, ContainerPanelConfigurationType config) {
super(id, model, config);
}

@Override
protected List<IColumn<PrismContainerValueWrapper<AssignmentType>, String>> initColumns() {
List<IColumn<PrismContainerValueWrapper<AssignmentType>, String>> columns = new ArrayList<>();

Expand Down Expand Up @@ -73,4 +78,15 @@ private <AR extends AbstractRoleType> IModel<String> getIdentifierLabelModel(Pri
}
return Model.of("");
}

@Override
protected void addSpecificSearchableItems(PrismContainerDefinition<AssignmentType> containerDef,
List<SearchItemDefinition> defs) {
super.addSpecificSearchableItems(containerDef, defs);
if (isRepositorySearchEnabled()) {
SearchFactory.addSearchPropertyDef(containerDef, TARGET_REF_OBJ.append(AbstractRoleType.F_NAME), defs);
SearchFactory.addSearchPropertyDef(containerDef, TARGET_REF_OBJ.append(AbstractRoleType.F_DISPLAY_NAME), defs);
SearchFactory.addSearchPropertyDef(containerDef, TARGET_REF_OBJ.append(AbstractRoleType.F_IDENTIFIER), defs);
}
}
}
90 changes: 80 additions & 10 deletions ...ui/src/main/java/com/evolveum/midpoint/web/component/util/RepoAssignmentListProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,34 @@

import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.prism.ItemDefinition;
import com.evolveum.midpoint.prism.ItemPathParser;
import com.evolveum.midpoint.prism.Objectable;
import com.evolveum.midpoint.prism.PrismConstants;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.query.AndFilter;
import com.evolveum.midpoint.prism.query.ExistsFilter;
import com.evolveum.midpoint.prism.query.FullTextFilter;
import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.prism.query.ObjectOrdering;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.prism.query.OrderDirection;
import com.evolveum.midpoint.prism.query.PropertyValueFilter;
import com.evolveum.midpoint.prism.query.ValueFilter;
import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.web.component.prism.ValueStatus;
import com.evolveum.midpoint.web.component.search.Search;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentHolderType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;

import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchBoxModeType;

import org.apache.wicket.Component;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
Expand All @@ -48,7 +55,9 @@ public class RepoAssignmentListProvider extends ContainerListDataProvider<Assign
private static final long serialVersionUID = 1L;

public static final String TARGET_NAME_STRING = "targetRef.targetName.orig";
private static final ItemPath TARGET_NAME_PATH = ItemPath.create(AssignmentType.F_TARGET_REF, PrismConstants.T_OBJECT_REFERENCE, ObjectType.F_NAME);
private static final ItemPath TARGET_REF_OBJ = ItemPath.create(AssignmentType.F_TARGET_REF, PrismConstants.T_OBJECT_REFERENCE);
private static final ItemPath TARGET_NAME_PATH = TARGET_REF_OBJ.append(ObjectType.F_NAME);



private final IModel<List<PrismContainerValueWrapper<AssignmentType>>> model;
Expand Down Expand Up @@ -214,17 +223,11 @@ protected void postProcessWrapper(PrismContainerValueWrapper<AssignmentType> val

@Override
public ObjectQuery getQuery() {
var search = getSearchModel();
var orig = search.getObject() == null ? null : search.getObject().createObjectQuery(getVariables(), getPageBase(), null);

if (orig != null && orig.getFilter() instanceof FullTextFilter) {
// User entered full text filter, lets make sure it is invoked on targetRef
orig = getPrismContext().queryFor(getType()).exists(AssignmentType.F_TARGET_REF, PrismConstants.T_OBJECT_REFERENCE)
.filter(orig.getFilter())
.build();
}

orig = mergeQueries(orig, getCustomizeContentQuery());
var customizeQuery = getCustomizeContentQuery();
var orig = normalizedSearchQuery();
orig = mergeQueries(orig, customizeQuery);
var idFilter = postFilterIds();
ObjectFilter filter = orig != null ? orig.getFilter() : null;
if (orig != null) {
Expand Down Expand Up @@ -255,6 +258,73 @@ public ObjectQuery getQuery() {
.build();
}

private QName determineTargetRefType() {
var targetRefDef = getSearchModel().getObject().getType().getContainerDefinition().findReferenceDefinition(AssignmentType.F_TARGET_REF);
QName targetType = targetRefDef.getTargetTypeName();
if (targetType != null && !Objects.equals(AssignmentHolderType.COMPLEX_TYPE, targetType)) {
// target type was overriden
return targetType;
}


return null;
}

private ObjectQuery normalizedSearchQuery() {
var search = getSearchModel();
var orig = search.getObject() == null ? null : search.getObject().createObjectQuery(getVariables(), getPageBase(), null);

var targetType = determineTargetRefType();

if (orig != null && targetType != null && SearchBoxModeType.BASIC.equals(search.getObject().getSearchType()) ) {
// We should optimize extract all dereferenced items from filter to form single exists(and) filter
// which can be later extended to exists(type(and))) in order to provide
// best information for repository

// This code is written with assumption that all target filters have path targetRef/@
var root = ObjectQueryUtil.simplify(orig.getFilter(), getPrismContext());
List<ObjectFilter> filters;
if (root instanceof AndFilter) {
filters = new ArrayList<>(((AndFilter) root).getConditions());
} else {
filters = new ArrayList<>();
filters.add(root);
}
var iter = filters.iterator();
ArrayList<ObjectFilter> targetObjFilters = new ArrayList<>();
while (iter.hasNext()) {
var filter = iter.next();
if (filter instanceof ValueFilter<?, ?>) {
if (((ValueFilter<?,?>) filter).canNestInsideExists(TARGET_REF_OBJ)) {
// Filter matches targetRef/@/
iter.remove();
targetObjFilters.add(((ValueFilter<?,?>) filter).nested(TARGET_REF_OBJ));
}
}
}
if (!targetObjFilters.isEmpty()) {
// We create replacement only if targetObjFilters were successfully created
var typeAnd =getPrismContext().queryFactory().createAnd(targetObjFilters);
orig = getPrismContext().queryFor(getType()).exists(TARGET_REF_OBJ)
.block()
.type(targetType).filter(typeAnd)
.endBlock().build();
orig.addFilter(getPrismContext().queryFactory().createAndOptimized(filters));
}

}



if (orig != null && orig.getFilter() instanceof FullTextFilter) {
// User entered full text filter, lets make sure it is invoked on targetRef
orig = getPrismContext().queryFor(getType()).exists(TARGET_REF_OBJ)
.filter(orig.getFilter())
.build();
}
return orig;
}

private ObjectQuery mergeQueries(ObjectQuery origQuery, ObjectQuery query) {
if (query != null) {
if (origQuery == null) {
Expand Down
7 changes: 6 additions & 1 deletion infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,12 @@ public static ObjectFilter simplify(ObjectFilter filter, PrismContext prismConte
// AND with "true", just skip it
} else {
ObjectFilter simplifiedSubfilter = simplify(subfilter, prismContext);
if (simplifiedSubfilter instanceof NoneFilter) {
if (simplifiedSubfilter instanceof AndFilter) {
// Unwrap AND filter to parent and
for (ObjectFilter condition : ((AndFilter) simplifiedSubfilter).getConditions()) {
simplifiedFilter.addCondition(condition);
}
} else if (simplifiedSubfilter instanceof NoneFilter) {
return FilterCreationUtil.createNone(prismContext);
} else if (simplifiedSubfilter == null || simplifiedSubfilter instanceof AllFilter) {
// skip
Expand Down

0 comments on commit 7375295

Please sign in to comment.