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

Providing a way to store SCP in experience fragments #2930

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)

- #2704 - Fixed issue with MCP report generation throwing an exception, and fixed some minor UI issues on AEM SDK (added BG color)
- #2716 - Fixed issue with Shared Component Properties Bindings Values Provider facing lock contention
- #2715 - Fixed issue with Shared Component Properties working with Experience Fragments
- #2718 - Fixes CM Code Quality Pipeline failure caused by TestMarketoInterfaces and Jacoco instrumentation
- #2713 - Marketo form/cloud config root missing
- #2714 - Implemented shared and global component properties to work in experience fragments.
Expand Down
14 changes: 14 additions & 0 deletions ui.apps/src/main/content/META-INF/vault/filter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
<include pattern="/apps/cq/core/content/nav/tools/acs-commons(/.*)?"/>
<include pattern="/apps/cq/core/content/nav/tools/cloudservices"/>
<include pattern="/apps/cq/core/content/nav/tools/cloudservices/marketo(/.*)?"/>
<include pattern="/apps/cq/experience-fragments" />
<include pattern="/apps/cq/experience-fragments/content" />
<include pattern="/apps/cq/experience-fragments/content/experience-fragments" />
<include pattern="/apps/cq/experience-fragments/content/experience-fragments/jcr:content" />
<include pattern="/apps/cq/experience-fragments/content/experience-fragments/jcr:content/actions(/.*)?" />
</filter>
<filter root="/apps/dam">
<include pattern="/apps/dam"/>
Expand All @@ -44,4 +49,13 @@
<include pattern="/apps/settings/dam/indesign"/>
<include pattern="/apps/settings/dam/indesign/scripts(/.*)?"/>
</filter>
<filter root="/apps/wcm">
<include pattern="/apps/wcm/core" />
<include pattern="/apps/wcm/core/content" />
<include pattern="/apps/wcm/core/content/coral" />
<include pattern="/apps/wcm/core/content/coral/common" />
<include pattern="/apps/wcm/core/content/coral/common/createxffolderdialog" />
<include pattern="/apps/wcm/core/content/coral/common/createxffolderdialog/items(/.*)?" />
<include pattern="/apps/wcm/core/content/coral/common/createxffolderdialog/footer(/.*)?" />
</filter>
</workspaceFilter>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="cq:Page"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?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"
jcr:primaryType="nt:unstructured"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?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"
jcr:primaryType="nt:unstructured"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?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"
jcr:primaryType="nt:unstructured"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?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"
jcr:primaryType="nt:unstructured"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?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"
jcr:primaryType="nt:unstructured"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root
xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
xmlns:granite="http://www.adobe.com/jcr/granite/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"
granite:comment="The actionlink uses the URI derived from the `href.uritemplate` value on the `data` node. The `href` attribute is only used externally (e.g. HApi tests), not by the actionlink itself"
granite:id="cq-experiencefragments-admin-createfolder"
granite:rel="cq-siteadmin-admin-createfolder"
jcr:primaryType="nt:unstructured"
sling:resourceType="granite/ui/components/coral/foundation/collection/actionlink"
sling:orderBefore="createlivecopy"
action="foundation.dialog"
href="/mnt/overlay/wcm/core/content/coral/common/createxffolderdialog.html${requestPathInfo.suffix}"
icon="folder"
relScope="collection"
target=".cq-experience-fragments-admin-childpages"
text="Shared Components Root Folder">
<data
jcr:primaryType="nt:unstructured"
nesting="hide"
src.uritemplate="/mnt/overlay/wcm/core/content/coral/common/createxffolderdialog.html{+id}"/>
</jcr:root>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?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"
jcr:primaryType="sling:Folder"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?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"
jcr:primaryType="sling:Folder"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
jcr:primaryType="nt:unstructured"
jcr:title="Shared Components Root"
sling:resourceType="granite/ui/components/coral/foundation/dialog">
<items jcr:primaryType="nt:unstructured">
<form
granite:id="cq-common-createfolderform"
jcr:primaryType="nt:unstructured"
sling:resourceType="granite/ui/components/coral/foundation/form"
action="${granite:encodeURIPath(requestPathInfo.suffix)}/"
foundationForm="{Boolean}true"
method="post"
style="vertical">
<items jcr:primaryType="nt:unstructured">
<label
jcr:primaryType="nt:unstructured"
sling:resourceType="granite/ui/components/coral/foundation/text"
text="A folder that allows for Shared Component Properties." />
<title
jcr:primaryType="nt:unstructured"
sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
fieldLabel="Title"
name="./jcr:title"
required="{Boolean}true"/>
<name
jcr:primaryType="nt:unstructured"
sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
fieldLabel="Name"
name=":name"
validation="foundation.jcr.name"/>
<primarytype
jcr:primaryType="nt:unstructured"
sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
name="./jcr:primaryType"
value="sling:OrderedFolder"/>
<charset
jcr:primaryType="nt:unstructured"
sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
name="_charset_"
value="utf-8"/>
<jcrPrimarytype
jcr:primaryType="nt:unstructured"
sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
name="./jcr:content/jcr:primaryType"
value="nt:unstructured"/>
</items>
</form>
</items>
<footer jcr:primaryType="nt:unstructured">
<cancel
jcr:primaryType="nt:unstructured"
sling:resourceType="granite/ui/components/coral/foundation/button"
text="Cancel">
<parentConfig
jcr:primaryType="nt:unstructured"
close="{Boolean}true"/>
</cancel>
<create
jcr:primaryType="nt:unstructured"
sling:resourceType="granite/ui/components/coral/foundation/button"
formId="cq-common-createfolderform"
text="Create"
type="submit"
variant="primary"/>
</footer>
</jcr:root>