jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2025-12-17 02:36:17 +01:00
Code Issues Packages Projects Releases 2 Wiki Activity

correctly sort status column in containers table (#1294)

Browse Source
This commit is contained in:
henrygd
2025-10-19 11:18:32 -04:00
parent f4abbd1a5b
commit 03900e54cc
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/site/src/components/containers-table/containers-table-columns.tsx
View File

@@ -19,6 +19,20 @@ import { t } from "@lingui/core/macro"
import { $allSystemsById } from "@/lib/stores" import { $allSystemsById } from "@/lib/stores"
import { useStore } from "@nanostores/react" import { useStore } from "@nanostores/react"
// Unit names and their corresponding number of seconds for converting docker status strings
const unitSeconds = [["s", 1], ["mi", 60], ["h", 3600], ["d", 86400], ["w", 604800], ["mo", 2592000]] as const
// Convert docker status string to number of seconds ("Up X minutes", "Up X hours", etc.)
function getStatusValue(status: string): number {
const [_, num, unit] = status.split(" ")
const numValue = Number(num)
for (const [unitName, value] of unitSeconds) {
if (unit.startsWith(unitName)) {
return numValue * value
}
}
return 0
}
export const containerChartCols: ColumnDef<ContainerRecord>[] = [ export const containerChartCols: ColumnDef<ContainerRecord>[] = [
{ {
id: "name", id: "name",
@@ -115,6 +129,7 @@ export const containerChartCols: ColumnDef<ContainerRecord>[] = [
id: "status", id: "status",
accessorFn: (record) => record.status, accessorFn: (record) => record.status,
invertSorting: true, invertSorting: true,
sortingFn: (a, b) => getStatusValue(a.original.status) - getStatusValue(b.original.status),
header: ({ column }) => <HeaderButton column={column} name={t`Status`} Icon={HourglassIcon} />, header: ({ column }) => <HeaderButton column={column} name={t`Status`} Icon={HourglassIcon} />,
cell: ({ getValue }) => { cell: ({ getValue }) => {
return <span className="ms-1.5 w-25 block truncate">{getValue() as string}</span> return <span className="ms-1.5 w-25 block truncate">{getValue() as string}</span>