From fee4fa8261bd5283bb274400cea8cc27d108f677 Mon Sep 17 00:00:00 2001
From: Amirhossein Mahmoodi <amir.mahmoodi74@gmail.com>
Date: Wed, 9 Aug 2023 15:48:26 +0330
Subject: [PATCH] add attachment to confirm and reject forms

---
 .../dashboard/machinary-office/Form/ConfirmForm.jsx         | 5 +++--
 .../dashboard/machinary-office/Form/RejectForm.jsx          | 5 +++--
 .../dashboard/passenger-boss/Form/ConfirmForm.jsx           | 5 +++--
 src/components/dashboard/passenger-boss/Form/RejectForm.jsx | 5 +++--
 .../dashboard/passenger-office/Form/ConfirmForm.jsx         | 5 +++--
 .../dashboard/passenger-office/Form/RejectForm.jsx          | 5 +++--
 .../dashboard/province-manager/Form/ConfirmForm.jsx         | 5 +++--
 .../dashboard/province-manager/Form/RejectForm.jsx          | 5 +++--
 .../transportation-assistance/Form/ConfirmForm.jsx          | 5 +++--
 .../dashboard/transportation-assistance/Form/RejectForm.jsx | 5 +++--
 .../components/notifications/UploadFileNotification.jsx     | 6 ++++--
 src/pages/dashboard/machinary-expert/index.jsx              | 4 ++--
 12 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
index ab0f17f..ef68207 100644
--- a/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/machinary-office/Form/ConfirmForm.jsx
@@ -38,13 +38,14 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
         initialValues: {
             description: "",
             proposed_amount: "",
-            confirm_img: ""
+            confirm_img: null
         },
         validationSchema,
         onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             formData.append("proposed_amount", values.proposed_amount);
             if (values.description != "") formData.append("expert_description", values.description);
+            if (values.confirm_img != null) formData.append("attachment", values.confirm_img);
 
             requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', {
                 data: formData,
