From 105353c9f6e609530399a36cf7aa07ccc02746f8 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sat, 21 Jun 2025 16:15:34 +0800 Subject: [PATCH] add factory utils for creating header function --- client/src/Components/Table/TableUtils.js | 11 +++ .../Pages/Queue/components/JobTable/index.jsx | 86 +++---------------- 2 files changed, 23 insertions(+), 74 deletions(-) create mode 100644 client/src/Components/Table/TableUtils.js diff --git a/client/src/Components/Table/TableUtils.js b/client/src/Components/Table/TableUtils.js new file mode 100644 index 000000000..a9f95a5b7 --- /dev/null +++ b/client/src/Components/Table/TableUtils.js @@ -0,0 +1,11 @@ +export const createHeaderFactory = (getCellSx = () => {}) => { + return ({ id, content, onClick = () => {}, render = () => {} }) => { + return { + id, + content, + onClick, + getCellSx, + render, + }; + }; +}; diff --git a/client/src/Pages/Queue/components/JobTable/index.jsx b/client/src/Pages/Queue/components/JobTable/index.jsx index 3bce34fff..3b694a991 100644 --- a/client/src/Pages/Queue/components/JobTable/index.jsx +++ b/client/src/Pages/Queue/components/JobTable/index.jsx @@ -7,6 +7,7 @@ import { useTheme } from "@emotion/react"; import { useNavigate } from "react-router-dom"; import { TypeToPathMap } from "../../../../Utils/monitorUtils"; import { useTranslation } from "react-i18next"; +import { createHeaderFactory } from "../../../../Components/Table/TableUtils"; const JobTable = ({ jobs = [] }) => { const theme = useTheme(); @@ -33,110 +34,47 @@ const JobTable = ({ jobs = [] }) => { return {}; }; - const headers = [ + const createHeader = createHeaderFactory(buildSx); + const headersData = [ { id: "id", content: t("queuePage.jobTable.idHeader"), - render: (row) => { - return row.monitorId; - }, - getCellSx: (row) => { - return buildSx(row); - }, + render: (row) => row.monitorId, }, { id: "url", content: t("queuePage.jobTable.urlHeader"), - render: (row) => { - return row.monitorUrl; - }, - getCellSx: (row) => { - return buildSx(row); - }, + render: (row) => row.monitorUrl, }, { id: "type", content: t("queuePage.jobTable.typeHeader"), - render: (row) => { - return row.monitorType; - }, - getCellSx: (row) => { - return buildSx(row); - }, + render: (row) => row.monitorType, }, { id: "active", content: t("queuePage.jobTable.activeHeader"), - render: (row) => { - return row.active.toString(); - }, - getCellSx: (row) => { - return buildSx(row); - }, + render: (row) => row.active.toString(), }, { id: "runCount", content: t("queuePage.jobTable.runCountHeader"), - render: (row) => { - return row.runCount; - }, - getCellSx: (row) => { - return buildSx(row); - }, + render: (row) => row.runCount, }, { id: "failCount", content: t("queuePage.jobTable.failCountHeader"), - render: (row) => { - return row.failCount; - }, - getCellSx: (row) => { - return buildSx(row); - }, + render: (row) => row.failCount, }, { id: "lastRun", content: t("queuePage.jobTable.lastRunHeader"), - render: (row) => { - return row.lastRunAt || "-"; - }, - getCellSx: (row) => { - return buildSx(row); - }, - }, - { - id: "lockedAt", - content: t("queuePage.jobTable.lockedAtHeader"), - render: (row) => { - return row.lockedAt || "-"; - }, - getCellSx: (row) => { - return buildSx(row); - }, - }, - { - id: "lastFinish", - content: t("queuePage.jobTable.lastFinishedAtHeader"), - render: (row) => { - return row.lastFinishedAt || "-"; - }, - getCellSx: (row) => { - return buildSx(row); - }, - }, - { - id: "lastRunTook", - content: t("queuePage.jobTable.lastRunTookHeader"), - render: (row) => { - const value = row.lastRunTook ? row.lastRunTook + " ms" : "-"; - return value; - }, - getCellSx: (row) => { - return buildSx(row); - }, + render: (row) => row.lastRunAt || "-", }, ]; + const headers = headersData.map((header) => createHeader(header)); + return ( {t("queuePage.jobTable.title")}