From c28824a58ec6a85a0977c0281e6ce4760a401f0f Mon Sep 17 00:00:00 2001 From: Amin Ghasempoor Date: Sun, 5 Jan 2025 07:25:53 +0000 Subject: [PATCH 1/3] bugfix rahdar code and car code --- src/core/components/CarCode.jsx | 3 +-- src/core/components/RahdarCode.jsx | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/components/CarCode.jsx b/src/core/components/CarCode.jsx index 8914acb..a5e5ea7 100644 --- a/src/core/components/CarCode.jsx +++ b/src/core/components/CarCode.jsx @@ -21,8 +21,7 @@ const CarCode = ({ carCode, setCarCode, inputValueDefault = "", error, multiple requestOptions: { signal: controller.signal }, }) .then((response) => { - const combinedArray = [...carCode, ...response.data.data]; - + const combinedArray = carCode ? [...carCode, ...response.data.data] : [...response.data.data]; const uniqueArray = Array.from(new Map(combinedArray.map((item) => [item.id, item])).values()); setOptions(uniqueArray || []); }) diff --git a/src/core/components/RahdarCode.jsx b/src/core/components/RahdarCode.jsx index f6d0e90..1c374ee 100644 --- a/src/core/components/RahdarCode.jsx +++ b/src/core/components/RahdarCode.jsx @@ -22,7 +22,9 @@ const RahdarCode = ({ rahdarsCode, setRahdarsCode, error, multiple = true }) => requestOptions: { signal: controller.signal }, }) .then((response) => { - const combinedArray = [...rahdarsCode, ...response.data.data]; + const combinedArray = rahdarsCode + ? [...rahdarsCode, ...response.data.data] + : [...response.data.data]; const uniqueArray = Array.from(new Map(combinedArray.map((item) => [item.id, item])).values()); setOptions(uniqueArray || []); }) From dd4720b63682d24b9007aea80bff324833838813 Mon Sep 17 00:00:00 2001 From: Amin Ghasempoor Date: Sun, 5 Jan 2025 08:08:32 +0000 Subject: [PATCH 2/3] edit form default values --- .../RowActions/EditForm/EditController.jsx | 16 +++++++++++++++- .../RowActions/EditForm/EditFormContent.jsx | 10 +++++----- .../RowActions/EditForm/EditFormCreate.jsx | 4 ++-- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx index 169170b..8f317ee 100644 --- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx +++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx @@ -33,7 +33,21 @@ const EditController = ({ rowId, mutate, setOpenEditDialog, openEditDialog, row }} > ویرایش اطلاعات - + ); }; diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx index 7bd5a49..37784dc 100644 --- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx +++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx @@ -8,11 +8,11 @@ const EditFormContent = ({ setOpenEditDialog, onSubmit, defaultData }) => { const subItem = subItemsList.find((SubItem) => SubItem.sub_item === defaultData?.sub_item); const defaultValues = { - before_image: defaultData?.files[0]?.full_path_for_fast_react || null, - after_image: defaultData?.files[1]?.full_path_for_fast_react || null, - amount: defaultData?.sub_item_data || null, - start_point: { lat: defaultData?.start_lat || "", lng: defaultData?.start_lng || "" }, - end_point: { lat: defaultData?.end_lat || "", lng: defaultData?.end_lng || "" }, + before_image: defaultData?.before_image || null, + after_image: defaultData?.after_image || null, + amount: defaultData?.amount || null, + start_point: defaultData?.start_point || { lat: "", lng: "" }, + end_point: defaultData?.end_point || { lat: "", lng: "" }, cmms_machines: defaultData?.cmms_machines || null, rahdaran_id: defaultData?.rahdaran || null, }; diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate.jsx index fef124f..4bd9a9c 100644 --- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate.jsx +++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate.jsx @@ -72,8 +72,8 @@ const EditFormCreate = ({ defaultData, subItem, onSubmitBase, defaultValues, set {subItem.needs_image === 1 ? ( Date: Sun, 5 Jan 2025 08:21:24 +0000 Subject: [PATCH 3/3] Bugfix/default values --- .../Actions/Create/Forms/CreateFormContent.jsx | 15 +++++++++++++-- .../RowActions/EditForm/EditController.jsx | 4 ++-- .../RowActions/EditForm/EditFormContent.jsx | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx index 17fd595..d6311e9 100644 --- a/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx +++ b/src/components/dashboard/roadItems/operator/Actions/Create/Forms/CreateFormContent.jsx @@ -137,15 +137,26 @@ const CreateFormContent = ({ setOpen, onSubmit }) => { const onSubmitBase = (data) => { let result = { ...data }; - result.before_image === null && delete result.before_image; - result.after_image === null && delete result.after_image; + if (result.before_image === null) { + delete result.before_image; + delete data.before_image; + } + + if (result.after_image === null) { + delete result.after_image; + delete data.after_image; + } + if (result.end_point === "") { delete result.end_point; + delete data.end_point; } else { result.end_point = `${result.end_point.lat},${result.end_point.lng}`; } + if (result.start_point === "") { delete result.start_point; + delete data.start_point; } else { result.start_point = `${result.start_point.lat},${result.start_point.lng}`; } diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx index 8f317ee..164fc70 100644 --- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx +++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditController.jsx @@ -39,8 +39,8 @@ const EditController = ({ rowId, mutate, setOpenEditDialog, openEditDialog, row defaultData={{ before_image: row.original?.files[0]?.full_path_for_fast_react || null, after_image: row.original?.files[1]?.full_path_for_fast_react || null, - item: row.original?.item || null, - sub_item: row.original?.sub_item || null, + item_id: row.original?.item || null, + sub_item_id: row.original?.sub_item || null, amount: row.original?.sub_item_data || null, start_point: { lat: row.original?.start_lat || "", lng: row.original?.start_lng || "" }, end_point: { lat: row.original?.end_lat || "", lng: row.original?.end_lng || "" }, diff --git a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx index 37784dc..095c706 100644 --- a/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx +++ b/src/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormContent.jsx @@ -4,8 +4,8 @@ import useRoadItemGetISubtems from "@/lib/hooks/useRoadItemGetISubtems"; import EditFormCreate from "@/components/dashboard/roadItems/operator/RowActions/EditForm/EditFormCreate"; const EditFormContent = ({ setOpenEditDialog, onSubmit, defaultData }) => { - const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetISubtems(defaultData?.item); - const subItem = subItemsList.find((SubItem) => SubItem.sub_item === defaultData?.sub_item); + const { subItemsList, loadingSubItemsList, errorSubItemsList } = useRoadItemGetISubtems(defaultData?.item_id); + const subItem = subItemsList.find((SubItem) => SubItem.sub_item === defaultData?.sub_item_id); const defaultValues = { before_image: defaultData?.before_image || null,