diff --git a/src/components/JobList/index.tsx b/src/components/JobList/index.tsx index b1985f1..e4230c7 100644 --- a/src/components/JobList/index.tsx +++ b/src/components/JobList/index.tsx @@ -20,6 +20,7 @@ import { formatDate, formatDuration } from "../../lib/utils"; import DataGrid from "../../components/DataGrid"; import IconLink from "../../components/IconLink"; import type { Run, NodeJobs } from "../../lib/paddles.d"; +import { dirName } from "../../lib/utils"; import sentryIcon from "./assets/sentry.svg"; @@ -50,7 +51,7 @@ const columns: GridColDef[] = [ width: 75, valueGetter: (params: GridValueGetterParams) => { return { - log: params.row.log_href, + log: dirName(params.row.log_href), sentry: params.row.sentry_event, }; }, diff --git a/src/lib/utils.js b/src/lib/utils.js index 72822c0..fd0cb6f 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -38,4 +38,10 @@ function colorTint(hex, delta) { return "#" + convert.hsl.hex(hsl); } -export { formatDate, getDuration, formatDuration, colorTint }; +function dirName(path) { + const array = path.split("/"); + array.splice(-1, 1, ""); + return array.join("/"); +} + +export { formatDate, getDuration, formatDuration, colorTint, dirName }; diff --git a/src/pages/Job/index.jsx b/src/pages/Job/index.jsx index 0a7b5e9..89997a0 100644 --- a/src/pages/Job/index.jsx +++ b/src/pages/Job/index.jsx @@ -10,6 +10,7 @@ import ScheduleIcon from "@mui/icons-material/Schedule"; import PlayCircleOutlineIcon from "@mui/icons-material/PlayCircleOutline"; import CheckCircleOutlineIcon from "@mui/icons-material/CheckCircleOutline"; import HighlightOffIcon from "@mui/icons-material/HighlightOff"; +import FolderIcon from '@mui/icons-material/Folder'; import formatDuration from "date-fns/formatDuration"; import { isValid, parse } from "date-fns"; import Editor from "react-simple-code-editor"; @@ -21,7 +22,7 @@ import YAML from "json-to-pretty-yaml"; import Link from "../../components/Link"; import { useJob } from "../../lib/paddles"; -import { getDuration } from "../../lib/utils"; +import { getDuration, dirName } from "../../lib/utils"; function StatusIcon({ status }) { const theme = useTheme(); @@ -76,6 +77,18 @@ function JobHeader({ query }) { if (!query.isSuccess) return null; return ( <> + + + + {query.data.name}/{query.data.job_id} + + + + + + Log Archive + + Status: {query.data.status} @@ -167,12 +180,6 @@ export default function Job() { {`Job ${job_id} - Pulpito`} - - - - {name}/{job_id} - -