diff --git a/client/src/pages/filaments/show.tsx b/client/src/pages/filaments/show.tsx index 0df6d42..dd6e719 100644 --- a/client/src/pages/filaments/show.tsx +++ b/client/src/pages/filaments/show.tsx @@ -7,6 +7,7 @@ import dayjs from "dayjs"; import utc from "dayjs/plugin/utc"; import { IFilament } from "./model"; import { enrichText } from "../../utils/parsing"; +import { IVendor } from "../vendors/model"; dayjs.extend(utc); @@ -20,10 +21,17 @@ export const FilamentShow: React.FC = () => { const record = data?.data; + const formatVendor = (item: IVendor) => { + const URL = `/vendor/show/${item.id}`; + return {item.name}; + }; + return ( {t("filament.fields.id")} + {t("filament.fields.vendor")} + {t("filament.fields.registered")} = () => { const record = data?.data; + const formatFilament = (item: IFilament) => { + let vendorPrefix = ""; + if (item.vendor) { + vendorPrefix = `${item.vendor.name} - `; + } + let name = item.name; + if (!name) { + name = `ID: ${item.id}`; + } + let material = ""; + if (item.material) { + material = ` - ${item.material}`; + } + const label = `${vendorPrefix}${name}${material}`; + const URL = `/filament/show/${item.id}`; + return {label}; + }; + return ( {t("spool.fields.id")} + {t("spool.fields.filament")} + {t("spool.fields.registered")} = () => { title={dayjs.utc(record?.last_used).local().format()} format="YYYY-MM-DD HH:mm:ss" /> - {/* {t("spool.fields.filament_id")} - {filamentIsLoading ? ( - <>Loading... - ) : ( - <>{filamentData?.data?.id} - )} */} {t("spool.fields.remaining_length")}