You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2024/06/21 12:12:30 UTC
(causeway) branch 3794.table.pagesize.sel updated (bdf6a88339 -> b770670bda)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch 3794.table.pagesize.sel
in repository https://gitbox.apache.org/repos/asf/causeway.git
from bdf6a88339 CAUSEWAY-3794: more encapsulation; also renaming encapsulated classes
new cc5cc78db1 CAUSEWAY-3794: make Wkt#addIfElseHide more broadly usable
new 9ca4e2405d CAUSEWAY-3794: separate out table hinting concerns
add 29083f4252 CAUSEWAY-3792: fixes internal 'long' parsing
new 379d0a6f83 Merge remote-tracking branch 'origin/master' into 3794.table.pagesize.sel
new b770670bda CAUSEWAY-3794: renames component id as well (build fix)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/internal/primitives/_Longs.java | 18 ++---
.../CollectionContentsAsAjaxTablePanel.html | 2 +-
.../ui/components/table/CausewayAjaxDataTable.java | 59 +-------------
.../table/DataTableWithPagesAndFilter.java | 91 +++++++++++++++++-----
.../apache/causeway/viewer/wicket/ui/util/Wkt.java | 24 +++---
5 files changed, 97 insertions(+), 97 deletions(-)
(causeway) 02/04: CAUSEWAY-3794: separate out table hinting concerns
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 3794.table.pagesize.sel
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 9ca4e2405df576636862f20ceb4fb258e11641e5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 21 14:01:38 2024 +0200
CAUSEWAY-3794: separate out table hinting concerns
---
.../ui/components/table/CausewayAjaxDataTable.java | 59 +-------------
.../table/DataTableWithPagesAndFilter.java | 91 +++++++++++++++++-----
2 files changed, 72 insertions(+), 78 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/CausewayAjaxDataTable.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/CausewayAjaxDataTable.java
index 1ce867f143..83760b000f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/CausewayAjaxDataTable.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/table/CausewayAjaxDataTable.java
@@ -20,9 +20,6 @@ package org.apache.causeway.viewer.wicket.ui.components.table;
import java.util.List;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
import org.apache.wicket.markup.repeater.Item;
@@ -32,8 +29,6 @@ import org.apache.wicket.model.IModel;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.tabular.DataRow;
-import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsSortableDataProvider;
import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ToggleboxColumn;
import org.apache.causeway.viewer.wicket.ui.components.table.head.CausewayAjaxHeadersToolbar;
@@ -43,12 +38,10 @@ import org.apache.causeway.viewer.wicket.ui.util.Wkt;
import lombok.val;
-public class CausewayAjaxDataTable extends DataTable<DataRow, String> {
+public class CausewayAjaxDataTable extends DataTableWithPagesAndFilter<DataRow, String> {
private static final long serialVersionUID = 1L;
- static final String UIHINT_PAGE_NUMBER = "pageNumber";
-
private final CollectionContentsSortableDataProvider dataProvider;
private final ToggleboxColumn toggleboxColumn;
@@ -61,38 +54,13 @@ public class CausewayAjaxDataTable extends DataTable<DataRow, String> {
final CollectionContentsSortableDataProvider dataProvider,
final int rowsPerPage,
final ToggleboxColumn toggleboxColumn) {
-
super(id, columns, dataProvider, rowsPerPage);
this.dataProvider = dataProvider;
this.toggleboxColumn = toggleboxColumn;
- setOutputMarkupId(true);
- setVersioned(false);
//[CAUSEWAY-3772] optimization reinstate? though I have no clue what that is doing
//setItemReuseStrategy((IItemReuseStrategy & Serializable) CausewayAjaxDataTable::itemReuseStrategyWithCast);
}
- public void setPageNumberHintAndBroadcast(final AjaxRequestTarget target) {
- final UiHintContainer uiHintContainer = getUiHintContainer();
- if(uiHintContainer == null) {
- return;
- }
- uiHintContainer.setHint(this, CausewayAjaxDataTable.UIHINT_PAGE_NUMBER, ""+getCurrentPage());
- }
-
- public void setSortOrderHintAndBroadcast(final SortOrder order, final String property, final AjaxRequestTarget target) {
- final UiHintContainer uiHintContainer = getUiHintContainer();
- if(uiHintContainer == null) {
- return;
- }
-
- // first clear all SortOrder hints...
- for (SortOrder eachSortOrder : SortOrder.values()) {
- uiHintContainer.clearHint(this, eachSortOrder.name());
- }
- // .. then set this one
- uiHintContainer.setHint(this, order.name(), property);
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
@@ -197,29 +165,4 @@ public class CausewayAjaxDataTable extends DataTable<DataRow, String> {
honourPageNumberHint();
}
- private void honourPageNumberHint() {
- UiHintContainer uiHintContainer = getUiHintContainer();
- if(uiHintContainer == null) {
- return;
- }
- final String pageNumberStr = uiHintContainer.getHint(this, UIHINT_PAGE_NUMBER);
- if(pageNumberStr != null) {
- try {
- long pageNumber = Long.parseLong(pageNumberStr);
- if(pageNumber >= 0) {
- // dataTable is clever enough to deal with too-large numbers
- this.setCurrentPage(pageNumber);
- }
- } catch(Exception ex) {
- // ignore.
- }
- }
- uiHintContainer.setHint(this, UIHINT_PAGE_NUMBER, ""+getCurrentPage());
- // don't broadcast (no AjaxRequestTarget, still configuring initial setup)
- }
-
- private UiHintContainer getUiHintContainer() {
- return UiHintContainer.Util.hintContainerOf(this, UiObjectWkt.class);
- }
-
}
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 32da0cf7d9..d14fb81642 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
@@ -1,41 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.causeway.viewer.wicket.ui.components.table;
import java.util.List;
+import java.util.OptionalLong;
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxNavigationToolbar;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.OddEvenItem;
-import org.apache.wicket.model.IModel;
+
+import org.apache.causeway.commons.internal.primitives._Longs;
+import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
+import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
public abstract class DataTableWithPagesAndFilter<T, S> extends DataTable<T, S> {
private static final long serialVersionUID = 1L;
- public DataTableWithPagesAndFilter(final String id, final List<? extends IColumn<T, S>> columns,
- final ISortableDataProvider<T, S> dataProvider, final int rowsPerPage) {
+ private static final String UIHINT_PAGE_NUMBER = "pageNumber";
+
+ public DataTableWithPagesAndFilter(
+ final String id,
+ final List<? extends IColumn<T, S>> columns,
+ final ISortableDataProvider<T, S> dataProvider,
+ final int rowsPerPage) {
super(id, columns, dataProvider, rowsPerPage);
setOutputMarkupId(true);
setVersioned(false);
- addToolBars(dataProvider);
}
- /**
- * Factory method for toolbars
- * @param dataProvider {@link org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider}
- */
- protected void addToolBars(final ISortableDataProvider<T, S> dataProvider) {
- addTopToolbar(new AjaxNavigationToolbar(this));
- addTopToolbar(new AjaxFallbackHeadersToolbar<>(this, dataProvider));
- addBottomToolbar(new NoRecordsToolbar(this));
+ public final void setSortOrderHintAndBroadcast(final SortOrder order, final String property, final AjaxRequestTarget target) {
+ final UiHintContainer uiHintContainer = getUiHintContainer();
+ if(uiHintContainer == null) return;
+
+ // first clear all SortOrder hints...
+ for (SortOrder eachSortOrder : SortOrder.values()) {
+ uiHintContainer.clearHint(this, eachSortOrder.name());
+ }
+ // .. then set this one
+ uiHintContainer.setHint(this, order.name(), property);
+ }
+
+ public final void setPageNumberHintAndBroadcast(final AjaxRequestTarget target) {
+ final UiHintContainer uiHintContainer = getUiHintContainer();
+ if(uiHintContainer == null) {
+ return;
+ }
+ uiHintContainer.setHint(this, UIHINT_PAGE_NUMBER, "" + getCurrentPage());
+ }
+
+ //TODO[CAUSEWAY-3794] encapsulate
+ protected final void honourPageNumberHint() {
+ var uiHintContainer = getUiHintContainer();
+ if(uiHintContainer == null) return;
+ parseZeroBasedPageNr(uiHintContainer.getHint(this, UIHINT_PAGE_NUMBER))
+ .ifPresent(this::setCurrentPage);
+ uiHintContainer.setHint(this, UIHINT_PAGE_NUMBER, "" + getCurrentPage());
+ // don't broadcast (no AjaxRequestTarget, still configuring initial setup)
+ }
+
+ // -- HELPER
+
+ private UiHintContainer getUiHintContainer() {
+ return UiHintContainer.Util.hintContainerOf(this, UiObjectWkt.class);
}
- @Override
- protected Item<T> newRowItem(final String id, final int index, final IModel<T> model) {
- return new OddEvenItem<>(id, index, model);
+ private OptionalLong parseZeroBasedPageNr(final String string) {
+ final long zeroBasedPageNr = _Longs.parseLong(string, 10).orElse(-1);
+ return zeroBasedPageNr>=0L
+ ? OptionalLong.of(zeroBasedPageNr)
+ : OptionalLong.empty();
}
}
(causeway) 01/04: CAUSEWAY-3794: make Wkt#addIfElseHide more broadly usable
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 3794.table.pagesize.sel
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit cc5cc78db1a4f61a7f776c04388a397655d21a36
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 21 13:23:48 2024 +0200
CAUSEWAY-3794: make Wkt#addIfElseHide more broadly usable
---
.../apache/causeway/viewer/wicket/ui/util/Wkt.java | 24 ++++++++++++++--------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
index 201623639f..c2a48166e0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
@@ -140,12 +140,14 @@ import de.agilecoders.wicket.jquery.Key;
@UtilityClass
public class Wkt {
- public <T extends Component> T add(final MarkupContainer container, final T component) {
+ public <T extends Component> T add(final @NonNull MarkupContainer container, final @Nullable T component) {
+ if(component==null) return null;
container.addOrReplace((Component)component);
return component;
}
- public <T extends Behavior> T add(final Component component, final T behavior) {
+ public <T extends Behavior> T add(final @NonNull Component component, final @Nullable T behavior) {
+ if(behavior==null) return null;
component.add((Behavior)behavior);
return behavior;
}
@@ -154,18 +156,22 @@ public class Wkt {
* If condition is true, adds a new {@link Component} to the {@link MarkupContainer},
* using given componentFactory. Otherwise permanently hide the corresponding tag
* that is mapped by given id.
+ * <p>
+ * Regardless, if given componentFactory is null or returns null, the tag is hidden as well.
*/
public <T extends Component> Optional<T> addIfElseHide(
final boolean condition,
final @NonNull MarkupContainer container,
final @NonNull String id,
- final @NonNull Function<String, T> componentFactory) {
- if(condition) {
- return Optional.ofNullable(add(container, componentFactory.apply(id)));
- }
- WktComponents.permanentlyHide(container, id);
- return Optional.empty();
-
+ final @Nullable Function<String, T> componentFactory) {
+ final Optional<T> componentOpt = condition
+ ? Optional.ofNullable(componentFactory)
+ .map(factory->factory.apply(id))
+ : Optional.empty();
+ componentOpt.ifPresentOrElse(
+ component->add(container, component),
+ ()->WktComponents.permanentlyHide(container, id));
+ return componentOpt;
}
// -- AJAX ENABLER
(causeway) 03/04: Merge remote-tracking branch 'origin/master' into 3794.table.pagesize.sel
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 3794.table.pagesize.sel
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 379d0a6f83732a8c23ed2720913ceecd8cf7066b
Merge: 9ca4e2405d 29083f4252
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 21 14:08:18 2024 +0200
Merge remote-tracking branch 'origin/master' into 3794.table.pagesize.sel
.../causeway/commons/internal/primitives/_Longs.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
(causeway) 04/04: CAUSEWAY-3794: renames component id as well (build fix)
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 3794.table.pagesize.sel
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit b770670bdadf6b73beb14b3325e87bee22235afb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 21 14:12:26 2024 +0200
CAUSEWAY-3794: renames component id as well (build fix)
---
.../ajaxtable/CollectionContentsAsAjaxTablePanel.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
index 86321771dd..f4fe72d832 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.html
@@ -23,7 +23,7 @@
<div class="collectionContentsAsAjaxTablePanel collectionContentsComponentType">
<div class="clearfix"></div>
- <div wicket:id="table-search-bar"/>
+ <div wicket:id="table-filter-bar"/>
<div class="table-responsive">
<table class="contents table table-striped table-sm table-hover table-bordered" cellspacing="0"