diff --git a/react/e2e/feeds.spec.ts b/react/e2e/feeds.spec.ts new file mode 100644 index 000000000..6dab96364 --- /dev/null +++ b/react/e2e/feeds.spec.ts @@ -0,0 +1,77 @@ +import { expect, test, type Page } from '@playwright/test'; +import { FEED_TYPES, PAGE_SIZES, feedHandlers, feedStoryId, feedStoryTitle } from './fixtures/feeds'; +import { mockHnApi } from './support/mock-api'; + +const posts = (page: Page) => page.locator('ol > li.post'); + +test.describe('feeds', () => { + for (const feedType of FEED_TYPES) { + test(`${feedType}: renders the list and paginates /${feedType}/1 → 2 → 1`, async ({ page }) => { + await mockHnApi(page, feedHandlers); + await page.goto(`/${feedType}/1`); + + const feed = page.getByTestId('feed'); + await expect(feed).toHaveAttribute('data-feed-type', feedType); + await expect(posts(page)).toHaveCount(PAGE_SIZES[1]); + await expect(page.locator('ol')).toHaveAttribute('start', '1'); + await expect(posts(page).first().locator('a.title')).toHaveText(feedStoryTitle(feedType, 1, 0)); + await expect(page.locator('.job-header')).toHaveCount(feedType === 'jobs' ? 1 : 0); + await expect(page.getByRole('link', { name: '‹ Prev' })).toHaveCount(0); + + await page.getByRole('link', { name: 'More ›' }).click(); + await expect(page).toHaveURL(new RegExp(`/${feedType}/2$`)); + await expect(feed).toHaveAttribute('data-page', '2'); + await expect(posts(page)).toHaveCount(PAGE_SIZES[2]); + await expect(page.locator('ol')).toHaveAttribute('start', '31'); + await expect(posts(page).first().locator('a.title')).toHaveText(feedStoryTitle(feedType, 2, 0)); + await expect(page.getByRole('link', { name: 'More ›' })).toHaveCount(0); + + await page.getByRole('link', { name: '‹ Prev' }).click(); + await expect(page).toHaveURL(new RegExp(`/${feedType}/1$`)); + await expect(posts(page)).toHaveCount(PAGE_SIZES[1]); + await expect(posts(page).first().locator('a.title')).toHaveText(feedStoryTitle(feedType, 1, 0)); + await expect(page.getByRole('link', { name: '‹ Prev' })).toHaveCount(0); + }); + + test(`${feedType}: shows the error state when the API fails`, async ({ page }) => { + await mockHnApi(page, {}); + await page.goto(`/${feedType}/1`); + + await expect(page.getByRole('alert')).toContainText(`Could not load ${feedType} stories.`); + await expect(page.getByTestId('feed')).toHaveAttribute('data-feed-type', feedType); + await expect(posts(page)).toHaveCount(0); + }); + } + + test('jobs rows hide user, points and comments', async ({ page }) => { + await mockHnApi(page, feedHandlers); + await page.goto('/jobs/1'); + + const first = posts(page).first(); + await expect(first.locator('.subtext-laptop')).toHaveText('1 hours ago'); + await expect(first.locator('.subtext-laptop a')).toHaveCount(0); + await expect(page.locator('.job-header').getByRole('link', { name: 'Triplebyte' })).toBeVisible(); + }); + + test('clicking a comments link navigates to the item page', async ({ page }) => { + await mockHnApi(page, feedHandlers); + await page.goto('/news/1'); + + const id = feedStoryId('news', 1, 2); + const second = posts(page).nth(2); + await expect(second.locator('.subtext-laptop')).toContainText('52 points by'); + await second.locator('.subtext-laptop').getByRole('link', { name: '2 comments' }).click(); + + await expect(page).toHaveURL(new RegExp(`/item/${id}$`)); + await expect(page.getByTestId('item-details')).toHaveAttribute('data-item-id', String(id)); + }); + + test('internal (ask) titles link to the item page', async ({ page }) => { + await mockHnApi(page, feedHandlers); + await page.goto('/ask/1'); + + const id = feedStoryId('ask', 1, 0); + await posts(page).first().locator('a.title').click(); + await expect(page).toHaveURL(new RegExp(`/item/${id}$`)); + }); +}); diff --git a/react/e2e/fixtures/feeds.ts b/react/e2e/fixtures/feeds.ts new file mode 100644 index 000000000..ce521a1fe --- /dev/null +++ b/react/e2e/fixtures/feeds.ts @@ -0,0 +1,64 @@ +import type { ApiHandler } from '../support/mock-api'; + +export const FEED_TYPES = ['news', 'newest', 'show', 'ask', 'jobs'] as const; +export type FeedType = (typeof FEED_TYPES)[number]; + +/** Page 1 is full (30 items → "More" shown); page 2 is partial (→ no "More"). */ +export const PAGE_SIZES: Record = { 1: 30, 2: 7 }; + +const FEED_ID_BASE: Record = { news: 1000, newest: 2000, show: 3000, ask: 4000, jobs: 5000 }; + +export function feedStoryId(feedType: FeedType, page: number, index: number): number { + return FEED_ID_BASE[feedType] + (page - 1) * 30 + index + 1; +} + +export function feedStoryTitle(feedType: FeedType, page: number, index: number): string { + return `${feedType} story p${page} #${index + 1}`; +} + +export function makeFeedPage(feedType: FeedType, page: number) { + const isJob = feedType === 'jobs'; + const isAsk = feedType === 'ask'; + return Array.from({ length: PAGE_SIZES[page] ?? 0 }, (_, index) => { + const id = feedStoryId(feedType, page, index); + return { + id, + title: feedStoryTitle(feedType, page, index), + points: isJob ? null : 50 + index, + user: isJob ? null : `user${id}`, + time: 1_700_000_000 - id, + time_ago: `${index + 1} hours ago`, + comments_count: isJob ? 0 : index, + type: isJob ? 'job' : isAsk ? 'ask' : 'link', + url: isAsk ? `item?id=${id}` : `https://example.com/${feedType}/${id}`, + domain: isAsk ? undefined : 'example.com', + }; + }); +} + +export function makeItem(id: number) { + return { + id, + title: `Item ${id}`, + points: 10, + user: 'pg', + time: 1_700_000_000, + time_ago: '1 hour ago', + type: 'link', + url: `https://example.com/${id}`, + domain: 'example.com', + content: '', + comments: [], + comments_count: 0, + }; +} + +export const feedHandlers: Record = { + ...Object.fromEntries( + FEED_TYPES.map((feedType) => [ + `/${feedType}`, + (url: URL) => makeFeedPage(feedType, Number(url.searchParams.get('page') ?? '1')), + ]) + ), + '/item/': (url: URL) => makeItem(Number(url.pathname.split('/').pop())), +}; diff --git a/react/src/feeds/Feed.scss b/react/src/feeds/Feed.scss new file mode 100644 index 000000000..21daa1ddb --- /dev/null +++ b/react/src/feeds/Feed.scss @@ -0,0 +1,109 @@ +@use '../styles/media' as *; + +// Port of src/app/feeds/feed/feed.component.scss. Angular scoped these to the feed template only, +// so anchor rules target the feed's own links (job header, pagination) rather than story rows. +.feed.main-content { + position: relative; + width: 100%; + min-height: 100vh; + -webkit-transition: opacity 0.2s ease; + transition: opacity 0.2s ease; + box-sizing: border-box; + padding: 8px 0; + z-index: 0; + + .job-header a, + .nav a { + text-decoration: none; + font-weight: bold; + + &:hover { + text-decoration: underline; + } + } + + ol { + padding: 0 40px; + margin: 0; + + @media #{$mobile-only} { + box-sizing: border-box; + list-style: none; + padding: 0 10px; + } + + li { + position: relative; + -webkit-transition: background-color 0.2s ease; + transition: background-color 0.2s ease; + } + } + + .list-margin { + @media #{$mobile-only} { + margin-top: 55px; + } + } + + .post { + padding: 10px 0 10px 5px; + transition: background-color 0.2s ease; + border-bottom: 1px solid #cececb; + + .itemNum { + color: #696969; + position: absolute; + width: 30px; + text-align: right; + left: 0; + top: 4px; + } + } + + .item-block { + display: block; + } + + .nav { + padding: 10px 40px; + margin-top: 10px; + font-size: 17px; + + a { + @media #{$mobile-only} { + text-decoration: none; + } + } + + @media #{$mobile-only} { + margin: 20px 0; + text-align: center; + padding: 10px 80px; + height: 20px; + } + + .prev { + padding-right: 20px; + + @media #{$mobile-only} { + float: left; + padding-right: 0; + } + } + + .more { + @media #{$mobile-only} { + float: right; + } + } + } + + .job-header { + font-size: 15px; + padding: 0 40px 10px; + + @media #{$mobile-only} { + padding: 60px 15px 25px 15px; + } + } +} diff --git a/react/src/feeds/Feed.test.tsx b/react/src/feeds/Feed.test.tsx new file mode 100644 index 000000000..2a6104685 --- /dev/null +++ b/react/src/feeds/Feed.test.tsx @@ -0,0 +1,227 @@ +import { act, screen, waitFor, within } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; +import { Route, Routes } from 'react-router-dom'; +import { vi, type Mock } from 'vitest'; +import type { FeedName, Story } from '../shared/models'; +import { fetchFeed } from '../shared/services/hackernewsApi'; +import { makeStories } from '../test/feedStories'; +import { renderWithProviders } from '../test/renderWithProviders'; +import Feed from './Feed'; + +vi.mock('../shared/services/hackernewsApi'); + +const fetchFeedMock = fetchFeed as Mock; + +interface Deferred { + resolve: (stories: Story[]) => void; + reject: (error: unknown) => void; +} + +function deferFeed(): Deferred { + const deferred = {} as Deferred; + fetchFeedMock.mockImplementationOnce( + () => + new Promise((resolve, reject) => { + deferred.resolve = resolve; + deferred.reject = reject; + }) + ); + return deferred; +} + +function renderFeed(feedType: FeedName = 'news', route = `/${feedType}/1`) { + return renderWithProviders( + + } /> + } /> + , + { route } + ); +} + +const feedRoot = () => screen.getByTestId('feed'); +const posts = () => document.querySelectorAll('ol > li.post'); +const signalOfCall = (index: number) => fetchFeedMock.mock.calls[index][2]!; + +describe('Feed', () => { + let scrollTo: Mock; + + beforeEach(() => { + scrollTo = vi.fn(); + vi.stubGlobal('scrollTo', scrollTo); + }); + + afterEach(() => { + vi.unstubAllGlobals(); + }); + + it('shows the loader, then the list of stories', async () => { + const request = deferFeed(); + renderFeed('news', '/news/1'); + + expect(screen.getByRole('status')).toHaveTextContent('Loading...'); + expect(feedRoot()).toHaveAttribute('data-feed-type', 'news'); + expect(feedRoot()).toHaveAttribute('data-page', '1'); + expect(fetchFeedMock).toHaveBeenCalledWith('news', 1, expect.any(AbortSignal)); + expect(scrollTo).not.toHaveBeenCalled(); + + await act(async () => request.resolve(makeStories(3))); + + expect(screen.queryByRole('status')).not.toBeInTheDocument(); + expect(posts()).toHaveLength(3); + expect(posts()[0].querySelector('.feed-item')).toHaveTextContent('Story 1'); + expect(screen.getByRole('link', { name: 'Story 2' })).toHaveAttribute('href', 'https://example.com/2'); + expect(scrollTo).toHaveBeenCalledWith(0, 0); + expect(feedRoot()).toHaveClass('main-content'); + }); + + it('shows the error message when the feed fails to load', async () => { + fetchFeedMock.mockRejectedValueOnce(new Error('boom')); + renderFeed('show', '/show/1'); + + expect(await screen.findByRole('alert')).toHaveTextContent('Could not load show stories.'); + expect(screen.queryByRole('status')).not.toBeInTheDocument(); + expect(document.querySelector('ol')).toBeNull(); + expect(feedRoot()).toHaveAttribute('data-feed-type', 'show'); + expect(scrollTo).not.toHaveBeenCalled(); + }); + + it('defaults to page 1 when there is no page param', async () => { + fetchFeedMock.mockResolvedValueOnce(makeStories(2)); + renderFeed('newest', '/newest'); + + await waitFor(() => expect(posts()).toHaveLength(2)); + expect(fetchFeedMock).toHaveBeenCalledWith('newest', 1, expect.any(AbortSignal)); + expect(document.querySelector('ol')).toHaveAttribute('start', '1'); + }); + + it('falls back to page 1 for a non-numeric page param', async () => { + fetchFeedMock.mockResolvedValueOnce(makeStories(2)); + renderFeed('news', '/news/abc'); + + await waitFor(() => expect(posts()).toHaveLength(2)); + expect(fetchFeedMock).toHaveBeenCalledWith('news', 1, expect.any(AbortSignal)); + }); + + it('numbers the list from the page offset', async () => { + fetchFeedMock.mockResolvedValueOnce(makeStories(30, 61)); + renderFeed('news', '/news/3'); + + await waitFor(() => expect(posts()).toHaveLength(30)); + expect(fetchFeedMock).toHaveBeenCalledWith('news', 3, expect.any(AbortSignal)); + expect(document.querySelector('ol')).toHaveAttribute('start', '61'); + }); + + it('on page 1 with 30 items shows More but not Prev', async () => { + fetchFeedMock.mockResolvedValueOnce(makeStories(30)); + renderFeed('news', '/news/1'); + + const more = await screen.findByRole('link', { name: 'More ›' }); + expect(more).toHaveAttribute('href', '/news/2'); + expect(more).toHaveClass('more'); + expect(screen.queryByRole('link', { name: '‹ Prev' })).not.toBeInTheDocument(); + }); + + it('on page 2 with fewer than 30 items shows Prev but not More', async () => { + fetchFeedMock.mockResolvedValueOnce(makeStories(12, 31)); + renderFeed('ask', '/ask/2'); + + const prev = await screen.findByRole('link', { name: '‹ Prev' }); + expect(prev).toHaveAttribute('href', '/ask/1'); + expect(prev).toHaveClass('prev'); + expect(screen.queryByRole('link', { name: 'More ›' })).not.toBeInTheDocument(); + }); + + it('on page 2 with 30 items shows both links', async () => { + fetchFeedMock.mockResolvedValueOnce(makeStories(30, 31)); + renderFeed('newest', '/newest/2'); + + const nav = (await screen.findByRole('link', { name: 'More ›' })).closest('.nav') as HTMLElement; + expect(within(nav).getByRole('link', { name: '‹ Prev' })).toHaveAttribute('href', '/newest/1'); + expect(within(nav).getByRole('link', { name: 'More ›' })).toHaveAttribute('href', '/newest/3'); + }); + + it('on page 1 with fewer than 30 items shows no pagination', async () => { + fetchFeedMock.mockResolvedValueOnce(makeStories(5)); + renderFeed('news', '/news/1'); + + await waitFor(() => expect(posts()).toHaveLength(5)); + expect(document.querySelector('.nav')).toBeEmptyDOMElement(); + }); + + it('renders the jobs header without list margin only for jobs', async () => { + fetchFeedMock.mockResolvedValueOnce(makeStories(2, 1, { type: 'job' })); + renderFeed('jobs', '/jobs/1'); + + const header = await screen.findByText(/These are jobs at startups that were funded by Y Combinator/); + expect(header).toHaveClass('job-header'); + expect(within(header).getByRole('link', { name: 'Triplebyte' })).toHaveAttribute( + 'href', + 'https://triplebyte.com/?ref=yc_jobs' + ); + expect(document.querySelector('ol')).not.toHaveClass('list-margin'); + }); + + it.each(['news', 'newest', 'show', 'ask'] as const)('omits the jobs header for %s', async (feedType) => { + fetchFeedMock.mockResolvedValueOnce(makeStories(2)); + renderFeed(feedType); + + await waitFor(() => expect(posts()).toHaveLength(2)); + expect(document.querySelector('.job-header')).toBeNull(); + expect(document.querySelector('ol')).toHaveClass('list-margin'); + }); + + it('refetches on page change and aborts the previous request', async () => { + fetchFeedMock.mockResolvedValueOnce(makeStories(30)); + renderFeed('news', '/news/1'); + + const page2 = deferFeed(); + await userEvent.click(await screen.findByRole('link', { name: 'More ›' })); + + expect(screen.getByTestId('location')).toHaveTextContent('/news/2'); + expect(feedRoot()).toHaveAttribute('data-page', '2'); + expect(fetchFeedMock).toHaveBeenLastCalledWith('news', 2, expect.any(AbortSignal)); + expect(signalOfCall(0).aborted).toBe(true); + expect(signalOfCall(1).aborted).toBe(false); + expect(screen.getByRole('status')).toBeInTheDocument(); + + await act(async () => page2.resolve(makeStories(4, 31))); + expect(posts()).toHaveLength(4); + expect(document.querySelector('ol')).toHaveAttribute('start', '31'); + expect(scrollTo).toHaveBeenCalledTimes(2); + + fetchFeedMock.mockResolvedValueOnce(makeStories(30)); + await userEvent.click(screen.getByRole('link', { name: '‹ Prev' })); + expect(screen.getByTestId('location')).toHaveTextContent('/news/1'); + await waitFor(() => expect(posts()).toHaveLength(30)); + expect(signalOfCall(1).aborted).toBe(true); + }); + + it('aborts the request on unmount and ignores the AbortError', async () => { + const request = deferFeed(); + const { unmount } = renderFeed('news', '/news/1'); + const signal = signalOfCall(0); + + unmount(); + expect(signal.aborted).toBe(true); + await act(async () => request.reject(new DOMException('The operation was aborted.', 'AbortError'))); + expect(scrollTo).not.toHaveBeenCalled(); + }); + + it('does not show an error for an AbortError even if the signal was not aborted', async () => { + fetchFeedMock.mockRejectedValueOnce(new DOMException('The operation was aborted.', 'AbortError')); + renderFeed('news', '/news/1'); + + await act(async () => {}); + expect(screen.queryByRole('alert')).not.toBeInTheDocument(); + expect(screen.getByRole('status')).toBeInTheDocument(); + }); + + it('does not apply a response that resolves after unmount', async () => { + const request = deferFeed(); + const { unmount } = renderFeed('news', '/news/1'); + unmount(); + await act(async () => request.resolve(makeStories(3))); + expect(scrollTo).not.toHaveBeenCalled(); + }); +}); diff --git a/react/src/feeds/Feed.tsx b/react/src/feeds/Feed.tsx index de6f875ef..858496fbf 100644 --- a/react/src/feeds/Feed.tsx +++ b/react/src/feeds/Feed.tsx @@ -1,18 +1,86 @@ -import { useParams } from 'react-router-dom'; -import type { FeedName } from '../shared/models/feed-type'; +import { useEffect, useState } from 'react'; +import { Link, useParams } from 'react-router-dom'; +import { ErrorMessage } from '../shared/components/ErrorMessage/ErrorMessage'; +import { Loader } from '../shared/components/Loader/Loader'; +import type { FeedName, Story } from '../shared/models'; +import { fetchFeed } from '../shared/services/hackernewsApi'; +import { FeedItem } from './FeedItem'; +import './Feed.scss'; + +export const ITEMS_PER_PAGE = 30; export interface FeedProps { feedType: FeedName; } -// Placeholder route target; the feed list is implemented in migration phase 3. +function isAbortError(error: unknown): boolean { + return error instanceof DOMException && error.name === 'AbortError'; +} + +/** Port of Angular's FeedComponent (src/app/feeds/feed). */ export default function Feed({ feedType }: FeedProps) { const { page = '1' } = useParams(); + const pageNum = Number(page) || 1; + const [items, setItems] = useState(null); + const [errorMessage, setErrorMessage] = useState(''); + + useEffect(() => { + const controller = new AbortController(); + setItems(null); + setErrorMessage(''); + fetchFeed(feedType, pageNum, controller.signal).then( + (stories) => { + if (controller.signal.aborted) { + return; + } + setItems(stories); + window.scrollTo(0, 0); + }, + (error: unknown) => { + if (!controller.signal.aborted && !isAbortError(error)) { + setErrorMessage(`Could not load ${feedType} stories.`); + } + } + ); + return () => controller.abort(); + }, [feedType, pageNum]); + + const listStart = (pageNum - 1) * ITEMS_PER_PAGE + 1; + return ( -
-

