Tempus-Dominus v6 is added (#1002)

* Tempus-Dominus v6 is added * Build should be fixed * Code clean-up * Consumers are added to config; Example page is improved * Dates are being validated onChange * Jar-based localization seems to be loaded * OnChangeAjaxBehavior seems to work * Code comment is added * Validation errors are being displayed * tempus-dominus-v5 is marked as deprecated; code clean-up * Non bundled bootstrap 5.3.2 version is used * Code related to OnChangeBehavior is simplified * Comments are addressed (cherry picked from commit a10a7f7)
martin-g · Oct 9, 2023 · afff884 · afff884
1 parent 618ddc0
commit afff884
Show file tree

Hide file tree

Showing 34 changed files with 2,714 additions and 2,119 deletions.
diff --git a/bootstrap-core/pom.xml b/bootstrap-core/pom.xml
@@ -37,6 +37,10 @@
             <groupId>org.webjars</groupId>
             <artifactId>bootstrap</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.webjars.npm</groupId>
+            <artifactId>popperjs__core</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.webjars</groupId>

diff --git a/.../java/de/agilecoders/wicket/core/markup/html/references/BootstrapJavaScriptReference.java b/.../java/de/agilecoders/wicket/core/markup/html/references/BootstrapJavaScriptReference.java
@@ -1,5 +1,12 @@
 package de.agilecoders.wicket.core.markup.html.references;
 
+import java.util.List;
+
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import de.agilecoders.wicket.core.Bootstrap;
+import de.agilecoders.wicket.core.util.Dependencies;
 import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
 
 /**
@@ -31,6 +38,12 @@ public static BootstrapJavaScriptReference instance() {
      * Private constructor.
      */
     private BootstrapJavaScriptReference() {
-        super("/bootstrap/current/js/bootstrap.bundle.js");
+        super("/bootstrap/current/js/bootstrap.js");
+    }
+
+    @Override
+    public List<HeaderItem> getDependencies() {
+        return Dependencies.combine(super.getDependencies(),
+                JavaScriptHeaderItem.forReference(Bootstrap.getSettings().getPopperJsResourceReference()));
     }
 }
diff --git a/...ain/java/de/agilecoders/wicket/core/markup/html/references/PopperJavaScriptReference.java b/...ain/java/de/agilecoders/wicket/core/markup/html/references/PopperJavaScriptReference.java
@@ -0,0 +1,32 @@
+package de.agilecoders.wicket.core.markup.html.references;
+
+import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
+
+/**
+ * Represents Popper.js library.
+ */
+public class PopperJavaScriptReference extends WebjarsJavaScriptResourceReference {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Singleton instance of this reference
+     */
+    private static final class Holder {
+        private static final PopperJavaScriptReference INSTANCE = new PopperJavaScriptReference();
+    }
+
+    /**
+     * Private constructor.
+     */
+    private PopperJavaScriptReference() {
+        super("popperjs__core/current/dist/umd/popper.js");
+    }
+
+    /**
+     *
+     * @return the single instance of the resource reference
+     */
+    public static PopperJavaScriptReference instance() {
+        return Holder.INSTANCE;
+    }
+}
diff --git a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/settings/BootstrapSettings.java b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/settings/BootstrapSettings.java
@@ -7,6 +7,7 @@
 
 import de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptReference;
 import de.agilecoders.wicket.core.markup.html.references.ModernizrJavaScriptReference;
+import de.agilecoders.wicket.core.markup.html.references.PopperJavaScriptReference;
 import de.agilecoders.wicket.core.markup.html.themes.bootstrap.BootstrapCssReference;
 import de.agilecoders.wicket.core.markup.html.themes.bootstrap.BootstrapCssRtlReference;
 
@@ -25,12 +26,14 @@ private static final class Holder {
         private static ResourceReference modernizrJavaScriptReference = ModernizrJavaScriptReference.instance();
         private static ResourceReference bootstrapCssReference = BootstrapCssReference.instance();
         private static ResourceReference bootstrapCssRtlReference = BootstrapCssRtlReference.instance();
+        private static ResourceReference popperJavaScriptReference = PopperJavaScriptReference.instance();
     }
 
     private ResourceReference bootstrapJavaScriptReference = null;
     private ResourceReference modernizrJavaScriptReference = null;
     private ResourceReference bootstrapCssReference = null;
     private ResourceReference bootstrapCssRtlReference = null;
+    private ResourceReference popperJavaScriptReference = null;
 
     private ThemeProvider themeProvider;
     private ActiveThemeProvider activeThemeProvider;
