Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions web/src/app/[locale]/result/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,23 @@ interface ResultsProps {
showExpanded?: boolean;
}

const sortResultsInOrder = (results: Domain[]): Domain[] => {
const desiredOrder = ['O', 'C', 'E', 'A', 'N'];

const domainMap = new Map<string, Domain>();
results.forEach(result => {
domainMap.set(result.domain, result);
});

return desiredOrder
.map(domain => domainMap.get(domain))
.filter((domain): domain is Domain => domain !== undefined);
};

const Results = ({ report, showExpanded }: ResultsProps) => {
const t = useTranslations('results');

const sortedResults = sortResultsInOrder(report.results);

return (
<>
Expand Down Expand Up @@ -100,12 +115,12 @@ const Results = ({ report, showExpanded }: ResultsProps) => {
<div className='flex mt-10'>
<h1 className={title()}>{t('theBigFive')}</h1>
</div>
<BarChart max={120} results={report.results} />
<BarChart max={120} results={sortedResults} />
<DomainTabs
results={report.results}
results={sortedResults}
showExpanded={!!showExpanded}
scoreText={t('score')}
/>
</>
);
};
};