Dev master2107 (#1659)

* Date time input field (#1587)

* date time input field

* date time fixes

* Added test cases

* fixed default message issue

* fixed formatting

* fixing code coverage

* removed css and fixed formatting

* Incorporated review comments

* Added cypress tests on authoring and runtime

---------

Co-authored-by: dgurjar <[email protected]>

* @releng updating af-core (#1657)

---------

Co-authored-by: Devendra Gurjar <[email protected]>
Co-authored-by: dgurjar <[email protected]>

Author: 3 people

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java

@@ -151,4 +151,8 @@ private FormConstants() {
 
     /** The channel for print */
     public static final String CHANNEL_PRINT = "print";
-}
+
+    /** The resource type for date time input field v1 */
+    public static final String RT_FD_FORM_DATETIME_V1 = RT_FD_FORM_PREFIX + "datetime/v1/datetime";
+
+}

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java

@@ -86,6 +86,8 @@ private ReservedProperties() {
     public static final String PN_MAX_LENGTH = "maxLength";
     public static final String PN_MINIMUM_DATE = "minimumDate";
     public static final String PN_MAXIMUM_DATE = "maximumDate";
+    public static final String PN_MINIMUM_DATE_TIME = "minimumDateTime";
+    public static final String PN_MAXIMUM_DATE_TIME = "maximumDateTime";
     public static final String PN_MAXIMUM = "maximum";
     public static final String PN_MINIMUM = "minimum";
     public static final String PN_EXCLUSIVE_MINIMUM = "exclusiveMinimum";

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DateTimeImpl.java

@@ -0,0 +1,102 @@
+/**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2025 Adobe
+ ~
+ ~ Licensed 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 com.adobe.cq.forms.core.components.internal.models.v1.form;
+
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.models.annotations.Exporter;
+import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
+import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
+import org.jetbrains.annotations.NotNull;
+
+import com.adobe.cq.export.json.ComponentExporter;
+import com.adobe.cq.export.json.ExporterConstants;
+import com.adobe.cq.forms.core.components.internal.form.FormConstants;
+import com.adobe.cq.forms.core.components.models.form.*;
+import com.adobe.cq.forms.core.components.util.AbstractFieldImpl;
+import com.adobe.xfa.ut.StringUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+@Model(
+    adaptables = { SlingHttpServletRequest.class, Resource.class },
+    adapters = { DateTime.class, ComponentExporter.class },
+    resourceType = { FormConstants.RT_FD_FORM_DATETIME_V1 })
+@Exporter(
+    name = ExporterConstants.SLING_MODEL_EXPORTER_NAME,
+    extensions = ExporterConstants.SLING_MODEL_EXTENSION)
+public class DateTimeImpl extends AbstractFieldImpl implements DateTime {
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Nullable
+    private String pattern;
+
+    @Override
+    public String getFieldType() {
+        return super.getFieldType(FieldType.DATETIME_INPUT);
+    }
+
+    @Override
+    public String getMinimumDateTime() {
+        return getFormattedDate(minimumDateTime);
+    }
+
+    @Override
+    public String getMaximumDateTime() {
+        return getFormattedDate(maximumDateTime);
+    }
+
+    private String getFormattedDate(String dateTime) {
+        if (!StringUtils.isEmpty(dateTime)) {
+            OffsetDateTime formattedTime = OffsetDateTime.parse(dateTime);
+            return formattedTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm"));
+        }
+        return dateTime;
+
+    }
+
+    public @NotNull Map<ConstraintType, String> getConstraintMessages() {
+        Map<ConstraintType, String> res = super.getConstraintMessages();
+        String msg = getConstraintMessage(ConstraintType.MINIMUM);
+        if (msg != null) {
+            res.put(ConstraintType.MINIMUM, msg);
+        }
+        msg = getConstraintMessage(ConstraintType.MAXIMUM);
+        if (msg != null) {
+            res.put(ConstraintType.MAXIMUM, msg);
+        }
+        return res;
+    }
+
+    @Override
+    @Nullable
+    public String getFormat() {
+        return "date-time";
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = Base.DATE_TIME_FORMATTER, timezone = "UTC")
+    @Override
+    public Object[] getDefault() {
+        return defaultValue != null ? defaultValue.clone() : null;
+    }
+
+}

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/Base.java

@@ -35,6 +35,8 @@
 public interface Base extends FormComponent {
     public final String DATE_FORMATTER = "yyyy-MM-dd";
 
+    public final String DATE_TIME_FORMATTER = "yyyy-MM-dd'T'HH:mm:ss";
+
     /**
      * Constant representing the default language used, typically "en-US".
      *

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/DateTime.java

@@ -0,0 +1,30 @@
+
+/**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2025 Adobe
+ ~
+ ~ Licensed 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 com.adobe.cq.forms.core.components.models.form;
+
+import org.osgi.annotation.versioning.ConsumerType;
+
+/**
+ * Interface for {@code Password} Sling Model used for the {@code /apps/core/fd/components/form/password/v1/password} component.
+ *
+ * @since com.adobe.cq.forms.core.components.models.form 5.12.0
+ */
+@ConsumerType
+public interface DateTime extends Field, DateTimeConstraint {
+
+}

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/DateTimeConstraint.java

@@ -0,0 +1,46 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2025 Adobe
+ ~
+ ~ Licensed 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 com.adobe.cq.forms.core.components.models.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public interface DateTimeConstraint extends FormatConstraint {
+    /**
+     * Returns the minimum value for the date. The constraint is applicable only for field with type date
+     *
+     * @return minimum date
+     * @since com.adobe.cq.forms.core.components.models.form 5.11.0
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @JsonProperty("minimum")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = Base.DATE_TIME_FORMATTER, timezone = "UTC")
+    String getMinimumDateTime();
+
+    /**
+     * Returns the maximum value for the date. The constraint is applicable only for field with type date
+     *
+     * @return maximum date
+     * @since com.adobe.cq.forms.core.components.models.form 5.11.0
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @JsonProperty("maximum")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = Base.DATE_TIME_FORMATTER, timezone = "UTC")
+    String getMaximumDateTime();
+
+}

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FieldType.java

@@ -38,6 +38,7 @@ public enum FieldType {
     IMAGE("image"),
     TELEPHONE("tel"),
     PASSWORD("password"),
+    DATETIME_INPUT("datetime-input"),
     RANGE("range"),
     COLOR("color"),
     URL("url"),

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFieldImpl.java

@@ -132,6 +132,14 @@ public static EmptyValue fromString(String value) {
     @Nullable
     protected Date maximumDate;
 
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_MINIMUM_DATE_TIME)
+    @Nullable
+    protected String minimumDateTime;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_MAXIMUM_DATE_TIME)
+    @Nullable
+    protected String maximumDateTime;
+
     /** Do not do any changes, this is just present for backward compatibility **/
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_MAXIMUM)
     @Nullable