@@ -68,7 +69,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
         if (uploadedFile) {
             const maxFileSize = 2 * 1024 * 1024;
             if (uploadedFile.size > maxFileSize) {
-                UploadFileNotification(directionApp, t);
+                UploadFileNotification(t);
                 event.target.value = "";
                 return;
             }
diff --git a/src/components/dashboard/machinary-office/Form/RejectForm.jsx b/src/components/dashboard/machinary-office/Form/RejectForm.jsx
index 5980af3..e82332b 100644
--- a/src/components/dashboard/machinary-office/Form/RejectForm.jsx
+++ b/src/components/dashboard/machinary-office/Form/RejectForm.jsx
@@ -38,12 +38,13 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
     const formik = useFormik({
         initialValues: {
             description: "",
-            reject_img: ""
+            reject_img: null
         },
         validationSchema,
         onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             formData.append("expert_description", values.description);
+            if (values.reject_img != null) formData.append("attachment", values.reject_img);
 
             requestServer(`${REJECT_MACHINARY_OFFICE}/${rowId}`, 'post', {
                 data: formData,
@@ -65,7 +66,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
         if (uploadedFile) {
             const maxFileSize = 2 * 1024 * 1024;
             if (uploadedFile.size > maxFileSize) {
-                UploadFileNotification(directionApp, t);
+                UploadFileNotification(t);
                 event.target.value = "";
                 return;
             }
diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx
index 18c8dd9..1628947 100644
--- a/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm.jsx
@@ -38,13 +38,14 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
         initialValues: {
             description: "",
             approved_amount: "",
-            confirm_img: ""
+            confirm_img: null
         },
         validationSchema,
         onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             formData.append("approved_amount", values.approved_amount);
             if (values.description != "") formData.append("expert_description", values.description);
+            if (values.confirm_img != null) formData.append("attachment", values.confirm_img);
 
             requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post', {
                 data: formData,
@@ -68,7 +69,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
         if (uploadedFile) {
             const maxFileSize = 2 * 1024 * 1024;
             if (uploadedFile.size > maxFileSize) {
-                UploadFileNotification(directionApp, t);
+                UploadFileNotification(t);
                 event.target.value = "";
                 return;
             }
diff --git a/src/components/dashboard/passenger-boss/Form/RejectForm.jsx b/src/components/dashboard/passenger-boss/Form/RejectForm.jsx
index 90bdb51..2c4e38d 100644
--- a/src/components/dashboard/passenger-boss/Form/RejectForm.jsx
+++ b/src/components/dashboard/passenger-boss/Form/RejectForm.jsx
@@ -38,12 +38,13 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
     const formik = useFormik({
         initialValues: {
             description: "",
-            reject_img: ""
+            reject_img: null
         },
         validationSchema,
         onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             formData.append("expert_description", values.description);
+            if (values.reject_img != null) formData.append("attachment", values.reject_img);
 
             requestServer(`${REJECT_PASSENGER_BOSS}/${rowId}`, 'post', {
                 data: formData,
@@ -65,7 +66,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
         if (uploadedFile) {
             const maxFileSize = 2 * 1024 * 1024;
             if (uploadedFile.size > maxFileSize) {
-                UploadFileNotification(directionApp, t);
+                UploadFileNotification(t);
                 event.target.value = "";
                 return;
             }
diff --git a/src/components/dashboard/passenger-office/Form/ConfirmForm.jsx b/src/components/dashboard/passenger-office/Form/ConfirmForm.jsx
index 0a550e0..1056390 100644
--- a/src/components/dashboard/passenger-office/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/passenger-office/Form/ConfirmForm.jsx
@@ -33,11 +33,12 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
     const formik = useFormik({
         initialValues: {
             description: "",
-            confirm_img: ""
+            confirm_img: null
         },
         onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             if (values.description != "") formData.append("expert_description", values.description);
+            if (values.confirm_img != null) formData.append("attachment", values.confirm_img);
 
             requestServer(`${CONFIRM_PASSENGER_OFFICE}/${rowId}`, 'post', {
                 data: formData,
@@ -58,7 +59,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
         if (uploadedFile) {
             const maxFileSize = 2 * 1024 * 1024;
             if (uploadedFile.size > maxFileSize) {
-                UploadFileNotification(directionApp, t);
+                UploadFileNotification(t);
                 event.target.value = "";
                 return;
             }
diff --git a/src/components/dashboard/passenger-office/Form/RejectForm.jsx b/src/components/dashboard/passenger-office/Form/RejectForm.jsx
index 1b56bab..505389e 100644
--- a/src/components/dashboard/passenger-office/Form/RejectForm.jsx
+++ b/src/components/dashboard/passenger-office/Form/RejectForm.jsx
@@ -38,12 +38,13 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
     const formik = useFormik({
         initialValues: {
             description: "",
-            reject_img: ""
+            reject_img: null
         },
         validationSchema,
         onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             formData.append("expert_description", values.description);
+            if (values.reject_img != null) formData.append("attachment", values.reject_img);
 
             requestServer(`${REJECT_PASSENGER_OFFICE}/${rowId}`, 'post', {
                 data: formData,
@@ -65,7 +66,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
         if (uploadedFile) {
             const maxFileSize = 2 * 1024 * 1024;
             if (uploadedFile.size > maxFileSize) {
-                UploadFileNotification(directionApp, t);
+                UploadFileNotification(t);
                 event.target.value = "";
                 return;
             }
diff --git a/src/components/dashboard/province-manager/Form/ConfirmForm.jsx b/src/components/dashboard/province-manager/Form/ConfirmForm.jsx
index 7056975..a6b7c18 100644
--- a/src/components/dashboard/province-manager/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/province-manager/Form/ConfirmForm.jsx
@@ -33,11 +33,12 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
     const formik = useFormik({
         initialValues: {
             description: "",
-            confirm_img: ""
+            confirm_img: null
         },
         onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             if (values.description != "") formData.append("expert_description", values.description);
+            if (values.confirm_img != null) formData.append("attachment", values.confirm_img);
 
             requestServer(`${CONFIRM_PROVINCE_MANAGER}/${rowId}`, 'post', {
                 data: formData,
@@ -58,7 +59,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
         if (uploadedFile) {
             const maxFileSize = 2 * 1024 * 1024;
             if (uploadedFile.size > maxFileSize) {
-                UploadFileNotification(directionApp, t);
+                UploadFileNotification(t);
                 event.target.value = "";
                 return;
             }
diff --git a/src/components/dashboard/province-manager/Form/RejectForm.jsx b/src/components/dashboard/province-manager/Form/RejectForm.jsx
index 8934eee..9b04439 100644
--- a/src/components/dashboard/province-manager/Form/RejectForm.jsx
+++ b/src/components/dashboard/province-manager/Form/RejectForm.jsx
@@ -38,12 +38,13 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
     const formik = useFormik({
         initialValues: {
             description: "",
-            reject_img: ""
+            reject_img: null
         },
         validationSchema,
         onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             formData.append("expert_description", values.description);
+            if (values.reject_img != null) formData.append("attachment", values.reject_img);
 
             requestServer(`${REJECT_PROVINCE_MANAGER}/${rowId}`, 'post', {
                 data: formData,
@@ -65,7 +66,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
         if (uploadedFile) {
             const maxFileSize = 2 * 1024 * 1024;
             if (uploadedFile.size > maxFileSize) {
-                UploadFileNotification(directionApp, t);
+                UploadFileNotification(t);
                 event.target.value = "";
                 return;
             }
diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm.jsx
index 6ce7dda..d687349 100644
--- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm.jsx
+++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm.jsx
@@ -33,11 +33,12 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
     const formik = useFormik({
         initialValues: {
             description: "",
-            confirm_img: ""
+            confirm_img: null
         },
         onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             if (values.description != "") formData.append("expert_description", values.description);
+            if (values.confirm_img != null) formData.append("attachment", values.confirm_img);
 
             requestServer(`${CONFIRM_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', {
                 data: formData,
@@ -58,7 +59,7 @@ const Confirm = ({rowId, fetchUrl, mutate}) => {
         if (uploadedFile) {
             const maxFileSize = 2 * 1024 * 1024;
             if (uploadedFile.size > maxFileSize) {
-                UploadFileNotification(directionApp, t);
+                UploadFileNotification(t);
                 event.target.value = "";
                 return;
             }
diff --git a/src/components/dashboard/transportation-assistance/Form/RejectForm.jsx b/src/components/dashboard/transportation-assistance/Form/RejectForm.jsx
index 2bd4fe7..fff4c48 100644
--- a/src/components/dashboard/transportation-assistance/Form/RejectForm.jsx
+++ b/src/components/dashboard/transportation-assistance/Form/RejectForm.jsx
@@ -38,12 +38,13 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
     const formik = useFormik({
         initialValues: {
             description: "",
-            reject_img: ""
+            reject_img: null
         },
         validationSchema,
         onSubmit: (values, {setSubmitting}) => {
             const formData = new FormData();
             formData.append("expert_description", values.description);
+            if (values.reject_img != null) formData.append("attachment", values.reject_img);
 
             requestServer(`${REJECT_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', {
                 data: formData,
@@ -65,7 +66,7 @@ const Reject = ({rowId, fetchUrl, mutate}) => {
         if (uploadedFile) {
             const maxFileSize = 2 * 1024 * 1024;
             if (uploadedFile.size > maxFileSize) {
-                UploadFileNotification(directionApp, t);
+                UploadFileNotification(t);
                 event.target.value = "";
                 return;
             }
diff --git a/src/core/components/notifications/UploadFileNotification.jsx b/src/core/components/notifications/UploadFileNotification.jsx
index 4d3b462..6556944 100644
--- a/src/core/components/notifications/UploadFileNotification.jsx
+++ b/src/core/components/notifications/UploadFileNotification.jsx
@@ -26,9 +26,11 @@ const UploadFileNotification = (t) => {
             </>
         ),
         {
-            autoClose: false,
+            autoClose: 3000,
+            hideProgressBar: true,
+            pauseOnHover: true,
             closeOnClick: false,
-            draggable: false,
+            draggable: true,
         }
     );
 };
diff --git a/src/pages/dashboard/machinary-expert/index.jsx b/src/pages/dashboard/machinary-expert/index.jsx
index 35b7fe6..d05e7df 100644
--- a/src/pages/dashboard/machinary-expert/index.jsx
+++ b/src/pages/dashboard/machinary-expert/index.jsx
@@ -1,4 +1,4 @@
-import DashboardMachinaryOfficeComponent from "@/components/dashboard/machinary-office";
+import DashboardMachineryOfficeComponent from "@/components/dashboard/machinary-office";
 import RolePermissionMiddleware from "@/middlewares/RolePermission";
 import WithAuthMiddleware from "@/middlewares/WithAuth";
 import {parse} from "next-useragent";
@@ -8,7 +8,7 @@ export default function PassengerOffice() {
     return (
         <WithAuthMiddleware>
             <RolePermissionMiddleware requiredPermissions={requiredPermissions}>
-                <DashboardMachinaryOfficeComponent/>
+                <DashboardMachineryOfficeComponent/>
             </RolePermissionMiddleware>
         </WithAuthMiddleware>
     );