/trend fully working

src/pages/trend/index.tsx

@@ -77,21 +77,42 @@ 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;
+    if (contentType === 'all') {
+      return d.isDataset === null;  // Show only combined counts for 'all'
+    }
+    return (contentType === 'datasets' && d.isDataset === true) ||
+           (contentType === 'models' && d.isDataset === false);
   });
 
   // Group data by provider
   const providerData = Object.fromEntries(
     Object.keys(PROVIDERS_MAP).map(provider => {
       const providerMonthlyData = monthlyData.filter(d => {
-        const matchesContentType = contentType === 'all' || 
-                                 (contentType === 'datasets' && d.isDataset) ||
-                                 (contentType === 'models' && !d.isDataset);
+        if (contentType === 'all') {
+          return d.provider === provider;  // Show all items for the provider
+        }
+        const matchesContentType = (contentType === 'datasets' && d.isDataset === true) ||
+                                 (contentType === 'models' && d.isDataset === false);
         return d.provider === provider && matchesContentType;
       });
+
+      // If showing all, aggregate the counts for each month
+      if (contentType === 'all') {
+        const aggregatedData: Record<string, MonthlyActivity> = {};
+        providerMonthlyData.forEach(d => {
+          if (!aggregatedData[d.date]) {
+            aggregatedData[d.date] = {
+              date: d.date,
+              count: 0,
+              provider: d.provider,
+              isDataset: null
+            };
+          }
+          aggregatedData[d.date].count += d.count;
+        });
+        return [provider, Object.values(aggregatedData).sort((a, b) => a.date.localeCompare(b.date))];
+      }
+
       return [provider, providerMonthlyData || []];
     })
   );

src/utils/modelData.ts

@@ -21,7 +21,7 @@ export interface MonthlyActivity {
   date: string; // YYYY-MM format
   count: number;
   provider: string;
-  isDataset?: boolean;
+  isDataset: boolean | null;  // null means it includes both
   name?: string;
 }
 
@@ -280,25 +280,41 @@ 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, Record<string, MonthlyActivity>> = {};
+  const totalByMonth: Record<string, Record<'model' | 'dataset' | 'all', number>> = {};
   
-  monthlyData.forEach(({ date, count, isDataset }) => {
-    const type = isDataset ? 'dataset' : 'model';
+  // Initialize the structure
+  monthlyData.forEach(({ date }) => {
     if (!totalByMonth[date]) {
-      totalByMonth[date] = {};
-    }
-    if (!totalByMonth[date][type]) {
-      totalByMonth[date][type] = {
-        date,
-        count: 0,
-        provider: 'Total',
-        isDataset: isDataset
-      };
+      totalByMonth[date] = { model: 0, dataset: 0, all: 0 };
     }
-    totalByMonth[date][type].count += count;
   });
 
-  return Object.values(totalByMonth)
-    .flatMap(typeData => Object.values(typeData))
-    .sort((a, b) => a.date.localeCompare(b.date));
+  // Aggregate counts by month and type
+  monthlyData.forEach(({ date, count, isDataset }) => {
+    const type = isDataset ? 'dataset' : 'model';
+    totalByMonth[date][type] += count;
+    totalByMonth[date].all += count;  // Track combined count
+  });
+
+  // Convert to MonthlyActivity array
+  return Object.entries(totalByMonth).flatMap(([date, counts]) => [
+    {
+      date,
+      count: counts.all,
+      provider: 'Total',
+      isDataset: null  // null means it includes both
+    },
+    {
+      date,
+      count: counts.model,
+      provider: 'Total',
+      isDataset: false
+    },
+    {
+      date,
+      count: counts.dataset,
+      provider: 'Total',
+      isDataset: true
+    }
+  ]).sort((a, b) => a.date.localeCompare(b.date));
 };

src/utils/providers.ts

@@ -7,9 +7,13 @@ export const PROVIDERS_MAP: Record<string, ProviderInfo> = {
   "BAAI": { color: "#FF7000", authors: ["BAAI"] },
   "DeepSeek": { color: "#1877F2", authors: ["deepseek-ai"] },
   "Shanghai AI Lab": { color: "#10A37F", authors: ["internlm", "OpenGVLab", "openmmlab", "Vchitect"] },
-  "Alibaba": { color: "#FF6F00", authors: ["Qwen", "Alibaba-NLP", "alibaba-pai", "DAMO-NLP-SG", 'ali-vilab', 'modelscope', 'FunAudioLLM'] },
-  "ZhipuAI / GLM": { color: "#4285F4", authors: ["THUDM"] },
-  "Tencent": { color: "#1DA1F2", authors: ["TencentARC", "Tencent-Hunyuan", "h94"] },
-  "Yi/01": { color: "#FF4500", authors: ["01-ai"] },
-  "Multimodal Art Projection (m-a-p)": { color: "#5E35B1", authors: ["m-a-p"] }
+  "Alibaba": { color: "#FF9F1C", authors: ["Qwen", "Alibaba-NLP", "alibaba-pai", "DAMO-NLP-SG", 'ali-vilab', 'modelscope', 'FunAudioLLM'] },
+  "ZhipuAI / GLM": { color: "#E84855", authors: ["THUDM", "ZhipuAI"] },
+  "Tencent": { color: "#2AB7CA", authors: ["Tencent", "TencentARC"] },
+  "Yi/01": { color: "#FED766", authors: ["01-ai"] },
+  "m-a-p": { color: "#4F6D7A", authors: ["m-a-p"] },
+  "Skywork": { color: "#50514F", authors: ["Skywork"] },
+  "xverse": { color: "#F25F5C", authors: ["xverse"] },
+  "OpenBMB": { color: "#70C1B3", authors: ["openbmb"] },
+  "Baichuan": { color: "#247BA0", authors: ["baichuan-inc"] }
 };