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

Edited error message #13507

Merged
merged 8 commits into from
Oct 4, 2019
Merged

Edited error message #13507

merged 8 commits into from
Oct 4, 2019

Conversation

d3vl0p
Copy link
Contributor

@d3vl0p d3vl0p commented Sep 21, 2019

Fixes #13115

Changes proposed in this Pull Request:

  • edited error message to include a link to the debug and contact page

Testing instructions:

Proposed changelog entry for your changes:

  • No changelog entry needed

@d3vl0p d3vl0p requested a review from a team as a code owner September 21, 2019 11:59
@jetpackbot
Copy link

jetpackbot commented Sep 21, 2019

Thank you for the great PR description!

When this PR is ready for review, please apply the [Status] Needs Review label. If you are an a11n, please have someone from your team review the code if possible. The Jetpack team will also review this PR and merge it to be included in the next Jetpack release.

Scheduled Jetpack release: November 5, 2019.
Scheduled code freeze: October 29, 2019

Generated by 🚫 dangerJS against 710ea1d

@wigglemuff wigglemuff added [Status] In Progress [Status] Needs Review To request a review from Crew. Label will be renamed soon. labels Sep 21, 2019
Copy link
Member

@jeherve jeherve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would recommend linking to the Debug page with the site URL already filled in. I think you could also remove the comment at the end of the line now.

