adobe
diff --git a/‎bundles/af-core/pom.xml‎
Lines changed: 4 additions & 0 deletions b/‎bundles/af-core/pom.xml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java‎
Lines changed: 3 additions & 0 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImpl.java‎
Lines changed: 4 additions & 0 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/ButtonImpl.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FragmentImpl.java‎
Lines changed: 14 additions & 2 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FragmentImpl.java‎
Lines changed: 14 additions & 2 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImpl.java‎
Lines changed: 4 additions & 0 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/PanelImpl.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormComponent.java‎
Lines changed: 11 additions & 0 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormComponent.java‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractComponentImpl.java‎
Lines changed: 7 additions & 4 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractComponentImpl.java‎
Lines changed: 7 additions & 4 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractContainerImpl.java‎
Lines changed: 14 additions & 7 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractContainerImpl.java‎
Lines changed: 14 additions & 7 deletions
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java‎
Lines changed: 42 additions & 1 deletion b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java‎
Lines changed: 42 additions & 1 deletion
diff --git a/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/views/Views.java‎
Lines changed: 6 additions & 0 deletions b/‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/views/Views.java‎
Lines changed: 6 additions & 0 deletions
@@ -653,6 +653,10 @@
             <artifactId>core.wcm.components.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.adobe.aem</groupId>
+            <artifactId>core-forms-print-components-print-dor-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
 
@@ -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";
 }
@@ -109,6 +109,10 @@ public Map<String, Object> getDorProperties() {
         if (dorColspan != null) {
             customDorProperties.put("dorColspan", dorColspan);
         }
+        Map<String, Object> dorContainer = getDorContainer();
+        if (dorContainer != null) {
+            customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer);
+        }
         return customDorProperties;
     }
 
 
@@ -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;
 
@@ -145,6 +145,10 @@ public Map<String, Object> getDorProperties() {
         if (dorLayoutType != null) {
             customDorProperties.put(DOR_LAYOUT_TYPE, dorLayoutType);
         }
+        Map<String, Object> dorContainer = getDorContainer();
+        if (dorContainer != null) {
+            customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer);
+        }
         return customDorProperties;
     }
 
 
@@ -76,6 +76,17 @@ default Map<String, Object> 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<String, Object> getDorContainer() {
+        return Collections.emptyMap();
+    }
+
     /**
      * Returns getPath of the form field
      *
 
@@ -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.
      */
 
@@ -15,20 +15,18 @@
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 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;
 
 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 <T> Map<String, T> getChildrenModels(@Nullable SlingHttpServletRequest
         Map<String, T> 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);
 
@@ -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<String, Object> getDorProperties() {
         if (dorBindRef != null) {
             customDorProperties.put("dorBindRef", dorBindRef);
         }
+        Map<String, Object> dorContainer = getDorContainer();
+        if (dorContainer != null) {
+            customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer);
+        }
         return customDorProperties;
     }
 
@@ -567,4 +586,26 @@ private List<String> 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<String, Object> 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<Map<String, Object>>() {});
+                }
+            }
+        }
+        return null;
+    }
+
 }
@@ -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 {}
+
 }
Original file line number	Diff line number	Diff line change
`@@ -148,4 +148,7 @@ private FormConstants() {`
`148`	`148`
`149`	`149`	`/** Form definition type indicating submission view */`
`150`	`150`	`public static final String FORM_DEFINITION_SUBMISSION = "submission";`
	`151`	`+`
	`152`	`+ /** The channel for print */`
	`153`	`+ public static final String CHANNEL_PRINT = "print";`
`151`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,10 @@ public Map<String, Object> getDorProperties() {`
`109`	`109`	`if (dorColspan != null) {`
`110`	`110`	`customDorProperties.put("dorColspan", dorColspan);`
`111`	`111`	`}`
	`112`	`+ Map<String, Object> dorContainer = getDorContainer();`
	`113`	`+ if (dorContainer != null) {`
	`114`	`+ customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer);`
	`115`	`+ }`
`112`	`116`	`return customDorProperties;`
`113`	`117`	`}`
`114`	`118`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,10 @@ public Map<String, Object> getDorProperties() {`
`145`	`145`	`if (dorLayoutType != null) {`
`146`	`146`	`customDorProperties.put(DOR_LAYOUT_TYPE, dorLayoutType);`
`147`	`147`	`}`
	`148`	`+ Map<String, Object> dorContainer = getDorContainer();`
	`149`	`+ if (dorContainer != null) {`
	`150`	`+ customDorProperties.put(CUSTOM_DOR_CONTAINER_WRAPPER, dorContainer);`
	`151`	`+ }`
`148`	`152`	`return customDorProperties;`
`149`	`153`	`}`
`150`	`154`