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

Fix display of site URL on disconnect #8978

Merged
merged 1 commit into from
Mar 5, 2018
Merged

Conversation

jaswrks
Copy link
Contributor

@jaswrks jaswrks commented Mar 5, 2018

Fixes #8912

Changes proposed:

In the Jetpack Disconnect Dialog:

  • Use /::/g to replace all occurrences with /

Testing instructions:

  • Clear your browser cache.
  • Checkout this branch and run npm run build.
  • Connect a site that's at least two subdirectories deep; e.g., example.com/wp/personal
  • Then, from the Jetpack Dashboard, click 'Manage site connection' to disconnect it.
  • Observe; instead of :: you should see the correct / separators in the URL.

WIth the fix in this PR, all instances of :: are replaced with /

after

Before it was only replacing the first occurence of ::

before

Proposed changelog entry:

  • Dashboard: Fix :: separators (should be /) when disconnecting a site in a subdirectory.

- Use `/::/g` to replace all occurrences.

See: #8912
@jaswrks jaswrks requested a review from a team as a code owner March 5, 2018 16:38
@jaswrks jaswrks added [Status] Ready to Merge Go ahead, you can push that green button! [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. [Focus] FixTheFlows and removed [Status] Ready to Merge Go ahead, you can push that green button! labels Mar 5, 2018
@designsimply
Copy link

I tested on a site with WordPress installed two subdirectories deep running WordPress 4.9.4 and Jetpack c777b1f (fix/disconnect-site-url branch) by going to WP Admin > Jetpack > Connections and clicking "Manage site connection" and in my case the :: separator is still there for the 2nd occurrence:

screen shot 2018-03-05 at mon mar 5 12 28 21 pm
Seen at http://madefortesting.com/temp/subdir/wp-admin/admin.php?page=jetpack#/dashboard using Firefox 58.0.2 on macOS 10.13.3.

@jaswrks
Copy link
Contributor Author

jaswrks commented Mar 5, 2018

@designsimply Thanks for the review, I appreciate it :)

I'm sorry, I'm adding two additional steps to test this:

  • Clear your browser cache.
  • Checkout this branch and run npm run build before testing.

@designsimply
Copy link

Re-tested as discussed on Slack with the jetpack.zip provided (thank you 😊) and confirmed the separator for the 2nd subdirectory is now a / instead of ::.

screen shot 2018-03-05 at mon mar 5 2 28 24 pm
Seen at http://madefortesting.com/temp/subdir/wp-admin/admin.php?page=jetpack#/dashboard using Firefox 58.0.2 on macOS 10.13.3.

@beaulebens beaulebens self-requested a review March 5, 2018 22:22
@beaulebens beaulebens added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Mar 5, 2018
@gravityrail gravityrail merged commit c959e59 into master Mar 5, 2018
@gravityrail gravityrail deleted the fix/disconnect-site-url branch March 5, 2018 23:01
@oskosk oskosk added this to the 6.0 milestone Mar 9, 2018
oskosk added a commit that referenced this pull request Mar 16, 2018
dereksmart pushed a commit that referenced this pull request Mar 27, 2018
* Changelog 6.0: create base for changelog.

* Add #8938 to changelog

* Add #8962 to changelog

* Add #8974 to changelog

* Add #8975 to changelog

* Add #8978 to changelog

* Add #8867 to changelog

* Add #8937 to changelog

* Add #8961 to changelog

* Add #8855 to changelog

* Add #8944 to changelog

* Add #8973 to changelog

* Add #8977 to changelog

* Add #8979 to changelog

* Add #8980 to changelog

* Add #8982 to changelog

* Add #8983 to changelog

* Add #8984 to changelog

* Add #8986 to changelog

* Add #9005 to changelog

* Add #9010 to changelog

* Add #9012 to changelog

* Add #9021 to changelog

* Add #9022 to changelog

* Add #9056 to changelog

* Add #9061 to changelog

* Add #9079 to changelog

* Add #9080 to changelog

* Add #9088 to changelog

* Add #9096 to changelog

* Add #9097 to changelog

* Add #9100 to changelog

* Add #9107 to changelog

* Add #8969 to changelog

* Add #8993 to changelog

* Add #9003 to changelog

* Add #9031 to changelog

* Add #8945 to changelog

* Add #9052 to changelog

* Add #9058 to changelog

* Add #9066 to changelog

* Add #9076 to changelog

* Add #9053 to changelog

* Add #9108 to changelog

* Add #9135 to changelog

* Add #9148 to changelog

* Add #9125 to changelog

* Add #9137 to changelog

* Added testing instructions for 6.0.

* Added IS testing instructions, huge props to @tiagonoronha.

* Added #8498 to changelog.

* Added #8954 to changelog.

* Added #8985 to changelog.

* add #9027

* add #9112 to changelog

* add #9136 to changelog

* add #9102 to changelog

* add #9093 to changelog

* add #9062 to changelog

* add #9172 to changelog
@kraftbj kraftbj removed the [Status] Ready to Merge Go ahead, you can push that green button! label Oct 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Manage Connection dialog shows site slug incorrectly
7 participants