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.

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

lib-user: Refactor link urls for internal testing #6131

Merged
merged 3 commits into from
Jun 14, 2024
Merged

lib-user: Refactor link urls for internal testing #6131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdf3a12
Refactor link urls for internal testing
mcbouslog Jun 13, 2024
23aa06a
Merge branch 'master' into lib-user_links
mcbouslog Jun 14, 2024
26bd531
Add BASE_URL const to getHeaderItems
mcbouslog Jun 14, 2024
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
16 changes: 9 additions & 7 deletions packages/lib-user/src/components/GroupStats/helpers/getHeaderItems.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import {
HeaderToast
} from '@components/shared'

const BASE_URL = 'https://fe-root.preview.zooniverse.org'

async function handleLeaveGroup({
login,
membershipId
Expand All @@ -21,7 +23,7 @@ async function handleLeaveGroup({
const deleteMembershipResponse = await deletePanoptesMembership({ membershipId })
if (!deleteMembershipResponse.ok) return

window.location.href = `https://www.zooniverse.org/users/${login}`
window.location.href = '/'
}

function getHeaderItems({
Expand All @@ -46,14 +48,14 @@ function getHeaderItems({
label='Share Group'
message='Group Link Copied!'
primaryItem={true}
textToCopy={`https://www.zooniverse.org/groups/${group.id}`}
textToCopy={`${BASE_URL}/groups/${group.id}`}
/>
)
} else {
headerItems.PrimaryHeaderItem = (
<HeaderLink
href={`https://www.zooniverse.org/users/${authUser?.login}`}
label='back to profile'
href={`/users/${authUser?.login}/groups`}
label='all my groups'
primaryItem={true}
/>
)
Expand All @@ -74,7 +76,7 @@ function getHeaderItems({
icon={<Layer color='white' size='small' />}
label='Share Group'
message='Group Link Copied!'
textToCopy={`https://www.zooniverse.org/groups/${group.id}`}
textToCopy={`${BASE_URL}/groups/${group.id}`}
/>
)
}
Expand All @@ -86,14 +88,14 @@ function getHeaderItems({
icon={<Link color='white' size='small' />}
label='Copy Join Link'
message='Join Link Copied!'
textToCopy={`https://www.zooniverse.org/groups/${group.id}?join_token=${group.join_token}`}
textToCopy={`${BASE_URL}/groups/${group.id}?join_token=${group.join_token}`}
/>,
<HeaderToast
key='share-group-toast'
icon={<Layer color='white' size='small' />}
label='Share Group'
message='Group Link Copied!'
textToCopy={`https://www.zooniverse.org/groups/${group.id}`}
textToCopy={`${BASE_URL}/groups/${group.id}`}
/>,
<HeaderButton
key='manage-group-button'
Expand Down
8 changes: 4 additions & 4 deletions packages/lib-user/src/components/GroupStats/helpers/getHeaderItems.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('components > GroupStats > getHeaderItems', function () {
describe('with group member', function () {
it('should return a link to the user profile', function () {
const result = getHeaderItems({ authUser, group: privateAggOnly, membership: groupMember })
expect(result.PrimaryHeaderItem.props.label).to.equal('back to profile')
expect(result.PrimaryHeaderItem.props.label).to.equal('all my groups')
})

it('should return a leave group button', function () {
Expand All @@ -37,7 +37,7 @@ describe('components > GroupStats > getHeaderItems', function () {
describe('with group admin', function () {
it('should return a link to the user profile', function () {
const result = getHeaderItems({ authUser, group: privateAggOnly, membership: groupAdmin })
expect(result.PrimaryHeaderItem.props.label).to.equal('back to profile')
expect(result.PrimaryHeaderItem.props.label).to.equal('all my groups')
})

it('should return a copy join link toast', function () {
Expand Down Expand Up @@ -71,7 +71,7 @@ describe('components > GroupStats > getHeaderItems', function () {
describe('with group member', function () {
it('should return a link to the user profile', function () {
const result = getHeaderItems({ authUser, group: publicShowAll, membership: groupMember })
expect(result.PrimaryHeaderItem.props.label).to.equal('back to profile')
expect(result.PrimaryHeaderItem.props.label).to.equal('all my groups')
})

it('should return a leave group button', function () {
Expand All @@ -88,7 +88,7 @@ describe('components > GroupStats > getHeaderItems', function () {
describe('with group admin', function () {
it('should return a link to the user profile', function () {
const result = getHeaderItems({ authUser, group: publicShowAll, membership: groupAdmin })
expect(result.PrimaryHeaderItem.props.label).to.equal('back to profile')
expect(result.PrimaryHeaderItem.props.label).to.equal('all my groups')
})

it('should return a copy join link toast', function () {
Expand Down
6 changes: 2 additions & 4 deletions packages/lib-user/src/components/MyGroups/MyGroupsContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,13 @@ function MyGroupsContainer({
<Layout
primaryHeaderItem={
<HeaderLink
href={`https://www.zooniverse.org/users/${login}`}
label='back to profile'
href='/'
label='back'
primaryItem={true}
/>
}
>
<ContentBox
linkLabel='Learn more about Groups'
linkProps={{ href: '/groups' }}
title='My Groups'
pad={{ horizontal: '60px', vertical: '30px' }}
>
Expand Down
4 changes: 2 additions & 2 deletions packages/lib-user/src/components/UserStats/UserStats.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ function UserStats({
<Layout
primaryHeaderItem={
<HeaderLink
href={`https://www.zooniverse.org/users/${user?.login}`}
label='back to profile'
href='/'
label='back'
primaryItem={true}
/>
}
Expand Down
6 changes: 1 addition & 5 deletions packages/lib-user/src/components/shared/ContentBox/ContentBox.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ export const TopProjectsFull = {
export const TopProjectsFullWithFewerProjects = {
render: () => (
<ContentBox
linkLabel='See more'
linkProps={{ href: 'https://www.zooniverse.org/projects' }}
title='Top Projects'
>
<Box
Expand All @@ -103,8 +101,6 @@ export const TopProjectsFullWithFewerProjects = {
export const TopProjectsGrid = {
render: () => (
<ContentBox
linkLabel='See more'
linkProps={{ href: 'https://www.zooniverse.org/projects' }}
title='Top Projects'
width='625px'
>
Expand All @@ -123,7 +119,7 @@ export const TopContributors = {
render: () => (
<ContentBox
linkLabel='See all contributors and detailed stats'
linkProps={{ href: 'https://www.zooniverse.org/groups/12345/contributors' }}
linkProps={{ href: '/groups/12345/contributors' }}
title='Top Contributors'
width='625px'
>
Expand Down
4 changes: 2 additions & 2 deletions packages/lib-user/src/components/shared/HeaderToast/HeaderToast.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const CopyJoinLink = {
icon: <Link color='white' size='small' />,
label: 'Copy Join Link',
message: 'Join Link Copied!',
textToCopy: 'groups/1234?join_token=56789'
textToCopy: 'https://www.zooniverse.org/groups/1234?join_token=56789'
}
}

Expand All @@ -42,6 +42,6 @@ export const ShareGroup = {
icon: <Layer color='white' size='small' />,
label: 'Share Group',
message: 'Group Link Copied!',
textToCopy: 'zooniverse.org/groups/1234'
textToCopy: 'https://www.zooniverse.org/groups/1234'
}
}
2 changes: 0 additions & 2 deletions packages/lib-user/src/components/shared/TopProjects/TopProjects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ function TopProjects({

return (
<ContentBox
linkLabel='See more'
linkProps={{ href: 'https://www.zooniverse.org/projects' }}
title='Top Projects'
>
<Container>
Expand Down
4 changes: 3 additions & 1 deletion packages/lib-user/src/components/shared/TopProjects/TopProjects.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ describe('components > shared > TopProjects', function () {
expect(screen.getByText('Top Projects')).to.be.ok()
})

it('should show a "see more" link', function () {
// temporarily skipping until the new All Projects page is created
// once the All Projects page is created the "see more" to that page will be added and this test can be enabled
it.skip('should show a "see more" link', function () {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason this one is still getting skipped?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Great question! Eventually there'll be an All Projects page and the "see more" link will be added back and this test can be re-enabled. I've added a comment in the test code accordingly (should have done initially 🤦‍♂️ )

render(<DefaultStory />)

expect(screen.getByRole('link', { name: 'See more' })).to.be.ok()
Expand Down