-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:Evolveum/midpoint
- Loading branch information
Showing
19 changed files
with
617 additions
and
296 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
.../java/com/evolveum/midpoint/gui/impl/component/button/SelectableItemListPopoverPanel.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <!-- | ||
| ~ Copyright (c) 2021 Evolveum | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
| <wicket:panel xmlns:wicket="http://wicket.apache.org"> | ||
| <div wicket:id="popover"> | ||
| <div class="search-popover"> | ||
| <input wicket:id="searchText" type="text" class="form-control form-control-sm mt-1 mb-2" style="width: auto;" size="20"> | ||
|
|
||
| <dl class="border-bottom mb-2" wicket:id="itemList"> | ||
| <dt class="mb-1"> | ||
| <div wicket:id="itemsTitle" /> | ||
| </dt> | ||
| <dd wicket:id="items"> | ||
| <label> | ||
| <input wicket:id="itemCheckbox" type="checkbox"> | ||
| <a wicket:id="itemLink"><span wicket:id="itemName"/></a> | ||
| <i wicket:id="itemHelp"/> | ||
| </label> | ||
| </dd> | ||
| </dl> | ||
|
|
||
| <div class="mt-2 mb-1"> | ||
| <a wicket:id="addButton" class="btn btn-sm btn-success"/> | ||
| <a wicket:id="closeButton" class="btn btn-sm btn-default"/> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </wicket:panel> |
207 changes: 207 additions & 0 deletions
207
.../java/com/evolveum/midpoint/gui/impl/component/button/SelectableItemListPopoverPanel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,207 @@ | ||
| /* | ||
| * Copyright (c) 2022 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.gui.impl.component.button; | ||
|
|
||
| import com.evolveum.midpoint.gui.api.component.BasePanel; | ||
|
|
||
| import com.evolveum.midpoint.gui.api.util.WebComponentUtil; | ||
| import com.evolveum.midpoint.gui.impl.component.search.AbstractSearchItemWrapper; | ||
| import com.evolveum.midpoint.gui.impl.component.search.Popover; | ||
| import com.evolveum.midpoint.web.component.AjaxButton; | ||
| import com.evolveum.midpoint.web.component.util.SelectableRow; | ||
| import com.evolveum.midpoint.web.component.util.VisibleBehaviour; | ||
|
|
||
| import com.evolveum.midpoint.web.util.InfoTooltipBehavior; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.wicket.AttributeModifier; | ||
| import org.apache.wicket.Component; | ||
| import org.apache.wicket.ajax.AjaxRequestTarget; | ||
| import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; | ||
| import org.apache.wicket.ajax.markup.html.AjaxLink; | ||
| import org.apache.wicket.markup.html.WebMarkupContainer; | ||
| import org.apache.wicket.markup.html.basic.Label; | ||
| import org.apache.wicket.markup.html.form.CheckBox; | ||
| import org.apache.wicket.markup.html.form.TextField; | ||
| import org.apache.wicket.markup.html.list.ListItem; | ||
| import org.apache.wicket.markup.html.list.ListView; | ||
| import org.apache.wicket.model.IModel; | ||
| import org.apache.wicket.model.Model; | ||
| import org.apache.wicket.model.PropertyModel; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Popupable panel with listed items which can be searched and selected | ||
| * The component can be used as More button popup or saved searches popup on search panel | ||
| */ | ||
| public abstract class SelectableItemListPopoverPanel<T> extends BasePanel<List<T>> { | ||
|
|
||
| private static final String ID_POPOVER = "popover"; | ||
| private static final String ID_SEARCH_TEXT = "searchText"; | ||
| private static final String ID_ITEM_LIST = "itemList"; | ||
| private static final String ID_ITEMS_TITLE = "itemsTitle"; | ||
| private static final String ID_ITEMS = "items"; | ||
| private static final String ID_ITEM_CHECKBOX = "itemCheckbox"; | ||
| private static final String ID_ITEM_LINK = "itemLink"; | ||
| private static final String ID_ITEM_NAME = "itemName"; | ||
| private static final String ID_ITEM_HELP = "itemHelp"; | ||
| private static final String ID_ADD_BUTTON = "addButton"; | ||
| private static final String ID_CLOSE_BUTTON = "closeButton"; | ||
|
|
||
| public SelectableItemListPopoverPanel(String id, IModel<List<T>> popupItemModel) { | ||
| super(id, popupItemModel); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onInitialize() { | ||
| super.onInitialize(); | ||
| initLayout(); | ||
| } | ||
|
|
||
| private void initLayout() { | ||
| Popover popover = new Popover(ID_POPOVER); | ||
| add(popover); | ||
|
|
||
| final WebMarkupContainer propList = new WebMarkupContainer(ID_ITEM_LIST); | ||
| propList.setOutputMarkupId(true); | ||
| popover.add(propList); | ||
|
|
||
| Label itemsTitle = new Label(ID_ITEMS_TITLE, getPopoverTitleModel()); | ||
| itemsTitle.setOutputMarkupId(true); | ||
| itemsTitle.add(new VisibleBehaviour(() -> getPopoverTitleModel() != null)); | ||
| propList.add(itemsTitle); | ||
|
|
||
| IModel<String> searchTextModel = Model.of(""); | ||
| TextField<?> addText = new TextField<>(ID_SEARCH_TEXT, searchTextModel); | ||
| addText.add(WebComponentUtil.preventSubmitOnEnterKeyDownBehavior()); | ||
|
|
||
| popover.add(addText); | ||
| addText.add(new AjaxFormComponentUpdatingBehavior("keyup") { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Override | ||
| protected void onUpdate(AjaxRequestTarget target) { | ||
| target.add(propList); | ||
| } | ||
| }); | ||
| popover.add(addText); | ||
|
|
||
| ListView<T> properties = new ListView<>(ID_ITEMS, getModel()) { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Override | ||
| protected void populateItem(final ListItem<T> item) { | ||
| CheckBox check = new CheckBox(ID_ITEM_CHECKBOX, | ||
| new PropertyModel<>(item.getModel(), AbstractSearchItemWrapper.F_SELECTED)); | ||
| check.add(new AjaxFormComponentUpdatingBehavior("change") { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Override | ||
| protected void onUpdate(AjaxRequestTarget target) { | ||
| //nothing, just update model. | ||
| } | ||
| }); | ||
| check.add(new VisibleBehaviour(() -> (item.getModelObject() instanceof SelectableRow))); | ||
| item.add(check); | ||
|
|
||
| AjaxLink<Void> propLink = new AjaxLink<Void>(ID_ITEM_LINK) { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Override | ||
| public void onClick(AjaxRequestTarget target) { | ||
| if (item.getModelObject() instanceof SelectableRow) { | ||
| ((SelectableRow) item.getModelObject()).setSelected(true); | ||
| } | ||
| addItemsPerformed(Arrays.asList(item.getModelObject()), target); | ||
| } | ||
| }; | ||
| item.add(propLink); | ||
|
|
||
| Label name = new Label(ID_ITEM_NAME, getItemName(item.getModelObject())); | ||
| name.setRenderBodyOnly(true); | ||
| propLink.add(name); | ||
|
|
||
| Label help = new Label(ID_ITEM_HELP); | ||
| String helpText = getItemHelp(item.getModelObject()) != null ? getItemHelp(item.getModelObject()) : ""; | ||
| help.add(AttributeModifier.replace("title", createStringResource(helpText))); | ||
| help.add(new InfoTooltipBehavior() { | ||
| @Override | ||
| public String getDataPlacement() { | ||
| return "left"; | ||
| } | ||
| }); | ||
| help.add(new VisibleBehaviour(() -> StringUtils.isNotEmpty(helpText))); | ||
| item.add(help); | ||
|
|
||
| item.add(new VisibleBehaviour(() -> isPropertyItemVisible(getItemName(item.getModelObject()), searchTextModel.getObject()))); | ||
| } | ||
|
|
||
| private boolean isPropertyItemVisible(String itemName, String propertySearchText) { | ||
| String name = itemName != null ? createStringResource(itemName).getString() : ""; | ||
| return StringUtils.isEmpty(propertySearchText) | ||
| || name.toLowerCase().contains(propertySearchText.toLowerCase()); | ||
| } | ||
| }; | ||
| propList.add(properties); | ||
|
|
||
| AjaxButton add = new AjaxButton(ID_ADD_BUTTON, createStringResource("SearchPanel.add")) { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Override | ||
| public void onClick(AjaxRequestTarget target) { | ||
| addItemsPerformed(getSelectedItemList(), target); | ||
| } | ||
| }; | ||
| popover.add(add); | ||
|
|
||
| AjaxButton close = new AjaxButton(ID_CLOSE_BUTTON, createStringResource("SearchPanel.close")) { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Override | ||
| public void onClick(AjaxRequestTarget target) { | ||
| closeMorePopoverPerformed(target); | ||
| } | ||
| }; | ||
| popover.add(close); | ||
|
|
||
| popover.setReference(getPopoverReferenceComponent()); | ||
| } | ||
|
|
||
| protected abstract void addItemsPerformed(List<T> item, AjaxRequestTarget target); | ||
|
|
||
| protected abstract Component getPopoverReferenceComponent(); | ||
|
|
||
| protected abstract String getItemName(T item); | ||
|
|
||
| protected abstract String getItemHelp(T item); | ||
|
|
||
| private void closeMorePopoverPerformed(AjaxRequestTarget target) { | ||
| String popoverId = get(ID_POPOVER).getMarkupId(); | ||
| target.appendJavaScript("$('#" + popoverId + "').toggle();"); | ||
| } | ||
|
|
||
| private List<T> getSelectedItemList() { | ||
| return getModelObject().stream().filter(item -> (item instanceof SelectableRow)) | ||
| .filter(item -> ((SelectableRow)item).isSelected()).collect(Collectors.toList()); | ||
| } | ||
|
|
||
| protected IModel<String> getPopoverTitleModel() { | ||
| return null; | ||
| } | ||
|
|
||
| public void togglePopover(AjaxRequestTarget target) { | ||
| ((Popover) get(ID_POPOVER)).toggle(target); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
...a/com/evolveum/midpoint/gui/impl/component/data/column/CompositedIconWithLabelColumn.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Copyright (C) 2022 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.gui.impl.component.data.column; | ||
|
|
||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.DisplayType; | ||
|
|
||
| import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; | ||
| import org.apache.wicket.markup.repeater.Item; | ||
| import org.apache.wicket.model.IModel; | ||
| import org.apache.wicket.model.Model; | ||
|
|
||
| public abstract class CompositedIconWithLabelColumn<T> extends CompositedIconColumn<T> { | ||
|
|
||
| public CompositedIconWithLabelColumn(IModel<String> displayModel) { | ||
| super(displayModel); | ||
| } | ||
|
|
||
| @Override | ||
| public void populateItem(Item<ICellPopulator<T>> cellItem, String componentId, IModel<T> rowModel) { | ||
| cellItem.add(new CompositedIconWithLabelPanel(componentId, Model.of(getCompositedIcon(rowModel)), getLabelDisplayModel(rowModel))); | ||
| } | ||
|
|
||
| public abstract IModel<DisplayType> getLabelDisplayModel(IModel<T> rowModel); | ||
|
|
||
| } |
13 changes: 13 additions & 0 deletions
13
...va/com/evolveum/midpoint/gui/impl/component/data/column/CompositedIconWithLabelPanel.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <!-- | ||
| ~ Copyright (c) 2022 Evolveum | ||
| ~ | ||
| ~ This work is dual-licensed under the Apache License 2.0 | ||
| ~ and European Union Public License. See LICENSE file for details. | ||
| --> | ||
|
|
||
| <!DOCTYPE html> | ||
| <html xmlns:wicket="http://wicket.apache.org"> | ||
| <wicket:extend> | ||
| <div wicket:id="label" /> | ||
| </wicket:extend> | ||
| </html> |
53 changes: 53 additions & 0 deletions
53
...va/com/evolveum/midpoint/gui/impl/component/data/column/CompositedIconWithLabelPanel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Copyright (C) 2022 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.gui.impl.component.data.column; | ||
|
|
||
| import com.evolveum.midpoint.gui.api.util.WebComponentUtil; | ||
| import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon; | ||
|
|
||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.DisplayType; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.wicket.behavior.AttributeAppender; | ||
| import org.apache.wicket.markup.html.basic.Label; | ||
| import org.apache.wicket.model.IModel; | ||
|
|
||
| public class CompositedIconWithLabelPanel extends CompositedIconPanel { | ||
|
|
||
| private static final String ID_LABEL = "label"; | ||
|
|
||
| private IModel<DisplayType> labelDisplayModel; | ||
|
|
||
| public CompositedIconWithLabelPanel(String id, IModel<CompositedIcon> compositedIcon, IModel<DisplayType> labelDisplayModel) { | ||
| super(id, compositedIcon); | ||
| this.labelDisplayModel = labelDisplayModel; | ||
| } | ||
|
|
||
| protected void onInitialize() { | ||
| super.onInitialize(); | ||
| initLayout(); | ||
| } | ||
|
|
||
| private void initLayout() { | ||
| Label label = new Label(ID_LABEL, getLabel()); | ||
| if (StringUtils.isNotEmpty(getLabelColor())) { | ||
| label.add(AttributeAppender.append("style", "color: " + getLabelColor())); | ||
| } | ||
| label.setOutputMarkupId(true); | ||
| add(label); | ||
| } | ||
|
|
||
| private String getLabel() { | ||
| return labelDisplayModel != null && labelDisplayModel.getObject() != null && labelDisplayModel.getObject().getLabel() != null ? | ||
| WebComponentUtil.getTranslatedPolyString(labelDisplayModel.getObject().getLabel()) : ""; | ||
| } | ||
|
|
||
| private String getLabelColor() { | ||
| return labelDisplayModel != null && labelDisplayModel.getObject() != null && labelDisplayModel.getObject().getColor() != null ? | ||
| labelDisplayModel.getObject().getColor() : ""; | ||
| } | ||
| } |
Oops, something went wrong.