repo-tools/isambard
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updaed API

Browse Source
This commit is contained in:
ferreo 2024-07-30 02:12:52 +01:00
parent 086b09df12
commit eb7c9daba2
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/pages/packages.tsx
View File

@ -141,18 +141,18 @@ const Packages: React.FC = () => {
</TableCell> </TableCell>
</TableRow> </TableRow>
) : ( ) : (
Object.entries(packages).map(([pkgName, pkgInfo]) => { packages.map((pkg, i) => {
const firstPackage = Object.values(pkgInfo.Packages)[0]; const firstPackage = pkg.Packages[0];
return ( return (
<TableRow <TableRow
key={pkgName} key={pkg.Name}
className="md:table-row border-b last:border-b-0" className="md:table-row border-b last:border-b-0"
> >
<TableCell className="w-full md:w-1/2 py-2 md:py-4"> <TableCell className="w-full md:w-1/2 py-2 md:py-4">
<div className="flex flex-col h-full md:h-auto"> <div className="flex flex-col h-full md:h-auto">
<div className="flex justify-between items-start mb-2 md:mb-0"> <div className="flex justify-between items-start mb-2 md:mb-0">
<span className="font-medium truncate mr-2"> <span className="font-medium truncate mr-2">
{pkgName} {pkg.Name}
</span> </span>
<span className="text-sm md:hidden truncate"> <span className="text-sm md:hidden truncate">
{firstPackage.Status} {firstPackage.Status}

16
src/components/pages/queue.tsx
View File

@ -144,32 +144,32 @@ const Queue: React.FC = () => {
Loading... Loading...
</TableCell> </TableCell>
</TableRow> </TableRow>
) : Object.keys(packages).length === 0 ? ( ) : packages.length === 0 ? (
<TableRow> <TableRow>
<TableCell colSpan={3} className="text-center"> <TableCell colSpan={3} className="text-center">
No packages found. No packages found.
</TableCell> </TableCell>
</TableRow> </TableRow>
) : ( ) : (
Object.entries(packages).map(([pkgName, pkgInfo]) => { packages.map((pkg) => {
return ( return (
<TableRow <TableRow
key={pkgName} key={pkg.Source.Name}
className="md:table-row border-b last:border-b-0" className="md:table-row border-b last:border-b-0"
> >
<TableCell className="w-full md:w-1/2 py-2 md:py-4"> <TableCell className="w-full md:w-1/2 py-2 md:py-4">
<div className="flex flex-col h-full md:h-auto"> <div className="flex flex-col h-full md:h-auto">
<div className="flex justify-between items-start mb-2 md:mb-0"> <div className="flex justify-between items-start mb-2 md:mb-0">
<span className="font-medium truncate mr-2"> <span className="font-medium truncate mr-2">
{pkgName} - {pkgInfo.Type} {pkg.Source.Name} - {pkg.Type}
</span> </span>
<span className="text-sm md:hidden truncate"> <span className="text-sm md:hidden truncate">
{pkgInfo.Status} {pkg.Status}
</span> </span>
</div> </div>
<div className="md:hidden text-sm text-muted-foreground text-center"> <div className="md:hidden text-sm text-muted-foreground text-center">
<span className="truncate"> <span className="truncate">
{pkgInfo.BuildVersion} {pkg.BuildVersion}
</span> </span>
</div> </div>
</div> </div>
@ -177,12 +177,12 @@ const Queue: React.FC = () => {
<TableCell className="hidden md:table-cell md:w-1/4 py-4 text-left"> <TableCell className="hidden md:table-cell md:w-1/4 py-4 text-left">
<div className="flex flex-col"> <div className="flex flex-col">
<span className="truncate"> <span className="truncate">
{pkgInfo.BuildVersion} {pkg.BuildVersion}
</span> </span>
</div> </div>
</TableCell> </TableCell>
<TableCell className="hidden md:table-cell md:w-1/4 py-2 md:py-4 text-left"> <TableCell className="hidden md:table-cell md:w-1/4 py-2 md:py-4 text-left">
<span className="truncate">{pkgInfo.Status}</span> <span className="truncate">{pkg.Status}</span>
</TableCell> </TableCell>
</TableRow> </TableRow>
); );

6
src/hooks/useQueueData.ts
View File

@ -34,13 +34,13 @@ interface PackageData {
interface PackagesResponse { interface PackagesResponse {
total: number; total: number;
packages: Record<string, QueueData>; packages: QueueData[];
} }
const usePackageData = () => { const usePackageData = () => {
const [stats, setStats] = useState<PackageStats | null>(null); const [stats, setStats] = useState<PackageStats | null>(null);
const [lastUpdated, setLastUpdated] = useState<string>(''); const [lastUpdated, setLastUpdated] = useState<string>('');
const [packages, setQueuePackages] = useState<Record<string, QueueData>>({}); const [packages, setQueuePackages] = useState<QueueData[]>([]);
const [totalCount, setTotalCount] = useState(0); const [totalCount, setTotalCount] = useState(0);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const fetchStatsAttempted = useRef(false); const fetchStatsAttempted = useRef(false);
@ -74,7 +74,7 @@ const usePackageData = () => {
setQueuePackages(data.packages); setQueuePackages(data.packages);
} catch (error) { } catch (error) {
console.error("Error fetching packages:", error); console.error("Error fetching packages:", error);
setQueuePackages({}); setQueuePackages([]);
setTotalCount(0); setTotalCount(0);
} finally { } finally {
setLoading(false); setLoading(false);