Cq 4348367 new (#1031)

* CQ-4348367 Upgrade npm and include package-lock.json for forms headless * CQ-4348367 Separate Page Component for Adaptive Forms * CQ-4348367 forms core components version bump --------- Co-authored-by: barshatr <barshatr@adobe.com>
adobe · Jan 30, 2023 · af843ea · af843ea
1 parent 20a1e5d
commit af843ea
Show file tree

Hide file tree

Showing 13 changed files with 9,995 additions and 544 deletions.
diff --git a/src/main/archetype/pom.xml b/src/main/archetype/pom.xml
@@ -82,8 +82,8 @@
 #end
 
 #if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud" )
-        <core.forms.components.version>2.0.2</core.forms.components.version>
-        <core.forms.components.af.version>2.0.2</core.forms.components.af.version>
+        <core.forms.components.version>2.0.4</core.forms.components.version>
+        <core.forms.components.af.version>2.0.4</core.forms.components.af.version>
         <aem.forms.sdk.api>SDK_FORMS_VERSION</aem.forms.sdk.api>
 #end
         <bnd.version>5.1.2</bnd.version>

diff --git a/...i.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/page/.content.xml b/...i.apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/page/.content.xml
@@ -0,0 +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="${appTitle} Adaptive Form Page"
+    sling:resourceSuperType="core/fd/components/page/v1/page"
+    componentGroup=".hidden"/>
diff --git a/...c/main/content/jcr_root/apps/__appId__/components/adaptiveForm/page/customfooterlibs.html b/...c/main/content/jcr_root/apps/__appId__/components/adaptiveForm/page/customfooterlibs.html
@@ -0,0 +1,27 @@
+<!--/*
+    Copyright 2017 Adobe Systems Incorporated
+
+    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.
+*/-->
+<sly data-sly-use.clientlib="core/wcm/components/commons/v1/templates/clientlib.html"
+     data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"
+     data-sly-test.clientLibRef="${symbol_dollar}{formstructparser.clientLibRefFromFormContainer}">
+    <sly data-sly-test="${symbol_dollar}{clientLibRef}" data-sly-call="${symbol_dollar}{clientlib.js @ categories=clientLibRef, async=true}"/>
+</sly>
+<sly data-sly-use.clientlib="core/wcm/components/commons/v1/templates/clientlib.html">
+    <sly data-sly-call="${symbol_dollar}{clientlib.js @ categories='${appId}.base', async=true}"/>
+    #if ($includeFormsheadless == "y" and $aemVersion == "cloud")
+    <sly data-sly-call="${symbol_dollar}{clientlib.js @ categories='${appId}.forms.react', async=true}"/>
+    #end
+    <sly data-sly-test="${symbol_dollar}{!wcmmode.edit}" data-sly-call="${symbol_dollar}{clientlib.js @ categories='core.forms.components.runtime.all', async=true}"/>
+</sly>
diff --git a/...c/main/content/jcr_root/apps/__appId__/components/adaptiveForm/page/customheaderlibs.html b/...c/main/content/jcr_root/apps/__appId__/components/adaptiveForm/page/customheaderlibs.html
@@ -0,0 +1,28 @@
+<!--/*
+    Copyright 2017 Adobe Systems Incorporated
+
+    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.
+*/-->
+<sly data-sly-use.clientlib="core/wcm/components/commons/v1/templates/clientlib.html"
+     data-sly-use.formstructparser="com.adobe.cq.forms.core.components.models.form.FormStructureParser"
+     data-sly-test.clientLibRef="${symbol_dollar}{formstructparser.clientLibRefFromFormContainer}">
+    <sly data-sly-test="${symbol_dollar}{clientLibRef}" data-sly-call="${symbol_dollar}{clientlib.css @ categories=clientLibRef}"/>
+</sly>
+<sly data-sly-use.clientlib="core/wcm/components/commons/v1/templates/clientlib.html">
+    <sly data-sly-call="${symbol_dollar}{clientlib.css @ categories='${appId}.base'}"/>
+    #if ($includeFormsheadless == "y" and $aemVersion == "cloud")
+    <sly data-sly-call="${symbol_dollar}{clientlib.css @ categories='${appId}.forms.react'}" />
+    #end
+    <sly data-sly-test="${symbol_dollar}{!wcmmode.edit}" data-sly-call="${symbol_dollar}{clientlib.css @ categories='core.forms.components.runtime.all'}"/>
+</sly>
+
diff --git a/...pe/ui.apps/src/main/content/jcr_root/apps/__appId__/components/page/customfooterlibs.html b/...pe/ui.apps/src/main/content/jcr_root/apps/__appId__/components/page/customfooterlibs.html
@@ -18,12 +18,6 @@
 #if ( $includeCommerce == "y" )
     <sly data-sly-call="${symbol_dollar}{clientlib.js @ categories='${appId}.cif', async=true}" />
 #end
-#if ($includeFormsheadless == "y" and $aemVersion == "cloud")
-    <sly data-sly-call="${symbol_dollar}{clientlib.js @ categories='${appId}.forms.react', async=true}"/>
-#end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud")
-    <sly data-sly-test="${symbol_dollar}{!wcmmode.edit}" data-sly-call="${symbol_dollar}{clientlib.js @ categories='core.forms.components.runtime.all', async=true}"/>
-#end
 </sly>
 #if ( $isSpaProject )
 <!--/*

diff --git a/...pe/ui.apps/src/main/content/jcr_root/apps/__appId__/components/page/customheaderlibs.html b/...pe/ui.apps/src/main/content/jcr_root/apps/__appId__/components/page/customheaderlibs.html
@@ -18,12 +18,6 @@
 #if ( $includeCommerce == "y" )
     <sly data-sly-call="${symbol_dollar}{clientlib.css @ categories='${appId}.cif'}" />
 #end
-#if ($includeFormsheadless == "y" and $aemVersion == "cloud")
-    <sly data-sly-call="${symbol_dollar}{clientlib.css @ categories='${appId}.forms.react'}" />
-#end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") and $aemVersion == "cloud")
-    <sly data-sly-test="${symbol_dollar}{!wcmmode.edit}" data-sly-call="${symbol_dollar}{clientlib.css @ categories='core.forms.components.runtime.all'}"/>
-#end
 </sly>
 
 #if ( $frontendModule == "angular" )

diff --git a/src/main/archetype/ui.content/src/main/content/META-INF/vault/filter.xml b/src/main/archetype/ui.content/src/main/content/META-INF/vault/filter.xml
@@ -11,7 +11,7 @@
 #if ( $includeCommerce == "y" and $aemVersion != "cloud")
     <filter root="/var/commerce/products/${appId}-default" mode="merge"/>
 #end
-#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y") and $aemVersion == "cloud")
+#if ( ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y" ) and $aemVersion == "cloud")
     <filter root="/content/dam/formsanddocuments-themes/${appId}" mode="merge"/>
     <filter root="/content/dam/formsanddocuments-fdm/${appId}" mode="merge"/>
     <filter root="/content/dam/${appId}/sample_logo.png" mode="merge"/>

diff --git a/...ntent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/initial/.content.xml b/...ntent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/initial/.content.xml
@@ -4,7 +4,7 @@
     <jcr:content
         cq:deviceGroups="[/etc/mobile/groups/responsive]"
         jcr:primaryType="cq:PageContent"
-        sling:resourceType="${appId}/components/page"
+        sling:resourceType="${appId}/components/adaptiveForm/page"
         sling:configRef="/conf/${appId}/forms"
         guideComponentType="fd/af/templates">
         <guideContainer

diff --git a/...ent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml b/...ent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml
@@ -5,7 +5,7 @@
         cq:deviceGroups="[/etc/mobile/groups/responsive]"
         guideComponentType="fd/af/templates"
         jcr:primaryType="cq:PageContent"
-        sling:resourceType="${appId}/components/page">
+        sling:resourceType="${appId}/components/adaptiveForm/page">
         <parsys1
             jcr:primaryType="nt:unstructured"
             editable="{Boolean}true"

diff --git a/...n/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/initial/.content.xml b/...n/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/initial/.content.xml
@@ -5,7 +5,7 @@
         cq:deviceGroups="[/etc/mobile/groups/responsive]"
         cq:template="/conf/${appId}/settings/wcm/templates/blank-af-v2"
         jcr:primaryType="cq:PageContent"
-        sling:resourceType="${appId}/components/page"
+        sling:resourceType="${appId}/components/adaptiveForm/page"
         sling:configRef="/conf/${appId}/forms"
         guideComponentType="fd/af/templates">
         <guideContainer

diff --git a/...content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/structure/.content.xml b/...content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2/structure/.content.xml
@@ -5,7 +5,7 @@
         cq:deviceGroups="[/etc/mobile/groups/responsive]"
         cq:template="/conf/${appId}/settings/wcm/templates/blank-af-v2"
         jcr:primaryType="cq:PageContent"
-        sling:resourceType="${appId}/components/page"
+        sling:resourceType="${appId}/components/adaptiveForm/page"
         guideComponentType="fd/af/templates">
         <parsys1
             jcr:primaryType="nt:unstructured"