fix(pagebuilder): Html content type unescapes when GraphQL does not #2283
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zetlen
added
the
version: Patch
davemacaulay
previously approved these changes
Mar 25, 2020
jimbo
previously approved these changes
Mar 25, 2020
m2-community-project
bot
moved this from Ready for Review
to Reviewer Approved
in Pull Request Progress
sirugh
previously approved these changes
Mar 25, 2020
zetlen
dismissed stale reviews from sirugh, jimbo, and davemacaulay
via
1bee42d
zetlen
force-pushed
the
zetlen/pagebuilder-detect-unescape-MC-32787
branch
from
e30f3da
to
1bee42d
Compare
m2-community-project
bot
moved this from Reviewer Approved
to Review in Progress
in Pull Request Progress
sirugh
reviewed
Mar 25, 2020
| let html; | ||
| if (node.dataset.decoded) { | ||
| html = node.innerHTML; | ||
| if (process.env.NODE_ENV !== 'production') { |
There was a problem hiding this comment.
I think we remove logs in production bundles anyways - shouldn't need to gate with a condition. If I'm wrong we probably have to go clean up our app :D
There was a problem hiding this comment.
We might, but I just wanted to be explicit. This is a pattern we ought to follow. We may later remove the drop_console in some cases!
sirugh
approved these changes
Mar 25, 2020
|
|
Works fine. Tested this PR against -
|
m2-community-project
bot
moved this from Review in Progress
to Done
in Pull Request Progress
dpatil-magento
added a commit
that referenced
this pull request
Apr 28, 2020
* Removed cart and checkout routes from 6.0 branch. (#2255) * - Mock version in test so snaps dont fail during releases (#2266) - Fixup regex to handle line breaks * [security] minimist >= 1.2.2 (#2267) * Requires at least minimist 1.2.2 due to security vuln Signed-off-by: sirugh <rugh@adobe.com> * Switches to yarn and requires minimist 1.2.2 for security vuln Signed-off-by: sirugh <rugh@adobe.com> * v6.0.0-alpha.1 * v6.0.0-beta.1 * Jimothy/6.0 release notes (#2279) * Add unsorted PR list * Add items to separate lists * Finish organizing PRs in sections * Finish highlights * Remove entries that were part of previous releases * Update PageBuilder to Page Builder Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * fix(pagebuilder): Html content type unescapes content when GraphQL does not (#2283) Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * [PWA-479] Extension Files Missing From Packages (#2305) * Add extensible files and directories to published packages * Revert version bumps Co-authored-by: Devagouda <40405790+dpatil-magento@users.noreply.github.com> * v6.0.0-beta.2 * [bug]: Fix (remove) OOTB tests from scaffold (#2321) * Ignores buildpack and test directories during create-pwa Signed-off-by: sirugh <rugh@adobe.com> * Fix glob pattern to match sub directories AND contents Signed-off-by: sirugh <rugh@adobe.com> * Fixes tests and makes ignore pattern easier to construct Signed-off-by: sirugh <rugh@adobe.com> * [Doc] 6.0 release notes updates (#2323) * Add new PRs to changelog and update compatibility table * Fix wrong entry placement * v6.0.0-beta.3 * v6.0.0-rc.1 * v6.0.0 * Enable cart and checkout routes Co-authored-by: Revanth Kumar Annavarapu <35203638+revanth0212@users.noreply.github.com> Co-authored-by: Tommy Wiebell <twiebell@adobe.com> Co-authored-by: Stephen <sirugh@users.noreply.github.com> Co-authored-by: devops-pwa-codebuild <magento-devops-github-pwa-int@adobe.com> Co-authored-by: James Calcaben <jcalcaben@users.noreply.github.com> Co-authored-by: James Zetlen <jzetlen@adobe.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Due to an apparent regression in M2.3.5, the GraphQL API now passes HTML content (in CMS blocks, anyway) through at least one PageBuilder-related render. The effect is that HTML content nodes, whose content itself was HTML encoded (
<div>became<div>), was no longer HTML encoded. This broke the PageBuilder Html content type by stripping all HTML tags from it.The Html "config aggregator" was using
node.textContentto get and unescape its HTML, but when GraphQL has already unescaped it, we must use innerHTML instead. This PR updates the config aggregator with that logic.Because the bug in MC-32787 may indicate a misconfiguration, the config aggregator logs a message in development mode.
Related Issue
Closes https://jira.corp.magento.com/browse/MC-32787.
Acceptance
Verification Stakeholders
@sirugh
@davemacaulay
@dpatil-magento
Specification
Verification Steps
MAGENTO_BACKEND_URL=<host>a 2.3.4 instance.yarn run watch:veniaMAGENTO_BACKEND_URL=<host>a 2.3.5 instanceyarn run watch:veniadevelopthis formatting is bonkers.