fix: test URL equivalency before replacing iframe location to avoid reloads #46
Conversation
This file contains hidden or 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
|
amcgee
approved these changes
Apr 14, 2025
Comment on lines
+110
to
+124
| // Copy before mutating | ||
| const [currentUrl, newUrl] = [new URL(currentUrlOrig), new URL(newUrlOrig)] | ||
| newUrl.searchParams.sort() | ||
| // If redirect is not already false in the search set that | ||
| currentUrl.searchParams.set('redirect', 'false') | ||
| currentUrl.searchParams.sort() | ||
| // If pathname doesn't end in html, add that | ||
| if (currentUrl.pathname.endsWith('/')) { | ||
| currentUrl.pathname = currentUrl.pathname + 'index.html' | ||
| } | ||
|
|
||
| const [newBase] = newUrl.href.split('#') | ||
| const [currentBase] = currentUrl.href.split('#') | ||
|
|
||
| return newBase === currentBase |
Member
There was a problem hiding this comment.
I think this might be more restrictive than it needs to be - we could probably just check for any sub-path of the base url - but I tested this and it works well!
dhis2-bot
added a commit
that referenced
this pull request
Apr 14, 2025
## [1.7.6](v1.7.5...v1.7.6) (2025-04-14) ### Bug Fixes * test URL equivalency before replacing iframe location to avoid reloads ([#46](#46)) ([eef989d](eef989d))
Contributor
|
🎉 This PR is included in version 1.7.6 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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.
DHIS2-19412
If an app is using its app root
/as base for hash routing, before this fix, new navigations in the app will trigger an update topluginHref, which can then set the app's URL to/index.html?redirect=false, which can cause a whole-app reload, since it's a different path than before. This change checks for equivalent base paths, and if they are equivalent, only updates the iframe location's hash, if it has changedTested with a build of the new maintenance app from this PR: dhis2/maintenance-app-beta#541
equiv-test-routing.mov
Also tested these scenarios: