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

Cq 4343453 #945

Merged
merged 18 commits into from
Jun 16, 2022
Merged

Cq 4343453 #945

merged 18 commits into from
Jun 16, 2022

Conversation

barshat7
Copy link
Contributor

@barshat7 barshat7 commented Jun 15, 2022

Description

AF 2.0 template and form container proxy component for headless beta

Related Issue

CQ-4343453

Motivation and Context

How Has This Been Tested?

Manually

Screenshots (if appropriate):

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.

@barshat7 barshat7 requested review from vdua and rismehta June 15, 2022 16:18
@lgtm-com
Copy link

lgtm-com bot commented Jun 15, 2022

This pull request introduces 3 alerts when merging 332fa73 into ecb4f01 - view on LGTM.com

new alerts:

  • 2 for Unused variable, import, function or class
  • 1 for Unmatchable dollar in regular expression

@lgtm-com
Copy link

lgtm-com bot commented Jun 16, 2022

This pull request introduces 3 alerts when merging 8012ba3 into ecb4f01 - view on LGTM.com

new alerts:

  • 2 for Unused variable, import, function or class
  • 1 for Unmatchable dollar in regular expression

@barshat7 barshat7 added this to the 37 milestone Jun 16, 2022
@lgtm-com
Copy link

lgtm-com bot commented Jun 16, 2022

This pull request introduces 3 alerts when merging 2707c48 into ecb4f01 - view on LGTM.com

new alerts:

  • 2 for Unused variable, import, function or class
  • 1 for Unmatchable dollar in regular expression

@lgtm-com
Copy link

lgtm-com bot commented Jun 16, 2022

This pull request introduces 3 alerts when merging e9a9322 into ecb4f01 - view on LGTM.com

new alerts:

  • 2 for Unused variable, import, function or class
  • 1 for Unmatchable dollar in regular expression

Copy link
Contributor

@rismehta rismehta left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -13,4 +13,7 @@
<filter root="/content/dam/${appId}/sample_logo.png" mode="merge"/>
<filter root="/content/dam/${appId}/sample_terms.png" mode="merge"/>
#end
#if ( ($includeFormsheadless == "y" ) and $aemVersion == "cloud")
<filter root="/content/dam/${appId}/sample.json" mode="merge"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we rename sample.json to af_model_sample.json ?

mergeList="{Boolean}true"/>
</default>
</formcontainer>
<formpage jcr:primaryType="nt:unstructured">
Copy link
Contributor

Choose a reason for hiding this comment

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

There is no formpage, you need to delete this

<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" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
jcr:primaryType="cq:Page">
<jcr:content
cq:policy="${appId}/components/adaptiveForm/formpage/default"
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be ${appId}/components/page/default

<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" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
jcr:primaryType="cq:Page">
<jcr:content
cq:policy="${appId}/components/adaptiveForm/formpage/default"
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be ${appId}/components/page/default

cq:lastModifiedBy="admin"
cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
jcr:primaryType="cq:PageContent"
jcr:title="Blank With Core Components"
Copy link
Contributor

Choose a reason for hiding this comment

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

${appId} - Blank With Core Components

@rismehta rismehta merged commit 37094a7 into develop Jun 16, 2022
@rismehta rismehta deleted the CQ-4343453 branch June 16, 2022 09:27
pankaj-parashar pushed a commit that referenced this pull request Jun 27, 2022
* CIF-2628 - Remove reference to Venia from Archetype (#873)

* remove references to Venia

* Issue/angular ssr - io runtime support

Provide support for IO runtime in the angular spa editor. This will provide support for performing SSR for aem in the cloud as well. 

Co-authored-by: Niek Raaijmakers <[email protected]>
Co-authored-by: Zoran Nikolovski <[email protected]>

* releng - Update CIF to January release (#881)

* releng - Update CIF to January release

* Add feedback

* CIF-2678 - Styling is broken on catalog page in Venia and archetype projects (#884)

* fixed HTL syntax in catalogpage customheaderlibs.html

* CIF-2638: Move navigation styling to archetype (#888)

* add rule to remove form ui test assets if not a forms project (#890)

* Update aemanalyser maven plugin to 1.4.0 (#895)

* Bump log4js in /src/main/archetype/ui.tests/test-module (#879)

Bumps [log4js](https://github.com/log4js-node/log4js-node) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/log4js-node/log4js-node/releases)
- [Changelog](https://github.com/log4js-node/log4js-node/blob/master/CHANGELOG.md)
- [Commits](log4js-node/log4js-node@v6.3.0...v6.4.0)

---
updated-dependencies:
- dependency-name: log4js
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump nanoid in /src/main/archetype/ui.frontend.general (#880)

Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](ai/nanoid@3.1.30...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump node-fetch in /src/main/archetype/ui.frontend.general (#883)

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](node-fetch/node-fetch@v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump aem-testing-clients to 1.0.5 (#892)

Fixes:

SLING-11131 - Remove Guava Dependency for CVE-2018-10237 and CVE-2020-8908
SLING-11124 - Update Apache HTTP Client Dependency for CVE-2020-13956
Allow to set "forceBasicAuth" for author and publish instance separately

Co-authored-by: Andrei Tuicu <[email protected]>

* Bump follow-redirects in /src/main/archetype/ui.frontend.general (#894)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.14.6...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Restore .gitignore files to generated projects (#889)

* restore gitignore file

* disable default exclude rule

* Update Core Components to v2.18.0 (#897)

* Update Core Components to v2.18.0

- update dependency of core components to latest v2.18.0
- update resourceSuperType of proxy components to latest component version
- enable inheritance of edit config from parent component
- remove deprecated sharing component

fixes #896

* Adjust AIO SSR configuration, handle gzip payload (#903)

Co-authored-by: Cezary Czernecki <[email protected]>
Co-authored-by: Hanish Bansal <[email protected]>

* CIF-2721: update CIF Core Components to 2.6.0 (#899)

* CIF-2526 - Add add-to-cart button in all product collections (#904)

* updated style templates for productcarousel, productcollection and productlist component

* Update forms (#901)

* Update Forms Core Components to v1.0.4

Also include examples if user chose to in project creation

@review @rismehta

* CQ-4331109 Update to forms core components v1.0.6

* Update AEM Analyser Maven Plugin to 1.4.2 (#906)

* updated README and VERSIONS for 36 release (#908)

Co-authored-by: ddewanji <[email protected]>

* Release/36 merge into develop after release step (#909)

* [maven-release-plugin] prepare release aem-project-archetype-36

* [maven-release-plugin] prepare for next development iteration

Co-authored-by: adobe-bot <[email protected]>

* Update the AEMAnalyser update to 1.4.6 (#912)

Co-authored-by: Niek Raaijmakers <[email protected]>

* Adding updated immutable files gnerated by AEM Dispatcher Tools 2.0.91 (#918)

* CIF-2734: update CIF Core Components to 2.8.0 and CIF GQL Client to 1.7.10 (#923)

* Update Core Components to v2.19.0 (#926)

* Update Core Components to v2.19.0

- update dependency of core components to 2.19.0
- set proxy search component to v2
- set proxy amp image component to v2

fixes #921

* SITES-5185 - Ensure all GraphQL Queries to publisher are using Persistent Queries and not POST requests (#922)

* Update aemanalyser-maven-plugin to 1.4.8 (#928)

Updating to the latest release to get some improvements and bugfixes.

* Load js clientlibs async in customfooterlibs (#934)

* CIF-2302 - JS error in console (#935)

* load js clientlibs async in customfooterlibs
* load js clientlibs async in customfooterlibs

* Update aemanalyser plugin to 1.4.10 (#936)

We should update to the latest release: https://github.com/adobe/aemanalyser-maven-plugin/releases/tag/aemanalyser-maven-plugin-1.4.10

* CIF-2289 - Create a CIF Page v3 component based on the WCM Page v3 (#933)

* update CIF page to v3 
* update CIF components to 2.9.0

* CIF-2732 - Teaser: add option to open CTA in a new Tab (#932)

* updated commerce teaser proxy to v3

* Adding model.json cache settings to dispatcher (#937)

* * adding model.json cache settings to dispatcher
* bump of required version of spa.project.core

* * adding model.json cache settings to dispatcher
* bump of required version of spa.project.core

Co-authored-by: Bartosz Borowski <[email protected]>

* Cq 4343453 (#945)

* CQ-4343453 Initial commit for af2 forms component

* CQ-4343453 using flag includeFormsheadless for headless forms

* CQ-4343453 changes to include includeFormsheadless

* CQ-4343453 Renaming

* CQ-4343453 include ui.frontend.forms module

* CQ-4343453 adding basic af2 template and some minor fixes

* CQ-4343453 closing review comments

* CQ-4343453 Update Readme

* CQ-4343453 Updated package.json with aemforms dependencies, changes in template and templatetypes

* CQ-4343453 Added Sample Form Json

* CQ-4343453 Added test case

* CQ-4343453 template-type editable

* CQ-4343453 minor fixes

* CQ-4343453 removing unnecessary lines

* CQ-4343453 aligning npm packages to new names

* CQ-4343453 Review comments

* CQ-4343453 build fix

* revert 940419a

Co-authored-by: barshatr <[email protected]>

* CQ-4343453 Upgrade forms core components (#947)

* CQ-4343453 Upgrade forms core components

* CQ-4343453 Update @AEMFORMS artifacts in package.json

Co-authored-by: barshatr <[email protected]>

* CQ-4343453 Update sample form for multiple submit fix (#948)

Co-authored-by: barshatr <[email protected]>

* CQ-4343453 Exclude forms core components if cloud (#949)

* CQ-4343453 Exclude forms core components if cloud

* CQ-4343453 include sdk api for cloud

* CQ-4343453 minor changes

Co-authored-by: barshatr <[email protected]>

* updated README and VERSIONS for 37 release (#944)

Co-authored-by: barshatr <[email protected]>

* CQ-4343453 remove debugger from form.tsx (#950)

Co-authored-by: barshatr <[email protected]>

* [maven-release-plugin] prepare release aem-project-archetype-37

* [maven-release-plugin] prepare for next development iteration

* remove extra spaces

Co-authored-by: Burkhard Pauli <[email protected]>
Co-authored-by: Mark J. Becker <[email protected]>
Co-authored-by: Niek Raaijmakers <[email protected]>
Co-authored-by: Niek Raaijmakers <[email protected]>
Co-authored-by: Zoran Nikolovski <[email protected]>
Co-authored-by: Levente Sántha <[email protected]>
Co-authored-by: Daniel Gordon <[email protected]>
Co-authored-by: Carsten Ziegeler <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrei Tuicu <[email protected]>
Co-authored-by: Andrei Tuicu <[email protected]>
Co-authored-by: Cezary Czernecki <[email protected]>
Co-authored-by: Cezary Czernecki <[email protected]>
Co-authored-by: Hanish Bansal <[email protected]>
Co-authored-by: Dirk Rudolph <[email protected]>
Co-authored-by: Viresh Gupta <[email protected]>
Co-authored-by: David Bosschaert <[email protected]>
Co-authored-by: deepprakash345 <[email protected]>
Co-authored-by: ddewanji <[email protected]>
Co-authored-by: adobe-bot <[email protected]>
Co-authored-by: Patrick Heinzelmann <[email protected]>
Co-authored-by: Andreea Miruna Moise <[email protected]>
Co-authored-by: Bartosz Borowski <[email protected]>
Co-authored-by: Bartosz Borowski <[email protected]>
Co-authored-by: barshatr <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants