calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-05-22 08:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix display and query issues

Browse Source
This commit is contained in:
Owen
2026-04-26 20:33:58 -07:00
parent 467cd70b72
commit 7318c86cca
4 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
messages/en-US.json
View File

@@ -1998,6 +1998,7 @@
"resourcesTableUnhealthy": "Unhealthy",
"resourcesTableUnknown": "Unknown",
"resourcesTableNotMonitored": "Not monitored",
"resourcesTableNoTargets": "No targets",
"editInternalResourceDialogEditClientResource": "Edit Private Resource",
"editInternalResourceDialogUpdateResourceProperties": "Update the resource configuration and access controls for {resourceName}",
"editInternalResourceDialogResourceProperties": "Resource Properties",

33
server/routers/resource/listResources.ts
View File

@@ -110,9 +110,9 @@ const listResourcesSchema = z.object({
.catch(undefined)
.openapi({
type: "string",
enum: ["no_targets", "healthy", "degraded", "offline", "unknown"],
enum: ["healthy", "degraded", "offline", "unknown"],
description:
"Filter resources based on health status of their targets. `healthy` means all targets are healthy. `degraded` means at least one target is unhealthy, but not all are unhealthy. `offline` means all targets are unhealthy. `unknown` means all targets have unknown health status. `no_targets` means the resource has no targets."
"Filter resources based on health status of their targets. `healthy` means all targets are healthy. `degraded` means at least one target is unhealthy, but not all are unhealthy. `offline` means all targets are unhealthy. `unknown` means all targets have unknown health status."
}),
siteId: z.coerce.number<string>().int().positive().optional().openapi({
type: "integer",
@@ -374,21 +374,22 @@ export async function listResources(
);
break;
}
if (typeof healthStatus !== "undefined") {
conditions.push(eq(resources.health, healthStatus));
}
if (siteId != null) {
const resourcesWithSite = db
.select({ resourceId: targets.resourceId })
.from(targets)
.innerJoin(sites, eq(targets.siteId, sites.siteId))
.where(
and(eq(sites.orgId, orgId), eq(sites.siteId, siteId))
);
conditions.push(
inArray(resources.resourceId, resourcesWithSite)
}
if (typeof healthStatus !== "undefined") {
conditions.push(eq(resources.health, healthStatus));
}
if (siteId != null) {
const resourcesWithSite = db
.select({ resourceId: targets.resourceId })
.from(targets)
.innerJoin(sites, eq(targets.siteId, sites.siteId))
.where(
and(eq(sites.orgId, orgId), eq(sites.siteId, siteId))
);
}
conditions.push(
inArray(resources.resourceId, resourcesWithSite)
);
}
const baseQuery = queryResourcesBase().where(and(...conditions));

2
src/components/HealthChecksTable.tsx
View File

@@ -586,7 +586,7 @@ export default function HealthChecksTable({
<Switch
checked={r.hcEnabled}
disabled={
!isPaid || togglingId === r.targetHealthCheckId
!isPaid || togglingId === r.targetHealthCheckId || !!r.resourceId
}
onCheckedChange={(v) => handleToggleEnabled(r, v)}
/>

12
src/components/ProxyResourcesTable.tsx
View File

@@ -90,7 +90,7 @@ export type ResourceRow = {
targetHost?: string;
targetPort?: number;
targets?: TargetHealth[];
health?: "online" | "degraded" | "unhealthy" | "unknown";
health?: "healthy" | "degraded" | "unhealthy" | "unknown";
sites: ResourceSiteRow[];
};
@@ -265,8 +265,8 @@ export default function ProxyResourcesTable({
>
<StatusIcon status={overallStatus} />
<span className="text-sm">
{overallStatus === "online" &&
t("resourcesTableHealthy")}
{overallStatus === "healthy" &&
t("resourcesTableHealthy")}
{overallStatus === "degraded" &&
t("resourcesTableDegraded")}
{overallStatus === "unhealthy" &&
@@ -469,7 +469,7 @@ export default function ProxyResourcesTable({
label: t("resourcesTableDegraded")
},
{
value: "unhealty",
value: "unhealthy",
label: t("resourcesTableUnhealthy")
},
{ value: "unknown", label: t("resourcesTableUnknown") }
@@ -488,7 +488,7 @@ export default function ProxyResourcesTable({
),
cell: ({ row }) => {
const resourceRow = row.original;
return <TargetStatusCell targets={resourceRow.targets} />;
return <TargetStatusCell targets={resourceRow.targets} healthStatus={resourceRow.health} />;
},
sortingFn: (rowA, rowB) => {
const statusA = rowA.original.health;
@@ -497,7 +497,7 @@ export default function ProxyResourcesTable({
if (!statusA) return 1;
if (!statusB) return -1;
const statusOrder = {
online: 3,
healthy: 3,
degraded: 2,
unhealthy: 1,
unknown: 0