Skip to content

Commit

Permalink
MID-6035 Request a Role Cart - Include a Delete/remove item for each …
Browse files Browse the repository at this point in the history 
…item
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Apr 23, 2020
1 parent 8f748fe commit 35025f7
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 38 deletions.
1 change: 1 addition & 0 deletions ...main/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentListPanel.java
View file
Expand Up @@ -108,6 +108,7 @@ protected void deleteAssignmentConfirmedPerformed(AjaxRequestTarget target,
}
}
target.add(getPageBase().getFeedbackPanel());
getPageBase().reloadShoppingCartIcon(target);
reloadMainAssignmentsComponent(target);
}

Expand Down
13 changes: 7 additions & 6 deletions ...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
View file
Expand Up @@ -16,15 +16,16 @@
<a class="check-table-header-name" wicket:id="name">
<span class="name" wicket:id="nameLabel"/>
</a>
<span class="check-table-header-description" wicket:id="activation"/>
<i class="check-table-header-additional-icon fa fa-fw fa-exclamation-circle text-danger" wicket:id="errorIcon"></i>
<a class="check-table-header-show-more" wicket:id="errorLink">
<wicket:message key="AssignmentEditorPanel.showMore" />
</a>
<!-- <span class="check-table-header-description" wicket:id="activation"/>-->
<!-- <i class="check-table-header-additional-icon fa fa-fw fa-exclamation-circle text-danger" wicket:id="errorIcon"></i>-->
<!-- <a class="check-table-header-show-more" wicket:id="errorLink">-->
<!-- <wicket:message key="AssignmentEditorPanel.showMore" />-->
<!-- </a>-->
</div>
</div>
<div class="box-tools pull-right">
<button wicket:id="expand" class="btn btn-box-tool"><i class="fa fa-chevron-left"></i></button>
<button wicket:id="removeButton" class="btn-group btn btn-box-tool"><i class="fa fa-minus"></i></button>
<button wicket:id="expand" class="btn-group btn btn-box-tool"><i class="fa fa-chevron-left"></i></button>
</div>
</div>

Expand Down
85 changes: 53 additions & 32 deletions ...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
View file
Expand Up @@ -36,6 +36,7 @@
import com.evolveum.midpoint.util.logging.LoggingUtils;
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.DateInput;
import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
import com.evolveum.midpoint.web.component.input.RelationDropDownChoicePanel;
Expand All @@ -55,6 +56,7 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
Expand Down Expand Up @@ -93,9 +95,10 @@ public class AssignmentEditorPanel extends BasePanel<AssignmentEditorDto> {
private static final String ID_TYPE_IMAGE = "typeImage";
private static final String ID_NAME_LABEL = "nameLabel";
private static final String ID_NAME = "name";
private static final String ID_ACTIVATION = "activation";
// private static final String ID_ACTIVATION = "activation";
private static final String ID_ACTIVATION_BLOCK = "activationBlock";
private static final String ID_EXPAND = "expand";
private static final String ID_REMOVE_BUTTON = "removeButton";
protected static final String ID_BODY = "body";
private static final String ID_DESCRIPTION = "description";
private static final String ID_RELATION_CONTAINER = "relationContainer";
Expand All @@ -118,8 +121,8 @@ public class AssignmentEditorPanel extends BasePanel<AssignmentEditorDto> {
private static final String ID_TENANT_CHOOSER = "tenantRefChooser";
private static final String ID_CONTAINER_ORG_REF = "orgRefContainer";
private static final String ID_ORG_CHOOSER = "orgRefChooser";
private static final String ID_BUTTON_SHOW_MORE = "errorLink";
private static final String ID_ERROR_ICON = "errorIcon";
// private static final String ID_BUTTON_SHOW_MORE = "errorLink";
// private static final String ID_ERROR_ICON = "errorIcon";
private static final String ID_METADATA_CONTAINER = "metadataContainer";
private static final String ID_PROPERTY_CONTAINER = "propertyContainer";
private static final String ID_DESCRIPTION_CONTAINER = "descriptionContainer";
Expand Down Expand Up @@ -214,16 +217,16 @@ public boolean isVisible(){
typeImage.add(AttributeModifier.append("class", createImageTypeModel(getModel())));
headerRow.add(typeImage);

Label errorIcon = new Label(ID_ERROR_ICON);
errorIcon.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
return !isTargetValid();
}
});
headerRow.add(errorIcon);
// Label errorIcon = new Label(ID_ERROR_ICON);
// errorIcon.add(new VisibleEnableBehaviour() {
// private static final long serialVersionUID = 1L;
//
// @Override
// public boolean isVisible() {
// return !isTargetValid();
// }
// });
// headerRow.add(errorIcon);

