From 2dc01d31ac14e67a0ccd709691efc897b7b7a8ea Mon Sep 17 00:00:00 2001
From: ferreo <harderthanfire@gmail.com>
Date: Sun, 4 Aug 2024 12:28:34 +0100
Subject: [PATCH] Update to follow new package source versioning

---
 src/components/pages/errored.tsx  |  3 +--
 src/components/pages/i386.tsx     |  8 +++-----
 src/components/pages/packages.tsx | 17 ++++++++---------
 src/hooks/usePackageData.ts       |  3 +++
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/components/pages/errored.tsx b/src/components/pages/errored.tsx
index ab906ea..b33e683 100644
--- a/src/components/pages/errored.tsx
+++ b/src/components/pages/errored.tsx
@@ -72,11 +72,10 @@ const Errored: React.FC = () => {
     });
 
     const packData = await packResp.json();
-    const firstPackage = packData.Packages[Object.keys(packData.Packages)[0]];
     if (packResp.ok) {
       setRebuildData({
         packageName: pkg.Name,
-        version: firstPackage.NewVersion || firstPackage.Version,
+        version: packData.NewVersion || packData.Version,
         buildType: "lto",
         rebuild: false,
       });
diff --git a/src/components/pages/i386.tsx b/src/components/pages/i386.tsx
index 8f07181..d75b176 100644
--- a/src/components/pages/i386.tsx
+++ b/src/components/pages/i386.tsx
@@ -70,11 +70,10 @@ const I386: React.FC = () => {
     });
 
     const packData = await packResp.json();
-    const firstPackage = packData.Packages[Object.keys(packData.Packages)[0]];
     if (packResp.ok) {
       setRebuildData({
         packageName: pkg.Name,
-        version: firstPackage.NewVersion || firstPackage.Version,
+        version: packData.NewVersion || packData.Version,
         buildType: "i386",
         rebuild: false,
       });
@@ -96,8 +95,7 @@ const I386: React.FC = () => {
             method: "GET",
           });
           const packData = await packResp.json();
-          const firstPackage = packData.Packages[Object.keys(packData.Packages)[0]];
-          pkg.version = firstPackage.NewVersion || firstPackage.Version;
+          pkg.version = packData.NewVersion || packData.Version;
         }
 
         const response = await fetch("/api/admin/triggerbuild", {
@@ -250,7 +248,7 @@ const I386: React.FC = () => {
             </div>
             <div className="grid grid-cols-4 items-center gap-4">
               <label htmlFor="rebuild" className="text-right">
-                Build
+                Rebuild
               </label>
               <Checkbox
                 id="rebuild"
diff --git a/src/components/pages/packages.tsx b/src/components/pages/packages.tsx
index 14da43a..3f73afc 100644
--- a/src/components/pages/packages.tsx
+++ b/src/components/pages/packages.tsx
@@ -142,7 +142,6 @@ const Packages: React.FC = () => {
   </TableRow>
 ) : (
   packages.map((pkg) => {
-    const firstPackage = Object.values(pkg.Packages)[0];
     return (
       <TableRow
         key={pkg.Name}
@@ -155,16 +154,16 @@ const Packages: 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.Version}
               </span>
-              {firstPackage.NewVersion && (
+              {pkg.NewVersion && (
                 <span className="truncate block">
-                  → {firstPackage.NewVersion}
+                  → {pkg.NewVersion}
                 </span>
               )}
             </div>
@@ -173,18 +172,18 @@ const Packages: React.FC = () => {
         <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.Version}
             </span>
-            {firstPackage.NewVersion && (
+            {pkg.NewVersion && (
               <span className="text-sm text-muted-foreground truncate">
-                → {firstPackage.NewVersion}
+                → {pkg.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>
       </TableRow>
diff --git a/src/hooks/usePackageData.ts b/src/hooks/usePackageData.ts
index 15d218d..db042aa 100644
--- a/src/hooks/usePackageData.ts
+++ b/src/hooks/usePackageData.ts
@@ -16,6 +16,9 @@ interface CountResponse {
 
 interface PackageData {
   Name: string;
+  Version: string;
+  NewVersion: string;
+  Status: string;
   Packages: {
     [key: string]: {
       Version: string;