Skip to content
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

Improved counters format consistency #939

Merged
merged 4 commits into from
Feb 25, 2025
Merged
Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions backend/Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ RUN groupadd owasp && \
useradd --create-home --home-dir /home/owasp -g owasp owasp && \
apt-get update && \
apt-get install -y libpq-dev && \
apt-get clean -y && rm -rf /var/lib/apt/lists/* && \
python -m pip install --no-cache-dir poetry
apt-get clean -y && rm -rf /var/lib/apt/lists/*

ENV PATH="/home/owasp/.venv/bin:$PATH"
ENV POETRY_VIRTUALENVS_IN_PROJECT=true
Expand Down
4 changes: 2 additions & 2 deletions frontend/__tests__/src/data/mockRepositoryData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ export const mockRepositoryData = {
url: 'https://github.com/test-repo',
commitsCount: 10,
contributorsCount: 5,
forksCount: 3,
forksCount: 3000,
openIssuesCount: 2,
starsCount: 50,
starsCount: 50000,
topContributors: Array.from({ length: 15 }, (_, i) => ({
avatarUrl: `https://example.com/avatar${i + 1}.jpg`,
contributionsCount: 30 - i,
Expand Down
4 changes: 2 additions & 2 deletions frontend/__tests__/src/pages/RepositoryDetails.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ describe('RepositoryDetailsPage', () => {
expect(screen.getByText('Test Repo')).toBeInTheDocument()
expect(screen.getByText('MIT')).toBeInTheDocument()
})
expect(screen.getByText('50K Stars')).toBeInTheDocument()
expect(screen.getByText('3K Forks')).toBeInTheDocument()
expect(screen.getByText('10 Commits')).toBeInTheDocument()
expect(screen.getByText('5 Contributors')).toBeInTheDocument()
expect(screen.getByText('3 Forks')).toBeInTheDocument()
expect(screen.getByText('2 Issues')).toBeInTheDocument()
expect(screen.getByText('50 Stars')).toBeInTheDocument()
})

test('renders error message when GraphQL request fails', async () => {
Expand Down
27 changes: 22 additions & 5 deletions frontend/src/components/RepositoriesCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
IconDefinition,
} from '@fortawesome/free-solid-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import millify from 'millify'
import type React from 'react'
import { useState } from 'react'
import { useNavigate } from 'react-router-dom'
Expand Down Expand Up @@ -61,16 +62,32 @@ const RepositoryItem = ({ details }) => {
{details.name}
</p>
<div className="space-y-2 text-sm">
<InfoItem icon={faStar} label="Stars" value={details.starsCount} />
<InfoItem icon={faCodeFork} label="Forks" value={details.forksCount} />
<InfoItem icon={faUsers} label="Contributors" value={details.contributorsCount} />
<InfoItem icon={faExclamationCircle} label="Issues" value={details.openIssuesCount} />
<InfoItem
icon={faStar}
label="Stars"
value={millify(details.starsCount, { precision: 1 })}
/>
<InfoItem
icon={faCodeFork}
label="Forks"
value={millify(details.forksCount, { precision: 1 })}
/>
<InfoItem
icon={faUsers}
label="Contributors"
value={millify(details.contributorsCount, { precision: 1 })}
/>
<InfoItem
icon={faExclamationCircle}
label="Issues"
value={millify(details.openIssuesCount, { precision: 1 })}
/>
</div>
</div>
)
}

const InfoItem: React.FC<{ icon: IconDefinition; label: string; value: number }> = ({
const InfoItem: React.FC<{ icon: IconDefinition; label: string; value: string }> = ({
icon,
label,
value,
Expand Down
32 changes: 23 additions & 9 deletions frontend/src/pages/RepositoryDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
} from '@fortawesome/free-solid-svg-icons'
import { GET_REPOSITORY_DATA } from 'api/queries/repositoryQueries'
import { toast } from 'hooks/useToast'
import millify from 'millify'
import { useEffect, useState } from 'react'
import { useParams } from 'react-router-dom'
import { formatDate } from 'utils/dateFormatter'
Expand Down Expand Up @@ -82,24 +83,37 @@ const RepositoryDetailsPage = () => {

const RepositoryStats = [
{
icon: faHistory,
value: `${repository?.commitsCount || 'No'} ${pluralize(repository.commitsCount, 'Commit')}`,
icon: faStar,
value: `${
repository.starsCount ? millify(repository.starsCount, { precision: 1 }) : 'No'
} ${pluralize(repository.starsCount, 'Star')}`,
},
{
icon: faUsers,
value: `${repository?.contributorsCount || 'No'} ${pluralize(repository.contributorsCount, 'Contributor')}`,
icon: faCodeFork,
value: `${
repository.forksCount ? millify(repository.forksCount, { precision: 1 }) : 'No'
} ${pluralize(repository.forksCount, 'Fork')}`,
},
{
icon: faCodeFork,
value: `${repository?.forksCount || 'No'} ${pluralize(repository.forksCount, 'Fork')}`,
icon: faUsers,
value: `${
repository.contributorsCount
? millify(repository.contributorsCount, { precision: 1 })
: 'No'
} ${pluralize(repository.contributorsCount, 'Contributor')}`,
},

{
icon: faExclamationCircle,
value: `${repository?.openIssuesCount || 'No'} ${pluralize(repository.openIssuesCount, 'Issue')}`,
value: `${
repository.openIssuesCount ? millify(repository.openIssuesCount, { precision: 1 }) : 'No'
} ${pluralize(repository.openIssuesCount, 'Issue')}`,
},
{
icon: faStar,
value: `${repository?.starsCount || 'No'} ${pluralize(repository.starsCount, 'Star')}`,
icon: faHistory,
value: `${
repository.commitsCount ? millify(repository.commitsCount, { precision: 1 }) : 'No'
} ${pluralize(repository.commitsCount, 'Commit')}`,
},
]
return (
Expand Down