diff --git a/client/src/pages/spools/create.tsx b/client/src/pages/spools/create.tsx index 41b407b..66f12e2 100644 --- a/client/src/pages/spools/create.tsx +++ b/client/src/pages/spools/create.tsx @@ -9,9 +9,22 @@ import { IFilament } from "../filaments/model"; export const SpoolCreate: React.FC = () => { const { formProps, saveButtonProps } = useForm(); - const { selectProps } = useSelect({ + const { queryResult } = useSelect({ resource: "filament", - optionLabel: "name", + }); + + const filamentOptions = queryResult.data?.data.map((item) => { + let label; + if (item.vendor) { + label = `${item.vendor.name} - ${item.name}`; + } else { + label = item.name; + } + + return { + label: label, + value: item.id, + }; }); return ( @@ -54,7 +67,7 @@ export const SpoolCreate: React.FC = () => { }, ]} > - = () => { const { formProps, saveButtonProps } = useForm(); - const { selectProps } = useSelect({ + const { queryResult } = useSelect({ resource: "filament", - optionLabel: "name", + }); + + const filamentOptions = queryResult.data?.data.map((item) => { + let label; + if (item.vendor) { + label = `${item.vendor.name} - ${item.name}`; + } else { + label = item.name; + } + + return { + label: label, + value: item.id, + }; }); if (formProps.initialValues) { @@ -84,7 +97,7 @@ export const SpoolEdit: React.FC = () => { }, ]} > -