-
Notifications
You must be signed in to change notification settings - Fork 0
feat: updated Official Feed badge to allow for community feeds #152
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
Open
Alessandro100
wants to merge
8
commits into
main
Choose a base branch
from
unofficial-feed-badge
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
feef272
updated Official Feed badge to allow for community feeds
Alessandro100 3192935
lint fix
Alessandro100 6b46f69
spelling change
Alessandro100 e475fdd
logic fix
Alessandro100 3e8f379
verified feed component is client
Alessandro100 5156bb6
tests for verified feed badge
Alessandro100 c1a2ce7
lint fix
Alessandro100 261abd4
wording change
Alessandro100 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| import React, { type JSX } from 'react'; | ||
| import { render, screen } from '@testing-library/react'; | ||
| import { ThemeProvider } from '@mui/material'; | ||
| import { theme } from '../Theme'; | ||
| import FeedVerificationChip from './FeedVerificationChip'; | ||
|
|
||
| // next-intl is globally mocked in setupTests.ts: useTranslations returns (key) => key | ||
|
|
||
| function wrapper({ children }: { children: React.ReactNode }): JSX.Element { | ||
| return <ThemeProvider theme={theme}>{children}</ThemeProvider>; | ||
| } | ||
|
|
||
| describe('FeedVerificationChip', () => { | ||
| describe('when status is undefined', () => { | ||
| it('renders nothing', () => { | ||
| const { container } = render(<FeedVerificationChip />, { wrapper }); | ||
| expect(container).toBeEmptyDOMElement(); | ||
| }); | ||
| }); | ||
|
|
||
| describe('when status is true (official feed)', () => { | ||
| it('renders the official chip with label in long display mode (default)', () => { | ||
| render(<FeedVerificationChip status={true} />, { wrapper }); | ||
| expect(screen.getByTestId('official-feed-chip')).toBeInTheDocument(); | ||
| expect(screen.getByText('officialFeed')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('renders the official icon in short display mode', () => { | ||
| render(<FeedVerificationChip status={true} isLongDisplay={false} />, { | ||
| wrapper, | ||
| }); | ||
| expect(screen.getByTestId('official-feed-icon')).toBeInTheDocument(); | ||
| expect( | ||
| screen.queryByTestId('official-feed-chip'), | ||
| ).not.toBeInTheDocument(); | ||
| }); | ||
| }); | ||
|
|
||
| describe('when status is false (community feed)', () => { | ||
| it('renders the community chip with label in long display mode (default)', () => { | ||
| render(<FeedVerificationChip status={false} />, { wrapper }); | ||
| expect(screen.getByTestId('community-feed-chip')).toBeInTheDocument(); | ||
| expect(screen.getByText('communityFeed')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('renders the community icon in short display mode', () => { | ||
| render(<FeedVerificationChip status={false} isLongDisplay={false} />, { | ||
| wrapper, | ||
| }); | ||
| expect(screen.getByTestId('community-feed-icon')).toBeInTheDocument(); | ||
| expect( | ||
| screen.queryByTestId('community-feed-chip'), | ||
| ).not.toBeInTheDocument(); | ||
| }); | ||
| }); | ||
|
|
||
| describe('long display mode (isLongDisplay=true)', () => { | ||
| it('renders official chip — not icon — for status=true', () => { | ||
| render(<FeedVerificationChip status={true} isLongDisplay={true} />, { | ||
| wrapper, | ||
| }); | ||
| expect(screen.getByTestId('official-feed-chip')).toBeInTheDocument(); | ||
| expect( | ||
| screen.queryByTestId('official-feed-icon'), | ||
| ).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('renders community chip — not icon — for status=false', () => { | ||
| render(<FeedVerificationChip status={false} isLongDisplay={true} />, { | ||
| wrapper, | ||
| }); | ||
| expect(screen.getByTestId('community-feed-chip')).toBeInTheDocument(); | ||
| expect( | ||
| screen.queryByTestId('community-feed-icon'), | ||
| ).not.toBeInTheDocument(); | ||
| }); | ||
| }); | ||
|
|
||
| describe('short display mode (isLongDisplay=false)', () => { | ||
| it('renders official icon — not chip — for status=true', () => { | ||
| render(<FeedVerificationChip status={true} isLongDisplay={false} />, { | ||
| wrapper, | ||
| }); | ||
| expect(screen.getByTestId('official-feed-icon')).toBeInTheDocument(); | ||
| expect( | ||
| screen.queryByTestId('official-feed-chip'), | ||
| ).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('renders community icon — not chip — for status=false', () => { | ||
| render(<FeedVerificationChip status={false} isLongDisplay={false} />, { | ||
| wrapper, | ||
| }); | ||
| expect(screen.getByTestId('community-feed-icon')).toBeInTheDocument(); | ||
| expect( | ||
| screen.queryByTestId('community-feed-chip'), | ||
| ).not.toBeInTheDocument(); | ||
| }); | ||
| }); | ||
| }); |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| 'use client'; | ||
| import { Chip, Tooltip } from '@mui/material'; | ||
| import { useTranslations } from 'next-intl'; | ||
| import VerifiedIcon from '@mui/icons-material/Verified'; | ||
| import GroupsIcon from '@mui/icons-material/Groups'; | ||
|
|
||
| interface FeedVerificationChipProps { | ||
| isLongDisplay?: boolean; | ||
| status?: boolean; | ||
| } | ||
|
|
||
| export default function FeedVerificationChip({ | ||
| isLongDisplay = true, | ||
| status, | ||
| }: FeedVerificationChipProps): React.ReactElement | null { | ||
| const t = useTranslations('feeds'); | ||
|
|
||
| if (status == undefined) { | ||
| return null; | ||
| } | ||
|
|
||
| if (!status) { | ||
| return isLongDisplay ? ( | ||
| <Tooltip title={t('communityFeedTooltip')} placement='top'> | ||
| <Chip | ||
| data-testid='community-feed-chip' | ||
| sx={{ opacity: 0.8 }} | ||
| icon={<GroupsIcon></GroupsIcon>} | ||
| label={t('communityFeed')} | ||
| variant='filled' | ||
| ></Chip> | ||
| </Tooltip> | ||
| ) : ( | ||
| <Tooltip title={t('communityFeedTooltipShort')} placement='top'> | ||
| <GroupsIcon | ||
| data-testid='community-feed-icon' | ||
| sx={(theme) => ({ | ||
| display: 'block', | ||
| ml: 0, | ||
| mr: 2, | ||
| opacity: 0.6, | ||
| backgroundColor: theme.vars.palette.grey[400], | ||
| color: theme.vars.palette.text.primary, | ||
| borderRadius: '50%', | ||
| padding: '0.2rem', | ||
| })} | ||
| ></GroupsIcon> | ||
| </Tooltip> | ||
| ); | ||
| } | ||
|
|
||
| return isLongDisplay ? ( | ||
| <Tooltip title={t('officialFeedTooltip')} placement='top'> | ||
| <Chip | ||
| data-testid='official-feed-chip' | ||
| sx={(theme) => ({ | ||
| background: `linear-gradient(25deg, ${theme.vars.palette.primary.light}, ${theme.vars.palette.primary.dark})`, | ||
| color: 'white', | ||
| })} | ||
| icon={<VerifiedIcon sx={{ fill: 'white' }}></VerifiedIcon>} | ||
| label={t('officialFeed')} | ||
| ></Chip> | ||
| </Tooltip> | ||
| ) : ( | ||
| <Tooltip title={t('officialFeedTooltipShort')} placement='top'> | ||
| <VerifiedIcon | ||
| data-testid='official-feed-icon' | ||
| sx={(theme) => ({ | ||
| display: 'block', | ||
| borderRadius: '50%', | ||
| padding: '0.1rem', | ||
| ml: 0, | ||
| mr: 2, | ||
| background: `linear-gradient(25deg, ${theme.vars.palette.primary.light}, ${theme.vars.palette.primary.dark})`, | ||
| color: 'white', | ||
| })} | ||
| ></VerifiedIcon> | ||
| </Tooltip> | ||
| ); | ||
| } | ||
This file was deleted.
Oops, something went wrong.
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
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
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
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
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.