From 6813a1df3adf84e386fffcb3bdcf4d08a98eb6ca Mon Sep 17 00:00:00 2001 From: kate Date: Thu, 6 Sep 2018 11:47:52 +0200 Subject: [PATCH] removed relation drop down from assignments tab panel --- .../AbstractRoleAssignmentPanel.html | 6 +- .../AbstractRoleAssignmentPanel.java | 91 +------------------ .../assignment/GdprAssignmentPanel.java | 5 - .../assignment/InducedEntitlementsPanel.java | 5 - 4 files changed, 2 insertions(+), 105 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html index 243da713648..c019b1572a3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.html @@ -20,11 +20,7 @@
-
- -
-
-
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java index b8a1108961f..8dd4bb9b851 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java @@ -17,21 +17,16 @@ package com.evolveum.midpoint.web.component.assignment; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.xml.namespace.QName; - import com.evolveum.midpoint.gui.api.component.AssignmentPopup; import com.evolveum.midpoint.prism.*; import com.evolveum.midpoint.schema.constants.ObjectTypes; -import com.evolveum.midpoint.schema.constants.RelationTypes; import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.web.component.prism.*; import com.evolveum.midpoint.web.component.search.SearchFactory; -import com.evolveum.midpoint.web.component.search.SearchItem; import com.evolveum.midpoint.web.component.search.SearchItemDefinition; import com.evolveum.midpoint.web.page.admin.PageAdminFocus; import com.evolveum.midpoint.web.page.admin.users.component.AssignmentInfoDto; @@ -39,37 +34,27 @@ import com.evolveum.midpoint.xml.ns._public.common.common_3.*; import org.apache.commons.lang.StringUtils; -import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; 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.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.repeater.Item; 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.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; -import com.evolveum.midpoint.gui.impl.component.MultivalueContainerListPanelWithDetailsPanel; -import com.evolveum.midpoint.gui.impl.model.PropertyWrapperFromContainerValueWrapperModel; import com.evolveum.midpoint.prism.path.ItemPath; import com.evolveum.midpoint.prism.query.ObjectPaging; import com.evolveum.midpoint.prism.query.ObjectQuery; import com.evolveum.midpoint.prism.query.builder.QueryBuilder; -import com.evolveum.midpoint.schema.util.ObjectTypeUtil; -import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.util.exception.SchemaException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.component.AjaxButton; -import com.evolveum.midpoint.web.component.form.Form; -import com.evolveum.midpoint.web.component.input.DropDownChoicePanel; import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; import com.evolveum.midpoint.web.session.UserProfileStorage; import com.evolveum.midpoint.web.session.UserProfileStorage.TableId; @@ -83,15 +68,11 @@ public class AbstractRoleAssignmentPanel extends AssignmentPanel { private static final Trace LOGGER = TraceManager.getTrace(AssignmentPanel.class); - private static final String ID_RELATION = "relation"; - private static final String ID_RELATION_CONTAINER = "relationContainer"; private static final String ID_SHOW_ALL_ASSIGNMENTS_BUTTON = "showAllAssignmentsButton"; protected static final String DOT_CLASS = AbstractRoleAssignmentPanel.class.getName() + "."; private static final String OPERATION_LOAD_TARGET_REF_OBJECT = DOT_CLASS + "loadAssignmentTargetRefObject"; - private RelationTypes relationValue = null; - public AbstractRoleAssignmentPanel(String id, IModel> assignmentContainerWrapperModel){ super(id, assignmentContainerWrapperModel); } @@ -99,55 +80,6 @@ public AbstractRoleAssignmentPanel(String id, IModel relation = WebComponentUtil.createEnumPanel(RelationTypes.class, ID_RELATION, - WebComponentUtil.createReadonlyModelFromEnum(RelationTypes.class), - new IModel() { - - private static final long serialVersionUID = 1L; - - @Override - public RelationTypes getObject() { - return relationValue; - } - - @Override - public void setObject(RelationTypes relationTypes) { - relationValue = relationTypes; - } - - @Override - public void detach() { - - } - }, this, true, - createStringResource("RelationTypes.ANY").getString()); - relation.getBaseFormComponent().add(new AjaxFormComponentUpdatingBehavior("change") { - private static final long serialVersionUID = 1L; - - @Override - protected void onUpdate(AjaxRequestTarget target) { - getMultivalueContainerListPanel().refreshTable(target); - } - }); - relation.setOutputMarkupId(true); - relation.setOutputMarkupPlaceholderTag(true); - relationContainer.addOrReplace(relation); - AjaxButton showAllAssignmentsButton = new AjaxButton(ID_SHOW_ALL_ASSIGNMENTS_BUTTON, createStringResource("AssignmentTablePanel.menu.showAllAssignments")) { @@ -171,11 +103,6 @@ public boolean isVisible(){ return searchContainer; } - private DropDownChoicePanel getRelationPanel() { - return (DropDownChoicePanel) getAssignmentContainer().get(ID_RELATION_CONTAINER).get(ID_RELATION); - } - - protected void showAllAssignments(AjaxRequestTarget target) { PageBase pageBase = getPageBase(); List previewAssignmentsList; @@ -332,8 +259,6 @@ protected int getItemsPerPage() { } protected ObjectQuery createObjectQuery() { - QName relation = getRelation(); - if (PrismConstants.Q_ANY.equals(relation)){ return QueryBuilder.queryFor(AssignmentType.class, getParentPage().getPrismContext()) .block() .not() @@ -346,21 +271,11 @@ protected ObjectQuery createObjectQuery() { .item(new ItemPath(AssignmentType.F_TARGET_REF)) .ref(SchemaConstants.ORG_DEPUTY) .endBlock() - .and() + .and() .not() .exists(AssignmentType.F_POLICY_RULE) .build(); - } else { - return QueryBuilder.queryFor(AssignmentType.class, getParentPage().getPrismContext()) - .item(new ItemPath(AssignmentType.F_TARGET_REF)) - .ref(relation) - .build(); } - } - - private QName getRelation() { - return relationValue == null ? PrismConstants.Q_ANY : relationValue.getRelation(); - } private IModel getTenantLabelModel(ContainerValueWrapper assignmentContainer){ if (assignmentContainer == null || assignmentContainer.getContainerValue() == null){ @@ -403,10 +318,6 @@ private IModel getIdentifierLabelModel(ContainerV return Model.of(""); } - protected boolean isRelationVisible() { - return true; - } - protected List getObjectTypesList(){ return WebComponentUtil.createAssignableTypesList(); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java index fcabc78eba3..e8209a7408b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GdprAssignmentPanel.java @@ -95,11 +95,6 @@ public Boolean getObject() { return columns; } - @Override - protected boolean isRelationVisible() { - return false; - } - // @Override // protected void addSelectedAssignmentsPerformed(AjaxRequestTarget target, List assignmentsList, // QName relation, ShadowKindType kind, String intent) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java index 5ed71e3d4f4..45f727f022a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java @@ -151,11 +151,6 @@ private ConstructionAssociationPanel getConstructionAssociationPanel(ContainerVa return constructionDetailsPanel; } - @Override - protected boolean isRelationVisible() { - return false; - } - protected List getObjectTypesList(){ return Arrays.asList(ObjectTypes.RESOURCE); }