@jeherve jeherve added [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! and removed [Status] In Progress [Status] Needs Review To request a review from Crew. Label will be renamed soon. labels Sep 23, 2019
@d3vl0p
Copy link
Contributor Author

d3vl0p commented Sep 25, 2019

@jeherve made the change. The debug link will now include site_url() at the end of it.

Copy link
Member

@jeherve jeherve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The backticks aren't going to work well here. I'd recommend building the string using sprintf and wp_kses to ensure that translators cannot break the string while translating.

@d3vl0p
Copy link
Contributor Author

d3vl0p commented Sep 26, 2019

@jeherve That's great advice. While I knew a little bit about this in theory, I learned so much more in practice while making changes and getting this to work. What do you think about the latest commit?

sprintf(
/* translators: 1st placeholder is a link to Jetpack debug page, 2nd one fetches current site URL. */
__(
'<a href="%1$s%2$s">Visit the Jetpack.com debug page</a> for more information or <a href="https://jetpack.com/contact-support/">contact support</a>.',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be able to do this with just one placeholder.

'<a href="%1$s%2$s">Visit the Jetpack.com debug page</a> for more information or <a href="https://jetpack.com/contact-support/">contact support</a>.',
'jetpack'
),
'https://jetpack.com/support/debug/?url=',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we do just the one place holder, we condense these two into arguments (the debug URL and the site URL) into one:

esc_url( add_query_arg( 'url', urlencode( site_url() ), 'https://jetpack.com/support/debug/' ) )

This also ensures we're using the right escaping functions (esc_url() for the whole URL, urlencode() for the query string parameter) in the right places.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh! didn't think of that. Also add_query_arg is a TIL for me. Thanks. Made the change now.

Copy link
Member

@jeherve jeherve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good. However, while it works well under Tools > Site Health, we can't really display links in Jetpack > Debug right now:

image

image

You'd need to ensure that the output there allows for links, maybe using wp_kses as well:

echo '<p class="jetpack-test-details">' . esc_html( $fail['resolution'] ) . '</p>';

@d3vl0p d3vl0p requested a review from jeherve September 27, 2019 15:05
@d3vl0p
Copy link
Contributor Author

d3vl0p commented Sep 27, 2019

@jeherve Good point. Thanks for testing. Made the change (also resolved the conflict with the master branch) and this looks good to go!

@jeherve jeherve added this to the 7.9 milestone Sep 30, 2019
@jeherve jeherve added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Sep 30, 2019
jeherve
jeherve previously approved these changes Sep 30, 2019
Copy link
Member

@jeherve jeherve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. It should be good to merge. I only wonder if it may be best to have those links open in a new tab, since they direct you out of wp-admin.

@wigglemuff
Copy link
Contributor

wigglemuff commented Sep 30, 2019

@jeherve You're right, opening the link in a new tab makes sense. Let me make that change..
(sorry to flip between two diff accounts, I accidentally used my personal account omkarbhagat93 for this PR and will continue to use that only for this PR. Will switch back to codestor4 A8C account for all future PRs).

@jeherve jeherve removed the [Status] Ready to Merge Go ahead, you can push that green button! label Sep 30, 2019
@d3vl0p
Copy link
Contributor Author

d3vl0p commented Oct 3, 2019

@jeherve All done. Ready to merge 👍

@wigglemuff wigglemuff added the [Status] Needs Review To request a review from Crew. Label will be renamed soon. label Oct 3, 2019
Copy link
Member

@jeherve jeherve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good addition. I'd have 2 remarks:

@jeherve jeherve added [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! and removed [Status] In Progress [Status] Needs Review To request a review from Crew. Label will be renamed soon. labels Oct 3, 2019
@wigglemuff
Copy link
Contributor

Latest commit includes noopener noreferrer and wp_kses updated to include rel and target attributes. Thanks for including links for context. I love that I'm getting to learn so much more by working on a PR :)

cc: @jeherve

@wigglemuff wigglemuff added [Status] Needs Review To request a review from Crew. Label will be renamed soon. and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Oct 4, 2019
Copy link
Member

@jeherve jeherve left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. Merging.

@jeherve jeherve added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review To request a review from Crew. Label will be renamed soon. labels Oct 4, 2019
@jeherve jeherve dismissed mdawaffe’s stale review October 4, 2019 10:54

Changes were made to address this.

@jeherve jeherve merged commit fe3c46e into Automattic:master Oct 4, 2019
@matticbot matticbot added [Status] Needs Changelog and removed [Status] Ready to Merge Go ahead, you can push that green button! labels Oct 4, 2019
@kraftbj
Copy link
Contributor

kraftbj commented Oct 4, 2019

One thing I'd want to check is the wp jetpack status output of a site in a broken state.

Ideally, in the PR description and testing instructions, there would be enough detail to recreate the error state so it can be tested without figuring out how to break JP.

@kraftbj
Copy link
Contributor

kraftbj commented Oct 4, 2019

2019-10-04 at 2 55 PM

It looks good. I have a vague memory of not including a link for some CLI reason, but that seems to be outdated info.

@wigglemuff
Copy link
Contributor

wigglemuff commented Oct 5, 2019

Ideally, in the PR description and testing instructions, there would be enough detail to recreate the error state so it can be tested without figuring out how to break JP.

Noted. I'm still learning but I'll remember this for the next time. I wanted to recreate the error message to test things and Jeremy suggested the simplest way is to put it outside of if/else block. That's what I did. I don't know if there is a better way to recreate the error. Can you share some details on how you did it? @kraftbj

Edit: Wait I think you did it via wp jetpack status and if that's the case then disregard my question (disappears)..

jeherve added a commit that referenced this pull request Oct 23, 2019
jeherve added a commit that referenced this pull request Oct 29, 2019
* 7.9: Changelog

* Update version number

* Update stable tag and tested up to

* Changelog: add #13530

* changelog: add #13578

* Changelog: add #13598

* Changelog: add entry for numerous block preview changes

* Changelog: add #13599

* changelog: add #13541

* Changelog: add #13542

* Changelog: add #13331

* Changelog: add #13558

* Changelog: add #13409

* Changelog: add #13582

* Changelog: add #13600

* Changelog: add #13601

* Changelog: add #13595

* Changelog: add #12695

* Changelog: add #13009

* Changelog: add #13649

* Changelog: add #13450

* Changelog: add #13507

* Changelog: add #13658

* Changelog: add #13687

* changelog: add #13683

* Changelog: add #9323

* Changelog: add #13681

* Fix typos in readme

* Add link to WordPress Beta Tester plugin

* Changelog: add #13630

* Changelog: add #13695

* Changelog: add #13659

* Changelog: add #13716

* Changelog: add #13664

* Changelog: add #13682

* Changelog: add #13362

* Changelog: add #13563

* Add testing list for #13563

* Changelog: add #13735

* Changelog: add #13752

* Changelog: add #13624

* Changelog: add #13756

* Changelog: add #13745

* Changelog: add #13728

* Changelog: add #13779

* Changelog: add #13699

* Changelog: add #13804

* Changelog: add #13761

* Changelog: add #13637

* Changelog: add #13517

* Changelog: add #13521

* Changelog: add #13729

* Testing list: add testing instructions for #13729

* Changelog: add sync changes

* Changelog: add #13807

* Changelog: add #13654

* Changelog: add #13795

* Changelog: add #13801

* Changelog: add #13818

* Changelog: add #13725

* Changelog: add #13831

* Changelog: add #13516

* Testing list: add Twenty Twenty instructions

* Changelog: add #13799

* Changelog: add #13805

* Changelog: add #13688

* Changelog: add #13830
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error message should tell user how to get to debugging page
7 participants