transportation assistance implement

src/components/dashboard/transportation-assistance/Form/ConfirmForm.jsx

@@ -9,16 +9,10 @@ import {
 } from "@mui/material";
 import { useTranslations } from "next-intl";
 
-const ConfirmForm = ({
-  open,
-  handleClose,
-  handleDelete,
-  rowId,
-  confirmData,
-}) => {
+const ConfirmForm = ({ open, handleClose, rowId, confirmData }) => {
   const t = useTranslations();
   const handleConfirm = () => {
-    handleDelete();
+    handleClose();
     confirmData(CONFIRM_TRANSPORTATION_ASSISTANCE, rowId);
   };
   return (

src/components/dashboard/transportation-assistance/Form/RejectForm.jsx

@@ -6,23 +6,63 @@ import {
   DialogContentText,
   DialogActions,
   Button,
+  TextField,
 } from "@mui/material";
 import { useTranslations } from "next-intl";
+import { useFormik } from "formik";
+import * as Yup from "yup";
+import { useState } from "react";
 
-const RejectForm = ({ open, handleClose, handleDelete, rowId, rejectData }) => {
+const RejectForm = ({ open, handleClose, rowId, rejectData }) => {
+  const [description, setDescription] = useState("");
   const t = useTranslations();
-  const handleRejectRequest = () => {
-    handleDelete();
-    rejectData(REJECT_TRANSPORTATION_ASSISTANCE, rowId);
+
+  const validationSchema = Yup.object().shape({
+    description: Yup.string().required(t("RejectDialog.description_error")),
+  });
+
+  const formik = useFormik({
+    initialValues: {
+      description: "",
+    },
+    validationSchema,
+    onSubmit: () => {
+      const formData = new FormData();
+      formData.append("expert_description", description);
+      handleClose();
+      rejectData(REJECT_TRANSPORTATION_ASSISTANCE, rowId, formData);
+    },
+  });
+
+  const handleDescriptionChange = (event) => {
+    setDescription(event.target.value);
+    formik.handleChange(event);
   };
+
   return (
     <Dialog open={open} onClose={handleClose}>
       <DialogTitle>{t("RejectDialog.reject")}</DialogTitle>
       <DialogContent>
         <DialogContentText>{t("RejectDialog.context")}</DialogContentText>
+        <TextField
+          name="description"
+          multiline
+          rows={8}
+          placeholder={t("RejectDialog.description")}
+          value={description}
+          onChange={handleDescriptionChange}
+          onBlur={formik.handleBlur("description")}
+          error={
+            formik.touched.description && Boolean(formik.errors.description)
+          }
+          helperText={formik.touched.description && formik.errors.description}
+          fullWidth
+          variant="outlined"
+          sx={{ mt: 1 }}
+        />
       </DialogContent>
       <DialogActions>
-        <Button onClick={handleRejectRequest} color="primary">
+        <Button onClick={formik.handleSubmit} color="primary">
           {t("RejectDialog.button-reject")}
         </Button>
         <Button onClick={handleClose} color="secondary" autoFocus>

src/components/dashboard/transportation-assistance/TableRowActions.jsx

@@ -14,34 +14,39 @@ const TableRowActions = ({ row }) => {
     handleOpenRejectDialog,
     handleCloseConfirmDialog,
     handleCloseRejectDialog,
-    handleConfirmDialog,
-    handleRejectDialog,
     rowId,
     confirmData,
     rejectData,
   } = useContext(DataTableContext);
   return (
     <Box sx={{ display: "flex", flexWrap: "nowrap", gap: "8px" }}>
-      <IconButton color="primary" onClick={() => handleOpenConfirmDialog(row)}>
+      <IconButton
+        color="primary"
+        onClick={() => {
+          handleOpenConfirmDialog(row);
+        }}
+      >
         <ThumbUpAltIcon />
       </IconButton>
-      <ConfirmForm
-        rowId={rowId}
-        open={openConfirmDialog}
-        handleClose={handleCloseConfirmDialog}
-        handleDelete={handleConfirmDialog}
-        confirmData={confirmData}
-      />
+      {openConfirmDialog && (
+        <ConfirmForm
+          rowId={rowId}
+          open={openConfirmDialog}
+          handleClose={handleCloseConfirmDialog}
+          confirmData={confirmData}
+        />
+      )}
       <IconButton color="primary" onClick={() => handleOpenRejectDialog(row)}>
         <ThumbDownIcon />
       </IconButton>
-      <RejectForm
-        rowId={rowId}
-        open={openRejectDialog}
-        handleClose={handleCloseRejectDialog}
-        handleDelete={handleRejectDialog}
-        rejectData={rejectData}
-      />
+      {openRejectDialog && (
+        <RejectForm
+          rowId={rowId}
+          open={openRejectDialog}
+          handleClose={handleCloseRejectDialog}
+          rejectData={rejectData}
+        />
+      )}
     </Box>
   );
 };

src/core/data/apiRoutes.js

@@ -25,13 +25,13 @@ export const REJECT_PASSENGER_OFFICE =
 
 //transportation assistance
 export const GET_TRANSPORTATION_ASSISTANCE =
-  BASE_URL + "/dashboard/transportation_asisstants/show";
+  BASE_URL + "/dashboard/transportation_assistant/show";
 
 export const CONFIRM_TRANSPORTATION_ASSISTANCE =
-  BASE_URL + "/dashboard/transportation_asisstants/confirm";
+  BASE_URL + "/dashboard/transportation_assistant/confirm";
 
 export const REJECT_TRANSPORTATION_ASSISTANCE =
-  BASE_URL + "/dashboard/transportation_asisstants/reject";
+  BASE_URL + "/dashboard/transportation_assistant/reject";
 //transportation assistance
 //machinary office
 export const GET_MACHINARY_OFFICE =