ENH Allow URLs without trailing slashes #253
Merged
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
Closed
4 tasks
GuySartorelli
force-pushed
the
pulls/2/no-trailing-slashes
branch
2 times, most recently
from
1898a3e to
cb0a868
Compare
emteknetnz
requested changes
Jan 18, 2023
|
|
||
| // Set root breadcrumb | ||
| const breadcrumbs = [{ | ||
| text: i18n._t('CampaignAdmin.CAMPAIGN', 'Campaigns'), | ||
| href: url, | ||
| href: `/${reactRoutePath}`, |
There was a problem hiding this comment.
Can we always guarantee that reactRoutePath won't have a leading slash?
There was a problem hiding this comment.
Theoretically yes but realistically there's the remote chance someone will do something really weird lol. I'll apply joinUrlPaths to it as you recommended in another comment, that's a really elegant way to handle it that I hadn't considered
| @@ -119,7 +120,8 @@ class CampaignAdmin extends Component { | |||
| * @return {string} | |||
| */ | |||
| getActionRoute(id, view) { | |||
| return `/${this.props.sectionConfig.reactRoutePath}/set/${id}/${view}`; | |||
| const { reactRoutePath } = this.props.sectionConfig; | |||
| return joinUrlPaths(`/${reactRoutePath}`, `/set/${id}/${view}`); | |||
There was a problem hiding this comment.
This is possibly better done as
return joinUrlPaths('/', reactRoutePath, `/set/${id}/${view}`);
I'm not sure if reactRouthPath could have a leading slash or not
Same applies for all the other cases of /${reactRoutePath} in this PR
GuySartorelli
force-pushed
the
pulls/2/no-trailing-slashes
branch
from
cb0a868 to
4a9bf33
Compare
|
webpack-config changes are now included in this PR. |
GuySartorelli
force-pushed
the
pulls/2/no-trailing-slashes
branch
from
4a9bf33 to
f3b933b
Compare
GuySartorelli
force-pushed
the
pulls/2/no-trailing-slashes
branch
from
f3b933b to
a2a95ae
Compare
|
Rebased to resolve conflicts |
emteknetnz
approved these changes
Jan 20, 2023
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.
silverstripe/silverstripe-framework#10538 allows us to have a URLs which can be configured to have or omit trailing slashes. This PR updates the campaign-admin javascript to stop explicitly expecting one to be/not be there.
Note that this PR will need to be modified once silverstripe/webpack-config#57 has been merged and released in NPM.
Parent issue