Merge branch 'dev' into FORMS-18211

pulling the latest dev

Author: Armaan Gupta

.circleci/ci/accessibilityConfig.json

@@ -1,3 +1,3 @@
 {
-  "accessibilityExceptionList": ["landmark-one-main", "label-title-only", "region", "focus-order-semantics", "target-size", "page-has-heading-one"]
+  "accessibilityExceptionList": ["landmark-one-main", "label-title-only", "region", "focus-order-semantics", "target-size", "page-has-heading-one", "aria-required-attr", "empty-heading"]
 }

.circleci/ci/it-tests.js

@@ -39,7 +39,7 @@ try {
 
     //todo: remove this later, once aem image is released, since sites rotary aem base image has "2.25.4"
     //let wcmVersion = ci.sh('mvn help:evaluate -Dexpression=core.wcm.components.version -q -DforceStdout', true);
-    let wcmVersion = "2.27.0";
+    let wcmVersion = "2.30.0";
     ci.stage("Integration Tests");
     ci.dir(qpPath, () => {
         // Connect to QP

.circleci/config.yml

@@ -28,10 +28,14 @@ common:
           name: Docker compose
           command: |
             set +e  # Disable exit on error
+            # Clean up any existing containers first
+            docker-compose -f .circleci/docker-compose.yml down -v --remove-orphans || true
+            # Pull images in parallel to save time
+            # docker-compose -f .circleci/docker-compose.yml pull --parallel || true
             for i in $(seq 3); do
               echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin docker2-granite-release-local.dr-uw2.adobeitc.com
               echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin docker-adobe-cif-release.dr-uw2.adobeitc.com
-              docker-compose -f .circleci/docker-compose.yml down -v
+              # docker-compose -f .circleci/docker-compose.yml down -v
               docker-compose -f .circleci/docker-compose.yml up -d && break
               sleep 10  # Add a delay between retries
             done
@@ -136,6 +140,7 @@ executors:
     machine:
       image: ubuntu-2204:2024.01.1
       docker_layer_caching: true
+    resource_class: medium
 
 jobs:
   build-java-11:
@@ -161,13 +166,13 @@ jobs:
           root: /home/circleci/build
           paths:
             - configuration.json
-            - bundles/core/target
-            - bundles/af-core/target
+            - bundles/core/target/*.jar
+            - bundles/af-core/target/*.jar
             - ui.apps/target/*.zip
             - ui.af.apps/target/*.zip
             - examples/ui.apps/target/*.zip
             - examples/ui.content/target/*.zip
-            - examples/core/target
+            - examples/core/target/*.jar
             - it/core/target/*.jar
             - it/apps/target/*.zip
             - it/content/target/*.zip
@@ -182,17 +187,17 @@ jobs:
           conf: .circleci/codecov.yml
           flags: unittests
 
-  cypress-chrome-cloudready-with-addon:
-    executor: test_executor_cloudready
-    environment:
-      AEM: addon
-      TYPE: cypress
-      BROWSER: chrome
-      PRERELEASE: 'true'
-    resource_class: xlarge
-    working_directory: /home/circleci/build
-    parallelism: 8
-    <<: *cypress_test_steps
+  # cypress-chrome-cloudready-with-addon:
+  #   executor: test_executor_cloudready
+  #   environment:
+  #     AEM: addon
+  #     TYPE: cypress
+  #     BROWSER: chrome
+  #     PRERELEASE: 'true'
+  #   resource_class: xlarge
+  #   working_directory: /home/circleci/build
+  #   parallelism: 8
+  #   <<: *cypress_test_steps
 
   cypress-chrome-cloudready-with-latest-addon:
     executor: test_executor_cloudready
@@ -202,9 +207,9 @@ jobs:
       BROWSER: chrome
       PRERELEASE: 'true'
       FT: 'true'
-    resource_class: xlarge
+    resource_class: large
     working_directory: /home/circleci/build
-    parallelism: 8
+    parallelism: 4
     <<: *cypress_test_steps
 
   cypress-chrome-cloudready-with-latest-addon-without-ft:
@@ -215,9 +220,9 @@ jobs:
       BROWSER: chrome
       PRERELEASE: 'true'
       FT: 'false'
-    resource_class: xlarge
+    resource_class: large
     working_directory: /home/circleci/build
-    parallelism: 8
+    parallelism: 4
     <<: *cypress_test_steps
 
 #  cypress-chrome-cloudready-with-latest-addon-and-old-core-components:
@@ -393,12 +398,12 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - cypress-chrome-cloudready-with-addon:
-          filters:
-            tags:
-              only: /.*/
-          requires:
-            - build-java-11
+      # - cypress-chrome-cloudready-with-addon:
+      #     filters:
+      #       tags:
+      #         only: /.*/
+      #     requires:
+      #       - build-java-11
       - cypress-chrome-cloudready-with-latest-addon:
           filters:
             tags:

.circleci/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     entrypoint: tail -f /dev/null  # Keeps the container running
 
   circleci-aem-cloudready:
-    image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:19823-final-openjdk11
+    image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:22450-openjdk11
     depends_on:
       - circleci-qp
     # Add any additional configurations or environment variables if needed

bundles/af-core/pom.xml

@@ -653,6 +653,10 @@
             <artifactId>core.wcm.components.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.adobe.aem</groupId>
+            <artifactId>core-forms-print-components-print-dor-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>

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

@@ -148,4 +148,11 @@ private FormConstants() {
 
     /** Form definition type indicating submission view */
     public static final String FORM_DEFINITION_SUBMISSION = "submission";
+
+    /** 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

@@ -74,16 +74,20 @@ private ReservedProperties() {
     public static final String PN_PLACEHOLDER = "placeholder";
     public static final String PN_READ_ONLY = "readOnly";
     public static final String PN_DEFAULT_VALUE = "default";
+    public static final String PN_EMPTY_VALUE = "fd:emptyValue";
     public static final String PN_MULTI_DEFAULT_VALUES = "fd:multiDefaultValues";
     public static final String PN_FORMAT = "format";
     public static final String PN_DISPLAY_FORMAT = "displayFormat";
+    public static final String PN_CUSTOM_DISPLAY_FORMAT = "fd:customDisplayFormat";
     public static final String PN_EDIT_FORMAT = "editFormat";
     public static final String PN_DISPLAY_VALUE_EXPRESSION = "displayValueExpression";
     public static final String PN_DATA_FORMAT = "dataFormat";
     public static final String PN_MIN_LENGTH = "minLength";
     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";
@@ -163,8 +167,8 @@ private ReservedProperties() {
     public static final String FD_ENABLE_AUTO_SAVE = "fd:enableAutoSave";
     public static final String FD_AUTO_SAVE_STRATEGY_TYPE = "fd:autoSaveStrategyType";
     public static final String FD_AUTO_SAVE_INTERVAL = "fd:autoSaveInterval";
-    public static final String FD_EXCLUDE_FROM_DOR_IF_HIDDEN = "excludeFromDoRIfHidden";
-
+    public static final String FD_EXCLUDE_FROM_DOR_IF_HIDDEN = "fd:excludeFromDoRIfHidden";
+    public static final String FD_DIALOG_LABEL = "fd:dialogLabel";
     public static final String FD_XFA_SCRIPTS = "fd:xfaScripts";
 
     public static final String FD_DRAFT_ID = "fd:draftId";

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

@@ -109,6 +109,10 @@ public Map<String, Object> getDorProperties() {
         if (dorColspan != null) {
             customDorProperties.put("dorColspan", dorColspan);
         }
+        Map<String, Object> dorContainer = getDorContainer();
+        if (dorContainer != null) {
+            customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer);
+        }
         return customDorProperties;
     }
 

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;
+    }
+
+}