Issue #30594 - added preventDefault if EventListner is added for a tag #30628

amitsamsukha · 2020-10-23T14:41:13Z

Description (*)

renderEventListenerAsTag function of class Magento\Framework\View\Helper\SecureHtmlRenderer
execute/apply the event for tag
so the default event must prevent in this case.

Related Pull Requests

Fixed Issues (if relevant)

Fixes Email Template Preview spawns a pop-up window and also directs user away from email templates grid #30594

Manual testing scenarios (*)

Go to Marketing > Communications > Email Templates
Click Add New Template
Fill out the form and save. You'll be sent over to the Email Templates grid.
Click Preview on the newly or old created Email Template.
It will pop-up a preview window
and parent GRID does not redirect to preview window now.

Questions or comments

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds are green)

…or a tag

m2-assistant · 2020-10-23T14:41:15Z

Hi @amitsamsukha. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento give me test instance - deploy test instance based on PR changes
@magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

@magento run all tests - run or re-run all required tests against the PR changes
@magento run <test-build(s)> - run or re-run specific test build(s)
For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

Database Compare
Functional Tests CE
Functional Tests EE,
Functional Tests B2B
Integration Tests
Magento Health Index
Sample Data Tests CE
Sample Data Tests EE
Sample Data Tests B2B
Static Tests
Unit Tests
WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

amitsamsukha · 2020-10-23T16:56:45Z

@magento give me test instance

magento-deployment-service · 2020-10-23T16:56:48Z

Hi @amitsamsukha. Thank you for your request. I'm working on Magento instance for you.

magento-deployment-service · 2020-10-23T17:01:23Z

Hi @amitsamsukha, here is your Magento Instance: https://01b23675a576e47ab7afacff97f796dc.instances.magento-community.engineering
Admin access: https://01b23675a576e47ab7afacff97f796dc.instances.magento-community.engineering/admin_f2dd
Login: 0d78731b
Password: 792aaffa347a

amitsamsukha · 2020-10-23T17:05:40Z

@magento run all tests

amitsamsukha · 2020-10-24T03:09:41Z

@magento run Functional Tests CE

mrtuvn · 2020-10-24T05:57:41Z

Can we have test 2 cases in one PR ?
CC: @sivaschenko @amitsamsukha
I just found another PR have change with same area
See #29991

rogyar

Hi @amitsamsukha. Thank you for providing the fix. According to the definition of done all changes should be covered buy autotests.

Could I ask you to cover this fix with an MFTF test that will assert that after clicking the "Preview" link the parent page stays unchanged?

Thank you!

lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php

rogyar · 2020-10-24T11:23:04Z

Hi @mrtuvn. I would suggest not to merge these two solutions. So, leave the "preventDefault" in this PR and other changes in the mentioned PR. The main reason for that - author of #29991 will have to create an additional test that covers email templates preview. So, it's better to have 2 PRs for 2 different issues.

amitsamsukha · 2020-10-27T07:00:21Z

@magento run Functional Tests CE

amitsamsukha · 2020-10-27T07:01:45Z

@magento run Functional Tests EE

amitsamsukha · 2020-10-27T07:57:24Z

@magento run all tests

amitsamsukha · 2020-10-27T08:05:19Z

@magento run all tests

rogyar · 2020-10-30T16:16:12Z

Hi @amitsamsukha. Would you take care of the test coverage, please? Please, refer to my comment above

Thank you!

amitsamsukha · 2020-11-02T07:39:23Z

@rogyar can you guide me on how to resolve the following issues :
I have branched from the magento:2.4-develop branch and the issue listed is not related.

you can check the below link :
https://public-results-storage-prod.magento-testing-service.engineering/reports/magento/magento2/pull/30628/d4dc7d8f35182903927b55cc64fcd78c/Functional/allure-report-b2b/index.html#suites/8187718e2fd144987673ef34ee62b41b/8a85e072d2e7cb9a/

amitsamsukha · 2020-11-03T08:24:49Z

@magento run Functional Tests CE

amitsamsukha · 2020-11-03T12:27:02Z

@magento give me test instance

magento-deployment-service · 2020-11-03T12:27:04Z

Hi @amitsamsukha. Thank you for your request. I'm working on Magento instance for you.

magento-deployment-service · 2020-11-03T12:32:04Z

Hi @amitsamsukha, here is your Magento Instance: https://01b23675a576e47ab7afacff97f796dc.instances.magento-community.engineering
Admin access: https://01b23675a576e47ab7afacff97f796dc.instances.magento-community.engineering/admin_cf4e
Login: 35c6a935
Password: 7576d953399f

…ssue-30594

amitsamsukha · 2020-11-04T06:23:10Z

@magento give me test instance

magento-deployment-service · 2020-11-04T06:23:12Z

Hi @amitsamsukha. Thank you for your request. I'm working on Magento instance for you.

magento-deployment-service · 2020-11-04T06:27:50Z

Hi @amitsamsukha, here is your Magento Instance: https://01b23675a576e47ab7afacff97f796dc.instances.magento-community.engineering
Admin access: https://01b23675a576e47ab7afacff97f796dc.instances.magento-community.engineering/admin_d45f
Login: 97ea63f7
Password: 392c0ca2d369

amitsamsukha · 2020-11-04T06:37:03Z

