OSS index sorting (#314)

Signed-off-by: Gašper Grom <gasper.grom@gmail.com>

Author: gaspergrom

frontend/app/components/modules/open-source-index/services/osi.api.service.ts

@@ -180,13 +180,11 @@ class OssIndexApiService {
           name: group.name,
           value: [group.totalContributors, rangeIndex],
           slug: group.slug,
-          softwareValue: '',
+          softwareValue: group.softwareValue,
+          avgScore: group.avgScore,
           type: group.type,
           topProjects: group.topProjects.map((project) => ({
-            id: project.id,
-            name: project.name,
-            count: project.count,
-            softwareValue: '',
+            ...project,
             logoUrl: project.logo
           })),
           topCollections: group.topCollections,

frontend/app/components/uikit/chart/types/ChartTypes.ts

@@ -61,7 +61,8 @@ export interface TreeMapItem {
   id: string;
   name: string;
   count: number;
-  softwareValue?: string;
+  softwareValue: number;
+  avgScore: number;
   logoUrl?: string;
   icon?: string;
 }
@@ -72,7 +73,8 @@ export interface TreeMapData {
   slug: string;
   type: string;
   value: [number, number];
-  softwareValue?: string;
+  softwareValue: number;
+  avgScore: number;
   topProjects: TreeMapItem[];
   topCollections: TreeMapItem[];
   link?: string;

frontend/server/api/ossindex/categories.ts

@@ -16,6 +16,7 @@ import type {OSSIndexCategoryGroupDetails} from "~~/types/ossindex/category-grou
 export default defineEventHandler(async (event): Promise<OSSIndexCategoryGroupDetails | Error> => {
     const query = getQuery(event);
     const categoryGroupSlug: string = (query?.categoryGroupSlug as string);
+    const sort: string = (query?.sort as string);
 
     try {
         const resDetails = await fetchFromTinybird<CategoryGroup[]>(
@@ -25,36 +26,41 @@ export default defineEventHandler(async (event): Promise<OSSIndexCategoryGroupDe
             }
         );
 
+        const details: CategoryGroup | undefined = resDetails.data.at(0);
+
+        if(!details){
+            throw createError({statusCode: 404, statusMessage: 'Category group not found'});
+        }
+
         const res = await fetchFromTinybird<OSSIndexCategoryTinybird[]>(
             '/v0/pipes/categories_oss_index.json',
             {
                 categoryGroupSlug,
+                orderBy: sort,
             }
         );
 
-        const details: CategoryGroup | undefined = resDetails.data.at(0);
-
-        if(!details){
-            throw createError({statusCode: 404, statusMessage: 'Category group not found'});
-        }
-
         const categories = res.data.map((item) => ({
             ...item,
             topCollections: item.topCollections.map((collection) => {
-                const [id, count, name] = collection;
+                const [id, count, name, softwareValue, avgScore] = collection;
                 return {
                     id: id as string,
                     count: count as number,
                     name: name as string,
+                    softwareValue: softwareValue as number,
+                    avgScore: avgScore as number,
                 };
             }),
             topProjects: item.topProjects.map((collection) => {
-                const [id, count, name, logo] = collection;
+                const [id, count, name, logo, softwareValue, avgScore] = collection;
                 return {
                     id: id as string,
                     count: count as number,
                     name: name as string,
                     logo: logo as string,
+                    softwareValue: softwareValue as number,
+                    avgScore: avgScore as number,
                 };
             })
         }))

frontend/server/api/ossindex/collections.ts

@@ -17,6 +17,7 @@ export default defineEventHandler(
   async (event): Promise<OSSIndexCategoryDetails | Error> => {
     const query = getQuery(event);
     const categorySlug: string = query?.categorySlug as string;
+    const sort: string = query?.sort as string;
 
     try {
       const resDetails = await fetchFromTinybird<Category[]>(
@@ -26,28 +27,31 @@ export default defineEventHandler(
         }
       );
 
-      const res = await fetchFromTinybird<OSSIndexCollectionTinybird[]>(
-        '/v0/pipes/collections_oss_index.json',
-        {
-          categorySlug
-        }
-      );
-
       const details: Category | undefined = resDetails.data.at(0);
 
       if (!details) {
         throw createError({ statusCode: 404, statusMessage: 'Category not found' });
       }
 
+      const res = await fetchFromTinybird<OSSIndexCollectionTinybird[]>(
+        '/v0/pipes/collections_oss_index.json',
+        {
+          categorySlug,
+          orderBy: sort,
+        }
+      );
+
       const collections = res.data.map((item) => ({
         ...item,
         topProjects: item.topProjects.map((collection) => {
-          const [id, count, name, logo] = collection;
+          const [id, count, name, logo, softwareValue, avgScore] = collection;
           return {
             id: id as string,
             count: count as number,
             name: name as string,
-            logo: logo as string
+            logo: logo as string,
+            softwareValue: softwareValue as number,
+            avgScore: avgScore as number
           };
         })
       }));

frontend/server/api/ossindex/groups.ts

@@ -14,32 +14,38 @@ import type {OSSIndexCategoryGroup, OSSIndexCategoryGroupTinybird} from "~~/type
 export default defineEventHandler(async (event): Promise<OSSIndexCategoryGroup[] | Error> => {
     const query = getQuery(event);
     const type: string = (query?.type as string);
+    const sort: string = (query?.sort as string);
 
     try {
         const res = await fetchFromTinybird<OSSIndexCategoryGroupTinybird[]>(
             '/v0/pipes/category_groups_oss_index.json',
             {
                 type,
+                orderBy: sort,
             }
         );
 
         return res.data.map((item) => ({
             ...item,
             topCollections: item.topCollections.map((collection) => {
-                const [id, count, name] = collection;
+                const [id, count, name, softwareValue, avgScore] = collection;
                 return {
                     id: id as string,
                     count: count as number,
                     name: name as string,
+                    softwareValue: softwareValue as number,
+                    avgScore: avgScore as number,
                 };
             }),
             topProjects: item.topProjects.map((collection) => {
-                const [id, count, name, logo] = collection;
+                const [id, count, name, logo, softwareValue, avgScore] = collection;
                 return {
                     id: id as string,
                     count: count as number,
                     name: name as string,
                     logo: logo as string,
+                    softwareValue: softwareValue as number,
+                    avgScore: avgScore as number,
                 };
             })
         }))

frontend/types/open-source-index/responses.types.ts

@@ -10,6 +10,8 @@ export interface OSSIndexCategoryGroupTinybird {
     type: string;
     slug: string;
     totalContributors: number;
+    softwareValue: number;
+    avgScore: number;
     topCollections: (string | number)[][];
     topProjects: (string | number)[][];
 }
@@ -20,6 +22,8 @@ export interface OSSIndexCategoryGroup {
     type: string;
     slug: string;
     totalContributors: number;
+    softwareValue: number;
+    avgScore: number;
     topCollections: OSSIndexTopCollection[];
     topProjects: OSSIndexTopProject[];
 }

frontend/types/ossindex/category-group.ts

@@ -9,6 +9,8 @@ export interface OSSIndexCategoryTinybird {
     name: string;
     slug: string;
     totalContributors: number;
+    softwareValue: number;
+    avgScore: number;
     topCollections: (string | number)[][];
     topProjects: (string | number)[][];
 }
@@ -18,6 +20,8 @@ export interface OSSIndexCategory {
     name: string;
     slug: string;
     totalContributors: number;
+    softwareValue: number;
+    avgScore: number;
     topCollections: OSSIndexTopCollection[];
     topProjects: OSSIndexTopProject[];
 }

frontend/types/ossindex/category.ts

@@ -7,6 +7,8 @@ export interface OSSIndexCollectionTinybird {
     name: string;
     slug: string;
     totalContributors: number;
+    softwareValue: number;
+    avgScore: number;
     topProjects: (string | number)[][];
 }
 
@@ -15,5 +17,7 @@ export interface OSSIndexCollection {
     name: string;
     slug: string;
     totalContributors: number;
+    softwareValue: number;
+    avgScore: number;
     topProjects: OSSIndexTopProject[];
 }

frontend/types/ossindex/collection.ts

@@ -4,11 +4,15 @@ export interface OSSIndexTopCollection {
     id: string;
     count: number;
     name: string;
+    softwareValue: number;
+    avgScore: number;
 }
 
 export interface OSSIndexTopProject {
     id: string;
     count: number;
     name: string;
     logo: string;
+    softwareValue: number;
+    avgScore: number;
 }