From e749242ad6d9d5e2704a94b1d4b243d362222803 Mon Sep 17 00:00:00 2001 From: Andi Huber Date: Tue, 26 Nov 2024 10:27:06 +0100 Subject: [PATCH] CAUSEWAY-3833: polishing prev. commits (renaming) --- .../tableoption/SelectOperationChoice.java | 9 ++++++++- .../tableoption/SelectOperationChoiceKey.java | 9 +++++++++ .../ajaxtable/columns/ToggleboxColumn.java | 4 ++-- .../table/DataTableWithPagesAndFilter.java | 4 ++-- .../SelectOperationChooser.html} | 8 ++++---- .../SelectOperationChooser.java} | 20 +++++++++---------- 6 files changed, 35 insertions(+), 19 deletions(-) rename viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/{pageact/PageActionChooser.html => selop/SelectOperationChooser.html} (86%) rename viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/{pageact/PageActionChooser.java => selop/SelectOperationChooser.java} (81%) diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/tableoption/SelectOperationChoice.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/tableoption/SelectOperationChoice.java index 34e8afb3b96..e2e17880f56 100644 --- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/tableoption/SelectOperationChoice.java +++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/tableoption/SelectOperationChoice.java @@ -27,5 +27,12 @@ public record SelectOperationChoice( SelectOperationChoiceKey key, String translatedTitle, String cssClass) -implements Serializable{ +implements Serializable { + + public SelectOperationChoice( + final SelectOperationChoiceKey key, + final String translatedTitle) { + this(key, translatedTitle, ""); + } + } \ No newline at end of file diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/tableoption/SelectOperationChoiceKey.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/tableoption/SelectOperationChoiceKey.java index d3a6afdf726..3938408954e 100644 --- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/tableoption/SelectOperationChoiceKey.java +++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/tableoption/SelectOperationChoiceKey.java @@ -18,6 +18,8 @@ */ package org.apache.causeway.viewer.wicket.model.tableoption; +import java.util.function.Predicate; + import lombok.RequiredArgsConstructor; /** @@ -38,4 +40,11 @@ public boolean isPageSpecific() { return this==PAGE_SEL || this == PAGE_UNSEL; } + + public static Predicate isAvailableWhen(final boolean isTablePaged) { + return (final SelectOperationChoiceKey key)->isTablePaged + ? true + : !key.isPageSpecific(); + } + } \ No newline at end of file diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ToggleboxColumn.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ToggleboxColumn.java index 11cd2a4b624..bad1212cd37 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ToggleboxColumn.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ToggleboxColumn.java @@ -27,7 +27,7 @@ import org.apache.causeway.viewer.wicket.model.models.interaction.coll.DataRowToggleWkt; import org.apache.causeway.viewer.wicket.model.models.interaction.coll.DataRowWkt; import org.apache.causeway.viewer.wicket.ui.components.table.DataTableWithPagesAndFilter; -import org.apache.causeway.viewer.wicket.ui.components.table.nav.pageact.PageActionChooser; +import org.apache.causeway.viewer.wicket.ui.components.table.nav.selop.SelectOperationChooser; import org.apache.causeway.viewer.wicket.ui.components.widgets.checkbox.ContainedToggleboxPanel; import org.apache.causeway.viewer.wicket.ui.util.Wkt; @@ -60,7 +60,7 @@ protected Component createCellComponent(final String componentId, final DataRowW @Override public Component getHeader(final String componentId) { - var pageActionChooser = new PageActionChooser(componentId, table); + var pageActionChooser = new SelectOperationChooser(componentId, table); Wkt.cssAppend(pageActionChooser, "togglebox-column"); return pageActionChooser; } diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/DataTableWithPagesAndFilter.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/DataTableWithPagesAndFilter.java index 3b481249b93..7753ed5782f 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/DataTableWithPagesAndFilter.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/DataTableWithPagesAndFilter.java @@ -184,8 +184,8 @@ public List getPagesizeChoices() { public List getSelectOperationChoices() { return isRowSelectionEnabled() ? Stream.of(SelectOperationChoiceKey.values()) - .filter(key->isPaged() ? true : !key.isPageSpecific()) - .map(key->new SelectOperationChoice(key, translate(key.englishTitle), "")) + .filter(SelectOperationChoiceKey.isAvailableWhen(isPaged())) + .map(key->new SelectOperationChoice(key, translate(key.englishTitle))) .toList() : Collections.emptyList(); } diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/pageact/PageActionChooser.html b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/selop/SelectOperationChooser.html similarity index 86% rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/pageact/PageActionChooser.html rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/selop/SelectOperationChooser.html index f40c77d10c6..c750cc792a6 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/pageact/PageActionChooser.html +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/selop/SelectOperationChooser.html @@ -21,7 +21,7 @@
- diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/pageact/PageActionChooser.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/selop/SelectOperationChooser.java similarity index 81% rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/pageact/PageActionChooser.java rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/selop/SelectOperationChooser.java index 706dc7e1129..94d3b94bcd9 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/pageact/PageActionChooser.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/nav/selop/SelectOperationChooser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.causeway.viewer.wicket.ui.components.table.nav.pageact; +package org.apache.causeway.viewer.wicket.ui.components.table.nav.selop; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.list.ListItem; @@ -35,19 +35,19 @@ import lombok.Getter; import lombok.NonNull; -public class PageActionChooser extends Panel { +public class SelectOperationChooser extends Panel { private static final long serialVersionUID = 1L; - private static final String ID_PAGE_ACTION_BUTTON = "pageActionButton"; - private static final String ID_PAGE_ACTION_CHOICE = "pageActionChoice"; - private static final String ID_PAGE_ACTION_CHOICES = "pageActionChoices"; + private static final String ID_SELECT_OPERATION_BUTTON = "selectOperationButton"; + private static final String ID_SELECT_OPERATION_CHOICE = "selectOperationChoice"; + private static final String ID_SELECT_OPERATION_CHOICES = "selectOperationChoices"; private static final String ID_VIEW_ITEM_TITLE = "viewItemTitle"; private static final String ID_VIEW_ITEM_ICON = "viewItemIcon"; @Getter final DataTableWithPagesAndFilter table; - public PageActionChooser(final String id, final DataTableWithPagesAndFilter table) { + public SelectOperationChooser(final String id, final DataTableWithPagesAndFilter table) { super(id); this.table = table; } @@ -64,10 +64,10 @@ private void buildGui() { var selectOperationChoices = table.getSelectOperationChoices(); - var button = Wkt.add(this, new Button(ID_PAGE_ACTION_BUTTON)); + var button = Wkt.add(this, new Button(ID_SELECT_OPERATION_BUTTON)); - Wkt.listViewAdd(this, ID_PAGE_ACTION_CHOICES, selectOperationChoices, item->{ - var link = Wkt.linkAdd(item, ID_PAGE_ACTION_CHOICE, target->{ + Wkt.listViewAdd(this, ID_SELECT_OPERATION_CHOICES, selectOperationChoices, item->{ + var link = Wkt.linkAdd(item, ID_SELECT_OPERATION_CHOICE, target->{ var selectActionChoice = item.getModelObject(); table.executeSelectOperation(selectActionChoice); target.add(table); @@ -82,7 +82,7 @@ private void buildGui() { if(selectOperationChoices.isEmpty()) { this.setVisible(false); } else { - WktTooltips.addTooltip(button, translate("Select actions")); + WktTooltips.addTooltip(button, translate("Select operations")); } }