@magento run all tests

amitsamsukha · 2020-11-05T07:41:00Z

@magento run all tests

rogyar · 2020-11-08T14:05:56Z

Hi @amitsamsukha. There's nothing wrong with the existing tests at the moment. I was asking you to add an additional functional test that will emulate all the steps to reproduce the issue and make sure that the issue does not appear anymore after your fix.

Thank you.

mrtuvn · 2020-11-25T23:50:31Z

lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php

            }
+
 script;

        return $this->renderTag('script', ['type' => 'text/javascript'], $script, false);


Hard-code logic check nodename is not good way. IMO
You should add change method _toLinkHtml in https://github.com/magento/magento2/blob/2.4-develop/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php#L143
CC: @rogyar @zaximus84

@mrtuvn
thanks for the suggestion, but the preventDefault only works if called within function onclick into:

https://github.com/magento/magento2/blob/2.4-develop/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php#L116

the issue is resolved by just adding onclick if condition but I have put a double-check for the anchor tag.
let me know if I need to remove the anchor tag check in this.
CC: @rogyar @zaximus84

amitsamsukha · 2020-12-02T07:48:50Z

@magento run all tests

rogyar · 2020-12-04T08:57:12Z

Hi @amitsamsukha. Please, do not forget about the auto tests mentioned in the following comment.

#30628 (review)

Thanks

Issue magento#30594 - added preventDefault if EventListner is added f…

8449a05

…or a tag

magento-engcom-team added the Component: View label Oct 23, 2020

ghost added the Progress: pending review label Oct 23, 2020

magento-engcom-team added Release Line: 2.4 Event: MageCONF CD 2020 labels Oct 23, 2020

sivaschenko added the Priority: P3 May be fixed according to the position in the backlog. label Oct 23, 2020

rogyar requested changes Oct 24, 2020

View reviewed changes

lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php Outdated Show resolved Hide resolved

ghost assigned rogyar Oct 24, 2020

ghost added Progress: needs update and removed Progress: pending review labels Oct 24, 2020

indentation correction

7d3ea41

Merge branch '2.4-develop' into Issue-30594

e30bb6f

Merge branch '2.4-develop' into Issue-30594

ac5f953

amitsamsukha added 3 commits November 4, 2020 06:18

added check for anchor tag and click event

6fd02b3

Merge branch 'Issue-30594' of github.com:amitsamsukha/magento2 into I…

15f4850

…ssue-30594

indentation correction

93654ab

Merge branch '2.4-develop' into Issue-30594

3499bd8

amitsamsukha requested a review from rogyar November 5, 2020 10:38

m2-community-project bot added the Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. label Nov 11, 2020

mrtuvn requested changes Nov 25, 2020

View reviewed changes

m2-community-project bot assigned mrtuvn Nov 25, 2020

m2-community-project bot added Progress: review and removed Progress: needs update labels Nov 25, 2020

Merge branch '2.4-develop' into Issue-30594

f542a4f

Issue #30594 - added preventDefault if EventListner is added for a tag #30628

Are you sure you want to change the base?

Issue #30594 - added preventDefault if EventListner is added for a tag #30628

Uh oh!

Conversation

amitsamsukha commented Oct 23, 2020

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Manual testing scenarios (*)

Questions or comments

Contribution checklist (*)

Uh oh!

m2-assistant bot commented Oct 23, 2020

Uh oh!

amitsamsukha commented Oct 23, 2020

Uh oh!

magento-deployment-service bot commented Oct 23, 2020

Uh oh!

magento-deployment-service bot commented Oct 23, 2020

Uh oh!

amitsamsukha commented Oct 23, 2020

Uh oh!

amitsamsukha commented Oct 24, 2020

Uh oh!

mrtuvn commented Oct 24, 2020

Uh oh!

rogyar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rogyar commented Oct 24, 2020

Uh oh!

amitsamsukha commented Oct 27, 2020

Uh oh!

amitsamsukha commented Oct 27, 2020

Uh oh!

amitsamsukha commented Oct 27, 2020

Uh oh!

amitsamsukha commented Oct 27, 2020

Uh oh!

rogyar commented Oct 30, 2020

Uh oh!

amitsamsukha commented Nov 2, 2020

Uh oh!

amitsamsukha commented Nov 3, 2020

Uh oh!

amitsamsukha commented Nov 3, 2020

Uh oh!

magento-deployment-service bot commented Nov 3, 2020

Uh oh!

magento-deployment-service bot commented Nov 3, 2020

Uh oh!

amitsamsukha commented Nov 4, 2020

Uh oh!

magento-deployment-service bot commented Nov 4, 2020

Uh oh!

magento-deployment-service bot commented Nov 4, 2020

Uh oh!

amitsamsukha commented Nov 4, 2020

Uh oh!

amitsamsukha commented Nov 5, 2020

Uh oh!

rogyar commented Nov 8, 2020

Uh oh!

mrtuvn Nov 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mrtuvn Nov 25, 2020

Choose a reason for hiding this comment

Uh oh!

amitsamsukha Dec 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

amitsamsukha commented Dec 2, 2020

Uh oh!

rogyar commented Dec 4, 2020

Uh oh!

mrtuvn Nov 25, 2020 •

edited

Loading

amitsamsukha Dec 2, 2020 •

edited

Loading