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.

Sign up for GitHub

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

Jump to bottom

[Issue #2776] Don't ever initialize a com.adobe.cq.wcm.core.components.models.Component instance to retrieve an ID #2777

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[Issue #2776] Don't ever initialize a com.adobe.cq.wcm.core.components.models.Component instance to retrieve an ID #2777

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b89aba
Closes #2776 - Retrieve the component's ID from its corresponding sli…
paulochang Jun 5, 2024
b6800ae
Revert unintentional property replacement
paulochang Jun 7, 2024
71b8d1d
Fix missing placeholder
paulochang Jun 7, 2024
e9c4e2d
Merge branch 'main' into main
paulochang Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...nt/src/content/jcr_root/apps/core/wcm/components/breadcrumb/v2/breadcrumb/breadcrumb.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<nav data-sly-use.breadcrumb="com.adobe.cq.wcm.core.components.models.Breadcrumb"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.template="core/wcm/components/commons/v1/templates.html"
id="${component.id}"
id="${breadcrumb.id}"
class="cmp-breadcrumb"
aria-label="${'Breadcrumb' @ i18n}"
data-sly-test="${breadcrumb.items.size > 0}"
Expand Down
3 changes: 1 addition & 2 deletions content/src/content/jcr_root/apps/core/wcm/components/button/v1/button/button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<button data-sly-use.button="com.adobe.cq.wcm.core.components.models.Button"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.iconTemplate="icon.html"
data-sly-element="${button.link ? 'a' : 'button'}"
type="${button.link ? '' : 'button'}"
id="${component.id}"
id="${button.id}"
class="cmp-button"
href="${button.link}"
aria-label="${button.accessibilityLabel}"
Expand Down
3 changes: 1 addition & 2 deletions ...s/core/wcm/components/contentfragmentlist/v1/contentfragmentlist/contentfragmentlist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<sly data-sly-use.list="com.adobe.cq.wcm.core.components.models.contentfragment.ContentFragmentList"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-test="${list.listItems.size>0}" data-sly-use.fragmentTemplate="core/wcm/components/contentfragment/v1/contentfragment/templates.html">
<section data-sly-list.fragment="${list.listItems}"
id="${component.id}"
id="${list.id}"
class="cmp-contentfragmentlist">
<sly data-sly-call="${fragmentTemplate.contentFragment @ fragment=fragment, wcmmode=wcmmode}"></sly>
</section>
Expand Down
3 changes: 1 addition & 2 deletions content/src/content/jcr_root/apps/core/wcm/components/download/v1/download/download.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<div data-sly-use.download="com.adobe.cq.wcm.core.components.models.Download"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.templates="core/wcm/components/commons/v1/templates.html"
data-sly-test.hasContent="${download.filename}"
id="${component.id}"
id="${download.id}"
class="cmp-download${!wcmmode.disabled ? ' cq-dd-file' : ''}">
<h3 class="cmp-download__title" data-sly-test.title="${download.title}" data-sly-element="${download.titleType}">
<a data-sly-unwrap="${!download.url || download.hideTitleLink}" class="cmp-download__title-link" href="${download.url}" aria-hidden="true" role="presentation">${title}</a>
Expand Down
3 changes: 1 addition & 2 deletions content/src/content/jcr_root/apps/core/wcm/components/embed/v1/embed/embed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<div data-sly-use.embed="com.adobe.cq.wcm.core.components.models.Embed"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.commonsTemplates="core/wcm/components/commons/v1/templates.html"
data-sly-test.hasContent="${(embed.result && embed.result.processor) || embed.html || embed.embeddableResourceType}"
data-cmp-data-layer="${embed.data.json}"
id="${component.id}"
id="${embed.id}"
class="cmp-embed">
<sly data-sly-test="${embed.result && embed.result.processor}"
data-sly-use.processorTemplate="processors/${embed.result.processor}.html"
Expand Down
7 changes: 3 additions & 4 deletions ...apps/core/wcm/components/experiencefragment/v1/experiencefragment/experiencefragment.html
View file
Open in desktop
paulochang marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<div data-sly-use.fragment="com.adobe.cq.wcm.core.components.models.ExperienceFragment"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.template="core/wcm/components/commons/v1/templates.html"
data-sly-test=${fragment.configured}
data-sly-set.selector="content.${request.requestPathInfo.selectorString}"
data-sly-test="${fragment.configured}"
data-sly-set.selector="${'content.' @format=request.requestPathInfo.selectorString}"
data-sly-resource="${@path=fragment.localizedFragmentVariationPath, selectors=selector, wcmmode='disabled'}"
id="${component.id}"
id="${fragment.id}"
class="cmp-experiencefragment cmp-experiencefragment--${fragment.name}">
</div>
<sly data-sly-call="${template.placeholder @ isEmpty=!fragment.configured, classAppend='cmp-dd-experiencefragment'}"></sly>
3 changes: 1 addition & 2 deletions content/src/content/jcr_root/apps/core/wcm/components/image/v2/image/image.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<div data-sly-use.image="com.adobe.cq.wcm.core.components.models.Image"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.templates="core/wcm/components/commons/v1/templates.html"
data-sly-test="${image.src}"
data-cmp-is="image"
Expand All @@ -27,7 +26,7 @@
data-asset="${image.fileReference}"
data-asset-id="${image.uuid}"
data-title="${image.title || image.alt}"
id="${component.id}"
id="${image.id}"
data-cmp-data-layer="${image.data.json}"
class="cmp-image${!wcmmode.disabled ? ' cq-dd-image' : ''}"
itemscope itemtype="http://schema.org/ImageObject">
Expand Down
3 changes: 1 addition & 2 deletions ...apps/core/wcm/components/languagenavigation/v1/languagenavigation/languagenavigation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<nav data-sly-use.languageNavigation="com.adobe.cq.wcm.core.components.models.LanguageNavigation"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.commonsTemplates="core/wcm/components/commons/v1/templates.html"
data-sly-use.groupTemplate="group.html"
data-sly-call="${groupTemplate.group @ items=languageNavigation.items}"
data-sly-test.hasContent="${languageNavigation.items.size > 0}"
data-cmp-data-layer="${languageNavigation.data.json}"
id="${component.id}"
id="${languageNavigation.id}"
class="cmp-languagenavigation"
aria-label="${languageNavigation.accessibilityLabel}">
</nav>
Expand Down
3 changes: 1 addition & 2 deletions content/src/content/jcr_root/apps/core/wcm/components/list/v2/list/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<ul data-sly-use.list="com.adobe.cq.wcm.core.components.models.List"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.template="core/wcm/components/commons/v1/templates.html"
data-sly-use.itemTemplate="item.html"
data-sly-list.item="${list.listItems}"
id="${component.id}"
id="${list.id}"
data-cmp-data-layer="${list.data.json}"
class="cmp-list">
<li class="cmp-list__item" data-sly-call="${itemTemplate.item @ list = list, item = item}"
Expand Down
5 changes: 2 additions & 3 deletions content/src/content/jcr_root/apps/core/wcm/components/separator/v1/separator/separator.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<div data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.separator="com.adobe.cq.wcm.core.components.models.Separator"
id="${component.id}"
<div data-sly-use.separator="com.adobe.cq.wcm.core.components.models.Separator"
id="${separator.id}"
class="cmp-separator">
<hr class="cmp-separator__horizontal-rule"
data-sly-attribute.role="${separator.decorative ? 'none': ''}"
Expand Down
3 changes: 1 addition & 2 deletions ...jcr_root/apps/core/wcm/components/tableofcontents/v1/tableofcontents/tableofcontents.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<div data-sly-use.toc="com.adobe.cq.wcm.core.components.models.TableOfContents"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
class = "cmp-toc__placeholder"
id = "${component.id}"
id = "${toc.id}"
data-cmp-toc-list-type = "${toc.listType && toc.listType.value}"
data-cmp-toc-start-level = "${toc.startLevel && toc.startLevel.value}"
data-cmp-toc-stop-level = "${toc.stopLevel && toc.stopLevel.value}"
Expand Down
2 changes: 1 addition & 1 deletion content/src/content/jcr_root/apps/core/wcm/components/text/v1/text/text.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<sly data-sly-use.textModel="com.adobe.cq.wcm.core.components.models.Text"
data-sly-use.templates="core/wcm/components/commons/v1/templates.html"/>
<p data-sly-test.text="${textModel.text}" data-sly-unwrap="${textModel.isRichText}">${text @ context = textModel.isRichText ? 'html' : 'text'}</p>
<p data-sly-test.text="${textModel.id}" data-sly-unwrap="${textModel.isRichText}">${text @ context = textModel.isRichText ? 'html' : 'text'}</p>
paulochang marked this conversation as resolved.
Show resolved Hide resolved
<sly data-sly-call="${templates.placeholder @ isEmpty = !text}"></sly>
3 changes: 1 addition & 2 deletions content/src/content/jcr_root/apps/core/wcm/components/text/v2/text/text.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<div data-sly-use.textModel="com.adobe.cq.wcm.core.components.models.Text"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.templates="core/wcm/components/commons/v1/templates.html"
data-sly-test.text="${textModel.text}"
data-cmp-data-layer="${textModel.data.json}"
id="${component.id}"
id="${textModel.id}"
class="cmp-text">
<p class="cmp-text__paragraph"
data-sly-unwrap="${textModel.isRichText}">${text @ context = textModel.isRichText ? 'html' : 'text'}</p>
Expand Down
3 changes: 1 addition & 2 deletions content/src/content/jcr_root/apps/core/wcm/components/title/v2/title/title.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
~ limitations under the License.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
<div data-sly-use.title="com.adobe.cq.wcm.core.components.models.Title"
data-sly-use.component="com.adobe.cq.wcm.core.components.models.Component"
data-sly-use.template="core/wcm/components/commons/v1/templates.html"
data-sly-test.text="${title.text}"
data-cmp-data-layer="${title.data.json}"
id="${component.id}"
id="${title.id}"
class="cmp-title">
<h1 class="cmp-title__text" data-sly-element="${title.type}"><a
data-sly-unwrap="${!title.linkURL || title.linkDisabled}" class="cmp-title__link"
Expand Down