AjaxLink<Void> name = new AjaxLink<Void>(ID_NAME) {
private static final long serialVersionUID = 1L;
Expand All @@ -235,30 +238,30 @@ public void onClick(AjaxRequestTarget target) {
};
headerRow.add(name);

AjaxLink<Void> errorLink = new AjaxLink<Void>(ID_BUTTON_SHOW_MORE) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
showErrorPerformed(target);
}
};
errorLink.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
return !isTargetValid();
}
});
headerRow.add(errorLink);
// AjaxLink<Void> errorLink = new AjaxLink<Void>(ID_BUTTON_SHOW_MORE) {
// private static final long serialVersionUID = 1L;
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// showErrorPerformed(target);
// }
// };
// errorLink.add(new VisibleEnableBehaviour() {
// private static final long serialVersionUID = 1L;
//
// @Override
// public boolean isVisible() {
// return !isTargetValid();
// }
// });
// headerRow.add(errorLink);

Label nameLabel = new Label(ID_NAME_LABEL, createAssignmentNameLabelModel(false));
nameLabel.setOutputMarkupId(true);
name.add(nameLabel);

Label activation = new Label(ID_ACTIVATION, AssignmentsUtil.createActivationTitleModel(getModel().getObject().getActivation(), "-", getPageBase()));
headerRow.add(activation);
// Label activation = new Label(ID_ACTIVATION, AssignmentsUtil.createActivationTitleModel(getModel().getObject().getActivation(), "-", getPageBase()));
// headerRow.add(activation);

ToggleIconButton<Void> expandButton = new ToggleIconButton<Void>(ID_EXPAND, GuiStyleConstants.CLASS_ICON_EXPAND,
GuiStyleConstants.CLASS_ICON_COLLAPSE) {
Expand All @@ -283,7 +286,20 @@ public boolean isVisible(){
return !getModel().getObject().isSimpleView();
}
});
expandButton.setOutputMarkupId(true);
headerRow.add(expandButton);

AjaxButton removeButton = new AjaxButton(ID_REMOVE_BUTTON) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
removeButtonClickPerformed(AssignmentEditorPanel.this.getModelObject(), target);
}
};
removeButton.add(AttributeAppender.append("title", getPageBase().createStringResource("AssignmentTablePanel.menu.unassign")));
removeButton.setOutputMarkupId(true);
headerRow.add(removeButton);
}

protected IModel<String> createAssignmentNameLabelModel(final boolean isManager) {
Expand Down Expand Up @@ -1165,4 +1181,9 @@ private ItemSecurityConstraints loadSecurityConstraints() {
return constraints;
}

protected void removeButtonClickPerformed(AssignmentEditorDto assignmentDto, AjaxRequestTarget target){
//Override if needed
}


}
5 changes: 5 additions & 0 deletions ...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
View file
Expand Up @@ -167,6 +167,11 @@ protected boolean isRelationEditable(){
return AssignmentTablePanel.this.isRelationEditable();
}

@Override
protected void removeButtonClickPerformed(AssignmentEditorDto assignmentDto, AjaxRequestTarget target){
deleteAssignmentPerformed(target, assignmentDto);
}

};
item.add(editor);

Expand Down

0 comments on commit 35025f7

Please sign in to comment.