Skip to content

Revert "FORMS-11259: Avoid dataRef parameter in Iframe when no value… #1379

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

Merged
merged 1 commit into from
Sep 8, 2024
Merged

Revert "FORMS-11259: Avoid dataRef parameter in Iframe when no value… #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform/aemform.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,12 @@
<sly data-sly-use.clientLib="${'/libs/granite/sightly/templates/clientlib.html'}"/>
<sly data-sly-test.useIframe="${form.useIframe != 'false'}">
<sly data-sly-test.formLocaleString="${form.locale || 'en'}"/>
<sly data-sly-set.dataRef="${request.requestParameterMap['dataRef'] ? request.requestParameterMap['dataRef'][0].toString :'' @ context='attribute'}"/>
<sly data-sly-set.wcmmode="${!wcmmode.edit?'wcmmode=DISABLED':''}"/>
<sly data-sly-set.formUrlParams="${wcmmode ? '?':''}${wcmmode}${dataRef ? '&dataRef=' :''}${dataRef}"/>
<iframe title="${form.title}"
role="${form.roleAttribute || ''}"
class="cmp-aemform__iframecontent"
src="${request.contextPath}${resource.path}.iframe.${formLocaleString}.html${formUrlParams}"
width="100%;"
data-form-page-path="${form.formEditPagePath}"></iframe>
<iframe title="${form.title}"
role="${form.roleAttribute || ''}"
class="cmp-aemform__iframecontent"
src="${request.contextPath}${resource.path}.iframe.${formLocaleString}.html?dataRef=${request.requestParameterMap['dataRef'] != null ? request.requestParameterMap['dataRef'][0].toString : '' @ context='attribute'}${!wcmmode.edit ? '&wcmmode={0}':'' @ format=[wcmmode.toString]}"
width="100%;"
data-form-page-path="${form.formEditPagePath}"></iframe>
<sly data-sly-test="${form.useIframe != 'false' && form.height == 'auto'}"
data-sly-call="${clientLib.all @ categories=['core.forms.components.aemform.v2.iframeResizer']}"/>
</sly>
Expand Down
9 changes: 0 additions & 9 deletions ui.tests/test-module/specs/aemEmbedContainer/aemEmbedContainer.runtime.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,6 @@ describe("Sites with Aem Embed Container", () => {
cy.get('.cmp-adaptiveform-container').should('have.length', 1);
cy.get('.cmp-adaptiveform-container').find('.cmp-adaptiveform-textinput__widget').should('have.length', 11);
})

it('Test iframe src with dataRef', () => {
cy.visit(pagePath+"?dataRef='testingDataRef'")
cy.get('.cmp-aemform__iframecontent').should('have.attr', 'src').should('include', "?wcmmode=DISABLED&dataRef='testingDataRef'");
});

it('Test iframe src without dataRef', () => {
cy.get('.cmp-aemform__iframecontent').should('have.attr', 'src').should('include', "?wcmmode=DISABLED");
});
})

context('aem embed container in iframe mode with custom height ', function () {
Expand Down