update contributions block

Author: maslianok

app/profile/[login]/profile-summary.gql

@@ -57,6 +57,9 @@ query User($login: String!) {
     contributions {
       year
       prsCount
+      mergedPrsCount
+      linesAdded
+      linesRemoved
       repository {
         ...RepositoryFields
       }

app/profile/[login]/repositories/components/contribution-repository-card.tsx

@@ -8,21 +8,45 @@ import { RepositoryCard } from './repository-card';
 type RepositoryCardProps = {
   repository?: Repository | null;
   prsCount?: number | null;
+  mergedPrsCount?: number | null;
+  linesAdded?: number | null;
+  linesRemoved?: number | null;
   login: string;
 };
 
-export const ContributionRepositoryCard: FC<RepositoryCardProps> = ({ repository, prsCount, login }) => {
+const PR_FETCH_LIMIT = 20;
+
+export const ContributionRepositoryCard: FC<RepositoryCardProps> = ({
+  repository,
+  prsCount,
+  mergedPrsCount,
+  linesAdded,
+  linesRemoved,
+  login,
+}) => {
   if (!repository) {
     return null;
   }
 
+  // total PRs count is greater than PR_FETCH_LIMIT
+  // and merged PRs count is greater than half of PR_FETCH_LIMIT
+  const badgeLabel =
+    (prsCount ?? 0) > PR_FETCH_LIMIT && (mergedPrsCount ?? 0) >= PR_FETCH_LIMIT / 2
+      ? `~${prsCount} PRs`
+      : `${mergedPrsCount} PR${(mergedPrsCount ?? 0) > 1 ? 's' : ''}`;
+
   return (
     <RepositoryCard
       type="contribution"
       repository={repository}
-      meta={<Badge variant="secondary">{`${prsCount} contributions`}</Badge>}
+      meta={
+        <Badge variant="secondary">
+          {badgeLabel} <span className="text-positive">+{linesAdded}</span>
+          <span className="text-negative">-{linesRemoved}</span>
+        </Badge>
+      }
       login={login}
-      className="md:border-0 md:border-b-1 last:md:border-b-0 rounded-none md:pl-0"
+      className="md:border-0 md:border-b-1 last:md:border-b-0 p-4 pl-0 md:pl-0 md:rounded-none"
     />
   );
 };

app/profile/[login]/repositories/components/repository-card.tsx

@@ -4,6 +4,7 @@ import Link from 'next/link';
 import { FC, ReactNode } from 'react';
 
 import { Badge } from '@/components/ui/badge';
+import { cn } from '@/lib/utils';
 import { Repository } from '@/types/generated/graphql';
 
 import { ProfileCard, ProfileCardContent, ProfileCardHeader } from '../../components/profile-card';
@@ -29,7 +30,7 @@ export const RepositoryCard: FC<RepositoryCardProps> = ({
 
   const { name, url, pushedAt, createdAt, stargazerCount, forkCount, releasesCount, isArchived } = repository;
 
-  const titleUrl = type === 'repository' ? url : `${url}/pulls?q=is%3Apr+author%3A${login}`;
+  const titleUrl = type === 'repository' ? url : `${url}/pulls?q=is%3Apr+is%3Amerged+author%3A${login}`;
 
   const getMeta = () => {
     if (meta) {
@@ -44,7 +45,9 @@ export const RepositoryCard: FC<RepositoryCardProps> = ({
   };
 
   return (
-    <ProfileCard className={className}>
+    <ProfileCard
+      className={cn('border-b-1 last:border-b-0 md:last:border-b rounded-none md:rounded-xl pb-4', className)}
+    >
       <ProfileCardHeader meta={getMeta()}>
         <Link href={titleUrl} target="_blank" rel="noopener noreferrer" className="whitespace-nowrap">
           {name}

app/profile/[login]/repositories/components/user-contriutions-list.tsx

@@ -20,7 +20,7 @@ export const UserContriutionsList: FC<UserContriutionsListProps> = ({ contributi
 
   return (
     <>
-      <h2 className="text-xl font-semibold">Contributions</h2>
+      <h2 className="text-xl font-semibold mt-6">Contributions</h2>
       <Timeline>
         {sortedContributions.map((contribution) => (
           <TimelineItem key={contribution.year}>
@@ -33,6 +33,9 @@ export const UserContriutionsList: FC<UserContriutionsListProps> = ({ contributi
                   key={item.repository?.githubId}
                   repository={item.repository}
                   prsCount={item.prsCount}
+                  mergedPrsCount={item.mergedPrsCount}
+                  linesAdded={item.linesAdded}
+                  linesRemoved={item.linesRemoved}
                   login={login}
                 />
               ))}

app/profile/[login]/repositories/components/user-repositories-list.tsx

@@ -20,7 +20,7 @@ export const UserRepositoriesList: FC<UserRepositoriesListProps> = ({ login, rep
     <>
       <h2 className="text-xl font-semibold">Repositories</h2>
       <div className="flex flex-col gap-6">
-        <div className="flex flex-col md:flex-row flex-wrap gap-6">
+        <div className="flex flex-col md:flex-row flex-wrap gap-4 md:gap-6">
           {repositories?.map((repo) => (
             <RepositoryCard key={repo.githubId} repository={repo} login={login} />
           ))}

app/profile/[login]/utils/contrib-group-and-sort.ts

@@ -14,8 +14,11 @@ export const groupAndSortContributions = (contributions: Contribution[]) => {
     .map(([year, data]) => ({
       year: Number(year),
       data: data.sort((a, b) => {
-        // Primary: prsCount DESC, Secondary: stargazersCount DESC
-        if (b.prsCount !== a.prsCount) return b.prsCount - a.prsCount;
+        // Primary: mergedPrsCount DESC, Secondary: stargazersCount DESC
+        if (b.mergedPrsCount !== a.mergedPrsCount) {
+          return b.mergedPrsCount - a.mergedPrsCount;
+        }
+
         return (b.repository?.stargazerCount ?? 0) - (a.repository?.stargazerCount ?? 0);
       }),
     }))

types/generated/graphql.ts

@@ -1,5 +1,8 @@
 type Contribution {
-  prsCount: Int!
+  linesAdded: Int
+  linesRemoved: Int
+  mergedPrsCount: Int
+  prsCount: Int
   repoId: String
   repository: Repository
   year: Int!