From 00e232f0de4d2051f9d8c92d74c4f0a24b6ec876 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Thu, 19 Nov 2026 07:14:43 +1100 Subject: [PATCH] fix(PM-6776): show all challenge prizes with grouped placement ranges --- .../src/assets/detail-prize-medal-3.svg | 7 + .../src/assets/prize-medal-disc.svg | 3 + .../src/assets/prize-medal-ribbon.svg | 3 + .../src/assets/prize-range-separator.svg | 3 + .../ChallengeDetailHeader.module.scss | 72 ++++++++-- .../components/ChallengeDetailHeader.spec.tsx | 108 ++++++++++++++- .../src/components/ChallengeDetailHeader.tsx | 131 ++++++++++++------ src/libs/ui/lib/styles/2026/index.scss | 2 +- 8 files changed, 273 insertions(+), 56 deletions(-) create mode 100644 src/apps/opportunities/src/assets/detail-prize-medal-3.svg create mode 100644 src/apps/opportunities/src/assets/prize-medal-disc.svg create mode 100644 src/apps/opportunities/src/assets/prize-medal-ribbon.svg create mode 100644 src/apps/opportunities/src/assets/prize-range-separator.svg diff --git a/src/apps/opportunities/src/assets/detail-prize-medal-3.svg b/src/apps/opportunities/src/assets/detail-prize-medal-3.svg new file mode 100644 index 000000000..66454ca64 --- /dev/null +++ b/src/apps/opportunities/src/assets/detail-prize-medal-3.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/apps/opportunities/src/assets/prize-medal-disc.svg b/src/apps/opportunities/src/assets/prize-medal-disc.svg new file mode 100644 index 000000000..b517c4566 --- /dev/null +++ b/src/apps/opportunities/src/assets/prize-medal-disc.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/apps/opportunities/src/assets/prize-medal-ribbon.svg b/src/apps/opportunities/src/assets/prize-medal-ribbon.svg new file mode 100644 index 000000000..c5a89fe77 --- /dev/null +++ b/src/apps/opportunities/src/assets/prize-medal-ribbon.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/apps/opportunities/src/assets/prize-range-separator.svg b/src/apps/opportunities/src/assets/prize-range-separator.svg new file mode 100644 index 000000000..5409f742b --- /dev/null +++ b/src/apps/opportunities/src/assets/prize-range-separator.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/apps/opportunities/src/components/ChallengeDetailHeader.module.scss b/src/apps/opportunities/src/components/ChallengeDetailHeader.module.scss index 4e382da66..2f6dd03fa 100644 --- a/src/apps/opportunities/src/components/ChallengeDetailHeader.module.scss +++ b/src/apps/opportunities/src/components/ChallengeDetailHeader.module.scss @@ -300,6 +300,15 @@ } } +.manyPrizeCard { + gap: 16px; + min-height: 256px; +} + +.expandedPrizeCard { + gap: 40px; +} + .prizeFrame { align-items: center; display: flex; @@ -337,9 +346,7 @@ img { flex: 0 0 auto; - height: 20px; object-fit: contain; - width: 20px; } } @@ -378,28 +385,71 @@ } .denseFeaturedPrizes { - gap: 8px 16px; + gap: 4px 20px; } .densePrize { font-size: 22px !important; + line-height: 26px !important; min-width: 0; } .additionalPrizes { flex-wrap: wrap; - gap: 4px 12px; + gap: 4px 24px; } .secondaryPrize { - &, - img { - height: 16px !important; - } + font-size: 16px !important; +} - & { - font-size: 16px !important; - } +.medal { + align-items: center; + display: inline-flex; + flex: 0 0 16px; + height: 16px; + justify-content: center; + width: 16px; +} + +.featuredMedal { + flex-basis: 20px; + height: 20px; + width: 20px; +} + +.numberedMedal { + height: 16px; + position: relative; + width: 16px; +} + +.medalRibbon { + left: 4px; + position: absolute; + top: 10.318px; +} + +.medalDisc { + left: 2.4px; + position: absolute; + top: .8px; +} + +.medalNumber { + color: #161616; + font-size: 8px; + font-weight: 900; + left: 0; + line-height: normal; + position: absolute; + text-align: center; + top: 1.19px; + width: 16px; +} + +.prizeRangeSeparator { + align-self: center; } .checkpointAward { diff --git a/src/apps/opportunities/src/components/ChallengeDetailHeader.spec.tsx b/src/apps/opportunities/src/components/ChallengeDetailHeader.spec.tsx index fc6e1747b..75ad5ef2d 100644 --- a/src/apps/opportunities/src/components/ChallengeDetailHeader.spec.tsx +++ b/src/apps/opportunities/src/components/ChallengeDetailHeader.spec.tsx @@ -5,7 +5,7 @@ import '@testing-library/jest-dom' import { fireEvent, render, RenderResult, screen, within } from '@testing-library/react' import { MemoryRouter } from 'react-router-dom' -import { ChallengeOpportunity } from '../models' +import { ChallengeOpportunity, ChallengePrize } from '../models' import { ChallengeDetailHeader } from './ChallengeDetailHeader' @@ -1145,3 +1145,109 @@ describe('ChallengeDetailHeader actions and presentation', () => { .toBeInTheDocument() }) }) + +describe('ChallengeDetailHeader placement prizes beyond tenth place', () => { + function renderPrizes(prizes: ChallengePrize[]): void { + render( + + + , + ) + } + + it.each(['POINT', 'USD'])('renders all eighteen distinct %s prizes with their placements', type => { + renderPrizes(Array.from({ length: 18 }, (_, index) => ({ type, value: 1800 - index * 50 }))) + + for (let placement = 1; placement <= 18; placement += 1) { + const medal = screen.getByRole('img', { name: `${placement} place` }) + const amount = (1850 - placement * 50).toLocaleString('en-US') + expect(medal.closest('strong')) + .toHaveTextContent(type === 'USD' ? `$${amount}` : `${amount} pts`) + } + + expect(screen.getByRole('group', { name: 'Additional placement prizes' }).children) + .toHaveLength(15) + expect(screen.getByText('Prizes') + .closest('aside')) + .toHaveClass('expandedPrizeCard') + expect(screen.getByRole('button', { name: 'Submit a solution' })) + .toBeEnabled() + }) + + it('renders the Figma fourth-through-eighteenth range while keeping podium prizes separate', () => { + renderPrizes(Array.from({ length: 18 }, (_, index) => ({ + type: 'POINT', + value: [5000, 4000, 3000][index] ?? 1000, + }))) + + const additional = screen.getByRole('group', { name: 'Additional placement prizes' }) + expect(additional.children) + .toHaveLength(1) + expect(within(additional) + .getByText('1,000 pts')) + .toContainElement(screen.getByRole('img', { name: '4 place' })) + expect(within(additional) + .getByText('1,000 pts')) + .toContainElement(screen.getByRole('img', { name: '18 place' })) + expect(within(additional) + .getByRole('img', { name: 'through' })) + .toBeInTheDocument() + expect(screen.queryByRole('img', { name: '5 place' })).not.toBeInTheDocument() + expect(screen.getByText('Prizes') + .closest('aside')).not.toHaveClass('expandedPrizeCard') + }) + + it('keeps the top three medals separate even when all rewards match, without imposing another prize limit', () => { + renderPrizes(Array.from({ length: 25 }, () => ({ type: 'USD', value: 100 }))) + + expect(screen.getAllByText('$100')) + .toHaveLength(4) + for (const placement of [1, 2, 3, 4, 25]) { + expect(screen.getByRole('img', { name: `${placement} place` })) + .toBeInTheDocument() + } + }) + + it('never groups across missing placements, different reward types, or intervening amounts', () => { + renderPrizes([ + { value: 500 }, { value: 400 }, { value: 300 }, + { type: 'USD', value: 100 }, { type: 'POINT', value: 100 }, + { type: 'POINTS', value: 100 }, { type: 'POINT', value: -1 }, + { type: 'POINT', value: 100 }, { type: 'POINT', value: 50 }, + { type: 'POINT', value: 100 }, + ]) + + const additional = screen.getByRole('group', { name: 'Additional placement prizes' }) + expect(additional.children) + .toHaveLength(5) + expect(screen.getByRole('img', { name: '5 place' }) + .closest('strong')) + .toContainElement(screen.getByRole('img', { name: '6 place' })) + expect(screen.queryByRole('img', { name: '7 place' })).not.toBeInTheDocument() + expect(screen.getByRole('img', { name: '8 place' }) + .closest('strong')) + .not.toContainElement(screen.getByRole('img', { name: '10 place' })) + }) + + it('preserves original placement numbers when earlier prize values are invalid', () => { + renderPrizes([ + { value: -1 }, { value: 400 }, { value: 300 }, + { value: 200 }, { value: 100 }, { value: 100 }, + ]) + + expect(screen.queryByRole('img', { name: '1 place' })).not.toBeInTheDocument() + const additional = screen.getByRole('group', { name: 'Additional placement prizes' }) + expect(additional) + .toContainElement(screen.getByRole('img', { name: '4 place' })) + expect(screen.getByRole('img', { name: '5 place' }) + .closest('strong')) + .toContainElement(screen.getByRole('img', { name: '6 place' })) + }) +}) diff --git a/src/apps/opportunities/src/components/ChallengeDetailHeader.tsx b/src/apps/opportunities/src/components/ChallengeDetailHeader.tsx index 9b68d1ba4..edb2d1c95 100644 --- a/src/apps/opportunities/src/components/ChallengeDetailHeader.tsx +++ b/src/apps/opportunities/src/components/ChallengeDetailHeader.tsx @@ -26,7 +26,10 @@ import medal7 from '../assets/medal-7.svg' import medal8 from '../assets/medal-8.svg' import medal9 from '../assets/medal-9.svg' import prizeMedal2 from '../assets/prize-medal-2.svg' -import prizeMedal3 from '../assets/prize-medal-3.svg' +import prizeMedal3 from '../assets/detail-prize-medal-3.svg' +import prizeMedalDisc from '../assets/prize-medal-disc.svg' +import prizeMedalRibbon from '../assets/prize-medal-ribbon.svg' +import prizeRangeSeparator from '../assets/prize-range-separator.svg' import taskTypeIcon from '../assets/task-type.svg' import timelineAiScreeningIcon from '../assets/timeline-ai-screening.svg' import timelineAppealsIcon from '../assets/timeline-appeals.svg' @@ -87,6 +90,51 @@ interface IndexedChallengePhase { item: ChallengePhase } +const medalAssets = [medal1, prizeMedal2, prizeMedal3, medal4, medal5, medal6, medal7, medal8, medal9, medal10] + +interface PlacementPrizeRange extends ChallengePlacementPrize { + endPlacement: number +} + +/** Groups consecutive lower placements only when their amounts and reward types match. */ +function groupAdditionalPrizes(prizes: ChallengePlacementPrize[]): PlacementPrizeRange[] { + const ranges: PlacementPrizeRange[] = [] + const rewardType = (type?: string): string => { + const normalized = type?.trim() + .toUpperCase() || 'USD' + return normalized === 'POINT' ? 'POINTS' : normalized + } + + prizes.filter(prize => prize.placement > 3) + .forEach(prize => { + const previous = ranges[ranges.length - 1] + if (previous && previous.endPlacement + 1 === prize.placement + && previous.value === prize.value && rewardType(previous.type) === rewardType(prize.type)) { + previous.endPlacement = prize.placement + } else { + ranges.push({ ...prize, endPlacement: prize.placement }) + } + }) + + return ranges +} + +/** Uses the Figma medal artwork at its native size, with dynamic numbers beyond tenth place. */ +function placementMedal(placement: number): JSX.Element { + const medal = medalAssets[placement - 1] + return ( + + {medal ? {`${placement} : ( + + + + {placement} + + )} + + ) +} + /** Returns a catalog name from either v5-compatible or v6 challenge data. */ function catalogName(value: string | { name?: string } | undefined, fallback: string): string { return typeof value === 'string' ? value : value?.name || fallback @@ -505,20 +553,8 @@ export const ChallengeDetailHeader: FC = props => { && !registrationUnavailable && !props.busy const canSubmit = props.isRegistered && submissionOpen && !registrationUnavailable && !props.busy - const medalAssets = [ - medal1, - prizeMedal2, - prizeMedal3, - medal4, - medal5, - medal6, - medal7, - medal8, - medal9, - medal10, - ] - const featuredPrizes = challengePrizes.slice(0, 3) - const additionalPrizes = challengePrizes.slice(3, medalAssets.length) + const featuredPrizes = challengePrizes.filter(prize => prize.placement <= 3) + const additionalPrizes = groupAdditionalPrizes(challengePrizes) const featuredPrizeLabels = featuredPrizes.map(prize => formatPrize(prize)) const compactFeaturedPrizes = featuredPrizes.some((prize, index) => { const prizeType = prize.type?.trim() @@ -609,7 +645,12 @@ export const ChallengeDetailHeader: FC = props => { -