Skip to content

Commit

Permalink
MID-8615 Switching query type, click now works anywhere on highlighte…
Browse files Browse the repository at this point in the history 
…d line
  • Loading branch information
@1azyman
1azyman committed Apr 5, 2023
1 parent 7e1dd78 commit c18eb36
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 82 deletions.
6 changes: 3 additions & 3 deletions ...a/com/evolveum/midpoint/gui/impl/component/search/panel/SearchButtonWithDropdownMenu.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<span class="sr-only"><wicket:message key="SplitButtonDropDown.toggle"/></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li wicket:id="menuItems">
<div class="dropdown-item d-flex justify-content-between align-items-center" wicket:id="menuItem"/>
</li>
<wicket:container wicket:id="menuItems">
<a class="dropdown-item" wicket:id="menuItem"/>
</wicket:container>
</ul>
</div>
</wicket:panel>
86 changes: 7 additions & 79 deletions ...a/com/evolveum/midpoint/gui/impl/component/search/panel/SearchButtonWithDropdownMenu.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,10 @@
*/
package com.evolveum.midpoint.gui.impl.component.search.panel;

import com.evolveum.midpoint.gui.api.component.BasePanel;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.data.column.AjaxLinkPanel;

import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import java.util.List;

import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.list.ListItem;
Expand All @@ -24,7 +19,9 @@
import org.apache.wicket.model.Model;
import org.jetbrains.annotations.NotNull;

import java.util.List;
import com.evolveum.midpoint.gui.api.component.BasePanel;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;

public abstract class SearchButtonWithDropdownMenu<E extends Enum> extends BasePanel<List<E>> {
private static final long serialVersionUID = 1L;
Expand All @@ -37,7 +34,7 @@ public abstract class SearchButtonWithDropdownMenu<E extends Enum> extends BaseP

// E selectedValue = null;

private IModel<E> mode;
private final IModel<E> mode;

public SearchButtonWithDropdownMenu(String id, @NotNull IModel<List<E>> menuItemsModel, IModel<E> defaultValue) {
super(id, menuItemsModel);
Expand All @@ -57,7 +54,7 @@ private void initLayout() {

@Override
protected void onError(AjaxRequestTarget target) {
Form form = SearchButtonWithDropdownMenu.this.findParent(Form.class);
Form<?> form = SearchButtonWithDropdownMenu.this.findParent(Form.class);
if (form != null) {
target.add(form);
} else {
Expand Down Expand Up @@ -97,7 +94,7 @@ public void onClick(AjaxRequestTarget target) {

@Override
protected void populateItem(ListItem<E> item) {
AjaxLinkPanel ajaxLinkPanel = new AjaxLinkPanel(ID_MENU_ITEM, createStringResource(item.getModelObject())) {
AjaxButton ajaxLinkPanel = new AjaxButton(ID_MENU_ITEM, createStringResource(item.getModelObject())) {

@Override
public void onClick(AjaxRequestTarget target) {
Expand All @@ -109,86 +106,17 @@ public void onClick(AjaxRequestTarget target) {
};

item.add(ajaxLinkPanel);

// InlineMenuItem searchItem = new InlineMenuItem(createStringResource(item.getModelObject())) {
// private static final long serialVersionUID = 1L;
//
// @Override
// public InlineMenuItemAction initAction() {
// return new InlineMenuItemAction() {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// target.add(getSearchButton());
// mode = item;
// menuItemSelected(target, item);
// }
// };
// }
//
// @Override
// public IModel<Boolean> getVisible() {
// return isMenuItemVisible(item);
// }
// }
//
// WebMarkupContainer menuItemBody = new MenuLinkPanel(ID_MENU_ITEM, searchItem);
// menuItemBody.setRenderBodyOnly(true);
// item.add(menuItemBody);
// menuItemBody.add(new VisibleEnableBehaviour() {
// @Override
// public boolean isVisible() {
// return Boolean.TRUE.equals(item.getModelObject().getVisible().getObject());
// }
// });
}
};
menuItems.setOutputMarkupId(true);
add(menuItems);

}

// public void setSelectedValue(E newValue) {
// selectedValue = newValue;
// }

protected VisibleEnableBehaviour getSearchButtonVisibleEnableBehavior() {
return new VisibleEnableBehaviour();
}

// private IModel<List<InlineMenuItem>> createMenuItemsModel() {
// List<InlineMenuItem> menuItems = new ArrayList<>();
// getModelObject().forEach(item -> {
// InlineMenuItem searchItem = new InlineMenuItem(createStringResource(item)) {
// private static final long serialVersionUID = 1L;
//
// @Override
// public InlineMenuItemAction initAction() {
// return new InlineMenuItemAction() {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// target.add(getSearchButton());
// mode = item;
// menuItemSelected(target, item);
// }
// };
// }
//
// @Override
// public IModel<Boolean> getVisible() {
// return isMenuItemVisible(item);
// }
// };
// menuItems.add(searchItem);
// });
// return Model.ofList(menuItems);
// }

public AjaxSubmitLink getSearchButton() {
return (AjaxSubmitLink) get(ID_SEARCH_BUTTON);
}
Expand Down

0 comments on commit c18eb36

Please sign in to comment.