From 352d7aa8966a0cf2a436c02635019968b3aeafe6 Mon Sep 17 00:00:00 2001
From: ferreo <harderthanfire@gmail.com>
Date: Tue, 30 Jul 2024 20:43:27 +0100
Subject: [PATCH] Fix errored

---
 src/components/pages/errored.tsx | 22 +++++-----------------
 src/hooks/usePackageData.ts      | 11 +++++++++--
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/components/pages/errored.tsx b/src/components/pages/errored.tsx
index 93491df..edc33c8 100644
--- a/src/components/pages/errored.tsx
+++ b/src/components/pages/errored.tsx
@@ -66,11 +66,10 @@ const Errored: React.FC = () => {
   }, [loadPackages]);
 
   const handleRebuildClick = (pkg: any) => {
-    const firstPackage = Object.values(pkg.Packages)[0] as any;
     setSelectedPackage(pkg);
     setRebuildData({
       packageName: pkg.Name,
-      version: firstPackage.NewVersion || firstPackage.Version,
+      version: pkg.BuildVersion,
       buildType: "lto",
       rebuild: false,
     });
@@ -130,7 +129,6 @@ const Errored: React.FC = () => {
                   </TableRow>
                 ) : (
                   errPackages.map((pkg) => {
-                    const firstPackage = Object.values(pkg.Packages)[0];
                     return (
                       <TableRow
                         key={pkg.Name}
@@ -143,36 +141,26 @@ const Errored: React.FC = () => {
                                 {pkg.Name}
                               </span>
                               <span className="text-sm md:hidden truncate">
-                                {firstPackage.Status}
+                                {pkg.Status}
                               </span>
                             </div>
                             <div className="md:hidden text-sm text-muted-foreground text-center">
                               <span className="truncate">
-                                {firstPackage.Version}
+                                {pkg.BuildVersion}
                               </span>
-                              {firstPackage.NewVersion && (
-                                <span className="truncate block">
-                                  → {firstPackage.NewVersion}
-                                </span>
-                              )}
                             </div>
                           </div>
                         </TableCell>
                         <TableCell className="hidden md:table-cell md:w-1/4 py-4 text-left">
                           <div className="flex flex-col">
                             <span className="truncate">
-                              {firstPackage.Version}
+                              {pkg.BuildVersion}
                             </span>
-                            {firstPackage.NewVersion && (
-                              <span className="text-sm text-muted-foreground truncate">
-                                → {firstPackage.NewVersion}
-                              </span>
-                            )}
                           </div>
                         </TableCell>
                         <TableCell className="hidden md:table-cell md:w-1/4 py-2 md:py-4 text-left">
                           <span className="truncate">
-                            {firstPackage.Status}
+                            {pkg.Status}
                           </span>
                         </TableCell>
                         {isLoggedIn && (
diff --git a/src/hooks/usePackageData.ts b/src/hooks/usePackageData.ts
index 63cddb5..8b55e95 100644
--- a/src/hooks/usePackageData.ts
+++ b/src/hooks/usePackageData.ts
@@ -25,6 +25,13 @@ interface PackageData {
   };
 }
 
+interface ErrorData {
+  Name: string;
+  Status: string;
+  BuildVersion: string;
+  BuildNumber: number;
+}
+
 interface PackagesResponse {
   total: number;
   packages: PackageData[];
@@ -37,7 +44,7 @@ const usePackageData = () => {
     const [pkg, setPackage] = useState<PackageData | null>(null);
     const [totalCount, setTotalCount] = useState(0);
     const [loading, setLoading] = useState(false);
-    const [errPackages, setErrPackages] = useState<PackageData[]>([]);
+    const [errPackages, setErrPackages] = useState<ErrorData[]>([]);
     const fetchStatsAttempted = useRef(false);
   
     const fetchStats = useCallback(async () => {
@@ -104,7 +111,7 @@ const usePackageData = () => {
       setLoading(true);
       try {
         const response = await fetch('/api/errored');
-        const data: PackageData[] = await response.json();
+        const data: ErrorData[] = await response.json();
         setErrPackages(data);
       } catch (error) {
         console.error("Error fetching errored:", error);