/trend: plot worksforboth

src/pages/trend/index.tsx

@@ -75,6 +75,14 @@ const TrendPage: React.FC<TrendProps> = ({ monthlyData = [], totalData = [], det
     );
   };
 
+  // Filter total data based on content type
+  const filteredTotalData = totalData.filter(d => {
+    const matchesContentType = contentType === 'all' || 
+                             (contentType === 'datasets' && d.isDataset) ||
+                             (contentType === 'models' && !d.isDataset);
+    return matchesContentType;
+  });
+
   // Group data by provider
   const providerData = Object.fromEntries(
     Object.keys(PROVIDERS_MAP).map(provider => {
@@ -221,7 +229,7 @@ const TrendPage: React.FC<TrendProps> = ({ monthlyData = [], totalData = [], det
             {/* Total Line */}
             {showTotal && (
               <Line
-                data={totalData}
+                data={filteredTotalData}
                 type="monotone"
                 dataKey="count"
                 stroke={COLORS['Total']}

src/utils/modelData.ts

@@ -116,19 +116,23 @@ export const aggregateCalendarData = (calendarData: CalendarData): Activity[] =>
 };
 
 export const generateMonthlyData = (modelData: ModelData[]): MonthlyActivity[] => {
-  const monthlyData: Record<string, Record<string, MonthlyActivity>> = {};
+  const monthlyData: Record<string, Record<string, Record<string, MonthlyActivity>>> = {};
 
   modelData.forEach(model => {
     const date = new Date(model.createdAt);
     const monthKey = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}`;
     const provider = model.provider || 'unknown';
+    const type = model.isDataset ? 'dataset' : 'model';
 
     if (!monthlyData[monthKey]) {
       monthlyData[monthKey] = {};
     }
-
     if (!monthlyData[monthKey][provider]) {
-      monthlyData[monthKey][provider] = {
+      monthlyData[monthKey][provider] = {};
+    }
+
+    if (!monthlyData[monthKey][provider][type]) {
+      monthlyData[monthKey][provider][type] = {
         date: monthKey,
         count: 0,
         provider,
@@ -137,11 +141,16 @@ export const generateMonthlyData = (modelData: ModelData[]): MonthlyActivity[] =
       };
     }
 
-    monthlyData[monthKey][provider].count++;
+    monthlyData[monthKey][provider][type].count++;
   });
 
+  // Flatten the nested structure
   return Object.values(monthlyData)
-    .flatMap(providerData => Object.values(providerData))
+    .flatMap(providerData => 
+      Object.values(providerData).flatMap(typeData => 
+        Object.values(typeData)
+      )
+    )
     .sort((a, b) => a.date.localeCompare(b.date));
 };
 
@@ -271,17 +280,25 @@ export function processDetailedModelData(models: ModelData[]): DetailedModelData
 
 // Helper function to get total monthly data across all providers
 export const getTotalMonthlyData = (monthlyData: MonthlyActivity[]): MonthlyActivity[] => {
-  const totalByMonth: Record<string, number> = {};
+  const totalByMonth: Record<string, Record<string, MonthlyActivity>> = {};
   
-  monthlyData.forEach(({ date, count }) => {
-    totalByMonth[date] = (totalByMonth[date] || 0) + count;
+  monthlyData.forEach(({ date, count, isDataset }) => {
+    const type = isDataset ? 'dataset' : 'model';
+    if (!totalByMonth[date]) {
+      totalByMonth[date] = {};
+    }
+    if (!totalByMonth[date][type]) {
+      totalByMonth[date][type] = {
+        date,
+        count: 0,
+        provider: 'Total',
+        isDataset: isDataset
+      };
+    }
+    totalByMonth[date][type].count += count;
   });
 
-  return Object.entries(totalByMonth)
-    .map(([date, count]) => ({
-      date,
-      count,
-      provider: 'Total'
-    }))
+  return Object.values(totalByMonth)
+    .flatMap(typeData => Object.values(typeData))
     .sort((a, b) => a.date.localeCompare(b.date));
 };