feat(ElectionResults): enhance results display extended info #226
+74
−20
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,4 +1,4 @@ | ||||||
| import { Box, chakra, ChakraProps, Flex, Image, Progress, Text, useMultiStyleConfig } from '@chakra-ui/react' | ||||||
| import { useClient, useDatesLocale, useElection } from '@vocdoni/react-providers' | ||||||
| import { | ||||||
| ElectionResultsTypeNames, | ||||||
|
|
@@ -9,6 +9,7 @@ import { | |||||
| PublishedElection, | ||||||
| } from '@vocdoni/sdk' | ||||||
| import { format } from 'date-fns' | ||||||
| import { Markdown } from '../layout' | ||||||
|
|
||||||
| const percent = (result: number, total: number) => ((Number(result) / total) * 100 || 0).toFixed(1) + '%' | ||||||
| export const results = (result: number, decimals?: number) => | ||||||
|
|
@@ -53,25 +54,46 @@ export const ElectionResults = (props: ElectionResultsProps) => { | |||||
| <Text sx={styles.title}>{localize('results.title', { title: q.title.default })}</Text> | ||||||
| </chakra.div> | ||||||
| <chakra.div sx={styles.body}> | ||||||
| {choices.map((c: any, i: number) => { | ||||||
| if (!totals) return null | ||||||
|
|
||||||
| const meta = c.meta ?? {} | ||||||
| const description = meta.description as string | undefined | ||||||
| const imageSrc = meta.image?.default as string | undefined | ||||||
| const hasDescription = !!description | ||||||
| const hasImage = !!imageSrc | ||||||
|
|
||||||
| return ( | ||||||
| <Box key={i}> | ||||||
| <Progress | ||||||
| value={((Number(c.results) / totals[idx]) * 100) / 10 ** decimals || 0} | ||||||
| sx={styles.progress} | ||||||
| /> | ||||||
|
|
||||||
| <Flex sx={styles.choiceBody}> | ||||||
| <Box flex='1'> | ||||||
| <Flex justify='space-between' mb={hasDescription ? 1 : 0}> | ||||||
| <Text sx={styles.choiceTitle}>{c.title.default}</Text> | ||||||
| <Text sx={styles.choiceVotes}> | ||||||
| {localize('results.votes', { | ||||||
| votes: results(c.results, decimals) || 0, | ||||||
| percent: percent(results(c.results, decimals), totals[idx]), | ||||||
| })} | ||||||
| </Text> | ||||||
| </Flex> | ||||||
|
|
||||||
| {hasDescription && <Markdown sx={styles.choiceDescription}>{description}</Markdown>} | ||||||
| </Box> | ||||||
|
|
||||||
| {hasImage && ( | ||||||
| <Box sx={styles.choiceImageWrapper}> | ||||||
| <Image src={imageSrc} alt={c.title.default} sx={styles.choiceImage} loading='lazy' /> | ||||||
|
There was a problem hiding this comment. The alt text uses the choice title directly. Consider providing more descriptive alt text that explains what the image represents, such as 'Image for {title}' or extracting alt text from the metadata if available.
Suggested change
Member
There was a problem hiding this comment. +1 we should ideally use translations here |
||||||
| </Box> | ||||||
| )} | ||||||
| </Flex> | ||||||
| </Box> | ||||||
| ) | ||||||
| })} | ||||||
| </chakra.div> | ||||||
| </chakra.div> | ||||||
| ) | ||||||
|
|
||||||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The metadata extraction logic is repeated for each choice in the map function. Consider extracting this into a helper function or defining a proper type for the metadata structure to improve type safety and maintainability.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, @AlexanderArce, you can use a helper method in the SDK named
dotobject()which allows you to extract parts of an object using dot notation. We actually have it as a helper for theelectionclass (viaelection.get()), but I think it does not work for the fields you're trying out here... I think it was implemented only for the custom meta field (which is actuallymetadata.meta, what you're searching lies undermetadatatoo, so probably won't work the election helper method, but you can still use the underlyingdotobject()one for these things).