Skip to content

fix: prevent keyword=undefined from appearing in navigation URLs #1814

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.

Sign up for GitHub

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

Open
DukeDeSouth wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent keyword=undefined from appearing in navigation URLs #1814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/pages/trees/[treeid].js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,9 +577,15 @@ export default function Tree({
entityType="Planting Organization"
buttonText="Meet the Organization"
cardImageSrc={organization?.logo_url || imagePlaceholder}
link={`/organizations/${
organization.id
}?keyword=${nextExtraKeyword}${isEmbed ? '&embed=true' : ''}`}
link={`/organizations/${organization.id}${
nextExtraKeyword
? `?keyword=${nextExtraKeyword}`
: ''
}${
isEmbed
? `${nextExtraKeyword ? '&' : '?'}embed=true`
: ''
}`}
/>
</Box>
)}
Expand All @@ -594,8 +600,14 @@ export default function Tree({
buttonText="Meet the Planter"
cardImageSrc={planter?.image_url || imagePlaceholder}
rotation={planter?.image_rotation}
link={`/planters/${planter.id}?keyword=${nextExtraKeyword}${
isEmbed ? '&embed=true' : ''
link={`/planters/${planter.id}${
nextExtraKeyword
? `?keyword=${nextExtraKeyword}`
: ''
}${
isEmbed
? `${nextExtraKeyword ? '&' : '?'}embed=true`
: ''
}`}
/>
</Box>
Expand Down
20 changes: 16 additions & 4 deletions src/pages/v2/captures/[captureid].js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,8 +579,14 @@ export default function Capture({
buttonText="Meet the Organization"
cardImageSrc={logo_url || imagePlaceholder}
// TODO: this wont work until organizationsV2 page is completed
link={`/stakeholder/stakeholders/${id}?keyword=${nextExtraKeyword}${
isEmbed ? '&embed=true' : ''
link={`/stakeholder/stakeholders/${id}${
nextExtraKeyword
? `?keyword=${nextExtraKeyword}`
: ''
}${
isEmbed
? `${nextExtraKeyword ? '&' : '?'}embed=true`
: ''
}`}
/>
</Box>
Expand All @@ -597,8 +603,14 @@ export default function Capture({
cardImageSrc={grower?.image_url || imagePlaceholder}
rotation={grower?.image_rotation}
// TODO: this wont work until growers page is completed
link={`/grower-accounts/${grower.id}?keyword=${nextExtraKeyword}${
isEmbed ? '&embed=true' : ''
link={`/grower-accounts/${grower.id}${
nextExtraKeyword
? `?keyword=${nextExtraKeyword}`
: ''
}${
isEmbed
? `${nextExtraKeyword ? '&' : '?'}embed=true`
: ''
}`}
/>
</Box>
Expand Down