diff --git a/bundles/af-core/pom.xml b/bundles/af-core/pom.xml index 54eed7c5b3..172f68d6fb 100644 --- a/bundles/af-core/pom.xml +++ b/bundles/af-core/pom.xml @@ -653,6 +653,10 @@ core.wcm.components.core provided + + com.adobe.aem + core-forms-print-components-print-dor-api + org.apache.sling org.apache.sling.testing.caconfig-mock-plugin diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java index d5f64f60d9..862f046330 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java @@ -148,4 +148,7 @@ private FormConstants() { /** Form definition type indicating submission view */ public static final String FORM_DEFINITION_SUBMISSION = "submission"; + + /** The channel for print */ + public static final String CHANNEL_PRINT = "print"; } diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImpl.java index 11d84d0fc6..6597f80a1b 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImpl.java @@ -109,6 +109,10 @@ public Map getDorProperties() { if (dorColspan != null) { customDorProperties.put("dorColspan", dorColspan); } + Map dorContainer = getDorContainer(); + if (dorContainer != null) { + customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer); + } return customDorProperties; } diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FragmentImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FragmentImpl.java index 0614fcef10..ccd0e829d2 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FragmentImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FragmentImpl.java @@ -15,7 +15,9 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ package com.adobe.cq.forms.core.components.internal.models.v1.form; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import javax.annotation.PostConstruct; @@ -57,6 +59,7 @@ public class FragmentImpl extends PanelImpl implements Fragment { public static final String CUSTOM_FRAGMENT_PROPERTY_WRAPPER = "fd:fragment"; + private static final String PRINT_CHANNEL_PATH = "/" + "print"; @OSGiService private SlingModelFilter slingModelFilter; @@ -72,7 +75,9 @@ public class FragmentImpl extends PanelImpl implements Fragment { @PostConstruct private void initFragmentModel() { ResourceResolver resourceResolver = resource.getResourceResolver(); - fragmentContainer = ComponentUtils.getFragmentContainer(resourceResolver, fragmentPath); + + String updatedFragmentPath = this.getFragmentPathBasedOnChannel(fragmentPath); + fragmentContainer = ComponentUtils.getFragmentContainer(resourceResolver, updatedFragmentPath); if (request != null) { FormClientLibManager formClientLibManager = request.adaptTo(FormClientLibManager.class); String clientLibRef = getClientLibForFragment(); @@ -82,6 +87,13 @@ private void initFragmentModel() { } } + private String getFragmentPathBasedOnChannel(String fragmentPath) { + if (FormConstants.CHANNEL_PRINT.equals(this.channel)) { + return fragmentPath + PRINT_CHANNEL_PATH; + } + return fragmentPath; + } + @JsonView(Views.Author.class) public String getFragmentPath() { return fragmentPath; diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImpl.java index b066e38587..4ae32726a3 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImpl.java @@ -145,6 +145,10 @@ public Map getDorProperties() { if (dorLayoutType != null) { customDorProperties.put(DOR_LAYOUT_TYPE, dorLayoutType); } + Map dorContainer = getDorContainer(); + if (dorContainer != null) { + customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer); + } return customDorProperties; } diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormComponent.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormComponent.java index 8416d4ca8c..ee4446c73b 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormComponent.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormComponent.java @@ -76,6 +76,17 @@ default Map getDorProperties() { return Collections.emptyMap(); } + /** + * DOR container + * + * @since com.adobe.cq.forms.core.components.models.form 2.1.0 + */ + @JsonView(Views.DoR.class) + @JsonInclude(JsonInclude.Include.NON_EMPTY) + default Map getDorContainer() { + return Collections.emptyMap(); + } + /** * Returns getPath of the form field * diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractComponentImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractComponentImpl.java index 03f1f20cca..15f4cbb147 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractComponentImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractComponentImpl.java @@ -23,10 +23,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; -import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy; -import org.apache.sling.models.annotations.injectorspecific.ScriptVariable; -import org.apache.sling.models.annotations.injectorspecific.Self; -import org.apache.sling.models.annotations.injectorspecific.SlingObject; +import org.apache.sling.models.annotations.injectorspecific.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.osgi.annotation.versioning.ConsumerType; @@ -43,6 +40,7 @@ import com.day.cq.wcm.api.Page; import com.day.cq.wcm.api.PageManager; import com.day.cq.wcm.api.components.ComponentContext; +import com.fasterxml.jackson.annotation.JsonIgnore; // this class is copied from WCM, since for forms adapting via slingRequest is optional @@ -85,6 +83,11 @@ public abstract class AbstractComponentImpl implements Component { @Nullable private Page currentPage; + @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = "fd:channel") + @Nullable + @JsonIgnore + protected String channel; + /** * The ID for this component. */ diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractContainerImpl.java index 5192fb126b..d5f063d43f 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractContainerImpl.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractContainerImpl.java @@ -15,13 +15,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ package com.adobe.cq.forms.core.components.util; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; import javax.annotation.Nonnull; import javax.annotation.PostConstruct; @@ -29,6 +23,10 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; +import org.apache.sling.api.resource.ResourceUtil; +import org.apache.sling.api.resource.ValueMap; +import org.apache.sling.api.wrappers.ValueMapDecorator; +import org.apache.sling.api.wrappers.ValueMapUtil; import org.apache.sling.models.annotations.injectorspecific.OSGiService; import org.apache.sling.models.annotations.injectorspecific.SlingObject; import org.apache.sling.models.factory.ModelFactory; @@ -39,9 +37,11 @@ import com.adobe.cq.export.json.ComponentExporter; import com.adobe.cq.export.json.SlingModelFilter; +import com.adobe.cq.forms.core.components.internal.form.FormConstants; import com.adobe.cq.forms.core.components.models.form.Container; import com.adobe.cq.forms.core.components.models.form.ContainerConstraint; import com.adobe.cq.forms.core.components.models.form.FormComponent; +import com.adobe.granite.ui.components.ds.ValueMapResource; import com.day.cq.wcm.foundation.model.export.AllowedComponentsExporter; import com.day.cq.wcm.foundation.model.responsivegrid.ResponsiveGrid; import com.fasterxml.jackson.annotation.JsonInclude; @@ -143,6 +143,13 @@ protected Map getChildrenModels(@Nullable SlingHttpServletRequest Map models = new LinkedHashMap<>(); for (Resource child : filteredChildrenResources) { T model = null; + if (FormConstants.CHANNEL_PRINT.equals(this.channel)) { + // Create a ValueMap with additional properties + ValueMap additionalProperties = new ValueMapDecorator(new HashMap<>()); + additionalProperties.put("fd:channel", this.channel); + ValueMap properties = ValueMapUtil.merge(ResourceUtil.getValueMap(child), additionalProperties); + child = new ValueMapResource(child.getResourceResolver(), child.getPath(), child.getResourceType(), properties); + } if (request != null) { // todo: if possible set i18n form parent to child here, this would optimize the first form rendering model = modelFactory.getModelFromWrappedRequest(request, child, modelClass); 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..78898add40 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,18 @@ import java.io.IOException; import java.math.BigDecimal; -import java.util.*; +import java.util.AbstractMap; +import java.util.ArrayList; +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; @@ -44,11 +55,13 @@ import com.adobe.aemds.guide.utils.GuideUtils; import com.adobe.cq.forms.core.components.datalayer.FormComponentData; import com.adobe.cq.forms.core.components.internal.datalayer.ComponentDataImpl; +import com.adobe.cq.forms.core.components.internal.form.FormConstants; import com.adobe.cq.forms.core.components.internal.form.ReservedProperties; import com.adobe.cq.forms.core.components.models.form.BaseConstraint; import com.adobe.cq.forms.core.components.models.form.FieldType; import com.adobe.cq.forms.core.components.models.form.FormComponent; import com.adobe.cq.forms.core.components.models.form.Label; +import com.adobe.cq.forms.core.components.models.form.print.dorapi.DorContainer; import com.adobe.cq.wcm.core.components.models.Component; import com.adobe.cq.wcm.core.components.util.ComponentUtils; import com.day.cq.i18n.I18n; @@ -58,6 +71,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; @@ -258,6 +272,7 @@ protected boolean getEditMode() { } public static final String CUSTOM_DOR_PROPERTY_WRAPPER = "fd:dor"; + public static final String CUSTOM_DOR_CONTAINER_WRAPPER = "dorContainer"; // used for DOR and SPA editor to work public static final String CUSTOM_JCR_PATH_PROPERTY_WRAPPER = "fd:path"; @@ -544,6 +559,10 @@ public Map getDorProperties() { if (dorBindRef != null) { customDorProperties.put("dorBindRef", dorBindRef); } + Map dorContainer = getDorContainer(); + if (dorContainer != null) { + customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer); + } return customDorProperties; } @@ -567,4 +586,26 @@ private List getDisabledXFAScripts() { } return new ArrayList<>(disabledScripts); } + + /** + * Returns the dor container properties. + * + * @return Map of dor container properties if `fd:dorContainer` node is present otherwise returns null + */ + @JsonIgnore + @Override + public Map getDorContainer() { + if (FormConstants.CHANNEL_PRINT.equals(this.channel) && resource != null) { + Resource dorContainerResource = resource.getChild("fd:dorContainer"); + if (dorContainerResource != null) { + DorContainer dorContainer = dorContainerResource.adaptTo(DorContainer.class); + ObjectMapper objectMapper = new ObjectMapper(); + if (dorContainer != null) { + return objectMapper.convertValue(dorContainer, new TypeReference>() {}); + } + } + } + return null; + } + } diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/views/Views.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/views/Views.java index 9411d261ac..62dd56a224 100644 --- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/views/Views.java +++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/views/Views.java @@ -29,4 +29,10 @@ public static class Publish {} */ public static class Author extends Publish {} + /** + * Use this view for including the print-specific properties + * Eg; dorContainer and pageTemplate + */ + public static class DoR extends Author {} + } diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImplTest.java index cd6d9cda37..ac7429ac97 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImplTest.java @@ -15,6 +15,9 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ package com.adobe.cq.forms.core.components.internal.models.v1.form; +import java.util.HashMap; +import java.util.Map; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,12 +25,14 @@ import com.adobe.cq.forms.core.Utils; import com.adobe.cq.forms.core.components.internal.form.FormConstants; -import com.adobe.cq.forms.core.components.models.form.*; +import com.adobe.cq.forms.core.components.models.form.Button; +import com.adobe.cq.forms.core.components.models.form.FieldType; import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext; import io.wcm.testing.mock.aem.junit5.AemContext; import io.wcm.testing.mock.aem.junit5.AemContextExtension; import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(AemContextExtension.class) public class ButtonImplTest { @@ -148,4 +153,13 @@ void testNoFieldType() { Button button = Utils.getComponentUnderTest(PATH_BUTTON_NO_FIELDTYPE, Button.class, context); assertEquals(FieldType.BUTTON.getValue(), button.getFieldType()); } + + @Test + void testDorContainer() { + Button mockButton = Mockito.mock(ButtonImpl.class); + Mockito.when(mockButton.getDorContainer()).thenReturn(new HashMap<>()); + Mockito.when(mockButton.getDorProperties()).thenCallRealMethod(); + Map dorProperties = mockButton.getDorProperties(); + assertTrue(dorProperties.containsKey(ButtonImpl.CUSTOM_DOR_CONTAINER_WRAPPER)); + } } diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImplTest.java index 506291c089..cbe0d92d7b 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImplTest.java @@ -15,6 +15,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ package com.adobe.cq.forms.core.components.internal.models.v1.form; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -40,6 +41,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(AemContextExtension.class) public class PanelImplTest { @@ -137,4 +139,13 @@ void testNoFieldType() { Panel panel = Utils.getComponentUnderTest(PATH_PANEL_WITHOUT_FIELDTYPE, Panel.class, context); assertEquals(FieldType.PANEL.getValue(), panel.getFieldType()); } + + @Test + void testDorContainer() { + Panel mockPanel = Mockito.mock(PanelImpl.class); + Mockito.when(mockPanel.getDorContainer()).thenReturn(new HashMap<>()); + Mockito.when(mockPanel.getDorProperties()).thenCallRealMethod(); + Map dorProperties = mockPanel.getDorProperties(); + assertTrue(dorProperties.containsKey(PanelImpl.CUSTOM_DOR_CONTAINER_WRAPPER)); + } } diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java index 19aaa77f3d..cdbbf4f584 100644 --- a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java @@ -427,4 +427,4 @@ void testNoFieldType() { RadioButton radioButton = getRadioButtonUnderTest(PATH_RADIOBUTTON_WITHOUT_FIELDTYPE); assertEquals(FieldType.RADIO_GROUP.getValue(), radioButton.getFieldType()); } -} +} \ No newline at end of file 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 109a7b49ce..052ef08433 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 @@ -35,6 +35,7 @@ import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.osgi.services.HttpClientBuilderFactory; import org.apache.sling.api.resource.Resource; +import org.apache.sling.api.resource.ValueMap; import org.apache.sling.i18n.ResourceBundleProvider; import org.apache.sling.testing.mock.sling.MockResourceBundle; import org.apache.sling.testing.mock.sling.MockResourceBundleProvider; @@ -54,7 +55,13 @@ import com.adobe.cq.forms.core.Utils; import com.adobe.cq.forms.core.components.internal.form.FormConstants; import com.adobe.cq.forms.core.components.internal.form.ReservedProperties; -import com.adobe.cq.forms.core.components.models.form.*; +import com.adobe.cq.forms.core.components.models.form.AutoSaveConfiguration; +import com.adobe.cq.forms.core.components.models.form.FieldType; +import com.adobe.cq.forms.core.components.models.form.FormClientLibManager; +import com.adobe.cq.forms.core.components.models.form.FormContainer; +import com.adobe.cq.forms.core.components.models.form.FormMetaData; +import com.adobe.cq.forms.core.components.models.form.TextInput; +import com.adobe.cq.forms.core.components.models.form.ThankYouOption; import com.adobe.cq.forms.core.components.views.Views; import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext; import com.day.cq.i18n.I18n; @@ -96,6 +103,7 @@ public class FormContainerImplTest { + "/formContainer-cc-form-spreadsheet-submission"; private static final String PATH_CC_FORM_REST_SUBMISSION = CONTENT_ROOT + "/formContainer-cc-form-rest-submission"; + private static final String PATH_FORM_WITH_FRAGMENT = CONTENT_ROOT + "/formcontainerv2-with-fragment"; private static final String PATH_FORM_WITHOUT_FIELDTYPE = CONTENT_ROOT + "/formcontainerv2-without-fieldtype"; private static final String PATH_FORM_WITH_AUTO_SAVE = CONTENT_ROOT + "/formcontainerv2WithAutoSave"; @@ -441,6 +449,7 @@ void testGetName() throws Exception { @Test public void testRequestAttributeIfContainerPageDifferent() { Resource resource = Mockito.mock(Resource.class); + Mockito.when(resource.getValueMap()).thenReturn(ValueMap.EMPTY); Page afPage = Mockito.mock(Page.class); Mockito.when(afPage.getPath()).thenReturn(AF_PATH); PageManager pageManager = Mockito.mock(PageManager.class); @@ -815,4 +824,10 @@ void testExcludeFromDoRIfHiddenFromViewPrintFalse() throws Exception { assertTrue(dorProperties.containsKey("fd:excludeFromDoRIfHidden")); assertEquals(false, dorProperties.get("fd:excludeFromDoRIfHidden")); } + + @Test + void testJSONExportWithFragment() throws Exception { + FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_WITH_FRAGMENT, FormContainerImpl.class, context); + Utils.testJSONExport(formContainer, Utils.getTestExporterJSONPath(BASE, PATH_FORM_WITH_FRAGMENT)); + } } diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/models/form/FormComponentTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/models/form/FormComponentTest.java new file mode 100644 index 0000000000..58dff2ea1f --- /dev/null +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/models/form/FormComponentTest.java @@ -0,0 +1,35 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ +package com.adobe.cq.forms.core.components.models.form; + +import java.util.Collections; + +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.osgi.annotation.versioning.ProviderType; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@ProviderType +public class FormComponentTest { + @Test + public void testGetDorContainer() { + FormComponent formComponent = Mockito.mock(FormComponent.class); + Mockito.when(formComponent.getDorContainer()).thenCallRealMethod(); + assertEquals(Collections.emptyMap(), formComponent.getDorContainer()); + } + +} 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..77969f3874 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 @@ -30,6 +30,7 @@ import com.adobe.cq.forms.core.Utils; import com.adobe.cq.forms.core.components.internal.form.FormConstants; +import com.adobe.cq.forms.core.components.models.form.print.dorapi.DorContainer; import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext; import com.day.cq.wcm.api.Page; import com.day.cq.wcm.api.PageManager; @@ -185,4 +186,21 @@ private AbstractFormComponentImpl prepareTestClass(String path) { Utils.setInternalState(abstractFormComponentImpl, "resource", resource); return abstractFormComponentImpl; } + + @Test + public void testGetDorContainer() { + Resource resource = Mockito.mock(Resource.class); + AbstractFormComponentImpl abstractFormComponentImpl = new AbstractFormComponentImpl(); + Utils.setInternalState(abstractFormComponentImpl, "resource", resource); + Utils.setInternalState(abstractFormComponentImpl, "channel", "print"); + + Resource dorContainerResource = Mockito.mock(Resource.class); + Mockito.doReturn(dorContainerResource).when(resource).getChild("fd:dorContainer"); + + DorContainer dorContainerMock = Mockito.mock(DorContainer.class); + Mockito.doReturn(dorContainerMock).when(dorContainerResource).adaptTo(DorContainer.class); + + assertThrows(java.lang.IllegalArgumentException.class, () -> abstractFormComponentImpl.getDorContainer()); + + } } diff --git a/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/views/ViewsTest.java b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/views/ViewsTest.java new file mode 100644 index 0000000000..eb27198595 --- /dev/null +++ b/bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/views/ViewsTest.java @@ -0,0 +1,41 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ Copyright 2025 Adobe + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ +package com.adobe.cq.forms.core.components.views; + +import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.*; + +public class ViewsTest { + + @Test + public void testPublish() { + Views.Publish publish = new Views.Publish(); + assertNotNull(publish); + } + + @Test + public void testAuthor() { + Views.Author author = new Views.Author(); + assertTrue(author instanceof Views.Publish); + } + + @Test + public void testDor() { + Views.DoR dor = new Views.DoR(); + assertTrue(dor instanceof Views.Author); + } +} diff --git a/bundles/af-core/src/test/resources/form/formcontainer/exporter-formcontainerv2-with-fragment.json b/bundles/af-core/src/test/resources/form/formcontainer/exporter-formcontainerv2-with-fragment.json new file mode 100644 index 0000000000..d443738d66 --- /dev/null +++ b/bundles/af-core/src/test/resources/form/formcontainer/exporter-formcontainerv2-with-fragment.json @@ -0,0 +1,113 @@ +{ + ":items": { + "fragment": { + ":items": { + "textinput": { + ":type": "core/fd/components/form/textinput/v1/textinput", + "events": { + "custom:setProperty": [ + "$event.payload" + ] + }, + "fieldType": "text-input", + "id": "textinput-a286959469", + "label": { + "value": "Text Input" + }, + "name": "fragmenttextinput", + "properties": { + "fd:dor": { + "dorExclusion": false + }, + "fd:path": "/content/forms/af/demo/jcr:content/printfragment/print/jcr:content/guideContainer/textinput" + }, + "type": "string" + } + }, + ":itemsOrder": [ + "textinput" + ], + ":type": "core/fd/components/form/fragment/v1/fragment", + "events": { + "custom:setProperty": [ + "$event.payload" + ] + }, + "fieldType": "panel", + "id": "fragment-cf97dd9759", + "label": { + "value": "Fragment" + }, + "maxOccur": 4, + "minOccur": 0, + "name": "fragment-123", + "properties": { + "customProp": "customPropValue", + "fd:dor": { + "dorExcludeDescription": false, + "dorExcludeTitle": false, + "dorExclusion": false + }, + "fd:fragment": true, + "fd:path": "/content/forms/af/demo/jcr:content/formcontainerv2-with-fragment/fragment", + "fd:viewType": "fragment" + }, + "repeatable": true, + "type": "object" + }, + "textinput": { + ":type": "core/fd/components/form/textinput/v1/textinput", + "events": { + "custom:setProperty": [ + "$event.payload" + ] + }, + "fieldType": "text-input", + "id": "textinput-98750b73f9", + "label": { + "value": "Text Input" + }, + "name": "fragmenttextinput", + "properties": { + "fd:dor": { + "dorExclusion": false + }, + "fd:path": "/content/forms/af/demo/jcr:content/formcontainerv2-with-fragment/textinput" + }, + "type": "string" + } + }, + ":itemsOrder": [ + "textinput", + "fragment" + ], + ":type": "core/fd/components/print/container/v1/container", + "action": "/adobe/forms/af/submit/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==", + "adaptiveform": "0.15.2", + "events": { + "custom:setProperty": [ + "$event.payload" + ] + }, + "fieldType": "form", + "id": "L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==", + "lang": "en", + "metadata": { + "grammar": "json-formula-1.0.0", + "version": "1.0.0" + }, + "properties": { + "customProp": "customPropValue", + "fd:customFunctionsUrl": "/adobe/forms/af/customfunctions/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==", + "fd:dataUrl": "/adobe/forms/af/data/L2NvbnRlbnQvZm9ybXMvYWYvZGVtbw==", + "fd:dor": { + "dorTemplateRef": "xyz", + "dorType": "generate" + }, + "fd:formDataEnabled": true, + "fd:isHamburgerMenuEnabled": false, + "fd:path": "/content/forms/af/demo/jcr:content/formcontainerv2-with-fragment", + "fd:roleAttribute": "test-role-attribute", + "fd:schemaType": "BASIC" + } +} diff --git a/bundles/af-core/src/test/resources/form/formcontainer/exporter-formcontainerv2.json b/bundles/af-core/src/test/resources/form/formcontainer/exporter-formcontainerv2.json index 7e137961c7..d29486cb4b 100644 --- a/bundles/af-core/src/test/resources/form/formcontainer/exporter-formcontainerv2.json +++ b/bundles/af-core/src/test/resources/form/formcontainer/exporter-formcontainerv2.json @@ -57,4 +57,4 @@ ":type": "core/fd/components/form/textinput/v1/textinput" } } -} +} \ No newline at end of file diff --git a/bundles/af-core/src/test/resources/form/formcontainer/test-page-content.json b/bundles/af-core/src/test/resources/form/formcontainer/test-page-content.json index 5b999c8856..566fa9ae19 100644 --- a/bundles/af-core/src/test/resources/form/formcontainer/test-page-content.json +++ b/bundles/af-core/src/test/resources/form/formcontainer/test-page-content.json @@ -210,6 +210,86 @@ "visible": false }, "actionType": "fd/af/components/guidesubmittype/rest" + }, + "formcontainerv2-with-fragment": { + "jcr:primaryType": "nt:unstructured", + "sling:resourceType" : "core/fd/components/print/container/v1/container", + "thankYouMessage": "Thank you for submitting.", + "fd:roleAttribute": "test-role-attribute", + "thankYouOption": "message", + "redirect": "/content/wknd", + "prefillService": "FDM", + "fieldType" : "form", + "dorType": "generate", + "dorTemplateRef": "xyz", + "clientLibRef": "abc", + "customProp": "customPropValue", + "fd:channel": "print", + "specVersion": "0.15.2", + "textinput": { + "jcr:primaryType": "nt:unstructured", + "jcr:title": "Text Input", + "name": "fragmenttextinput", + "sling:resourceType": "core/fd/components/form/textinput/v1/textinput", + "fieldType": "text-input", + "fd:dorContainer": { + "jcr:primaryType": "nt:unstructured", + "sling:resourceType" : "core/fd/components/print/fielddorcontainer/v1/fielddorcontainer", + "type": "textfield", + "name": "TextField1", + "width": "1.5in", + "height": "0.5in", + "left": "0.5in", + "top": "0.5in" + } + }, + "fragment": { + "jcr:primaryType": "nt:unstructured", + "wrapData": true, + "jcr:title": "Fragment", + "minOccur": "0", + "jcr:lastModifiedBy": "admin", + "name": "fragment-123", + "maxOccur": "4", + "jcr:lastModified": "Fri Jun 02 2023 12:34:24 GMT+0530", + "repeatable": true, + "sling:resourceType": "core/fd/components/form/fragment/v1/fragment", + "fieldType": "panel", + "fragmentPath": "/content/forms/af/demo/jcr:content/printfragment", + "customProp": "customPropValue" + } + }, + "printfragment": { + "jcr:primaryType": "nt:unstructured", + "jcr:title": "AF Fragment (v2)", + "jcr:content": { + "jcr:primaryType": "cq:PageContent", + "jcr:title": "AF Fragment (v2)" + }, + "print": { + "jcr:primaryType": "nt:unstructured", + "jcr:title": "AF Fragment (v2)", + "jcr:content": { + "jcr:primaryType": "cq:PageContent", + "jcr:title": "AF Fragment (v2)", + "guideContainer": { + "jcr:primaryType": "nt:unstructured", + "thankYouOption": "page", + "fd:version": "2.1", + "title": "AF Fragment (v2)", + "sling:resourceType": "core/fd/components/form/fragmentcontainer/v1/fragmentcontainer", + "fieldType": "form", + "dorType": "none", + "textinput": { + "jcr:primaryType": "nt:unstructured", + "jcr:title": "Text Input", + "name": "fragmenttextinput", + "sling:resourceType": "core/fd/components/form/textinput/v1/textinput", + "fieldType": "text-input" + } + } + } + } } } } \ No newline at end of file diff --git a/parent/pom.xml b/parent/pom.xml index 4c13badbb2..c600faee99 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -91,6 +91,7 @@ 2.24.6 2.24.6 + 1.0.12 UTF-8 2.16.0 @@ -1074,6 +1075,11 @@ core.wcm.components.core ${core.wcm.components.version} + + com.adobe.aem + core-forms-print-components-print-dor-api + ${core.print.api.version} + org.apache.commons commons-text diff --git a/ui.frontend/package-lock.json b/ui.frontend/package-lock.json index a20359e29e..d7e6d6c711 100644 --- a/ui.frontend/package-lock.json +++ b/ui.frontend/package-lock.json @@ -18348,4 +18348,4 @@ "dev": true } } -} +} \ No newline at end of file