Cq 4348367 changes for forms cc #996

barshat7 · 2022-10-13T09:30:48Z

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Proxy Components

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

I have signed the Adobe Open Source CLA.
My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

...c/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2_1/.content.xml

nit23uec · 2022-10-14T15:21:59Z

...ontent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2_1/initial/.content.xml

+        sling:resourceType="${appId}/components/page"
+        guideComponentType="fd/af/templates">
+        <guideContainer
+            fd:version="2.0"


fd:version="2.1" for everything related to core components.

nit23uec · 2022-10-14T15:22:28Z

...t/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2_1/.content.xml

+        cq:lastModifiedBy="admin"
+        cq:templateType="/conf/headless01/settings/wcm/template-types/af-core-component-page-v2"
+        jcr:primaryType="cq:PageContent"
+        jcr:title="Blank With Core Components V2.1"


title needs update

nit23uec · 2022-10-14T15:24:14Z

...in/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2_1/initial/.content.xml

+        sling:resourceType="${appId}/components/page"
+        guideComponentType="fd/af/templates">
+        <guideContainer
+            fd:version="2.0"


fd:version="2.1"

nit23uec · 2022-10-14T15:25:07Z

...n/content/jcr_root/conf/__appId__/settings/wcm/templates/blank-af-v2_1/policies/.content.xml

+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/core/components/policies/mapping"/>
+        <guideContainer
+            cq:policy="${appId}/components/adaptiveForm/formcontainer/default"


I'm not able to see this policy in this PR. can you pls point me to the correct place?

aem-project-archetype/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml

Line 540 in f57c7f9

<formcontainer jcr:primaryType="nt:unstructured">

…ainer

nit23uec · 2022-10-17T10:51:11Z

src/main/archetype/pom.xml

@@ -74,15 +74,15 @@
        <aio.runtime.namespace>${env.AIO_RUNTIME_NAMESPACE}</aio.runtime.namespace>
        <aio.runtime.auth>${env.AIO_RUNTIME_AUTH}</aio.runtime.auth>
 #end
-        <core.wcm.components.version>2.19.0</core.wcm.components.version>
+        <core.wcm.components.version>2.21.0</core.wcm.components.version>


if there's no requirement of update of wcm core, we can skip it.

nit23uec · 2022-10-17T11:05:48Z

.../src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/accordion/_cq_template.xml

+    fieldType="panel"
+    jcr:title="Accordion">
+    <item_1 jcr:primaryType="nt:unstructured"
+            jcr:title="item_1"


lets haveItem 1 as title instead of item_1.

nit23uec · 2022-10-17T11:07:58Z

.../src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/accordion/_cq_template.xml

+            layout="responsiveGrid"/>
+    <item_2 jcr:primaryType="nt:unstructured"
+            jcr:title="item_2"
+            name="item_2"


ditto for Item 2

rismehta · 2022-10-18T06:43:56Z

src/main/archetype/pom.xml

@@ -74,15 +74,15 @@
        <aio.runtime.namespace>${env.AIO_RUNTIME_NAMESPACE}</aio.runtime.namespace>
        <aio.runtime.auth>${env.AIO_RUNTIME_AUTH}</aio.runtime.auth>
 #end
-        <core.wcm.components.version>2.19.0</core.wcm.components.version>
+        <core.wcm.components.version>2.21.0</core.wcm.components.version>


This should not be changed.

rismehta · 2022-10-18T06:44:27Z

.../src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/formcontainer/.content.xml

@@ -3,5 +3,5 @@
    jcr:description="Adaptive Form Container component"
    jcr:primaryType="cq:Component"
    jcr:title="Adaptive Form Container component"
-    sling:resourceSuperType="core/fd/components/form/container/v1/container"
+    sling:resourceSuperType="core/fd/components/form/container/v2/container"
    componentGroup="${appTitle} - Adaptive Forms"/>


This should have a hidden component group

rismehta · 2022-10-18T06:46:14Z

We also need to update template type and template

...apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/accordion/.content.xml

.../src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/fileinput/_cq_template.xml

sakshi-arora1

update the content.xml accordingly https://github.com/adobe/aem-project-archetype/blob/develop/src/main/archetype/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/.content.xml

…ionportal components

…osed

nit23uec · 2022-10-27T05:45:49Z

...type/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/templates/.content.xml

@@ -7,6 +7,9 @@
 #if ( $isSpaProject )
    <spa-app-template />
    <spa-page-template />
+#end
+#if ( $includeFormsheadless )
+    <blank-af-v2/>


blank-af-v2 is required for forms core components. it should be included irrespective of headless flag.

...etype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/page/customfooterlibs.html

nit23uec · 2022-10-27T05:48:16Z

...etype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/page/customheaderlibs.html

@@ -20,6 +20,7 @@
 #end
 #if ( $includeFormsheadless == "y" )
    <sly data-sly-call="${symbol_dollar}{clientlib.css @ categories='${appId}.forms.react'}" />
