djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove initial data from tracking number form (#1910)

Browse source
This commit is contained in:
Dominik Żegleń 2022-03-21 12:35:19 +01:00 committed by GitHub
parent 045f1d068d
commit 90ff0ebb5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx
View file

@ -46,9 +46,13 @@ const OrderFulfillmentTrackingDialog: React.FC<OrderFulfillmentTrackingDialogPro
const formFields = ["trackingNumber"]; const formFields = ["trackingNumber"];
const formErrors = getFormErrors(formFields, errors); const formErrors = getFormErrors(formFields, errors);
const initialData: FormData = {
trackingNumber: trackingNumber || ""
};
return ( return (
<Dialog onClose={onClose} open={open} fullWidth maxWidth="xs"> <Dialog onClose={onClose} open={open} fullWidth maxWidth="xs">
<Form confirmLeave initial={{ trackingNumber }} onSubmit={onConfirm}> <Form confirmLeave initial={initialData} onSubmit={onConfirm}>
{({ change, data, submit }) => ( {({ change, data, submit }) => (
<> <>
<DialogTitle> <DialogTitle>

4
src/orders/views/OrderDetails/OrderNormalDetails/index.tsx
View file

@ -309,11 +309,11 @@ export const OrderNormalDetails: React.FC<OrderNormalDetailsProps> = ({
?.orderFulfillmentUpdateTracking.errors || [] ?.orderFulfillmentUpdateTracking.errors || []
} }
open={params.action === "edit-fulfillment"} open={params.action === "edit-fulfillment"}
trackingNumber={getStringOrPlaceholder( trackingNumber={
data?.order?.fulfillments.find( data?.order?.fulfillments.find(
fulfillment => fulfillment.id === params.id fulfillment => fulfillment.id === params.id
)?.trackingNumber )?.trackingNumber
)} }
onConfirm={variables => onConfirm={variables =>
orderFulfillmentUpdateTracking.mutate({ orderFulfillmentUpdateTracking.mutate({
id: params.id, id: params.id,

4
src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx
View file

@ -385,11 +385,11 @@ export const OrderUnconfirmedDetails: React.FC<OrderUnconfirmedDetailsProps> = (
?.orderFulfillmentUpdateTracking.errors || [] ?.orderFulfillmentUpdateTracking.errors || []
} }
open={params.action === "edit-fulfillment"} open={params.action === "edit-fulfillment"}
trackingNumber={getStringOrPlaceholder( trackingNumber={
data?.order?.fulfillments.find( data?.order?.fulfillments.find(
fulfillment => fulfillment.id === params.id fulfillment => fulfillment.id === params.id
)?.trackingNumber )?.trackingNumber
)} }
onConfirm={variables => onConfirm={variables =>
orderFulfillmentUpdateTracking.mutate({ orderFulfillmentUpdateTracking.mutate({
id: params.id, id: params.id,