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

Update to follow new package source versioning

Browse Source
This commit is contained in:
ferreo 2024-08-04 12:28:34 +01:00
parent 7a4df6fa07
commit 2dc01d31ac
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/pages/errored.tsx
View File

@ -72,11 +72,10 @@ const Errored: React.FC = () => {
}); });
const packData = await packResp.json(); const packData = await packResp.json();
const firstPackage = packData.Packages[Object.keys(packData.Packages)[0]];
if (packResp.ok) { if (packResp.ok) {
setRebuildData({ setRebuildData({
packageName: pkg.Name, packageName: pkg.Name,
version: firstPackage.NewVersion || firstPackage.Version, version: packData.NewVersion || packData.Version,
buildType: "lto", buildType: "lto",
rebuild: false, rebuild: false,
}); });

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

@ -70,11 +70,10 @@ const I386: React.FC = () => {
}); });
const packData = await packResp.json(); const packData = await packResp.json();
const firstPackage = packData.Packages[Object.keys(packData.Packages)[0]];
if (packResp.ok) { if (packResp.ok) {
setRebuildData({ setRebuildData({
packageName: pkg.Name, packageName: pkg.Name,
version: firstPackage.NewVersion || firstPackage.Version, version: packData.NewVersion || packData.Version,
buildType: "i386", buildType: "i386",
rebuild: false, rebuild: false,
}); });
@ -96,8 +95,7 @@ const I386: React.FC = () => {
method: "GET", method: "GET",
}); });
const packData = await packResp.json(); const packData = await packResp.json();
const firstPackage = packData.Packages[Object.keys(packData.Packages)[0]]; pkg.version = packData.NewVersion || packData.Version;
pkg.version = firstPackage.NewVersion || firstPackage.Version;
} }
const response = await fetch("/api/admin/triggerbuild", { const response = await fetch("/api/admin/triggerbuild", {
@ -250,7 +248,7 @@ const I386: React.FC = () => {
</div> </div>
<div className="grid grid-cols-4 items-center gap-4"> <div className="grid grid-cols-4 items-center gap-4">
<label htmlFor="rebuild" className="text-right"> <label htmlFor="rebuild" className="text-right">
Build Rebuild
</label> </label>
<Checkbox <Checkbox
id="rebuild" id="rebuild"

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

@ -142,7 +142,6 @@ const Packages: React.FC = () => {
</TableRow> </TableRow>
) : ( ) : (
packages.map((pkg) => { packages.map((pkg) => {
const firstPackage = Object.values(pkg.Packages)[0];
return ( return (
<TableRow <TableRow
key={pkg.Name} key={pkg.Name}
@ -155,16 +154,16 @@ const Packages: React.FC = () => {
{pkg.Name} {pkg.Name}
</span> </span>
<span className="text-sm md:hidden truncate"> <span className="text-sm md:hidden truncate">
{firstPackage.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">
{firstPackage.Version} {pkg.Version}
</span> </span>
{firstPackage.NewVersion && ( {pkg.NewVersion && (
<span className="truncate block"> <span className="truncate block">
→ {firstPackage.NewVersion} → {pkg.NewVersion}
</span> </span>
)} )}
</div> </div>
@ -173,18 +172,18 @@ const Packages: 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">
{firstPackage.Version} {pkg.Version}
</span> </span>
{firstPackage.NewVersion && ( {pkg.NewVersion && (
<span className="text-sm text-muted-foreground truncate"> <span className="text-sm text-muted-foreground truncate">
→ {firstPackage.NewVersion} → {pkg.NewVersion}
</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"> <span className="truncate">
{firstPackage.Status} {pkg.Status}
</span> </span>
</TableCell> </TableCell>
</TableRow> </TableRow>

3
src/hooks/usePackageData.ts
View File

@ -16,6 +16,9 @@ interface CountResponse {
interface PackageData { interface PackageData {
Name: string; Name: string;
Version: string;
NewVersion: string;
Status: string;
Packages: { Packages: {
[key: string]: { [key: string]: {
Version: string; Version: string;