recive new data and remove conflicts

public/locales/fa/app.json

@@ -110,5 +110,16 @@
     "navgan_id": "کد ناوگان",
     "vehicle_type": "نوع ماشین",
     "state_name": "وضعیت درخواست"
+  },
+  "ConfirmDialog": {
+    "confirm": "تایید",
+    "context": "آیا از تایید این آیتم اطمینان دارید",
+    "button-confirm": "تایید",
+    "button-cancel": "بستن"
+  },
+  "RejectDialog": {
+    "reject": "عدم تایید",
+    "context": "آیا از عدم تایید این آیتم اطمینان دارید",
+    "button-reject": "عدم تایید",
+    "button-cancel": "بستن"
   }
-}

src/components/dashboard/passenger-office/Form/ConfirmForm.jsx

@@ -21,16 +21,16 @@ const ConfirmForm = ({
   };
   return (
     <Dialog open={open} onClose={handleClose}>
-      <DialogTitle>{t("delete-dialog.confirm")}</DialogTitle>
+      <DialogTitle>{t("ConfirmDialog.confirm")}</DialogTitle>
       <DialogContent>
-        <DialogContentText>{t("delete-dialog.context")}</DialogContentText>
+        <DialogContentText>{t("ConfirmDialog.context")}</DialogContentText>
       </DialogContent>
       <DialogActions>
         <Button onClick={handleDeleteExpert} color="primary">
-          {t("delete-dialog.button-delete")}
+          {t("ConfirmDialog.button-confirm")}
         </Button>
         <Button onClick={handleClose} color="secondary" autoFocus>
-          {t("delete-dialog.button-cancel")}
+          {t("ConfirmDialog.button-cancel")}
         </Button>
       </DialogActions>
     </Dialog>

src/components/dashboard/passenger-office/Form/RejectForm.jsx

@@ -10,21 +10,22 @@ import { useTranslations } from "next-intl";
 
 const RejectForm = ({ open, handleClose, handleDelete, rowId, deleteData }) => {
   const t = useTranslations();
-  const handleDeleteExpert = () => {
+  const handleRejectRequest = () => {
     handleDelete();
   };
+  console.log(rowId);
   return (
     <Dialog open={open} onClose={handleClose}>
-      <DialogTitle>{t("delete-dialog.confirm")}</DialogTitle>
+      <DialogTitle>{t("RejectDialog.reject")}</DialogTitle>
       <DialogContent>
-        <DialogContentText>{t("delete-dialog.context")}</DialogContentText>
+        <DialogContentText>{t("RejectDialog.context")}</DialogContentText>
       </DialogContent>
       <DialogActions>
-        <Button onClick={handleDeleteExpert} color="primary">
+        <Button onClick={handleRejectRequest} color="primary">
-          {t("delete-dialog.button-delete")}
+          {t("RejectDialog.button-reject")}
         </Button>
         <Button onClick={handleClose} color="secondary" autoFocus>
-          {t("delete-dialog.button-cancel")}
+          {t("RejectDialog.button-cancel")}
         </Button>
       </DialogActions>
     </Dialog>

src/components/dashboard/passenger-office/TableRowActions.jsx

@@ -9,36 +9,40 @@ import RejectForm from "./Form/RejectForm";
 // import DeleteForm from "./Form/DeleteForm";
 
 const TableRowActions = ({ row }) => {
-  // const {
+  const {
-  //   openDeleteDialog,
+    openConfirmDialog,
-  //   handleOpenDeleteDialog,
+    openRejectDialog,
-  //   handleCloseDeleteDialog,
+    handleOpenConfirmDialog,
-  //   handleDeleteDialog,
+    handleOpenRejectDialog,
-  //   rowId,
+    handleCloseConfirmDialog,
-  //   deleteData,
+    handleCloseRejectDialog,
-  // } = useContext(DataTableContext);
+    handleConfirmDialog,
+    handleRejectDialog,
+    rowId,
+    deleteData,
+  } = useContext(DataTableContext);
   return (
     <Box sx={{ display: "flex", flexWrap: "nowrap", gap: "8px" }}>
-      <IconButton color="primary" onClick={() => handleOpenDeleteDialog(row)}>
+      <IconButton color="primary" onClick={() => handleOpenConfirmDialog(row)}>
         <ThumbUpAltIcon />
       </IconButton>
-      {/* <ConfirmForm
+      <ConfirmForm
         rowId={rowId}
-        open={openDeleteDialog}
+        open={openConfirmDialog}
-        handleClose={handleCloseDeleteDialog}
+        handleClose={handleCloseConfirmDialog}
-        handleDelete={handleDeleteDialog}
+        handleDelete={handleConfirmDialog}
         deleteData={deleteData}
-      /> */}
+      />
-      <IconButton color="primary" onClick={() => handleOpenDeleteDialog(row)}>
+      <IconButton color="primary" onClick={() => handleOpenRejectDialog(row)}>
         <ThumbDownIcon />
       </IconButton>
-      {/* <RejectForm
+      <RejectForm
         rowId={rowId}
-        open={openDeleteDialog}
+        open={openRejectDialog}
-        handleClose={handleCloseDeleteDialog}
+        handleClose={handleCloseRejectDialog}
-        handleDelete={handleDeleteDialog}
+        handleDelete={handleRejectDialog}
         deleteData={deleteData}
-      /> */}
+      />
     </Box>
   );
 };

src/core/components/DatatableStructure.jsx

@@ -1,4 +1,4 @@
-import { DataTableProvider } from "@/lib/app/contexts/DatatableContext";
+import { DataTableProvider } from "@/lib/app/contexts/DataTableContext";
 import DataTable from "./Datatable";
 import { ReloadDataTableProvider } from "@/lib/app/contexts/ReloadDatatableContext";
 

src/lib/app/hooks/useDatatable.jsx

@@ -1,46 +1,28 @@
-import { useMediaQuery } from "@mui/material";
-import { useTheme } from "@mui/material/styles";
-import { useState, useReducer, useCallback, useContext } from "react";
 import axios from "axios";
-import ImageResizer from "@/core/components/ImageConvertor";
+import { useCallback, useContext, useReducer, useState } from "react";
+import { ReloadDataTableContext } from "../contexts/ReloadDatatableContext";
 import useUser from "./useUser";
-// import { ReloadDataTableContext } from "../contexts/ReloadDatatableContext";
 
 const initialValues = {
   url: "",
   rowID: "",
   values: {},
-  image: {
-    key: "",
-    value: {},
-  },
 };
 
 const reducer = (state, action) => {
   switch (action.type) {
-    case "ADD_DATA":
+    case "CONFIRM_DATA":
       return {
         ...state,
         url: action.url,
-        values: action.values,
-        image: action.image,
-        rowID: "",
-      };
-    case "EDIT_DATA":
-      return {
-        ...state,
-        url: action.url,
-        values: action.values,
         rowID: action.rowID,
-        image: action.image,
       };
-    case "DELETE_DATA":
+    case "REJECT_DATA":
       return {
         ...state,
         url: action.url,
         rowID: action.rowID,
         values: {},
-        image: {},
       };
     default:
       return state;
@@ -48,120 +30,82 @@ const reducer = (state, action) => {
 };
 
 const useDataTable = () => {
-  // const { setReloadDataTable } = useContext(ReloadDataTableContext);
+  const { setReloadDataTable } = useContext(ReloadDataTableContext);
   const [state, dispatch] = useReducer(reducer, initialValues);
-  const [drawerContent, setDrawerContent] = useState(null);
+  const [openConfirmDialog, setOpenConfirmDialog] = useState(false);
-  const [openDeleteDialog, setOpenDeleteDialog] = useState(false);
+  const [openRejectDialog, setOpenRejectDialog] = useState(false);
   const [rowId, setRowId] = useState(null);
-  const theme = useTheme();
+  
   const { token } = useUser();
 
-  const drawerDirection = useMediaQuery(theme.breakpoints.up("sm"))
+  const confirmData = useCallback(async (url, rowID) => {
-    ? "right"
+    dispatch({ type: "CONFIRM_DATA", url: url, rowID: rowID });
-    : "bottom";
-  const [sweepableDrawer, setSweepableDrawer] = useState({
-    bottom: false,
-    right: false,
-  });
-
-  const addData = useCallback(async (url, values, image) => {
-    dispatch({ type: "ADD_DATA", url: url, values: values, image: image });
-    if (image != null) {
-      var resizedAvatar = await ImageResizer(image.value);
-      formData.append(image.key, resizedAvatar);
-      axios.post(url, formData, {
-        headers: {
-          authorization: `Bearer ${token}`,
-          "Content-Type": "multipart/form-data",
-        },
-      });
-    }
     axios
-      .post(url, values, {
+      .post(`${url}/${rowID}`, {
-        headers: {
-          authorization: `Bearer ${token}`,
-        },
-      })
-      .then(() => {})
-      .catch(() => {});
-  }, []);
-
-  const deleteData = useCallback(async (url, rowID) => {
-    dispatch({ type: "DELETE_DATA", url: url, rowID: rowID });
-    axios
-      .delete(`${url}/${rowID}`, {
         headers: {
           authorization: `Bearer ${token}`,
         },
       })
       .then(() => {
-        // setReloadDataTable(true);
+        setReloadDataTable(true);
       })
       .catch(() => {});
   }, []);
 
-  const editData = useCallback(async (url, values, rowID, image) => {
+  const rejectData = useCallback(async (url, rowID) => {
-    dispatch({
+    dispatch({ type: "REJECT_DATA", url: url, rowID: rowID });
-      type: "EDIT_DATA",
-      url: url,
-      values: values,
-      rowID: rowID,
-      image: image,
-    });
-    if (image != null) {
-      var resizedAvatar = await ImageResizer(image.value);
-      formData.append(image.key, resizedAvatar);
-      axios.post(`${url}/${rowID}`, formData, {
-        headers: {
-          authorization: `Bearer ${token}`,
-          "Content-Type": "multipart/form-data",
-        },
-      });
-    }
     axios
-      .post(`${url}/${rowID}`, values, {
+      .post(`${url}/${rowID}`, {
         headers: {
           authorization: `Bearer ${token}`,
         },
       })
-      .then(() => {})
+      .then(() => {
+        setReloadDataTable(true);
+      })
       .catch(() => {});
   }, []);
 
-  const toggleDrawer = (open) => {
+  const handleOpenConfirmDialog = (row) => {
-    open == false &&
-      setTimeout(() => {
-        setDrawerContent(null);
-      }, theme.transitions.duration.leavingScreen);
-    setSweepableDrawer({ ...sweepableDrawer, [drawerDirection]: open });
-  };
-  const handleOpenDeleteDialog = (row) => {
     setRowId(row.getValue("id"));
-    setOpenDeleteDialog(true);
+    setOpenConfirmDialog(true);
   };
 
-  const handleCloseDeleteDialog = () => {
+  const handleCloseConfirmDialog = () => {
-    setOpenDeleteDialog(false);
+    setOpenConfirmDialog(false);
   };
 
-  const handleDeleteDialog = () => {
+  const handleConfirmDialog = () => {
-    setOpenDeleteDialog(false);
+    setOpenConfirmDialog(false);
   };
 
+  // Reject Data
+  const handleOpenRejectDialog = (row) => {
+    setRowId(row.getValue("id"));
+    setOpenRejectDialog(true);
+  };
+
+  const handleCloseRejectDialog = () => {
+    setOpenRejectDialog(false);
+  };
+
+  const handleRejectDialog = () => {
+    setOpenRejectDialog(false);
+  };
+  // End Reject Data
+
   const contextValue = {
-    toggleDrawer,
+    handleOpenConfirmDialog,
-    drawerDirection,
+    handleCloseConfirmDialog,
-    sweepableDrawer,
+    handleConfirmDialog,
-    setSweepableDrawer,
+    handleOpenRejectDialog,
-    setDrawerContent,
+    handleCloseRejectDialog,
-    drawerContent,
+    handleRejectDialog,
-    openDeleteDialog,
-    handleOpenDeleteDialog,
-    handleCloseDeleteDialog,
-    handleDeleteDialog,
     rowId,
-    deleteData,
+    openConfirmDialog,
-    addData,
+    openRejectDialog,
+    rejectData,
+    confirmData,
   };
   return contextValue;
 };