FORMS-26490: Electronic Signature Guide Container changes (SP24)

all/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

bundles/af-core/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

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

@@ -120,6 +120,13 @@ public Boolean isReadOnly() {
         return readOnly;
     }
 
+    @Override
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @Nullable
+    public boolean isWrapData() {
+        return wrapData;
+    }
+
     @Override
     @JsonIgnore
     @NotNull

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

@@ -0,0 +1,80 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ Copyright 2026 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.internal.models.v1.form;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.models.annotations.Exporter;
+import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
+import org.apache.sling.models.annotations.injectorspecific.ValueMapValue;
+
+import com.adobe.cq.export.json.ExporterConstants;
+
+@Model(adaptables = Resource.class)
+@Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
+public class SignerInfoFieldImpl {
+
+    private static final String PN_SIGNER_TITLE = "signerTitle";
+    private static final String PN_COUNTRY_CODE_SOURCE = "countryCodeSource";
+    private static final String PN_EMAIL = "email";
+    private static final String PN_EMAIL_SOURCE = "emailSource";
+    private static final String PN_PHONE_SOURCE = "phoneSource";
+    private static final String PN_RECIPIENT_ROLE = "recipientRole";
+    private static final String PN_DELEGATES_TO = "delegatesTo";
+    private static final String PN_SECURITY_OPTION = "securityOption";
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PN_SIGNER_TITLE)
+    private String signerTitle;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PN_COUNTRY_CODE_SOURCE)
+    private String countryCodeSource;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PN_EMAIL)
+    private String email;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PN_EMAIL_SOURCE)
+    private String emailSource;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PN_PHONE_SOURCE)
+    private String phoneSource;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PN_RECIPIENT_ROLE)
+    private String recipientRole;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PN_DELEGATES_TO)
+    private String delegatesTo;
+
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = PN_SECURITY_OPTION)
+    private String securityOption;
+
+    public Map<String, Object> getSignerFieldMap() {
+        Map<String, Object> signerField = new LinkedHashMap<>();
+        signerField.put(PN_SIGNER_TITLE, signerTitle);
+        signerField.put(PN_COUNTRY_CODE_SOURCE, countryCodeSource);
+        signerField.put(PN_EMAIL, email);
+        signerField.put(PN_EMAIL_SOURCE, emailSource);
+        signerField.put(PN_PHONE_SOURCE, phoneSource);
+        signerField.put(PN_RECIPIENT_ROLE, recipientRole);
+        signerField.put(PN_DELEGATES_TO, delegatesTo);
+        signerField.put(PN_SECURITY_OPTION, securityOption);
+        return signerField;
+    }
+
+}

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

@@ -0,0 +1,47 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 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.internal.models.v1.form;
+
+import java.util.*;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.models.annotations.Exporter;
+import org.apache.sling.models.annotations.Model;
+
+import com.adobe.aemds.guide.model.SignerInfo;
+import com.adobe.aemds.guide.model.SignerResource;
+import com.adobe.cq.export.json.ExporterConstants;
+
+@Model(adaptables = Resource.class)
+@Exporter(name = ExporterConstants.SLING_MODEL_EXPORTER_NAME, extensions = ExporterConstants.SLING_MODEL_EXTENSION)
+public class SignerInfoImpl {
+    public static Map<String, Object> getSignerDetails(Resource signerInfoResource) {
+        Map<String, Object> signerProperties = new LinkedHashMap<>();
+        SignerResource signerResource = signerInfoResource.adaptTo(SignerResource.class);
+        if (signerResource == null) {
+            return signerProperties;
+        }
+        signerProperties.put("firstSignerFormFiller", signerResource.isFirstSignerFormFiller());
+        signerProperties.put("workflowType", signerResource.getWorkflowType());
+        if (signerResource.getAllSignerInfo().size() > 0) {
+            List<SignerInfo> signersList = signerResource.getAllSignerInfo();
+            signerProperties.put("signers", signersList);
+        }
+        return signerProperties;
+    }
+
+}

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

