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

Client: Better spool filament select

Browse Source
This commit is contained in:
Donkie
2023-05-14 22:07:46 +02:00
parent e774c15a92
commit 1f90d7c3b1
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/src/pages/spools/create.tsx
View File

@@ -9,9 +9,22 @@ import { IFilament } from "../filaments/model";
export const SpoolCreate: React.FC<IResourceComponentsProps> = () => { export const SpoolCreate: React.FC<IResourceComponentsProps> = () => {
const { formProps, saveButtonProps } = useForm(); const { formProps, saveButtonProps } = useForm();
const { selectProps } = useSelect<IFilament>({ const { queryResult } = useSelect<IFilament>({
resource: "filament", 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 ( return (
@@ -54,7 +67,7 @@ export const SpoolCreate: React.FC<IResourceComponentsProps> = () => {
}, },
]} ]}
> >
<Select {...selectProps} /> <Select options={filamentOptions} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Used Weight" label="Used Weight"

19
client/src/pages/spools/edit.tsx
View File

@@ -9,9 +9,22 @@ import { IFilament } from "../filaments/model";
export const SpoolEdit: React.FC<IResourceComponentsProps> = () => { export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
const { formProps, saveButtonProps } = useForm(); const { formProps, saveButtonProps } = useForm();
const { selectProps } = useSelect<IFilament>({ const { queryResult } = useSelect<IFilament>({
resource: "filament", 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) { if (formProps.initialValues) {
@@ -84,7 +97,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
}, },
]} ]}
> >
<Select {...selectProps} /> <Select options={filamentOptions} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Used Weight" label="Used Weight"