File changes

Author: base44-builder[bot]

src/pages/GamificationAnalytics.jsx

@@ -50,25 +50,36 @@ export default function GamificationAnalytics() {
     queryFn: () => base44.entities.Recognition.list('-created_date', 1000),
   });
 
-  const isLoading = userLoading || pointsLoading || redemptionsLoading || ledgerLoading || tiersLoading || recognitionsLoading;
+  const isLoading = userLoading || pointsLoading || redemptionsLoading || ledgerLoading || tiersLoading || recognitionsLoading || badgesLoading || chalLoading;
 
   if (isLoading) {
     return <LoadingSpinner message="Loading analytics..." />;
   }
 
+  // Null-safe data
+  const safeUserPoints = allUserPoints || [];
+  const safeBadgeAwards = allBadgeAwards || [];
+  const safeChallengeParticipations = allChallengeParticipations || [];
+  const safeRedemptions = allRedemptions || [];
+
   // Calculate key metrics
-  const totalUsers = allUserPoints?.length || 0;
-  const totalPoints = allUserPoints?.reduce((sum, up) => sum + up.total_points, 0) || 0;
-  const avgPointsPerUser = totalUsers > 0 ? Math.round(totalPoints / totalUsers) : 0;
-  const totalRedemptions = allRedemptions?.length || 0;
-  const completedRedemptions = allRedemptions?.filter(r => r.status === 'fulfilled')?.length || 0;
-  const redemptionRate = totalRedemptions > 0 ? Math.round((completedRedemptions / totalRedemptions) * 100) : 0;
-
-  // Users by tier
-  const usersByTier = {};
-  allTiers?.forEach(tier => {
-    usersByTier[tier.tier_name] = allUserPoints?.filter(up => up.current_tier_id === tier.id).length || 0;
-  });
+  const totalPointsDistributed = safeUserPoints.reduce((sum, up) => sum + (up.total_points || 0), 0) || 0;
+  const totalBadgesAwarded = safeBadgeAwards.length || 0;
+  const totalChallengeJoins = safeChallengeParticipations.length || 0;
+  
+  // Empty state check
+  const hasData = safeUserPoints.length > 0 || safeBadgeAwards.length > 0 || safeChallengeParticipations.length > 0;
+  
+  // Tier distribution for chart
+  const tierDistributionData = (allTiers || []).map(tier => {
+    const pointsForTier = safeUserPoints
+      .filter(up => up.tier === tier.tier_name)
+      .reduce((sum, up) => sum + (up.total_points || 0), 0) || 0;
+    return {
+      tier: tier.tier_name || 'Unknown',
+      points: pointsForTier
+    };
+  }).filter(d => d.points > 0);
 
   return (
     <div className="space-y-6">