-
Notifications
You must be signed in to change notification settings - Fork 35
Wire up cricket header in live blog #16161
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b5311ff
Wire up cricket header in live blog
marjisound d73d4c6
Add interaction tests for cricket header stories
marjisound 051bed3
Ensure right header is rendered in live layout
marjisound e51172b
Refactor the live layout Header component to remove redundant props
marjisound bace345
Not render cricket redesign for apps
marjisound 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
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
95 changes: 95 additions & 0 deletions
95
dotcom-rendering/src/components/CricketMatchHeader/headerData.ts
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,95 @@ | ||
| import type { ComponentProps } from 'react'; | ||
| import { safeParse } from 'valibot'; | ||
| import { type CricketMatch, parseCricketMatchV2 } from '../../cricketMatchV2'; | ||
| import type { FECricketMatchHeader } from '../../frontend/feCricketMatchHeader'; | ||
| import { feCricketMatchHeaderSchema } from '../../frontend/feCricketMatchHeader'; | ||
| import { safeParseURL } from '../../lib/parse'; | ||
| import { error, fromValibot, ok, type Result } from '../../lib/result'; | ||
| import type { Tabs } from '../FootballMatchHeader/Tabs'; | ||
|
|
||
| export type CricketHeaderData = { | ||
| tabs: ComponentProps<typeof Tabs>; | ||
| match: CricketMatch; | ||
| }; | ||
|
|
||
| export const parse = | ||
| (selected: CricketHeaderData['tabs']['selected']) => | ||
| (json: unknown): Result<string, CricketHeaderData> => { | ||
| const feData = fromValibot(safeParse(feCricketMatchHeaderSchema, json)); | ||
|
|
||
| if (!feData.ok) { | ||
| return error('Failed to validate match header json'); | ||
| } | ||
|
|
||
| const parsedMatch = parseCricketMatchV2(feData.value.cricketMatch); | ||
|
|
||
| if (!parsedMatch.ok) { | ||
| return error('Failed to parse the match from the header json'); | ||
| } | ||
|
|
||
| const maybeTabs = createTabs( | ||
| selected, | ||
| feData.value, | ||
| parsedMatch.value.kind, | ||
| ); | ||
|
|
||
| if (!maybeTabs.ok) { | ||
| return error( | ||
| `The match header data contained an invalid ${maybeTabs.error.kind} URL`, | ||
| ); | ||
| } | ||
|
|
||
| return ok({ | ||
| match: parsedMatch.value, | ||
| tabs: maybeTabs.value, | ||
| }); | ||
| }; | ||
|
|
||
| type MatchURLError = { | ||
| kind: 'live' | 'report'; | ||
| }; | ||
|
|
||
| const createTabs = ( | ||
| selected: CricketHeaderData['tabs']['selected'], | ||
| feData: FECricketMatchHeader, | ||
| matchKind: CricketMatch['kind'], | ||
| ): Result<MatchURLError, CricketHeaderData['tabs']> => { | ||
| const reportURL = | ||
| feData.reportURL !== undefined | ||
| ? safeParseURL(feData.reportURL) | ||
| : undefined; | ||
| const liveURL = | ||
| feData.liveURL !== undefined ? safeParseURL(feData.liveURL) : undefined; | ||
| if (reportURL !== undefined && !reportURL.ok) { | ||
| return error({ kind: 'report' }); | ||
| } | ||
|
|
||
| if (liveURL !== undefined && !liveURL.ok) { | ||
| return error({ kind: 'live' }); | ||
| } | ||
|
|
||
| switch (selected) { | ||
| case 'info': | ||
| return ok({ | ||
| matchKind, | ||
| sportKind: 'cricket', | ||
| selected, | ||
| reportURL: reportURL?.value, | ||
| liveURL: liveURL?.value, | ||
| }); | ||
| case 'live': | ||
| return ok({ | ||
| matchKind, | ||
| sportKind: 'cricket', | ||
| selected, | ||
| reportURL: reportURL?.value, | ||
| }); | ||
| case 'report': | ||
| return ok({ | ||
| matchKind, | ||
| sportKind: 'cricket', | ||
| selected, | ||
| liveURL: liveURL?.value, | ||
| }); | ||
| } | ||
| }; |
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.