- {feedType} — page {page} -

+
+ {!items && !errorMessage && } + {!items && errorMessage && } + + {items && ( +
+ {feedType === 'jobs' && ( +

+ These are jobs at startups that were funded by Y Combinator. You can also get a job at a YC + startup through Triplebyte. +

+ )} +
    + {items.map((item) => ( +
  1. + +
  2. + ))} +
+
+ {pageNum > 1 && ( + + ‹ Prev + + )} + {items.length === ITEMS_PER_PAGE && ( + + More › + + )} +
+
+ )}
); } diff --git a/react/src/feeds/FeedItem.scss b/react/src/feeds/FeedItem.scss new file mode 100644 index 000000000..f828e4622 --- /dev/null +++ b/react/src/feeds/FeedItem.scss @@ -0,0 +1,72 @@ +@use '../styles/media' as *; + +// Port of src/app/feeds/item/item.component.scss, nested under the component root. +.feed-item { + p { + margin: 2px 0; + + @media #{$mobile-only} { + margin-bottom: 5px; + margin-top: 0; + } + } + + a { + cursor: pointer; + text-decoration: none; + } + + .title { + font-size: 16px; + font-family: Verdana, Geneva, sans-serif; + } + + .subtext-laptop { + font-size: 12px; + font-weight: bold; + letter-spacing: 0.5px; + + a { + &:hover { + text-decoration: underline; + } + } + + @media #{$mobile-only} { + display: none; + } + } + + .subtext-palm { + font-size: 13px; + font-weight: bold; + letter-spacing: 0.5px; + + a { + &:hover { + text-decoration: underline; + } + } + + .details { + margin-top: 5px; + + .right { + float: right; + } + } + + @media #{$laptop-only} { + display: none; + } + } + + .domain { + color: #696969; + letter-spacing: 0.5px; + } + + .item-details { + padding: 10px; + } +} diff --git a/react/src/feeds/FeedItem.test.tsx b/react/src/feeds/FeedItem.test.tsx new file mode 100644 index 000000000..4cc1b2ff3 --- /dev/null +++ b/react/src/feeds/FeedItem.test.tsx @@ -0,0 +1,114 @@ +import { screen, within } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; +import { Route, Routes } from 'react-router-dom'; +import { makeStory } from '../test/feedStories'; +import { renderWithProviders } from '../test/renderWithProviders'; +import type { Story } from '../shared/models'; +import { FeedItem } from './FeedItem'; + +function renderItem(item: Story) { + const result = renderWithProviders( + + } /> + + ); + const root = result.container.querySelector('.feed-item')!; + return { + ...result, + root, + title: root.querySelector('a.title')!, + palm: root.querySelector('.subtext-palm')!, + laptop: root.querySelector('.subtext-laptop')!, + }; +} + +describe('FeedItem', () => { + it('renders an external story link with its domain', () => { + const { title, root } = renderItem(makeStory(7, { url: 'https://example.com/a', domain: 'example.com' })); + expect(title).toHaveTextContent('Story 7'); + expect(title).toHaveAttribute('href', 'https://example.com/a'); + expect(title).not.toHaveAttribute('target'); + expect(title).not.toHaveAttribute('rel'); + expect(root.querySelector('.domain')).toHaveTextContent('(example.com)'); + expect(root.querySelector('p')).toHaveTextContent('Story 7 (example.com)'); + }); + + it('omits the domain span when the API gives none', () => { + const { root } = renderItem(makeStory(7, { domain: undefined })); + expect(root.querySelector('.domain')).toBeNull(); + }); + + it.each([ + ['relative', 'item?id=8'], + ['missing', undefined], + ])('links the title to the item page when the url is %s', async (_label, url) => { + const { title } = renderItem(makeStory(8, { url, domain: undefined, type: 'ask' })); + expect(title).toHaveAttribute('href', '/item/8'); + await userEvent.click(title); + expect(screen.getByTestId('location')).toHaveTextContent('/item/8'); + }); + + it('renders mobile and laptop subtext with user, points, time and comment links', () => { + const { palm, laptop } = renderItem(makeStory(3, { points: 42, user: 'pg', comments_count: 5 })); + + expect(within(palm).getByRole('link', { name: 'pg' })).toHaveAttribute('href', '/user/pg'); + expect(palm.querySelector('.right')).toHaveTextContent('42 ★'); + expect(palm).toHaveTextContent('3 hours ago'); + const palmComments = palm.querySelector('a.comment-number')!; + expect(palmComments).toHaveAttribute('href', '/item/3'); + expect(palmComments).toHaveTextContent('• 5 comments'); + + expect(laptop).toHaveTextContent('42 points by pg 3 hours ago | 5 comments'); + expect(within(laptop).getByRole('link', { name: 'pg' })).toHaveAttribute('href', '/user/pg'); + expect(within(laptop).getByRole('link', { name: '5 comments' })).toHaveAttribute('href', '/item/3'); + expect(laptop.querySelector('.item-details')).not.toBeNull(); + }); + + it.each([ + [1, '1 comment'], + [0, 'discuss'], + [undefined, 'discuss'], + ])('formats %s comments as "%s"', (count, label) => { + const { laptop } = renderItem(makeStory(3, { comments_count: count })); + expect(within(laptop).getByRole('link', { name: label })).toBeInTheDocument(); + }); + + it('hides user, points and comments for jobs', () => { + const { palm, laptop } = renderItem( + makeStory(9, { type: 'job', title: 'Acme is hiring', time_ago: '1 day ago', points: 0 }) + ); + expect(within(palm).queryAllByRole('link')).toHaveLength(0); + expect(palm.querySelector('.right')).toBeNull(); + expect(palm).toHaveTextContent(/^1 day ago$/); + expect(within(laptop).queryAllByRole('link')).toHaveLength(0); + expect(laptop).toHaveTextContent(/^1 day ago$/); + expect(laptop.querySelector('.item-details')).toBeNull(); + }); + + it('applies list spacing and title font size from settings', () => { + localStorage.setItem('titleFontSize', '20'); + localStorage.setItem('listSpacing', '12'); + const { root, title } = renderItem(makeStory(1)); + expect(root).toHaveStyle({ marginBottom: '12px' }); + expect(title).toHaveStyle({ fontSize: '20px' }); + }); + + it('uses default spacing and font size', () => { + const { root, title } = renderItem(makeStory(1, { url: 'item?id=1' })); + expect(root.style.marginBottom).toBe('0px'); + expect(title.style.fontSize).toBe('16px'); + }); + + it('opens external links in a new tab when the setting is on', () => { + localStorage.setItem('openLinkInNewTab', 'true'); + const { title } = renderItem(makeStory(1)); + expect(title).toHaveAttribute('target', '_blank'); + expect(title).toHaveAttribute('rel', 'noopener'); + }); + + it('never adds target to internal title links', () => { + localStorage.setItem('openLinkInNewTab', 'true'); + const { title } = renderItem(makeStory(1, { url: 'item?id=1' })); + expect(title).not.toHaveAttribute('target'); + }); +}); diff --git a/react/src/feeds/FeedItem.tsx b/react/src/feeds/FeedItem.tsx new file mode 100644 index 000000000..601588021 --- /dev/null +++ b/react/src/feeds/FeedItem.tsx @@ -0,0 +1,85 @@ +import { Link } from 'react-router-dom'; +import type { Story } from '../shared/models'; +import { useSettings } from '../shared/services/useSettings'; +import { formatCommentCount } from '../shared/utils/comment'; +import './FeedItem.scss'; + +export interface FeedItemProps { + item: Story; +} + +/** Port of Angular's ItemComponent (src/app/feeds/item): one story row in a feed. */ +export function FeedItem({ item }: FeedItemProps) { + const { settings } = useSettings(); + const hasUrl = item.url?.startsWith('http') ?? false; + const isJob = item.type === 'job'; + const titleStyle = { fontSize: `${settings.titleFontSize}px` }; + const itemLink = `/item/${item.id}`; + const userLink = `/user/${item.user}`; + const commentCount = formatCommentCount(item.comments_count ?? 0); + + return ( +
+ {hasUrl ? ( +

+ + {item.title} + + {item.domain && ( + <> + {' '} + ({item.domain}) + + )} +

+ ) : ( +

+ + {item.title} + +

+ )} +
+ {!isJob && ( +
+ + {item.user} + + {item.points} ★ +
+ )} +
+ {item.time_ago} + {!isJob && ( + + {' '} + • {commentCount} + + )} +
+
+
+ {!isJob && ( + + {item.points} points by {item.user}{' '} + + )} + + {item.time_ago} + {!isJob && ( + + {' | '} + {commentCount} + + )} + +
+
+ ); +} diff --git a/react/src/test/feedStories.ts b/react/src/test/feedStories.ts new file mode 100644 index 000000000..5d2df2153 --- /dev/null +++ b/react/src/test/feedStories.ts @@ -0,0 +1,21 @@ +import type { Story } from '../shared/models'; + +export function makeStory(id: number, overrides: Partial = {}): Story { + return { + id, + title: `Story ${id}`, + points: 100 + id, + user: `user${id}`, + time: 1_700_000_000 + id, + time_ago: '3 hours ago', + type: 'link', + url: `https://example.com/${id}`, + domain: 'example.com', + comments_count: id, + ...overrides, + }; +} + +export function makeStories(count: number, firstId = 1, overrides: Partial = {}): Story[] { + return Array.from({ length: count }, (_, i) => makeStory(firstId + i, overrides)); +}