+    <sly data-sly-test="${symbol_dollar}{!wcmmode.edit}" data-sly-call="${symbol_dollar}{clientlib.css @ categories='core.forms.components.runtime.all'}"/>


clientlibs should be included outside of headless flag. if includeForms or includeFormsEnrollment or communication is true.

… to only include headless spa

This reverts commit 859be02.

This reverts commit d4c6226.

Switch to ubuntu-20.04 as the update to 22.04 (https://github.blog/changelog/2022-11-09-github-actions-ubuntu-latest-workflows-will-use-ubuntu-22-04/) seems to be causing tests failures: ``` 2023-01-10T12:53:01.6940591Z [INFO] [INFO] Compiling @angular/router/testing : es2015 as esm2015 2023-01-10T12:53:05.2477787Z [INFO] [INFO] 10 01 2023 12:53:05.245:INFO [karma-server]: Karma v5.2.3 server started at http://localhost:9876/ 2023-01-10T12:53:05.2478369Z [INFO] [INFO] 10 01 2023 12:53:05.247:INFO [launcher]: Launching browsers ChromeHeadless with concurrency unlimited 2023-01-10T12:53:05.2497125Z [INFO] [INFO] (node:2292) [log4js-node-DEP0004] DeprecationWarning: Pattern %d{DATE} is deprecated due to the confusion it causes when used. Please use %d{DATETIME} instead. 2023-01-10T12:53:05.2498554Z [INFO] [INFO] (node:2292) [log4js-node-DEP0004] DeprecationWarning: Pattern %d{DATE} is deprecated due to the confusion it causes when used. Please use %d{DATETIME} instead. 2023-01-10T12:53:05.2505232Z [INFO] [INFO] 10 01 2023 12:53:05.250:INFO [launcher]: Starting browser ChromeHeadless 2023-01-10T12:53:05.2641898Z [INFO] [INFO] (node:2292) [log4js-node-DEP0004] DeprecationWarning: Pattern %d{DATE} is deprecated due to the confusion it causes when used. Please use %d{DATETIME} instead. 2023-01-10T12:53:07.0112167Z [INFO] [INFO] 10 01 2023 12:53:07.010:ERROR [launcher]: Cannot start ChromeHeadless 2023-01-10T12:53:07.0112824Z [INFO] [INFO] 2023-01-10T12:53:07.0113978Z [INFO] [INFO] DevTools listening on ws://127.0.0.1:9222/devtools/browser/b96a691d-ec85-4600-a87b-dc10ca506918 2023-01-10T12:53:07.0114595Z [INFO] [INFO] [0110/125305.697634:WARNING:gpu_process_host.cc(1265)] The GPU process has crashed 1 time(s) 2023-01-10T12:53:07.0162860Z [INFO] [INFO] [0110/125305.837689:WARNING:gpu_process_host.cc(1265)] The GPU process has crashed 2 time(s) 2023-01-10T12:53:07.0163597Z [INFO] [INFO] [0110/125305.968590:WARNING:gpu_process_host.cc(1265)] The GPU process has crashed 3 time(s) 2023-01-10T12:53:07.0166297Z [INFO] [INFO] [0110/125306.089230:WARNING:gpu_process_host.cc(1265)] The GPU process has crashed 4 time(s) 2023-01-10T12:53:07.0166760Z [INFO] [INFO] [0110/125306.209451:WARNING:gpu_process_host.cc(1265)] The GPU process has crashed 5 time(s) 2023-01-10T12:53:07.0167158Z [INFO] [INFO] [0110/125306.329345:WARNING:gpu_process_host.cc(1265)] The GPU process has crashed 6 time(s) 2023-01-10T12:53:07.0167866Z [INFO] [INFO] [0110/125306.329371:FATAL:gpu_data_manager_impl_private.cc(407)] GPU process isn't usable. Goodbye. 2023-01-10T12:53:07.0168464Z [INFO] [INFO] #0 0x5565114edb39 base::debug::CollectStackTrace() ```

.../src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkboxgroup/.content.xml

…components

barshatr added 3 commits October 13, 2022 14:59

CQ-4348367 Changes for forms core components

abd7a8a

Merge branch 'develop' into CQ-4348367_changes_for_forms_cc

db91eb9

CQ-4348367 adding core dependencies in all

996fef8

barshat7 requested review from rismehta and nit23uec October 14, 2022 06:01

CQ-4348367 proxy components for wizard and title

6197b2b

nit23uec reviewed Oct 14, 2022

View reviewed changes

...c/main/content/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2_1/.content.xml Outdated Show resolved Hide resolved

nit23uec reviewed Oct 14, 2022

View reviewed changes

barshatr added 2 commits October 17, 2022 12:35

CQ-4348367 using the same proxy formcontainer as headless for v2 cont…

b22c33a

…ainer

CQ-4348367 updating versions of wcm and forms components

a2d13f8

barshat7 changed the title ~~WIP - Cq 4348367 changes for forms cc~~ Cq 4348367 changes for forms cc Oct 17, 2022

barshat7 added this to the 40 milestone Oct 17, 2022

nit23uec reviewed Oct 17, 2022

View reviewed changes

rismehta previously requested changes Oct 18, 2022

View reviewed changes

rismehta reviewed Oct 18, 2022

View reviewed changes

...apps/src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/accordion/.content.xml Outdated Show resolved Hide resolved

rismehta reviewed Oct 18, 2022

View reviewed changes

.../src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/fileinput/_cq_template.xml Show resolved Hide resolved

sakshi-arora1 reviewed Oct 18, 2022

View reviewed changes

barshatr added 3 commits October 23, 2022 13:22

CQ-4348367 review comments: changing cmp group, added formscommunicat…

1cc96fd

…ionportal components

CQ-4348367 upgrade wcm examples if forms included, review comments cl…

124db57

…osed

CQ-4348367 Update thumbnails for af2

7bc6652

nit23uec reviewed Oct 27, 2022

View reviewed changes

...etype/ui.apps/src/main/content/jcr_root/apps/__appId__/components/page/customfooterlibs.html Show resolved Hide resolved

nit23uec reviewed Oct 27, 2022

View reviewed changes

CQ-4348367 include core components if includeForms, use headless flag…

ce482bf

… to only include headless spa

CQ-4348367 template changes on par with core components it

b2ec2d6

barshat7 closed this Nov 1, 2022

CQ-4348367 separate adaptive form and portal components

b4773a3

barshat7 reopened this Dec 22, 2022

barshat7 changed the title ~~Cq 4348367 changes for forms cc - Do Not Merge~~ Cq 4348367 changes for forms cc Dec 22, 2022

CQ-4348367 adaptive form submit button

a99e2bd

nit23uec approved these changes Dec 22, 2022

View reviewed changes

barshatr and others added 11 commits January 3, 2023 13:32

Merge branch 'develop' into CQ-4348367_changes_for_forms_cc

bd158cd

CQ-4348367 associate af v2 canvas theme with template

593aebe

Merge branch 'develop' into CQ-4348367_changes_for_forms_cc

8868bd8

CQ-4348367 Debug mvn build failure. Need to Revert

d4c6226

CQ-4348367 Debug mvn build failure. Need to Revert

859be02

Revert " CQ-4348367 Debug mvn build failure. Need to Revert"

00ea652

This reverts commit 859be02.

Revert "CQ-4348367 Debug mvn build failure. Need to Revert"

f1e7e6e

This reverts commit d4c6226.

CQ-4348367 include core components in cloud only

673f961

CQ-4348367 update adaptive form json path

15b3fdd

Merge branch 'develop' into CQ-4348367_changes_for_forms_cc

730706f

rismehta approved these changes Jan 12, 2023

View reviewed changes

nit23uec reviewed Jan 12, 2023

View reviewed changes

.../src/main/content/jcr_root/apps/__appId__/components/adaptiveForm/checkboxgroup/.content.xml Outdated Show resolved Hide resolved

CQ-4348367 remove unnecessary versioning & redundant names for proxy …

48655ad

…components

barshat7 removed the request for review from pankaj-parashar January 12, 2023 09:04

barshat7 closed this Jan 12, 2023

barshat7 deleted the CQ-4348367_changes_for_forms_cc branch January 12, 2023 10:20

barshat7 restored the CQ-4348367_changes_for_forms_cc branch January 12, 2023 10:21

barshat7 reopened this Jan 12, 2023

nit23uec approved these changes Jan 12, 2023

View reviewed changes

Merge branch 'develop' into CQ-4348367_changes_for_forms_cc

daeece0

vladbailescu merged commit 0867f0a into develop Jan 16, 2023

vladbailescu deleted the CQ-4348367_changes_for_forms_cc branch January 16, 2023 11:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cq 4348367 changes for forms cc #996

Cq 4348367 changes for forms cc #996

barshat7 commented Oct 13, 2022 •

edited

nit23uec Oct 14, 2022

barshat7 Oct 17, 2022

nit23uec Oct 14, 2022

nit23uec Oct 14, 2022

nit23uec Oct 14, 2022

barshat7 Oct 17, 2022

nit23uec Oct 17, 2022

nit23uec Oct 17, 2022

nit23uec Oct 17, 2022

rismehta Oct 18, 2022

rismehta Oct 18, 2022

rismehta commented Oct 18, 2022

sakshi-arora1 left a comment

nit23uec Oct 27, 2022

nit23uec Oct 27, 2022

Cq 4348367 changes for forms cc #996

Cq 4348367 changes for forms cc #996

Conversation

barshat7 commented Oct 13, 2022 • edited

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Proxy Components

Types of changes

Checklist:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rismehta commented Oct 18, 2022

sakshi-arora1 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

barshat7 commented Oct 13, 2022 •

edited