@@ -42,6 +45,7 @@ private static final class Holder {
     private boolean deferJavascript;
     private String version = VERSION;
     private String modernizrVersion = MODERNIZR_VERSION;
+    private String popperVersion = POPPER_VERSION;
 
     /**
      * Constructor.
@@ -68,6 +72,12 @@ public IBootstrapSettings setModernizrVersion(String version) {
         return this;
     }
 
+    @Override
+    public IBootstrapSettings setPopperJsVersion(String version) {
+        this.popperVersion = version;
+        return this;
+    }
+
     @Override
     public String getVersion() {
         return version;
@@ -83,6 +93,11 @@ public String getModernizrVersion() {
         return modernizrVersion;
     }
 
+    @Override
+    public String getPopperJsVersion() {
+        return popperVersion;
+    }
+
     @Override
     public boolean autoAppendResources() {
         return autoAppendResources;
@@ -135,6 +150,20 @@ public ResourceReference getModernizrResourceReference() {
         return jsReference != null ? jsReference : Holder.modernizrJavaScriptReference;
     }
 
+    @Override
+    public ResourceReference getPopperJsResourceReference() {
+        ResourceReference jsReference;
+
+        if (useCdnResources()) {
+            String cdnUrl = String.format(POPPER_JS_CDN_PATTERN, getPopperJsVersion());
+            jsReference = new UrlResourceReference(Url.parse(cdnUrl));
+        } else {
+            jsReference = popperJavaScriptReference;
+        }
+
+        return jsReference != null ? jsReference : Holder.popperJavaScriptReference;
+    }
+
     @Override
     public String getJsResourceFilterName() {
         return resourceFilterName;
@@ -193,6 +222,12 @@ public BootstrapSettings setModernizrResourceReference(final ResourceReference m
         return this;
     }
 
+    @Override
+    public IBootstrapSettings setPopperJsResourceReference(final ResourceReference popperJsResourceReference) {
+        this.popperJavaScriptReference = popperJsResourceReference;
+        return this;
+    }
+
     @Override
     public IBootstrapSettings setUpdateSecurityManager(boolean activate) {
         updateSecurityManager = activate;

diff --git a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/settings/IBootstrapSettings.java b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/settings/IBootstrapSettings.java
@@ -21,6 +21,11 @@ public interface IBootstrapSettings {
      */
     String MODERNIZR_VERSION = "2.8.3";
 
+    /**
+     * The version of Popper.js
+     */
+    String POPPER_VERSION = "2.11.8";
+
     /**
      * The url to the JavaScript resource at a CDN network
      */
@@ -41,6 +46,11 @@ public interface IBootstrapSettings {
      */
     String CSS_RTL_CDN_PATTERN = "//stackpath.bootstrapcdn.com/bootstrap/%s/css/bootstrap.rtl.min.css";
 
+    /**
+     * The url to the Popper.js Javascript resource at a CDN network
+     */
+    String POPPER_JS_CDN_PATTERN = "//unpkg.com/popper.js@%s/dist/umd/popper.min.js";
+
     /**
      * @param version The version of Bootstrap. CDN resources use it to construct their urls
      * @return same instance for chaining
@@ -53,6 +63,12 @@ public interface IBootstrapSettings {
      */
     IBootstrapSettings setModernizrVersion(String version);
 
+    /**
+     * @param version The version of popper.js. CDN resources use it to construct their urls
+     * @return same instance for chaining
+     */
+    IBootstrapSettings setPopperJsVersion(String version);
+
     /**
      * @return the deferJavascript flag
      */
@@ -68,6 +84,11 @@ public interface IBootstrapSettings {
      */
     String getModernizrVersion();
 
+    /**
+     * @return The version of popper.js. CDN resources use it to construct their urls
+     */
+    String getPopperJsVersion();
+
     /**
      * @return True, if bootstrap resources should be added to each page automatically
      */
@@ -88,6 +109,11 @@ public interface IBootstrapSettings {
      */
     ResourceReference getModernizrResourceReference();
 
+    /**
+     * @return the popper.js JavaScript resource reference
+     */
+    ResourceReference getPopperJsResourceReference();
+
     /**
      * @param reference a reference to the base bootstrap css library.
      *                  Defaults to the embedded bootstrap.css
@@ -116,6 +142,14 @@ public interface IBootstrapSettings {
      */
     IBootstrapSettings setModernizrResourceReference(ResourceReference reference);
 
+    /**
+     *
+     * @param popperJsResourceReference a reference to the Popper.js library.
+     *                                  Defaults to the embedded popper.js.
+     * @return same instance for chaining
+     */
+    IBootstrapSettings setPopperJsResourceReference(ResourceReference popperJsResourceReference);
+
     /**
      * @return javascript resource filter name
      */

diff --git a/...ava/de/agilecoders/wicket/core/markup/html/themes/bootstrap/BootstrapJsReferenceTest.java b/...ava/de/agilecoders/wicket/core/markup/html/themes/bootstrap/BootstrapJsReferenceTest.java
@@ -28,7 +28,7 @@ void cdnResources() {
 
         CharSequence url = tester().getRequestCycle().urlFor(jsResourceReference, null);
         assertThat(url.toString(), is(equalTo(
-                String.format("./wicket/resource/de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference/webjars/bootstrap/%s/js/bootstrap.bundle.js",
+                String.format("./wicket/resource/de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference/webjars/bootstrap/%s/js/bootstrap.js",
                               IBootstrapSettings.VERSION))));
 
         settings.useCdnResources(true);

diff --git a/bootstrap-extensions/pom.xml b/bootstrap-extensions/pom.xml
@@ -26,7 +26,8 @@
         <font-awesome.version>6.4.2</font-awesome.version>
         <momentjs.version>2.29.4</momentjs.version>
         <bootstrap-select.version>1.14.0-beta3</bootstrap-select.version>
-        <tempusdominus.version>5.39.0</tempusdominus.version>
+        <tempusdominus4.version>5.39.0</tempusdominus4.version>
+        <tempusdominus.version>6.7.11</tempusdominus.version>
     </properties>
 
     <dependencies>
@@ -55,7 +56,7 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>tempusdominus-bootstrap-4</artifactId>
-            <version>${tempusdominus.version}</version>
+            <version>${tempusdominus4.version}</version>
         </dependency>
 
         <dependency>
@@ -64,6 +65,12 @@
             <version>${momentjs.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.webjars.npm</groupId>
+            <artifactId>eonasdan__tempus-dominus</artifactId>
+            <version>${tempusdominus.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>bootstrap-select</artifactId>

diff --git a/...wicket/extensions/markup/html/bootstrap/form/datetime/AbstractDateTimePickerWithIcon.java b/...wicket/extensions/markup/html/bootstrap/form/datetime/AbstractDateTimePickerWithIcon.java
@@ -19,6 +19,7 @@
  * @author Alexey Volkov
  * @since 01.02.2015
  */
+@Deprecated
 public abstract class AbstractDateTimePickerWithIcon<T> extends FormComponentPanel<T> {
 
     private static final long serialVersionUID = 1L;

diff --git a/.../de/agilecoders/wicket/extensions/markup/html/bootstrap/form/datetime/DatetimePicker.java b/.../de/agilecoders/wicket/extensions/markup/html/bootstrap/form/datetime/DatetimePicker.java
@@ -11,6 +11,7 @@
  * @author Alexey Volkov
  * @since 01.02.2015
  */
+@Deprecated
 public class DatetimePicker extends DateTextField {
 
     private static final long serialVersionUID = 1L;

diff --git a/...ecoders/wicket/extensions/markup/html/bootstrap/form/datetime/DatetimePickerBehavior.java b/...ecoders/wicket/extensions/markup/html/bootstrap/form/datetime/DatetimePickerBehavior.java
@@ -21,6 +21,7 @@
  * @author Alexey Volkov
  * @since 01.02.2015
  */
+@Deprecated
 public class DatetimePickerBehavior extends BootstrapJavascriptBehavior {
 
     private static final long serialVersionUID = 1L;

diff --git a/...ilecoders/wicket/extensions/markup/html/bootstrap/form/datetime/DatetimePickerConfig.java b/...ilecoders/wicket/extensions/markup/html/bootstrap/form/datetime/DatetimePickerConfig.java
@@ -26,6 +26,7 @@
  * @since 02.02.2015
  * @see <a href="http://eonasdan.github.io/bootstrap-datetimepicker/Options/">JS widget options</a>
  */
+@Deprecated
 public class DatetimePickerConfig extends AbstractConfig {
 
     public enum ViewModeType {

diff --git a/...oders/wicket/extensions/markup/html/bootstrap/form/datetime/DatetimePickerIconConfig.java b/...oders/wicket/extensions/markup/html/bootstrap/form/datetime/DatetimePickerIconConfig.java
@@ -12,6 +12,7 @@
  * @author Alexey Volkov
  * @since 07.02.15
  */
+@Deprecated
 public class DatetimePickerIconConfig extends AbstractConfig {
 
     private static final long serialVersionUID = 1L;

diff --git a/...gilecoders/wicket/extensions/markup/html/bootstrap/form/datetime/LocalDateTimePicker.java b/...gilecoders/wicket/extensions/markup/html/bootstrap/form/datetime/LocalDateTimePicker.java
@@ -11,6 +11,7 @@
  * @author Alexey Volkov
  * @since 01.02.2015
  */
+@Deprecated
 public class LocalDateTimePicker extends LocalDateTimeTextField {
 
     private static final long serialVersionUID = 1L;

diff --git a/...et/extensions/markup/html/bootstrap/form/tempusdominus/AbstractTempusDominusWithIcon.html b/...et/extensions/markup/html/bootstrap/form/tempusdominus/AbstractTempusDominusWithIcon.html
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wicket:panel xmlns:wicket="http://wicket.apache.org">
+    <input type="text" class="form-control" wicket:id="date"/>
+    <span class="input-group-text" wicket:id="iconContainer">
+        <i wicket:id="icon"></i>
+    </span>
+</wicket:panel>