@@ -36,4 +36,14 @@ public interface Panel extends Container, ContainerConstraint {
     default Boolean isReadOnly() {
         return null;
     }
+
+    /**
+     * Checks if the container is wrap data.
+     *
+     * @return {@code true} if the container is wrap data, {@code false} otherwise
+     * @since com.adobe.cq.forms.core.components.models.form 5.3.0
+     */
+    default boolean isWrapData() {
+        return false;
+    }
 }

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

@@ -0,0 +1,48 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2026 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 org.osgi.annotation.versioning.ConsumerType;
+
+@ConsumerType
+public interface SignerInfo {
+
+    /**
+     * Check if first signer form filler
+     *
+     * @return the firstSignerFormFiller
+     * @since com.adobe.cq.forms.core.components.models.form 0.0.1
+     */
+    String getFirstSignerFormFiller();
+
+    /**
+     * Returns the workflow type
+     *
+     * @return the signer's email
+     * @since com.adobe.cq.forms.core.components.models.form 0.0.1
+     */
+    String getWorkflowType();
+
+    /**
+     * Returns the signer
+     *
+     * @return the signer
+     * @since com.adobe.cq.forms.core.components.models.form 0.0.1
+     */
+    String[] getSigners();
+
+}

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/util/AbstractFormComponentImpl.java

@@ -45,6 +45,7 @@
 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.ReservedProperties;
+import com.adobe.cq.forms.core.components.internal.models.v1.form.SignerInfoImpl;
 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;
@@ -286,6 +287,7 @@ protected boolean getEditMode() {
     }
 
     public static final String CUSTOM_DOR_PROPERTY_WRAPPER = "fd:dor";
+    public static final String CUSTOM_SIGNER_PROPERTY_WRAPPER = "fd:signerInfo";
     // used for DOR and SPA editor to work
     public static final String CUSTOM_JCR_PATH_PROPERTY_WRAPPER = "fd:path";
 
@@ -319,6 +321,12 @@ protected boolean getEditMode() {
         if (rulesProperties.size() > 0) {
             properties.put(CUSTOM_RULE_PROPERTY_WRAPPER, rulesProperties);
         }
+
+        Resource signerInfoResource = resource.getChild(CUSTOM_SIGNER_PROPERTY_WRAPPER);
+        if (signerInfoResource != null) {
+            properties.put(CUSTOM_SIGNER_PROPERTY_WRAPPER, SignerInfoImpl.getSignerDetails(signerInfoResource));
+        }
+
         return properties;
     }
 

bundles/core/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

examples/all/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

examples/core/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

examples/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

examples/ui.apps/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

examples/ui.content/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

it/apps/pom.xml

@@ -19,7 +19,7 @@
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
 
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

it/config/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

it/content/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

it/core/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

jsdocs/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

parent/pom.xml

@@ -22,7 +22,7 @@
     <artifactId>core-forms-components-parent</artifactId>
     <packaging>pom</packaging>
 
-    <version>1.1.79-SNAPSHOT</version>
+    <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
     <name>AEM Forms Core Components - Parent</name>
     <description>Parent POM for AEM Forms Core Components</description>
     <url>https://github.com/adobe/aem-core-forms-components</url>

pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>parent/pom.xml</relativePath>
     </parent>
 

ui.af.apps/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.adobe.aem</groupId>
         <artifactId>core-forms-components-parent</artifactId>
-        <version>1.1.79-SNAPSHOT</version>
+        <version>1.1.79-SNAPSHOT-AdobeSignComponent</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <!-- ====================================================================== -->

ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/_cq_dialog/.content.xml

@@ -359,6 +359,12 @@
                             </columns>
                         </items>
                     </submitActions>
+                    <signature
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Electronic Signature"
+                            sling:resourceType="granite/ui/components/coral/foundation/include"
+                            path="fd/af/authoring/content/coreComponentSign/dialogConfig"
+                            resouceType="granite/ui/components/coral/foundation/container"/>
                     <advanced
                             jcr:primaryType="nt:unstructured"
                             sling:resourceType="granite/ui/components/coral/foundation/include"