Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Oct 17, 2017
2 parents c68ab59 + 2abd889 commit 97b8989
Show file tree
Hide file tree
Showing 67 changed files with 1,182 additions and 503 deletions.
31 changes: 23 additions & 8 deletions ...gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java
View file
Expand Up @@ -20,24 +20,24 @@

import javax.xml.namespace.QName;

import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.query.builder.QueryBuilder;
import com.evolveum.midpoint.web.component.prism.ContainerValueWrapper;
import com.evolveum.midpoint.web.component.prism.ContainerWrapper;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;

import com.evolveum.midpoint.gui.api.component.TypedAssignablePanel;
import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.web.component.data.column.CheckBoxColumn;
import com.evolveum.midpoint.web.session.UserProfileStorage.TableId;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;

public class GdprAssignmentPanel extends AbstractRoleAssignmentPanel {

Expand All @@ -51,11 +51,18 @@ public GdprAssignmentPanel(String id, IModel<ContainerWrapper<AssignmentType>> a
@Override
protected List<IColumn<ContainerValueWrapper<AssignmentType>, String>> initColumns() {
List<IColumn<ContainerValueWrapper<AssignmentType>, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<>(createStringResource("AssignmentType.lifecycleState"), AssignmentType.F_LIFECYCLE_STATE.getLocalPart()));
columns.add(new AbstractColumn<ContainerValueWrapper<AssignmentType>, String>(createStringResource("AssignmentType.lifecycleState")) {
private static final long serialVersionUID = 1L;
@Override
public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentType>>> item, String componentId, IModel<ContainerValueWrapper<AssignmentType>> rowModel) {
item.add(new Label(componentId, rowModel.getObject().getContainerValue().asContainerable().getLifecycleState()));
}
});

columns.add(new CheckBoxColumn<ContainerValueWrapper<AssignmentType>>(createStringResource("AssignmnetType.accepted")) {

private static final long serialVersionUID = 1L;

@Override
protected IModel<Boolean> getEnabled() {
return Model.of(Boolean.FALSE);
Expand Down Expand Up @@ -99,4 +106,12 @@ protected <T extends ObjectType> void addSelectedAssignmentsPerformed(AjaxReques
super.addSelectedAssignmentsPerformed(target, assignmentsList, SchemaConstants.ORG_CONSENT);
}

protected ObjectQuery createObjectQuery() {
return QueryBuilder.queryFor(AssignmentType.class, getParentPage().getPrismContext())
.block()
.item(new ItemPath(AssignmentType.F_TARGET_REF))
.ref(SchemaConstants.ORG_CONSENT)
.endBlock()
.build();
}
}
4 changes: 2 additions & 2 deletions ...in-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java 100644 → 100755
View file
Expand Up @@ -103,8 +103,8 @@ public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentTyp
public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentType>>> cellItem, String componentId,
final IModel<ContainerValueWrapper<AssignmentType>> rowModel) {
PolicyRuleType policyRuleType = rowModel.getObject().getContainerValue().getValue().getPolicyRule();
// String action = PolicyRuleTypeUtil.toShortString(policyRuleType.getPolicyActions());
// cellItem.add(new MultiLineLabel(componentId, Model.of(action != null && !action.equals("null") ? action : "")));
String action = PolicyRuleTypeUtil.toShortString(policyRuleType.getPolicyActions(), new ArrayList<>());
cellItem.add(new MultiLineLabel(componentId, Model.of(action != null && !action.equals("null") ? action : "")));
}

});
Expand Down
Empty file modified ...admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/RelationTypes.java 100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion ...min-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxColumn.java
View file
Expand Up @@ -50,7 +50,7 @@ public void populateItem(final Item<ICellPopulator<T>> cellItem, String componen
final IModel<T> rowModel) {
IModel<Boolean> selected = getCheckBoxValueModel(rowModel);

CheckBoxPanel check = new CheckBoxPanel(componentId, selected, enabled) {
CheckBoxPanel check = new CheckBoxPanel(componentId, selected, getEnabled()) {

@Override
public void onUpdate(AjaxRequestTarget target) {
Expand Down
39 changes: 2 additions & 37 deletions ...main/java/com/evolveum/midpoint/web/component/objectdetails/FocusAssignmentsTabPanel.java
View file
Expand Up @@ -61,49 +61,14 @@ public FocusAssignmentsTabPanel(String id, Form<?> mainForm, LoadableModel<Objec
}

private void initLayout() {
ContainerWrapper<AssignmentType> assignmentsContainerWrapper = getObjectWrapper().findContainerWrapper(new ItemPath(FocusType.F_ASSIGNMENT));

WebMarkupContainer assignments = new WebMarkupContainer(ID_ASSIGNMENTS);
assignments.setOutputMarkupId(true);
add(assignments);

new ContainerWrapperFromObjectWrapperModel<>(getObjectWrapperModel(), new ItemPath(FocusType.F_ASSIGNMENT));
AbstractRoleAssignmentPanel panel = new AbstractRoleAssignmentPanel(ID_ASSIGNMENTS_PANEL, Model.of(assignmentsContainerWrapper));
AbstractRoleAssignmentPanel panel = new AbstractRoleAssignmentPanel(ID_ASSIGNMENTS_PANEL,
new ContainerWrapperFromObjectWrapperModel<>(getObjectWrapperModel(), new ItemPath(FocusType.F_ASSIGNMENT)));

// new AbstractReadOnlyModel<ContainerWrapper<AssignmentType>>() {
// @Override
// public ContainerWrapper<AssignmentType> getObject() {
// return assignmentsContainerWrapper;
// }
// });
assignments.add(panel);
}

private IModel<List<ContainerValueWrapper<AssignmentType>>> getAssignmentsListModel(ContainerWrapper<AssignmentType> assignmentsContainerWrapper){
return new IModel<List<ContainerValueWrapper<AssignmentType>>>() {
private static final long serialVersionUID = 1L;

@Override
public List<ContainerValueWrapper<AssignmentType>> getObject() {
List<ContainerValueWrapper<AssignmentType>> assignmentsList = new ArrayList<>();
assignmentsContainerWrapper.getValues().forEach(a -> {
if (!AssignmentsUtil.isPolicyRuleAssignment(a.getContainerValue().getValue()) && !AssignmentsUtil.isConsentAssignment(a.getContainerValue().getValue())
&& AssignmentsUtil.isAssignmentRelevant(a.getContainerValue().getValue())) {
assignmentsList.add(a);
}
});
// Collections.sort(consentsList);
return assignmentsList;
}

@Override
public void setObject(List<ContainerValueWrapper<AssignmentType>> object){
assignmentsContainerWrapper.getValues().clear();
assignmentsContainerWrapper.getValues().addAll(object);
}

@Override
public void detach(){};
};
}
}
26 changes: 3 additions & 23 deletions ...src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusConsentTabPanel.java
View file
Expand Up @@ -15,6 +15,7 @@
import com.evolveum.midpoint.web.component.prism.ContainerValueWrapper;
import com.evolveum.midpoint.web.component.prism.ContainerWrapper;
import com.evolveum.midpoint.web.component.prism.ObjectWrapper;
import com.evolveum.midpoint.web.model.ContainerWrapperFromObjectWrapperModel;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
import org.apache.wicket.model.AbstractReadOnlyModel;
Expand All @@ -37,31 +38,10 @@ public FocusConsentTabPanel(String id, Form<ObjectWrapper<F>> mainForm, Loadable
}

private void initLayout() {
ContainerWrapper<AssignmentType> assignmentsContainerWrapper = getObjectWrapper().findContainerWrapper(new ItemPath(FocusType.F_ASSIGNMENT));

GdprAssignmentPanel consentRoles = new GdprAssignmentPanel(ID_ROLES, new AbstractReadOnlyModel<ContainerWrapper<AssignmentType>>() {
@Override
public ContainerWrapper<AssignmentType> getObject() {
return assignmentsContainerWrapper;
}
});
GdprAssignmentPanel consentRoles = new GdprAssignmentPanel(ID_ROLES,
new ContainerWrapperFromObjectWrapperModel<>(getObjectWrapperModel(), new ItemPath(FocusType.F_ASSIGNMENT)));
add(consentRoles);
consentRoles.setOutputMarkupId(true);

}

private IModel<List<ContainerValueWrapper<AssignmentType>>> getConsentsModel(ContainerWrapper<AssignmentType> assignmentsContainerWrapper){
List<ContainerValueWrapper<AssignmentType>> consentsList = new ArrayList<>();
assignmentsContainerWrapper.getValues().forEach(a -> {
if (isConsentAssignment(a.getContainerValue().getValue())){
consentsList.add(a);
}
});
// Collections.sort(consentsList);
return Model.ofList(consentsList);
}

private boolean isConsentAssignment(AssignmentType assignment) {
return assignment.getTargetRef() != null && QNameUtil.match(assignment.getTargetRef().getRelation(), SchemaConstants.ORG_CONSENT);
}
}
23 changes: 4 additions & 19 deletions ...main/java/com/evolveum/midpoint/web/component/objectdetails/FocusPolicyRulesTabPanel.java
View file
Expand Up @@ -29,6 +29,7 @@
import com.evolveum.midpoint.web.component.prism.ContainerValueWrapper;
import com.evolveum.midpoint.web.component.prism.ContainerWrapper;
import com.evolveum.midpoint.web.component.prism.ObjectWrapper;
import com.evolveum.midpoint.web.model.ContainerWrapperFromObjectWrapperModel;
import com.evolveum.midpoint.web.page.admin.PageAdminFocus;
import com.evolveum.midpoint.web.page.admin.users.component.AssignmentPreviewDialog;
import com.evolveum.midpoint.web.page.admin.users.component.AssignmentsPreviewDto;
Expand Down Expand Up @@ -66,29 +67,13 @@ public FocusPolicyRulesTabPanel(String id, Form mainForm, LoadableModel<ObjectWr
}

private void initLayout() {
ContainerWrapper<AssignmentType> assignmentsContainerWrapper = getObjectWrapper().findContainerWrapper(new ItemPath(FocusType.F_ASSIGNMENT));

WebMarkupContainer policyRules = new WebMarkupContainer(ID_POLICY_RULES_CONTAINER);
policyRules.setOutputMarkupId(true);
add(policyRules);

PolicyRulesPanel policyRulesPanel = new PolicyRulesPanel(ID_POLICY_RULES_PANEL, new AbstractReadOnlyModel<ContainerWrapper<AssignmentType>>() {
@Override
public ContainerWrapper<AssignmentType> getObject() {
return assignmentsContainerWrapper;
}
});
policyRules.add(policyRulesPanel);
}
PolicyRulesPanel policyRulesPanel = new PolicyRulesPanel(ID_POLICY_RULES_PANEL,
new ContainerWrapperFromObjectWrapperModel<>(getObjectWrapperModel(), new ItemPath(FocusType.F_ASSIGNMENT)));

private IModel<List<ContainerValueWrapper<AssignmentType>>> getPolicyRulesModel(ContainerWrapper<AssignmentType> assignmentsContainerWrapper){
List<ContainerValueWrapper<AssignmentType>> policyRuleList = new ArrayList<>();
assignmentsContainerWrapper.getValues().forEach(a -> {
if (AssignmentsUtil.isPolicyRuleAssignment(a.getContainerValue().getValue())){
policyRuleList.add(a);
}
});
// Collections.sort(consentsList);
return Model.ofList(policyRuleList);
policyRules.add(policyRulesPanel);
}
}
2 changes: 1 addition & 1 deletion ...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PagePreviewChanges.java
View file
Expand Up @@ -138,7 +138,7 @@ public SceneDto getObject() {
? modelContext.getHookPreviewResult(PolicyRuleEnforcerHookPreviewOutputType.class)
: null;
List<EvaluatedTriggerGroupDto> triggerGroups = enforcements != null
? Collections.singletonList(EvaluatedTriggerGroupDto.createFrom(enforcements.getRule(), false, null))
? Collections.singletonList(EvaluatedTriggerGroupDto.initializeFromRules(enforcements.getRule(), false, null))
: Collections.emptyList();
policyViolationsModel = Model.ofList(triggerGroups);

Expand Down
33 changes: 0 additions & 33 deletions ...ain/java/com/evolveum/midpoint/web/page/admin/workflow/dto/AlreadyShownTriggerRecord.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...evolveum/midpoint/web/page/admin/workflow/dto/ApprovalProcessExecutionInformationDto.java
View file
Expand Up @@ -76,7 +76,7 @@ public static ApprovalProcessExecutionInformationDto createFrom(ApprovalSchemaEx
String targetName = WfContextUtil.getTargetName(info);
WfContextType wfc = WfContextUtil.getWorkflowContext(info);
boolean running = wfc != null && wfc.getEndTimestamp() == null;
EvaluatedTriggerGroupDto triggers = EvaluatedTriggerGroupDto.createFrom(WfContextUtil.getAllRules(info.getPolicyRules()), false, new ArrayList<>());
EvaluatedTriggerGroupDto triggers = EvaluatedTriggerGroupDto.initializeFromRules(WfContextUtil.getAllRules(info.getPolicyRules()), false, new EvaluatedTriggerGroupDto.UniquenessFilter());
ApprovalProcessExecutionInformationDto rv =
new ApprovalProcessExecutionInformationDto(wholeProcess, currentStageNumber, numberOfStages, processName,
targetName, triggers, running);
Expand Down
61 changes: 6 additions & 55 deletions .../src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/EvaluatedTriggerDto.java
View file
Expand Up @@ -16,13 +16,12 @@

package com.evolveum.midpoint.web.page.admin.workflow.dto;

import com.evolveum.midpoint.model.api.util.EvaluatedPolicyRuleUtil;
import com.evolveum.midpoint.util.TreeNode;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import org.jetbrains.annotations.NotNull;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
* @author mederly
Expand All @@ -36,10 +35,10 @@ public class EvaluatedTriggerDto implements Serializable {
@NotNull private final EvaluatedTriggerGroupDto children;
private boolean highlighted;

private EvaluatedTriggerDto(@NotNull EvaluatedPolicyRuleTriggerType trigger, boolean highlighted) {
this.trigger = trigger;
this.children = new EvaluatedTriggerGroupDto(null);
this.highlighted = highlighted;
public EvaluatedTriggerDto(TreeNode<EvaluatedPolicyRuleUtil.AugmentedTrigger<EvaluatedTriggerGroupDto.HighlightingInformation>> node) {
this.trigger = node.getUserObject().trigger;
this.children = new EvaluatedTriggerGroupDto(null, node.getChildren());
this.highlighted = node.getUserObject().additionalData.value;
}

@NotNull
Expand All @@ -56,54 +55,6 @@ public EvaluatedTriggerGroupDto getChildren() {
return children;
}

// copies logic from EvaluatedPolicyRuleImpl.createMessageTreeNode
public static void create(List<EvaluatedTriggerDto> resultList, EvaluatedPolicyRuleTriggerType trigger, boolean highlighted,
List<AlreadyShownTriggerRecord> triggersAlreadyShown) {
boolean hidden = Boolean.TRUE.equals(trigger.isHidden());
boolean isFinal = Boolean.TRUE.equals(trigger.isFinal());
if (!hidden) {
EvaluatedTriggerDto newTriggerDto = new EvaluatedTriggerDto(trigger, highlighted);
if (triggersAlreadyShown != null && alreadyShown(triggersAlreadyShown, newTriggerDto)) {
return;
}
resultList.add(newTriggerDto);
resultList = newTriggerDto.getChildren().getTriggers();
}
if (!isFinal) { // it's possible that this was pre-filtered e.g. by policy enforcer hook
for (EvaluatedPolicyRuleTriggerType innerTrigger : getChildTriggers(trigger)) {
create(resultList, innerTrigger, highlighted, triggersAlreadyShown);
}
}
}

private static boolean alreadyShown(List<AlreadyShownTriggerRecord> triggersAlreadyShown, EvaluatedTriggerDto newTriggerDto) {
EvaluatedPolicyRuleTriggerType anonymizedTrigger = newTriggerDto.trigger.clone().ruleName(null);
for (AlreadyShownTriggerRecord alreadyShown : triggersAlreadyShown) {
if (alreadyShown.anonymizedTrigger.equals(anonymizedTrigger)) {
if (newTriggerDto.highlighted) {
alreadyShown.originalTriggerDto.highlighted = true;
}
return true;
}
}
triggersAlreadyShown.add(new AlreadyShownTriggerRecord(newTriggerDto, anonymizedTrigger));
return false;
}

private static List<EvaluatedPolicyRuleTriggerType> getChildTriggers(EvaluatedPolicyRuleTriggerType trigger) {
if (trigger instanceof EvaluatedEmbeddingTriggerType) {
return ((EvaluatedEmbeddingTriggerType) trigger).getEmbedded();
} else if (trigger instanceof EvaluatedSituationTriggerType) {
List<EvaluatedPolicyRuleTriggerType> rv = new ArrayList<>();
for (EvaluatedPolicyRuleType rule : ((EvaluatedSituationTriggerType) trigger).getSourceRule()) {
rv.addAll(rule.getTrigger());
}
return rv;
} else {
return Collections.emptyList();
}
}

public boolean isHighlighted() {
return highlighted;
}
Expand Down

0 comments on commit 97b8989

Please sign in to comment.