tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Client: Improved show page titles

Browse Source
This commit is contained in:
Donkie
2023-08-13 10:14:48 +02:00
parent 373067bd09
commit 980284be1d
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/pages/filaments/show.tsx
View File

@@ -21,13 +21,21 @@ export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
const record = data?.data; const record = data?.data;
const formatTitle = (item: IFilament) => {
let vendorPrefix = "";
if (item.vendor) {
vendorPrefix = `${item.vendor.name} - `;
}
return `[Filament #${item.id}] ${vendorPrefix}${item.name}`;
};
const formatVendor = (item: IVendor) => { const formatVendor = (item: IVendor) => {
const URL = `/vendor/show/${item.id}`; const URL = `/vendor/show/${item.id}`;
return <a href={URL}>{item.name}</a>; return <a href={URL}>{item.name}</a>;
}; };
return ( return (
<Show isLoading={isLoading}> <Show isLoading={isLoading} title={record ? formatTitle(record) : ""}>
<Title level={5}>{t("filament.fields.id")}</Title> <Title level={5}>{t("filament.fields.id")}</Title>
<NumberField value={record?.id ?? ""} /> <NumberField value={record?.id ?? ""} />
<Title level={5}>{t("filament.fields.vendor")}</Title> <Title level={5}>{t("filament.fields.vendor")}</Title>

15
client/src/pages/spools/show.tsx
View File

@@ -34,17 +34,24 @@ export const SpoolShow: React.FC<IResourceComponentsProps> = () => {
if (item.material) { if (item.material) {
material = ` - ${item.material}`; material = ` - ${item.material}`;
} }
const label = `${vendorPrefix}${name}${material}`; return `${vendorPrefix}${name}${material}`;
};
const filamentURL = (item: IFilament) => {
const URL = `/filament/show/${item.id}`; const URL = `/filament/show/${item.id}`;
return <a href={URL}>{label}</a>; return <a href={URL}>{formatFilament(item)}</a>;
};
const formatTitle = (item: ISpool) => {
return `[Spool #${item.id}] ${formatFilament(item.filament)}`;
}; };
return ( return (
<Show isLoading={isLoading}> <Show isLoading={isLoading} title={record ? formatTitle(record) : ""}>
<Title level={5}>{t("spool.fields.id")}</Title> <Title level={5}>{t("spool.fields.id")}</Title>
<NumberField value={record?.id ?? ""} /> <NumberField value={record?.id ?? ""} />
<Title level={5}>{t("spool.fields.filament")}</Title> <Title level={5}>{t("spool.fields.filament")}</Title>
<TextField value={record ? formatFilament(record?.filament) : ""} /> <TextField value={record ? filamentURL(record?.filament) : ""} />
<Title level={5}>{t("spool.fields.registered")}</Title> <Title level={5}>{t("spool.fields.registered")}</Title>
<DateField <DateField
value={dayjs.utc(record?.registered).local()} value={dayjs.utc(record?.registered).local()}

6
client/src/pages/vendors/show.tsx vendored
View File

@@ -19,8 +19,12 @@ export const VendorShow: React.FC<IResourceComponentsProps> = () => {
const record = data?.data; const record = data?.data;
const formatTitle = (item: IVendor) => {
return `[Vendor #${item.id}] ${item.name}`;
};
return ( return (
<Show isLoading={isLoading}> <Show isLoading={isLoading} title={record ? formatTitle(record) : ""}>
<Title level={5}>{t("vendor.fields.id")}</Title> <Title level={5}>{t("vendor.fields.id")}</Title>
<NumberField value={record?.id ?? ""} /> <NumberField value={record?.id ?? ""} />
<Title level={5}>{t("vendor.fields.registered")}</Title> <Title level={5}>{t("vendor.fields.registered")}</Title>