Merge pull request #667 from Adez017/Experiment

Updated the PR Modal as per changes in Leaderboard

Author: sanjay-kv

src/components/dashboard/LeaderBoard/PRListModal.tsx

@@ -11,6 +11,7 @@ interface PRDetails {
   mergedAt: string;
   repoName: string;
   number: number;
+  points: number; // Now includes the points field
 }
 
 interface Contributor {
@@ -40,6 +41,9 @@ export default function PRListModal({ contributor, isOpen, onClose }: PRListModa
   // Get filtered PRs instead of using contributor.prDetails
   const filteredPRs = getFilteredPRsForContributor(contributor.username);
 
+  // Calculate total points from filtered PRs
+  const totalPoints = filteredPRs.reduce((sum, pr) => sum + pr.points, 0);
+
   const formatDate = (dateString: string) => {
     const date = new Date(dateString);
     return date.toLocaleDateString('en-US', {
@@ -72,6 +76,14 @@ export default function PRListModal({ contributor, isOpen, onClose }: PRListModa
     }
   };
 
+  // Helper function to get badge color based on points
+  const getPointsBadgeColor = (points: number) => {
+    if (points >= 50) return '#10b981'; // Green for Level 3
+    if (points >= 30) return '#f59e0b'; // Orange for Level 2
+    if (points >= 10) return '#3b82f6'; // Blue for Level 1
+    return '#6b7280'; // Gray for no points
+  };
+
   return (
     <AnimatePresence>
       {isOpen && (
@@ -107,8 +119,8 @@ export default function PRListModal({ contributor, isOpen, onClose }: PRListModa
                     {contributor.username}'s Pull Requests
                   </h2>
                   <p className={`pr-modal-subtitle ${isDark ? "dark" : "light"}`}>
-                    {/*Show filtered count and add filter info */}
-                    {filteredPRs.length} merged PR{filteredPRs.length !== 1 ? 's' : ''} • {filteredPRs.length * 10} points
+                    {/* Show filtered count with actual total points */}
+                    {filteredPRs.length} merged PR{filteredPRs.length !== 1 ? 's' : ''} • {totalPoints} point{totalPoints !== 1 ? 's' : ''}
                     {currentTimeFilter !== 'all' && (
                       <span style={{ marginLeft: '8px', opacity: 0.7 }}>
                         ({getFilterDisplayText(currentTimeFilter)})
@@ -128,7 +140,7 @@ export default function PRListModal({ contributor, isOpen, onClose }: PRListModa
 
             {/* Modal Body */}
             <div className={`pr-modal-body ${isDark ? "dark" : "light"}`}>
-              {/*Use filteredPRs instead of contributor.prDetails */}
+              {/* Use filteredPRs instead of contributor.prDetails */}
               {filteredPRs && filteredPRs.length > 0 ? (
                 <div className="pr-list">
                   {filteredPRs.map((pr, index) => (
@@ -144,6 +156,23 @@ export default function PRListModal({ contributor, isOpen, onClose }: PRListModa
                           {pr.title}
                         </h3>
                         <div className="pr-item-actions">
+                          {/* Points badge */}
+                          {pr.points > 0 && (
+                            <span 
+                              className="pr-points-badge"
+                              style={{
+                                backgroundColor: getPointsBadgeColor(pr.points),
+                                color: 'white',
+                                padding: '4px 8px',
+                                borderRadius: '12px',
+                                fontSize: '12px',
+                                fontWeight: '600',
+                                marginRight: '8px',
+                              }}
+                            >
+                              +{pr.points} pts
+                            </span>
+                          )}
                           <a 
                             href={pr.url} 
                             target="_blank" 

src/lib/statsProvider.tsx

@@ -306,7 +306,7 @@ export function CommunityStatsProvider({ children }: CommunityStatsProviderProps
     return mergedPRs;
   }, []);
 
-  // Enhanced processing function that stores all PR data without filtering
+  // Enhanced processing function that stores only valid PRs with points
   const processBatch = useCallback(async (
     repos: any[],
     headers: Record<string, string>
@@ -335,35 +335,38 @@ export function CommunityStatsProvider({ children }: CommunityStatsProviderProps
 
       // Process results from this batch
       results.forEach(({ mergedPRs, repoName }) => {
-        totalMergedPRs += mergedPRs.length;
-        
         mergedPRs.forEach((pr) => {
-          const username = pr.user.login;
-          if (!contributorMap.has(username)) {
-            contributorMap.set(username, {
-              username,
-              avatar: pr.user.avatar_url,
-              profile: pr.user.html_url,
-              points: 0, // Will be calculated later based on filter
-              prs: 0, // Will be calculated later based on filter
-              allPRDetails: [], // Store all PRs here
-            });
-          }
-          const contributor = contributorMap.get(username)!;
-          
           // Calculate points for this PR based on labels
           const prPoints = calculatePointsForPR(pr.labels);
 
-          // Add detailed PR information to the full list
-          if (pr.title && pr.html_url && pr.merged_at && pr.number) {
-            contributor.allPRDetails.push({
-              title: pr.title,
-              url: pr.html_url,
-              mergedAt: pr.merged_at,
-              repoName,
-              number: pr.number,
-              points: prPoints,
-            });
+          // ONLY store PRs that have points (i.e., have "recode" label and a level label)
+          if (prPoints > 0) {
+            totalMergedPRs++;
+            
+            const username = pr.user.login;
+            if (!contributorMap.has(username)) {
+              contributorMap.set(username, {
+                username,
+                avatar: pr.user.avatar_url,
+                profile: pr.user.html_url,
+                points: 0, // Will be calculated later based on filter
+                prs: 0, // Will be calculated later based on filter
+                allPRDetails: [], // Store only valid PRs here
+              });
+            }
+            const contributor = contributorMap.get(username)!;
+            
+            // Add detailed PR information only if it has all required fields
+            if (pr.title && pr.html_url && pr.merged_at && pr.number) {
+              contributor.allPRDetails.push({
+                title: pr.title,
+                url: pr.html_url,
+                mergedAt: pr.merged_at,
+                repoName,
+                number: pr.number,
+                points: prPoints,
+              });
+            }
           }
         });
       });