Fixes

twentyhq · Feb 14, 2024 · 7368c8a · 7368c8a
1 parent b39dba7
commit 7368c8a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/packages/twenty-website/src/app/developers/contributors/[slug]/components/ActivityLog.tsx b/packages/twenty-website/src/app/developers/contributors/[slug]/components/ActivityLog.tsx
@@ -10,6 +10,9 @@ export const ActivityLog = ({
 }: {
   data: { value: number; day: string }[];
 }) => {
+  if (!data.length) {
+    return null;
+  }
   return (
     <CardContainer>
       <Title>Activity</Title>

diff --git a/packages/twenty-website/src/app/developers/contributors/[slug]/components/ProfileCard.tsx b/packages/twenty-website/src/app/developers/contributors/[slug]/components/ProfileCard.tsx
@@ -90,10 +90,12 @@ export const ProfileCard = ({
             <StyledGithubIcon size="M" color="rgba(0,0,0,1)" />
           </a>
         </h3>
-        <p className="duration">
-          Contributing since{' '}
-          {format(new Date(firstContributionAt), 'MMMM yyyy')}
-        </p>
+        {firstContributionAt && (
+          <p className="duration">
+            Contributing since{' '}
+            {format(new Date(firstContributionAt), 'MMMM yyyy')}
+          </p>
+        )}
       </Details>
     </ProfileContainer>
   );

diff --git a/packages/twenty-website/src/app/developers/contributors/[slug]/page.tsx b/packages/twenty-website/src/app/developers/contributors/[slug]/page.tsx
@@ -22,7 +22,9 @@ export function generateMetadata({
 }
 
 export default async function ({ params }: { params: { slug: string } }) {
-  const contributor = (await findAll(userModel)).find(
+  const contributors = await findAll(userModel);
+
+  const contributor = contributors.find(
     (contributor) => contributor.id === params.slug,
   );
 
@@ -78,9 +80,12 @@ export default async function ({ params }: { params: { slug: string } }) {
     .sort((a, b) => b.value - a.value);
 
   const contributorRank =
-    mergedContributorPullRequestsByContributorArray.findIndex(
+    ((mergedContributorPullRequestsByContributorArray.findIndex(
       (contributor) => contributor.authorId === params.slug,
-    );
+    ) +
+      1) /
+      contributors.length) *
+    100;
 
   const pullRequestActivity = contributorPullRequests.reduce((acc, pr) => {
     const date = new Date(pr.createdAt).toISOString().split('T')[0];
@@ -100,11 +105,11 @@ export default async function ({ params }: { params: { slug: string } }) {
         <ProfileCard
           username={contributor.id}
           avatarUrl={contributor.avatarUrl}
-          firstContributionAt={pullRequestActivityArray[0].day}
+          firstContributionAt={pullRequestActivityArray[0]?.day}
         />
         <ProfileInfo
           mergedPRsCount={mergedContributorPullRequests.length}
-          rank={(100 - Number(contributorRank)).toFixed(0)}
+          rank={Math.ceil(Number(contributorRank)).toFixed(0)}
           activeDays={pullRequestActivityArray.length}
         />
         <ActivityLog data={pullRequestActivityArray} />

diff --git a/packages/twenty-website/src/app/developers/contributors/page.tsx b/packages/twenty-website/src/app/developers/contributors/page.tsx
@@ -34,7 +34,8 @@ const Contributors = async () => {
 
       return contributor;
     })
-    .sort((a, b) => b.pullRequestCount - a.pullRequestCount);
+    .sort((a, b) => b.pullRequestCount - a.pullRequestCount)
+    .filter((contributor) => contributor.pullRequestCount > 0);
 
   return (
     <>