From 87a5387fedcb704146c1afcb6b3ceefe2847b3c3 Mon Sep 17 00:00:00 2001 From: Anshika Gautam Date: Wed, 11 Jun 2025 12:40:04 +0530 Subject: [PATCH 1/3] FORMS-20431: Update excludeFromDoRIfHidden prefix --- .../core/components/internal/form/ReservedProperties.java | 1 - .../internal/models/v2/form/FormContainerImpl.java | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) 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 ba83d703dc..5aa4e3e5ec 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,7 +163,6 @@ private ReservedProperties() { public static final String FD_ENABLE_AUTO_SAVE = "fd:enableAutoSave"; public static final String FD_AUTO_SAVE_STRATEGY_TYPE = "fd:autoSaveStrategyType"; public static final String FD_AUTO_SAVE_INTERVAL = "fd:autoSaveInterval"; - public static final String FD_EXCLUDE_FROM_DOR_IF_HIDDEN = "excludeFromDoRIfHidden"; public static final String FD_XFA_SCRIPTS = "fd:xfaScripts"; diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java index b35e7d4b5a..6381295eb2 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java @@ -84,7 +84,7 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont private static final String FD_CUSTOM_FUNCTIONS_URL = "fd:customFunctionsUrl"; private static final String FD_DATA_URL = "fd:dataUrl"; private static final String FD_VIEW_PRINT_PATH = "fd:view/print"; - private static final String EXCLUDE_FROM_DOR_IF_HIDDEN = "excludeFromDoRIfHidden"; + private static final String FD_EXCLUDE_FROM_DOR_IF_HIDDEN = "fd:excludeFromDoRIfHidden"; /** Constant representing email submit action type */ private static final String SS_EMAIL = "email"; @@ -183,8 +183,8 @@ private void initExcludeFromDoRIfHidden() { Resource viewPrintResource = resource.getChild(FD_VIEW_PRINT_PATH); if (viewPrintResource != null) { ValueMap vm = viewPrintResource.getValueMap(); - if (vm.containsKey(EXCLUDE_FROM_DOR_IF_HIDDEN)) { - excludeFromDoRIfHidden = vm.get(EXCLUDE_FROM_DOR_IF_HIDDEN, Boolean.class); + if (vm.containsKey(FD_EXCLUDE_FROM_DOR_IF_HIDDEN)) { + excludeFromDoRIfHidden = vm.get(FD_EXCLUDE_FROM_DOR_IF_HIDDEN, Boolean.class); } } } @@ -419,7 +419,7 @@ public Map getDorProperties() { customDorProperties.put(DOR_TEMPLATE_TYPE, dorTemplateType); } if (excludeFromDoRIfHidden != null) { - customDorProperties.put(EXCLUDE_FROM_DOR_IF_HIDDEN, excludeFromDoRIfHidden); + customDorProperties.put(FD_EXCLUDE_FROM_DOR_IF_HIDDEN, excludeFromDoRIfHidden); } return customDorProperties; } From 38950fa0a5cded4d7539acbf3528fb3b37d74704 Mon Sep 17 00:00:00 2001 From: Anshika Gautam Date: Wed, 11 Jun 2025 16:29:07 +0530 Subject: [PATCH 2/3] FORMS-20431: Update test cases --- .../core/components/internal/form/ReservedProperties.java | 1 + .../internal/models/v2/form/FormContainerImpl.java | 8 ++++---- .../internal/models/v2/form/FormContainerImplTest.java | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) 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 5aa4e3e5ec..026c65de1d 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,7 @@ private ReservedProperties() { public static final String FD_ENABLE_AUTO_SAVE = "fd:enableAutoSave"; public static final String FD_AUTO_SAVE_STRATEGY_TYPE = "fd:autoSaveStrategyType"; public static final String FD_AUTO_SAVE_INTERVAL = "fd:autoSaveInterval"; + public static final String FD_EXCLUDE_FROM_DOR_IF_HIDDEN = "fd:excludeFromDoRIfHidden"; public static final String FD_XFA_SCRIPTS = "fd:xfaScripts"; diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java index 6381295eb2..d931c82386 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java @@ -84,7 +84,7 @@ public class FormContainerImpl extends AbstractContainerImpl implements FormCont private static final String FD_CUSTOM_FUNCTIONS_URL = "fd:customFunctionsUrl"; private static final String FD_DATA_URL = "fd:dataUrl"; private static final String FD_VIEW_PRINT_PATH = "fd:view/print"; - private static final String FD_EXCLUDE_FROM_DOR_IF_HIDDEN = "fd:excludeFromDoRIfHidden"; + private static final String EXCLUDE_FROM_DOR_IF_HIDDEN = "excludeFromDoRIfHidden"; /** Constant representing email submit action type */ private static final String SS_EMAIL = "email"; @@ -183,8 +183,8 @@ private void initExcludeFromDoRIfHidden() { Resource viewPrintResource = resource.getChild(FD_VIEW_PRINT_PATH); if (viewPrintResource != null) { ValueMap vm = viewPrintResource.getValueMap(); - if (vm.containsKey(FD_EXCLUDE_FROM_DOR_IF_HIDDEN)) { - excludeFromDoRIfHidden = vm.get(FD_EXCLUDE_FROM_DOR_IF_HIDDEN, Boolean.class); + if (vm.containsKey(EXCLUDE_FROM_DOR_IF_HIDDEN)) { + excludeFromDoRIfHidden = vm.get(EXCLUDE_FROM_DOR_IF_HIDDEN, Boolean.class); } } } @@ -419,7 +419,7 @@ public Map getDorProperties() { customDorProperties.put(DOR_TEMPLATE_TYPE, dorTemplateType); } if (excludeFromDoRIfHidden != null) { - customDorProperties.put(FD_EXCLUDE_FROM_DOR_IF_HIDDEN, excludeFromDoRIfHidden); + customDorProperties.put(ReservedProperties.FD_EXCLUDE_FROM_DOR_IF_HIDDEN, excludeFromDoRIfHidden); } return customDorProperties; } diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java index 5eec0c4d73..84adcf883c 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java @@ -798,8 +798,8 @@ void testExcludeFromDoRIfHiddenFromViewPrint() throws Exception { FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_EXCLUDE_FROM_DOR_IF_HIDDEN, FormContainer.class, context); Map dorProperties = ((FormContainerImpl) formContainer).getDorProperties(); - assertTrue(dorProperties.containsKey("excludeFromDoRIfHidden")); - assertEquals(true, dorProperties.get("excludeFromDoRIfHidden")); + assertTrue(dorProperties.containsKey("fd:excludeFromDoRIfHidden")); + assertEquals(true, dorProperties.get("fd:excludeFromDoRIfHidden")); } @Test @@ -812,7 +812,7 @@ void testExcludeFromDoRIfHiddenFromViewPrintFalse() throws Exception { FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_EXCLUDE_FROM_DOR_IF_HIDDEN, FormContainer.class, context); Map dorProperties = ((FormContainerImpl) formContainer).getDorProperties(); - assertTrue(dorProperties.containsKey("excludeFromDoRIfHidden")); - assertEquals(false, dorProperties.get("excludeFromDoRIfHidden")); + assertTrue(dorProperties.containsKey("fd:excludeFromDoRIfHidden")); + assertEquals(false, dorProperties.get("fd:excludeFromDoRIfHidden")); } } From 67d4a35d7345f26db3feb25453adc240cce9ce92 Mon Sep 17 00:00:00 2001 From: Anshika Gautam Date: Tue, 17 Jun 2025 12:04:34 +0530 Subject: [PATCH 3/3] FORMS-20431: Update the af-core version --- ui.frontend/package-lock.json | 33 +++++++++++++++++---------------- ui.frontend/package.json | 4 ++-- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json index a20359e29e..0e56d16eaf 100644 --- a/ui.frontend/package-lock.json +++ b/ui.frontend/package-lock.json @@ -9,10 +9,10 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@aemforms/af-core": "^0.22.129", + "@aemforms/af-core": "^0.22.134", "@aemforms/af-core-xfa": "^0.1.6", "@aemforms/af-custom-functions": "1.0.15", - "@aemforms/af-formatters": "^0.22.129" + "@aemforms/af-formatters": "^0.22.134" }, "devDependencies": { "@babel/preset-env": "^7.18.2", @@ -108,13 +108,13 @@ } }, "node_modules/@aemforms/af-core": { - "version": "0.22.129", - "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-0.22.129.tgz", - "integrity": "sha512-Dh3kYXbWovznloZj8SmyIiHn2nxCrkO9YdJ30bfSF6oKn8lB/AfYbOsEEQYzpFnoOihcc+ujdxHvw0m/JOXgRA==", + "version": "0.22.134", + "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-0.22.134.tgz", + "integrity": "sha512-ABzdTk3RBBDhApx8lE8iQs5np8ykvvZ3iR7ML2fcx9ckLWAoo/BmH8gncmgVT0qRtWePhiMpSnf/jIDYrsC65w==", "license": "Adobe Proprietary", "dependencies": { "@adobe/json-formula": "0.1.50", - "@aemforms/af-formatters": "^0.22.129" + "@aemforms/af-formatters": "^0.22.134" } }, "node_modules/@aemforms/af-core-xfa": { @@ -132,9 +132,10 @@ "integrity": "sha512-8mzNBGJ48B6GVL9N9FKuT+ufJgnRYWlY4Ni7U067cwN+sr9K4HWzBzQtShOlstZNXLuDNYt2pO03CMi1j6SQwg==" }, "node_modules/@aemforms/af-formatters": { - "version": "0.22.129", - "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.129.tgz", - "integrity": "sha512-e/T0yGfBsRD7/NymCwlvNTcSI4s7X8U0ZA/a+zvbvR3fGHIBh7QkrubxoV0XlBewI12TimaCrqVvMwGvaiJW0w==" + "version": "0.22.134", + "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.134.tgz", + "integrity": "sha512-Hct7quuIkBq2qbvo6YxaPiIruZi+WgvRVtaE9h9ggnn2EV1jznPclh9Yn2DTlGUFOYrfvQEPtJpkP19IGqQMgQ==", + "license": "Adobe Proprietary" }, "node_modules/@ampproject/remapping": { "version": "2.2.1", @@ -11133,12 +11134,12 @@ "integrity": "sha512-dmlLYfbty8NPVIdxvI9cJ+ZdXsrRCFrCdmL1+aR2auEzXJ86rD0bm1qu+S4NOpFiZLKIyx0zvUTykms40vNjsA==" }, "@aemforms/af-core": { - "version": "0.22.129", - "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-0.22.129.tgz", - "integrity": "sha512-Dh3kYXbWovznloZj8SmyIiHn2nxCrkO9YdJ30bfSF6oKn8lB/AfYbOsEEQYzpFnoOihcc+ujdxHvw0m/JOXgRA==", + "version": "0.22.134", + "resolved": "https://registry.npmjs.org/@aemforms/af-core/-/af-core-0.22.134.tgz", + "integrity": "sha512-ABzdTk3RBBDhApx8lE8iQs5np8ykvvZ3iR7ML2fcx9ckLWAoo/BmH8gncmgVT0qRtWePhiMpSnf/jIDYrsC65w==", "requires": { "@adobe/json-formula": "0.1.50", - "@aemforms/af-formatters": "^0.22.129" + "@aemforms/af-formatters": "^0.22.134" } }, "@aemforms/af-core-xfa": { @@ -11156,9 +11157,9 @@ "integrity": "sha512-8mzNBGJ48B6GVL9N9FKuT+ufJgnRYWlY4Ni7U067cwN+sr9K4HWzBzQtShOlstZNXLuDNYt2pO03CMi1j6SQwg==" }, "@aemforms/af-formatters": { - "version": "0.22.129", - "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.129.tgz", - "integrity": "sha512-e/T0yGfBsRD7/NymCwlvNTcSI4s7X8U0ZA/a+zvbvR3fGHIBh7QkrubxoV0XlBewI12TimaCrqVvMwGvaiJW0w==" + "version": "0.22.134", + "resolved": "https://registry.npmjs.org/@aemforms/af-formatters/-/af-formatters-0.22.134.tgz", + "integrity": "sha512-Hct7quuIkBq2qbvo6YxaPiIruZi+WgvRVtaE9h9ggnn2EV1jznPclh9Yn2DTlGUFOYrfvQEPtJpkP19IGqQMgQ==" }, "@ampproject/remapping": { "version": "2.2.1", diff --git a/ui.frontend/package.json b/ui.frontend/package.json index 22c2bcb1dc..bcdc8772d1 100644 --- a/ui.frontend/package.json +++ b/ui.frontend/package.json @@ -25,9 +25,9 @@ "webpack-merge": "^5.8.0" }, "dependencies": { - "@aemforms/af-core": "^0.22.129", + "@aemforms/af-core": "^0.22.134", "@aemforms/af-core-xfa": "^0.1.6", - "@aemforms/af-formatters": "^0.22.129", + "@aemforms/af-formatters": "^0.22.134", "@aemforms/af-custom-functions": "1.0.15" } }