Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FORMS-7603 forms core components changes #1074

Merged
merged 2 commits into from
May 23, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@

#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y")
#if ($aemVersion == "cloud")
<core.forms.components.version>2.0.14</core.forms.components.version>
<core.forms.components.af.version>2.0.14</core.forms.components.af.version>
<core.forms.components.version>2.0.16</core.forms.components.version>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last released version is 2.0.14. https://github.com/adobe/aem-core-forms-components

<core.forms.components.af.version>2.0.16</core.forms.components.af.version>
#else
<core.forms.components.version>1.1.12</core.forms.components.version>
<core.forms.components.af.version>1.1.12</core.forms.components.af.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
jcr:title="Adaptive Form Container"
fd:version="2.1"
sling:resourceSuperType="core/fd/components/form/container/v2/container"
componentGroup=".${appTitle} - Adaptive Form"/>
componentGroup="${appTitle} - Adaptive Form"/>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@barshat7 , is this '.' removed intentionally

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we will need to unhide to support forms in site

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<image
jcr:primaryType="nt:unstructured"
jcr:title="Logo"
sling:resourceType="wcm/foundation/components/image"
sling:resourceType="${appId}/components/image"
name="logoImage"/>
<text
jcr:primaryType="nt:unstructured"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:description="Adaptive Form Tabs on Top (v1) component"
jcr:primaryType="cq:Component"
jcr:title="Adaptive Form Vertical Tabs"
sling:resourceSuperType="core/fd/components/form/verticaltabs/v1/verticaltabs"
componentGroup="${appTitle} - Adaptive Form"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
jcr:primaryType="nt:unstructured"
jcr:title="Tabs on Top"
fieldType="panel">
<item_1 jcr:primaryType="nt:unstructured"
jcr:title="Item 1"
name="item_1"
fieldType="panel"
sling:resourceType="${appId}/components/adaptiveForm/panelcontainer"
layout="responsiveGrid"/>
<item_2 jcr:primaryType="nt:unstructured"
jcr:title="Item 2"
name="item_2"
fieldType="panel"
sling:resourceType="${appId}/components/adaptiveForm/panelcontainer"
layout="responsiveGrid"/>
</jcr:root>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="cq:Component"
jcr:title="AEM Forms Container"
jcr:title="Adaptive Form - Embed"
sling:resourceSuperType="core/fd/components/aemform/v1/aemform"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@barshat7 we should use latest version(v2) for aemform in archetype.
cc: @rismehta

componentGroup="${appTitle} - Forms"/>
27 changes: 27 additions & 0 deletions src/test/resources/projects/forms-basic-6.5.0/archetype.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
groupId=archetype.it
artifactId=testing-basicforms650
appId=testing-basicforms650
package=it.pkg
version=0.1-SNAPSHOT
appTitle=Test Basic Project
aemVersion=6.5.15
sdkVersion=latest
language=en
country=us
singleCountry=n
frontendModule=none
includeExamples=y
includeErrorHandler=y
includeDispatcherConfig=y
includeCommerce=n
commerceEndpoint=https://hostname.com/grapql
includeForms=n
includeFormsenrollment=y
includeFormscommunications=n
sdkFormsVersion=latest
datalayer=y
amp=y
enableDynamicMedia=y
enableSSR=n
precompiledScripts=n
includeFormsheadless=n
1 change: 1 addition & 0 deletions src/test/resources/projects/forms-basic-6.5.0/goal.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
install