Skip to content

Commit

Permalink
fixing the functionality after shopping cart restructurizing
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Jul 21, 2018
1 parent 8490648 commit 75d44e6
Show file tree
Hide file tree
Showing 9 changed files with 135 additions and 152 deletions.
2 changes: 1 addition & 1 deletion ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java
View file
Expand Up @@ -38,7 +38,7 @@ public abstract class AbstractPopupTabPanel<O extends ObjectType> extends BasePa
private static final long serialVersionUID = 1L;

private static final String ID_OBJECT_LIST_PANEL = "objectListPanel";
private static final String ID_PARAMETERS_PANEL = "parametersPanel";
protected static final String ID_PARAMETERS_PANEL = "parametersPanel";
protected static final String ID_PARAMETERS_PANEL_FRAGMENT = "parametersPanelFragment";

protected List<O> preSelectedObjects = new ArrayList<>();
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
View file
Expand Up @@ -97,7 +97,7 @@ public QName getRelationValue(){
}

private DropDownChoicePanel getRelationDropDown(){
return (DropDownChoicePanel)get(ID_RELATION_CONTAINER).get(ID_RELATION);
return (DropDownChoicePanel)get(ID_PARAMETERS_PANEL).get(ID_RELATION_CONTAINER).get(ID_RELATION);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
View file
Expand Up @@ -176,7 +176,7 @@ public void onClick(AjaxRequestTarget target) {
// isVisible = ((PageBase) getPage()).getSecurityEnforcer().isAuthorized(ModelAuthorizationAction.ADD.getUrl(),
// null, objectToCreate, null, null, null);
// } catch (Exception ex){
// LOGGER.error("Failed to check authorization for ADD action on new object of " + mainObjectListPanel.getType().getSimpleName()
// LOGGER.error("Failed to check authorization for ADD action on new object of " + mainObjectListPanel.getQueryType().getSimpleName()
// + " type, ", ex);
// }
// return isVisible;
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MemberPopupTabPanel.java
View file
Expand Up @@ -128,6 +128,6 @@ public QName getRelationValue(){
}

private DropDownChoicePanel getRelationDropDown(){
return (DropDownChoicePanel)get(ID_RELATION_CONTAINER).get(ID_RELATION);
return (DropDownChoicePanel)get(ID_PARAMETERS_PANEL).get(ID_RELATION_CONTAINER).get(ID_RELATION);
}
}
74 changes: 50 additions & 24 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
View file
Expand Up @@ -16,13 +16,14 @@
package com.evolveum.midpoint.web.page.self;

import com.evolveum.midpoint.gui.api.component.BasePanel;
import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.model.api.ModelInteractionService;
import com.evolveum.midpoint.model.api.RoleSelectionSpecification;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.query.InOidFilter;
import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.prism.query.TypeFilter;
import com.evolveum.midpoint.schema.constants.RelationTypes;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
import com.evolveum.midpoint.task.api.Task;
Expand All @@ -33,20 +34,20 @@
import com.evolveum.midpoint.web.component.assignment.GridViewComponent;
import com.evolveum.midpoint.web.component.assignment.RoleCatalogItemButton;
import com.evolveum.midpoint.web.component.data.ObjectDataProvider;
import com.evolveum.midpoint.web.component.search.Search;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.web.page.admin.users.dto.UserDtoStatus;
import com.evolveum.midpoint.web.page.self.dto.AssignmentViewType;
import com.evolveum.midpoint.web.session.RoleCatalogStorage;
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.RoleManagementConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.Model;
import org.apache.wicket.markup.repeater.data.IDataProvider;

import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.List;

/**
Expand All @@ -61,8 +62,11 @@ public abstract class AbstractShoppingCartTabPanel<R extends AbstractRoleType> e
private static final String OPERATION_LOAD_ASSIGNABLE_ROLES = DOT_CLASS + "loadAssignableRoles";
private static final Trace LOGGER = TraceManager.getTrace(AbstractShoppingCartTabPanel.class);

public AbstractShoppingCartTabPanel(String id){
private RoleManagementConfigurationType roleManagementConfig;

public AbstractShoppingCartTabPanel(String id, RoleManagementConfigurationType roleManagementConfig){
super(id);
this.roleManagementConfig = roleManagementConfig;
}

@Override
Expand All @@ -74,7 +78,13 @@ protected void onInitialize(){
private void initLayout(){
initLeftSidePanel();

GridViewComponent<AssignmentEditorDto> catalogItemsGrid = new GridViewComponent(ID_SHOPPING_CART_ITEMS_PANEL, Model.of(getTabPanelProvider())) {
GridViewComponent<AssignmentEditorDto> catalogItemsGrid = new GridViewComponent(ID_SHOPPING_CART_ITEMS_PANEL,
new LoadableModel<IDataProvider>() {
@Override
protected IDataProvider load() {
return getTabPanelProvider();
}
}) {
private static final long serialVersionUID = 1L;

// @Override
Expand All @@ -90,8 +100,7 @@ protected void populateItem(Item item) {

@Override
protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
// PageAssignmentShoppingCart.this.reloadCartButton(target);

AbstractShoppingCartTabPanel.this.assignmentAddedToShoppingCartPerformed(target);
}
});
}
Expand Down Expand Up @@ -120,10 +129,10 @@ private ObjectDataProvider getTabPanelProvider() {
public AssignmentEditorDto createDataObjectWrapper(PrismObject<AbstractRoleType> obj) {

AssignmentEditorDto dto = AssignmentEditorDto.createDtoFromObject(obj.asObjectable(), UserDtoStatus.ADD, getPageBase());
// if (!getRoleCatalogStorage().isMultiUserRequest()) {
// dto.setAlreadyAssigned(isAlreadyAssigned(obj, dto));
// dto.setDefualtAssignmentConstraints(getRoleCatalogStorage().getShoppingCartConfigurationDto().getDefaultAssignmentConstraints());
// }
if (!getRoleCatalogStorage().isMultiUserRequest()) {
dto.setAlreadyAssigned(isAlreadyAssigned(obj, dto));
dto.setDefualtAssignmentConstraints(roleManagementConfig == null ? null : roleManagementConfig.getDefaultAssignmentConstraints());
}
return dto;
}

Expand All @@ -135,6 +144,23 @@ public ObjectQuery getQuery() {
return provider;
}

private boolean isAlreadyAssigned(PrismObject<AbstractRoleType> obj, AssignmentEditorDto assignmentDto){
UserType user = getTargetUser();
if (user == null || user.getAssignment() == null){
return false;
}
boolean isAssigned = false;
List<RelationTypes> assignedRelationsList = new ArrayList<>();
for (AssignmentType assignment : user.getAssignment()){
if (assignment.getTargetRef() != null && assignment.getTargetRef().getOid().equals(obj.getOid())){
isAssigned = true;
assignedRelationsList.add(RelationTypes.getRelationType(assignment.getTargetRef().getRelation()));
}
}
assignmentDto.setAssignedRelationsList(assignedRelationsList);
return isAssigned;
}

protected boolean isShoppingCartItemsPanelVisible(){
return true;
}
Expand All @@ -145,22 +171,15 @@ protected void appendItemsPanelStyle(GridViewComponent itemsPanel){

protected ObjectQuery createContentQuery(ObjectQuery searchQuery) {
ObjectQuery memberQuery = new ObjectQuery();
// if (AssignmentViewType.ROLE_CATALOG_VIEW.equals(viewTypeModel.getObject())){
// String oid = getRoleCatalogStorage().getSelectedOid();
// if(StringUtils.isEmpty(oid)){
// return null;
// }
// addOrgMembersFilter(oid, memberQuery);
// }
// if (getRoleCatalogStorage().getAssignmentsUserOwner() != null) {
// UserType assignmentsOwner = getRoleCatalogStorage().getAssignmentsUserOwner();
// List<String> assignmentTargetObjectOidsList = collectTargetObjectOids(assignmentsOwner.getAssignment());
// ObjectFilter oidsFilter = InOidFilter.createInOid(assignmentTargetObjectOidsList);
// memberQuery.addFilter(oidsFilter);
// }
// memberQuery.addFilter(getAssignableRolesFilter());
if (getType() != null){
ObjectFilter typeFilter = ObjectQueryUtil.filterAnd(TypeFilter.createType(getType(), null), memberQuery.getFilter());
memberQuery.addFilter(getAssignableRolesFilter());
if (getQueryType() != null){
ObjectFilter typeFilter = ObjectQueryUtil.filterAnd(TypeFilter.createType(getQueryType(), null), memberQuery.getFilter());
memberQuery.addFilter(typeFilter);
}

Expand Down Expand Up @@ -201,7 +220,7 @@ private ObjectFilter getAssignableRolesFilter() {
return filter;
}

protected abstract QName getType();
protected abstract QName getQueryType();

private UserType getTargetUser(){
if (getRoleCatalogStorage().isSelfRequest()){
Expand All @@ -210,7 +229,14 @@ private UserType getTargetUser(){
return getRoleCatalogStorage().getTargetUserList().get(0);
}

protected void assignmentAddedToShoppingCartPerformed(AjaxRequestTarget target){
}

protected RoleCatalogStorage getRoleCatalogStorage(){
return getPageBase().getSessionStorage().getRoleCatalog();
}

protected GridViewComponent getGridViewComponent(){
return (GridViewComponent)get(ID_SHOPPING_CART_ITEMS_PANEL);
}
}
4 changes: 2 additions & 2 deletions ...min-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingCart.html
View file
Expand Up @@ -29,8 +29,8 @@
<div class="col-md-1 pull-right">
<a wicket:id="cartButton">
<i class="fa fa-shopping-cart fa-2x"></i>
<span wicket:id="itemsCount" class="badge bg-red"></span>
<!--style="position: absolute; top: -1px; left: 30px;"></span>-->
<span wicket:id="itemsCount" class="badge bg-red"
style="position: absolute; top: -1px; left: 30px;"></span>
</a>
</div>
</div>
Expand Down

0 comments on commit 75d44e6

Please sign in to comment.