Merge pull request #95 from escottalexander/graph-adjustments

Graph adjustments
BuidlGuidl · Apr 15, 2024 · 101b1ae · 101b1ae
2 parents aa715c0 + 43619d6
commit 101b1ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/nextjs/components/impact-vector/ImpactVectorGraph.tsx b/packages/nextjs/components/impact-vector/ImpactVectorGraph.tsx
@@ -64,7 +64,7 @@ const transformData = (impactData: DataSet[]): any[] => {
 
 // Function to sort array in descending order based on opAllocation
 const sortByTotalDescending = (dataSetArray: any[]) => {
-  return dataSetArray.slice().sort((a, b) => b.opAllocation - a.opAllocation);
+  return dataSetArray.slice().sort((a, b) => a.opAllocation - b.opAllocation);
 };
 
 export default function ImpactVectorGraph({

diff --git a/packages/nextjs/pages/api/impact/index.ts b/packages/nextjs/pages/api/impact/index.ts
@@ -53,14 +53,14 @@ async function getImpact(vectorWeights: VectorWeight[]) {
   const allProjects = await getProjects();
   const scoredProjects = await scoreProjectsByVectorWeight({ allProjects, vectorWeights });
 
-  const nonZeroProjects = scoredProjects.filter(project => project.score > 0);
-
   // Calculate total OP allocated to each project
-  const totalScore = nonZeroProjects.reduce((total, curr) => total + curr.score, 0);
-  const projectsWithOPAllocated = nonZeroProjects.map(project => ({
-    ...project,
-    opAllocation: (project.score / totalScore) * 10000000,
-  }));
+  const totalScore = scoredProjects.reduce((total, curr) => total + curr.score, 0);
+  const projectsWithOPAllocated = scoredProjects
+    .map(project => ({
+      ...project,
+      opAllocation: (project.score / totalScore) * 10000000,
+    }))
+    .filter(project => project.opAllocation >= 1);
   return projectsWithOPAllocated;
 }