Merge branch 'dev' into FORMS-24185

Author: AnurudraS

.circleci/ci/it-tests.js

@@ -25,7 +25,7 @@ const qpPath = '/home/circleci/cq';
 const buildPath = '/home/circleci/build';
 const { TYPE, BROWSER, AEM, PRERELEASE, FT, CORE_COMPONENTS, WCM_COMPONENTS} = process.env;
 const isLatestAddon = AEM === 'addon-latest';
-const jacocoAgent = '/home/circleci/.m2/repository/org/jacoco/org.jacoco.agent/0.8.3/org.jacoco.agent-0.8.3-runtime.jar';
+const jacocoAgent = '/home/circleci/.m2/repository/org/jacoco/org.jacoco.agent/0.8.12/org.jacoco.agent-0.8.12-runtime.jar';
 
 try {
     // # Define the image name
@@ -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.30.2";
+    let wcmVersion = "2.32.4";
     ci.stage("Integration Tests");
     ci.dir(qpPath, () => {
         // Connect to QP
@@ -105,7 +105,7 @@ try {
             ${ci.addQpFileDependency(config.modules['core-forms-components-it-tests-core'])} \
             ${ci.addQpFileDependency(config.modules['core-forms-components-it-tests-apps'])} \
             ${ci.addQpFileDependency(config.modules['core-forms-components-it-tests-content'])} \
-            --vm-options \\\"-Xmx4096m -XX:MaxPermSize=1024m -Djava.awt.headless=true -javaagent:${jacocoAgent}=destfile=crx-quickstart/jacoco-it.exec\\\" \
+            --vm-options \\\"-Xmx4096m -Djava.awt.headless=true -javaagent:${jacocoAgent}=destfile=crx-quickstart/jacoco-it.exec\\\" \
             ${preleaseOpts}`);
 });
 

.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:23385-openjdk11
+    image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:27293-v2-openjdk21
     depends_on:
       - circleci-qp
     # Add any additional configurations or environment variables if needed

CLAUDE.md

@@ -9,6 +9,8 @@ AEM Core Forms Components — Adaptive Forms v2 component library.
   Module structure, Java model hierarchy, form JSON model, IT infrastructure, Cypress patterns, JCR content XML patterns.
 - **Runtime internals**: [`docs/architecture/runtime-internals.md`](docs/architecture/runtime-internals.md)
   Deep dive into the form initialization pipeline, repeatable container/InstanceManager mechanics, FT_FORMS-24358 items-array export, common crash signatures, and debugging checklist.
+- **Component versioning**: [`docs/architecture/component-versioning.md`](docs/architecture/component-versioning.md)
+  When a change needs a new component version (`v1` → `v2`) vs. a fix-in-place, and the full checklist of what to update when bumping a version (clientlib self-containment, `_cq_dialog`/`_cq_styleConfig` inheritance, `pom.xml`, runtime clientlib embed lists, etc.).
 
 ### E2E Testing
 - **Feature Toggle Tests**: [`docs/e2e-testing/feature-toggles.md`](docs/e2e-testing/feature-toggles.md)

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

@@ -56,9 +56,6 @@ private FormConstants() {
     /** The resource type for date picker v1 */
     public static final String RT_FD_FORM_DATE_PICKER_V1 = RT_FD_FORM_PREFIX + "datepicker/v1/datepicker";
 
-    /** The resource type for date picker v2 */
-    public static final String RT_FD_FORM_DATE_PICKER_V2 = RT_FD_FORM_PREFIX + "datepicker/v2/datepicker";
-
     /** The resource type for number input v1 */
     public static final String RT_FD_FORM_NUMBER_INPUT_V1 = RT_FD_FORM_PREFIX + "numberinput/v1/numberinput";
 

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

@@ -176,6 +176,7 @@ private ReservedProperties() {
 
     public static final String FD_DRAFT_ID = "fd:draftId";
     public static final String FD_CHANGE_EVENT_BEHAVIOUR = "fd:changeEventBehaviour";
+    public static final String FD_SET_PROPERTY_BEHAVIOUR = "fd:setPropertyBehaviour";
 
     public static final String PN_CQ_ANNOTATIONS = "cq:annotations";
 

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

@@ -44,10 +44,7 @@
     adaptables = { SlingHttpServletRequest.class, Resource.class },
     adapters = { DatePicker.class,
         ComponentExporter.class },
-    resourceType = {
-        FormConstants.RT_FD_FORM_DATE_PICKER_V1,
-        FormConstants.RT_FD_FORM_DATE_PICKER_V2
-    })
+    resourceType = { FormConstants.RT_FD_FORM_DATE_PICKER_V1 })
 @Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
 public class DatePickerImpl extends AbstractFieldImpl implements DatePicker {
 

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

@@ -46,6 +46,7 @@
 public class TermsAndConditionsImpl extends PanelImpl implements TermsAndConditions {
 
     private static final String CUSTOM_TNC_PROPERTY = "fd:tnc";
+    private static final String SHOW_AS_POPUP_PROPERTY = "fd:showAsPopup";
 
     @JsonIgnore
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_SHOW_APPROVAL_OPTION)
@@ -88,6 +89,7 @@ public boolean isShowAsPopup() {
         if (resource.getValueMap().containsKey(CUSTOM_TNC_PROPERTY)) {
             properties.put(CUSTOM_TNC_PROPERTY, true);
         }
+        properties.put(SHOW_AS_POPUP_PROPERTY, isShowAsPopup());
         return properties;
     }
 

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

@@ -150,6 +150,10 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont
     @Nullable
     private String changeEventBehaviour;
 
+    @ValueMapValue(name = ReservedProperties.FD_SET_PROPERTY_BEHAVIOUR, injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Nullable
+    private String setPropertyBehaviour;
+
     @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_DATA)
     @Nullable
     private String data;
@@ -422,6 +426,12 @@ public String getLanguageDirection() {
         if (StringUtils.isNotBlank(changeEventBehaviour)) {
             properties.put(ReservedProperties.FD_CHANGE_EVENT_BEHAVIOUR, changeEventBehaviour);
         }
+        // fd:setPropertyBehaviour ("async" default | "eager") opts a form into read-after-write for
+        // setProperty / rule-node writes. Node-authored value is emitted as-is; no toggle-driven default
+        // (unlike changeEventBehaviour) since the runtime defaults to the backward-compatible "async".
+        if (StringUtils.isNotBlank(setPropertyBehaviour)) {
+            properties.put(ReservedProperties.FD_SET_PROPERTY_BEHAVIOUR, setPropertyBehaviour);
+        }
         properties.put(FD_FORM_DATA_ENABLED, formDataEnabled);
         if (this.autoSaveConfig != null && this.autoSaveConfig.isEnableAutoSave()) {
             properties.put(ReservedProperties.FD_AUTO_SAVE_PROPERTY_WRAPPER, this.autoSaveConfig);

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/servlets/FormMetaDataDataSourceServlet.java

@@ -87,7 +87,8 @@ public enum FormMetaDataType {
         PREFILL_ACTION("prefillServiceProvider"),
         LANG("lang"),
         FORMATTERS("formatters"),
-        SSV_CLOUD_CONFIG("ssvCloudServiceConfiguration");
+        SSV_CLOUD_CONFIG("ssvCloudServiceConfiguration"),
+        FILE_ATTACHMENT_VALIDATOR("fileAttachmentValidator");
 
         private String value;
 
@@ -181,12 +182,13 @@ private List<Resource> getDataSourceResources(SlingHttpServletRequest request, R
         FormMetaData formMetaData = resourceResolver.adaptTo(FormMetaData.class);
         if (formMetaData != null) {
             Iterator<FormsManager.ComponentDescription> metaDataList = null;
+            I18n i18n = new I18n(request.getResourceBundle(request.getLocale()));
             switch (type) {
                 case FORMATTERS:
                 case LANG:
                     ContentPolicy policy = ComponentUtils.getPolicy((String) request.getAttribute(Value.CONTENTPATH_ATTRIBUTE),
                         resourceResolver);
-                    resources.add(getResourceForDropdownDisplay(resourceResolver, "Select", ""));
+                    resources.add(getResourceForDropdownDisplay(resourceResolver, i18n.get("Select"), ""));
                     if (policy != null) {
                         ValueMap props = policy.getProperties();
                         if (props != null) {
@@ -204,7 +206,7 @@ private List<Resource> getDataSourceResources(SlingHttpServletRequest request, R
                             }
                         }
                     }
-                    resources.add(getResourceForDropdownDisplay(resourceResolver, "Custom", "custom"));
+                    resources.add(getResourceForDropdownDisplay(resourceResolver, i18n.get("Custom"), "custom"));
                     break;
                 case SUBMIT_ACTION:
                     // filter the submit actions by uniqueness and data model
@@ -223,7 +225,12 @@ private List<Resource> getDataSourceResources(SlingHttpServletRequest request, R
                 case PREFILL_ACTION:
                     metaDataList = formMetaData.getPrefillActions();
                     // Add an explicit empty option so authors can clear an already selected prefill service.
-                    I18n i18n = new I18n(request.getResourceBundle(request.getLocale()));
+                    resources.add(getResourceForDropdownDisplay(resourceResolver, i18n.get("None"), ""));
+                    resources.addAll(this.getResourceListFromComponentDescription(metaDataList, resourceResolver));
+                    break;
+                case FILE_ATTACHMENT_VALIDATOR:
+                    metaDataList = formMetaData.getFileAttachmentValidators();
+                    // Add an explicit empty option so authors can clear an already selected file attachment validator.
                     resources.add(getResourceForDropdownDisplay(resourceResolver, i18n.get("None"), ""));
                     resources.addAll(this.getResourceListFromComponentDescription(metaDataList, resourceResolver));
                     break;

bundles/af-core/src/test/java/com/adobe/cq/forms/core/Utils.java

@@ -28,6 +28,7 @@
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.sling.api.scripting.SlingBindings;
 import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
 import org.jetbrains.annotations.NotNull;
 
@@ -252,4 +253,22 @@ public static Method getPrivateMethod(Class clazz, String privateMethodName) {
             return null;
         }
     }
+
+    /**
+     * Removes the request's {@link SlingBindings} attribute so the AF locale-resolution code in
+     * {@code GuideUtils} takes its {@code bindings == null} branches.
+     * <p>
+     * Call this in tests that set an AF language parameter before adapting/using a model. Newer
+     * {@code aem-forms-sdk-api} versions resolve the locale via {@code GuideUtils}, and when a
+     * {@link SlingBindings} is present they look up services through {@code bindings.getSling()}:
+     * {@code getSanitizedLocale(...)} fetches the runtime-only Granite {@code ToggleRouter} (absent
+     * from the test classpath → {@link NoClassDefFoundError}), and {@code getLocaleParamFromRequest(...)}
+     * fetches {@code GuideLocalizationService} via {@code getSling()} without null-guarding it. Both
+     * are skipped entirely when the {@code SlingBindings} attribute is absent, and the locale is then
+     * taken from the {@code afAcceptLang} request parameter (which these tests set) — the same result
+     * expected in production for that parameter, since no {@code ToggleRouter} is registered in tests.
+     */
+    public static void disableLocaleFeatureToggleLookup(MockSlingHttpServletRequest request) {
+        request.setAttribute(SlingBindings.class.getName(), null);
+    }
 }