From 34f4522c8af3dc749eeb71a99b4c842f3aac0b1e Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:39:38 +0530 Subject: [PATCH 01/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index caee95a58c..e44db4e773 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ The latest version of the AEM Forms Core Components, require the below minimum s | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | -| 3.0.86 | 2.24.6 | Continual | 11 | 3.3.9+ | +| 3.0.86 | 2.24.6+ | Continual | 11 | 3.3.9+ | For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md). From 89a3c1076f8b1a4f387d91a71ee30b8deb3b0b3a Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Fri, 31 Jan 2025 12:40:43 +0530 Subject: [PATCH 02/36] Update VERSIONS.md --- VERSIONS.md | 90 ++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/VERSIONS.md b/VERSIONS.md index 73ae53623f..1179245257 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -4,51 +4,51 @@ See below for a full list of minimum system requirements for historical versions | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | -| 3.0.86 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.84 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.82 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.80 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.78 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.76 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.74 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.72 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.70 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.68 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.66 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.64 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.58 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.56 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.54 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.52 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.50 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.48 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.44 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.40 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.34 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.32 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.30 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.28 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.26 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.24 | 2.24.2 | Continual | 11 | 3.3.9+ | -| 3.0.22 | 2.24.4 | Continual | 11 | 3.3.9+ | -| 3.0.20 | 2.24.4 | Continual | 11 | 3.3.9+ | -| 3.0.18 | 2.24.2 | Continual | 8, 11 | 3.3.9+ | -| 3.0.16 | 2.24.2 | Continual | 8, 11 | 3.3.9+ | -| 3.0.14 | 2.24.2 | Continual | 8, 11 | 3.3.9+ | -| 3.0.12 | 2.24.2 | Continual | 8, 11 | 3.3.9+ | -| 3.0.10 | 2.24.2 | Continual | 8, 11 | 3.3.9+ | -| 3.0.8 | 2.24.2 | Continual | 8, 11 | 3.3.9+ | -| 3.0.6 | 2.24.2 | Continual | 8, 11 | 3.3.9+ | -| 3.0.4 | 2.24.2 | Continual | 8, 11 | 3.3.9+ | -| 3.0.2 | 2.24.2 | Continual | 8, 11 | 3.3.9+ | -| 3.0.0 | 2.24.2 | Continual | 8, 11 | 3.3.9+ | -| 2.0.90 | 2.23.4 | Continual | 8, 11 | 3.3.9+ | -| 2.0.88 | 2.23.4 | Continual | 8, 11 | 3.3.9+ | -| 2.0.86 | 2.23.4 | Continual | 8, 11 | 3.3.9+ | -| 2.0.76 | 2.23.4 | Continual | 8, 11 | 3.3.9+ | -| 2.0.74 | 2.23.4 | Continual | 8, 11 | 3.3.9+ | -| 2.0.72 | 2.23.4 | Continual | 8, 11 | 3.3.9+ | -| 2.0.70 | 2.23.4 | Continual | 8, 11 | 3.3.9+ | +| 3.0.86 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.84 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.82 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.80 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.78 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.76 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.74 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.72 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.70 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.68 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.66 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.64 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.58 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.56 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.54 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.52 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.50 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.48 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.44 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.40 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.34 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.32 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.30 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.28 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.26 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.24 | 2.24.2+ | Continual | 11 | 3.3.9+ | +| 3.0.22 | 2.24.4+ | Continual | 11 | 3.3.9+ | +| 3.0.20 | 2.24.4+ | Continual | 11 | 3.3.9+ | +| 3.0.18 | 2.24.2+ | Continual | 8, 11 | 3.3.9+ | +| 3.0.16 | 2.24.2+ | Continual | 8, 11 | 3.3.9+ | +| 3.0.14 | 2.24.2+ | Continual | 8, 11 | 3.3.9+ | +| 3.0.12 | 2.24.2+ | Continual | 8, 11 | 3.3.9+ | +| 3.0.10 | 2.24.2+ | Continual | 8, 11 | 3.3.9+ | +| 3.0.8 | 2.24.2+ | Continual | 8, 11 | 3.3.9+ | +| 3.0.6 | 2.24.2+ | Continual | 8, 11 | 3.3.9+ | +| 3.0.4 | 2.24.2+ | Continual | 8, 11 | 3.3.9+ | +| 3.0.2 | 2.24.2+ | Continual | 8, 11 | 3.3.9+ | +| 3.0.0 | 2.24.2+ | Continual | 8, 11 | 3.3.9+ | +| 2.0.90 | 2.23.4+ | Continual | 8, 11 | 3.3.9+ | +| 2.0.88 | 2.23.4+ | Continual | 8, 11 | 3.3.9+ | +| 2.0.86 | 2.23.4+ | Continual | 8, 11 | 3.3.9+ | +| 2.0.76 | 2.23.4+ | Continual | 8, 11 | 3.3.9+ | +| 2.0.74 | 2.23.4+ | Continual | 8, 11 | 3.3.9+ | +| 2.0.72 | 2.23.4+ | Continual | 8, 11 | 3.3.9+ | +| 2.0.70 | 2.23.4+ | Continual | 8, 11 | 3.3.9+ | | 2.0.68 | 2.23.2 | Continual | 8, 11 | 3.3.9+ | | 2.0.66 | 2.23.2 | Continual | 8, 11 | 3.3.9+ | | 2.0.64 | 2.23.2 | Continual | 8, 11 | 3.3.9+ | From 5f9dd91d11e463b258c27cd36fa4048667b6eb9e Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Mon, 3 Feb 2025 15:07:18 +0530 Subject: [PATCH 03/36] Fixing cross origin issues (#1518) --- ui.frontend/src/GuideBridge.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ui.frontend/src/GuideBridge.js b/ui.frontend/src/GuideBridge.js index 694e8a09db..08943d36f1 100644 --- a/ui.frontend/src/GuideBridge.js +++ b/ui.frontend/src/GuideBridge.js @@ -80,9 +80,16 @@ class GuideBridge { let customEvent = document.createEvent("CustomEvent"); customEvent.initCustomEvent(Constants.GUIDE_BRIDGE_INITIALIZE_START, true, true, {"guideBridge": this}); window.dispatchEvent(customEvent); + // Safely handle cross-origin parent window communication if (window !== window.parent) { - window.parent.document.getElementById(window.name); - window.parent.dispatchEvent(customEvent); + try { + // Try to access parent window + window.parent.document.getElementById(window.name); + window.parent.dispatchEvent(customEvent); + } catch (e) { + // Silently handle cross-origin security errors + console.debug('Cross-origin access to parent window blocked'); + } } let self = this; function onFormContainerInitialised(e) { From 72ff6a89e486ae4f7f3ce069f680ea8b7802a1e2 Mon Sep 17 00:00:00 2001 From: barshat7 Date: Mon, 3 Feb 2025 10:28:20 +0000 Subject: [PATCH 04/36] @releng [maven-scm] :prepare release core-forms-components-reactor-3.0.88 --- all/pom.xml | 4 ++-- bundles/af-core/pom.xml | 4 ++-- bundles/core/pom.xml | 4 ++-- examples/all/pom.xml | 4 ++-- examples/core/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/ui.apps/pom.xml | 4 ++-- examples/ui.content/pom.xml | 4 ++-- it/apps/pom.xml | 4 ++-- it/config/pom.xml | 4 ++-- it/content/pom.xml | 4 ++-- it/core/pom.xml | 4 ++-- jsdocs/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- ui.af.apps/pom.xml | 4 ++-- ui.apps/pom.xml | 4 ++-- ui.frontend/pom.xml | 2 +- ui.tests/pom.xml | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 0a6b1fa221..aedad14831 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index 1fd9476d6a..985307b340 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index 6417c14036..6fdaf68000 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/examples/all/pom.xml b/examples/all/pom.xml index 47045241f6..d21bd017bc 100644 --- a/examples/all/pom.xml +++ b/examples/all/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/examples/core/pom.xml b/examples/core/pom.xml index 3adda486ab..7f8a293104 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/examples/pom.xml b/examples/pom.xml index 7cd0b990dc..b49e963a54 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../parent/pom.xml diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml index a98586b6e0..2b026d3d6e 100644 --- a/examples/ui.apps/pom.xml +++ b/examples/ui.apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml index 7d9371f14b..9536c739ed 100644 --- a/examples/ui.content/pom.xml +++ b/examples/ui.content/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/it/apps/pom.xml b/it/apps/pom.xml index fd1b8f2fe6..2bd599344f 100644 --- a/it/apps/pom.xml +++ b/it/apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../../parent/pom.xml @@ -32,7 +32,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/it/config/pom.xml b/it/config/pom.xml index 51436c0603..51920a3c93 100644 --- a/it/config/pom.xml +++ b/it/config/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/it/content/pom.xml b/it/content/pom.xml index 290a9ea07f..9d84a65365 100644 --- a/it/content/pom.xml +++ b/it/content/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/it/core/pom.xml b/it/core/pom.xml index e3314a7072..685c017aca 100644 --- a/it/core/pom.xml +++ b/it/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml index bdc436e064..cb6119d566 100644 --- a/jsdocs/pom.xml +++ b/jsdocs/pom.xml @@ -22,7 +22,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/parent/pom.xml b/parent/pom.xml index 931cf4b33e..c027aa798b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent pom - 3.0.87-SNAPSHOT + 3.0.88 AEM Forms Core Components - Parent Parent POM for AEM Forms Core Components @@ -31,7 +31,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 diff --git a/pom.xml b/pom.xml index e81f45dddc..e42c850208 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 parent/pom.xml @@ -77,7 +77,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index 771ffd02fb..fadae43a65 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index e402ffc129..53c7bb9522 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.88 Adobe diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml index d70fdffec6..e7a0239a7f 100644 --- a/ui.frontend/pom.xml +++ b/ui.frontend/pom.xml @@ -16,7 +16,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../parent/pom.xml 4.0.0 diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml index eb41af442a..2782823d94 100644 --- a/ui.tests/pom.xml +++ b/ui.tests/pom.xml @@ -24,7 +24,7 @@ com.adobe.aem core-forms-components-parent - 3.0.87-SNAPSHOT + 3.0.88 ../parent/pom.xml From 8cb5013e2dd2d0219123855eb8bcce943027542a Mon Sep 17 00:00:00 2001 From: barshat7 Date: Mon, 3 Feb 2025 10:28:22 +0000 Subject: [PATCH 05/36] @releng [maven-scm] :prepare for next development iteration --- all/pom.xml | 4 ++-- bundles/af-core/pom.xml | 4 ++-- bundles/core/pom.xml | 4 ++-- examples/all/pom.xml | 4 ++-- examples/core/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/ui.apps/pom.xml | 4 ++-- examples/ui.content/pom.xml | 4 ++-- it/apps/pom.xml | 4 ++-- it/config/pom.xml | 4 ++-- it/content/pom.xml | 4 ++-- it/core/pom.xml | 4 ++-- jsdocs/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- ui.af.apps/pom.xml | 4 ++-- ui.apps/pom.xml | 4 ++-- ui.frontend/pom.xml | 2 +- ui.tests/pom.xml | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index aedad14831..295109945a 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index 985307b340..6bd408dbd4 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index 6fdaf68000..ec64fd2ad0 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/examples/all/pom.xml b/examples/all/pom.xml index d21bd017bc..f07a24d82a 100644 --- a/examples/all/pom.xml +++ b/examples/all/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/examples/core/pom.xml b/examples/core/pom.xml index 7f8a293104..c5c34c59b1 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/examples/pom.xml b/examples/pom.xml index b49e963a54..6204d6761e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../parent/pom.xml diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml index 2b026d3d6e..638eb2edf7 100644 --- a/examples/ui.apps/pom.xml +++ b/examples/ui.apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml index 9536c739ed..a4396e8181 100644 --- a/examples/ui.content/pom.xml +++ b/examples/ui.content/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/it/apps/pom.xml b/it/apps/pom.xml index 2bd599344f..5820e329a3 100644 --- a/it/apps/pom.xml +++ b/it/apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../../parent/pom.xml @@ -32,7 +32,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/it/config/pom.xml b/it/config/pom.xml index 51920a3c93..4dd5d1d8c1 100644 --- a/it/config/pom.xml +++ b/it/config/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/it/content/pom.xml b/it/content/pom.xml index 9d84a65365..17981551a6 100644 --- a/it/content/pom.xml +++ b/it/content/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/it/core/pom.xml b/it/core/pom.xml index 685c017aca..d235c855ee 100644 --- a/it/core/pom.xml +++ b/it/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml index cb6119d566..7a2536165c 100644 --- a/jsdocs/pom.xml +++ b/jsdocs/pom.xml @@ -22,7 +22,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/parent/pom.xml b/parent/pom.xml index c027aa798b..ff65badac9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent pom - 3.0.88 + 3.0.89-SNAPSHOT AEM Forms Core Components - Parent Parent POM for AEM Forms Core Components @@ -31,7 +31,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD diff --git a/pom.xml b/pom.xml index e42c850208..14450c87c2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT parent/pom.xml @@ -77,7 +77,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index fadae43a65..0409cdf6ce 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 53c7bb9522..264b674e0b 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.88 + HEAD Adobe diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml index e7a0239a7f..1f0f45149f 100644 --- a/ui.frontend/pom.xml +++ b/ui.frontend/pom.xml @@ -16,7 +16,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml index 2782823d94..91af1bd19c 100644 --- a/ui.tests/pom.xml +++ b/ui.tests/pom.xml @@ -24,7 +24,7 @@ com.adobe.aem core-forms-components-parent - 3.0.88 + 3.0.89-SNAPSHOT ../parent/pom.xml From 07135c645524ce2e9f1bd4759b407e3c3994aef6 Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Mon, 3 Feb 2025 16:24:16 +0530 Subject: [PATCH 06/36] Disabling old core component build since core component is part of cloud (#1520) --- .circleci/config.yml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1fbabf8743..194868e12c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -220,19 +220,19 @@ jobs: parallelism: 8 <<: *cypress_test_steps - cypress-chrome-cloudready-with-latest-addon-and-old-core-components: - executor: test_executor_cloudready - environment: - AEM: addon-latest - TYPE: cypress - BROWSER: chrome - PRERELEASE: 'true' - FT: 'true' - CORE_COMPONENTS: '3.0.0' - resource_class: xlarge - working_directory: /home/circleci/build - parallelism: 8 - <<: *cypress_test_steps +# cypress-chrome-cloudready-with-latest-addon-and-old-core-components: +# executor: test_executor_cloudready +# environment: +# AEM: addon-latest +# TYPE: cypress +# BROWSER: chrome +# PRERELEASE: 'true' +# FT: 'true' +# CORE_COMPONENTS: '3.0.0' +# resource_class: xlarge +# working_directory: /home/circleci/build +# parallelism: 8 +# <<: *cypress_test_steps jsdocs-deploy: docker: @@ -419,19 +419,19 @@ workflows: ignore: /.*/ tags: only: /^core-forms-components-reactor-\d+\.\d+\.\d+$/ - - cypress-chrome-cloudready-with-latest-addon-and-old-core-components: - filters: -# branches: -# ignore: /.*/ - tags: - only: /^core-forms-components-reactor-\d+\.\d+\.\d+$/ - requires: - - build-java-11 +# - cypress-chrome-cloudready-with-latest-addon-and-old-core-components: +# filters: +## branches: +## ignore: /.*/ +# tags: +# only: /^core-forms-components-reactor-\d+\.\d+\.\d+$/ +# requires: +# - build-java-11 - release: requires: - build-java-11 - jsdocs-deploy - - cypress-chrome-cloudready-with-latest-addon-and-old-core-components +# - cypress-chrome-cloudready-with-latest-addon-and-old-core-components filters: branches: ignore: /.*/ From e1dd78b785d006552e4992cf741f004adc7d36fc Mon Sep 17 00:00:00 2001 From: barshat7 Date: Mon, 3 Feb 2025 13:07:52 +0000 Subject: [PATCH 07/36] @releng [maven-scm] :prepare release core-forms-components-reactor-3.0.90 --- all/pom.xml | 4 ++-- bundles/af-core/pom.xml | 4 ++-- bundles/core/pom.xml | 4 ++-- examples/all/pom.xml | 4 ++-- examples/core/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/ui.apps/pom.xml | 4 ++-- examples/ui.content/pom.xml | 4 ++-- it/apps/pom.xml | 4 ++-- it/config/pom.xml | 4 ++-- it/content/pom.xml | 4 ++-- it/core/pom.xml | 4 ++-- jsdocs/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- ui.af.apps/pom.xml | 4 ++-- ui.apps/pom.xml | 4 ++-- ui.frontend/pom.xml | 2 +- ui.tests/pom.xml | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 295109945a..a0ff628e2e 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index 6bd408dbd4..050d3bac0b 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index ec64fd2ad0..28d642e8a0 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/examples/all/pom.xml b/examples/all/pom.xml index f07a24d82a..96ce3ed2ec 100644 --- a/examples/all/pom.xml +++ b/examples/all/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/examples/core/pom.xml b/examples/core/pom.xml index c5c34c59b1..dcaf719de7 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/examples/pom.xml b/examples/pom.xml index 6204d6761e..b1dd96e8fa 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../parent/pom.xml diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml index 638eb2edf7..2fa2493641 100644 --- a/examples/ui.apps/pom.xml +++ b/examples/ui.apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml index a4396e8181..8f0b0d08c5 100644 --- a/examples/ui.content/pom.xml +++ b/examples/ui.content/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/it/apps/pom.xml b/it/apps/pom.xml index 5820e329a3..2cb0b6c547 100644 --- a/it/apps/pom.xml +++ b/it/apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../../parent/pom.xml @@ -32,7 +32,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/it/config/pom.xml b/it/config/pom.xml index 4dd5d1d8c1..5b43204cb3 100644 --- a/it/config/pom.xml +++ b/it/config/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/it/content/pom.xml b/it/content/pom.xml index 17981551a6..4606e83a27 100644 --- a/it/content/pom.xml +++ b/it/content/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/it/core/pom.xml b/it/core/pom.xml index d235c855ee..22a1569d16 100644 --- a/it/core/pom.xml +++ b/it/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml index 7a2536165c..a8cb9ce4c6 100644 --- a/jsdocs/pom.xml +++ b/jsdocs/pom.xml @@ -22,7 +22,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/parent/pom.xml b/parent/pom.xml index ff65badac9..15becdb447 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent pom - 3.0.89-SNAPSHOT + 3.0.90 AEM Forms Core Components - Parent Parent POM for AEM Forms Core Components @@ -31,7 +31,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 diff --git a/pom.xml b/pom.xml index 14450c87c2..740f0f408f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 parent/pom.xml @@ -77,7 +77,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index 0409cdf6ce..2067a1a172 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 264b674e0b..d9156267ed 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.90 Adobe diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml index 1f0f45149f..3b26928b9c 100644 --- a/ui.frontend/pom.xml +++ b/ui.frontend/pom.xml @@ -16,7 +16,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../parent/pom.xml 4.0.0 diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml index 91af1bd19c..e1e19f3912 100644 --- a/ui.tests/pom.xml +++ b/ui.tests/pom.xml @@ -24,7 +24,7 @@ com.adobe.aem core-forms-components-parent - 3.0.89-SNAPSHOT + 3.0.90 ../parent/pom.xml From 293fe578e64cf5cbca2b75cf5e4ac51a7089ea87 Mon Sep 17 00:00:00 2001 From: barshat7 Date: Mon, 3 Feb 2025 13:07:53 +0000 Subject: [PATCH 08/36] @releng [maven-scm] :prepare for next development iteration --- all/pom.xml | 4 ++-- bundles/af-core/pom.xml | 4 ++-- bundles/core/pom.xml | 4 ++-- examples/all/pom.xml | 4 ++-- examples/core/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/ui.apps/pom.xml | 4 ++-- examples/ui.content/pom.xml | 4 ++-- it/apps/pom.xml | 4 ++-- it/config/pom.xml | 4 ++-- it/content/pom.xml | 4 ++-- it/core/pom.xml | 4 ++-- jsdocs/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- ui.af.apps/pom.xml | 4 ++-- ui.apps/pom.xml | 4 ++-- ui.frontend/pom.xml | 2 +- ui.tests/pom.xml | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index a0ff628e2e..d965a3f48a 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index 050d3bac0b..934a9f45e7 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index 28d642e8a0..86eca2d749 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/examples/all/pom.xml b/examples/all/pom.xml index 96ce3ed2ec..da0042fd54 100644 --- a/examples/all/pom.xml +++ b/examples/all/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/examples/core/pom.xml b/examples/core/pom.xml index dcaf719de7..50fa27999b 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/examples/pom.xml b/examples/pom.xml index b1dd96e8fa..02a5fa7a5a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../parent/pom.xml diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml index 2fa2493641..445bbd337e 100644 --- a/examples/ui.apps/pom.xml +++ b/examples/ui.apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml index 8f0b0d08c5..d15310d8fe 100644 --- a/examples/ui.content/pom.xml +++ b/examples/ui.content/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/it/apps/pom.xml b/it/apps/pom.xml index 2cb0b6c547..fa093b402e 100644 --- a/it/apps/pom.xml +++ b/it/apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../../parent/pom.xml @@ -32,7 +32,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/it/config/pom.xml b/it/config/pom.xml index 5b43204cb3..a209b728ee 100644 --- a/it/config/pom.xml +++ b/it/config/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/it/content/pom.xml b/it/content/pom.xml index 4606e83a27..ea660eb2fa 100644 --- a/it/content/pom.xml +++ b/it/content/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/it/core/pom.xml b/it/core/pom.xml index 22a1569d16..49ccc94bc6 100644 --- a/it/core/pom.xml +++ b/it/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml index a8cb9ce4c6..b0dbb0c0c9 100644 --- a/jsdocs/pom.xml +++ b/jsdocs/pom.xml @@ -22,7 +22,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/parent/pom.xml b/parent/pom.xml index 15becdb447..09032dda5f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent pom - 3.0.90 + 3.0.91-SNAPSHOT AEM Forms Core Components - Parent Parent POM for AEM Forms Core Components @@ -31,7 +31,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD diff --git a/pom.xml b/pom.xml index 740f0f408f..441c11e25c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT parent/pom.xml @@ -77,7 +77,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index 2067a1a172..5cc000bcf2 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index d9156267ed..2698842ab5 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.90 + HEAD Adobe diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml index 3b26928b9c..79dca8499f 100644 --- a/ui.frontend/pom.xml +++ b/ui.frontend/pom.xml @@ -16,7 +16,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml index e1e19f3912..ff03a0a74e 100644 --- a/ui.tests/pom.xml +++ b/ui.tests/pom.xml @@ -24,7 +24,7 @@ com.adobe.aem core-forms-components-parent - 3.0.90 + 3.0.91-SNAPSHOT ../parent/pom.xml From 183454805414ab33f6a227a95b9d4e0e8c6fef02 Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Tue, 4 Feb 2025 09:28:49 +0530 Subject: [PATCH 09/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e44db4e773..4855c68055 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ The latest version of the AEM Forms Core Components, require the below minimum s | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | -| 3.0.86 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.90 | 2.24.6+ | Continual | 11 | 3.3.9+ | For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md). From cac07df22d13b2e151aaa2ea137df9d12f87e6ef Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Tue, 4 Feb 2025 09:32:54 +0530 Subject: [PATCH 10/36] Update VERSIONS.md --- VERSIONS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/VERSIONS.md b/VERSIONS.md index 1179245257..81f5c2c9c2 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -4,6 +4,7 @@ See below for a full list of minimum system requirements for historical versions | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | +| 3.0.90 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.86 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.84 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.82 | 2.24.6+ | Continual | 11 | 3.3.9+ | From 115d14f9088b214c8632abe3ec258539edb8eac2 Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Wed, 5 Feb 2025 11:06:49 +0530 Subject: [PATCH 11/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4855c68055..67a341c44c 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ https://opensource.adobe.com/aem-core-forms-components/ - [Text Input](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput) - [Number Input](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput) - [Date Picker](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker) -- [File Attachment](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v1/fileinput) +- [File Attachment](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput) - [Dropdown List](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown) - [Checkbox Group](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/checkboxgroup/v1/checkboxgroup) - [Radio Button Group](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton) From e8c24612498568895114672c32643ec2bb6144b0 Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Wed, 5 Feb 2025 15:50:02 +0530 Subject: [PATCH 12/36] Fixing chrome driver (#1523) --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 194868e12c..686fd6ff97 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,8 +15,8 @@ common: cypress_test_steps: &cypress_test_steps steps: - checkout - - browser-tools/install-browser-tools: - chrome-version: latest + - browser-tools/install-chrome + - browser-tools/install-chromedriver - run: command: | google-chrome --version From 80e41c707beb68413bff434c0f937be6f6848478 Mon Sep 17 00:00:00 2001 From: pavi41 <82104752+pavi41@users.noreply.github.com> Date: Wed, 5 Feb 2025 16:54:37 +0530 Subject: [PATCH 13/36] Issue with long description text and introduce data-name attribute in radiobutton (#1522) Co-authored-by: Pavitra Khatri --- .../clientlibs/site/js/radiobuttonview.js | 3 ++- .../radiobutton/v1/radiobutton/radiobutton.html | 1 + ui.frontend/src/view/FormFieldBase.js | 9 +++++---- .../specs/prefill/customprefill.cy.js | 2 +- .../specs/radiobutton/radiobutton.runtime.cy.js | 16 ++++++++++++++++ 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/clientlibs/site/js/radiobuttonview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/clientlibs/site/js/radiobuttonview.js index 99f2f04f9f..c048de6c8a 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/clientlibs/site/js/radiobuttonview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/clientlibs/site/js/radiobuttonview.js @@ -177,8 +177,9 @@ } #syncWidgetName() { + const name = this.getModel()?.name; this.widget.forEach(widget => { - widget.setAttribute("name", this.id + "_name"); + widget.setAttribute("name", `${this.id}_${name}`); }); } } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html index 361f3d1fca..1cb200a00d 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/radiobutton/v1/radiobutton/radiobutton.html @@ -29,6 +29,7 @@ data-cmp-enabled="${radioButton.enabled ? 'true' : 'false'}" data-cmp-required="${radioButton.required ? 'true': 'false'}" data-cmp-readonly="${radioButton.readOnly ? 'true' : 'false'}" + data-name="${radioButton.name}" id="${radiobutton.id}" data-cmp-data-layer="${radioButton.data.json}" data-cmp-adaptiveformcontainer-path="${formstructparser.formContainerPath}" diff --git a/ui.frontend/src/view/FormFieldBase.js b/ui.frontend/src/view/FormFieldBase.js index 4b58cc4323..aa7d99b446 100644 --- a/ui.frontend/src/view/FormFieldBase.js +++ b/ui.frontend/src/view/FormFieldBase.js @@ -636,17 +636,18 @@ class FormFieldBase extends FormField { } // Find the existing

element - let pElement = descriptionElement.querySelector('p'); + let pElements = descriptionElement.querySelectorAll('p'); - if (!pElement) { + if (!pElements) { // If no

tag exists, create one and set it as the content - pElement = document.createElement('p'); + pElements = document.createElement('p'); descriptionElement.innerHTML = ''; // Clear existing content descriptionElement.appendChild(pElement); } // Update the

element's content with sanitized content - pElement.innerHTML = sanitizedDescriptionText; + pElements.length === 1 ? (pElements[0].innerHTML = sanitizedDescriptionText) : null; + } else { // If no description was set during authoring this.#addDescriptionInRuntime(sanitizedDescriptionText); diff --git a/ui.tests/test-module/specs/prefill/customprefill.cy.js b/ui.tests/test-module/specs/prefill/customprefill.cy.js index 979884bcd0..85318f917e 100644 --- a/ui.tests/test-module/specs/prefill/customprefill.cy.js +++ b/ui.tests/test-module/specs/prefill/customprefill.cy.js @@ -27,7 +27,7 @@ describe('Custom Prefill Test', function () { const nameTextBox = "input[name='name']", dobDropdown = "input[name='dob']", jobDropdown = "select[name='job']"; - let genderRadioButton = "input[name='radiobutton-c8c660bac8_name']"; + let genderRadioButton = "input[name='radiobutton-c8c660bac8_gender']"; let formContainer = null; beforeEach(() => { diff --git a/ui.tests/test-module/specs/radiobutton/radiobutton.runtime.cy.js b/ui.tests/test-module/specs/radiobutton/radiobutton.runtime.cy.js index cee413e625..27bb4ca228 100644 --- a/ui.tests/test-module/specs/radiobutton/radiobutton.runtime.cy.js +++ b/ui.tests/test-module/specs/radiobutton/radiobutton.runtime.cy.js @@ -79,6 +79,22 @@ describe("Form with Radio Button Input", () => { }); }); + it("should have data-name attribute in parent div matching model name", () => { + const [radioButton1, radioButton1FieldView] = Object.entries(formContainer._fields)[0]; + const modelName = radioButton1FieldView.getModel().name; + cy.get(`#${radioButton1}`).invoke('attr', 'data-name').should('eq', modelName); + }); + + it("should set proper name attribute for radio buttons", () => { + const [id, fieldView] = Object.entries(formContainer._fields)[0]; + const model = formContainer._model.getElement(id); + const expectedName = `${id}_${model.name}`; + + cy.get(`#${id}`).find(".cmp-adaptiveform-radiobutton__option__widget").each(($radio) => { + cy.wrap($radio).should('have.attr', 'name', expectedName); + }); + }); + it("radiobutton html changes are reflected in model", () => { const [id, fieldView] = Object.entries(formContainer._fields)[1]; const model = formContainer._model.getElement(id); From 6907ddf44c55cdddfdd15fd9ceb535f71728d4f4 Mon Sep 17 00:00:00 2001 From: Pavitra Khatri Date: Thu, 6 Feb 2025 15:01:20 +0530 Subject: [PATCH 14/36] @releng [maven-scm] :prepare release core-forms-components-reactor-3.0.92 --- all/pom.xml | 4 ++-- bundles/af-core/pom.xml | 4 ++-- bundles/core/pom.xml | 4 ++-- examples/all/pom.xml | 4 ++-- examples/core/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/ui.apps/pom.xml | 4 ++-- examples/ui.content/pom.xml | 4 ++-- it/apps/pom.xml | 4 ++-- it/config/pom.xml | 4 ++-- it/content/pom.xml | 4 ++-- it/core/pom.xml | 4 ++-- jsdocs/package-lock.json | 3 +-- jsdocs/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- ui.af.apps/pom.xml | 4 ++-- ui.apps/pom.xml | 4 ++-- ui.frontend/package-lock.json | 21 +++++++-------------- ui.frontend/pom.xml | 2 +- ui.tests/pom.xml | 2 +- 21 files changed, 43 insertions(+), 51 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index d965a3f48a..fbda2fd0d0 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index 934a9f45e7..2bafe9ef16 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index 86eca2d749..5b65295f2a 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/examples/all/pom.xml b/examples/all/pom.xml index da0042fd54..ff2aab0dc0 100644 --- a/examples/all/pom.xml +++ b/examples/all/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/examples/core/pom.xml b/examples/core/pom.xml index 50fa27999b..5eeb2463c7 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/examples/pom.xml b/examples/pom.xml index 02a5fa7a5a..b2d1971a53 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../parent/pom.xml diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml index 445bbd337e..2426d864ac 100644 --- a/examples/ui.apps/pom.xml +++ b/examples/ui.apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml index d15310d8fe..3363f717d8 100644 --- a/examples/ui.content/pom.xml +++ b/examples/ui.content/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/it/apps/pom.xml b/it/apps/pom.xml index fa093b402e..fdf390cf9b 100644 --- a/it/apps/pom.xml +++ b/it/apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../../parent/pom.xml @@ -32,7 +32,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/it/config/pom.xml b/it/config/pom.xml index a209b728ee..cd1760b175 100644 --- a/it/config/pom.xml +++ b/it/config/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/it/content/pom.xml b/it/content/pom.xml index ea660eb2fa..9adb740519 100644 --- a/it/content/pom.xml +++ b/it/content/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/it/core/pom.xml b/it/core/pom.xml index 49ccc94bc6..364733d4b9 100644 --- a/it/core/pom.xml +++ b/it/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/jsdocs/package-lock.json b/jsdocs/package-lock.json index 355d5ba7dd..84483bc404 100644 --- a/jsdocs/package-lock.json +++ b/jsdocs/package-lock.json @@ -5050,8 +5050,7 @@ "version": "8.6.7", "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz", "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==", - "dev": true, - "requires": {} + "dev": true }, "marked": { "version": "4.3.0", diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml index b0dbb0c0c9..68b82794cf 100644 --- a/jsdocs/pom.xml +++ b/jsdocs/pom.xml @@ -22,7 +22,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/parent/pom.xml b/parent/pom.xml index 09032dda5f..d9fce2894d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent pom - 3.0.91-SNAPSHOT + 3.0.92 AEM Forms Core Components - Parent Parent POM for AEM Forms Core Components @@ -31,7 +31,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 diff --git a/pom.xml b/pom.xml index 441c11e25c..87cc5632d3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 parent/pom.xml @@ -77,7 +77,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index 5cc000bcf2..a5581dd7ec 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 2698842ab5..5ef396cc0c 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.92 Adobe diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json index 9c253d02c2..7e66085763 100644 --- a/ui.frontend/package-lock.json +++ b/ui.frontend/package-lock.json @@ -11414,8 +11414,7 @@ }, "@babel/plugin-proposal-private-property-in-object": { "version": "7.21.0-placeholder-for-preset-env.2", - "dev": true, - "requires": {} + "dev": true }, "@babel/plugin-syntax-async-generators": { "version": "7.8.4", @@ -13353,8 +13352,7 @@ }, "@webpack-cli/configtest": { "version": "1.2.0", - "dev": true, - "requires": {} + "dev": true }, "@webpack-cli/info": { "version": "1.5.0", @@ -13365,8 +13363,7 @@ }, "@webpack-cli/serve": { "version": "1.7.0", - "dev": true, - "requires": {} + "dev": true }, "@xtuc/ieee754": { "version": "1.2.0", @@ -13400,8 +13397,7 @@ }, "acorn-import-assertions": { "version": "1.9.0", - "dev": true, - "requires": {} + "dev": true }, "acorn-walk": { "version": "7.2.0", @@ -13437,8 +13433,7 @@ }, "ajv-keywords": { "version": "3.5.2", - "dev": true, - "requires": {} + "dev": true }, "ansi-escapes": { "version": "4.3.2", @@ -15804,8 +15799,7 @@ }, "jest-pnp-resolver": { "version": "1.2.3", - "dev": true, - "requires": {} + "dev": true }, "jest-regex-util": { "version": "26.0.0", @@ -18287,8 +18281,7 @@ }, "ws": { "version": "8.16.0", - "dev": true, - "requires": {} + "dev": true }, "xml-name-validator": { "version": "4.0.0", diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml index 79dca8499f..9037f037c0 100644 --- a/ui.frontend/pom.xml +++ b/ui.frontend/pom.xml @@ -16,7 +16,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../parent/pom.xml 4.0.0 diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml index ff03a0a74e..e114e76483 100644 --- a/ui.tests/pom.xml +++ b/ui.tests/pom.xml @@ -24,7 +24,7 @@ com.adobe.aem core-forms-components-parent - 3.0.91-SNAPSHOT + 3.0.92 ../parent/pom.xml From 51f1dffda15ed81bc19c2024d478ab566df3a261 Mon Sep 17 00:00:00 2001 From: Pavitra Khatri Date: Thu, 6 Feb 2025 15:01:21 +0530 Subject: [PATCH 15/36] @releng [maven-scm] :prepare for next development iteration --- all/pom.xml | 4 ++-- bundles/af-core/pom.xml | 4 ++-- bundles/core/pom.xml | 4 ++-- examples/all/pom.xml | 4 ++-- examples/core/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/ui.apps/pom.xml | 4 ++-- examples/ui.content/pom.xml | 4 ++-- it/apps/pom.xml | 4 ++-- it/config/pom.xml | 4 ++-- it/content/pom.xml | 4 ++-- it/core/pom.xml | 4 ++-- jsdocs/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- ui.af.apps/pom.xml | 4 ++-- ui.apps/pom.xml | 4 ++-- ui.frontend/pom.xml | 2 +- ui.tests/pom.xml | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index fbda2fd0d0..4d5ad6aafe 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index 2bafe9ef16..85093b21ab 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index 5b65295f2a..fc35b29368 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/examples/all/pom.xml b/examples/all/pom.xml index ff2aab0dc0..b5a51b561c 100644 --- a/examples/all/pom.xml +++ b/examples/all/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/examples/core/pom.xml b/examples/core/pom.xml index 5eeb2463c7..3a420cc92b 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/examples/pom.xml b/examples/pom.xml index b2d1971a53..ee2a7f2cb9 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../parent/pom.xml diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml index 2426d864ac..9b46da6e19 100644 --- a/examples/ui.apps/pom.xml +++ b/examples/ui.apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml index 3363f717d8..8934cc43bc 100644 --- a/examples/ui.content/pom.xml +++ b/examples/ui.content/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/it/apps/pom.xml b/it/apps/pom.xml index fdf390cf9b..cebc8e0d26 100644 --- a/it/apps/pom.xml +++ b/it/apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../../parent/pom.xml @@ -32,7 +32,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/it/config/pom.xml b/it/config/pom.xml index cd1760b175..3c89db6a8a 100644 --- a/it/config/pom.xml +++ b/it/config/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/it/content/pom.xml b/it/content/pom.xml index 9adb740519..09d31c1991 100644 --- a/it/content/pom.xml +++ b/it/content/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/it/core/pom.xml b/it/core/pom.xml index 364733d4b9..8ce1604681 100644 --- a/it/core/pom.xml +++ b/it/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml index 68b82794cf..ce9f14a8a4 100644 --- a/jsdocs/pom.xml +++ b/jsdocs/pom.xml @@ -22,7 +22,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/parent/pom.xml b/parent/pom.xml index d9fce2894d..91dce69963 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent pom - 3.0.92 + 3.0.93-SNAPSHOT AEM Forms Core Components - Parent Parent POM for AEM Forms Core Components @@ -31,7 +31,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD diff --git a/pom.xml b/pom.xml index 87cc5632d3..43991b8e70 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT parent/pom.xml @@ -77,7 +77,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index a5581dd7ec..f469d7975b 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 5ef396cc0c..d1d489424b 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.92 + HEAD Adobe diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml index 9037f037c0..4f7e5e678a 100644 --- a/ui.frontend/pom.xml +++ b/ui.frontend/pom.xml @@ -16,7 +16,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml index e114e76483..b959fc1d84 100644 --- a/ui.tests/pom.xml +++ b/ui.tests/pom.xml @@ -24,7 +24,7 @@ com.adobe.aem core-forms-components-parent - 3.0.92 + 3.0.93-SNAPSHOT ../parent/pom.xml From 7ebdc56d710f4ae9c0c0d90e271733baa348f3b2 Mon Sep 17 00:00:00 2001 From: ci-build Date: Thu, 6 Feb 2025 09:49:24 +0000 Subject: [PATCH 16/36] Update VERSIONS.md and README.md to include version 3.0.92 --- VERSIONS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/VERSIONS.md b/VERSIONS.md index 81f5c2c9c2..29166dbc4e 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -5,6 +5,7 @@ See below for a full list of minimum system requirements for historical versions | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | | 3.0.90 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.90 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.86 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.84 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.82 | 2.24.6+ | Continual | 11 | 3.3.9+ | From 2f7696460790ed9f5848c9ea6f579e0b3de15927 Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Thu, 6 Feb 2025 20:19:15 +0530 Subject: [PATCH 17/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67a341c44c..465e5010f6 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ The latest version of the AEM Forms Core Components, require the below minimum s | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | -| 3.0.90 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.92 | 2.24.6+ | Continual | 11 | 3.3.9+ | For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md). From 2b52028e0c8209a3bc8e4f8c52f992f4c4f004cf Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Thu, 6 Feb 2025 20:19:46 +0530 Subject: [PATCH 18/36] Update VERSIONS.md --- VERSIONS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSIONS.md b/VERSIONS.md index 29166dbc4e..18b67a08f5 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -4,7 +4,7 @@ See below for a full list of minimum system requirements for historical versions | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | -| 3.0.90 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.92 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.90 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.86 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.84 | 2.24.6+ | Continual | 11 | 3.3.9+ | From cd7b71da8a51fa42ad940e6b9e4c6e7d04b4e752 Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Tue, 11 Feb 2025 00:19:20 +0530 Subject: [PATCH 19/36] Fixing readme.md script (#1525) --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 686fd6ff97..8745e0005a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -363,16 +363,16 @@ jobs: # Debugging output echo "WCM_CORE_COMPONENTS_VERSION: $WCM_CORE_COMPONENTS_VERSION" - echo "Before sed: $(cat VERSIONS.md)" + # echo "Before sed: $(cat VERSIONS.md)" # update versions.md sed -i "/$LAST_VERSION/ { p; b; }; 1,/$LAST_VERSION/ { p; d; }" VERSIONS.md - sed -i -E "0,/(\| $LAST_VERSION\s*\|) [0-9]+\.[0-9]+\.[0-9]+\s*\|/s//| $NEW_VERSION \| $WCM_CORE_COMPONENTS_VERSION |/" VERSIONS.md - echo "After sed: $(cat VERSIONS.md)" + sed -i -E "0,/(\| $LAST_VERSION\s*\|) [0-9]+\.[0-9]+\.[0-9]+\+?\s*\|/s//| $NEW_VERSION \| $WCM_CORE_COMPONENTS_VERSION |/" VERSIONS.md + # echo "After sed: $(cat VERSIONS.md)" - echo "Before sed: $(cat README.md)" + # echo "Before sed: $(cat README.md)" # update readme.md - sed -i -E "s/(\| $LAST_VERSION\s*\|) [0-9]+\.[0-9]+\.[0-9]+ \s*\| /| $NEW_VERSION | $WCM_CORE_COMPONENTS_VERSION | /g" README.md - echo "After sed: $(cat README.md)" + sed -i -E "s/(\| $LAST_VERSION\s*\|) [0-9]+\.[0-9]+\.[0-9]+\+? \s*\| /| $NEW_VERSION | $WCM_CORE_COMPONENTS_VERSION | /g" README.md + # echo "After sed: $(cat README.md)" # Check if package-lock.json is modified if [[ $(git status --porcelain | grep "package-lock.json") ]]; then From be68afdb8ee8fc861a710ab227c3a210407fb65c Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Wed, 19 Feb 2025 17:32:30 +0530 Subject: [PATCH 20/36] @releng updating af-custom-function to 1.0.14 (#1529) --- ui.frontend/package-lock.json | 14 +++++++------- ui.frontend/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json index 9c253d02c2..b32195bf61 100644 --- a/ui.frontend/package-lock.json +++ b/ui.frontend/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@aemforms/af-core": "^0.22.114", - "@aemforms/af-custom-functions": "1.0.13", + "@aemforms/af-custom-functions": "1.0.14", "@aemforms/af-formatters": "^0.22.114" }, "devDependencies": { @@ -116,9 +116,9 @@ } }, "node_modules/@aemforms/af-custom-functions": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.13.tgz", - "integrity": "sha512-thtSn92qpkZg0uldYMaiN81MGxyttv+kyO2h34YA1Li8V79DYFp3JJWE3duhCgo+tslCLGamqryVwJbMdSJV6Q==" + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.14.tgz", + "integrity": "sha512-rxFTfGKj9lMeFx0WsOempSavgXKFQZNinr8BLjREVagkuZesQjzlSn/mjoWrLf1YC3VPUnFOj408SX+SX0rChQ==" }, "node_modules/@aemforms/af-formatters": { "version": "0.22.114", @@ -11131,9 +11131,9 @@ } }, "@aemforms/af-custom-functions": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.13.tgz", - "integrity": "sha512-thtSn92qpkZg0uldYMaiN81MGxyttv+kyO2h34YA1Li8V79DYFp3JJWE3duhCgo+tslCLGamqryVwJbMdSJV6Q==" + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.14.tgz", + "integrity": "sha512-rxFTfGKj9lMeFx0WsOempSavgXKFQZNinr8BLjREVagkuZesQjzlSn/mjoWrLf1YC3VPUnFOj408SX+SX0rChQ==" }, "@aemforms/af-formatters": { "version": "0.22.114", diff --git a/ui.frontend/package.json b/ui.frontend/package.json index e80c729ef3..d4d2620ad8 100644 --- a/ui.frontend/package.json +++ b/ui.frontend/package.json @@ -25,6 +25,6 @@ "dependencies": { "@aemforms/af-core": "^0.22.114", "@aemforms/af-formatters": "^0.22.114", - "@aemforms/af-custom-functions": "1.0.13" + "@aemforms/af-custom-functions": "1.0.14" } } From f5bdc0564b57df3f9b7af4ea247c292ea1f29b6b Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Mon, 24 Feb 2025 12:27:50 +0530 Subject: [PATCH 21/36] Fixing sling output mappings in aemform embed component (#1530) * Fixing sling output mappings in aemform embed component * Fixing sling output mappings in aemform embed component --- .../internal/models/v1/aemform/AEMFormImpl.java | 6 ++++++ .../internal/models/v1/aemform/AEMFormImplTest.java | 12 ++++++++++++ .../src/test/resources/aemform/test-content.json | 6 ++++++ 3 files changed, 24 insertions(+) diff --git a/bundles/core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/aemform/AEMFormImpl.java b/bundles/core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/aemform/AEMFormImpl.java index 92456c7d32..6997fe9d2b 100644 --- a/bundles/core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/aemform/AEMFormImpl.java +++ b/bundles/core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/aemform/AEMFormImpl.java @@ -279,6 +279,12 @@ public boolean isFormSelected() { @Override public String getThankyouPage() { + if (request != null && StringUtils.isNotBlank(thankyouPage)) { + ResourceResolver resourceResolver = request.getResourceResolver(); + if (resourceResolver != null) { + thankyouPage = StringUtils.replace(resourceResolver.map(thankyouPage), "_jcr_content", "jcr:content"); + } + } return GuideUtils.getRedirectUrl(thankyouPage, null); } diff --git a/bundles/core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/aemform/AEMFormImplTest.java b/bundles/core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/aemform/AEMFormImplTest.java index e645788037..3cc7c67ff4 100644 --- a/bundles/core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/aemform/AEMFormImplTest.java +++ b/bundles/core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/aemform/AEMFormImplTest.java @@ -41,8 +41,10 @@ class AEMFormImplTest { private static final String GRID_LANG = ROOT_PAGE_LANG + "/jcr:content/root/responsivegrid"; private static final String FORM_1 = "/aemform-1"; private static final String FORM_2 = "/aemform-2"; + private static final String FORM_WITH_SLINGMAPPINGS = "/aemformv2_slingmappings"; private static final String PATH_FORM_1 = GRID + FORM_1; private static final String PATH_FORM_2 = GRID + FORM_2; + private static final String PATH_FORM_SLINGMAPPINGS = GRID + FORM_WITH_SLINGMAPPINGS; private static final String PATH_FORM_LANG = GRID_LANG + FORM_1; private final AemContext context = FormsCoreComponentTestContext.newAemContext(); @@ -294,6 +296,16 @@ void testJSONExport() throws Exception { Utils.testJSONExport(aemform, Utils.getTestExporterJSONPath(BASE, PATH_FORM_1)); } + @Test + void testGetThankYouPageWithResourceResolver() { + // Get form under test using test resource that has _jcr_content in thankyou page path + AEMForm aemForm = getAEMFormUnderTest(PATH_FORM_SLINGMAPPINGS); + + // Test the method - verify _jcr_content replacement + String result = aemForm.getThankyouPage(); + assertEquals("/content/jcr:content/thank/page.html", result); + } + private AEMForm getAEMFormUnderTest(String resourcePath) { context.currentResource(resourcePath); MockSlingHttpServletRequest request = context.request(); diff --git a/bundles/core/src/test/resources/aemform/test-content.json b/bundles/core/src/test/resources/aemform/test-content.json index b37e6abdb0..dce9b60564 100644 --- a/bundles/core/src/test/resources/aemform/test-content.json +++ b/bundles/core/src/test/resources/aemform/test-content.json @@ -80,6 +80,12 @@ "useiframe" : "true", "usePageLocale" : "true", "enableFocusOnFirstField" : true + }, + "aemformv2_slingmappings" : { + "jcr:primaryType": "nt:unstructured", + "jcr:title": "", + "sling:resourceType": "core/fd/components/aemform/v1/aemform", + "thankyouPage": "/content/_jcr_content/thank/page" } } } From b20dcba2e0cf32ad20605205f6217f1b7265fc9b Mon Sep 17 00:00:00 2001 From: Rajat Khurana <30727855+rajatofficial@users.noreply.github.com> Date: Mon, 24 Feb 2025 15:16:46 +0530 Subject: [PATCH 22/36] fix: Tabs list in desktop (#1526) * fix: resolve issue with hamburgermenu hiding the tabs list in desktop view * fix: tabs were getting hidden in desktop view * fix: tabs were getting hidden in desktop view and removed unused code * feat(hamburgerMenu): test case added * feat(hamburgerMenu): test case added and html on server side * fix: tabs were getting hidden in desktop view * feat(hamburgerMenu): test case added --------- Co-authored-by: Rajat Khurana --- .../form/container/v2/container/README.md | 2 ++ .../clientlibs/site/js/hamburgerMenu.js | 24 +------------------ .../container/v2/container/container.html | 1 + .../formContainer/formContainer.runtime.cy.js | 6 +++++ 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md index ecb44cc22f..1fb501d511 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md @@ -92,3 +92,5 @@ Applying `data-cmp-custom-functions-module-url` attribute to the div to point to This Url should whitelist the AEM author/publish domain in the Cross Origin Resource Sharing (CORS) configuration. Applying `data-cmp-auto-save` attribute to the `cmp-adaptiveform-container` block to control the auto-save functionality. If the attribute's value is set to true, auto-save will be enabled for the form; otherwise, it will not be triggered. This attribute will be set to true in published mode if enableAutoSave is enabled. + +Applying `data-cmp-hamburger-menu-enabled` attribute to the `cmp-adaptiveform-container` block to control the hamburger meu. If the attribute's value is set to true, hamburger menu will be enabled in the mobile view. \ No newline at end of file diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/site/js/hamburgerMenu.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/site/js/hamburgerMenu.js index 19e5bea911..2c9e108a87 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/site/js/hamburgerMenu.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/site/js/hamburgerMenu.js @@ -334,27 +334,6 @@ if (typeof window.HamburgerMenu === 'undefined') { return ul; } - #hideIndividualComponentsNavigation() { - // hide all the horizontal tabs list - const tabsLists = document.getElementsByClassName('cmp-tabs__tablist'); - Array.from(tabsLists).forEach(tabsList => { - tabsList.style.display = 'none'; - }); - - // hide all the vertical tabs list - const verticalTabsLists = document.getElementsByClassName('cmp-verticaltabs__tablist'); - Array.from(verticalTabsLists).forEach(tabsList => { - tabsList.style.display = 'none'; - }); - // hide all the wizard tabs list - const wizardTabsLists = document.getElementsByClassName('cmp-adaptiveform-wizard__tabList'); - const wizardTabsNavButton = document.querySelector('.cmp-adaptiveform-wizard__containerNav'); - if(wizardTabsNavButton) wizardTabsNavButton.style.display = 'none'; - Array.from(wizardTabsLists).forEach(tabsList => { - tabsList.style.display = 'none'; - }); - } - // Function to find the currently active li #findActiveLi() { return document.querySelector(HamburgerMenu.selectors.active).parentElement; @@ -492,8 +471,6 @@ if (typeof window.HamburgerMenu === 'undefined') { this.#attachHamburgerEventListeners(hamburgerIcon, menu); this.#attachOutsideClickHandler(hamburgerIcon, menu); - - this.#hideIndividualComponentsNavigation(); this.#attachMenuEventListeners(menu); this.#styleSubmenuItems(menu); parentContainer.innerHTML=''; @@ -566,6 +543,7 @@ if (typeof window.HamburgerMenu === 'undefined') { init() { if(this.formContainer?.getModel()?.properties?.['fd:isHamburgerMenuEnabled']) { + document.querySelector('.cmp-adaptiveform-container')?.setAttribute('data-cmp-hamburger-menu-enabled', 'true'); const panels = this.#getAllPanels(); this.#renderHamburgerItems(panels); } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html index 6d368ae1f9..c0493c5d65 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html @@ -41,6 +41,7 @@ data-cmp-context-path="${request.contextPath}" data-cmp-page-lang="${container.containingPageLang}" data-cmp-path="${resource.path}" + data-cmp-hamburger-menu-enabled="${container.isHamburgerMenuEnabled ? 'true' : 'false'}" class="cmp-adaptiveform-container cmp-container ${wcmmode.edit ? 'cmp-adaptiveform-container--edit' : ''}" data-cmp-custom-functions-module-url="${configurationProvider.customFunctionModuleUrl}" dir="${container.languageDirection}" diff --git a/ui.tests/test-module/specs/formContainer/formContainer.runtime.cy.js b/ui.tests/test-module/specs/formContainer/formContainer.runtime.cy.js index 002fbef631..6ed3961550 100644 --- a/ui.tests/test-module/specs/formContainer/formContainer.runtime.cy.js +++ b/ui.tests/test-module/specs/formContainer/formContainer.runtime.cy.js @@ -43,6 +43,12 @@ describe("Form Runtime with Hamburger Menu", () => { cy.get(selectors.hamburgerMenuWidget.hamburgerMenu).should("be.visible"); }) + it(`Test data-cmp-hamburger-menu-enabled attribute when hamburger menu is enabled`, () => { + cy.viewport('iphone-x'); + cy.get('form') + .should('have.attr', 'data-cmp-hamburger-menu-enabled', 'true'); + }) + it(`Test hamburger menu should render exact number of items`, () => { cy.viewport('iphone-x'); cy.get(selectors.hamburgerMenuTopContainer.hamburgerMenuIcon).click(); From a8c269d4f2d028aee70d4fbc513d707b7465dfb2 Mon Sep 17 00:00:00 2001 From: Rishi Mehta Date: Mon, 24 Feb 2025 16:02:21 +0530 Subject: [PATCH 23/36] @releng [maven-scm] :prepare release core-forms-components-reactor-3.0.94 --- all/pom.xml | 4 ++-- bundles/af-core/pom.xml | 4 ++-- bundles/core/pom.xml | 4 ++-- examples/all/pom.xml | 4 ++-- examples/core/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/ui.apps/pom.xml | 4 ++-- examples/ui.content/pom.xml | 4 ++-- it/apps/pom.xml | 4 ++-- it/config/pom.xml | 4 ++-- it/content/pom.xml | 4 ++-- it/core/pom.xml | 4 ++-- jsdocs/package-lock.json | 3 ++- jsdocs/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- ui.af.apps/pom.xml | 4 ++-- ui.apps/pom.xml | 4 ++-- ui.frontend/package-lock.json | 21 ++++++++++++++------- ui.frontend/pom.xml | 2 +- ui.tests/pom.xml | 2 +- 21 files changed, 51 insertions(+), 43 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 4d5ad6aafe..76d4ee7753 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index 85093b21ab..2dac00479d 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index fc35b29368..f6517a126a 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/examples/all/pom.xml b/examples/all/pom.xml index b5a51b561c..ebac58efaa 100644 --- a/examples/all/pom.xml +++ b/examples/all/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/examples/core/pom.xml b/examples/core/pom.xml index 3a420cc92b..177e2c8648 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/examples/pom.xml b/examples/pom.xml index ee2a7f2cb9..dbbc93e1f8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../parent/pom.xml diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml index 9b46da6e19..5c6a49c5a1 100644 --- a/examples/ui.apps/pom.xml +++ b/examples/ui.apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml index 8934cc43bc..405deeb640 100644 --- a/examples/ui.content/pom.xml +++ b/examples/ui.content/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/it/apps/pom.xml b/it/apps/pom.xml index cebc8e0d26..13db7c7460 100644 --- a/it/apps/pom.xml +++ b/it/apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../../parent/pom.xml @@ -32,7 +32,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/it/config/pom.xml b/it/config/pom.xml index 3c89db6a8a..b72d66d7c8 100644 --- a/it/config/pom.xml +++ b/it/config/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/it/content/pom.xml b/it/content/pom.xml index 09d31c1991..6124a2d4f5 100644 --- a/it/content/pom.xml +++ b/it/content/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/it/core/pom.xml b/it/core/pom.xml index 8ce1604681..6a237bac8e 100644 --- a/it/core/pom.xml +++ b/it/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/jsdocs/package-lock.json b/jsdocs/package-lock.json index 84483bc404..355d5ba7dd 100644 --- a/jsdocs/package-lock.json +++ b/jsdocs/package-lock.json @@ -5050,7 +5050,8 @@ "version": "8.6.7", "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz", "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==", - "dev": true + "dev": true, + "requires": {} }, "marked": { "version": "4.3.0", diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml index ce9f14a8a4..c15e5dddf1 100644 --- a/jsdocs/pom.xml +++ b/jsdocs/pom.xml @@ -22,7 +22,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/parent/pom.xml b/parent/pom.xml index 91dce69963..59628a0e59 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent pom - 3.0.93-SNAPSHOT + 3.0.94 AEM Forms Core Components - Parent Parent POM for AEM Forms Core Components @@ -31,7 +31,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 diff --git a/pom.xml b/pom.xml index 43991b8e70..c0be5a71af 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 parent/pom.xml @@ -77,7 +77,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index f469d7975b..9bb2e1d4c9 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index d1d489424b..efcc82a364 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.94 Adobe diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json index 3ac36b3b5a..b32195bf61 100644 --- a/ui.frontend/package-lock.json +++ b/ui.frontend/package-lock.json @@ -11414,7 +11414,8 @@ }, "@babel/plugin-proposal-private-property-in-object": { "version": "7.21.0-placeholder-for-preset-env.2", - "dev": true + "dev": true, + "requires": {} }, "@babel/plugin-syntax-async-generators": { "version": "7.8.4", @@ -13352,7 +13353,8 @@ }, "@webpack-cli/configtest": { "version": "1.2.0", - "dev": true + "dev": true, + "requires": {} }, "@webpack-cli/info": { "version": "1.5.0", @@ -13363,7 +13365,8 @@ }, "@webpack-cli/serve": { "version": "1.7.0", - "dev": true + "dev": true, + "requires": {} }, "@xtuc/ieee754": { "version": "1.2.0", @@ -13397,7 +13400,8 @@ }, "acorn-import-assertions": { "version": "1.9.0", - "dev": true + "dev": true, + "requires": {} }, "acorn-walk": { "version": "7.2.0", @@ -13433,7 +13437,8 @@ }, "ajv-keywords": { "version": "3.5.2", - "dev": true + "dev": true, + "requires": {} }, "ansi-escapes": { "version": "4.3.2", @@ -15799,7 +15804,8 @@ }, "jest-pnp-resolver": { "version": "1.2.3", - "dev": true + "dev": true, + "requires": {} }, "jest-regex-util": { "version": "26.0.0", @@ -18281,7 +18287,8 @@ }, "ws": { "version": "8.16.0", - "dev": true + "dev": true, + "requires": {} }, "xml-name-validator": { "version": "4.0.0", diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml index 4f7e5e678a..6610825e82 100644 --- a/ui.frontend/pom.xml +++ b/ui.frontend/pom.xml @@ -16,7 +16,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../parent/pom.xml 4.0.0 diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml index b959fc1d84..f189d737cf 100644 --- a/ui.tests/pom.xml +++ b/ui.tests/pom.xml @@ -24,7 +24,7 @@ com.adobe.aem core-forms-components-parent - 3.0.93-SNAPSHOT + 3.0.94 ../parent/pom.xml From 733f19b96f431c7eba25d4d05158cf9a36fa12d1 Mon Sep 17 00:00:00 2001 From: Rishi Mehta Date: Mon, 24 Feb 2025 16:02:21 +0530 Subject: [PATCH 24/36] @releng [maven-scm] :prepare for next development iteration --- all/pom.xml | 4 ++-- bundles/af-core/pom.xml | 4 ++-- bundles/core/pom.xml | 4 ++-- examples/all/pom.xml | 4 ++-- examples/core/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/ui.apps/pom.xml | 4 ++-- examples/ui.content/pom.xml | 4 ++-- it/apps/pom.xml | 4 ++-- it/config/pom.xml | 4 ++-- it/content/pom.xml | 4 ++-- it/core/pom.xml | 4 ++-- jsdocs/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- ui.af.apps/pom.xml | 4 ++-- ui.apps/pom.xml | 4 ++-- ui.frontend/pom.xml | 2 +- ui.tests/pom.xml | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 76d4ee7753..93d23a90b0 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index 2dac00479d..324773d394 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index f6517a126a..952b1de1d8 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/examples/all/pom.xml b/examples/all/pom.xml index ebac58efaa..38fc318c63 100644 --- a/examples/all/pom.xml +++ b/examples/all/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/examples/core/pom.xml b/examples/core/pom.xml index 177e2c8648..75f55e140b 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/examples/pom.xml b/examples/pom.xml index dbbc93e1f8..31a69fe0d7 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../parent/pom.xml diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml index 5c6a49c5a1..bbb96e256d 100644 --- a/examples/ui.apps/pom.xml +++ b/examples/ui.apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml index 405deeb640..35836907e8 100644 --- a/examples/ui.content/pom.xml +++ b/examples/ui.content/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/it/apps/pom.xml b/it/apps/pom.xml index 13db7c7460..a746a68c4c 100644 --- a/it/apps/pom.xml +++ b/it/apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../../parent/pom.xml @@ -32,7 +32,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/it/config/pom.xml b/it/config/pom.xml index b72d66d7c8..1136734974 100644 --- a/it/config/pom.xml +++ b/it/config/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/it/content/pom.xml b/it/content/pom.xml index 6124a2d4f5..23d5ed8114 100644 --- a/it/content/pom.xml +++ b/it/content/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/it/core/pom.xml b/it/core/pom.xml index 6a237bac8e..d9f840e713 100644 --- a/it/core/pom.xml +++ b/it/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml index c15e5dddf1..a60e548c29 100644 --- a/jsdocs/pom.xml +++ b/jsdocs/pom.xml @@ -22,7 +22,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/parent/pom.xml b/parent/pom.xml index 59628a0e59..720d732549 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent pom - 3.0.94 + 3.0.95-SNAPSHOT AEM Forms Core Components - Parent Parent POM for AEM Forms Core Components @@ -31,7 +31,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD diff --git a/pom.xml b/pom.xml index c0be5a71af..35a38ec510 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT parent/pom.xml @@ -77,7 +77,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index 9bb2e1d4c9..98758da83e 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index efcc82a364..27c2a7be64 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.94 + HEAD Adobe diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml index 6610825e82..1609ae5477 100644 --- a/ui.frontend/pom.xml +++ b/ui.frontend/pom.xml @@ -16,7 +16,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml index f189d737cf..7cf7e53d06 100644 --- a/ui.tests/pom.xml +++ b/ui.tests/pom.xml @@ -24,7 +24,7 @@ com.adobe.aem core-forms-components-parent - 3.0.94 + 3.0.95-SNAPSHOT ../parent/pom.xml From 129ea283887443bd1f1080c5dc18d61fecd0357a Mon Sep 17 00:00:00 2001 From: ci-build Date: Mon, 24 Feb 2025 12:42:22 +0000 Subject: [PATCH 25/36] Update VERSIONS.md and README.md to include version 3.0.94 --- README.md | 2 +- VERSIONS.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 465e5010f6..2565756d63 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ The latest version of the AEM Forms Core Components, require the below minimum s | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | -| 3.0.92 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.94 | 2.24.6 | Continual | 11 | 3.3.9+ | For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md). diff --git a/VERSIONS.md b/VERSIONS.md index 18b67a08f5..62d7be7820 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -4,6 +4,7 @@ See below for a full list of minimum system requirements for historical versions | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | +| 3.0.94 | 2.24.6 | Continual | 11 | 3.3.9+ | | 3.0.92 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.90 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.86 | 2.24.6+ | Continual | 11 | 3.3.9+ | From 67815a2c0cf7d0d1eb10f2aaf54fe25d5e30aac9 Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Mon, 24 Feb 2025 18:17:45 +0530 Subject: [PATCH 26/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2565756d63..d40d119959 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ The latest version of the AEM Forms Core Components, require the below minimum s | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | -| 3.0.94 | 2.24.6 | Continual | 11 | 3.3.9+ | +| 3.0.94 | 2.24.6+ | Continual | 11 | 3.3.9+ | For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md). From 0e467d3997e934278268edc6a7c7277ba94bde63 Mon Sep 17 00:00:00 2001 From: s1mahanty <110378842+s1mahanty@users.noreply.github.com> Date: Thu, 27 Feb 2025 09:54:10 +0530 Subject: [PATCH 27/36] FORMS-16007 : rest endpoint url validation, to not allow relative url (#1505) * restendpoint url validation * cypress test and incorporating the review comments * updating the fieldDescription * removing the updatefieldDescription logic --------- Co-authored-by: Shrikha . Co-authored-by: Shrikha . --- .../clientlibs/editor/js/editDialog.js | 20 ++++++++++++++++ .../test-module/specs/formcontainer.cy.js | 24 ++++++++++++++++--- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v1/container/clientlibs/editor/js/editDialog.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v1/container/clientlibs/editor/js/editDialog.js index aecdaa2b3c..0edd28b2ab 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v1/container/clientlibs/editor/js/editDialog.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v1/container/clientlibs/editor/js/editDialog.js @@ -378,15 +378,18 @@ if(restEndPointSource.length == 0 || isPostUrlSelected){ Utils.showComponent(restEndPointUrlTextBox, 'div'); Utils.hideComponent(restEndpointConfigPath, 'div'); + restEndPointUrlTextBox?.setAttribute("data-rest-endpoint-url-validation", ""); } else { Utils.showComponent(restEndpointConfigPath, 'div'); Utils.hideComponent(restEndPointUrlTextBox, 'div'); + restEndPointUrlTextBox?.removeAttribute("data-rest-endpoint-url-validation"); } } else { Utils.hideComponent(restEndPointSource, 'div'); Utils.hideComponent(restEndPointUrlTextBox, 'div'); Utils.hideComponent(restEndpointConfigPath, 'div'); restEndPointSource.parent('div').parent('div').hide(); + restEndPointUrlTextBox?.removeAttribute("data-rest-endpoint-url-validation"); } } @@ -421,6 +424,7 @@ $(document).off('change' + REST_ENDPOINT).on('change' + REST_ENDPOINT, restCheckBox, function(){ showPostUrlTextField(dialog); }); + registerRestEndpointUrlValidator(); } } @@ -489,6 +493,22 @@ } }); + function registerRestEndpointUrlValidator() { + $(window).adaptTo("foundation-registry").register("foundation.validation.validator", { + selector: "[data-rest-endpoint-url-validation]", + validate: (el) => { + const url = el.value; + // Regex to validate absolute URLs starting with http:// or https:// only + const absoluteUrlPattern = /^https?:\/\/.+$/i; + if (!absoluteUrlPattern.test(url)) { + return Granite.I18n.getMessage( + "Please enter the absolute path of the REST endpoint." + ); + } + } + }); + } + Utils.initializeEditDialog(EDIT_DIALOG_FORM)(handleAsyncSubmissionAndThankYouOption, handleSubmitAction, registerSubmitActionSubDialogClientLibs, registerRestEndPointDialogClientlibs, registerFDMDialogClientlibs, registerEmailDialogClientlibs, initialiseDataModel, registerAutoSaveDialogAction); diff --git a/ui.tests/test-module/specs/formcontainer.cy.js b/ui.tests/test-module/specs/formcontainer.cy.js index 1577b55190..0bf0267683 100644 --- a/ui.tests/test-module/specs/formcontainer.cy.js +++ b/ui.tests/test-module/specs/formcontainer.cy.js @@ -76,7 +76,18 @@ describe('Page/Form Authoring', function () { cy.get("coral-numberinput[name='./fd:autoSaveInterval']").should("exist"); } - + const checkValidatorFunctioning = function(formContainerEditPathSelector) { + cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + formContainerEditPathSelector); + cy.invokeEditableAction("[data-action='CONFIGURE']"); + cy.get('.cmp-adaptiveform-container__editdialog').contains('Submission').click({force:true}); + cy.get(".cmp-adaptiveform-container__submitaction").children('button[is="coral-button"][aria-haspopup="listbox"]').first().click({force: true}); + cy.get('coral-selectlist-item[value="fd/af/components/guidesubmittype/restendpoint"]').should('be.visible').click(); + cy.get("[name='./restEndpointPostUrl']").scrollIntoView().clear({force: true}).type("invalid-url", {force: true}); + cy.get('.coral-Form-errorlabel').should('contain.text', "Please enter the absolute path of the REST endpoint."); + cy.get("[name='./restEndpointPostUrl']").clear({force: true}).type("http://localhost:4502/some/endpoint", {force: true}); + cy.get('.coral-Form-errorlabel').should('not.exist'); + cy.get('.cq-dialog-submit').click(); + }; const checkAndSaveSubmitAction = function(formContainerEditPathSelector) { // click configure action on adaptive form container component @@ -107,11 +118,11 @@ describe('Page/Form Authoring', function () { cy.get("[name='./restEndpointConfigPath']").should("exist").should("be.visible"); cy.get("coral-radio[name='./restEndPointSource'][value='posturl']").first().click(); cy.get("[name='./restEndpointPostUrl']").should("exist").should("be.visible"); + cy.get("[name='./restEndpointPostUrl']").should("exist").clear().type("http://localhost:4502/some/endpoint"); cy.get("[name='./restEndpointConfigPath']").should("exist").should("not.be.visible"); } - cy.get("[name='./restEndpointPostUrl']").should("exist").type("http://localhost:4502/some/endpoint"); - //save the configuration + cy.get("[name='./restEndpointPostUrl']").scrollIntoView().should("exist").clear().type("http://localhost:4502/some/endpoint"); cy.get('.cq-dialog-submit').click(); }; @@ -243,6 +254,9 @@ describe('Page/Form Authoring', function () { } }); + it('check validator functioning for REST endpoint URL', function() { + checkValidatorFunctioning(formContainerEditPathSelector); + }); }); // commenting once we support adaptive form container in sites editor, uncomment this test @@ -296,6 +310,10 @@ describe('Page/Form Authoring', function () { checkEditDialog(formContainerEditPathSelector); cy.get(sitesSelectors.confirmDialog.actions.first).click(); }) + + it('check validator functioning for REST endpoint URL', function() { + checkValidatorFunctioning(formContainerEditPathSelector); + }); }); context("Render Forms in Disabled mode", function () { From 9b1eb2a1f9e5f2776242f37c0a653650d34550f3 Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Fri, 28 Feb 2025 18:28:55 +0530 Subject: [PATCH 28/36] FORMS-18986 XFA to AF (#1532) * XFA web pack refactoring * FORMS-16342 adding xfa data model in CC * XFA changes to master * XFA changes to master * Adding support for xfa page component * Adding test and few fixes * Adding xfa client lib to .gitignore * Stop tracking auto-generated client libs * Language resources would always be part of runtime-all library * Adding xfa test * Fixing xfa test * Fixing test * Fixing XFA data model code --------- Co-authored-by: Shivam Agarwal --- .gitignore | 1 + .../internal/form/ReservedProperties.java | 2 + .../util/AbstractFormComponentImpl.java | 39 ++- .../util/AbstractOptionsFieldImpl.java | 5 +- .../models/v1/form/CheckBoxGroupImplTest.java | 13 + .../util/AbstractFormComponentImplTest.java | 33 ++- .../form/checkboxgroup/test-content.json | 20 ++ .../form/componentswithrule/test-content.json | 11 + ...mpl.dev.DynamicToggleProviderImpl.cfg.json | 3 +- .../samples/showHideRule.xdp/.content.xml | 28 ++ .../_jcr_content/renditions/original | 255 ++++++++++++++++++ .../renditions/original.dir/.content.xml | 8 + .../_jcr_content/renditions/print | Bin 0 -> 5742 bytes .../renditions/print.dir/.content.xml | 8 + .../samples/xfatest/.content.xml | 27 ++ .../samples/xfatest/.content.xml | 94 +++++++ ui.af.apps/pom.xml | 7 + .../.content.xml | 8 + .../css.txt | 15 ++ .../js.txt | 15 ++ .../.content.xml | 8 + .../form/base/v1/base/_cq_editConfig.xml | 6 + .../form/button/v1/button/_cq_editConfig.xml | 6 + .../clientlibs/editor/js/editDialog.js | 85 +++++- .../form/container/v2/container/README.md | 2 + .../v2/container/_cq_dialog/.content.xml | 29 ++ .../editorhook/js/qualifiedNameHook.js | 139 +++++++++- .../container/v2/container/container.html | 1 + .../clientlibs/site/js/datepickerview.js | 4 + .../clientlibs/site/js/dropdownview.js | 2 + .../clientlibs/site/js/emailinputview.js | 2 + .../clientlibs/site/js/numberinputview.js | 2 + .../v1/panelcontainer/_cq_editConfig.xml | 6 + .../clientlibs/site/js/telephoneinputview.js | 2 + .../clientlibs/site/js/textinputview.js | 2 + .../core/fd/components/xfa-page/.content.xml | 18 ++ .../fd/components/xfa-page/v1/.content.xml | 20 ++ .../xfa-page/v1/xfa-page/.content.xml | 23 ++ .../components/xfa-page/v1/xfa-page/README.md | 44 +++ .../v1/xfa-page/customfooterlibs.html | 33 +++ .../v1/xfa-page/customheaderlibs.html | 24 ++ ui.frontend/clientlib-dev.config.cjs | 48 +--- ui.frontend/clientlib-dev.xfa.config.cjs | 33 +++ ui.frontend/clientlib.config.cjs | 45 ++-- ui.frontend/clientlib.xfa.config.cjs | 32 +++ ui.frontend/package-lock.json | 31 ++- ui.frontend/package.json | 7 +- ui.frontend/src/handleXfa.js | 31 +++ ui.frontend/src/utils.js | 31 ++- ui.frontend/src/view/FormCheckBox.js | 9 +- ui.frontend/src/view/FormField.js | 8 + ui.frontend/webpack.common.cjs | 13 +- ui.frontend/webpack.dev.cjs | 15 +- ui.frontend/webpack.prod.cjs | 7 +- .../test-module/specs/xfa/xfa.runtime.cy.js | 53 ++++ 55 files changed, 1312 insertions(+), 101 deletions(-) create mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/.content.xml create mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original create mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original.dir/.content.xml create mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/print create mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/print.dir/.content.xml create mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/xfatest/.content.xml create mode 100755 it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/xfatest/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/css.txt create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/js.txt create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/.content.xml create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/README.md create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customfooterlibs.html create mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customheaderlibs.html create mode 100644 ui.frontend/clientlib-dev.xfa.config.cjs create mode 100644 ui.frontend/clientlib.xfa.config.cjs create mode 100644 ui.frontend/src/handleXfa.js create mode 100644 ui.tests/test-module/specs/xfa/xfa.runtime.cy.js diff --git a/.gitignore b/.gitignore index 5cf2b91d0e..d5907a33ad 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ # auto-generated clientlib ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base/** +ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/** # Ignore Maven stuff target/ diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java index 72742d818a..6ec62ae2e7 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java @@ -163,6 +163,8 @@ private ReservedProperties() { 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_XFA_SCRIPTS = "fd:xfaScripts"; + public static final String FD_DRAFT_ID = "fd:draftId"; private static final Set reservedProperties = aggregateReservedProperties(); diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java index 723c9eec9a..bf2ceebb9e 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java @@ -17,17 +17,7 @@ import java.io.IOException; import java.math.BigDecimal; -import java.util.AbstractMap; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -68,9 +58,12 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.node.ArrayNode; public class AbstractFormComponentImpl extends AbstractComponentImpl implements FormComponent { @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_DATAREF) @@ -298,6 +291,10 @@ protected boolean getEditMode() { if (rulesProperties.size() > 0) { properties.put(CUSTOM_RULE_PROPERTY_WRAPPER, rulesProperties); } + List disabledScripts = getDisabledXFAScripts(); + if (!disabledScripts.isEmpty()) { + properties.put("fd:disabledXfaScripts", disabledScripts); + } return properties; } @@ -550,4 +547,24 @@ public Map getDorProperties() { return customDorProperties; } + private List getDisabledXFAScripts() { + Set disabledScripts = new HashSet<>(); + String xfaScripts = resource.getValueMap().get(ReservedProperties.FD_XFA_SCRIPTS, ""); + if (StringUtils.isNotEmpty(xfaScripts)) { + // read string xfaScripts to jsonNode + ObjectMapper mapper = new ObjectMapper(); + try { + ArrayNode node = (ArrayNode) mapper.readTree(xfaScripts); + // iterate through the array node and add the elements which have disabled property set to true + for (JsonNode jsonNode : node) { + if (jsonNode.has("disabled") && jsonNode.get("disabled").asBoolean()) { + disabledScripts.add(jsonNode.get("activity").asText()); + } + } + } catch (IOException e) { + logger.error("Error while parsing xfaScripts {} {}", e, resource.getPath()); + } + } + return new ArrayList<>(disabledScripts); + } } diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java index b43f30b643..5b6702cf5c 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java @@ -18,6 +18,7 @@ import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; +import java.util.Optional; import java.util.stream.IntStream; import org.apache.sling.models.annotations.Default; @@ -106,9 +107,7 @@ public String[] getEnumNames() { Map map = getEnumPairs(); String[] enumName = map.values().toArray(new String[0]); return Arrays.stream(enumName) - .map(p -> { - return this.translate(ReservedProperties.PN_ENUM_NAMES, p); - }) + .map(p -> Optional.ofNullable(translate(ReservedProperties.PN_ENUM_NAMES, p)).orElse("")) .toArray(String[]::new); } return null; diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java index 867415de31..9d4c62af38 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java @@ -57,6 +57,7 @@ public class CheckBoxGroupImplTest { private static final String PATH_CHECKBOX_GROUP_FOR_INSERTION_ORDER = CONTENT_ROOT + "/checkboxgroup-insertion-order"; private static final String PATH_CHECKBOX_GROUP_FOR_BOOLEAN = CONTENT_ROOT + "/checkboxgroup-boolean"; private static final String PATH_CHECKBOX_GROUP_NO_FIELDTYPE = CONTENT_ROOT + "/checkboxgroup-without-fieldtype"; + private static final String PATH_CHECKBOX_GROUP_WITH_NULL_VALUES = CONTENT_ROOT + "/checkboxgroup-with-null-values"; private final AemContext context = FormsCoreComponentTestContext.newAemContext(); @@ -298,6 +299,18 @@ void testGetEnumNames() { assertArrayEquals(new String[] { "m", "f", "o" }, checkboxGroup.getEnumNames()); } + @Test + void testGetEnumNamesWithNullValues() throws Exception { + // Get the checkbox group under test + CheckBoxGroup checkboxGroup = getCheckBoxGroupUnderTest(PATH_CHECKBOX_GROUP); + String[] modifiedEnumNames = new String[] { null, "", "value3" }; + FieldUtils.writeField(checkboxGroup, "enumNames", modifiedEnumNames, true); + // Now call getEnumNames() which should handle the null value by converting it to an empty string + String[] result = checkboxGroup.getEnumNames(); + // Verify that nulls are converted to empty strings + assertArrayEquals(new String[] { "", "", "value3" }, result); + } + @Test void testGetEnumNamesWithDuplicateEnumValues() { CheckBoxGroup checkboxGroup = getCheckBoxGroupUnderTest(PATH_CHECKBOX_GROUP_WITH_DUPLICATE_ENUMS); diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java index 19eb8f156a..4306d94aab 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java @@ -17,6 +17,7 @@ package com.adobe.cq.forms.core.components.util; import java.lang.reflect.Method; +import java.util.List; import java.util.Map; import org.apache.sling.api.resource.Resource; @@ -48,6 +49,9 @@ public class AbstractFormComponentImplTest { private static final String PATH_COMPONENT_WITH_NO_VALIDATION_STATUS = CONTENT_ROOT + "/datepicker2"; private static final String PATH_COMPONENT_WITH_INVALID_VALIDATION_STATUS = CONTENT_ROOT + "/datepicker3"; private static final String PATH_COMPONENT_WITH_NO_RULE = CONTENT_ROOT + "/numberinput"; + private static final String PATH_COMPONENT_WITH_DISABLED_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponent"; + private static final String PATH_COMPONENT_WITH_INVALID_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponentinvalid"; + private static final String PATH_COMPONENT_WITH_NO_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponentnone"; private static final String AF_PATH = "/content/forms/af/testAf"; private static final String PAGE_PATH = "/content/testPage"; @@ -101,6 +105,34 @@ public void testInvalidValidationStatusRule() { assertEquals("invalid", rulesProperties.get("validationStatus")); } + @Test + public void testDisabledXFAScripts() { + AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_DISABLED_XFA_SCRIPTS); + Map properties = abstractFormComponentImpl.getProperties(); + List disabledScripts = (List) properties.get("fd:disabledXfaScripts"); + assertNotNull(disabledScripts); + assertEquals(2, disabledScripts.size()); + assertTrue(disabledScripts.contains("click")); + assertTrue(disabledScripts.contains("change")); + } + + @Test + public void testInvalidXFAScripts() { + AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_INVALID_XFA_SCRIPTS); + Map properties = abstractFormComponentImpl.getProperties(); + Object disabledScripts = properties.get("fd:disabledXfaScripts"); + // Even with invalid JSON, we should get an empty list, not null + assertNull(disabledScripts); + } + + @Test + public void testNoXFAScripts() { + AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_NO_XFA_SCRIPTS); + Map properties = abstractFormComponentImpl.getProperties(); + Object disabledScripts = properties.get("fd:disabledXfaScripts"); + assertNull(disabledScripts); + } + @Test public void testEmbedWithIframe() { Resource resource = Mockito.mock(Resource.class); @@ -147,7 +179,6 @@ public Page getCurrentPageToTest() { } } - @Test private AbstractFormComponentImpl prepareTestClass(String path) { Resource resource = context.resourceResolver().getResource(path); AbstractFormComponentImpl abstractFormComponentImpl = new AbstractFormComponentImpl(); diff --git a/bundles/af-core/src/test/resources/form/checkboxgroup/test-content.json b/bundles/af-core/src/test/resources/form/checkboxgroup/test-content.json index cdd7d6bc34..ffb9ea7b03 100644 --- a/bundles/af-core/src/test/resources/form/checkboxgroup/test-content.json +++ b/bundles/af-core/src/test/resources/form/checkboxgroup/test-content.json @@ -269,5 +269,25 @@ ], "jcr:lastModified": "Tue Jul 30 2024 15:16:00 GMT+0530", "sling:resourceType": "forms-components-examples/components/form/checkboxgroup" + }, + "checkboxgroup-with-null-values": { + "id": "checkboxgroup-with-null-values", + "jcr:primaryType": "nt:unstructured", + "sling:resourceType": "core/fd/components/form/checkboxgroup/v1/checkboxgroup", + "name": "nullValues", + "jcr:title": "Null Values Test", + "fieldType": "checkbox-group", + "type": "number[]", + "enum": [ + 0, + 1, + 2 + ], + "enforceEnum": true, + "enumNames": [ + "", + "", + "value3" + ] } } diff --git a/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json b/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json index 25ae1b9144..351b9c7753 100644 --- a/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json +++ b/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json @@ -43,5 +43,16 @@ "jcr:primaryType": "nt:unstructured", "validationStatus" : "someInvalidStatus" } + }, + "xfacomponent": { + "jcr:primaryType": "nt:unstructured", + "fd:xfaScripts": "[{\"activity\":\"click\",\"disabled\":true},{\"activity\":\"change\",\"disabled\":true},{\"activity\":\"initialize\",\"disabled\":false}]" + }, + "xfacomponentinvalid": { + "jcr:primaryType": "nt:unstructured", + "fd:xfaScripts": "invalid json" + }, + "xfacomponentnone": { + "jcr:primaryType": "nt:unstructured" } } diff --git a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json index 8842ce8f0c..134ff99f03 100644 --- a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json +++ b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json @@ -21,6 +21,7 @@ "FT_SITES-19631", "FT_FORMS-14255", "FT_FORMS-14068", - "FT_FORMS-16351" + "FT_FORMS-16351", + "FT_FORMS-14518" ] } diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/.content.xml new file mode 100755 index 0000000000..567a3ee07d --- /dev/null +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/.content.xml @@ -0,0 +1,28 @@ + + + + + + diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original new file mode 100755 index 0000000000..40f67ea327 --- /dev/null +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original @@ -0,0 +1,255 @@ + + + + + + + + pdf + + + + + + + + + + + 0 + + 0 + 1.7 + 11 + + + * + + + + + + + + January + February + March + April + May + June + July + August + September + October + November + December + + + Jan + Feb + Mar + Apr + May + Jun + Jul + Aug + Sep + Oct + Nov + Dec + + + Sunday + Monday + Tuesday + Wednesday + Thursday + Friday + Saturday + + + Sun + Mon + Tue + Wed + Thu + Fri + Sat + + + AM + PM + + + BC + AD + + + + EEEE, MMMM D, YYYY + MMMM D, YYYY + MMM D, YYYY + M/D/YY + + + h:MM:SS A Z + h:MM:SS A Z + h:MM:SS A + h:MM A + + GyMdkHmsSEDFwWahKzZ + + z,zz9.zzz + $z,zz9.99|($z,zz9.99) + z,zz9% + + + . + , + % + - + 0 + + + $ + USD + . + + + + + + + + + + + + + + + + + + + + + + 2025-02-28T05:39:31Z + Designer 6.5 + 1 + Designer 6.5 + uuid:614e0343-5f24-42b2-bd2b-1e4609912b49 + + 6.5.16.20230206.87 + /template/subform[1] + + + + diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original.dir/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original.dir/.content.xml new file mode 100755 index 0000000000..4348e11022 --- /dev/null +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original.dir/.content.xml @@ -0,0 +1,8 @@ + + + + diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/print b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/print new file mode 100755 index 0000000000000000000000000000000000000000..de88fbafd65c590baee29c6f82845a987ea93c0d GIT binary patch literal 5742 zcmeHLdsq`!7DwD_jc6-;bP@U(Q?Sq)=8+ePAwUQbEI}Gxwum^Hxd|i5Om;GnfNNFk zO3`Y4*81*JOKo*U>sl4H+KRfXZfR92)>jo>-L5NCx3v$D-U)D9u{-CrSar2363Ke!da(EbUM_;I0V3>CI=}1BcM1Mz#-l( zAR06iuy&yY!4)br3n9?lau+}+Sf}O)PQBhO@PKpl{En??+q!-0#p9cU2ShHLTl;b8B*TE}JLN~Sb0}9gLm5#*S(l{By@U;^NV%-q!Z~Y3twU{ zfvfYwmPgJhn%A;)-ocw+)V#C9tG~NH>UP+appSQB*Cc?YyQ~v?;x2KbAKO*dDJG^dfNQ?81C!+ZE z+ilZlDl>22`fkhmSmE%DvNc@orI$74Q;&XI|I=sOos1nnwYO2_dy}RWw^iTugw{Oy z#-1Nm&rR+OiyJ-u@mF^*`l}&w<@o29&9Q7=ZV9h4#yD46VjE`FeRB71@gmj2LkX#d z+RD8nBXeg(#@g3By+3!&^R=66>qe~jirWzVeu`^y+-cKMrtmrM4JDoOj9mcjG zP&elrZc}M;M@V|w&2#A+tcQvYM3rQxP0G76?vdQ7g3upM73|X%_G%FSj5}5y5VzczNEp|htD^$sojTS@Dg;f-W{d-2h*T``W_h}{c1W0qBZex|UQ zd}Qar;hXlU#_Foh9M4}cVagk>W6QtqxOHnq(7>QYpWK+;hwlVjC(SDW*3EFN8-`7a z(U1mz45S<616~|OVSu4MGMQi+a3DCYhYignSv#VJnk=Xp2qaAkBqI8x1Ua# zeP4W~!Z`!Dv0qo(VW@kseZ+Q(9|V)T_jZs1jGvL44Wuz z-LqecFm$4{KxxLzu2fLMq*w4Dry?ttswky2v@}UC(RsCAr^^Y=M7&N1>(+V`r6dd^ zpoM*L7?mPE5ur3unj%gh6V2I3D#rsv6OYL#48st$CZ3{5rNWAhK?sZ>P#i}Il?>Bp z35`~%M7o<)FM&NBPusK>qp5p6_%BgfA_y)mik6j?#h1zBIo^)q8jS|U2$UdXP(tP| zX9dzLW8F`8De>zu0yo7oE&(10BI+froJUBMO2vhGTKC4BuAYThcf4>hGpvQISJ^$~O(`NG=?V$j#?~0x@uM6-D zU@3r@NfzD*JYwT`ryGHe>+%RbT>(rlT|URq8ac`%9%qJ8@9{9SR)s47CRfO1N*ke& zDF`bev(kiBh69BP(`azQs?hj|G@E;4@6(&Xx&;y%<=3mGpM zGBt+VXxavw+UD2W3)@RCO=-oAk%FFdxf~2dia{zerGsASpXx0S{YyKo>vHwQG9=dx z#9J~^Y5{J}!&9KQ`-vVXhWs?r;Q@N+FY&l49(tf0BQRBbf?9_LW&_KJDAAL(Jh16e z0XSXaO9*v)tfH}ncoDSDKOI1I4|ZGUyT(LCz7?R$`mdm_`^`5BFF1I)qCK~(9|K|k z!xpgk!6N-&-~nCzASod7fUW=+{pdZQs~;o|x;;G!SB2Xys=q=3l(oi0frKZA9O zL}{6rece~P5VJVCAsxs=lT3oQ)^buTL1d${L)Bg>f@?B{`~0j#>Q!57QYr;y+QKf!ZAYB zHt&0@?#$@OJKwshs9~DVRtEg?D{aQrxp45oJZ4P5&aC^|o81|KQ zv$jXPe4_1#bXIpZqcSA=)AfrNjSHPOa%kQ2!?vxJ|9D{IurGIiFk3Nn^E1oL8-`pf z(lps#cz@@*jgy8d+pnzn@Qu}PU5oj&WB_=MoxF2T>)BhWx@CXxUim!Zq20L~=f%cd zcspO)aDB)Vd)~FQd_FO;_VCjWCH-Z~sD-H`w{G~XB<$*_%YQf3gq?ZQ8@ej#Ipl@G z)uHoO8dpWvZx4-Il0M|l;ytR<&T;1zr_GDmvaCDCb*>{tk1qe{;-PnTUfFfk5j*3> zjvJS@ZCTaS95n8r>Q>THc5QLzyA^p0nmWU$ z1eG||NA5pzP2g-(+!TD;BN`=vrjo97z}QO!M5R`s;u}+(kr7HvtlimR5rIHW94iD##{zrxB~~ya5c98CqgG5EVdWqJQz_&yYm7sE^Bf-wb@pV0aVSjrehuKyvts*| zXT|lhO036pmq)uwqS+)&$Y89cat@D^bt4Kin+G&Q!7LTQ30UFjql%hgEYuMO6E4Tp zMnY~#H4r$CrC^u}!;MCx2{yG!uT!TGm>j=XA`Qb$JrYG|25aLGA5#{8jZ&3>S~yNX z#5%48&0#74tkQPTKG6bfXh9(k3ru)XApA=%Sgk?9qfNHbL8AxFH6j15OB#4GX>MIe zW@gB_*OKwWotd2vot{G + + + diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/xfatest/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/xfatest/.content.xml new file mode 100755 index 0000000000..d11803db28 --- /dev/null +++ b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/xfatest/.content.xml @@ -0,0 +1,27 @@ + + + + + + diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/xfatest/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/xfatest/.content.xml new file mode 100755 index 0000000000..cf7f21cd95 --- /dev/null +++ b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/xfatest/.content.xml @@ -0,0 +1,94 @@ + + + + + <_x0031_740725085254 jcr:primaryType="nt:unstructured"/> + + <_unnamed0_subform1740725098862 + fd:xfajson="\{"visible":true,"hideTitle":true,"icon":"article","name":"_unnamed0_subform","sling:resourceType":"core/fd/components/form/panelcontainer/v1/panelcontainer","jcr:title":"Unnamed 0 Subform","dataRef":"xfa[0].form[0].form1[0].#subform[0]","fieldType":"panel","enabled":true}" + jcr:primaryType="nt:unstructured" + jcr:title="Unnamed 0 Subform" + sling:resourceType="core/fd/components/form/panelcontainer/v1/panelcontainer" + dataRef="xfa[0].form[0].form1[0].#subform[0]" + enabled="{Boolean}true" + fieldType="panel" + hideTitle="{Boolean}true" + icon="article" + name="_unnamed0_subform" + visible="{Boolean}true"> + + + + + + + diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index 38362a2211..1521b1e8d8 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -90,6 +90,9 @@ /apps/core/fd/components/page + + /apps/core/fd/components/xfa-page + /apps/core/fd/af-clientlibs @@ -167,6 +170,7 @@ **/*.editorconfig **/*.stylelintrc.yaml **/*.eslintignore + **/main-xfa.js **/node/** **/node_modules/** @@ -352,6 +356,9 @@ /libs/core/fd/components/page + + /libs/core/fd/components/xfa-page + /libs/core/fd/af-clientlibs diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml new file mode 100644 index 0000000000..3bf1de3a89 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml @@ -0,0 +1,8 @@ + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/css.txt new file mode 100644 index 0000000000..e4a9cd93e9 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/css.txt @@ -0,0 +1,15 @@ +############################################################################### +# Copyright 2023 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. +############################################################################### \ No newline at end of file diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/js.txt new file mode 100644 index 0000000000..00b68a1429 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/js.txt @@ -0,0 +1,15 @@ +############################################################################### +# Copyright 2023 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. +############################################################################### diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/.content.xml new file mode 100644 index 0000000000..87e3ce2be1 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/.content.xml @@ -0,0 +1,8 @@ + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml index fc6d62c32d..5a4a7100a8 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml @@ -23,6 +23,12 @@ handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName" icon="viewSOMExpression" text="View Qualified Name"/> + + 0){ schemaRef = schemaRef[0].value; configuredFormModel = schemaRef; @@ -143,6 +176,13 @@ $(FDM_DROPDOWN_SELECTOR).val(schemaRef); } else if (schemaType == CONNECTOR) { $(CONNECTOR_DROPDOWN_SELECTOR).val(schemaRef); + } else if (schemaType == FORM_TEMPLATE) { + $(FORM_TEMPLATE_DROPDOWN_SELECTOR).val(schemaRef); + // Also set the form parameter for xdpRef when prefilling + if (isForm()) { + var afAssetPath = getAfAssetMetadataPath(); + addFormParameter(afAssetPath + '/xdpRef', schemaRef); + } } } }; @@ -192,6 +232,26 @@ } }; + function formTemplateSelectorOnChanged(dialog) { + var selectedSchema = dialog.find(FORM_TEMPLATE_DROPDOWN_SELECTOR); + if(selectedSchema.length > 0) { + selectedSchema = selectedSchema[0].value; + setElementValue(dialog, SCHEMA_REF, selectedSchema); + setElementValue(dialog, XDP_REF, selectedSchema); + setElementValue(dialog, DAM_SCHEMA_REF, selectedSchema); + if (isForm()) { + var afAssetPath = getAfAssetMetadataPath(); + addFormParameter(afAssetPath + '/xdpRef', selectedSchema); + } + isSchemaChanged = true; + if (configuredFormModel) { + confirmFormModelChange(selectedSchema, $(FORM_TEMPLATE_DROPDOWN_SELECTOR)); + } else { + toBeConfiguredFormModel = selectedSchema; + } + } + }; + function setElementValue(dialog, elementRef, value){ var element = dialog.find(elementRef); if(element.length > 0){ @@ -225,20 +285,29 @@ function hideContainersExcept(selectedSchemaType) { if (selectedSchemaType == JSON_SCHEMA) { $(FDM_CONTAINER).hide(); + $(FORM_TEMPLATE_CONTAINER).hide(); $(CONNECTOR_CONTAINER).hide(); $(SCHEMA_CONTAINER).show(); } else if (selectedSchemaType == FORM_DATA_MODEL) { $(SCHEMA_CONTAINER).hide(); + $(FORM_TEMPLATE_CONTAINER).hide(); $(CONNECTOR_CONTAINER).hide(); $(FDM_CONTAINER).show(); } else if (selectedSchemaType == CONNECTOR) { $(SCHEMA_CONTAINER).hide(); $(FDM_CONTAINER).hide(); + $(FORM_TEMPLATE_CONTAINER).hide(); $(CONNECTOR_CONTAINER).show(); - } else if (selectedSchemaType == 'none') { + } else if (selectedSchemaType == FORM_TEMPLATE) { $(FDM_CONTAINER).hide(); $(CONNECTOR_CONTAINER).hide(); $(SCHEMA_CONTAINER).hide(); + $(FORM_TEMPLATE_CONTAINER).show(); + } else if (selectedSchemaType == NONE) { + $(FDM_CONTAINER).hide(); + $(SCHEMA_CONTAINER).hide(); + $(CONNECTOR_CONTAINER).hide(); + $(FORM_TEMPLATE_CONTAINER).hide(); } }; @@ -266,7 +335,8 @@ var formModelSelector = dialog.find(FORM_MODEL_SELECTOR)[0], schemaSelector = dialog.find(SCHEMA_DROPDOWN_SELECTOR)[0], fdmSelector = dialog.find(FDM_DROPDOWN_SELECTOR)[0], - connectorSelector = dialog.find(CONNECTOR_DROPDOWN_SELECTOR)[0]; + connectorSelector = dialog.find(CONNECTOR_DROPDOWN_SELECTOR)[0], + formTemplateSelector = dialog.find(FORM_TEMPLATE_DROPDOWN_SELECTOR)[0]; if (formModelSelector) { formModelSelector.on("change", function() { selectFormModelOnChanged(dialog); @@ -287,6 +357,11 @@ connectorSelectorOnChanged(dialog); }); }; + if(formTemplateSelector) { + formTemplateSelector.on("change", function() { + formTemplateSelectorOnChanged(dialog); + }); + } selectFormModelOnLoad(dialog); } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md index 1fb501d511..3602149917 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md @@ -93,4 +93,6 @@ This Url should whitelist the AEM author/publish domain in the Cross Origin Reso Applying `data-cmp-auto-save` attribute to the `cmp-adaptiveform-container` block to control the auto-save functionality. If the attribute's value is set to true, auto-save will be enabled for the form; otherwise, it will not be triggered. This attribute will be set to true in published mode if enableAutoSave is enabled. +Applying `data-cmp-schema-type` attribute to the `cmp-adaptiveform-container` block to indicate the schema type of the form. This attribute is used to determine the appropriate form loading mechanism, particularly for XDP forms which require special handling. The value corresponds to the schema type from the FormContainer model (e.g., 'XDP', 'XSD', 'JSON', etc.). + Applying `data-cmp-hamburger-menu-enabled` attribute to the `cmp-adaptiveform-container` block to control the hamburger meu. If the attribute's value is set to true, hamburger menu will be enabled in the mobile view. \ No newline at end of file diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml index e3bf5979ef..b34d364dc1 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml @@ -136,6 +136,10 @@ jcr:primaryType="nt:unstructured" sling:resourceType="/libs/fd/af/connectors/rendercondition/marketo"/> + + + + + + + + + 0; + } catch(e) { + console.error('Error parsing xfaScripts', e, json['fd:xfaScripts']); + } + } + } + return false + } + + window.CQ.FormsCoreComponents.editorhooks.viewXfaScripts = function (editable) { + fetch(Granite.HTTP.externalize(editable.path + ".json")).then(async function (resp) { + const json = await resp.json(); + // Assuming `resp` contains the JSON string with `fd:xfaScripts` + var xfaScripts = JSON.parse(json['fd:xfaScripts']); + var dialogContent = document.createElement('div'); + + // Create a Coral Table + var table = document.createElement('coral-table'); + + // Create the header + var thead = document.createElement('coral-table-head'); + var headerRow = document.createElement('coral-table-row'); + + var eventNameHeader = document.createElement('coral-table-headercell'); + eventNameHeader.textContent = 'Event Name'; + var eventContentHeader = document.createElement('coral-table-headercell'); + eventContentHeader.textContent = 'Event Content'; + var disableHeader = document.createElement('coral-table-headercell'); + disableHeader.textContent = 'Disable'; + + headerRow.appendChild(eventNameHeader); + headerRow.appendChild(eventContentHeader); + headerRow.appendChild(disableHeader); + thead.appendChild(headerRow); + table.appendChild(thead); + + // Populate the table with data from xfaScripts + var tbody = document.createElement('coral-table-body'); + xfaScripts.forEach(function(script) { + var row = document.createElement('coral-table-row'); + + var nameCell = document.createElement('coral-table-cell'); + nameCell.textContent = script.runAt === "server" ? `${script.activity}(server)` : script.activity; + var contentCell = document.createElement('coral-table-cell'); + contentCell.innerHTML = script.value.replaceAll("\n", "
"); + + var checkboxCell = document.createElement('coral-table-cell'); + var checkbox = new Coral.Checkbox(); + checkbox.name = 'disableCheckbox'; + checkbox.on('change', function() { + script.disabled = this.checked; + }); + checkboxCell.appendChild(checkbox); + checkbox.checked = !!script.disabled; + if (script.runAt === "server") { + checkbox.disabled = true; + } + row.appendChild(nameCell); + row.appendChild(contentCell); + row.appendChild(checkboxCell); + + tbody.appendChild(row); + }); + table.appendChild(tbody); + + dialogContent.appendChild(table); + + // Create the dialog + var dialog = new Coral.Dialog().set({ + id: 'xfaScriptsDialog', + header: { + innerHTML: 'XFA Scripts' + }, + content: { + innerHTML: '' + }, + footer: {}, + closable: "on" + }); + + // Add the table to the dialog content + //dialog.content.appendChild(dialogContent); + + var okButton = new Coral.Button(); + okButton.label.textContent = 'OK'; + okButton.variant = Coral.Button.variant.PRIMARY; + okButton.addEventListener('click', function() { + // Prepare the modified xfaScripts for POST request + var modifiedXfaScripts = JSON.stringify({ 'fd:xfaScripts': JSON.stringify(xfaScripts) }); + $.ajax({ + url: editable.path, + type: 'POST', + data: { + "_charset_" : "UTF-8", + ':operation': 'import', + ':contentType': 'json', + ':content': modifiedXfaScripts, + ':replaceProperties': true + }, + success: function(response) { + console.log('Successfully posted the data'); + dialog.remove(); + }, + error: function(xhr, status, error) { + console.error('Error posting the data', error); + dialog.remove(); + } + }); + }); + dialog.footer.appendChild(okButton); + +// Append and show the dialog + document.body.appendChild(dialog); + + // add a listener on dialog show event + dialog.on('coral-overlay:open', function() { + dialog.content.appendChild(dialogContent); + }); + dialog.show(); + + }) + return true; + }; + +})(window, Granite.author, Coral); diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html index c0493c5d65..509df52406 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html @@ -42,6 +42,7 @@ data-cmp-page-lang="${container.containingPageLang}" data-cmp-path="${resource.path}" data-cmp-hamburger-menu-enabled="${container.isHamburgerMenuEnabled ? 'true' : 'false'}" + data-cmp-schema-type="${container.schemaType}" class="cmp-adaptiveform-container cmp-container ${wcmmode.edit ? 'cmp-adaptiveform-container--edit' : ''}" data-cmp-custom-functions-module-url="${configurationProvider.customFunctionModuleUrl}" dir="${container.languageDirection}" diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerview.js index 86f65a2ab5..c4df1c1302 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerview.js @@ -99,10 +99,12 @@ this.widgetObject.setDisplayValue(this._model.value); this.widgetObject.setCalendarWidgetValue(this._model.value); this.setInactive(); + this.triggerExit(); }, this.getWidget()); this.widgetObject.addEventListener('focus', (e) => { this.widgetObject.setValue(e.target.value); this.setActive(); + this.triggerEnter(); }, this.getWidget()); this.widgetObject.addEventListener('input', (e) => { if( e.target.value === '') { @@ -117,9 +119,11 @@ this.widget.addEventListener('blur', (e) => { this.setModelValue(e.target.value); this.setInactive(); + this.triggerExit(); }); this.widget.addEventListener('focus', (e) => { this.setActive(); + this.triggerEnter(); }); } } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/clientlibs/site/js/dropdownview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/clientlibs/site/js/dropdownview.js index d32907b7d7..1c95f33839 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/clientlibs/site/js/dropdownview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/clientlibs/site/js/dropdownview.js @@ -206,9 +206,11 @@ }); this.widget.addEventListener('focus', (e) => { this.setActive(); + this.triggerEnter(); }); this.widget.addEventListener('blur', (e) => { this.setInactive(); + this.triggerExit(); }); } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/clientlibs/site/js/emailinputview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/clientlibs/site/js/emailinputview.js index 41662f809c..b8974c5c7c 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/clientlibs/site/js/emailinputview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/clientlibs/site/js/emailinputview.js @@ -74,10 +74,12 @@ this.setModelValue(e.target.value); this.setWidgetValueToDisplayValue(); this.setInactive(); + this.triggerExit(); }); this.widget.addEventListener('focus', (e) => { this.setActive(); this.setWidgetValueToModelValue(); + this.triggerEnter(); }); } } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/clientlibs/site/js/numberinputview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/clientlibs/site/js/numberinputview.js index 8d737e0a0c..a81994501f 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/clientlibs/site/js/numberinputview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/clientlibs/site/js/numberinputview.js @@ -100,12 +100,14 @@ this.setModelValue(e.target.value); if(this.element) { this.setInactive(); + this.triggerExit(); } }); } this.getWidget().addEventListener('focus', (e) => { if (this.element) { this.setActive(); + this.triggerEnter(); } }); } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml index b9cf9ad1bb..428607e492 100755 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml @@ -25,5 +25,11 @@ handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName" icon="viewSOMExpression" text="View Qualified Name"/> + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/clientlibs/site/js/telephoneinputview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/clientlibs/site/js/telephoneinputview.js index 7fe8a2d048..ea43ca183f 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/clientlibs/site/js/telephoneinputview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/clientlibs/site/js/telephoneinputview.js @@ -74,10 +74,12 @@ this.setModelValue(e.target.value); this.setWidgetValueToDisplayValue(); this.setInactive(); + this.triggerExit(); }); this.widget.addEventListener('focus', (e) => { this.setActive(); this.setWidgetValueToModelValue(); + this.triggerEnter(); }); } } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/clientlibs/site/js/textinputview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/clientlibs/site/js/textinputview.js index e2119a07df..2c075f12c1 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/clientlibs/site/js/textinputview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/clientlibs/site/js/textinputview.js @@ -74,10 +74,12 @@ this.setModelValue(e.target.value); this.setWidgetValueToDisplayValue(); this.setInactive(); + this.triggerExit(); }); this.widget.addEventListener('focus', (e) => { this.setActive(); this.setWidgetValueToModelValue(); + this.triggerEnter(); }); } } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/.content.xml new file mode 100644 index 0000000000..3977155bee --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/.content.xml @@ -0,0 +1,18 @@ + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/.content.xml new file mode 100644 index 0000000000..73a43f51ca --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/.content.xml @@ -0,0 +1,20 @@ + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/.content.xml new file mode 100644 index 0000000000..b287296481 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/.content.xml @@ -0,0 +1,23 @@ + + + \ No newline at end of file diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/README.md new file mode 100644 index 0000000000..0ba894f713 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/README.md @@ -0,0 +1,44 @@ + +Adaptive Form XFA Core Page (v1) +==== +Adaptive Form XFA Core Page component v1 which extends the forms [Page](https://github.com/adobe/aem-core-forms-components/tree/master/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/page/v1/page) Component. + +## Features + +* This is the page component for the Adaptive Form Core Components with XFA support. +* Loads all required XFA-specific clientlibs in the headers and footers: + * Base runtime clientlib (core.forms.components.runtime.base.xfa) which includes: + * XFA core dependencies: + * xfaforms.3rdparty + * xfaforms.I18N.en + * xfaforms.formbridge + * xfaforms.xfalibutil + * xfaforms.xfalibwidgets + * xfaforms.formcalc + * xfaforms.xfalibModel + * Common dependencies: + * granite.csrf.standalone.fetchsupport + * af.rum + * dompurify + * All-in-one clientlib (core.forms.components.runtime.all.xfa) which includes: + * Base XFA runtime (core.forms.components.runtime.base.xfa) + * All form component runtimes (textinput, dropdown, etc.) + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customfooterlibs.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customfooterlibs.html new file mode 100644 index 0000000000..2206dc0229 --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customfooterlibs.html @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customheaderlibs.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customheaderlibs.html new file mode 100644 index 0000000000..e730a374fc --- /dev/null +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customheaderlibs.html @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/ui.frontend/clientlib-dev.config.cjs b/ui.frontend/clientlib-dev.config.cjs index 10173a641f..ca0e2c2200 100644 --- a/ui.frontend/clientlib-dev.config.cjs +++ b/ui.frontend/clientlib-dev.config.cjs @@ -14,43 +14,17 @@ * limitations under the License. ******************************************************************************/ -const path = require('path'); +const baseConfig = require('./clientlib.config.cjs'); -const CLIENTLIB_DIR = path.join( - __dirname, - '..', - 'ui.af.apps', - 'src', - 'main', - 'content', - 'jcr_root', - 'apps', - 'core', - 'fd', - 'af-clientlibs' -); - -const libsBaseConfig = { - allowProxy: true, - serializationFormat: 'xml', - cssProcessor: ['default:none', 'min:none'], - jsProcessor: ['default:none', 'min:none'] -}; - -// Config for `aem-clientlib-generator` module.exports = { - context: __dirname, - clientLibRoot: CLIENTLIB_DIR, - libs: [ - { - ...libsBaseConfig, - name: 'core-forms-components-runtime-base', - categories: ['core.forms.components.runtime.base'], - dependencies: ['granite.csrf.standalone.fetchsupport', 'af.rum', 'dompurify'], - assets: { - js: ['dist/main.js'], - resources: ['dist/main.js.map'] - } - } - ] + ...baseConfig, + libs: [ + { + ...baseConfig.libs[0], + assets: { + js: ['dist/main.js'], + resources: ['dist/main.js.map'] + } + } + ] }; diff --git a/ui.frontend/clientlib-dev.xfa.config.cjs b/ui.frontend/clientlib-dev.xfa.config.cjs new file mode 100644 index 0000000000..7313cc7392 --- /dev/null +++ b/ui.frontend/clientlib-dev.xfa.config.cjs @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright 2022 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. + ******************************************************************************/ + +const baseConfig = require('./clientlib.config.cjs'); + +module.exports = { + ...baseConfig, + libs: [ + { + ...baseConfig.libs[0], + name: 'core-forms-components-runtime-base-xfa', + categories: ['core.forms.components.runtime.base.xfa'], + dependencies: [...baseConfig.libs[0].dependencies, ...baseConfig.xfaDependencies], + assets: { + js: ['dist/main-xfa.js'], + resources: ['dist/main-xfa.js.map'] + } + } + ] +}; \ No newline at end of file diff --git a/ui.frontend/clientlib.config.cjs b/ui.frontend/clientlib.config.cjs index e9b3c715c9..f67c27c8fc 100644 --- a/ui.frontend/clientlib.config.cjs +++ b/ui.frontend/clientlib.config.cjs @@ -31,25 +31,36 @@ const CLIENTLIB_DIR = path.join( ); const libsBaseConfig = { - allowProxy: true, - serializationFormat: 'xml', - cssProcessor: ['default:none', 'min:none'], - jsProcessor: ['default:none', 'min:none'] + allowProxy: true, + serializationFormat: 'xml', + cssProcessor: ['default:none', 'min:none'], + jsProcessor: ['default:none', 'min:none'] }; +const xfaDependencies = [ + 'xfaforms.3rdparty', + 'xfaforms.I18N.en', + 'xfaforms.formbridge', + 'xfaforms.xfalibutil', + 'xfaforms.xfalibwidgets', + 'xfaforms.formcalc', + 'xfaforms.xfalibModel' +]; + // Config for `aem-clientlib-generator` module.exports = { - context: __dirname, - clientLibRoot: CLIENTLIB_DIR, - libs: [ - { - ...libsBaseConfig, - name: 'core-forms-components-runtime-base', - categories: ['core.forms.components.runtime.base'], - dependencies: ['granite.csrf.standalone.fetchsupport', 'af.rum', 'dompurify'], - assets: { - js: ['dist/main.js'] - } - } - ] + context: __dirname, + clientLibRoot: CLIENTLIB_DIR, + libs: [ + { + ...libsBaseConfig, + name: 'core-forms-components-runtime-base', + categories: ['core.forms.components.runtime.base'], + dependencies: ['granite.csrf.standalone.fetchsupport', 'af.rum', 'dompurify'], + assets: { + js: ['dist/main.js'] + } + } + ], + xfaDependencies }; diff --git a/ui.frontend/clientlib.xfa.config.cjs b/ui.frontend/clientlib.xfa.config.cjs new file mode 100644 index 0000000000..f7157be356 --- /dev/null +++ b/ui.frontend/clientlib.xfa.config.cjs @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright 2022 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. + ******************************************************************************/ + +const baseConfig = require('./clientlib.config.cjs'); + +module.exports = { + ...baseConfig, + libs: [ + { + ...baseConfig.libs[0], + name: 'core-forms-components-runtime-base-xfa', + categories: ['core.forms.components.runtime.base.xfa'], + dependencies: [...baseConfig.libs[0].dependencies, ...baseConfig.xfaDependencies], + assets: { + js: ['dist/main-xfa.js'] + } + } + ] +}; \ No newline at end of file diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json index b32195bf61..840173599c 100644 --- a/ui.frontend/package-lock.json +++ b/ui.frontend/package-lock.json @@ -10,6 +10,7 @@ "license": "Apache-2.0", "dependencies": { "@aemforms/af-core": "^0.22.114", + "@aemforms/af-core-xfa": "^0.1.6", "@aemforms/af-custom-functions": "1.0.14", "@aemforms/af-formatters": "^0.22.114" }, @@ -115,15 +116,24 @@ "@aemforms/af-formatters": "^0.22.114" } }, + "node_modules/@aemforms/af-core-xfa": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@aemforms/af-core-xfa/-/af-core-xfa-0.1.6.tgz", + "integrity": "sha512-9pRZM9+AddJXMlF0f3gOGS0HV+yTM0VqOaz2dWZZz9N1YnF431dBKID3mqt1PdbrF8xw/ocSOfLiELHbDjJp/A==", + "dependencies": { + "@adobe/json-formula": "0.1.50", + "@aemforms/af-formatters": "^0.22.116" + } + }, "node_modules/@aemforms/af-custom-functions": { "version": "1.0.14", "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.14.tgz", "integrity": "sha512-rxFTfGKj9lMeFx0WsOempSavgXKFQZNinr8BLjREVagkuZesQjzlSn/mjoWrLf1YC3VPUnFOj408SX+SX0rChQ==" }, "node_modules/@aemforms/af-formatters": { - "version": "0.22.114", - "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.114.tgz", - "integrity": "sha512-kIrWTAzLgv2Te2sq8IQl4P0AtFAN1t3znnXXgMPp9MO6P+pB4mqaFlF+DUdE1BpbYdeEYdUxZioL/oq5NVtNag==" + "version": "0.22.116", + "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.116.tgz", + "integrity": "sha512-iI4EzP0rLXqUUVryTbS6i1Fl+28eEHvHylvecAV9xH4LiYP4yRqrA6jJbuguA9/3fZBCKCXWXchtQfABWRSGzA==" }, "node_modules/@ampproject/remapping": { "version": "2.2.1", @@ -11130,15 +11140,24 @@ "@aemforms/af-formatters": "^0.22.114" } }, + "@aemforms/af-core-xfa": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@aemforms/af-core-xfa/-/af-core-xfa-0.1.6.tgz", + "integrity": "sha512-9pRZM9+AddJXMlF0f3gOGS0HV+yTM0VqOaz2dWZZz9N1YnF431dBKID3mqt1PdbrF8xw/ocSOfLiELHbDjJp/A==", + "requires": { + "@adobe/json-formula": "0.1.50", + "@aemforms/af-formatters": "^0.22.116" + } + }, "@aemforms/af-custom-functions": { "version": "1.0.14", "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.14.tgz", "integrity": "sha512-rxFTfGKj9lMeFx0WsOempSavgXKFQZNinr8BLjREVagkuZesQjzlSn/mjoWrLf1YC3VPUnFOj408SX+SX0rChQ==" }, "@aemforms/af-formatters": { - "version": "0.22.114", - "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.114.tgz", - "integrity": "sha512-kIrWTAzLgv2Te2sq8IQl4P0AtFAN1t3znnXXgMPp9MO6P+pB4mqaFlF+DUdE1BpbYdeEYdUxZioL/oq5NVtNag==" + "version": "0.22.116", + "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.116.tgz", + "integrity": "sha512-iI4EzP0rLXqUUVryTbS6i1Fl+28eEHvHylvecAV9xH4LiYP4yRqrA6jJbuguA9/3fZBCKCXWXchtQfABWRSGzA==" }, "@ampproject/remapping": { "version": "2.2.1", diff --git a/ui.frontend/package.json b/ui.frontend/package.json index d4d2620ad8..6ad7cba519 100644 --- a/ui.frontend/package.json +++ b/ui.frontend/package.json @@ -4,8 +4,10 @@ "description": "", "scripts": { "test": "jest", - "build:dev": "webpack --config webpack.dev.cjs && clientlib --verbose clientlib-dev.config.cjs", - "build:prod": "webpack --config webpack.prod.cjs && clientlib --verbose clientlib.config.cjs" + "build:dev": "webpack --config webpack.dev.cjs && webpack --config webpack.dev.cjs --env xfa && npm run clientlib:dev", + "build:prod": "webpack --config webpack.prod.cjs && webpack --config webpack.prod.cjs --env xfa && npm run clientlib:prod", + "clientlib:dev": "clientlib --verbose clientlib-dev.config.cjs && clientlib --verbose clientlib-dev.xfa.config.cjs", + "clientlib:prod": "clientlib --verbose clientlib.config.cjs && clientlib --verbose clientlib.xfa.config.cjs" }, "keywords": [], "author": "", @@ -24,6 +26,7 @@ }, "dependencies": { "@aemforms/af-core": "^0.22.114", + "@aemforms/af-core-xfa": "^0.1.6", "@aemforms/af-formatters": "^0.22.114", "@aemforms/af-custom-functions": "1.0.14" } diff --git a/ui.frontend/src/handleXfa.js b/ui.frontend/src/handleXfa.js new file mode 100644 index 0000000000..f1a6468b58 --- /dev/null +++ b/ui.frontend/src/handleXfa.js @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright 2024 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. + ******************************************************************************/ + +export function loadXfa(formdom, renderContext) { + if (window.xfalib) { + formBridge.registerConfig("disabledServerScripts", ["initialize", "$formready", "$layoutready"]) + const xfaJson = JSON.parse(JSON.parse(JSON.stringify(formdom))); + xfalib.runtime.renderContext = JSON.parse(JSON.parse(JSON.stringify(renderContext))); + xfalib.script.XfaModelRegistry.prototype.createModel(xfaJson); + //initialize Acrobat specific scripts + new xfalib.acrobat.Acrobat(); + return function (model) { + model._syncXfaProps(); + xfalib.runtime.xfa.form._initialize(true); + $(window).trigger("XfaInitialized"); + } + } +} diff --git a/ui.frontend/src/utils.js b/ui.frontend/src/utils.js index 16e03a285a..887fe77bb2 100644 --- a/ui.frontend/src/utils.js +++ b/ui.frontend/src/utils.js @@ -17,7 +17,8 @@ import {Constants} from "./constants.js"; import HTTPAPILayer from "./HTTPAPILayer.js"; import {customFunctions} from "./customFunctions.js"; -import {FunctionRuntime} from '@aemforms/af-core' +import {FunctionRuntime} from '@aemforms/af-core'; +import {loadXfa} from "./handleXfa"; /** * @module FormView @@ -332,7 +333,22 @@ class Utils { if (_path == null) { console.error(`data-${Constants.NS}-${formContainerClass}-path attribute is not present in the HTML element. Form cannot be initialized` ) } else { - const _formJson = await HTTPAPILayer.getFormDefinition(_path, _pageLang); + let _formJson, callback; + const loader = elements[i].parentElement?.querySelector('[data-cmp-adaptiveform-container-loader]'); + // Get the schema type from the data attribute with null safety + const schemaType = elements[i].getAttribute('data-cmp-schema-type'); + // Check if this is an XDP form based on the schema type + // According to GuideSchemaType enum, XDP has value of FORM_TEMPLATES, not 'XFA' + if (loader && schemaType && (schemaType === 'XDP' || schemaType === 'FORM_TEMPLATES')) { + const id = loader.getAttribute('data-cmp-adaptiveform-container-loader'); + const response = await fetch(`/adobe/forms/af/${id}`) + _formJson = (await response.json()).afModelDefinition; + _formJson.id = id; + //window.formJson = _formJson + callback = loadXfa(_formJson.formdom, _formJson.xfaRenderContext); + } else { + _formJson = await HTTPAPILayer.getFormDefinition(_path, _pageLang); + } console.debug("fetched model json", _formJson); await this.registerCustomFunctionsV2( _formJson); await this.registerCustomFunctionsByUrl(customFunctionUrl); @@ -344,6 +360,14 @@ class Utils { _prefillData = await HTTPAPILayer.getJson(_formJson.properties['fd:dataUrl'] + "?" + Object.keys(params).map(p => p+"="+params[p]).join("&")) _prefillData = _prefillData || {}; _prefillData = Utils.stripIfWrapped(_prefillData); + if(window.formBridge){ + window.formBridge.restoreFormState({ + formState : {xfaDom: _prefillData.data.xfaDom, xfaRenderContext: _prefillData.data.xfaRenderContext}, + context : this, + error : function() {}, + success : function () {} + }); + } } const formContainer = await createFormContainer({ _formJson, @@ -351,6 +375,9 @@ class Utils { _path, _element: elements[i] }); + if (typeof callback === 'function') { + callback(formContainer.getModel()); + } Utils.initializeAllFields(formContainer); const event = new CustomEvent(Constants.FORM_CONTAINER_INITIALISED, { "detail": formContainer }); document.dispatchEvent(event); diff --git a/ui.frontend/src/view/FormCheckBox.js b/ui.frontend/src/view/FormCheckBox.js index 6c47438cd4..9eee73e711 100644 --- a/ui.frontend/src/view/FormCheckBox.js +++ b/ui.frontend/src/view/FormCheckBox.js @@ -46,7 +46,14 @@ class FormCheckBox extends FormFieldBase { const value = this.widget.checked ? this._onValue : this._offValue; this._model.dispatch(new FormView.Actions.UIChange({'value': value})); }) - + this.widget.addEventListener('focus', (e) => { + this.setActive(); + this.triggerEnter(); + }); + this.widget.addEventListener('blur', (e) => { + this.setInactive(); + this.triggerExit(); + }); } } diff --git a/ui.frontend/src/view/FormField.js b/ui.frontend/src/view/FormField.js index 22afc7ad75..fb38a5aebe 100644 --- a/ui.frontend/src/view/FormField.js +++ b/ui.frontend/src/view/FormField.js @@ -102,6 +102,14 @@ class FormField { return this.element.getAttribute(Constants.DATA_ATTRIBUTE_ACTIVE) === 'true'; } + triggerExit() { + this._model.dispatch(new FormView.Actions.CustomEvent('xfaexit')); + } + + triggerEnter() { + this._model.dispatch(new FormView.Actions.CustomEvent('xfaenter')); + } + /** * Returns the form container path of the form field. * @returns {string} The form container path. diff --git a/ui.frontend/webpack.common.cjs b/ui.frontend/webpack.common.cjs index f1d76bfd68..0cb36678e5 100644 --- a/ui.frontend/webpack.common.cjs +++ b/ui.frontend/webpack.common.cjs @@ -15,15 +15,20 @@ ******************************************************************************/ const path = require('path'); -module.exports = { +module.exports = (env = {}) => ({ entry: './src/index.js', output: { - filename: 'main.js', + filename: env.xfa ? '[name]-xfa.js' : '[name].js', path: path.resolve(__dirname, 'dist'), - clean: true, + clean: !env.xfa, library: { name: 'FormView', type: 'window' }, }, -}; \ No newline at end of file + resolve: env.xfa ? { + alias: { + '@aemforms/af-core': '@aemforms/af-core-xfa' + } + } : {} +}); \ No newline at end of file diff --git a/ui.frontend/webpack.dev.cjs b/ui.frontend/webpack.dev.cjs index 14b453ef49..92cb5ee093 100644 --- a/ui.frontend/webpack.dev.cjs +++ b/ui.frontend/webpack.dev.cjs @@ -17,15 +17,18 @@ const webpack = require('webpack'); const { merge } = require('webpack-merge'); const common = require('./webpack.common.cjs'); -const path = require('path'); -module.exports = () => { - return merge(common, { +module.exports = (env = {}) => { + const sourcemapPath = env.xfa ? + '/libs/core/fd/clientlibs/core-forms-components-runtime-xfa/resources/[name].js.map' : + '/libs/core/fd/clientlibs/core-forms-components-runtime/resources/[name].js.map'; + + return merge(common(env), { mode: 'development', devtool: false, plugins: [new webpack.SourceMapDevToolPlugin({ - append: '\n//# sourceMappingURL=/libs/core/fd/clientlibs/core-forms-components-runtime/resources/[name].js.map', - filename: '[name].js.map' - })], + append: `\n//# sourceMappingURL=${sourcemapPath}`, + filename: env.xfa ? '[name]-xfa.js.map' : '[name].js.map' + })] }); }; diff --git a/ui.frontend/webpack.prod.cjs b/ui.frontend/webpack.prod.cjs index ca66c65d15..b5581072eb 100644 --- a/ui.frontend/webpack.prod.cjs +++ b/ui.frontend/webpack.prod.cjs @@ -15,10 +15,9 @@ ******************************************************************************/ const { merge } = require('webpack-merge'); const common = require('./webpack.common.cjs'); -const path = require('path'); -module.exports = () => { - return merge(common, { - mode: 'production', +module.exports = (env = {}) => { + return merge(common(env), { + mode: 'production' }); }; diff --git a/ui.tests/test-module/specs/xfa/xfa.runtime.cy.js b/ui.tests/test-module/specs/xfa/xfa.runtime.cy.js new file mode 100644 index 0000000000..b0cebc71a8 --- /dev/null +++ b/ui.tests/test-module/specs/xfa/xfa.runtime.cy.js @@ -0,0 +1,53 @@ +/******************************************************************************* + * 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. + ******************************************************************************/ +describe("Form Runtime with XFA", () => { + if(cy.af.isLatestAddon()) { + const pagePath = "content/forms/af/core-components-it/samples/xfatest.html" + const IS = "adaptiveFormButton" + + let formContainer = null + let toggle_array = []; + + beforeEach(() => { + cy.fetchFeatureToggles().then((response) => { + if (response.status === 200) { + toggle_array = response.body.enabled; + } + }); + + if (toggle_array && toggle_array.includes("FT_FORMS-14518")) { + cy.previewForm(pagePath).then(p => { + formContainer = p; + }) + } + }); + + + it(`xfa rules would work`, () => { + if (toggle_array && toggle_array.includes("FT_FORMS-14518")) { + const [textInputId] = Object.entries(formContainer._fields)[0]; + const [showButtonId] = Object.entries(formContainer._fields)[3]; + const [hideButtonId] = Object.entries(formContainer._fields)[4]; + cy.get(`#${showButtonId}`).find('.cmp-adaptiveform-button__widget').click(); + cy.get(`#${textInputId}`).should("be.visible"); + cy.get(`#${hideButtonId}`).find('.cmp-adaptiveform-button__widget').click(); + cy.get(`#${textInputId}`).should("not.be.visible"); + cy.get(`#${showButtonId}`).find('.cmp-adaptiveform-button__widget').click(); + cy.get(`#${textInputId}`).should("be.visible"); + } + }); + } +}) From ab44357205b9884406c954bf5ffa9cd9bdefbcb6 Mon Sep 17 00:00:00 2001 From: Rishi Mehta Date: Fri, 28 Feb 2025 19:17:52 +0530 Subject: [PATCH 29/36] @releng [maven-scm] :prepare release core-forms-components-reactor-3.0.96 --- all/pom.xml | 4 ++-- bundles/af-core/pom.xml | 4 ++-- bundles/core/pom.xml | 4 ++-- examples/all/pom.xml | 4 ++-- examples/core/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/ui.apps/pom.xml | 4 ++-- examples/ui.content/pom.xml | 4 ++-- it/apps/pom.xml | 4 ++-- it/config/pom.xml | 4 ++-- it/content/pom.xml | 4 ++-- it/core/pom.xml | 4 ++-- jsdocs/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- ui.af.apps/pom.xml | 4 ++-- ui.apps/pom.xml | 4 ++-- ui.frontend/pom.xml | 2 +- ui.tests/pom.xml | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 93d23a90b0..92e1ef9cbd 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index 324773d394..e8a3e9d031 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index 952b1de1d8..d4d355d0ca 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/examples/all/pom.xml b/examples/all/pom.xml index 38fc318c63..d02bb9099e 100644 --- a/examples/all/pom.xml +++ b/examples/all/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/examples/core/pom.xml b/examples/core/pom.xml index 75f55e140b..993d905a79 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/examples/pom.xml b/examples/pom.xml index 31a69fe0d7..557290116f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../parent/pom.xml diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml index bbb96e256d..bf1da78724 100644 --- a/examples/ui.apps/pom.xml +++ b/examples/ui.apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml index 35836907e8..8b2f49eb9a 100644 --- a/examples/ui.content/pom.xml +++ b/examples/ui.content/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/it/apps/pom.xml b/it/apps/pom.xml index a746a68c4c..8361a60f63 100644 --- a/it/apps/pom.xml +++ b/it/apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../../parent/pom.xml @@ -32,7 +32,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/it/config/pom.xml b/it/config/pom.xml index 1136734974..a1c553a589 100644 --- a/it/config/pom.xml +++ b/it/config/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/it/content/pom.xml b/it/content/pom.xml index 23d5ed8114..7ca09ea9b6 100644 --- a/it/content/pom.xml +++ b/it/content/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/it/core/pom.xml b/it/core/pom.xml index d9f840e713..6617fec81b 100644 --- a/it/core/pom.xml +++ b/it/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml index a60e548c29..177c42a472 100644 --- a/jsdocs/pom.xml +++ b/jsdocs/pom.xml @@ -22,7 +22,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/parent/pom.xml b/parent/pom.xml index 720d732549..4b90deea07 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent pom - 3.0.95-SNAPSHOT + 3.0.96 AEM Forms Core Components - Parent Parent POM for AEM Forms Core Components @@ -31,7 +31,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 diff --git a/pom.xml b/pom.xml index 35a38ec510..a382613f47 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 parent/pom.xml @@ -77,7 +77,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index acbb40da10..22ed30ae1f 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 27c2a7be64..e3f9ef3461 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - HEAD + core-forms-components-reactor-3.0.96 Adobe diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml index 1609ae5477..5fa5e5c03f 100644 --- a/ui.frontend/pom.xml +++ b/ui.frontend/pom.xml @@ -16,7 +16,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../parent/pom.xml 4.0.0 diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml index 7cf7e53d06..d26de3b713 100644 --- a/ui.tests/pom.xml +++ b/ui.tests/pom.xml @@ -24,7 +24,7 @@ com.adobe.aem core-forms-components-parent - 3.0.95-SNAPSHOT + 3.0.96 ../parent/pom.xml From a670a6775f0ce5ff0bc60b3c1abd309d9c880766 Mon Sep 17 00:00:00 2001 From: Rishi Mehta Date: Fri, 28 Feb 2025 19:17:52 +0530 Subject: [PATCH 30/36] @releng [maven-scm] :prepare for next development iteration --- all/pom.xml | 4 ++-- bundles/af-core/pom.xml | 4 ++-- bundles/core/pom.xml | 4 ++-- examples/all/pom.xml | 4 ++-- examples/core/pom.xml | 4 ++-- examples/pom.xml | 2 +- examples/ui.apps/pom.xml | 4 ++-- examples/ui.content/pom.xml | 4 ++-- it/apps/pom.xml | 4 ++-- it/config/pom.xml | 4 ++-- it/content/pom.xml | 4 ++-- it/core/pom.xml | 4 ++-- jsdocs/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- pom.xml | 4 ++-- ui.af.apps/pom.xml | 4 ++-- ui.apps/pom.xml | 4 ++-- ui.frontend/pom.xml | 2 +- ui.tests/pom.xml | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 92e1ef9cbd..4a431898e9 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index e8a3e9d031..417ee0987d 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml index d4d355d0ca..a5aa4a6f19 100644 --- a/bundles/core/pom.xml +++ b/bundles/core/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../../parent/pom.xml @@ -38,7 +38,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/examples/all/pom.xml b/examples/all/pom.xml index d02bb9099e..36e1867a39 100644 --- a/examples/all/pom.xml +++ b/examples/all/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/examples/core/pom.xml b/examples/core/pom.xml index 993d905a79..a6f666e4cb 100644 --- a/examples/core/pom.xml +++ b/examples/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/examples/pom.xml b/examples/pom.xml index 557290116f..c31d7078ba 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../parent/pom.xml diff --git a/examples/ui.apps/pom.xml b/examples/ui.apps/pom.xml index bf1da78724..a69ea39768 100644 --- a/examples/ui.apps/pom.xml +++ b/examples/ui.apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/examples/ui.content/pom.xml b/examples/ui.content/pom.xml index 8b2f49eb9a..415a0cd28a 100644 --- a/examples/ui.content/pom.xml +++ b/examples/ui.content/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/it/apps/pom.xml b/it/apps/pom.xml index 8361a60f63..92da38a53d 100644 --- a/it/apps/pom.xml +++ b/it/apps/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../../parent/pom.xml @@ -32,7 +32,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/it/config/pom.xml b/it/config/pom.xml index a1c553a589..3b074a272c 100644 --- a/it/config/pom.xml +++ b/it/config/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/it/content/pom.xml b/it/content/pom.xml index 7ca09ea9b6..492c249e37 100644 --- a/it/content/pom.xml +++ b/it/content/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../../parent/pom.xml @@ -34,7 +34,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/it/core/pom.xml b/it/core/pom.xml index 6617fec81b..de176d71df 100644 --- a/it/core/pom.xml +++ b/it/core/pom.xml @@ -18,7 +18,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../../parent/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/jsdocs/pom.xml b/jsdocs/pom.xml index 177c42a472..e58837f193 100644 --- a/jsdocs/pom.xml +++ b/jsdocs/pom.xml @@ -22,7 +22,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../parent/pom.xml @@ -39,7 +39,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/parent/pom.xml b/parent/pom.xml index 4b90deea07..c0eed8ad9d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent pom - 3.0.96 + 3.0.97-SNAPSHOT AEM Forms Core Components - Parent Parent POM for AEM Forms Core Components @@ -31,7 +31,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD diff --git a/pom.xml b/pom.xml index a382613f47..4a2b353f41 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT parent/pom.xml @@ -77,7 +77,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index 22ed30ae1f..b22c2dac0b 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index e3f9ef3461..556ee7a5bd 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -20,7 +20,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../parent/pom.xml @@ -37,7 +37,7 @@ scm:git:https://github.com/adobe/aem-core-forms-components scm:git:git@github.com:adobe/aem-core-forms-components.git https://github.com/adobe/aem-core-forms-components - core-forms-components-reactor-3.0.96 + HEAD Adobe diff --git a/ui.frontend/pom.xml b/ui.frontend/pom.xml index 5fa5e5c03f..3ad807780c 100644 --- a/ui.frontend/pom.xml +++ b/ui.frontend/pom.xml @@ -16,7 +16,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/ui.tests/pom.xml b/ui.tests/pom.xml index d26de3b713..27e045bf9e 100644 --- a/ui.tests/pom.xml +++ b/ui.tests/pom.xml @@ -24,7 +24,7 @@ com.adobe.aem core-forms-components-parent - 3.0.96 + 3.0.97-SNAPSHOT ../parent/pom.xml From eea08ebbc8d4a111a7dc5f13c9022dc7a9b3c696 Mon Sep 17 00:00:00 2001 From: ci-build Date: Fri, 28 Feb 2025 14:08:35 +0000 Subject: [PATCH 31/36] Update VERSIONS.md and README.md to include version 3.0.96 --- README.md | 2 +- VERSIONS.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d40d119959..09965e796b 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ The latest version of the AEM Forms Core Components, require the below minimum s | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | -| 3.0.94 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.96 | 2.24.6 | Continual | 11 | 3.3.9+ | For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md). diff --git a/VERSIONS.md b/VERSIONS.md index 62d7be7820..565dac0ebf 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -4,6 +4,7 @@ See below for a full list of minimum system requirements for historical versions | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | +| 3.0.96 | 2.24.6 | Continual | 11 | 3.3.9+ | | 3.0.94 | 2.24.6 | Continual | 11 | 3.3.9+ | | 3.0.92 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.90 | 2.24.6+ | Continual | 11 | 3.3.9+ | From d72110a24f9e042269c73872e8f617024f377968 Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Sat, 1 Mar 2025 18:41:05 +0530 Subject: [PATCH 32/36] Update VERSIONS.md --- VERSIONS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSIONS.md b/VERSIONS.md index 565dac0ebf..5b145501ae 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -4,8 +4,8 @@ See below for a full list of minimum system requirements for historical versions | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | -| 3.0.96 | 2.24.6 | Continual | 11 | 3.3.9+ | -| 3.0.94 | 2.24.6 | Continual | 11 | 3.3.9+ | +| 3.0.96 | 2.24.6+ | Continual | 11 | 3.3.9+ | +| 3.0.94 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.92 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.90 | 2.24.6+ | Continual | 11 | 3.3.9+ | | 3.0.86 | 2.24.6+ | Continual | 11 | 3.3.9+ | From 8ca1bb096207462979ac928c5c4fec90913fa64a Mon Sep 17 00:00:00 2001 From: Rishi Mehta <69448117+rismehta@users.noreply.github.com> Date: Sat, 1 Mar 2025 18:41:26 +0530 Subject: [PATCH 33/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09965e796b..54f05e500f 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ The latest version of the AEM Forms Core Components, require the below minimum s | Forms Core Components | WCM Core Components | AEM Forms as a cloud service | Java | Maven | |-----------------------|---------------------| ---------------------------- | ----- | ------ | -| 3.0.96 | 2.24.6 | Continual | 11 | 3.3.9+ | +| 3.0.96 | 2.24.6+ | Continual | 11 | 3.3.9+ | For a list of requirements for previous versions, see [Historical System Requirements](VERSIONS.md). From d95f8cf4866cc6e67d1d31ee369f11337a0f8803 Mon Sep 17 00:00:00 2001 From: Rishi Mehta Date: Mon, 3 Mar 2025 10:08:53 +0530 Subject: [PATCH 34/36] Updating read me --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 54f05e500f..09c04b1251 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,12 @@ https://opensource.adobe.com/aem-core-forms-components/ - [Turnstile](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/turnstile/v1/turnstile) +### XFA-based Form + +- [XFA Page](ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page) + +To create XFA-based core component forms, you need to use the XFA Page component. This component serves as the foundation for rendering XFA forms. + ## System Requirements The latest version of the AEM Forms Core Components, require the below minimum system requirements: From fe5c31543c87b639e3d3611101e0fde19000ea41 Mon Sep 17 00:00:00 2001 From: Rishi Mehta Date: Tue, 4 Mar 2025 12:30:34 +0530 Subject: [PATCH 35/36] Revert "FORMS-18986 XFA to AF (#1532)" This reverts commit 9b1eb2a1f9e5f2776242f37c0a653650d34550f3. --- .gitignore | 1 - .../internal/form/ReservedProperties.java | 2 - .../util/AbstractFormComponentImpl.java | 39 +-- .../util/AbstractOptionsFieldImpl.java | 5 +- .../models/v1/form/CheckBoxGroupImplTest.java | 13 - .../util/AbstractFormComponentImplTest.java | 33 +-- .../form/checkboxgroup/test-content.json | 20 -- .../form/componentswithrule/test-content.json | 11 - ...mpl.dev.DynamicToggleProviderImpl.cfg.json | 3 +- .../samples/showHideRule.xdp/.content.xml | 28 -- .../_jcr_content/renditions/original | 255 ------------------ .../renditions/original.dir/.content.xml | 8 - .../_jcr_content/renditions/print | Bin 5742 -> 0 bytes .../renditions/print.dir/.content.xml | 8 - .../samples/xfatest/.content.xml | 27 -- .../samples/xfatest/.content.xml | 94 ------- ui.af.apps/pom.xml | 7 - .../.content.xml | 8 - .../css.txt | 15 -- .../js.txt | 15 -- .../.content.xml | 8 - .../form/base/v1/base/_cq_editConfig.xml | 6 - .../form/button/v1/button/_cq_editConfig.xml | 6 - .../clientlibs/editor/js/editDialog.js | 85 +----- .../form/container/v2/container/README.md | 2 - .../v2/container/_cq_dialog/.content.xml | 29 -- .../editorhook/js/qualifiedNameHook.js | 139 +--------- .../container/v2/container/container.html | 1 - .../clientlibs/site/js/datepickerview.js | 4 - .../clientlibs/site/js/dropdownview.js | 2 - .../clientlibs/site/js/emailinputview.js | 2 - .../clientlibs/site/js/numberinputview.js | 2 - .../v1/panelcontainer/_cq_editConfig.xml | 6 - .../clientlibs/site/js/telephoneinputview.js | 2 - .../clientlibs/site/js/textinputview.js | 2 - .../core/fd/components/xfa-page/.content.xml | 18 -- .../fd/components/xfa-page/v1/.content.xml | 20 -- .../xfa-page/v1/xfa-page/.content.xml | 23 -- .../components/xfa-page/v1/xfa-page/README.md | 44 --- .../v1/xfa-page/customfooterlibs.html | 33 --- .../v1/xfa-page/customheaderlibs.html | 24 -- ui.frontend/clientlib-dev.config.cjs | 48 +++- ui.frontend/clientlib-dev.xfa.config.cjs | 33 --- ui.frontend/clientlib.config.cjs | 45 ++-- ui.frontend/clientlib.xfa.config.cjs | 32 --- ui.frontend/package-lock.json | 31 +-- ui.frontend/package.json | 7 +- ui.frontend/src/handleXfa.js | 31 --- ui.frontend/src/utils.js | 31 +-- ui.frontend/src/view/FormCheckBox.js | 9 +- ui.frontend/src/view/FormField.js | 8 - ui.frontend/webpack.common.cjs | 13 +- ui.frontend/webpack.dev.cjs | 15 +- ui.frontend/webpack.prod.cjs | 7 +- .../test-module/specs/xfa/xfa.runtime.cy.js | 53 ---- 55 files changed, 101 insertions(+), 1312 deletions(-) delete mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/.content.xml delete mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original delete mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original.dir/.content.xml delete mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/print delete mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/print.dir/.content.xml delete mode 100755 it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/xfatest/.content.xml delete mode 100755 it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/xfatest/.content.xml delete mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml delete mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/css.txt delete mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/js.txt delete mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/.content.xml delete mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/.content.xml delete mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/.content.xml delete mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/.content.xml delete mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/README.md delete mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customfooterlibs.html delete mode 100644 ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customheaderlibs.html delete mode 100644 ui.frontend/clientlib-dev.xfa.config.cjs delete mode 100644 ui.frontend/clientlib.xfa.config.cjs delete mode 100644 ui.frontend/src/handleXfa.js delete mode 100644 ui.tests/test-module/specs/xfa/xfa.runtime.cy.js diff --git a/.gitignore b/.gitignore index a8774e396b..edecfa1c4b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ # auto-generated clientlib ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base/** -ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/** # Ignore Maven stuff target/ diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java index 6ec62ae2e7..72742d818a 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/ReservedProperties.java @@ -163,8 +163,6 @@ private ReservedProperties() { 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_XFA_SCRIPTS = "fd:xfaScripts"; - public static final String FD_DRAFT_ID = "fd:draftId"; private static final Set reservedProperties = aggregateReservedProperties(); diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java index bf2ceebb9e..723c9eec9a 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java @@ -17,7 +17,17 @@ import java.io.IOException; import java.math.BigDecimal; -import java.util.*; +import java.util.AbstractMap; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -58,12 +68,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.node.ArrayNode; public class AbstractFormComponentImpl extends AbstractComponentImpl implements FormComponent { @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = ReservedProperties.PN_DATAREF) @@ -291,10 +298,6 @@ protected boolean getEditMode() { if (rulesProperties.size() > 0) { properties.put(CUSTOM_RULE_PROPERTY_WRAPPER, rulesProperties); } - List disabledScripts = getDisabledXFAScripts(); - if (!disabledScripts.isEmpty()) { - properties.put("fd:disabledXfaScripts", disabledScripts); - } return properties; } @@ -547,24 +550,4 @@ public Map getDorProperties() { return customDorProperties; } - private List getDisabledXFAScripts() { - Set disabledScripts = new HashSet<>(); - String xfaScripts = resource.getValueMap().get(ReservedProperties.FD_XFA_SCRIPTS, ""); - if (StringUtils.isNotEmpty(xfaScripts)) { - // read string xfaScripts to jsonNode - ObjectMapper mapper = new ObjectMapper(); - try { - ArrayNode node = (ArrayNode) mapper.readTree(xfaScripts); - // iterate through the array node and add the elements which have disabled property set to true - for (JsonNode jsonNode : node) { - if (jsonNode.has("disabled") && jsonNode.get("disabled").asBoolean()) { - disabledScripts.add(jsonNode.get("activity").asText()); - } - } - } catch (IOException e) { - logger.error("Error while parsing xfaScripts {} {}", e, resource.getPath()); - } - } - return new ArrayList<>(disabledScripts); - } } diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java index 5b6702cf5c..b43f30b643 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractOptionsFieldImpl.java @@ -18,7 +18,6 @@ import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import java.util.Optional; import java.util.stream.IntStream; import org.apache.sling.models.annotations.Default; @@ -107,7 +106,9 @@ public String[] getEnumNames() { Map map = getEnumPairs(); String[] enumName = map.values().toArray(new String[0]); return Arrays.stream(enumName) - .map(p -> Optional.ofNullable(translate(ReservedProperties.PN_ENUM_NAMES, p)).orElse("")) + .map(p -> { + return this.translate(ReservedProperties.PN_ENUM_NAMES, p); + }) .toArray(String[]::new); } return null; diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java index 9d4c62af38..867415de31 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java @@ -57,7 +57,6 @@ public class CheckBoxGroupImplTest { private static final String PATH_CHECKBOX_GROUP_FOR_INSERTION_ORDER = CONTENT_ROOT + "/checkboxgroup-insertion-order"; private static final String PATH_CHECKBOX_GROUP_FOR_BOOLEAN = CONTENT_ROOT + "/checkboxgroup-boolean"; private static final String PATH_CHECKBOX_GROUP_NO_FIELDTYPE = CONTENT_ROOT + "/checkboxgroup-without-fieldtype"; - private static final String PATH_CHECKBOX_GROUP_WITH_NULL_VALUES = CONTENT_ROOT + "/checkboxgroup-with-null-values"; private final AemContext context = FormsCoreComponentTestContext.newAemContext(); @@ -299,18 +298,6 @@ void testGetEnumNames() { assertArrayEquals(new String[] { "m", "f", "o" }, checkboxGroup.getEnumNames()); } - @Test - void testGetEnumNamesWithNullValues() throws Exception { - // Get the checkbox group under test - CheckBoxGroup checkboxGroup = getCheckBoxGroupUnderTest(PATH_CHECKBOX_GROUP); - String[] modifiedEnumNames = new String[] { null, "", "value3" }; - FieldUtils.writeField(checkboxGroup, "enumNames", modifiedEnumNames, true); - // Now call getEnumNames() which should handle the null value by converting it to an empty string - String[] result = checkboxGroup.getEnumNames(); - // Verify that nulls are converted to empty strings - assertArrayEquals(new String[] { "", "", "value3" }, result); - } - @Test void testGetEnumNamesWithDuplicateEnumValues() { CheckBoxGroup checkboxGroup = getCheckBoxGroupUnderTest(PATH_CHECKBOX_GROUP_WITH_DUPLICATE_ENUMS); diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java index 4306d94aab..19eb8f156a 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImplTest.java @@ -17,7 +17,6 @@ package com.adobe.cq.forms.core.components.util; import java.lang.reflect.Method; -import java.util.List; import java.util.Map; import org.apache.sling.api.resource.Resource; @@ -49,9 +48,6 @@ public class AbstractFormComponentImplTest { private static final String PATH_COMPONENT_WITH_NO_VALIDATION_STATUS = CONTENT_ROOT + "/datepicker2"; private static final String PATH_COMPONENT_WITH_INVALID_VALIDATION_STATUS = CONTENT_ROOT + "/datepicker3"; private static final String PATH_COMPONENT_WITH_NO_RULE = CONTENT_ROOT + "/numberinput"; - private static final String PATH_COMPONENT_WITH_DISABLED_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponent"; - private static final String PATH_COMPONENT_WITH_INVALID_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponentinvalid"; - private static final String PATH_COMPONENT_WITH_NO_XFA_SCRIPTS = CONTENT_ROOT + "/xfacomponentnone"; private static final String AF_PATH = "/content/forms/af/testAf"; private static final String PAGE_PATH = "/content/testPage"; @@ -105,34 +101,6 @@ public void testInvalidValidationStatusRule() { assertEquals("invalid", rulesProperties.get("validationStatus")); } - @Test - public void testDisabledXFAScripts() { - AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_DISABLED_XFA_SCRIPTS); - Map properties = abstractFormComponentImpl.getProperties(); - List disabledScripts = (List) properties.get("fd:disabledXfaScripts"); - assertNotNull(disabledScripts); - assertEquals(2, disabledScripts.size()); - assertTrue(disabledScripts.contains("click")); - assertTrue(disabledScripts.contains("change")); - } - - @Test - public void testInvalidXFAScripts() { - AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_INVALID_XFA_SCRIPTS); - Map properties = abstractFormComponentImpl.getProperties(); - Object disabledScripts = properties.get("fd:disabledXfaScripts"); - // Even with invalid JSON, we should get an empty list, not null - assertNull(disabledScripts); - } - - @Test - public void testNoXFAScripts() { - AbstractFormComponentImpl abstractFormComponentImpl = prepareTestClass(PATH_COMPONENT_WITH_NO_XFA_SCRIPTS); - Map properties = abstractFormComponentImpl.getProperties(); - Object disabledScripts = properties.get("fd:disabledXfaScripts"); - assertNull(disabledScripts); - } - @Test public void testEmbedWithIframe() { Resource resource = Mockito.mock(Resource.class); @@ -179,6 +147,7 @@ public Page getCurrentPageToTest() { } } + @Test private AbstractFormComponentImpl prepareTestClass(String path) { Resource resource = context.resourceResolver().getResource(path); AbstractFormComponentImpl abstractFormComponentImpl = new AbstractFormComponentImpl(); diff --git a/bundles/af-core/src/test/resources/form/checkboxgroup/test-content.json b/bundles/af-core/src/test/resources/form/checkboxgroup/test-content.json index ffb9ea7b03..cdd7d6bc34 100644 --- a/bundles/af-core/src/test/resources/form/checkboxgroup/test-content.json +++ b/bundles/af-core/src/test/resources/form/checkboxgroup/test-content.json @@ -269,25 +269,5 @@ ], "jcr:lastModified": "Tue Jul 30 2024 15:16:00 GMT+0530", "sling:resourceType": "forms-components-examples/components/form/checkboxgroup" - }, - "checkboxgroup-with-null-values": { - "id": "checkboxgroup-with-null-values", - "jcr:primaryType": "nt:unstructured", - "sling:resourceType": "core/fd/components/form/checkboxgroup/v1/checkboxgroup", - "name": "nullValues", - "jcr:title": "Null Values Test", - "fieldType": "checkbox-group", - "type": "number[]", - "enum": [ - 0, - 1, - 2 - ], - "enforceEnum": true, - "enumNames": [ - "", - "", - "value3" - ] } } diff --git a/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json b/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json index 351b9c7753..25ae1b9144 100644 --- a/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json +++ b/bundles/af-core/src/test/resources/form/componentswithrule/test-content.json @@ -43,16 +43,5 @@ "jcr:primaryType": "nt:unstructured", "validationStatus" : "someInvalidStatus" } - }, - "xfacomponent": { - "jcr:primaryType": "nt:unstructured", - "fd:xfaScripts": "[{\"activity\":\"click\",\"disabled\":true},{\"activity\":\"change\",\"disabled\":true},{\"activity\":\"initialize\",\"disabled\":false}]" - }, - "xfacomponentinvalid": { - "jcr:primaryType": "nt:unstructured", - "fd:xfaScripts": "invalid json" - }, - "xfacomponentnone": { - "jcr:primaryType": "nt:unstructured" } } diff --git a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json index 134ff99f03..8842ce8f0c 100644 --- a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json +++ b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json @@ -21,7 +21,6 @@ "FT_SITES-19631", "FT_FORMS-14255", "FT_FORMS-14068", - "FT_FORMS-16351", - "FT_FORMS-14518" + "FT_FORMS-16351" ] } diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/.content.xml deleted file mode 100755 index 567a3ee07d..0000000000 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/.content.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original deleted file mode 100755 index 40f67ea327..0000000000 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - pdf - - - - - - - - - - - 0 - - 0 - 1.7 - 11 - - - * - - - - - - - - January - February - March - April - May - June - July - August - September - October - November - December - - - Jan - Feb - Mar - Apr - May - Jun - Jul - Aug - Sep - Oct - Nov - Dec - - - Sunday - Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - - - Sun - Mon - Tue - Wed - Thu - Fri - Sat - - - AM - PM - - - BC - AD - - - - EEEE, MMMM D, YYYY - MMMM D, YYYY - MMM D, YYYY - M/D/YY - - - h:MM:SS A Z - h:MM:SS A Z - h:MM:SS A - h:MM A - - GyMdkHmsSEDFwWahKzZ - - z,zz9.zzz - $z,zz9.99|($z,zz9.99) - z,zz9% - - - . - , - % - - - 0 - - - $ - USD - . - - - - - - - - - - - - - - - - - - - - - - 2025-02-28T05:39:31Z - Designer 6.5 - 1 - Designer 6.5 - uuid:614e0343-5f24-42b2-bd2b-1e4609912b49 - - 6.5.16.20230206.87 - /template/subform[1] - - - - diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original.dir/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original.dir/.content.xml deleted file mode 100755 index 4348e11022..0000000000 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/original.dir/.content.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/print b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/showHideRule.xdp/_jcr_content/renditions/print deleted file mode 100755 index de88fbafd65c590baee29c6f82845a987ea93c0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5742 zcmeHLdsq`!7DwD_jc6-;bP@U(Q?Sq)=8+ePAwUQbEI}Gxwum^Hxd|i5Om;GnfNNFk zO3`Y4*81*JOKo*U>sl4H+KRfXZfR92)>jo>-L5NCx3v$D-U)D9u{-CrSar2363Ke!da(EbUM_;I0V3>CI=}1BcM1Mz#-l( zAR06iuy&yY!4)br3n9?lau+}+Sf}O)PQBhO@PKpl{En??+q!-0#p9cU2ShHLTl;b8B*TE}JLN~Sb0}9gLm5#*S(l{By@U;^NV%-q!Z~Y3twU{ zfvfYwmPgJhn%A;)-ocw+)V#C9tG~NH>UP+appSQB*Cc?YyQ~v?;x2KbAKO*dDJG^dfNQ?81C!+ZE z+ilZlDl>22`fkhmSmE%DvNc@orI$74Q;&XI|I=sOos1nnwYO2_dy}RWw^iTugw{Oy z#-1Nm&rR+OiyJ-u@mF^*`l}&w<@o29&9Q7=ZV9h4#yD46VjE`FeRB71@gmj2LkX#d z+RD8nBXeg(#@g3By+3!&^R=66>qe~jirWzVeu`^y+-cKMrtmrM4JDoOj9mcjG zP&elrZc}M;M@V|w&2#A+tcQvYM3rQxP0G76?vdQ7g3upM73|X%_G%FSj5}5y5VzczNEp|htD^$sojTS@Dg;f-W{d-2h*T``W_h}{c1W0qBZex|UQ zd}Qar;hXlU#_Foh9M4}cVagk>W6QtqxOHnq(7>QYpWK+;hwlVjC(SDW*3EFN8-`7a z(U1mz45S<616~|OVSu4MGMQi+a3DCYhYignSv#VJnk=Xp2qaAkBqI8x1Ua# zeP4W~!Z`!Dv0qo(VW@kseZ+Q(9|V)T_jZs1jGvL44Wuz z-LqecFm$4{KxxLzu2fLMq*w4Dry?ttswky2v@}UC(RsCAr^^Y=M7&N1>(+V`r6dd^ zpoM*L7?mPE5ur3unj%gh6V2I3D#rsv6OYL#48st$CZ3{5rNWAhK?sZ>P#i}Il?>Bp z35`~%M7o<)FM&NBPusK>qp5p6_%BgfA_y)mik6j?#h1zBIo^)q8jS|U2$UdXP(tP| zX9dzLW8F`8De>zu0yo7oE&(10BI+froJUBMO2vhGTKC4BuAYThcf4>hGpvQISJ^$~O(`NG=?V$j#?~0x@uM6-D zU@3r@NfzD*JYwT`ryGHe>+%RbT>(rlT|URq8ac`%9%qJ8@9{9SR)s47CRfO1N*ke& zDF`bev(kiBh69BP(`azQs?hj|G@E;4@6(&Xx&;y%<=3mGpM zGBt+VXxavw+UD2W3)@RCO=-oAk%FFdxf~2dia{zerGsASpXx0S{YyKo>vHwQG9=dx z#9J~^Y5{J}!&9KQ`-vVXhWs?r;Q@N+FY&l49(tf0BQRBbf?9_LW&_KJDAAL(Jh16e z0XSXaO9*v)tfH}ncoDSDKOI1I4|ZGUyT(LCz7?R$`mdm_`^`5BFF1I)qCK~(9|K|k z!xpgk!6N-&-~nCzASod7fUW=+{pdZQs~;o|x;;G!SB2Xys=q=3l(oi0frKZA9O zL}{6rece~P5VJVCAsxs=lT3oQ)^buTL1d${L)Bg>f@?B{`~0j#>Q!57QYr;y+QKf!ZAYB zHt&0@?#$@OJKwshs9~DVRtEg?D{aQrxp45oJZ4P5&aC^|o81|KQ zv$jXPe4_1#bXIpZqcSA=)AfrNjSHPOa%kQ2!?vxJ|9D{IurGIiFk3Nn^E1oL8-`pf z(lps#cz@@*jgy8d+pnzn@Qu}PU5oj&WB_=MoxF2T>)BhWx@CXxUim!Zq20L~=f%cd zcspO)aDB)Vd)~FQd_FO;_VCjWCH-Z~sD-H`w{G~XB<$*_%YQf3gq?ZQ8@ej#Ipl@G z)uHoO8dpWvZx4-Il0M|l;ytR<&T;1zr_GDmvaCDCb*>{tk1qe{;-PnTUfFfk5j*3> zjvJS@ZCTaS95n8r>Q>THc5QLzyA^p0nmWU$ z1eG||NA5pzP2g-(+!TD;BN`=vrjo97z}QO!M5R`s;u}+(kr7HvtlimR5rIHW94iD##{zrxB~~ya5c98CqgG5EVdWqJQz_&yYm7sE^Bf-wb@pV0aVSjrehuKyvts*| zXT|lhO036pmq)uwqS+)&$Y89cat@D^bt4Kin+G&Q!7LTQ30UFjql%hgEYuMO6E4Tp zMnY~#H4r$CrC^u}!;MCx2{yG!uT!TGm>j=XA`Qb$JrYG|25aLGA5#{8jZ&3>S~yNX z#5%48&0#74tkQPTKG6bfXh9(k3ru)XApA=%Sgk?9qfNHbL8AxFH6j15OB#4GX>MIe zW@gB_*OKwWotd2vot{G - - - diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/xfatest/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/xfatest/.content.xml deleted file mode 100755 index d11803db28..0000000000 --- a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/xfatest/.content.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/xfatest/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/xfatest/.content.xml deleted file mode 100755 index cf7f21cd95..0000000000 --- a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/xfatest/.content.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - <_x0031_740725085254 jcr:primaryType="nt:unstructured"/> - - <_unnamed0_subform1740725098862 - fd:xfajson="\{"visible":true,"hideTitle":true,"icon":"article","name":"_unnamed0_subform","sling:resourceType":"core/fd/components/form/panelcontainer/v1/panelcontainer","jcr:title":"Unnamed 0 Subform","dataRef":"xfa[0].form[0].form1[0].#subform[0]","fieldType":"panel","enabled":true}" - jcr:primaryType="nt:unstructured" - jcr:title="Unnamed 0 Subform" - sling:resourceType="core/fd/components/form/panelcontainer/v1/panelcontainer" - dataRef="xfa[0].form[0].form1[0].#subform[0]" - enabled="{Boolean}true" - fieldType="panel" - hideTitle="{Boolean}true" - icon="article" - name="_unnamed0_subform" - visible="{Boolean}true"> - - - - - - - diff --git a/ui.af.apps/pom.xml b/ui.af.apps/pom.xml index c361d9c718..98429e0ab9 100644 --- a/ui.af.apps/pom.xml +++ b/ui.af.apps/pom.xml @@ -90,9 +90,6 @@ /apps/core/fd/components/page - - /apps/core/fd/components/xfa-page - /apps/core/fd/af-clientlibs @@ -170,7 +167,6 @@ **/*.editorconfig **/*.stylelintrc.yaml **/*.eslintignore - **/main-xfa.js **/node/** **/node_modules/** @@ -356,9 +352,6 @@ /libs/core/fd/components/page - - /libs/core/fd/components/xfa-page - /libs/core/fd/af-clientlibs diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml deleted file mode 100644 index 3bf1de3a89..0000000000 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/.content.xml +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/css.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/css.txt deleted file mode 100644 index e4a9cd93e9..0000000000 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/css.txt +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################### -# Copyright 2023 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. -############################################################################### \ No newline at end of file diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/js.txt b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/js.txt deleted file mode 100644 index 00b68a1429..0000000000 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all-xfa/js.txt +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################### -# Copyright 2023 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. -############################################################################### diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/.content.xml deleted file mode 100644 index 87e3ce2be1..0000000000 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-base-xfa/.content.xml +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml index 5a4a7100a8..fc6d62c32d 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_editConfig.xml @@ -23,12 +23,6 @@ handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName" icon="viewSOMExpression" text="View Qualified Name"/> - - 0){ schemaRef = schemaRef[0].value; configuredFormModel = schemaRef; @@ -176,13 +143,6 @@ $(FDM_DROPDOWN_SELECTOR).val(schemaRef); } else if (schemaType == CONNECTOR) { $(CONNECTOR_DROPDOWN_SELECTOR).val(schemaRef); - } else if (schemaType == FORM_TEMPLATE) { - $(FORM_TEMPLATE_DROPDOWN_SELECTOR).val(schemaRef); - // Also set the form parameter for xdpRef when prefilling - if (isForm()) { - var afAssetPath = getAfAssetMetadataPath(); - addFormParameter(afAssetPath + '/xdpRef', schemaRef); - } } } }; @@ -232,26 +192,6 @@ } }; - function formTemplateSelectorOnChanged(dialog) { - var selectedSchema = dialog.find(FORM_TEMPLATE_DROPDOWN_SELECTOR); - if(selectedSchema.length > 0) { - selectedSchema = selectedSchema[0].value; - setElementValue(dialog, SCHEMA_REF, selectedSchema); - setElementValue(dialog, XDP_REF, selectedSchema); - setElementValue(dialog, DAM_SCHEMA_REF, selectedSchema); - if (isForm()) { - var afAssetPath = getAfAssetMetadataPath(); - addFormParameter(afAssetPath + '/xdpRef', selectedSchema); - } - isSchemaChanged = true; - if (configuredFormModel) { - confirmFormModelChange(selectedSchema, $(FORM_TEMPLATE_DROPDOWN_SELECTOR)); - } else { - toBeConfiguredFormModel = selectedSchema; - } - } - }; - function setElementValue(dialog, elementRef, value){ var element = dialog.find(elementRef); if(element.length > 0){ @@ -285,29 +225,20 @@ function hideContainersExcept(selectedSchemaType) { if (selectedSchemaType == JSON_SCHEMA) { $(FDM_CONTAINER).hide(); - $(FORM_TEMPLATE_CONTAINER).hide(); $(CONNECTOR_CONTAINER).hide(); $(SCHEMA_CONTAINER).show(); } else if (selectedSchemaType == FORM_DATA_MODEL) { $(SCHEMA_CONTAINER).hide(); - $(FORM_TEMPLATE_CONTAINER).hide(); $(CONNECTOR_CONTAINER).hide(); $(FDM_CONTAINER).show(); } else if (selectedSchemaType == CONNECTOR) { $(SCHEMA_CONTAINER).hide(); $(FDM_CONTAINER).hide(); - $(FORM_TEMPLATE_CONTAINER).hide(); $(CONNECTOR_CONTAINER).show(); - } else if (selectedSchemaType == FORM_TEMPLATE) { + } else if (selectedSchemaType == 'none') { $(FDM_CONTAINER).hide(); $(CONNECTOR_CONTAINER).hide(); $(SCHEMA_CONTAINER).hide(); - $(FORM_TEMPLATE_CONTAINER).show(); - } else if (selectedSchemaType == NONE) { - $(FDM_CONTAINER).hide(); - $(SCHEMA_CONTAINER).hide(); - $(CONNECTOR_CONTAINER).hide(); - $(FORM_TEMPLATE_CONTAINER).hide(); } }; @@ -335,8 +266,7 @@ var formModelSelector = dialog.find(FORM_MODEL_SELECTOR)[0], schemaSelector = dialog.find(SCHEMA_DROPDOWN_SELECTOR)[0], fdmSelector = dialog.find(FDM_DROPDOWN_SELECTOR)[0], - connectorSelector = dialog.find(CONNECTOR_DROPDOWN_SELECTOR)[0], - formTemplateSelector = dialog.find(FORM_TEMPLATE_DROPDOWN_SELECTOR)[0]; + connectorSelector = dialog.find(CONNECTOR_DROPDOWN_SELECTOR)[0]; if (formModelSelector) { formModelSelector.on("change", function() { selectFormModelOnChanged(dialog); @@ -357,11 +287,6 @@ connectorSelectorOnChanged(dialog); }); }; - if(formTemplateSelector) { - formTemplateSelector.on("change", function() { - formTemplateSelectorOnChanged(dialog); - }); - } selectFormModelOnLoad(dialog); } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md index 3602149917..1fb501d511 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/README.md @@ -93,6 +93,4 @@ This Url should whitelist the AEM author/publish domain in the Cross Origin Reso Applying `data-cmp-auto-save` attribute to the `cmp-adaptiveform-container` block to control the auto-save functionality. If the attribute's value is set to true, auto-save will be enabled for the form; otherwise, it will not be triggered. This attribute will be set to true in published mode if enableAutoSave is enabled. -Applying `data-cmp-schema-type` attribute to the `cmp-adaptiveform-container` block to indicate the schema type of the form. This attribute is used to determine the appropriate form loading mechanism, particularly for XDP forms which require special handling. The value corresponds to the schema type from the FormContainer model (e.g., 'XDP', 'XSD', 'JSON', etc.). - Applying `data-cmp-hamburger-menu-enabled` attribute to the `cmp-adaptiveform-container` block to control the hamburger meu. If the attribute's value is set to true, hamburger menu will be enabled in the mobile view. \ No newline at end of file diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml index b34d364dc1..e3bf5979ef 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml @@ -136,10 +136,6 @@ jcr:primaryType="nt:unstructured" sling:resourceType="/libs/fd/af/connectors/rendercondition/marketo"/> - - - - - - - - - 0; - } catch(e) { - console.error('Error parsing xfaScripts', e, json['fd:xfaScripts']); - } - } - } - return false - } - - window.CQ.FormsCoreComponents.editorhooks.viewXfaScripts = function (editable) { - fetch(Granite.HTTP.externalize(editable.path + ".json")).then(async function (resp) { - const json = await resp.json(); - // Assuming `resp` contains the JSON string with `fd:xfaScripts` - var xfaScripts = JSON.parse(json['fd:xfaScripts']); - var dialogContent = document.createElement('div'); - - // Create a Coral Table - var table = document.createElement('coral-table'); - - // Create the header - var thead = document.createElement('coral-table-head'); - var headerRow = document.createElement('coral-table-row'); - - var eventNameHeader = document.createElement('coral-table-headercell'); - eventNameHeader.textContent = 'Event Name'; - var eventContentHeader = document.createElement('coral-table-headercell'); - eventContentHeader.textContent = 'Event Content'; - var disableHeader = document.createElement('coral-table-headercell'); - disableHeader.textContent = 'Disable'; - - headerRow.appendChild(eventNameHeader); - headerRow.appendChild(eventContentHeader); - headerRow.appendChild(disableHeader); - thead.appendChild(headerRow); - table.appendChild(thead); - - // Populate the table with data from xfaScripts - var tbody = document.createElement('coral-table-body'); - xfaScripts.forEach(function(script) { - var row = document.createElement('coral-table-row'); - - var nameCell = document.createElement('coral-table-cell'); - nameCell.textContent = script.runAt === "server" ? `${script.activity}(server)` : script.activity; - var contentCell = document.createElement('coral-table-cell'); - contentCell.innerHTML = script.value.replaceAll("\n", "
"); - - var checkboxCell = document.createElement('coral-table-cell'); - var checkbox = new Coral.Checkbox(); - checkbox.name = 'disableCheckbox'; - checkbox.on('change', function() { - script.disabled = this.checked; - }); - checkboxCell.appendChild(checkbox); - checkbox.checked = !!script.disabled; - if (script.runAt === "server") { - checkbox.disabled = true; - } - row.appendChild(nameCell); - row.appendChild(contentCell); - row.appendChild(checkboxCell); - - tbody.appendChild(row); - }); - table.appendChild(tbody); - - dialogContent.appendChild(table); - - // Create the dialog - var dialog = new Coral.Dialog().set({ - id: 'xfaScriptsDialog', - header: { - innerHTML: 'XFA Scripts' - }, - content: { - innerHTML: '' - }, - footer: {}, - closable: "on" - }); - - // Add the table to the dialog content - //dialog.content.appendChild(dialogContent); - - var okButton = new Coral.Button(); - okButton.label.textContent = 'OK'; - okButton.variant = Coral.Button.variant.PRIMARY; - okButton.addEventListener('click', function() { - // Prepare the modified xfaScripts for POST request - var modifiedXfaScripts = JSON.stringify({ 'fd:xfaScripts': JSON.stringify(xfaScripts) }); - $.ajax({ - url: editable.path, - type: 'POST', - data: { - "_charset_" : "UTF-8", - ':operation': 'import', - ':contentType': 'json', - ':content': modifiedXfaScripts, - ':replaceProperties': true - }, - success: function(response) { - console.log('Successfully posted the data'); - dialog.remove(); - }, - error: function(xhr, status, error) { - console.error('Error posting the data', error); - dialog.remove(); - } - }); - }); - dialog.footer.appendChild(okButton); - -// Append and show the dialog - document.body.appendChild(dialog); - - // add a listener on dialog show event - dialog.on('coral-overlay:open', function() { - dialog.content.appendChild(dialogContent); - }); - dialog.show(); - - }) - return true; - }; - -})(window, Granite.author, Coral); +})(window, Granite.author, Coral); \ No newline at end of file diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html index 63ba0650e6..e3499e6e11 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/container.html @@ -42,7 +42,6 @@ data-cmp-page-lang="${container.containingPageLang}" data-cmp-path="${resource.path}" data-cmp-hamburger-menu-enabled="${container.isHamburgerMenuEnabled ? 'true' : 'false'}" - data-cmp-schema-type="${container.schemaType}" class="cmp-adaptiveform-container cmp-container ${wcmmode.edit ? 'cmp-adaptiveform-container--edit' : ''}" data-cmp-custom-functions-module-url="${configurationProvider.customFunctionModuleUrl}" dir="${container.languageDirection}" diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerview.js index c4df1c1302..86f65a2ab5 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerview.js @@ -99,12 +99,10 @@ this.widgetObject.setDisplayValue(this._model.value); this.widgetObject.setCalendarWidgetValue(this._model.value); this.setInactive(); - this.triggerExit(); }, this.getWidget()); this.widgetObject.addEventListener('focus', (e) => { this.widgetObject.setValue(e.target.value); this.setActive(); - this.triggerEnter(); }, this.getWidget()); this.widgetObject.addEventListener('input', (e) => { if( e.target.value === '') { @@ -119,11 +117,9 @@ this.widget.addEventListener('blur', (e) => { this.setModelValue(e.target.value); this.setInactive(); - this.triggerExit(); }); this.widget.addEventListener('focus', (e) => { this.setActive(); - this.triggerEnter(); }); } } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/clientlibs/site/js/dropdownview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/clientlibs/site/js/dropdownview.js index 1c95f33839..d32907b7d7 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/clientlibs/site/js/dropdownview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/clientlibs/site/js/dropdownview.js @@ -206,11 +206,9 @@ }); this.widget.addEventListener('focus', (e) => { this.setActive(); - this.triggerEnter(); }); this.widget.addEventListener('blur', (e) => { this.setInactive(); - this.triggerExit(); }); } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/clientlibs/site/js/emailinputview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/clientlibs/site/js/emailinputview.js index b8974c5c7c..41662f809c 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/clientlibs/site/js/emailinputview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/emailinput/v1/emailinput/clientlibs/site/js/emailinputview.js @@ -74,12 +74,10 @@ this.setModelValue(e.target.value); this.setWidgetValueToDisplayValue(); this.setInactive(); - this.triggerExit(); }); this.widget.addEventListener('focus', (e) => { this.setActive(); this.setWidgetValueToModelValue(); - this.triggerEnter(); }); } } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/clientlibs/site/js/numberinputview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/clientlibs/site/js/numberinputview.js index a81994501f..8d737e0a0c 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/clientlibs/site/js/numberinputview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/numberinput/v1/numberinput/clientlibs/site/js/numberinputview.js @@ -100,14 +100,12 @@ this.setModelValue(e.target.value); if(this.element) { this.setInactive(); - this.triggerExit(); } }); } this.getWidget().addEventListener('focus', (e) => { if (this.element) { this.setActive(); - this.triggerEnter(); } }); } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml index 428607e492..b9cf9ad1bb 100755 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_editConfig.xml @@ -25,11 +25,5 @@ handler="CQ.FormsCoreComponents.editorhooks.viewQualifiedName" icon="viewSOMExpression" text="View Qualified Name"/> - diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/clientlibs/site/js/telephoneinputview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/clientlibs/site/js/telephoneinputview.js index ea43ca183f..7fe8a2d048 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/clientlibs/site/js/telephoneinputview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/telephoneinput/v1/telephoneinput/clientlibs/site/js/telephoneinputview.js @@ -74,12 +74,10 @@ this.setModelValue(e.target.value); this.setWidgetValueToDisplayValue(); this.setInactive(); - this.triggerExit(); }); this.widget.addEventListener('focus', (e) => { this.setActive(); this.setWidgetValueToModelValue(); - this.triggerEnter(); }); } } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/clientlibs/site/js/textinputview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/clientlibs/site/js/textinputview.js index 2c075f12c1..e2119a07df 100644 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/clientlibs/site/js/textinputview.js +++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/textinput/v1/textinput/clientlibs/site/js/textinputview.js @@ -74,12 +74,10 @@ this.setModelValue(e.target.value); this.setWidgetValueToDisplayValue(); this.setInactive(); - this.triggerExit(); }); this.widget.addEventListener('focus', (e) => { this.setActive(); this.setWidgetValueToModelValue(); - this.triggerEnter(); }); } } diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/.content.xml deleted file mode 100644 index 3977155bee..0000000000 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/.content.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/.content.xml deleted file mode 100644 index 73a43f51ca..0000000000 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/.content.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/.content.xml deleted file mode 100644 index b287296481..0000000000 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/.content.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - \ No newline at end of file diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/README.md b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/README.md deleted file mode 100644 index 0ba894f713..0000000000 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/README.md +++ /dev/null @@ -1,44 +0,0 @@ - -Adaptive Form XFA Core Page (v1) -==== -Adaptive Form XFA Core Page component v1 which extends the forms [Page](https://github.com/adobe/aem-core-forms-components/tree/master/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/page/v1/page) Component. - -## Features - -* This is the page component for the Adaptive Form Core Components with XFA support. -* Loads all required XFA-specific clientlibs in the headers and footers: - * Base runtime clientlib (core.forms.components.runtime.base.xfa) which includes: - * XFA core dependencies: - * xfaforms.3rdparty - * xfaforms.I18N.en - * xfaforms.formbridge - * xfaforms.xfalibutil - * xfaforms.xfalibwidgets - * xfaforms.formcalc - * xfaforms.xfalibModel - * Common dependencies: - * granite.csrf.standalone.fetchsupport - * af.rum - * dompurify - * All-in-one clientlib (core.forms.components.runtime.all.xfa) which includes: - * Base XFA runtime (core.forms.components.runtime.base.xfa) - * All form component runtimes (textinput, dropdown, etc.) - - - - - diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customfooterlibs.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customfooterlibs.html deleted file mode 100644 index 2206dc0229..0000000000 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customfooterlibs.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customheaderlibs.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customheaderlibs.html deleted file mode 100644 index e730a374fc..0000000000 --- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/xfa-page/v1/xfa-page/customheaderlibs.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/ui.frontend/clientlib-dev.config.cjs b/ui.frontend/clientlib-dev.config.cjs index ca0e2c2200..10173a641f 100644 --- a/ui.frontend/clientlib-dev.config.cjs +++ b/ui.frontend/clientlib-dev.config.cjs @@ -14,17 +14,43 @@ * limitations under the License. ******************************************************************************/ -const baseConfig = require('./clientlib.config.cjs'); +const path = require('path'); +const CLIENTLIB_DIR = path.join( + __dirname, + '..', + 'ui.af.apps', + 'src', + 'main', + 'content', + 'jcr_root', + 'apps', + 'core', + 'fd', + 'af-clientlibs' +); + +const libsBaseConfig = { + allowProxy: true, + serializationFormat: 'xml', + cssProcessor: ['default:none', 'min:none'], + jsProcessor: ['default:none', 'min:none'] +}; + +// Config for `aem-clientlib-generator` module.exports = { - ...baseConfig, - libs: [ - { - ...baseConfig.libs[0], - assets: { - js: ['dist/main.js'], - resources: ['dist/main.js.map'] - } - } - ] + context: __dirname, + clientLibRoot: CLIENTLIB_DIR, + libs: [ + { + ...libsBaseConfig, + name: 'core-forms-components-runtime-base', + categories: ['core.forms.components.runtime.base'], + dependencies: ['granite.csrf.standalone.fetchsupport', 'af.rum', 'dompurify'], + assets: { + js: ['dist/main.js'], + resources: ['dist/main.js.map'] + } + } + ] }; diff --git a/ui.frontend/clientlib-dev.xfa.config.cjs b/ui.frontend/clientlib-dev.xfa.config.cjs deleted file mode 100644 index 7313cc7392..0000000000 --- a/ui.frontend/clientlib-dev.xfa.config.cjs +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright 2022 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. - ******************************************************************************/ - -const baseConfig = require('./clientlib.config.cjs'); - -module.exports = { - ...baseConfig, - libs: [ - { - ...baseConfig.libs[0], - name: 'core-forms-components-runtime-base-xfa', - categories: ['core.forms.components.runtime.base.xfa'], - dependencies: [...baseConfig.libs[0].dependencies, ...baseConfig.xfaDependencies], - assets: { - js: ['dist/main-xfa.js'], - resources: ['dist/main-xfa.js.map'] - } - } - ] -}; \ No newline at end of file diff --git a/ui.frontend/clientlib.config.cjs b/ui.frontend/clientlib.config.cjs index f67c27c8fc..e9b3c715c9 100644 --- a/ui.frontend/clientlib.config.cjs +++ b/ui.frontend/clientlib.config.cjs @@ -31,36 +31,25 @@ const CLIENTLIB_DIR = path.join( ); const libsBaseConfig = { - allowProxy: true, - serializationFormat: 'xml', - cssProcessor: ['default:none', 'min:none'], - jsProcessor: ['default:none', 'min:none'] + allowProxy: true, + serializationFormat: 'xml', + cssProcessor: ['default:none', 'min:none'], + jsProcessor: ['default:none', 'min:none'] }; -const xfaDependencies = [ - 'xfaforms.3rdparty', - 'xfaforms.I18N.en', - 'xfaforms.formbridge', - 'xfaforms.xfalibutil', - 'xfaforms.xfalibwidgets', - 'xfaforms.formcalc', - 'xfaforms.xfalibModel' -]; - // Config for `aem-clientlib-generator` module.exports = { - context: __dirname, - clientLibRoot: CLIENTLIB_DIR, - libs: [ - { - ...libsBaseConfig, - name: 'core-forms-components-runtime-base', - categories: ['core.forms.components.runtime.base'], - dependencies: ['granite.csrf.standalone.fetchsupport', 'af.rum', 'dompurify'], - assets: { - js: ['dist/main.js'] - } - } - ], - xfaDependencies + context: __dirname, + clientLibRoot: CLIENTLIB_DIR, + libs: [ + { + ...libsBaseConfig, + name: 'core-forms-components-runtime-base', + categories: ['core.forms.components.runtime.base'], + dependencies: ['granite.csrf.standalone.fetchsupport', 'af.rum', 'dompurify'], + assets: { + js: ['dist/main.js'] + } + } + ] }; diff --git a/ui.frontend/clientlib.xfa.config.cjs b/ui.frontend/clientlib.xfa.config.cjs deleted file mode 100644 index f7157be356..0000000000 --- a/ui.frontend/clientlib.xfa.config.cjs +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright 2022 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. - ******************************************************************************/ - -const baseConfig = require('./clientlib.config.cjs'); - -module.exports = { - ...baseConfig, - libs: [ - { - ...baseConfig.libs[0], - name: 'core-forms-components-runtime-base-xfa', - categories: ['core.forms.components.runtime.base.xfa'], - dependencies: [...baseConfig.libs[0].dependencies, ...baseConfig.xfaDependencies], - assets: { - js: ['dist/main-xfa.js'] - } - } - ] -}; \ No newline at end of file diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json index 840173599c..b32195bf61 100644 --- a/ui.frontend/package-lock.json +++ b/ui.frontend/package-lock.json @@ -10,7 +10,6 @@ "license": "Apache-2.0", "dependencies": { "@aemforms/af-core": "^0.22.114", - "@aemforms/af-core-xfa": "^0.1.6", "@aemforms/af-custom-functions": "1.0.14", "@aemforms/af-formatters": "^0.22.114" }, @@ -116,24 +115,15 @@ "@aemforms/af-formatters": "^0.22.114" } }, - "node_modules/@aemforms/af-core-xfa": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@aemforms/af-core-xfa/-/af-core-xfa-0.1.6.tgz", - "integrity": "sha512-9pRZM9+AddJXMlF0f3gOGS0HV+yTM0VqOaz2dWZZz9N1YnF431dBKID3mqt1PdbrF8xw/ocSOfLiELHbDjJp/A==", - "dependencies": { - "@adobe/json-formula": "0.1.50", - "@aemforms/af-formatters": "^0.22.116" - } - }, "node_modules/@aemforms/af-custom-functions": { "version": "1.0.14", "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.14.tgz", "integrity": "sha512-rxFTfGKj9lMeFx0WsOempSavgXKFQZNinr8BLjREVagkuZesQjzlSn/mjoWrLf1YC3VPUnFOj408SX+SX0rChQ==" }, "node_modules/@aemforms/af-formatters": { - "version": "0.22.116", - "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.116.tgz", - "integrity": "sha512-iI4EzP0rLXqUUVryTbS6i1Fl+28eEHvHylvecAV9xH4LiYP4yRqrA6jJbuguA9/3fZBCKCXWXchtQfABWRSGzA==" + "version": "0.22.114", + "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.114.tgz", + "integrity": "sha512-kIrWTAzLgv2Te2sq8IQl4P0AtFAN1t3znnXXgMPp9MO6P+pB4mqaFlF+DUdE1BpbYdeEYdUxZioL/oq5NVtNag==" }, "node_modules/@ampproject/remapping": { "version": "2.2.1", @@ -11140,24 +11130,15 @@ "@aemforms/af-formatters": "^0.22.114" } }, - "@aemforms/af-core-xfa": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/@aemforms/af-core-xfa/-/af-core-xfa-0.1.6.tgz", - "integrity": "sha512-9pRZM9+AddJXMlF0f3gOGS0HV+yTM0VqOaz2dWZZz9N1YnF431dBKID3mqt1PdbrF8xw/ocSOfLiELHbDjJp/A==", - "requires": { - "@adobe/json-formula": "0.1.50", - "@aemforms/af-formatters": "^0.22.116" - } - }, "@aemforms/af-custom-functions": { "version": "1.0.14", "resolved": "https://registry.npmjs.org/@aemforms/af-custom-functions/-/af-custom-functions-1.0.14.tgz", "integrity": "sha512-rxFTfGKj9lMeFx0WsOempSavgXKFQZNinr8BLjREVagkuZesQjzlSn/mjoWrLf1YC3VPUnFOj408SX+SX0rChQ==" }, "@aemforms/af-formatters": { - "version": "0.22.116", - "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.116.tgz", - "integrity": "sha512-iI4EzP0rLXqUUVryTbS6i1Fl+28eEHvHylvecAV9xH4LiYP4yRqrA6jJbuguA9/3fZBCKCXWXchtQfABWRSGzA==" + "version": "0.22.114", + "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.114.tgz", + "integrity": "sha512-kIrWTAzLgv2Te2sq8IQl4P0AtFAN1t3znnXXgMPp9MO6P+pB4mqaFlF+DUdE1BpbYdeEYdUxZioL/oq5NVtNag==" }, "@ampproject/remapping": { "version": "2.2.1", diff --git a/ui.frontend/package.json b/ui.frontend/package.json index 6ad7cba519..d4d2620ad8 100644 --- a/ui.frontend/package.json +++ b/ui.frontend/package.json @@ -4,10 +4,8 @@ "description": "", "scripts": { "test": "jest", - "build:dev": "webpack --config webpack.dev.cjs && webpack --config webpack.dev.cjs --env xfa && npm run clientlib:dev", - "build:prod": "webpack --config webpack.prod.cjs && webpack --config webpack.prod.cjs --env xfa && npm run clientlib:prod", - "clientlib:dev": "clientlib --verbose clientlib-dev.config.cjs && clientlib --verbose clientlib-dev.xfa.config.cjs", - "clientlib:prod": "clientlib --verbose clientlib.config.cjs && clientlib --verbose clientlib.xfa.config.cjs" + "build:dev": "webpack --config webpack.dev.cjs && clientlib --verbose clientlib-dev.config.cjs", + "build:prod": "webpack --config webpack.prod.cjs && clientlib --verbose clientlib.config.cjs" }, "keywords": [], "author": "", @@ -26,7 +24,6 @@ }, "dependencies": { "@aemforms/af-core": "^0.22.114", - "@aemforms/af-core-xfa": "^0.1.6", "@aemforms/af-formatters": "^0.22.114", "@aemforms/af-custom-functions": "1.0.14" } diff --git a/ui.frontend/src/handleXfa.js b/ui.frontend/src/handleXfa.js deleted file mode 100644 index f1a6468b58..0000000000 --- a/ui.frontend/src/handleXfa.js +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright 2024 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. - ******************************************************************************/ - -export function loadXfa(formdom, renderContext) { - if (window.xfalib) { - formBridge.registerConfig("disabledServerScripts", ["initialize", "$formready", "$layoutready"]) - const xfaJson = JSON.parse(JSON.parse(JSON.stringify(formdom))); - xfalib.runtime.renderContext = JSON.parse(JSON.parse(JSON.stringify(renderContext))); - xfalib.script.XfaModelRegistry.prototype.createModel(xfaJson); - //initialize Acrobat specific scripts - new xfalib.acrobat.Acrobat(); - return function (model) { - model._syncXfaProps(); - xfalib.runtime.xfa.form._initialize(true); - $(window).trigger("XfaInitialized"); - } - } -} diff --git a/ui.frontend/src/utils.js b/ui.frontend/src/utils.js index 887fe77bb2..16e03a285a 100644 --- a/ui.frontend/src/utils.js +++ b/ui.frontend/src/utils.js @@ -17,8 +17,7 @@ import {Constants} from "./constants.js"; import HTTPAPILayer from "./HTTPAPILayer.js"; import {customFunctions} from "./customFunctions.js"; -import {FunctionRuntime} from '@aemforms/af-core'; -import {loadXfa} from "./handleXfa"; +import {FunctionRuntime} from '@aemforms/af-core' /** * @module FormView @@ -333,22 +332,7 @@ class Utils { if (_path == null) { console.error(`data-${Constants.NS}-${formContainerClass}-path attribute is not present in the HTML element. Form cannot be initialized` ) } else { - let _formJson, callback; - const loader = elements[i].parentElement?.querySelector('[data-cmp-adaptiveform-container-loader]'); - // Get the schema type from the data attribute with null safety - const schemaType = elements[i].getAttribute('data-cmp-schema-type'); - // Check if this is an XDP form based on the schema type - // According to GuideSchemaType enum, XDP has value of FORM_TEMPLATES, not 'XFA' - if (loader && schemaType && (schemaType === 'XDP' || schemaType === 'FORM_TEMPLATES')) { - const id = loader.getAttribute('data-cmp-adaptiveform-container-loader'); - const response = await fetch(`/adobe/forms/af/${id}`) - _formJson = (await response.json()).afModelDefinition; - _formJson.id = id; - //window.formJson = _formJson - callback = loadXfa(_formJson.formdom, _formJson.xfaRenderContext); - } else { - _formJson = await HTTPAPILayer.getFormDefinition(_path, _pageLang); - } + const _formJson = await HTTPAPILayer.getFormDefinition(_path, _pageLang); console.debug("fetched model json", _formJson); await this.registerCustomFunctionsV2( _formJson); await this.registerCustomFunctionsByUrl(customFunctionUrl); @@ -360,14 +344,6 @@ class Utils { _prefillData = await HTTPAPILayer.getJson(_formJson.properties['fd:dataUrl'] + "?" + Object.keys(params).map(p => p+"="+params[p]).join("&")) _prefillData = _prefillData || {}; _prefillData = Utils.stripIfWrapped(_prefillData); - if(window.formBridge){ - window.formBridge.restoreFormState({ - formState : {xfaDom: _prefillData.data.xfaDom, xfaRenderContext: _prefillData.data.xfaRenderContext}, - context : this, - error : function() {}, - success : function () {} - }); - } } const formContainer = await createFormContainer({ _formJson, @@ -375,9 +351,6 @@ class Utils { _path, _element: elements[i] }); - if (typeof callback === 'function') { - callback(formContainer.getModel()); - } Utils.initializeAllFields(formContainer); const event = new CustomEvent(Constants.FORM_CONTAINER_INITIALISED, { "detail": formContainer }); document.dispatchEvent(event); diff --git a/ui.frontend/src/view/FormCheckBox.js b/ui.frontend/src/view/FormCheckBox.js index 7f0d5bc0a3..acf5fc4075 100644 --- a/ui.frontend/src/view/FormCheckBox.js +++ b/ui.frontend/src/view/FormCheckBox.js @@ -48,14 +48,7 @@ class FormCheckBox extends FormFieldBase { const value = this.widget.checked ? this._onValue : this._offValue; this._model.dispatch(new FormView.Actions.UIChange({'value': value})); }) - this.widget.addEventListener('focus', (e) => { - this.setActive(); - this.triggerEnter(); - }); - this.widget.addEventListener('blur', (e) => { - this.setInactive(); - this.triggerExit(); - }); + } } diff --git a/ui.frontend/src/view/FormField.js b/ui.frontend/src/view/FormField.js index fb38a5aebe..22afc7ad75 100644 --- a/ui.frontend/src/view/FormField.js +++ b/ui.frontend/src/view/FormField.js @@ -102,14 +102,6 @@ class FormField { return this.element.getAttribute(Constants.DATA_ATTRIBUTE_ACTIVE) === 'true'; } - triggerExit() { - this._model.dispatch(new FormView.Actions.CustomEvent('xfaexit')); - } - - triggerEnter() { - this._model.dispatch(new FormView.Actions.CustomEvent('xfaenter')); - } - /** * Returns the form container path of the form field. * @returns {string} The form container path. diff --git a/ui.frontend/webpack.common.cjs b/ui.frontend/webpack.common.cjs index 0cb36678e5..f1d76bfd68 100644 --- a/ui.frontend/webpack.common.cjs +++ b/ui.frontend/webpack.common.cjs @@ -15,20 +15,15 @@ ******************************************************************************/ const path = require('path'); -module.exports = (env = {}) => ({ +module.exports = { entry: './src/index.js', output: { - filename: env.xfa ? '[name]-xfa.js' : '[name].js', + filename: 'main.js', path: path.resolve(__dirname, 'dist'), - clean: !env.xfa, + clean: true, library: { name: 'FormView', type: 'window' }, }, - resolve: env.xfa ? { - alias: { - '@aemforms/af-core': '@aemforms/af-core-xfa' - } - } : {} -}); \ No newline at end of file +}; \ No newline at end of file diff --git a/ui.frontend/webpack.dev.cjs b/ui.frontend/webpack.dev.cjs index 92cb5ee093..14b453ef49 100644 --- a/ui.frontend/webpack.dev.cjs +++ b/ui.frontend/webpack.dev.cjs @@ -17,18 +17,15 @@ const webpack = require('webpack'); const { merge } = require('webpack-merge'); const common = require('./webpack.common.cjs'); +const path = require('path'); -module.exports = (env = {}) => { - const sourcemapPath = env.xfa ? - '/libs/core/fd/clientlibs/core-forms-components-runtime-xfa/resources/[name].js.map' : - '/libs/core/fd/clientlibs/core-forms-components-runtime/resources/[name].js.map'; - - return merge(common(env), { +module.exports = () => { + return merge(common, { mode: 'development', devtool: false, plugins: [new webpack.SourceMapDevToolPlugin({ - append: `\n//# sourceMappingURL=${sourcemapPath}`, - filename: env.xfa ? '[name]-xfa.js.map' : '[name].js.map' - })] + append: '\n//# sourceMappingURL=/libs/core/fd/clientlibs/core-forms-components-runtime/resources/[name].js.map', + filename: '[name].js.map' + })], }); }; diff --git a/ui.frontend/webpack.prod.cjs b/ui.frontend/webpack.prod.cjs index b5581072eb..ca66c65d15 100644 --- a/ui.frontend/webpack.prod.cjs +++ b/ui.frontend/webpack.prod.cjs @@ -15,9 +15,10 @@ ******************************************************************************/ const { merge } = require('webpack-merge'); const common = require('./webpack.common.cjs'); +const path = require('path'); -module.exports = (env = {}) => { - return merge(common(env), { - mode: 'production' +module.exports = () => { + return merge(common, { + mode: 'production', }); }; diff --git a/ui.tests/test-module/specs/xfa/xfa.runtime.cy.js b/ui.tests/test-module/specs/xfa/xfa.runtime.cy.js deleted file mode 100644 index b0cebc71a8..0000000000 --- a/ui.tests/test-module/specs/xfa/xfa.runtime.cy.js +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************* - * 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. - ******************************************************************************/ -describe("Form Runtime with XFA", () => { - if(cy.af.isLatestAddon()) { - const pagePath = "content/forms/af/core-components-it/samples/xfatest.html" - const IS = "adaptiveFormButton" - - let formContainer = null - let toggle_array = []; - - beforeEach(() => { - cy.fetchFeatureToggles().then((response) => { - if (response.status === 200) { - toggle_array = response.body.enabled; - } - }); - - if (toggle_array && toggle_array.includes("FT_FORMS-14518")) { - cy.previewForm(pagePath).then(p => { - formContainer = p; - }) - } - }); - - - it(`xfa rules would work`, () => { - if (toggle_array && toggle_array.includes("FT_FORMS-14518")) { - const [textInputId] = Object.entries(formContainer._fields)[0]; - const [showButtonId] = Object.entries(formContainer._fields)[3]; - const [hideButtonId] = Object.entries(formContainer._fields)[4]; - cy.get(`#${showButtonId}`).find('.cmp-adaptiveform-button__widget').click(); - cy.get(`#${textInputId}`).should("be.visible"); - cy.get(`#${hideButtonId}`).find('.cmp-adaptiveform-button__widget').click(); - cy.get(`#${textInputId}`).should("not.be.visible"); - cy.get(`#${showButtonId}`).find('.cmp-adaptiveform-button__widget').click(); - cy.get(`#${textInputId}`).should("be.visible"); - } - }); - } -}) From c8321e492765d58141616cb644c7ea62d426eddd Mon Sep 17 00:00:00 2001 From: Pavitra Khatri Date: Tue, 4 Mar 2025 16:38:27 +0530 Subject: [PATCH 36/36] Test case correction --- ui.tests/test-module/specs/formcontainer.cy.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui.tests/test-module/specs/formcontainer.cy.js b/ui.tests/test-module/specs/formcontainer.cy.js index 0e644d4f01..bf153900fd 100644 --- a/ui.tests/test-module/specs/formcontainer.cy.js +++ b/ui.tests/test-module/specs/formcontainer.cy.js @@ -80,8 +80,6 @@ describe('Page/Form Authoring', function () { cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + formContainerEditPathSelector); cy.invokeEditableAction("[data-action='CONFIGURE']"); cy.get('.cmp-adaptiveform-container__editdialog').contains('Submission').click({force:true}); - cy.get(".cmp-adaptiveform-container__submitaction").children('button[is="coral-button"][aria-haspopup="listbox"]').first().click({force: true}); - cy.get('coral-selectlist-item[value="fd/af/components/guidesubmittype/restendpoint"]').should('be.visible').click(); cy.get("[name='./restEndpointPostUrl']").scrollIntoView().clear({force: true}).type("invalid-url", {force: true}); cy.get('.coral-Form-errorlabel').should('contain.text', "Please enter the absolute path of the REST endpoint."); cy.get("[name='./restEndpointPostUrl']").clear({force: true}).type("http://localhost:4502/some/endpoint", {force: true});